Issue WARN instead of FIXME when there are mismatches between hard coded and real keyboard layouts

Dmitry Timoshkov dmitry at baikal.ru
Tue Feb 3 07:39:57 CST 2004


Hello,

I believe that x11drv keyboard driver is in a quite good shape now,
and emitting FIXME about a keyboard layout mismatch is almost always
useless and leads to a lot of confusion.

Changelog:
    Dmitry Timoshkov <dmitry at codeweavers.com>
    Issue WARN instead of FIXME when there are mismatches between
    hard coded and real keyboard layouts.

--- cvs/hq/wine/dlls/x11drv/keyboard.c	2004-01-27 15:31:29.000000000 +0800
+++ wine/dlls/x11drv/keyboard.c	2004-02-03 15:46:41.000000000 +0800
@@ -1305,15 +1305,9 @@ X11DRV_KEYBOARD_DetectLayout (void)
     }
   }
   /* we're done, report results if necessary */
-  if (!ismatch) {
-    FIXME(
-	   "Your keyboard layout was not found!\n"
-	   "Using closest match instead (%s) for scancode mapping.\n"
-	   "Please define your layout in dlls/x11drv/keyboard.c and submit them\n"
-	   "to us for inclusion into future Wine releases.\n"
-	   "See the Wine User Guide, chapter \"Keyboard\" for more information.\n",
-	   main_key_tab[kbd_layout].comment);
-  }
+  if (!ismatch)
+    WARN("Using closest match (%s) for scan/virtual codes mapping.\n",
+        main_key_tab[kbd_layout].comment);
 
   TRACE("detected layout is \"%s\"\n", main_key_tab[kbd_layout].comment);
 }






More information about the wine-patches mailing list