Commit e770aad5 authored by Jan Djärv's avatar Jan Djärv
Browse files

* nsterm.m (convert_ns_to_X_keysym, keyDown:): Add NSNumericPadKeyMask

to keypad keys.

Fixes: debbugs:12816
parent 68f8f1c0
2012-11-06 Jan Djärv <jan.h.d@swipnet.se>
* nsterm.m (convert_ns_to_X_keysym, keyDown:): Add NSNumericPadKeyMask
to keypad keys (Bug#12816).
2012-11-06 Paul Eggert <eggert@cs.ucla.edu>
 
Minor adjustments of recently-changed frame functions.
......
......@@ -145,22 +145,22 @@ Updated by Christian Limpach (chris@nice.ch)
NSNewlineCharacter, 0x0D,
NSEnterCharacter, 0x8D,
0x41, 0xAE, /* KP_Decimal */
0x43, 0xAA, /* KP_Multiply */
0x45, 0xAB, /* KP_Add */
0x4B, 0xAF, /* KP_Divide */
0x4E, 0xAD, /* KP_Subtract */
0x51, 0xBD, /* KP_Equal */
0x52, 0xB0, /* KP_0 */
0x53, 0xB1, /* KP_1 */
0x54, 0xB2, /* KP_2 */
0x55, 0xB3, /* KP_3 */
0x56, 0xB4, /* KP_4 */
0x57, 0xB5, /* KP_5 */
0x58, 0xB6, /* KP_6 */
0x59, 0xB7, /* KP_7 */
0x5B, 0xB8, /* KP_8 */
0x5C, 0xB9, /* KP_9 */
0x41|NSNumericPadKeyMask, 0xAE, /* KP_Decimal */
0x43|NSNumericPadKeyMask, 0xAA, /* KP_Multiply */
0x45|NSNumericPadKeyMask, 0xAB, /* KP_Add */
0x4B|NSNumericPadKeyMask, 0xAF, /* KP_Divide */
0x4E|NSNumericPadKeyMask, 0xAD, /* KP_Subtract */
0x51|NSNumericPadKeyMask, 0xBD, /* KP_Equal */
0x52|NSNumericPadKeyMask, 0xB0, /* KP_0 */
0x53|NSNumericPadKeyMask, 0xB1, /* KP_1 */
0x54|NSNumericPadKeyMask, 0xB2, /* KP_2 */
0x55|NSNumericPadKeyMask, 0xB3, /* KP_3 */
0x56|NSNumericPadKeyMask, 0xB4, /* KP_4 */
0x57|NSNumericPadKeyMask, 0xB5, /* KP_5 */
0x58|NSNumericPadKeyMask, 0xB6, /* KP_6 */
0x59|NSNumericPadKeyMask, 0xB7, /* KP_7 */
0x5B|NSNumericPadKeyMask, 0xB8, /* KP_8 */
0x5C|NSNumericPadKeyMask, 0xB9, /* KP_9 */
0x1B, 0x1B /* escape */
};
......@@ -4829,7 +4829,7 @@ most recently updated (I guess), which is not the correct one. */
/* is it a "function key"? */
fnKeysym = (code < 0x00ff && (flags&NSNumericPadKeyMask))
? ns_convert_key ([theEvent keyCode])
? ns_convert_key ([theEvent keyCode] | NSNumericPadKeyMask)
: ns_convert_key (code);
if (fnKeysym)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment