Fix Ctrl key regression

Fix Ctrl-h, Ctrl-@ and Ctrl-o regression.  Also remove all key bindings
involving arrays from KeyBinding.dict.
This commit is contained in:
Bjorn Winckler
2009-08-16 01:09:02 +02:00
parent 2e45751630
commit a8da347a13
3 changed files with 10 additions and 9 deletions
+4 -4
View File
@@ -150,11 +150,11 @@
<string>deleteBackward:</string>
<key>^k</key>
<string>deleteToEndOfParagraph:</string>
<key>^l</key>
<key>^l</key>
<string>centerSelectionInVisibleArea:</string>
<key>^n</key>
<string>moveDown:</string>
<key>^o</key>
<!-- <key>^o</key>
<array>
<string>insertNewlineIgnoringFieldEditor:</string>
<string>moveBackward:</string>
@@ -370,7 +370,7 @@
<key>^</key>
<string>moveToBeginningOfLine:</string>
<key>^</key>
<string>moveToEndOfLine:</string>
<string>moveToEndOfLine:</string>
<key>^$</key>
<string>moveToBeginningOfLineAndModifySelection:</string>
<key>^$</key>
@@ -379,7 +379,7 @@
<array>
<string>moveBackward:</string>
<string>moveToBeginningOfParagraph:</string>
</array>
</array>
<key>~</key>
<array>
<string>moveForward:</string>
+2 -1
View File
@@ -1135,7 +1135,8 @@ extern GuiFont gui_mch_retain_font(GuiFont font);
if (1 == len) {
char_u *str = (char_u*)bytes;
if ((str[0] == Ctrl_C && ctrl_c_interrupts) ||
(str[0] == intr_char && intr_char != Ctrl_C)) {
(str[0] == intr_char && intr_char != 0)) {
ASLogDebug(@"Got INT, str[0]=%#x", str[0]);
got_int = TRUE;
[inputQueue removeAllObjects];
return;
+4 -4
View File
@@ -251,7 +251,7 @@ KeyboardInputSourcesEqual(TISInputSourceRef a, TISInputSourceRef b)
@selector(deleteWordBackward:) == sel ||
@selector(deleteBackwardByDecomposingPreviousCharacter:) == sel ||
@selector(deleteToBeginningOfLine:) == sel)
[self doKeyDown:@"\x7f"];
[self doKeyDown:@"\x08"];
else if (@selector(keySpace:) == sel)
[self doKeyDown:@" "];
else if (@selector(cancel:) == sel)
@@ -262,6 +262,8 @@ KeyboardInputSourcesEqual(TISInputSourceRef a, TISInputSourceRef b)
- (BOOL)performKeyEquivalent:(NSEvent *)event
{
ASLogDebug(@"");
if ([event type] != NSKeyDown)
return NO;
// NOTE: Key equivalent handling was fixed in Leopard. That is, an
// unhandled key equivalent is passed to keyDown: -- contrast this with
@@ -294,9 +296,7 @@ KeyboardInputSourcesEqual(TISInputSourceRef a, TISInputSourceRef b)
// HACK! Pass the event on or it may disappear (Tiger does not pass Cmd-key
// events to keyDown:).
if ([event type] == NSKeyDown)
[self keyDown:event];
[self keyDown:event];
return YES;
}