Merge pull request #250 from bambu/macmeta

Added macmeta support

doc/nvim_dot_app.txt

@@ -48,6 +48,11 @@ MacShowFontSelector()
     Fonts chosen from the GUI font selector are stored to User Defaults, and
     take effect on startup until overridden by a MacSetFont call.
 
+MacSetOptionAsMeta(value)
+    If value is 1, pressing the option (alt) key will be interpreted as a 
+    meta command. With this set any option hotkeys are bindable as <M-..>.
+    If the value is 0, all option keys are interpreted as normal (the default).
+
 MacSetFontShouldAntialias(value)
     If value is 1, enable font antialiasing (the default). If value is 0,
     disable it. Calling with any other value is undefined behaviour.

res/nvimrc

@@ -95,6 +95,10 @@ function! MacOpenFileInBufferOrNewTab(filename)
     endif
 endfunction
 
+function! MacSetOptionAsMeta(value)
+    call rpcnotify(1, "neovim.app.setOptAsMeta", a:value)
+endfunction
+
 function! MacSetFontShouldAntialias(value)
     call rpcnotify(1, "neovim.app.shouldAntialias", a:value)
 endfunction

src/input.mm

@@ -15,13 +15,16 @@ - (void)keyDown:(NSEvent *)event
     NSTextInputContext *con = [NSTextInputContext currentInputContext];
     [NSCursor setHiddenUntilMouseMoves:YES];
 
-    /* When a deadkey is received on keydown the length is 0. Allow
-       NSTextInputContext to handle the key press */
-    if ([[event characters] length] == 0 || [self hasMarkedText])
+    /* When a deadkey is received the character length is 0. Allow
+       NSTextInputContext to handle the key press only if Macmeta is
+       not turned on */
+    if ([self hasMarkedText]) {
         [con handleEvent:event];
-    else {
+    } else if (!mOptAsMeta && ([[event characters] length] == 0)) {
+        [con handleEvent:event];
+    } else {
         std::stringstream raw;
-        translateKeyEvent(raw, event);
+        translateKeyEvent(raw, event, mOptAsMeta);
         std::string raws = raw.str();
 
         if (raws.size())
@@ -40,7 +43,7 @@ - (BOOL)performKeyEquivalent:(NSEvent *)event
         [self keyDown:event];
         return YES;
     }
-    
+
     return NO;
 }
 

src/keys.h

@@ -2,6 +2,6 @@
 
 @class NSEvent;
 
-void addModifiedName(std::ostream &, NSEvent *, const char *name);
-void translateKeyEvent(std::ostream &, unsigned short keyCode, unsigned flags);
-void translateKeyEvent(std::ostream &, NSEvent *);
+void addModifiedName(std::ostream &, NSEvent *, const char *);
+void translateKeyEvent(std::ostream &, unsigned short, unsigned, BOOL);
+void translateKeyEvent(std::ostream &, NSEvent *, BOOL);

src/keys.mm

@@ -78,7 +78,7 @@ static unsigned cocoaToCarbonModifiers(unsigned mods)
     const UCKeyboardLayout *layout =
         (const UCKeyboardLayout *)CFDataGetBytePtr(layoutData);
 
-    unsigned deadKeyState;
+    unsigned deadKeyState = 0;
     unichar chars[5];
     UniCharCount numChars;
 
@@ -146,7 +146,7 @@ void addModifiedName(std::ostream &os, NSEvent *event, const char *name)
     addModifiedName(os, [event modifierFlags], clickCount, name);
 }
 
-void translateKeyEvent(std::ostream &os, unsigned short keyCode, unsigned flags)
+void translateKeyEvent(std::ostream &os, unsigned short keyCode, unsigned flags, BOOL optAsMeta)
 {
     const char *name = keyName(keyCode);
 
@@ -174,11 +174,11 @@ send them as modifiers (no "S-" or "M-") */
         than sending the alternate character for that key; nobody wants to
         map <C-∆> */
     if (flags & NSAlternateKeyMask)
-    if (flags & (NSCommandKeyMask | NSControlKeyMask)) {
-        chars = stringFromModifiedKey(keyCode, flags & NSShiftKeyMask);
-        sendflags |= NSAlternateKeyMask;
-        flags &= ~NSAlternateKeyMask;
-    }
+        if (flags & (NSCommandKeyMask | NSControlKeyMask) || optAsMeta) {
+            chars = stringFromModifiedKey(keyCode, flags & NSShiftKeyMask);
+            sendflags |= NSAlternateKeyMask;
+            flags &= ~NSAlternateKeyMask;
+        }
 
     /* Vim doesn't distinguish between <C-j> and <C-J>, so let's send the
         S- modifier if:
@@ -214,7 +214,7 @@ send them as modifiers (no "S-" or "M-") */
     }
 }
 
-void translateKeyEvent(std::ostream &os, NSEvent *event)
+void translateKeyEvent(std::ostream &os, NSEvent *event, BOOL optAsMeta)
 {
     unsigned short keyCode = [event keyCode];
 
@@ -227,5 +227,5 @@ void translateKeyEvent(std::ostream &os, NSEvent *event)
         NSCommandKeyMask
     );
 
-    translateKeyEvent(os, keyCode, flags);
+    translateKeyEvent(os, keyCode, flags, optAsMeta);
 }

src/tests/main.mm

@@ -12,7 +12,7 @@
 static void test(unsigned short keyCode, unsigned flags, std::string expected)
 {
     std::stringstream ss;
-    translateKeyEvent(ss, keyCode, flags);
+    translateKeyEvent(ss, keyCode, flags, NO);
     std::string got = ss.str();
     if (got != expected) {
         pass = false;

src/view.h

@@ -35,6 +35,7 @@ class Vim;
     bool mMenuNeedsUpdate;
 
     NSString *mMarkedText;
+    BOOL mOptAsMeta;
 }
 
 - (void)cutText;
@@ -45,6 +46,8 @@ class Vim;
 - (void)setFontProgramatically:(NSFont *)font;
 - (void)setShouldAntialias:(BOOL)shouldAntialias;
 
+- (void)setOptionAsMeta:(BOOL)isEnabled;
+
 - (void)openFile:(NSString *)filename;
 
 - (void)requestResize:(CGSize)cellSize;

src/view.mm

@@ -47,6 +47,8 @@ - (id)initWithFrame:(NSRect)frame vim:(Vim *)vim
         mCursorPos = mCursorDisplayPos = CGPointZero;
         mCursorOn = true;
 
+        mOptAsMeta = NO;
+
         [self registerForDraggedTypes:[NSArray arrayWithObjects: NSFilenamesPboardType, nil]];
     }
 
@@ -202,6 +204,11 @@ - (void)changeFont:(id)sender
     [defaults setFloat:mFont.pointSize forKey:@"fontSize"];
 }
 
+- (void)setOptionAsMeta:(BOOL)isEnabled
+{
+    mOptAsMeta = isEnabled;
+}
+
 - (void)setShouldAntialias:(BOOL)shouldAntialias
 {
     CGContextSetShouldAntialias(mCanvasContext, shouldAntialias);

src/window.mm

@@ -401,14 +401,18 @@ - (void)notified:(const std::string &)note withData:(const msgpack::object &)upd
             mVim->vim_report_error(msg);
         }
     }
-    else if (note ==  "neovim.app.bufchanged") {
+    else if (note == "neovim.app.bufchanged") {
         int isModified = update_o.via.array.ptr[0].convert();
         [self setDocumentEdited:isModified?YES:NO];
     }
-    else if (note ==  "neovim.app.closeTabOrWindow") {
+    else if (note == "neovim.app.closeTabOrWindow") {
         [self closeTabOrWindow];
     }
-    else if (note ==  "neovim.app.shouldAntialias") {
+    else if (note == "neovim.app.setOptAsMeta") {
+        BOOL optAsMeta = update_o.via.array.ptr[0].convert();
+        [mMainView setOptionAsMeta:optAsMeta];
+    }
+    else if (note == "neovim.app.shouldAntialias") {
         BOOL shouldAntialias = update_o.via.array.ptr[0].convert();
         [mMainView setShouldAntialias:shouldAntialias];
     }