Define our own None atom value

[platform/upstream/libxkbcommon.git] / src / xkbcomp / action.c

diff --git a/src/xkbcomp/action.c b/src/xkbcomp/action.c
index 7374652..eca1d6d 100644 (file)
--- a/src/xkbcomp/action.c
+++ b/src/xkbcomp/action.c
@@ -24,6 +24,8 @@
 
  ********************************************************/
 
+#include <X11/X.h>
+
 #include "xkbcomp.h"
 #include "xkbmisc.h"
 #include "expr.h"
@@ -132,7 +134,7 @@ stringToValue(const LookupEntry tab[], const char *string,
         return False;
 
     for (entry = tab; entry->name != NULL; entry++) {
-        if (uStrCaseCmp(entry->name, string) == 0) {
+        if (strcasecmp(entry->name, string) == 0) {
             *value_rtrn = entry->result;
             return True;
         }
@@ -251,8 +253,8 @@ CheckModifierField(struct xkb_desc * xkb,
     {
         const char *valStr;
         valStr = XkbcAtomText(value->value.str);
-        if (valStr && ((uStrCaseCmp(valStr, "usemodmapmods") == 0) ||
-                       (uStrCaseCmp(valStr, "modmapmods") == 0)))
+        if (valStr && ((strcasecmp(valStr, "usemodmapmods") == 0) ||
+                       (strcasecmp(valStr, "modmapmods") == 0)))
         {
 
             *mods_rtrn = 0;
@@ -740,10 +742,10 @@ const LookupEntry ctrlNames[] = {
     {"accessxtimeout", XkbAccessXTimeoutMask},
     {"accessxfeedback", XkbAccessXFeedbackMask},
     {"audiblebell", XkbAudibleBellMask},
-    {"overlay1", XkbOverlay1Mask},
-    {"overlay2", XkbOverlay2Mask},
     {"ignoregrouplock", XkbIgnoreGroupLockMask},
     {"all", XkbAllBooleanCtrlsMask},
+    {"overlay1", 0},
+    {"overlay2", 0},
     {"none", 0},
     {NULL, 0}
 };
@@ -1238,7 +1240,7 @@ SetActionField(struct xkb_desc * xkb,
         WSGO("Couldn't allocate space for action default\n");
         return False;
     }
-    if (uStrCaseCmp(elem, "action") == 0)
+    if (strcasecmp(elem, "action") == 0)
         new->action = XkbSA_NoAction;
     else
     {