diff options
| author | Po Lu | 2024-12-20 08:39:29 +0800 |
|---|---|---|
| committer | Po Lu | 2024-12-20 08:39:29 +0800 |
| commit | e166803f8c1f1870cefb4f5b7828422a145cd3d4 (patch) | |
| tree | 599f821f100d5e8fbf28f091f47193f33f5a0c4d /src | |
| parent | f0d7a395eaf818a6fe05ac1cf8b630775b02f451 (diff) | |
| download | emacs-e166803f8c1f1870cefb4f5b7828422a145cd3d4.tar.gz emacs-e166803f8c1f1870cefb4f5b7828422a145cd3d4.zip | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/dispnew.c | 6 | ||||
| -rw-r--r-- | src/frame.c | 4 |
2 files changed, 10 insertions, 0 deletions
diff --git a/src/dispnew.c b/src/dispnew.c index f628415359c..2e95016b5f3 100644 --- a/src/dispnew.c +++ b/src/dispnew.c | |||
| @@ -3903,6 +3903,8 @@ is_cursor_obscured (void) | |||
| 3903 | return cursor_glyph->frame != SELECTED_FRAME (); | 3903 | return cursor_glyph->frame != SELECTED_FRAME (); |
| 3904 | } | 3904 | } |
| 3905 | 3905 | ||
| 3906 | #ifndef HAVE_ANDROID | ||
| 3907 | |||
| 3906 | /* Decide where to show the cursor, and whether to hide it. | 3908 | /* Decide where to show the cursor, and whether to hide it. |
| 3907 | 3909 | ||
| 3908 | This works very well for Vertico-Posframe, Transient-Posframe and | 3910 | This works very well for Vertico-Posframe, Transient-Posframe and |
| @@ -3942,9 +3944,12 @@ terminal_cursor_magic (struct frame *root, struct frame *topmost_child) | |||
| 3942 | } | 3944 | } |
| 3943 | } | 3945 | } |
| 3944 | 3946 | ||
| 3947 | #endif /* !HAVE_ANDROID */ | ||
| 3948 | |||
| 3945 | void | 3949 | void |
| 3946 | combine_updates_for_frame (struct frame *f, bool inhibit_scrolling) | 3950 | combine_updates_for_frame (struct frame *f, bool inhibit_scrolling) |
| 3947 | { | 3951 | { |
| 3952 | #ifndef HAVE_ANDROID | ||
| 3948 | struct frame *root = root_frame (f); | 3953 | struct frame *root = root_frame (f); |
| 3949 | eassert (FRAME_VISIBLE_P (root)); | 3954 | eassert (FRAME_VISIBLE_P (root)); |
| 3950 | 3955 | ||
| @@ -3981,6 +3986,7 @@ combine_updates_for_frame (struct frame *f, bool inhibit_scrolling) | |||
| 3981 | add_frame_display_history (f, false); | 3986 | add_frame_display_history (f, false); |
| 3982 | #endif | 3987 | #endif |
| 3983 | } | 3988 | } |
| 3989 | #endif /* HAVE_ANDROID */ | ||
| 3984 | } | 3990 | } |
| 3985 | 3991 | ||
| 3986 | /* Update on the screen all root frames ROOTS. Called from | 3992 | /* Update on the screen all root frames ROOTS. Called from |
diff --git a/src/frame.c b/src/frame.c index 547ad0da962..5518201fca7 100644 --- a/src/frame.c +++ b/src/frame.c | |||
| @@ -1442,6 +1442,8 @@ tty_child_size_param (struct frame *child, Lisp_Object key, | |||
| 1442 | return dflt; | 1442 | return dflt; |
| 1443 | } | 1443 | } |
| 1444 | 1444 | ||
| 1445 | #ifndef HAVE_ANDROID | ||
| 1446 | |||
| 1445 | static void | 1447 | static void |
| 1446 | tty_child_frame_rect (struct frame *f, Lisp_Object params, | 1448 | tty_child_frame_rect (struct frame *f, Lisp_Object params, |
| 1447 | int *x, int *y, int *w, int *h) | 1449 | int *x, int *y, int *w, int *h) |
| @@ -1452,6 +1454,8 @@ tty_child_frame_rect (struct frame *f, Lisp_Object params, | |||
| 1452 | *h = tty_child_size_param (f, Qheight, params, FRAME_TOTAL_LINES (f)); | 1454 | *h = tty_child_size_param (f, Qheight, params, FRAME_TOTAL_LINES (f)); |
| 1453 | } | 1455 | } |
| 1454 | 1456 | ||
| 1457 | #endif /* !HAVE_ANDROID */ | ||
| 1458 | |||
| 1455 | DEFUN ("make-terminal-frame", Fmake_terminal_frame, Smake_terminal_frame, | 1459 | DEFUN ("make-terminal-frame", Fmake_terminal_frame, Smake_terminal_frame, |
| 1456 | 1, 1, 0, | 1460 | 1, 1, 0, |
| 1457 | doc: /* Create an additional terminal frame, possibly on another terminal. | 1461 | doc: /* Create an additional terminal frame, possibly on another terminal. |