winex11: use XkbKeycodeToKeysym instead of (deprecated) XKeycodeToKeysym (see http://bugs.freedesktop.org/show_bug.cgi?id=5349)
Alexandre Goujon
ale.goujon at gmail.com
Tue Apr 20 14:29:56 CDT 2010
---
dlls/winex11.drv/keyboard.c | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c
index e044d6d..a66c5aa 100644
--- a/dlls/winex11.drv/keyboard.c
+++ b/dlls/winex11.drv/keyboard.c
@@ -1523,7 +1523,7 @@ X11DRV_KEYBOARD_DetectLayout( Display *display )
for (keyc = min_keycode; keyc <= max_keycode; keyc++) {
/* get data for keycode from X server */
for (i = 0; i < syms; i++) {
- if (!(keysym = XKeycodeToKeysym (display, keyc, i))) continue;
+ if (!(keysym = XkbKeycodeToKeysym (display, keyc, 0, i))) continue;
/* Allow both one-byte and two-byte national keysyms */
if ((keysym < 0x8000) && (keysym != ' '))
{
@@ -1735,12 +1735,12 @@ void X11DRV_InitKeyboard( Display *display )
int k;
for (k = 0; k < keysyms_per_keycode; k += 1)
- if (XKeycodeToKeysym(display, *kcp, k) == XK_Num_Lock)
+ if (XkbKeycodeToKeysym(display, *kcp, 0, k) == XK_Num_Lock)
{
NumLockMask = 1 << i;
TRACE_(key)("NumLockMask is %x\n", NumLockMask);
}
- else if (XKeycodeToKeysym(display, *kcp, k) == XK_Scroll_Lock)
+ else if (XkbKeycodeToKeysym(display, *kcp, 0, k) == XK_Scroll_Lock)
{
ScrollLockMask = 1 << i;
TRACE_(key)("ScrollLockMask is %x\n", ScrollLockMask);
@@ -1792,7 +1792,7 @@ void X11DRV_InitKeyboard( Display *display )
/* we seem to need to search the layout-dependent scancodes */
int maxlen=0,maxval=-1,ok;
for (i=0; i<syms; i++) {
- keysym = XKeycodeToKeysym(display, keyc, i);
+ keysym = XkbKeycodeToKeysym(display, keyc, 0, i);
if ((keysym<0x8000) && (keysym!=' '))
{
#ifdef HAVE_XKB
@@ -1944,7 +1944,7 @@ void X11DRV_InitKeyboard( Display *display )
for (scan = 0x60, keyc = min_keycode; keyc <= max_keycode; keyc++)
if (keyc2vkey[keyc]&&!keyc2scan[keyc]) {
const char *ksname;
- keysym = XKeycodeToKeysym(display, keyc, 0);
+ keysym = XkbKeycodeToKeysym(display, keyc, 0, 0);
ksname = XKeysymToString(keysym);
if (!ksname) ksname = "NoSymbol";
@@ -2148,7 +2148,7 @@ SHORT CDECL X11DRV_VkKeyScanEx(WCHAR wChar, HKL hkl)
wine_tsx11_lock();
for (i = 0; i < 4; i++) /* find shift state */
{
- if (XKeycodeToKeysym(display, keycode, i) == keysym)
+ if (XkbKeycodeToKeysym(display, keycode, 0, i) == keysym)
{
index = i;
break;
@@ -2402,7 +2402,7 @@ INT CDECL X11DRV_GetKeyNameText(LONG lParam, LPWSTR lpBuffer, INT nSize)
{
wine_tsx11_lock();
keyc = (KeyCode) keyi;
- keys = XKeycodeToKeysym(display, keyc, 0);
+ keys = XkbKeycodeToKeysym(display, keyc, 0, 0);
name = XKeysymToString(keys);
wine_tsx11_unlock();
TRACE("found scan=%04x keyc=%u keysym=%04x string=%s\n",
--
1.6.3.3
More information about the wine-patches
mailing list