[gtk+/gtk-2-24] Revert "gdk: merge all 3.x changes to gdk_keysym_to_unicode_tab[] in gdkkeyuni.c"



commit 0909d7cee613477744a19f2c030564cf5916bd1f
Author: Michael Natterer <mitch gimp org>
Date:   Sat Mar 30 08:42:58 2013 +0100

    Revert "gdk: merge all 3.x changes to gdk_keysym_to_unicode_tab[] in gdkkeyuni.c"
    
    This reverts commit 67438e0e49f83215376c76cc2de979a3134a46ff.
    
    There must be some other change in 3.x that goes along with these
    table changes, they completely break e.g. GtkEntry.

 gdk/gdkkeyuni.c |   32 +++++++-------------------------
 1 files changed, 7 insertions(+), 25 deletions(-)
---
diff --git a/gdk/gdkkeyuni.c b/gdk/gdkkeyuni.c
index c54455f..4282597 100644
--- a/gdk/gdkkeyuni.c
+++ b/gdk/gdkkeyuni.c
@@ -830,29 +830,15 @@ static const struct {
 
   /* Following items added to GTK, not in the xterm table */
 
-  /* A few ASCII control characters */
-#ifndef GDK_WINDOWING_WIN32
-  { 0xFF08 /* Backspace */, '\b' },
-  { 0xFF09 /* Tab       */, '\t'  },
-#endif
-
-  { 0xFF0A /* Linefeed  */, '\n' },
-  { 0xFF0B /* Vert. Tab */, '\v' },
-
-#ifndef GDK_WINDOWING_WIN32
-  { 0xFF0D /* Return    */, '\r' },
-  { 0xFF1B /* Escape    */, '\033' },
-#endif
-
   /* Numeric keypad */
-
-  { 0xFF80 /* Space     */, ' ' },
-  { 0xFFAA /* Multiply  */, '*' },
-  { 0xFFAB /* Add       */, '+' },
+  
+  { 0xFF80 /* Space */, ' ' },
+  { 0xFFAA /* Multiply */, '*' },
+  { 0xFFAB /* Add */, '+' },
   { 0xFFAC /* Separator */, ',' },
-  { 0xFFAD /* Subtract  */, '-' },
-  { 0xFFAE /* Decimal   */, '.' },
-  { 0xFFAF /* Divide    */, '/' },
+  { 0xFFAD /* Subtract */, '-' },
+  { 0xFFAE /* Decimal */, '.' },
+  { 0xFFAF /* Divide */, '/' },
   { 0xFFB0 /* 0 */, '0' },
   { 0xFFB1 /* 1 */, '1' },
   { 0xFFB2 /* 2 */, '2' },
@@ -866,10 +852,6 @@ static const struct {
   { 0xFFBD /* Equal */, '=' },  
 
   /* End numeric keypad */
-
-#ifndef GDK_WINDOWING_WIN32
-  { 0xFFFF /* Delete */, '\177' }
-#endif
 };
 
 /**


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]