aboutsummaryrefslogtreecommitdiffstats
path: root/src/androidterm.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/androidterm.c')
-rw-r--r--src/androidterm.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/androidterm.c b/src/androidterm.c
index 9948a2919d8..ba9b6d3b8a9 100644
--- a/src/androidterm.c
+++ b/src/androidterm.c
@@ -376,11 +376,11 @@ android_android_to_emacs_modifiers (struct android_display_info *dpyinfo,
376 tem = Fget (Vx_super_keysym, Qmodifier_value); 376 tem = Fget (Vx_super_keysym, Qmodifier_value);
377 if (FIXNUMP (tem)) mod_super = XFIXNUM (tem) & INT_MAX; 377 if (FIXNUMP (tem)) mod_super = XFIXNUM (tem) & INT_MAX;
378 378
379 return (((state & ANDROID_CONTROL_MASK) ? mod_ctrl : 0) 379 return (((state & ANDROID_CONTROL_MASK) ? mod_ctrl : 0)
380 | ((state & ANDROID_SHIFT_MASK) ? mod_shift : 0) 380 | ((state & ANDROID_SHIFT_MASK) ? shift_modifier : 0)
381 | ((state & ANDROID_ALT_MASK) ? mod_meta : 0) 381 | ((state & ANDROID_ALT_MASK) ? mod_meta : 0)
382 | ((state & ANDROID_SUPER_MASK) ? mod_super : 0) 382 | ((state & ANDROID_SUPER_MASK) ? mod_super : 0)
383 | ((state & ANDROID_META_MASK) ? mod_alt : 0)); 383 | ((state & ANDROID_META_MASK) ? mod_alt : 0));
384} 384}
385 385
386static int 386static int
@@ -402,11 +402,11 @@ android_emacs_to_android_modifiers (struct android_display_info *dpyinfo,
402 tem = Fget (Vx_super_keysym, Qmodifier_value); 402 tem = Fget (Vx_super_keysym, Qmodifier_value);
403 if (FIXNUMP (tem)) mod_super = XFIXNUM (tem); 403 if (FIXNUMP (tem)) mod_super = XFIXNUM (tem);
404 404
405 return (((state & mod_ctrl) ? ANDROID_CONTROL_MASK : 0) 405 return (((state & mod_ctrl) ? ANDROID_CONTROL_MASK : 0)
406 | ((state & mod_shift) ? ANDROID_SHIFT_MASK : 0) 406 | ((state & shift_modifier) ? ANDROID_SHIFT_MASK : 0)
407 | ((state & mod_meta) ? ANDROID_ALT_MASK : 0) 407 | ((state & mod_meta) ? ANDROID_ALT_MASK : 0)
408 | ((state & mod_super) ? ANDROID_SUPER_MASK : 0) 408 | ((state & mod_super) ? ANDROID_SUPER_MASK : 0)
409 | ((state & mod_alt) ? ANDROID_META_MASK : 0)); 409 | ((state & mod_alt) ? ANDROID_META_MASK : 0));
410} 410}
411 411
412static void android_frame_rehighlight (struct android_display_info *); 412static void android_frame_rehighlight (struct android_display_info *);