Changeset 13335 in vbox for trunk/src/VBox/Frontends/VirtualBox4

Timestamp:

Oct 16, 2008 11:43:16 AM (17 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

38022

Message:

two warnings

File:

• trunk/src/VBox/Frontends/VirtualBox4/src/X11/keyboard-new.c (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox4/src/X11/keyboard-new.c

@@ -144 +144 @@
  */
 static int
-X11DRV_KEYBOARD_DetectLayout (Display *display, int min_keycode,
-                              int max_keycode)
+X11DRV_KEYBOARD_DetectLayout (Display *display, KeyCode min_keycode,
+                              KeyCode max_keycode)
 {
   /** Counter variable for iterating through the keyboard layout tables. */
@@ -159 +159 @@
   char ckey[256][2];
   /** Counter variable representing a keycode */
-  unsigned keyc;
+  KeyCode keyc;
 
   /* Fill in our keycode to keysym mapping table. */
@@ -309 +309 @@
     XDisplayKeycodes(display, &min_keycode, &max_keycode);
 
+    /* according to the space this function is guaranteed to never return
+     * values for min_keycode < 8 and values for max_keycode > 255 */
+    if (min_keycode < 0)
+        min_keycode = 0;
+    if (max_keycode > 255)
+        max_keycode = 255;
+
     /* Detect the keyboard layout */
     kbd_layout = X11DRV_KEYBOARD_DetectLayout(display, min_keycode,