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

Correctly register Num Lock keys under Haiku

Browse source 
* src/haiku_support.cc (DispatchMessage): If B_NUM_LOCK is set,
invert B_SHIFT_KEY; should it be subsequently set, omit mapping
from raw_char.
This commit is contained in:
Po Lu 2023-10-23 05:30:14 +00:00
parent db96cdcc8d
commit 2cb3dea72b
1 changed files with 35 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/haiku_support.cc
View file

@ -1059,6 +1059,8 @@ class EmacsWindow : public BWindow
msg->FindInt64 ("when", &rq.time);
rq.modifiers = 0;
rq.keysym = 0;
uint32_t mods = modifiers ();
if (mods & B_SHIFT_KEY)
@ -1073,10 +1075,39 @@ class EmacsWindow : public BWindow
if (mods & B_OPTION_KEY)
rq.modifiers |= HAIKU_MODIFIER_SUPER;
ret = keysym_from_raw_char (raw, key, &rq.keysym);
/* mods & B_SHIFT_KEY should be inverted if keycode is
situated in the numeric keypad and Num Lock is set, for
this transformation is not effected on key events
themselves. */
if (!ret)
rq.keysym = 0;
if (mods & B_NUM_LOCK)
{
switch (key)
{
case 0x37:
case 0x38:
case 0x39:
case 0x48:
case 0x49:
case 0x4a:
case 0x58:
case 0x59:
case 0x5a:
case 0x64:
case 0x65:
mods ^= B_SHIFT_KEY;
/* If shift is set at this juncture, map these keys to
the digits they represent. Because raw is not
affected by Num Lock, keysym_from_raw_char will map
this to the keysym yielded by this key in the
absence of any modifiers. */
if (mods & B_SHIFT_KEY)
goto map_keysym;
}
}
ret = keysym_from_raw_char (raw, key, &rq.keysym);
if (ret < 0)
return;
@ -1087,6 +1118,7 @@ class EmacsWindow : public BWindow
{
if (mods & B_SHIFT_KEY)
{
map_keysym:
if (mods & B_CAPS_LOCK)
map_caps_shift (key, &rq.multibyte_char);
else