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

Comparing rxvt-unicode/src/xdefaults.C (file contents):
Revision 1.162 by sf-exg, Sat Feb 4 21:47:06 2012 UTC vs.
Revision 1.179 by mikachu, Tue Jul 29 13:50:05 2014 UTC

  * 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
               STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"),
               SWCH ("C", Opt_console, 0, "intercept console messages"),
               SWCH ("iconic", Opt_iconic, 0, "start iconic"),
               SWCH ("ic", Opt_iconic, 0, NULL),	/* short form */
               STRG (Rs_chdir, "chdir", "cd", "string", "start shell in this directory"),
+              SWCH ("dockapp", Opt_dockapp, 0, "start as dockapp"),
               BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"),
               BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"),
               BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"),
               BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"),
               BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, 0, "tab characters are pastable"),
               STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"),
               BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL),
               BOOL (Rs_scrollTtyOutput, NULL, "si",  Opt_scrollTtyOutput, Optflag_Reverse, "scroll-on-tty-output inhibit"),
               BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"),
               BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"),
-#if ENABLE_TRANSPARENCY
+#if BG_IMAGE_FROM_ROOT
               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"),
               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"),
+#endif
-# if ENABLE_EWMH
+#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"),
               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 */
               STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),
 #if ENABLE_XEMBED
               STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"),
 #endif
 #if XFT
+              BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL),
+#endif
+#if ENABLE_FRILLS
               STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
-              BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL),
+              STRG (Rs_visual, "visual", "visual", "number", "visual id to request"),
-#endif
-#if ENABLE_FRILLS
               RSTRG (Rs_transient_for, "transient-for", "windowid"),
               BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, 0, "set override-redirect on the terminal window"),
               STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"),
               BOOL (Rs_hold, "hold", "hold", Opt_hold, 0, "retain window after shell exit"),
               STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
 #if defined(XTERM_SCROLLBAR)
                                     "+xterm"
 #endif
                                     "\nUsage: ";		/* Usage */
-#define INDENT 18
+#define INDENT 28
 const char rxvt_term::resval_undef [] = "<undef>";
 const char rxvt_term::resval_on []    = "on";
 const char rxvt_term::resval_off []   = "off";
 /*{{{ usage: */
 /*----------------------------------------------------------------------*/
-static void
+void
-rxvt_usage (int type)
+rxvt_term::rxvt_usage (int type)
 {
   unsigned int i, col;
   rxvt_log ("%s%s%s", releasestring, optionsstring, RESNAME);
             {
               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);
               col += len;
               if (col > 79)
                 {
                   /* assume regular width */
                   rxvt_log ("\n");
                   col = 1 + len;
                 }
               rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
               if (optList[i].arg)
                 rxvt_log (" %s]", optList[i].arg);
               else
                 rxvt_log ("]");
             }
                           + (optList_isBool (i) ? 0 : 2)),
                          (optList[i].arg ? optList[i].arg : ""),
                          (optList_isBool (i) ? "turn on/off " : ""),
                          optList[i].desc);
             }
+#if ENABLE_PERL
+        rxvt_perl.init (this);
+        rxvt_perl.usage (this, 1);
+#endif
         rxvt_log ("\n  --help to list long-options");
         break;
       case 2:			/* full resource listing */
         rxvt_log (" [options] [-e command args]\n\n"
         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 */
+                    (INDENT + 2 - strlen (optList[i].kw)), "", /* XXX */
                     (optList_isBool (i) ? "boolean" : optList[i].arg));
+#if ENABLE_PERL
+        rxvt_perl.init (this);
+        rxvt_perl.usage (this, 2);
+#endif
         rxvt_log ("\n  -help to list options");
         break;
     }
   rxvt_log ("\n\n");
                * default values
                */
               if (optList[entry].doff != -1)
                 {
-                  if (flag && i+1 == argc)
+                  if (flag && i + 1 == argc)
                     rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]);
                   rs[optList[entry].doff] = flag ? argv[++i] : resval_undef;
                 }
             }
             }
         }
 #ifndef NO_RESOURCES
       else if (!strcmp (opt, "xrm"))
         {
-          if (i+1 < argc)
+          if (i + 1 < argc)
             XrmPutLineResource (&option_db, argv[++i]);
         }
 #endif
 #ifdef KEYSYM_RESOURCE
       else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
         {
-          if (i+1 < argc)
+          if (i + 1 < argc)
             {
               char *res = rxvt_temp_buf<char> (strlen (opt) + strlen (argv[++i]) + 6);
               sprintf (res, "*.%s: %s\n", opt, argv[i]);
               XrmPutLineResource (&option_db, res);
             }
         }
 #endif
       else if (!strcmp (opt, "e"))
         {
-          if (i+1 == argc)
+          if (i + 1 < argc)
-            rxvt_fatal ("option '-e' requires an argument, aborting.\n");
-          return (const char **)argv + i + 1;
+            return (const char **)argv + i + 1;
+          rxvt_warn ("option '-e' requires an argument, aborting.\n");
+          bad_option = 1;
         }
       else
         {
+#if ENABLE_PERL
+          rxvt_perl.init (this);
+          if (int flags = rxvt_perl.parse_resource (this, opt, true, longopt, flag, argv [i + 1]))
+            {
+              if (flags & rxvt_perl.RESOURCE_ARG)
+                {
+                  if (i + 1 == argc)
+                    {
+                      rxvt_warn ("option '%s' requires an argument.\n", argv [i]);
-          bad_option = 1;
+                      bad_option = 1;
+                    }
+                  else
+                    ++i;
+                }
+            }
+          else
+#endif
+            {
-          rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
+              rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
+              bad_option = 1;
+            }
         }
     }
   if (bad_option)
     rxvt_usage (0);
 #ifndef NO_RESOURCES
 /*----------------------------------------------------------------------*/
 # ifdef KEYSYM_RESOURCE
+static void
+rxvt_define_key (rxvt_term *term, const char *k, const char *v)
+{
+  term->bind_action (k, v);
+}
 /*
  * Define key from XrmEnumerateDatabase.
  *   quarks will be something like
  *      "rxvt" "keysym" "0xFF01"
  *   value will be a string
  */
 static int
+rxvt_keysym_enumerate_helper (
-rxvt_define_key (XrmDatabase *database ecb_unused,
+   XrmDatabase *database ecb_unused,
-                 XrmBindingList bindings ecb_unused,
+   XrmBindingList bindings ecb_unused,
-                 XrmQuarkList quarks,
+   XrmQuarkList quarks,
-                 XrmRepresentation *type ecb_unused,
+   XrmRepresentation *type ecb_unused,
-                 XrmValue *value,
+   XrmValue *value,
-                 XPointer closure ecb_unused)
+   XPointer closure
+)
 {
   int last;
   for (last = 0; quarks[last] != NULLQUARK; last++)	/* look for last quark in list */
     ;
-  last--;
+  rxvt_term *term = (rxvt_term *)(((void **)closure)[0]);
-  GET_R->parse_keysym (XrmQuarkToString (quarks[last]), (char *)value->addr);//D//TODO
+  void (*cb)(rxvt_term *, const char *, const char *)
+     = (void (*)(rxvt_term *, const char *, const char *))
+          (((void **)closure)[1]);
+  cb (term, XrmQuarkToString (quarks[last - 1]), (char *)value->addr);
   return False;
 }
 /*
  * look for something like this (XK_Delete)
   { "4",         1, Mod4Mask      },
   { "5",         1, Mod5Mask      },
 };
 int
-rxvt_term::parse_keysym (const char *str, const char *arg)
+rxvt_term::bind_action (const char *str, const char *arg)
 {
   int sym;
   unsigned int state = 0;
   const char *key = strrchr (str, '-');
         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, ws);
+    keyboard->register_action (sym, state, ws);
   free (ws);
   return 1;
 }
 # endif /* KEYSYM_RESOURCE */
     }
 #endif /* NO_RESOURCES */
 }
 void
-rxvt_term::extract_keysym_resources ()
+rxvt_term::enumerate_keysym_resources (void (*cb)(rxvt_term *, const char *, const char *))
 {
 #ifndef NO_RESOURCES
   /*
    * [R5 or later]: enumerate the resource database
    */
 #  ifdef KEYSYM_RESOURCE
+  void *closure[2] = {
+    (void *)this,
+    (void *)cb,
+  };
   XrmDatabase database = XrmGetDatabase (dpy);
   XrmName name_prefix[3];
   XrmClass class_prefix[3];
   name_prefix[0] = XrmStringToName (rs[Rs_name]);
   class_prefix[0] = XrmStringToName (RESCLASS);
   class_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);
+                        XrmEnumOneLevel, rxvt_keysym_enumerate_helper, (XPointer)closure);
 #   ifdef RESFALLBACK
   name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK);
   /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
   XrmEnumerateDatabase (database, name_prefix, class_prefix,
-                        XrmEnumOneLevel, rxvt_define_key, NULL);
+                        XrmEnumOneLevel, rxvt_keysym_enumerate_helper, (XPointer)closure);
 #   endif
 #  endif
 #endif /* NO_RESOURCES */
 }
+void
+rxvt_term::extract_keysym_resources ()
+{
+  enumerate_keysym_resources (rxvt_define_key);
+}
 /*----------------------- 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.162 by sf-exg, Sat Feb 4 21:47:06 2012 UTC vs. Revision 1.179 by mikachu, Tue Jul 29 13:50:05 2014 UTC

Diff Legend

Comparing rxvt-unicode/src/xdefaults.C (file contents):
Revision 1.162 by sf-exg, Sat Feb 4 21:47:06 2012 UTC vs.
Revision 1.179 by mikachu, Tue Jul 29 13:50:05 2014 UTC