Skip to content

W
wine-winehq
Commit c7ffd04b authored by Ken Thomases's avatar Ken Thomases Committed by Alexandre Julliard
Browse files
Options

winex11.drv: Changed indenting of some dead code.

parent fac3dc60
Hide whitespace changes
Inline Side-by-side
Showing with 50 additions and 50 deletions
dlls/winex11.drv/keyboard.c
View file @ c7ffd04b
...@@ -1676,67 +1676,67 @@ void X11DRV_InitKeyboard(void) ...@@ -1676,67 +1676,67 @@ void X11DRV_InitKeyboard(void)
#if 0 /* this breaks VK_OEM_x VKeys in some layout tables by inserting #if 0 /* this breaks VK_OEM_x VKeys in some layout tables by inserting
* a VK code into a not appropriate place. * a VK code into a not appropriate place.
*/ */
/* find a suitable layout-dependent VK code */ /* find a suitable layout-dependent VK code */
/* (most Winelib apps ought to be able to work without layout tables!) */ /* (most Winelib apps ought to be able to work without layout tables!) */
for (i = 0; (i < keysyms_per_keycode) && (!vkey); i++) for (i = 0; (i < keysyms_per_keycode) && (!vkey); i++)
{ {
keysym = XLookupKeysym(&e2, i); keysym = XLookupKeysym(&e2, i);
if ((keysym >= XK_0 && keysym <= XK_9) if ((keysym >= XK_0 && keysym <= XK_9)
|| (keysym >= XK_A && keysym <= XK_Z)) { || (keysym >= XK_A && keysym <= XK_Z)) {
vkey = keysym; 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); case ';': vkey = VK_OEM_1; break;
switch (keysym) case '/': vkey = VK_OEM_2; break;
{ case '`': vkey = VK_OEM_3; break;
case ';': vkey = VK_OEM_1; break; case '[': vkey = VK_OEM_4; break;
case '/': vkey = VK_OEM_2; break; case '\\': vkey = VK_OEM_5; break;
case '`': vkey = VK_OEM_3; break; case ']': vkey = VK_OEM_6; break;
case '[': vkey = VK_OEM_4; break; case '\'': vkey = VK_OEM_7; break;
case '\\': vkey = VK_OEM_5; break; case ',': vkey = VK_OEM_COMMA; break;
case ']': vkey = VK_OEM_6; break; case '.': vkey = VK_OEM_PERIOD; break;
case '\'': vkey = VK_OEM_7; break; case '-': vkey = VK_OEM_MINUS; break;
case ',': vkey = VK_OEM_COMMA; break; case '+': vkey = VK_OEM_PLUS; 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, case 0xc1 : OEMvkey=0xdb; break;
* that is ([0xba,0xc0], [0xdb,0xe4], 0xe6 (given up) et [0xe9,0xf5]) */ case 0xe5 : OEMvkey=0xe9; break;
switch (++OEMvkey) 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", const char *ksname;
OEMvkey, e2.keycode);
TRACE("(");
for (i = 0; i < keysyms_per_keycode; i += 1)
{
const char *ksname;
keysym = XLookupKeysym(&e2, i); keysym = XLookupKeysym(&e2, i);
ksname = XKeysymToString(keysym); ksname = XKeysymToString(keysym);
if (!ksname) if (!ksname)
ksname = "NoSymbol"; ksname = "NoSymbol";
TRACE( "%lX (%s) ", keysym, ksname); TRACE( "%lX (%s) ", keysym, ksname);
}
TRACE(")\n");
} }
TRACE(")\n");
} }
}
#endif #endif
/* If some keys still lack scancodes, assign some arbitrary ones to them now */ /* If some keys still lack scancodes, assign some arbitrary ones to them now */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment