Convert keysym to keycode for modifiers

chrome/browser/automation/ui_controls_aurax11.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 "chrome/browser/automation/ui_controls.h"
 
 #include <X11/keysym.h>
 #include <X11/Xlib.h>
 
 // X macro fail.
@@ skipping 72 matching lines @@
                   ui::KeyboardCode key,
                   bool control,
                   bool shift,
                   bool alt,
                   bool command) {
   DCHECK(!command);  // No command key on Aura
   return SendKeyPressNotifyWhenDone(
       window, key, control, shift, alt, command, base::Closure());
 }
 
-void SetMaskAndKeycodeThenSend(XEvent* xevent,
-                               unsigned int mask,
-                               unsigned int keycode) {
+void SetKeycodeAndSendThenMask(XEvent* xevent,
+                               KeySym keysym,
+                               unsigned int mask) {
+  xevent->xkey.keycode =
+      XKeysymToKeycode(base::MessagePumpX::GetDefaultXDisplay(),
+                       keysym);
+  aura::RootWindow::GetInstance()->PostNativeEvent(xevent);
   xevent->xkey.state |= mask;
-  xevent->xkey.keycode = keycode;
+}
+
+void UnmaskAndSetKeycodeThenSend(XEvent* xevent,
+                                 unsigned int mask,
+                                 KeySym keysym) {
+  xevent->xkey.state ^= mask;
+  xevent->xkey.keycode =
+      XKeysymToKeycode(base::MessagePumpX::GetDefaultXDisplay(),
+                       keysym);
   aura::RootWindow::GetInstance()->PostNativeEvent(xevent);
 }
 
-void SetKeycodeAndSendThenUnmask(XEvent* xevent,
-                                 unsigned int mask,
-                                 unsigned int keycode) {
-  xevent->xkey.keycode = keycode;
-  aura::RootWindow::GetInstance()->PostNativeEvent(xevent);
-  xevent->xkey.state ^= mask;
-}
-
 bool SendKeyPressNotifyWhenDone(gfx::NativeWindow window,
                                 ui::KeyboardCode key,
                                 bool control,
                                 bool shift,
                                 bool alt,
                                 bool command,
                                 const base::Closure& closure) {
   DCHECK(!command);  // No command key on Aura
   XEvent xevent = {0};
   xevent.xkey.type = KeyPress;
   if (control)
-    SetMaskAndKeycodeThenSend(&xevent, ControlMask, XK_Control_L);
+    SetKeycodeAndSendThenMask(&xevent, XK_Control_L, ControlMask);
   if (shift)
-    SetMaskAndKeycodeThenSend(&xevent, ShiftMask, XK_Shift_L);
+    SetKeycodeAndSendThenMask(&xevent, XK_Shift_L, ShiftMask);
   if (alt)
-    SetMaskAndKeycodeThenSend(&xevent, Mod1Mask, XK_Alt_L);
+    SetKeycodeAndSendThenMask(&xevent, XK_Alt_L, Mod1Mask);
   xevent.xkey.keycode =
       XKeysymToKeycode(base::MessagePumpX::GetDefaultXDisplay(),
                        ui::XKeysymForWindowsKeyCode(key, shift));
   aura::RootWindow::GetInstance()->PostNativeEvent(&xevent);
 
   // Send key release events.
   xevent.xkey.type = KeyRelease;
   aura::RootWindow::GetInstance()->PostNativeEvent(&xevent);
   if (alt)
-    SetKeycodeAndSendThenUnmask(&xevent, Mod1Mask, XK_Alt_L);
+    UnmaskAndSetKeycodeThenSend(&xevent, Mod1Mask, XK_Alt_L);
   if (shift)
-    SetKeycodeAndSendThenUnmask(&xevent, ShiftMask, XK_Shift_L);
+    UnmaskAndSetKeycodeThenSend(&xevent, ShiftMask, XK_Shift_L);
   if (control)
-    SetKeycodeAndSendThenUnmask(&xevent, ControlMask, XK_Control_L);
+    UnmaskAndSetKeycodeThenSend(&xevent, ControlMask, XK_Control_L);
   DCHECK(!xevent.xkey.state);
   RunClosureAfterAllPendingUIEvents(closure);
   return true;
 }
 
 bool SendMouseMove(long x, long y) {
   return SendMouseMoveNotifyWhenDone(x, y, base::Closure());
 }
 
 bool SendMouseMoveNotifyWhenDone(long x, long y, const base::Closure& closure) {
@@ skipping 76 matching lines @@
     marker_event->xclient.display = NULL;
     marker_event->xclient.window = None;
     marker_event->xclient.format = 8;
   }
   marker_event->xclient.message_type = MarkerEventAtom();
   aura::RootWindow::GetInstance()->PostNativeEvent(marker_event);
   new EventWaiter(closure, &Matcher);
 }
 
 }  // namespace ui_controls