mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-02-16 17:24:23 +00:00
Fix the Android port
* src/dispnew.c (terminal_cursor_magic) (combine_updates_for_frame): Disable unused code on Android. * src/frame.c (tty_child_frame_rect): Define out on Android.
This commit is contained in:
parent
f0d7a395ea
commit
e166803f8c
2 changed files with 10 additions and 0 deletions
|
|
@ -3903,6 +3903,8 @@ is_cursor_obscured (void)
|
|||
return cursor_glyph->frame != SELECTED_FRAME ();
|
||||
}
|
||||
|
||||
#ifndef HAVE_ANDROID
|
||||
|
||||
/* Decide where to show the cursor, and whether to hide it.
|
||||
|
||||
This works very well for Vertico-Posframe, Transient-Posframe and
|
||||
|
|
@ -3942,9 +3944,12 @@ terminal_cursor_magic (struct frame *root, struct frame *topmost_child)
|
|||
}
|
||||
}
|
||||
|
||||
#endif /* !HAVE_ANDROID */
|
||||
|
||||
void
|
||||
combine_updates_for_frame (struct frame *f, bool inhibit_scrolling)
|
||||
{
|
||||
#ifndef HAVE_ANDROID
|
||||
struct frame *root = root_frame (f);
|
||||
eassert (FRAME_VISIBLE_P (root));
|
||||
|
||||
|
|
@ -3981,6 +3986,7 @@ combine_updates_for_frame (struct frame *f, bool inhibit_scrolling)
|
|||
add_frame_display_history (f, false);
|
||||
#endif
|
||||
}
|
||||
#endif /* HAVE_ANDROID */
|
||||
}
|
||||
|
||||
/* Update on the screen all root frames ROOTS. Called from
|
||||
|
|
|
|||
|
|
@ -1442,6 +1442,8 @@ tty_child_size_param (struct frame *child, Lisp_Object key,
|
|||
return dflt;
|
||||
}
|
||||
|
||||
#ifndef HAVE_ANDROID
|
||||
|
||||
static void
|
||||
tty_child_frame_rect (struct frame *f, Lisp_Object params,
|
||||
int *x, int *y, int *w, int *h)
|
||||
|
|
@ -1452,6 +1454,8 @@ tty_child_frame_rect (struct frame *f, Lisp_Object params,
|
|||
*h = tty_child_size_param (f, Qheight, params, FRAME_TOTAL_LINES (f));
|
||||
}
|
||||
|
||||
#endif /* !HAVE_ANDROID */
|
||||
|
||||
DEFUN ("make-terminal-frame", Fmake_terminal_frame, Smake_terminal_frame,
|
||||
1, 1, 0,
|
||||
doc: /* Create an additional terminal frame, possibly on another terminal.
|
||||
|
|
|
|||
Loading…
Reference in a new issue