[ViewVC] Diff of: cvs/rxvt-unicode/src/xdefaults.C

Comparing rxvt-unicode/src/xdefaults.C (file contents):
Revision 1.153 by sf-exg, Sat Apr 30 13:11:34 2011 UTC vs.
Revision 1.160 by sf-exg, Sun Dec 18 02:14:59 2011 UTC

 /* place holders used for parsing command-line options */
 #define Optflag_Reverse              1
 #define Optflag_Boolean              2
 #define Optflag_Switch               4
+#define Optflag_Info                 8
 /* monolithic option/resource structure: */
 /*
  * `string' options MUST have a usage argument
  * `switch' and `boolean' options have no argument
  * if there's no desc (ription), it won't appear in rxvt_usage ()
  */
 /* INFO () - descriptive information only */
 #define INFO(opt, arg, desc)					\
-    {0, 0, -1, NULL, (opt), (arg), (desc)}
+    {0, Optflag_Info, -1, NULL, (opt), (arg), (desc)}
 /* STRG () - command-line option, with/without resource */
 #define STRG(rsp, kw, opt, arg, desc)				\
     {0, 0, (rsp), (kw), (opt), (arg), (desc)}
     (optList[i].flag == 0)
 #define optList_isBool(i)						\
     (optList[i].flag & Optflag_Boolean)
 #define optList_isReverse(i)						\
     (optList[i].flag & Optflag_Reverse)
+#define optList_isInfo(i)						\
+    (optList[i].flag & Optflag_Info)
 static const struct
   {
     const uint8_t   index;      /* Option index */
     const uint8_t   flag;	/* Option flag */
   switch (type)
     {
       case 0:			/* brief listing */
         rxvt_log (" [-help] [--help]\n");
-        for (col = 1, i = 0; i < ARRAY_LENGTH(optList); i++)
+        for (col = 1, i = 0; i < ecb_array_length (optList); i++)
           if (optList[i].desc != NULL)
             {
               int len = 0;
               if (optList[i].arg)
         break;
       case 1:			/* full command-line listing */
         rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
-        for (i = 0; i < ARRAY_LENGTH(optList); i++)
+        for (i = 0; i < ecb_array_length (optList); i++)
           if (optList[i].desc != NULL)
             {
               assert (optList[i].opt != NULL);
               rxvt_log ("  %s%s %-*s%s%s\n",
                          (optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
       case 2:			/* full resource listing */
         rxvt_log (" [options] [-e command args]\n\n"
                    "where resources (long-options) include:\n");
-        for (i = 0; i < ARRAY_LENGTH(optList); i++)
+        for (i = 0; i < ecb_array_length (optList); i++)
           if (optList[i].kw != NULL)
             rxvt_log ("  %s: %*s%s\n",
                     optList[i].kw,
                     (INDENT - strlen (optList[i].kw)), "", /* XXX */
                     (optList_isBool (i) ? "boolean" : optList[i].arg));
 }
 /*}}} */
 /*{{{ get command-line options before getting resources */
-void
+const char **
 rxvt_term::get_options (int argc, const char *const *argv)
 {
   int i, bad_option = 0;
   for (i = 1; i < argc; i++)
       if (!strcmp (opt, "h"))
         rxvt_usage (0);
       /* feature: always try to match long-options */
-      for (entry = 0; entry < ARRAY_LENGTH(optList); entry++)
+      for (entry = 0; entry < ecb_array_length (optList); entry++)
         if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))
             || (!longopt
                 && optList[entry].opt && !strcmp (opt, optList[entry].opt)))
           break;
-      if (entry < ARRAY_LENGTH(optList))
+      if (entry < ecb_array_length (optList)
+          && !optList_isInfo (entry))
         {
           if (optList_isReverse (entry))
             flag = !flag;
           if (optList_isString (entry))
               sprintf (res, "*.%s: %s\n", opt, argv[i]);
               XrmPutLineResource (&option_db, res);
             }
         }
 #endif
+      else if (!strcmp (opt, "e"))
+        {
+          if (i+1 == argc)
+            rxvt_fatal ("option '-e' requires an argument, aborting.\n");
+          return (const char **)argv + i + 1;
+        }
       else
         {
           bad_option = 1;
           rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
         }
     }
   if (bad_option)
     rxvt_usage (0);
+  return 0;
 }
 /*}}} */
 #ifndef NO_RESOURCES
  * Define key from XrmEnumerateDatabase.
  *   quarks will be something like
  *      "rxvt" "keysym" "0xFF01"
  *   value will be a string
  */
-int
+static int
-rxvt_define_key (XrmDatabase *database UNUSED,
+rxvt_define_key (XrmDatabase *database ecb_unused,
-                 XrmBindingList bindings UNUSED,
+                 XrmBindingList bindings ecb_unused,
                  XrmQuarkList quarks,
-                 XrmRepresentation *type UNUSED,
+                 XrmRepresentation *type ecb_unused,
                  XrmValue *value,
-                 XPointer closure UNUSED)
+                 XPointer closure ecb_unused)
 {
   int last;
   for (last = 0; quarks[last] != NULLQUARK; last++)	/* look for last quark in list */
     ;
   // parse modifiers
   while (str < key)
     {
       unsigned int i;
-      for (i=0; i < ARRAY_LENGTH(keysym_vocabulary); ++i)
+      for (i = 0; i < ecb_array_length (keysym_vocabulary); ++i)
         {
           if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0)
             {
               state |= keysym_vocabulary[i].value;
               str += keysym_vocabulary[i].len;
               break;
             }
         }
-      if (i >= ARRAY_LENGTH(keysym_vocabulary))
+      if (i >= ecb_array_length (keysym_vocabulary))
         return -1;
       if (*str == '-')
         ++str;
     }
       sym = strtol (str, &end, 16);
       if (*end)
         return -1;
     }
+  wchar_t *ws = rxvt_mbstowcs (arg);
+  if (!HOOK_INVOKE ((this, HOOK_REGISTER_COMMAND, DT_INT, sym, DT_INT, state, DT_WCS_LEN, ws, wcslen (ws), DT_END)))
-  keyboard->register_user_translation (sym, state, arg);
+    keyboard->register_user_translation (sym, state, ws);
+  free (ws);
   return 1;
 }
 # endif /* KEYSYM_RESOURCE */
 #endif /* NO_RESOURCES */
   XrmMergeDatabases (option_db, &database);
   option_db = NULL;
   /*
    * Query resources for options that affect us
    */
-  for (int entry = 0; entry < ARRAY_LENGTH(optList); entry++)
+  for (int entry = 0; entry < ecb_array_length (optList); entry++)
     {
       int s;
       const char *kw = optList[entry].kw;
       if (kw == NULL || rs[optList[entry].doff] != NULL)
               set_option (optList[entry].index, s);
             }
         }
     }
+#endif /* NO_RESOURCES */
+}
+void
+rxvt_term::extract_keysym_resources ()
+{
+#ifndef NO_RESOURCES
   /*
    * [R5 or later]: enumerate the resource database
    */
 #  ifdef KEYSYM_RESOURCE
+  XrmDatabase database = XrmGetDatabase (dpy);
   XrmName name_prefix[3];
   XrmClass class_prefix[3];
   name_prefix[0] = XrmStringToName (rs[Rs_name]);
   name_prefix[1] = XrmStringToName ("keysym");
   class_prefix[2] = NULLQUARK;
   /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
   XrmEnumerateDatabase (database, name_prefix, class_prefix,
                         XrmEnumOneLevel, rxvt_define_key, NULL);
 #   ifdef RESFALLBACK
-  name_prefix[0] = XrmStringToName (RESFALLBACK);
-  name_prefix[1] = XrmStringToName ("keysym");
-  class_prefix[0] = XrmStringToName (RESFALLBACK);
+  name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK);
-  class_prefix[1] = XrmStringToName ("Keysym");
   /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
   XrmEnumerateDatabase (database, name_prefix, class_prefix,
                         XrmEnumOneLevel, rxvt_define_key, NULL);
 #   endif
 #  endif

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing rxvt-unicode/src/xdefaults.C (file contents): Revision 1.153 by sf-exg, Sat Apr 30 13:11:34 2011 UTC vs. Revision 1.160 by sf-exg, Sun Dec 18 02:14:59 2011 UTC

Diff Legend

Comparing rxvt-unicode/src/xdefaults.C (file contents):
Revision 1.153 by sf-exg, Sat Apr 30 13:11:34 2011 UTC vs.
Revision 1.160 by sf-exg, Sun Dec 18 02:14:59 2011 UTC