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

Comparing rxvt-unicode/src/xdefaults.C (file contents):
Revision 1.142 by sf-exg, Wed Jan 6 12:10:44 2010 UTC vs.
Revision 1.161 by sf-exg, Sun Dec 18 02:25:12 2011 UTC

  *
  * All portions of code are copyright by their respective author/s.
  * Copyright (c) 1994      Robert Nation <nation@rocket.sanders.lockheed.com>
  *				- original version
  * Copyright (c) 1997,1998 mj olesen <olesen@me.queensu.ca>
- * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
+ * Copyright (c) 2003-2006 Marc Lehmann <schmorp@schmorp.de>
  * Copyright (c) 2007      Emanuele Giaquinta <e.giaquinta@glauco.it>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
 /* 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_size							\
+#define optList_isInfo(i)						\
-    (sizeof (optList) / sizeof (optList[0]))
+    (optList[i].flag & Optflag_Info)
 static const struct
   {
     const uint8_t   index;      /* Option index */
     const uint8_t   flag;	/* Option flag */
 #if ENABLE_TRANSPARENCY
               BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"),
               BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"),
               STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
               STRG (Rs_shade, "shading", "sh", "number", "shade background by number %."),
+              STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "gaussian blur radii to apply to the root background"),
 #endif
 #if OFF_FOCUS_FADING
               STRG (Rs_fade, "fading", "fade", "number", "fade colors by number % when losing focus"),
               STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"),
 #endif
 #ifdef RXVT_SCROLLBAR
               RSTRG (Rs_color + Color_trough, "troughColor", "color"),
 #endif
 #ifdef OPTION_HC
               STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"),
+              RSTRG (Rs_color + Color_HTC, "highlightTextColor", "color"),
 #endif
 #ifndef NO_CURSORCOLOR
               STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
               /* command-line option = resource name */
               RSTRG (Rs_color + Color_cursor2, "cursorColor2", "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
               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
 #endif
               /* fonts: command-line option = resource name */
               STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
 #if ENABLE_STYLES
               STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
               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
               STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."),
-              STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "gaussian blur radii to apply to the root background"),
-# if ENABLE_EWMH
-              STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"),
-# endif
+#endif
+#ifndef NO_RESOURCES
+              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
                                     "tint,"
 #endif
 #if HAVE_AFTERIMAGE
                                     "afterimage,"
 #endif
+#if HAVE_PIXBUF
+                                    "pixbuf,"
+#endif
 #if defined(USE_XIM)
                                     "XIM,"
 #endif
 #if defined(NO_BACKSPACE_KEY)
                                     "no_backspace,"
   switch (type)
     {
       case 0:			/* brief listing */
         rxvt_log (" [-help] [--help]\n");
-        for (col = 1, i = 0; i < optList_size; i++)
+        for (col = 1, i = 0; i < ecb_array_length (optList); i++)
           if (optList[i].desc != NULL)
             {
               int len = 0;
               if (optList[i].arg)
                 len = strlen (optList[i].arg) + 1;
               assert (optList[i].opt != NULL);
-              len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0);
+              len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2 : 0);
               col += len;
               if (col > 79)
                 {
                   /* assume regular width */
                   rxvt_log ("\n");
         break;
       case 1:			/* full command-line listing */
         rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
-        for (i = 0; i < optList_size; 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 < optList_size; 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");
   rxvt_exit_failure ();
-  /* NOTREACHED */
 }
 /*}}} */
 /*{{{ 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 < optList_size; 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 < optList_size)
+      if (entry < ecb_array_length (optList)
+          && !optList_isInfo (entry))
         {
           if (optList_isReverse (entry))
             flag = !flag;
           if (optList_isString (entry))
             {
               /*
-               * special cases are handled in main.c:main () to allow
+               * special cases are handled in init_resources () to allow
                * X resources to set these values before we settle for
                * default values
                */
               if (optList[entry].doff != -1)
 #ifdef KEYSYM_RESOURCE
       else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
         {
           if (i+1 < argc)
             {
-              char *res = (char *)malloc (strlen (opt) + strlen (argv[++i]) + 6);
+              char *res = rxvt_temp_buf<char> (strlen (opt) + strlen (argv[++i]) + 6);
               sprintf (res, "*.%s: %s\n", opt, argv[i]);
               XrmPutLineResource (&option_db, res);
-              free (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
  */
-/* ARGSUSED */
+static int
-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 < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++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 >= sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t))
+      if (i >= ecb_array_length (keysym_vocabulary))
         return -1;
       if (*str == '-')
         ++str;
     }
       // fallback on hexadecimal parsing
       char *end;
       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 < optList_size; 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.142 by sf-exg, Wed Jan 6 12:10:44 2010 UTC vs. Revision 1.161 by sf-exg, Sun Dec 18 02:25:12 2011 UTC

Diff Legend

Comparing rxvt-unicode/src/xdefaults.C (file contents):
Revision 1.142 by sf-exg, Wed Jan 6 12:10:44 2010 UTC vs.
Revision 1.161 by sf-exg, Sun Dec 18 02:25:12 2011 UTC