From: Po Lu <luangruo@yahoo.com>
Date: Fri, 20 Dec 2024 00:39:29 +0000 (+0800)
Subject: Fix the Android port
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e91d6bb4231627a1375d664a7668ce141334fe2d;p=emacs.git

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.

(cherry picked from commit e166803f8c1f1870cefb4f5b7828422a145cd3d4)
---

diff --git a/src/dispnew.c b/src/dispnew.c
index a1b3c3ae101..3c4b20c23b7 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -3900,6 +3900,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
@@ -3939,9 +3941,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));
 
@@ -3978,6 +3983,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
diff --git a/src/frame.c b/src/frame.c
index 26a28575cc4..8423836a80f 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -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.