bug#21330: [PATCH] Fix handling Command-Control-<letter> combination under OS X

[Mikhail Gusarov <dottedmag@dottedmag.net>]

[-- Attachment #1: Type: text/plain, Size: 32 bytes --]

Please find the patch attached.

[-- Attachment #2: 0001-Fix-handling-Command-Control-letter-combination-unde.patch --]
[-- Type: application/octet-stream, Size: 1936 bytes --]

From a9d54fbeccba6e467f310a34c63b631b1c7a90d2 Mon Sep 17 00:00:00 2001
From: Mikhail Gusarov <dottedmag@dottedmag.net>
Date: Sun, 23 Aug 2015 18:42:33 +0200
Subject: [PATCH] Fix handling Command-Control-<letter> combination under OS X

Do not use [theEvent characters] for getting key if Command is supplied,
this causes Command-Control-A and similar key combinations to be
interpreted as control characters (^A), which breaks key processing
later on. The code which produces wrong keycode claims to handle Dvorak,
but Dvorak keyboard is handled fine without it.
* src/nsterm.m (keyDown): Disable code consulting input manager, not needed.

Copyright-paperwork-exempt: yes
---
 src/nsterm.m | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/nsterm.m b/src/nsterm.m
index 2806f31..79f97db 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -5385,6 +5385,7 @@ not_in_argv (NSString *arg)
           emacs_event->modifiers |= parse_solitary_modifier
             (ns_command_modifier);
 
+#if 0
           /* if super (default), take input manager's word so things like
              dvorak / qwerty layout work */
           if (EQ (ns_command_modifier, Qsuper)
@@ -5395,7 +5396,6 @@ not_in_argv (NSString *arg)
                  a shift modifier, must convert ourselves */
               if (!(flags & NSShiftKeyMask))
                 code = [[theEvent characters] characterAtIndex: 0];
-#if 0
               /* this is ugly and also requires linking w/Carbon framework
                  (for LMGetKbdType) so for now leave this rare (?) case
                  undealt with.. in future look into CGEvent methods */
@@ -5413,8 +5413,8 @@ not_in_argv (NSString *arg)
                                  &dummy, 1, &dummy, &code);
                   code &= 0xFF;
                 }
-#endif
             }
+#endif
         }
 
       is_right_key = (flags & NSRightControlKeyMask) == NSRightControlKeyMask;
-- 
2.5.0