procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix the Android port

Browse source 
* src/term.c (tty_frame_at) [HAVE_ANDROID]: Always return nil.

* src/terminal.c (cursor_to, raw_cursor_to) [HAVE_ANDROID]:
Don't call root_xy.
This commit is contained in:
Po Lu 2025-01-27 09:11:21 +08:00
parent aec9e66178
commit 8d11871c63
2 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/term.c
View file

@ -2597,6 +2597,7 @@ tty_draw_row_with_mouse_face (struct window *w, struct glyph_row *row,
static Lisp_Object
tty_frame_at (int x, int y, int *cx, int *cy)
{
#ifndef HAVE_ANDROID
for (Lisp_Object frames = Ftty_frame_list_z_order (Qnil);
!NILP (frames);
frames = Fcdr (frames))
@ -2613,6 +2614,7 @@ tty_frame_at (int x, int y, int *cx, int *cy)
return frame;
}
}
#endif /* !HAVE_ANDROID */
return Qnil;
}

8
src/terminal.c
View file

@ -114,7 +114,11 @@ cursor_to (struct frame *f, int vpos, int hpos)
if (term->cursor_to_hook)
{
int x, y;
#ifndef HAVE_ANDROID
root_xy (f, hpos, vpos, &x, &y);
#else /* HAVE_ANDROID */
x = hpos, y = vpos;
#endif /* !HAVE_ANDROID */
term->cursor_to_hook (f, y, x);
}
}
@ -128,7 +132,11 @@ raw_cursor_to (struct frame *f, int row, int col)
if (term->raw_cursor_to_hook)
{
int x, y;
#ifndef HAVE_ANDROID
root_xy (f, col, row, &x, &y);
#else /* HAVE_ANDROID */
x = col, y = row;
#endif /* !HAVE_ANDROID */
term->raw_cursor_to_hook (f, y, x);
}
}