From: Ian Jackson <iwj@mariner.uk.xensource.com>
Date: Wed, 28 May 2008 14:41:47 +0000 (+0100)
Subject: keyfooIsThing => keyfoo_is_thing - upstream naming conventions
X-Git-Tag: xen-3.3.0-rc1~171
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=2dc6d264379ee79c6f804404873b70565a210584;p=qemu-xen-3.4-testing.git

keyfooIsThing => keyfoo_is_thing - upstream naming conventions
---

diff --git a/vnc.c b/vnc.c
index b3b31c60..2333dfed 100644
--- a/vnc.c
+++ b/vnc.c
@@ -1320,7 +1320,7 @@ static void do_key_event(VncState *vs, int down, uint32_t sym)
             shift = 1;
         }
         else {
-            shift = keysymIsShift(vs->kbd_layout, sym & 0xFFFF);
+            shift = keysym_is_shift(vs->kbd_layout, sym & 0xFFFF);
         }
     }
     shift_keys = vs->modifiers_state[0x2a] | vs->modifiers_state[0x36];
@@ -1370,13 +1370,13 @@ static void do_key_event(VncState *vs, int down, uint32_t sym)
 	return;
     }
 
-    keypad = keycodeIsKeypad(vs->kbd_layout, keycode);
+    keypad = keycode_is_keypad(vs->kbd_layout, keycode);
     if (keypad) {
         /* If the numlock state needs to change then simulate an additional
            keypress before sending this one.  This will happen if the user
            toggles numlock away from the VNC window.
         */
-        if (keysymIsNumlock(vs->kbd_layout, sym & 0xFFFF)) {
+        if (keysym_is_numlock(vs->kbd_layout, sym & 0xFFFF)) {
 	    if (!vs->modifiers_state[0x45]) {
 		vs->modifiers_state[0x45] = 1;
 		press_key(vs, 0xff7f);
@@ -1398,7 +1398,7 @@ static void do_key_event(VncState *vs, int down, uint32_t sym)
             return;
         }
         else if (!shift && shift_keys && !keypad &&
-                 keycodeIsShiftable(vs->kbd_layout, keycode)) {
+                 keycode_is_shiftable(vs->kbd_layout, keycode)) {
             press_key_shift_up(vs, down, keycode);
             return;
         }