From 428d1b4412fd0df8f021699f8ca16f2f1de89848 Mon Sep 17 00:00:00 2001 From: Bjorn Winckler Date: Sun, 8 Jun 2008 16:35:43 +0200 Subject: [PATCH] Window cycling hardcoded to keycode 50 Window cycling is hardcoded to happen when the Cmd key is pressed with the key whose keycode = 50. Having window cycling in the "Window" menu means that window cycling stops working when the keyboard layout is changed. Thus revert back to the old way of dealing with this since it seems to work better. --- .../MainMenu.nib/keyedobjects.nib | Bin 11124 -> 10859 bytes src/MacVim/MMAtsuiTextView.m | 6 ++++++ src/MacVim/MMTextView.m | 6 ++++++ src/MacVim/gvimrc | 4 ---- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/MacVim/English.lproj/MainMenu.nib/keyedobjects.nib b/src/MacVim/English.lproj/MainMenu.nib/keyedobjects.nib index 61f27a69dd8edc655371f10618135f7f0bd56871..8864a9f6c40391c951d45a32acfb62881d6e8215 100644 GIT binary patch literal 10859 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 literal 11124 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 diff --git a/src/MacVim/MMAtsuiTextView.m b/src/MacVim/MMAtsuiTextView.m index 7990b63da1..c2eaa9c45f 100644 --- a/src/MacVim/MMAtsuiTextView.m +++ b/src/MacVim/MMAtsuiTextView.m @@ -406,6 +406,12 @@ enum { && !(116 == [event keyCode] || 121 == [event keyCode])) return NO; + // HACK! KeyCode 50 represent the key which switches between windows + // within an application (like Cmd+Tab is used to switch between + // applications). Return NO here, else the window switching does not work. + if ([event keyCode] == 50) + return NO; + // HACK! Let the main menu try to handle any key down event, before // passing it on to vim, otherwise key equivalents for menus will // effectively be disabled. diff --git a/src/MacVim/MMTextView.m b/src/MacVim/MMTextView.m index 22554ced0a..80ccbdfabc 100644 --- a/src/MacVim/MMTextView.m +++ b/src/MacVim/MMTextView.m @@ -640,6 +640,12 @@ enum { && !(116 == [event keyCode] || 121 == [event keyCode])) return NO; + // HACK! KeyCode 50 represent the key which switches between windows + // within an application (like Cmd+Tab is used to switch between + // applications). Return NO here, else the window switching does not work. + if ([event keyCode] == 50) + return NO; + // HACK! Let the main menu try to handle any key down event, before // passing it on to vim, otherwise key equivalents for menus will // effectively be disabled. diff --git a/src/MacVim/gvimrc b/src/MacVim/gvimrc index 1c39d71d3e..a735ff310f 100644 --- a/src/MacVim/gvimrc +++ b/src/MacVim/gvimrc @@ -83,8 +83,6 @@ an 9900.301 Window.Minimize\ All an 9900.310 Window.Zoom an 9900.311 Window.Zoom\ All an 9900.320 Window.Toggle\ Full\ Screen\ Mode :set invfullscreen -an 9900.325 Window.Cycle\ Through\ Windows -an 9900.326 Window.Cycle\ Backwards\ Through\ Windows an 9900.330 Window.-SEP1- " TODO! Grey out if no tabs are visible. an 9900.340 Window.Previous\ Tab :tabprevious @@ -244,8 +242,6 @@ macm Window.Minimize\ All key= action=miniaturizeAll: alt=YES macm Window.Zoom key= action=performZoom: macm Window.Zoom\ All key= action=zoomAll: alt=YES macm Window.Toggle\ Full\ Screen\ Mode key= -macm Window.Cycle\ Through\ Windows key= action=_cycleWindows: -macm Window.Cycle\ Backwards\ Through\ Windows key= action=_cycleWindowsBackwards: alt=YES macm Window.Previous\ Tab key= macm Window.Next\ Tab key= macm Window.Bring\ All\ To\ Front action=arrangeInFront: