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

* nsterm.m (keyDown): If ns_right_alternate_modifier is Qleft, check

if ns_alternate_modifier is none.
parent c310ff4f
2011-01-21 Jan Djärv <jan.h.d@swipnet.se>
* nsterm.m (keyDown): If ns_right_alternate_modifier is Qleft, check
if ns_alternate_modifier is none.
2011-01-20 Jan Djärv <jan.h.d@swipnet.se> 2011-01-20 Jan Djärv <jan.h.d@swipnet.se>
   
* unexmacosx.c: Add comment about include order. * unexmacosx.c: Add comment about include order.
...@@ -4388,6 +4388,7 @@ - (void)keyDown: (NSEvent *)theEvent ...@@ -4388,6 +4388,7 @@ - (void)keyDown: (NSEvent *)theEvent
int flags; int flags;
static NSMutableArray *nsEvArray; static NSMutableArray *nsEvArray;
static BOOL firstTime = YES; static BOOL firstTime = YES;
int left_is_none;
NSTRACE (keyDown); NSTRACE (keyDown);
...@@ -4511,10 +4512,14 @@ most recently updated (I guess), which is not the correct one. */ ...@@ -4511,10 +4512,14 @@ most recently updated (I guess), which is not the correct one. */
emacs_event->modifiers |= emacs_event->modifiers |=
parse_solitary_modifier (ns_function_modifier); parse_solitary_modifier (ns_function_modifier);
left_is_none = NILP (ns_alternate_modifier)
|| EQ (ns_alternate_modifier, Qnone);
if ((flags & NSRightAlternateKeyMask) == NSRightAlternateKeyMask) if ((flags & NSRightAlternateKeyMask) == NSRightAlternateKeyMask)
{ {
if ((NILP (ns_right_alternate_modifier) if ((NILP (ns_right_alternate_modifier)
|| EQ (ns_right_alternate_modifier, Qnone)) || EQ (ns_right_alternate_modifier, Qnone)
|| (EQ (ns_right_alternate_modifier, Qleft) && left_is_none))
&& !fnKeysym) && !fnKeysym)
{ /* accept pre-interp alt comb */ { /* accept pre-interp alt comb */
if ([[theEvent characters] length] > 0) if ([[theEvent characters] length] > 0)
...@@ -4532,9 +4537,7 @@ most recently updated (I guess), which is not the correct one. */ ...@@ -4532,9 +4537,7 @@ most recently updated (I guess), which is not the correct one. */
if ((flags & NSLeftAlternateKeyMask) == NSLeftAlternateKeyMask) /* default = meta */ if ((flags & NSLeftAlternateKeyMask) == NSLeftAlternateKeyMask) /* default = meta */
{ {
if ((NILP (ns_alternate_modifier) if (left_is_none && !fnKeysym)
|| EQ (ns_alternate_modifier, Qnone))
&& !fnKeysym)
{ /* accept pre-interp alt comb */ { /* accept pre-interp alt comb */
if ([[theEvent characters] length] > 0) if ([[theEvent characters] length] > 0)
code = [[theEvent characters] characterAtIndex: 0]; code = [[theEvent characters] characterAtIndex: 0];
......
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