Keystroke.h: improve parse_keystroke_file()

nx-X11/programs/Xserver/hw/nxagent/Keystroke.c

@@ -217,6 +217,8 @@ static Bool read_binding_from_xmlnode(xmlNode *node, struct nxagentSpecialKeystr
           break;
         }
       }
+      if (newkm.stroke == KEYSTROKE_NOTHING)
+        fprintf(stderr, "Info: ignoring unknown keystroke action '%s'.\n", (char *)attr->children->content);
       continue;
     }
     else if (strcmp((char *)attr->name, "key") == 0)
@@ -281,7 +283,7 @@ static void parse_keystroke_file(Bool force)
       free(map);
       map = default_map;
     }
-    fprintf(stderr, "re-reading keystroke config\n");
+    fprintf(stderr, "Info: re-reading keystrokes configuration\n");
   }
   else
   {
@@ -309,7 +311,10 @@ static void parse_keystroke_file(Bool force)
       exit(EXIT_FAILURE);
     }
   }
-  else if ((filename = getenv(envvar)) && access(filename, R_OK) == 0)
+  else if (nxagentKeystrokeFile)
+  {
+    fprintf(stderr, "Warning: Cannot read keystroke file '%s'.\n", nxagentKeystrokeFile);
+    if ((filename = getenv(envvar)) && access(filename, R_OK) == 0)
     {
       if (!(filename = strdup(filename)))
       {
@@ -351,15 +356,16 @@ static void parse_keystroke_file(Bool force)
         filename = NULL;
       }
     }
+  }
 
   /* now we know which file to read, if any */
   if (filename)
   {
-    fprintf(stderr, "Info: using keystrokes file %s\n", filename);
     LIBXML_TEST_VERSION
     xmlDoc *doc = xmlReadFile(filename, NULL, 0);
     if (doc)
     {
+      fprintf(stderr, "Info: using keystrokes file '%s'\n", filename);
       for (xmlNode *cur = xmlDocGetRootElement(doc); cur; cur = cur->next)
       {
         if (cur->type == XML_ELEMENT_NODE && strcmp((char *)cur->name, "keystrokes") == 0)
@@ -427,14 +433,17 @@ static void parse_keystroke_file(Bool force)
     }
     else
     {
-      #ifdef DEBUG
-      fprintf(stderr, "XML parsing for %s failed\n", filename);
-      #endif
+      fprintf(stderr, "Warning: could not read/parse keystrokes file '%s'\n", filename);
     }
     free(filename);
     filename = NULL;
   }
 
+  if (map == default_map)
+  {
+    fprintf(stderr, "Info: Using builtin keystrokes.\n");
+  }
+
   nxagentDumpKeystrokes();
 }