Author: fredkiefer
Date: Sun Aug 23 00:09:01 2015
New Revision: 38918
URL: http://svn.gna.org/viewcvs/gnustep?rev=38918&view=rev
Log:
* Source/NSInputManager.m: Add binding processing code for
escape key and make list of bindings easier to extend.
* KeyBindings/DefaultKeyBindings.dict: Add default escape key
binding to complete: method.
Patch by Marcian Lytwyn <[email protected]>.
* Source/NSInputManager.m: Fixed alt behaviors for return
Patch by Paul Landers <[email protected]>.
Modified:
libs/gui/trunk/ChangeLog
libs/gui/trunk/KeyBindings/DefaultKeyBindings.dict
libs/gui/trunk/Source/NSInputManager.m
Modified: libs/gui/trunk/ChangeLog
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/trunk/ChangeLog?rev=38918&r1=38917&r2=38918&view=diff
==============================================================================
--- libs/gui/trunk/ChangeLog (original)
+++ libs/gui/trunk/ChangeLog Sun Aug 23 00:09:01 2015
@@ -1,3 +1,13 @@
+2015-08-23 Fred Kiefer <[email protected]>
+
+ * Source/NSInputManager.m: Add binding processing code for escape
+ key and make list of bindings easier to extend.
+ * KeyBindings/DefaultKeyBindings.dict: Add default escape key
+ binding to complete: method.
+ Patch by Marcian Lytwyn <[email protected]>.
+ * Source/NSInputManager.m: Fixed alt behaviors for return
+ Patch by Paul Landers <[email protected]>.
+
2015-08-21 Fred Kiefer <[email protected]>
* Source/NSMatrix.m: Remove GC ifdefs.
Modified: libs/gui/trunk/KeyBindings/DefaultKeyBindings.dict
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/trunk/KeyBindings/DefaultKeyBindings.dict?rev=38918&r1=38917&r2=38918&view=diff
==============================================================================
--- libs/gui/trunk/KeyBindings/DefaultKeyBindings.dict (original)
+++ libs/gui/trunk/KeyBindings/DefaultKeyBindings.dict Sun Aug 23 00:09:01 2015
@@ -1,4 +1,6 @@
{ /* -*-c-*- */
+ /* Auto-Completion key */
+ "Escape" = "complete:";
/* Function keys */
"UpArrow" = "moveUp:";
Modified: libs/gui/trunk/Source/NSInputManager.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/trunk/Source/NSInputManager.m?rev=38918&r1=38917&r2=38918&view=diff
==============================================================================
--- libs/gui/trunk/Source/NSInputManager.m (original)
+++ libs/gui/trunk/Source/NSInputManager.m Sun Aug 23 00:09:01 2015
@@ -39,14 +39,13 @@
/* A table mapping character names to characters, used to interpret
the character names found in KeyBindings dictionaries. */
-#define CHARACTER_TABLE_SIZE 78
static struct
{
NSString *name;
unichar character;
}
-character_table[CHARACTER_TABLE_SIZE] =
+character_table[] =
{
/* Function keys. */
{ @"UpArrow", NSUpArrowFunctionKey },
@@ -129,8 +128,11 @@
{ @"Tab", NSTabCharacter },
{ @"Enter", NSEnterCharacter },
{ @"FormFeed", NSFormFeedCharacter },
- { @"CarriageReturn", NSCarriageReturnCharacter }
+ { @"CarriageReturn", NSCarriageReturnCharacter },
+ { @"Escape", 0x1b }
};
+
+static int CHARACTER_TABLE_SIZE = (sizeof(character_table) /
sizeof(character_table[0]));
static NSInputManager *currentInputManager = nil;
@@ -674,7 +676,14 @@
case NSEnterCharacter:
case NSFormFeedCharacter:
case NSCarriageReturnCharacter:
- [self doCommandBySelector: @selector (insertNewline:)];
+ if (flags & NSAlternateKeyMask)
+ {
+ [self doCommandBySelector: @selector
(insertNewlineIgnoringFieldEditor:)];
+ }
+ else
+ {
+ [self doCommandBySelector: @selector (insertNewline:)];
+ }
break;
case NSHelpFunctionKey:
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
