Module: wine Branch: master Commit: c7ffd04be7e3207843534f00f3803ea484f01174 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7ffd04be7e3207843534f00f3...
Author: Ken Thomases ken@codeweavers.com Date: Fri Nov 17 14:46:58 2006 -0600
winex11.drv: Changed indenting of some dead code.
---
dlls/winex11.drv/keyboard.c | 100 +++++++++++++++++++++--------------------- 1 files changed, 50 insertions(+), 50 deletions(-)
diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 7256edd..dc355a5 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1676,67 +1676,67 @@ void X11DRV_InitKeyboard(void) #if 0 /* this breaks VK_OEM_x VKeys in some layout tables by inserting * a VK code into a not appropriate place. */ - /* find a suitable layout-dependent VK code */ - /* (most Winelib apps ought to be able to work without layout tables!) */ - for (i = 0; (i < keysyms_per_keycode) && (!vkey); i++) - { - keysym = XLookupKeysym(&e2, i); - if ((keysym >= XK_0 && keysym <= XK_9) - || (keysym >= XK_A && keysym <= XK_Z)) { - vkey = keysym; - } + /* find a suitable layout-dependent VK code */ + /* (most Winelib apps ought to be able to work without layout tables!) */ + for (i = 0; (i < keysyms_per_keycode) && (!vkey); i++) + { + keysym = XLookupKeysym(&e2, i); + if ((keysym >= XK_0 && keysym <= XK_9) + || (keysym >= XK_A && keysym <= XK_Z)) { + vkey = keysym; } + }
- for (i = 0; (i < keysyms_per_keycode) && (!vkey); i++) + for (i = 0; (i < keysyms_per_keycode) && (!vkey); i++) + { + keysym = XLookupKeysym(&e2, i); + switch (keysym) { - keysym = XLookupKeysym(&e2, i); - switch (keysym) - { - case ';': vkey = VK_OEM_1; break; - case '/': vkey = VK_OEM_2; break; - case '`': vkey = VK_OEM_3; break; - case '[': vkey = VK_OEM_4; break; - case '\': vkey = VK_OEM_5; break; - case ']': vkey = VK_OEM_6; break; - case ''': vkey = VK_OEM_7; break; - case ',': vkey = VK_OEM_COMMA; break; - case '.': vkey = VK_OEM_PERIOD; break; - case '-': vkey = VK_OEM_MINUS; break; - case '+': vkey = VK_OEM_PLUS; break; - } - } + case ';': vkey = VK_OEM_1; break; + case '/': vkey = VK_OEM_2; break; + case '`': vkey = VK_OEM_3; break; + case '[': vkey = VK_OEM_4; break; + case '\': vkey = VK_OEM_5; break; + case ']': vkey = VK_OEM_6; break; + case ''': vkey = VK_OEM_7; break; + case ',': vkey = VK_OEM_COMMA; break; + case '.': vkey = VK_OEM_PERIOD; break; + case '-': vkey = VK_OEM_MINUS; break; + case '+': vkey = VK_OEM_PLUS; break; + } + }
- if (!vkey) + if (!vkey) + { + /* Others keys: let's assign OEM virtual key codes in the allowed range, + * that is ([0xba,0xc0], [0xdb,0xe4], 0xe6 (given up) et [0xe9,0xf5]) */ + switch (++OEMvkey) { - /* Others keys: let's assign OEM virtual key codes in the allowed range, - * that is ([0xba,0xc0], [0xdb,0xe4], 0xe6 (given up) et [0xe9,0xf5]) */ - switch (++OEMvkey) - { - case 0xc1 : OEMvkey=0xdb; break; - case 0xe5 : OEMvkey=0xe9; break; - case 0xf6 : OEMvkey=0xf5; WARN("No more OEM vkey available!\n"); - } + case 0xc1 : OEMvkey=0xdb; break; + case 0xe5 : OEMvkey=0xe9; break; + case 0xf6 : OEMvkey=0xf5; WARN("No more OEM vkey available!\n"); + }
- vkey = OEMvkey; + vkey = OEMvkey;
- if (TRACE_ON(keyboard)) + if (TRACE_ON(keyboard)) + { + TRACE("OEM specific virtual key %X assigned to keycode %X:\n", + OEMvkey, e2.keycode); + TRACE("("); + for (i = 0; i < keysyms_per_keycode; i += 1) { - TRACE("OEM specific virtual key %X assigned to keycode %X:\n", - OEMvkey, e2.keycode); - TRACE("("); - for (i = 0; i < keysyms_per_keycode; i += 1) - { - const char *ksname; + const char *ksname;
- keysym = XLookupKeysym(&e2, i); - ksname = XKeysymToString(keysym); - if (!ksname) - ksname = "NoSymbol"; - TRACE( "%lX (%s) ", keysym, ksname); - } - TRACE(")\n"); + keysym = XLookupKeysym(&e2, i); + ksname = XKeysymToString(keysym); + if (!ksname) + ksname = "NoSymbol"; + TRACE( "%lX (%s) ", keysym, ksname); } + TRACE(")\n"); } + } #endif
/* If some keys still lack scancodes, assign some arbitrary ones to them now */
-
Alexandre Julliard