From 331a21d0bd85faaf461fc4ac3cfe32df854c5cb5 Mon Sep 17 00:00:00 2001 From: Bjorn Winckler Date: Sat, 25 Oct 2008 16:34:16 +0200 Subject: [PATCH] Revert "Modifier key sends Esc" related commits This reverts the following three commits: 3ae360ddb38dd49e9392aad7a70f0f31a30849ee 007bb96eb3ec035169510caa4e206ab901e4b6d0 b6c06f31be1e8124ed12cc2ff5361752df1e4634 --- runtime/doc/gui_mac.txt | 26 ----- .../English.lproj/Preferences.nib/classes.nib | 2 - .../English.lproj/Preferences.nib/info.nib | 2 +- .../Preferences.nib/keyedobjects.nib | Bin 35563 -> 33356 bytes src/MacVim/MMAppController.m | 4 - src/MacVim/MMApplication.h | 9 -- src/MacVim/MMApplication.m | 107 +----------------- src/MacVim/Miscellaneous.h | 11 -- src/MacVim/Miscellaneous.m | 3 - 9 files changed, 2 insertions(+), 162 deletions(-) diff --git a/runtime/doc/gui_mac.txt b/runtime/doc/gui_mac.txt index f79de5505b..573ce83aaa 100644 --- a/runtime/doc/gui_mac.txt +++ b/runtime/doc/gui_mac.txt @@ -242,8 +242,6 @@ Here is a list of relevant dictionary entries: KEY VALUE ~ MMCellWidthMultiplier width of a normal glyph in em units [float] MMDialogsTrackPwd open/save dialogs track the Vim pwd [bool] -MMFakeEscTimeout timeout for modifier to count as Esc [float] -MMFakeEscOnKeyDown send Esc when modifier is pressed [bool] MMLoginShellArgument login shell parameter [string] MMLoginShellCommand which shell to use to launch Vim [string] MMNoFontSubstitution disable automatic font substitution [bool] @@ -285,30 +283,6 @@ user default MMLoginShellArgument (e.g. to "-l"). Finally, if the "bash" shell is used, then "-l" is automatically added as an argument. To override this behaviour set MMLoginShellArgument to "--". - *macvim-esc* -MacVim can treat a modifier key as Esc in order to avoid having to reach for -the Esc key all the time. The actual modifier key to treat as Esc can be -selected in the preferences (only the left modifier key is affected on -keyboards which have a left and a right modifier key). This is most useful if -Caps Lock has also been remapped to the chosen modifier since it is then -possible to use Caps Lock (which is very easy to reach) to go to normal mode -instead of using Esc (which is somewhat harder to reach). Caps Lock can be -remapped in the "Keyboard & Mouse" System Preference by clicking on the -"Modifier Keys..." button. - -This feature works by swapping the modifier key release event for an Esc key -press event, so the Esc is only sent when the modifier is released. Also, if -the modifier is not released quickly enough no Esc event is sent. This way it -is possible to keep using the modifier key as a modifier (by holding the key -down and pressing another key) as well as using it as Esc (by quickly pressing -the key). It is possible to make MacVim send Esc when the modifier is pressed -(which makes the key feel more responsive) by setting the MMFakeEscOnKeyDown -user default, but then that modifier key can only be used as Esc. The timeout -can also be change by setting the MMFakeEscTimeout user default to the desired -timeout in seconds (e.g. if you want to be able to press the modifier more -slowly but still having it count as Esc, then you could increase the timeout -to 1.0). - ============================================================================== 4. Special colors *macvim-colors* diff --git a/src/MacVim/English.lproj/Preferences.nib/classes.nib b/src/MacVim/English.lproj/Preferences.nib/classes.nib index d163273bc7..fbdbe5193b 100644 --- a/src/MacVim/English.lproj/Preferences.nib/classes.nib +++ b/src/MacVim/English.lproj/Preferences.nib/classes.nib @@ -76,8 +76,6 @@ atsuiButtonClicked id - fakeEscModifierKeyChanged - id loginShellButtonClicked id quickstartButtonClicked diff --git a/src/MacVim/English.lproj/Preferences.nib/info.nib b/src/MacVim/English.lproj/Preferences.nib/info.nib index e5cd30f152..9c4b5d95c6 100644 --- a/src/MacVim/English.lproj/Preferences.nib/info.nib +++ b/src/MacVim/English.lproj/Preferences.nib/info.nib @@ -13,7 +13,7 @@ 115 IBSystem Version - 9F33 + 9E17 targetFramework IBCocoaFramework diff --git a/src/MacVim/English.lproj/Preferences.nib/keyedobjects.nib b/src/MacVim/English.lproj/Preferences.nib/keyedobjects.nib index a21ea9ae9ea2e1b8b949c5da673d6a769b932f13..d6c412543a190d5019c8f2dc4b568065b6bc396b 100644 GIT binary patch delta 14704 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 delta 16891 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 diff --git a/src/MacVim/MMAppController.m b/src/MacVim/MMAppController.m index 3d7fa845ef..3bea328aed 100644 --- a/src/MacVim/MMAppController.m +++ b/src/MacVim/MMAppController.m @@ -185,10 +185,6 @@ fsEventCallback(ConstFSEventStreamRef streamRef, [NSNumber numberWithBool:NO], MMVerticalSplitKey, [NSNumber numberWithInt:0], MMPreloadCacheSizeKey, [NSNumber numberWithInt:0], MMLastWindowClosedBehaviorKey, - [NSNumber numberWithInt:MMDisableFakeEsc], - MMFakeEscModifierKey, - [NSNumber numberWithFloat:0.3], MMFakeEscTimeoutKey, - [NSNumber numberWithBool:NO], MMFakeEscOnKeyDownKey, nil]; [[NSUserDefaults standardUserDefaults] registerDefaults:dict]; diff --git a/src/MacVim/MMApplication.h b/src/MacVim/MMApplication.h index 3c1470d3e6..28937e9745 100644 --- a/src/MacVim/MMApplication.h +++ b/src/MacVim/MMApplication.h @@ -12,15 +12,6 @@ @interface MMApplication : NSApplication { - CFAbsoluteTime fakeEscTimeDown; - CFAbsoluteTime fakeEscTimeout; - int fakeEscKeyCode; - unsigned fakeEscModifierMask; - BOOL blockFakeEscEvent; - BOOL blockKeyDown; - BOOL fakeEscOnKeyDown; } -- (IBAction)fakeEscModifierKeyChanged:(id)sender; - @end diff --git a/src/MacVim/MMApplication.m b/src/MacVim/MMApplication.m index 3bea9b836c..10c69d9d62 100644 --- a/src/MacVim/MMApplication.m +++ b/src/MacVim/MMApplication.m @@ -14,7 +14,6 @@ */ #import "MMApplication.h" -#import "Miscellaneous.h" // Ctrl-Tab is broken on pre 10.5, so we add a hack to make it work. #if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_4 @@ -27,88 +26,11 @@ @implementation MMApplication -- (void)awakeFromNib -{ - [self fakeEscModifierKeyChanged:nil]; -} - - (void)sendEvent:(NSEvent *)event { NSEventType type = [event type]; unsigned flags = [event modifierFlags]; - // The following hack allows the user to set one modifier key of choice - // (Ctrl, Alt, or Cmd) to generate an Esc key press event. In order for - // the key to still be used as a modifier we only send the "faked" Esc - // event if the modifier was pressed and released without any other keys - // being pressed in between. The user may elect to have the chosen - // modifier sending Esc on key down, since sending it on key up makes it - // appear a bit sluggish. However, this effectively disables the modifier - // key (but only the left key and not the right one, in case there are two - // on the keyboard). - // - // This hack is particularly useful in conjunction with Mac OS X's ability - // to turn Caps-Lock into a modifier key of choice because it enables us to - // turn Caps-Lock into a quasi-Esc key! (This remapping be done inside - // "System Preferences -> Keyboard & Mouse -> Modifier Keys...".) - // - if (fakeEscKeyCode != 0) { - if (NSFlagsChanged == type && [event keyCode] == fakeEscKeyCode) { - BOOL sendEsc = NO; - CFAbsoluteTime timeNow = CFAbsoluteTimeGetCurrent(); - - if ((flags & fakeEscModifierMask) == 0) { - // The chosen modifier was released. If the modifier was - // recently pressed then convert this event to a "fake" Esc key - // press event. - if (!blockFakeEscEvent && !fakeEscOnKeyDown && - timeNow - fakeEscTimeDown < fakeEscTimeout) - sendEsc = YES; - - blockFakeEscEvent = YES; - blockKeyDown = NO; - } else { - // The chosen modifier was pressed. - blockFakeEscEvent = NO; - fakeEscTimeDown = timeNow; - - if (fakeEscOnKeyDown) { - sendEsc = YES; - - // Block key down while the fake Esc modifier key is held, - // otherwise "marked text" may pop up if a key is pressed - // while the fake Esc modifier is held (which looks ugly, - // but is harmless). - blockKeyDown = YES; - } - } - - if (sendEsc) { - NSEvent *e = [NSEvent keyEventWithType:NSKeyDown - location:[event locationInWindow] - modifierFlags:flags & 0x0000ffffU - timestamp:[event timestamp] - windowNumber:[event windowNumber] - context:[event context] - characters:@"\x1b" // Esc - charactersIgnoringModifiers:@"\x1b" - isARepeat:NO - keyCode:53]; - - [self postEvent:e atStart:YES]; - return; - } - } else if (type != NSKeyUp) { - // Another event occurred, so don't send any fake Esc events now - // (else the modifier would not function as a modifier key any - // more). - blockFakeEscEvent = YES; - } - - if (blockKeyDown && type == NSKeyDown) - return; - } - #ifdef MM_CTRL_TAB_HACK NSResponder *firstResponder = [[self keyWindow] firstResponder]; @@ -129,7 +51,7 @@ // key event. if ((NSKeyDown == type || NSKeyUp == type) && (flags & NSHelpKeyMask)) { flags &= ~NSHelpKeyMask; - NSEvent *e = [NSEvent keyEventWithType:[event type] + event = [NSEvent keyEventWithType:[event type] location:[event locationInWindow] modifierFlags:flags timestamp:[event timestamp] @@ -139,9 +61,6 @@ charactersIgnoringModifiers:[event charactersIgnoringModifiers] isARepeat:[event isARepeat] keyCode:[event keyCode]]; - - [self postEvent:e atStart:YES]; - return; } [super sendEvent:event]; @@ -164,28 +83,4 @@ nil]]; } -- (IBAction)fakeEscModifierKeyChanged:(id)sender -{ - NSUserDefaults *ud = [NSUserDefaults standardUserDefaults]; - switch ([ud integerForKey:MMFakeEscModifierKey]) { - case MMCtrlFakeEsc: - fakeEscKeyCode = 59; - fakeEscModifierMask = NSControlKeyMask; - break; - case MMAltFakeEsc: - fakeEscKeyCode = 58; - fakeEscModifierMask = NSAlternateKeyMask; - break; - case MMCmdFakeEsc: - fakeEscKeyCode = 55; - fakeEscModifierMask = NSCommandKeyMask; - break; - default: - fakeEscKeyCode = fakeEscModifierMask = 0; - } - - fakeEscTimeout = [ud floatForKey:MMFakeEscTimeoutKey]; - fakeEscOnKeyDown = [ud boolForKey:MMFakeEscOnKeyDownKey]; -} - @end diff --git a/src/MacVim/Miscellaneous.h b/src/MacVim/Miscellaneous.h index ce4a02b55f..23c3ebe206 100644 --- a/src/MacVim/Miscellaneous.h +++ b/src/MacVim/Miscellaneous.h @@ -53,9 +53,6 @@ extern NSString *MMOpenLayoutKey; extern NSString *MMVerticalSplitKey; extern NSString *MMPreloadCacheSizeKey; extern NSString *MMLastWindowClosedBehaviorKey; -extern NSString *MMFakeEscModifierKey; -extern NSString *MMFakeEscTimeoutKey; -extern NSString *MMFakeEscOnKeyDownKey; // Enum for MMUntitledWindowKey @@ -82,14 +79,6 @@ enum { MMTerminateWhenLastWindowClosed = 2, }; -// Enum for MMFakeEscModifierKey -enum { - MMDisableFakeEsc = 0, - MMCtrlFakeEsc = 1, - MMAltFakeEsc = 2, - MMCmdFakeEsc = 3 -}; - diff --git a/src/MacVim/Miscellaneous.m b/src/MacVim/Miscellaneous.m index f36050357a..15259d48d7 100644 --- a/src/MacVim/Miscellaneous.m +++ b/src/MacVim/Miscellaneous.m @@ -44,9 +44,6 @@ NSString *MMOpenLayoutKey = @"MMOpenLayout"; NSString *MMVerticalSplitKey = @"MMVerticalSplit"; NSString *MMPreloadCacheSizeKey = @"MMPreloadCacheSize"; NSString *MMLastWindowClosedBehaviorKey = @"MMLastWindowClosedBehavior"; -NSString *MMFakeEscModifierKey = @"MMFakeEscModifier"; -NSString *MMFakeEscTimeoutKey = @"MMFakeEscTimeout"; -NSString *MMFakeEscOnKeyDownKey = @"MMFakeEscOnKeyDown";