Cygwin/X: Fix compilation for mandatory XKB

Fix a stray '}'
Update to use RMLVO interface
Remove g_winInfo.xkb.disable, can never be set since noXkbExtension has been removed
Change to retrieve modifier key state using XkbStateFieldFromRec() from Colin Harrison
Update to use XKB defaults from xkb-config.h

Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>

1 files changed, 1 insertions, 10 deletions

diff --git a/hw/xwin/winconfig.h b/hw/xwin/winconfig.h
index 71c458200..63d621112 100644
--- a/hw/xwin/winconfig.h
+++ b/hw/xwin/winconfig.h
@@ -305,16 +305,7 @@ typedef struct
     long rate;
   }
   keyboard;
-  struct
-  {
-    Bool disable;
-    char *rules;
-    char *model;
-    char *layout;
-    char *variant;
-    char *options;
-  }
-  xkb;
+  XkbRMLVOSet xkb;
   struct
   {
     Bool emulate3Buttons;