Consolidate two very similar functions; ui::WindowsKeyCodeForGdkKeyCode and ui::KeyboardCodeFromXKey

ui/base/keycodes/keyboard_code_conversion_x.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/base/keycodes/keyboard_code_conversion_x.h"
 
+#define XK_3270  // for XK_3270_BackTab

[sadrul, 2011/12/05 16:00:28]

This ... looks weird. Why is this necessary? Is this how this is usually done?
Or is a better way of doing this is to add the define in the compile flags?

[Yusuke Sato, 2011/12/06 04:30:39]

The Xlib reference manual says "This file declares all standard KeySym values,
which are symbols with the prefix "XK_". The KeySyms are arranged in groups, and
a preprocessor symbol controls inclusion of each group. The preprocessor symbol
must be defined prior to inclusion of the file to obtain the associated values.
The preprocessor symbols are XK_MISCELLANY, XK_XKB_KEYS, XK_3270, XK_LATIN1,
XK_LATIN2, XK_LATIN3, XK_LATIN4, XK_KATAKANA, XK_ARABIC, XK_CYRILLIC, XK_GREEK,
XK_TECHNICAL, XK_SPECIAL, XK_PUBLISHING, XK_APL, XK_HEBREW, XK_THAI, and
XK_KOREAN."  So I believe adding #define here is fine.

http://www.x.org/releases/X11R7.6/doc/libX11/specs/libX11/libX11.html#Standar...

 #include <X11/keysym.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 
 namespace ui {
 
 // Get an ui::KeyboardCode from an X keyevent
 KeyboardCode KeyboardCodeFromXKeyEvent(XEvent* xev) {
   // XLookupKeysym does not take into consideration the state of the lock/shift
   // etc. keys. So it is necessary to use XLookupString instead.
   KeySym keysym;
   XLookupString(&xev->xkey, NULL, 0, &keysym, NULL);
   KeyboardCode keycode = KeyboardCodeFromXKeysym(keysym);
   if (keycode == VKEY_UNKNOWN) {
     keysym = DefaultXKeysymFromHardwareKeycode(xev->xkey.keycode);
     keycode = KeyboardCodeFromXKeysym(keysym);
   }
 
   return keycode;
 }
 
 KeyboardCode KeyboardCodeFromXKeysym(unsigned int keysym) {
-  // Consult GDK key translation (in WindowsKeyCodeForGdkKeyCode) for details
-  // about the following translations.
-
   // TODO(sad): Have |keysym| go through the X map list?
 
   switch (keysym) {
     case XK_BackSpace:
       return VKEY_BACK;
     case XK_Delete:
     case XK_KP_Delete:
       return VKEY_DELETE;
     case XK_Tab:
     case XK_KP_Tab:
+    case XK_ISO_Left_Tab:
+    case XK_3270_BackTab:
       return VKEY_TAB;
     case XK_Linefeed:
     case XK_Return:
     case XK_KP_Enter:
+    case XK_ISO_Enter:
       return VKEY_RETURN;
     case XK_Clear:
       return VKEY_CLEAR;
     case XK_KP_Space:
     case XK_space:
       return VKEY_SPACE;
     case XK_Home:
     case XK_KP_Home:
       return VKEY_HOME;
     case XK_End:
@@ skipping 12 matching lines @@
     case XK_KP_Right:
       return VKEY_RIGHT;
     case XK_Down:
     case XK_KP_Down:
       return VKEY_DOWN;
     case XK_Up:
     case XK_KP_Up:
       return VKEY_UP;
     case XK_Escape:
       return VKEY_ESCAPE;
+    case XK_Kana_Lock:
+    case XK_Kana_Shift:
+      return VKEY_KANA;
+    case XK_Hangul:
+      return VKEY_HANGUL;
+    case XK_Hangul_Hanja:
+      return VKEY_HANJA;
+    case XK_Kanji:
+      return VKEY_KANJI;
     case XK_A:
     case XK_a:
       return VKEY_A;
     case XK_B:
     case XK_b:
       return VKEY_B;
     case XK_C:
     case XK_c:
       return VKEY_C;
     case XK_D:
@@ skipping 83 matching lines @@
     case XK_KP_2:
     case XK_KP_3:
     case XK_KP_4:
     case XK_KP_5:
     case XK_KP_6:
     case XK_KP_7:
     case XK_KP_8:
     case XK_KP_9:
       return static_cast<KeyboardCode>(VKEY_NUMPAD0 + (keysym - XK_KP_0));
 
+    case XK_parenright:
+      return VKEY_0;
+    case XK_exclam:
+      return VKEY_1;
+    case XK_at:
+      return VKEY_2;
+    case XK_numbersign:
+      return VKEY_3;
+    case XK_dollar:
+      return VKEY_4;
+    case XK_percent:
+      return VKEY_5;
+    case XK_asciicircum:
+      return VKEY_6;
+    case XK_ampersand:
+      return VKEY_7;
+    case XK_asterisk:
+      return VKEY_8;
+    case XK_parenleft:
+      return VKEY_9;
+
     case XK_multiply:
     case XK_KP_Multiply:
       return VKEY_MULTIPLY;
     case XK_KP_Add:
       return VKEY_ADD;
     case XK_KP_Separator:
       return VKEY_SEPARATOR;
     case XK_KP_Subtract:
       return VKEY_SUBTRACT;
     case XK_KP_Decimal:
@@ skipping 398 matching lines @@
     case VKEY_F23:
     case VKEY_F24:
       return XK_F1 + (keycode - VKEY_F1);
 
     default:
       return 0;
     }
 }
 
 }  // namespace ui