Fix NULL pointers in rmlvo

2 files changed, 4 insertions, 8 deletions

diff --git a/src/jstk.c b/src/jstk.c
index 42274ad..a2e927c 100644
--- a/src/jstk.c
+++ b/src/jstk.c
@@ -669,15 +669,15 @@ jstkCorePreInit(InputDriverPtr drv, IDevPtr dev, int flags)
 
     priv->rmlvo.layout = xf86SetStrOption(dev->commonOptions, "xkb_layout", NULL);
     if (!priv->rmlvo.layout)
-	priv->rmlvo.layout = xf86SetStrOption(dev->commonOptions, "XkbLayout", "uk");
+	priv->rmlvo.layout = xf86SetStrOption(dev->commonOptions, "XkbLayout", "us");
 
     priv->rmlvo.variant = xf86SetStrOption(dev->commonOptions, "xkb_variant", NULL);
     if (!priv->rmlvo.variant)
-	priv->rmlvo.variant = xf86SetStrOption(dev->commonOptions, "XkbVariant", NULL);
+	priv->rmlvo.variant = xf86SetStrOption(dev->commonOptions, "XkbVariant", "");
 
     priv->rmlvo.options = xf86SetStrOption(dev->commonOptions, "xkb_options", NULL);
     if (!priv->rmlvo.options)
-	priv->rmlvo.options = xf86SetStrOption(dev->commonOptions, "XkbOptions", NULL);
+	priv->rmlvo.options = xf86SetStrOption(dev->commonOptions, "XkbOptions", "");
 
     priv->mouse_enabled = xf86SetBoolOption(dev->commonOptions, "StartMouseEnabled", TRUE);
     priv->keys_enabled = xf86SetBoolOption(dev->commonOptions, "StartKeysEnabled", TRUE);
diff --git a/src/jstk_key.c b/src/jstk_key.c
index 25b3856..fb1f52e 100644
--- a/src/jstk_key.c
+++ b/src/jstk_key.c
@@ -348,10 +348,6 @@ jstkInitKeys(DeviceIntPtr pJstk, JoystickDevPtr priv)
 
 #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 5
     {
-/*        XkbRMLVOSet rmlvo; */
-/*        XkbGetRulesDflts(&rmlvo); */
-    	/* FIXME */
-	#warning KEYMAP FOR ABI_XINPUT_VERSION >= 5 BROKEN RIGHT NOW
         if (!InitKeyboardDeviceStruct(pJstk, &priv->rmlvo, NULL, jstkKbdCtrl))
         {
             ErrorF("unable to init keyboard device\n");
@@ -388,7 +384,7 @@ jstkInitKeys(DeviceIntPtr pJstk, JoystickDevPtr priv)
     if (!XkbInitKeyboardDeviceStruct(pJstk, &xkbnames,
                 &keySyms, modMap, NULL,
                 jstkKbdCtrl))
-        return 0;
+        return !Success;
 #endif
 
     /* Set Autorepeat and Delay */