aboutsummaryrefslogtreecommitdiffstats
path: root/src/androidterm.c
diff options
context:
space:
mode:
authorPo Lu2023-03-12 11:06:47 +0800
committerPo Lu2023-03-12 11:06:47 +0800
commitb0abc50218696b7b5db6589d73c49fdb64b3e289 (patch)
treeac35b966d449792fb3c9836f06a496016d04198d /src/androidterm.c
parent5c2fee0c257ea24cf28e0d493e5dbaf41152d94c (diff)
downloademacs-b0abc50218696b7b5db6589d73c49fdb64b3e289.tar.gz
emacs-b0abc50218696b7b5db6589d73c49fdb64b3e289.zip
Add Super modifier support to Android port
* src/androidgui.h (enum android_modifier_mask): New modifier ANDROID_SUPER_MASK. * src/androidterm.c (android_android_to_emacs_modifiers) (android_emacs_to_android_modifiers): Add new modifier.
Diffstat (limited to 'src/androidterm.c')
-rw-r--r--src/androidterm.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/androidterm.c b/src/androidterm.c
index 019b84bf391..397971e3c87 100644
--- a/src/androidterm.c
+++ b/src/androidterm.c
@@ -362,7 +362,8 @@ android_android_to_emacs_modifiers (struct android_display_info *dpyinfo,
362{ 362{
363 return ((state & ANDROID_CONTROL_MASK) ? ctrl_modifier : 0 363 return ((state & ANDROID_CONTROL_MASK) ? ctrl_modifier : 0
364 | (state & ANDROID_SHIFT_MASK) ? shift_modifier : 0 364 | (state & ANDROID_SHIFT_MASK) ? shift_modifier : 0
365 | (state & ANDROID_ALT_MASK) ? meta_modifier : 0); 365 | (state & ANDROID_ALT_MASK) ? meta_modifier : 0
366 | (state & ANDROID_SUPER_MASK) ? super_modifier : 0);
366} 367}
367 368
368static int 369static int
@@ -371,7 +372,8 @@ android_emacs_to_android_modifiers (struct android_display_info *dpyinfo,
371{ 372{
372 return ((state & ctrl_modifier) ? ANDROID_CONTROL_MASK : 0 373 return ((state & ctrl_modifier) ? ANDROID_CONTROL_MASK : 0
373 | (state & shift_modifier) ? ANDROID_SHIFT_MASK : 0 374 | (state & shift_modifier) ? ANDROID_SHIFT_MASK : 0
374 | (state & meta_modifier) ? ANDROID_ALT_MASK : 0); 375 | (state & meta_modifier) ? ANDROID_ALT_MASK : 0
376 | (state & super_modifier) ? ANDROID_SUPER_MASK : 0);
375} 377}
376 378
377static void android_frame_rehighlight (struct android_display_info *); 379static void android_frame_rehighlight (struct android_display_info *);