[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.165 by root, Mon Jun 4 15:18:53 2012 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)}
+#define RINFO(kw, arg)						\
+    {0, Optflag_Info, -1, (kw), NULL, (arg), NULL}
 /* 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 */
               RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
 #endif /* NO_CURSORCOLOR */
               STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
               STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
               STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
-#ifdef BG_IMAGE_FROM_FILE
+#if BG_IMAGE_FROM_FILE
               RSTRG (Rs_path, "path", "search path"),
               STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
 # if ENABLE_EWMH
               STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"),
 # endif
               STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
               STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"),
               STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"),
               BOOL (Rs_intensityStyles, "intensityStyles", "is", Opt_intensityStyles, 0, "font styles imply intensity changes"),
 #endif
-#ifdef USE_XIM
+#if USE_XIM
               STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
               STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"),
               STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"),
               STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"),
 #endif /* USE_XIM */
 #endif
 #if ISO_14755
               BOOL (Rs_iso14755, "iso14755", NULL, Opt_iso14755, 0, NULL),
               BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL),
 #endif
-#ifdef HAVE_AFTERIMAGE
+#ifndef NO_RESOURCES
-              STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."),
+              RINFO ("xrm", "string"),
+#endif
+#ifdef KEYSYM_RESOURCE
+              RINFO ("keysym.sym", "keysym"),
 #endif
               INFO ("e", "command arg ...", "command to execute")
             };
 #undef INFO
+#undef RINFO
 #undef STRG
 #undef RSTRG
 #undef SWCH
 #undef BOOL
 #endif
 #if defined(ENABLE_TRANSPARENCY)
                                     "transparent,"
                                     "tint,"
 #endif
-#if HAVE_AFTERIMAGE
-                                    "afterimage,"
-#endif
 #if HAVE_PIXBUF
                                     "pixbuf,"
 #endif
 #if defined(USE_XIM)
                                     "XIM,"
   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));
-#ifdef KEYSYM_RESOURCE
-        rxvt_log ("  " "keysym.sym" ": %*s%s\n",
-                (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */
-                "keysym");
-#endif
         rxvt_log ("\n  -help to list options");
         break;
     }
   rxvt_log ("\n\n");
 }
 /*}}} */
 /*{{{ 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)
         continue; // previously set
           allocated.push_back ((void *)p);
           rs[optList[entry].doff] = p;
           if (optList_isBool (entry))
             {
-              s = strcasecmp (p, "TRUE") == 0
+              bool s = parse_bool_resource (p);
-                  || strcasecmp (p, "YES") == 0
-                  || strcasecmp (p, "ON") == 0
-                  || strcasecmp (p, "1") == 0;
               if (optList_isReverse (entry))
                 s = !s;
               set_option (optList[entry].index, s);
             }
         }
     }
+#endif /* NO_RESOURCES */
+}
+void
+rxvt_term::extract_keysym_resources ()
+{
+#if !defined NO_RESOURCES && defined KEYSYM_RESOURCE
+  find_resources ("keysym", "Keysym", XrmEnumOneLevel, rxvt_define_key);
+#endif
+}
+#if !defined NO_RESOURCES && (defined KEYSYM_RESOURCE || defined BG_IMAGE_FROM_FILE)
+void
+rxvt_term::find_resources (const char *n_prefix, const char *c_prefix, int mode,
+                           Bool (*proc)(XrmDatabase *, XrmBindingList, XrmQuarkList, XrmRepresentation *, XrmValue *, XPointer))
+{
   /*
    * [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");
+  name_prefix[1] = XrmStringToName (n_prefix);
   name_prefix[2] = NULLQUARK;
   class_prefix[0] = XrmStringToName (RESCLASS);
-  class_prefix[1] = XrmStringToName ("Keysym");
+  class_prefix[1] = XrmStringToName (c_prefix);
   class_prefix[2] = NULLQUARK;
   /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
   XrmEnumerateDatabase (database, name_prefix, class_prefix,
-                        XrmEnumOneLevel, rxvt_define_key, NULL);
+                        mode, proc, 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);
+                        mode, proc, NULL);
 #   endif
-#  endif
-#endif /* NO_RESOURCES */
 }
+#endif
 /*----------------------- end-of-file (C source) -----------------------*/

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.165 by root, Mon Jun 4 15:18:53 2012 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.165 by root, Mon Jun 4 15:18:53 2012 UTC