wrong keyboard layout

[Dmitry Timoshkov]

"Shachar Shemesh" <wine-devel at shemesh.biz> wrote:

> There is one thing that still bothers me. When using right-win for group 
> toggle, I get a "`" printed when switching from group 0 to group 1, and 
> ";" when switching from group 1 to group 0. Otherwise, everything works 
> fine. This does not happen when other combinations are used to switch 
> modes (well, both shifts toggle used to drive wine simply mad, I don't 
> know how things are today, but that also happened with some other 
> applications).

That's because we should ignore some key events. Try the attached patch,
perhaps some other keysyms should be added to that list.

Raul, that should help you as well.

-- 
Dmitry.
-------------- next part --------------
--- cvs/hq/wine/dlls/x11drv/keyboard.c	Fri Aug 08 01:57:34 2003
+++ wine/dlls/x11drv/keyboard.c	Tue Aug 12 13:18:20 2003
@@ -1007,6 +1007,14 @@
         ascii_chars = XLookupString(event, Str, sizeof(Str), &keysym, NULL);
     wine_tsx11_unlock();
 
+    /* Ignore some unwanted events */
+    if ((keysym >= XK_ISO_Lock && keysym <= XK_ISO_Last_Group_Lock) ||
+         keysym == XK_Mode_switch)
+    {
+        TRACE("Ignoring %s keyboard event\n", TSXKeysymToString(keysym));
+        return;
+    }
+
     TRACE_(key)("state = %X\n", event->state);
 
     /* If XKB extensions are used, the state mask for AltGr will use the group