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

Comparing rxvt-unicode/src/xdefaults.C (file contents):
Revision 1.42 by root, Wed Dec 1 02:12:18 2004 UTC vs.
Revision 1.49 by root, Thu Feb 3 10:24:10 2005 UTC

 #include "../config.h"		/* NECESSARY */
 #include "rxvt.h"		/* NECESSARY */
 #include "version.h"
+#ifdef KEYSYM_RESOURCE
+#include "keyboard.h"
+#endif
 /* #define DEBUG_RESOURCES */
 static const char *const xnames[2] = { ".Xdefaults", ".Xresources" };
 /*{{{ monolithic option/resource structure: */
               BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, "reverse video"),
               BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, "login shell"),
               BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, "jump scrolling"),
               BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, "tab characters are pastable"),
 #ifdef HAVE_SCROLLBARS
+              RSTRG (Rs_scrollstyle, "scrollstyle", "mode"),
               BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, "scrollbar"),
               BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, "scrollbar right"),
               BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, "scrollbar without a trough"),
+              RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"),
+              STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"),
 #endif
               BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, NULL),
               BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_Reverse | Opt_scrollTtyOutput, "scroll-on-tty-output inhibit"),
               BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, "scroll-on-keypress"),
               BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, "scroll-with-buffer"),
               RSTRG (Rs_color + Color_BD, "colorBD", "color"),
               RSTRG (Rs_color + Color_IT, "colorIT", "color"),
               RSTRG (Rs_color + Color_UL, "colorUL", "color"),
               RSTRG (Rs_color + Color_RV, "colorRV", "color"),
 #endif				/* ! NO_BOLD_UNDERLINE_REVERSE */
+#if ENABLE_FRILLS
+              RSTRG (Rs_color + Color_underline, "underlineColor", "color"),
+#endif
 #ifdef KEEP_SCROLLCOLOR
               RSTRG (Rs_color + Color_scroll, "scrollColor", "color"),
               RSTRG (Rs_color + Color_trough, "troughColor", "color"),
 #endif				/* KEEP_SCROLLCOLOR */
 #ifdef OPTION_HC
               STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight 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"),
+#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"),
 #if defined (XPM_BACKGROUND) || (MENUBAR_MAX)
               RSTRG (Rs_path, "path", "search path"),
 #endif				/* defined (XPM_BACKGROUND) || (MENUBAR_MAX) */
 #ifdef XPM_BACKGROUND
               STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
               STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"),
 #endif
 #ifdef USE_XIM
               STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
               STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"),
-#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
               STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"),
-#endif
+              STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"),
 #endif				/* USE_XIM */
               STRG (Rs_name, NULL, "name", "string", "client instance, icon, and title strings"),
               STRG (Rs_title, "title", "title", "string", "title name for window"),
               STRG (Rs_title, NULL, "T", NULL, NULL),	/* short form */
               STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),
-#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"),
-#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"),
               STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),
 #if ENABLE_FRILLS
               STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
               STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
               STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
               STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
               BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"),
-#endif
-#ifndef NO_LINESPACE
               STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
 #endif
-              STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"),
 #ifdef POINTER_BLANK
               RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
 #endif
 #ifndef NO_BACKSPACE_KEY
               RSTRG (Rs_backspace_key, "backspacekey", "string"),
 #endif
 #ifndef NO_DELETE_KEY
               RSTRG (Rs_delete_key, "deletekey", "string"),
 #endif
               RSTRG (Rs_selectstyle, "selectstyle", "mode"),
-              RSTRG (Rs_scrollstyle, "scrollstyle", "mode"),
-#ifdef HAVE_SCROLLBARS
-              RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"),
-#endif
 #ifdef PRINTPIPE
               RSTRG (Rs_print_pipe, "print-pipe", "string"),
 #endif
               STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"),
-              INFO ("xrm", "string", "X resource"),
 #ifdef CUTCHAR_RESOURCE
               RSTRG (Rs_cutchars, "cutchars", "string"),
 #endif				/* CUTCHAR_RESOURCE */
               RSTRG (Rs_answerbackstring, "answerbackString", "string"),
 #ifndef NO_SECONDARY_SCREEN
               BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"),
               BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"),
+#endif
+#if !defined(NO_RESOURCES) && defined(USE_XGETDEFAULT)
+              INFO ("xrm", "string", "X resource"),
 #endif
               INFO ("e", "command arg ...", "command to execute")
             };
 #undef INFO
                                     "strings,"
 #endif
 #if defined(ENABLE_FRILLS)
                                     "frills,"
 #endif
-#if !defined(NO_LINESPACE)
-                                    "linespace,"
-#endif
 #if defined(PREFER_24BIT)
                                     "24bit,"
 #endif
 #if defined(SELECTION_SCROLLING)
                                     "selectionscrolling,"
                  XrmQuarkList quarks,
                  XrmRepresentation *type __attribute__((unused)),
                  XrmValue *value,
                  XPointer closure __attribute__((unused)))
 {
-  int             last;
+  int last;
   for (last = 0; quarks[last] != NULLQUARK; last++)	/* look for last quark in list */
     ;
   last--;
   GET_R->parse_keysym (XrmQuarkToString (quarks[last]), (char *)value->addr);//D//TODO
   return False;
 }
  * arg will be
  *      NULL for ~/.Xdefaults and
  *      non-NULL for command-line options (need to allocate)
  */
 #define NEWARGLIM	500	/* `reasonable' size */
+struct keysym_vocabulary_t
+{
+  const char    *name;
+  unsigned short len;
+  unsigned short value;
+};
+keysym_vocabulary_t keysym_vocabulary[] =
+{
+  { "ISOLevel3", 9, Level3Mask    },
+  { "AppKeypad", 9, AppKeypadMask },
+  { "Control",   7, ControlMask   },
+  { "NumLock",   7, NumLockMask   },
+  { "Shift",     5, ShiftMask     },
+  { "Meta",      4, MetaMask      },
+  { "Lock",      4, LockMask      },
+  { "Mod1",      4, Mod1Mask      },
+  { "Mod2",      4, Mod2Mask      },
+  { "Mod3",      4, Mod3Mask      },
+  { "Mod4",      4, Mod4Mask      },
+  { "Mod5",      4, Mod5Mask      },
+  { "I",         1, Level3Mask    },
+  { "K",         1, AppKeypadMask },
+  { "C",         1, ControlMask   },
+  { "N",         1, NumLockMask   },
+  { "S",         1, ShiftMask     },
+  { "M",         1, MetaMask      },
+  { "A",         1, MetaMask      },
+  { "L",         1, LockMask      },
+  { "1",         1, Mod1Mask      },
+  { "2",         1, Mod2Mask      },
+  { "3",         1, Mod3Mask      },
+  { "4",         1, Mod4Mask      },
+  { "5",         1, Mod5Mask      },
+};
 int
 rxvt_term::parse_keysym (const char *str, const char *arg)
 {
-  int             n, sym;
+  int n, sym;
-  char           *key_string, *newarg = NULL;
+  unsigned int state = 0;
+  const char *pmodend = NULL;
+  char *newarg = NULL;
-  char            newargstr[NEWARGLIM];
+  char newargstr[NEWARGLIM];
   if (arg == NULL)
     {
       if ((n = rxvt_Str_match (str, "keysym.")) == 0)
         return 0;
       str += n;		/* skip `keysym.' */
+      if ((pmodend = strchr (str, ':')) < str)
+        return -1;
     }
+  else
+    pmodend = str + strlen(str);
+  for (--pmodend; str < pmodend; --pmodend)
+    if (*pmodend == '-')
+      break;
+  while (str < pmodend)
+    {
+      unsigned int i;
+      for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++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))
+        return -1;
+      if (*str == '-')
+        ++str;
+    }
   /* some scanf () have trouble with a 0x prefix */
-  if (isdigit (str[0]))
+  if (str[0] == '0' && toupper (str[1]) == 'X')
     {
-      if (str[0] == '0' && toupper (str[1]) == 'X')
-        str += 2;
+      str += 2;
       if (arg)
         {
           if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1)
             return -1;
         }
       /*
        * convert keysym name to keysym number
        */
       strncpy (newargstr, str, NEWARGLIM - 1);
       newargstr[NEWARGLIM - 1] = '\0';
       if (arg == NULL)
         {
           if ((newarg = strchr (newargstr, ':')) == NULL)
             return -1;
           *newarg++ = '\0';	/* terminate keysym name */
         }
       if ((sym = XStringToKeysym (newargstr)) == None)
         return -1;
     }
-  if (sym < 0xFF00 || sym > 0xFFFF)	/* we only do extended keys */
-    return -1;
-  sym &= 0xFF;
-  if (Keysym_map[sym] != NULL)	/* already set ? */
-    return -1;
   if (newarg == NULL)
     {
       strncpy (newargstr, arg, NEWARGLIM - 1);
       newargstr[NEWARGLIM - 1] = '\0';
       newarg = newargstr;
     }
   rxvt_Str_trim (newarg);
   if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0)
     return -1;
-  MIN_IT (n, 255);
-  key_string = (char *)rxvt_malloc ((n + 1) * sizeof (char));
-  key_string[0] = n;
+  keyboard->register_user_translation (sym, state, newarg);
-  strncpy (key_string + 1, newarg, n);
-  Keysym_map[sym] = (unsigned char *)key_string;
   return 1;
 }
 # endif				/* KEYSYM_RESOURCE */
             {
               XrmMergeDatabases (rdb1, &database);
 #    ifndef HAVE_BOTH_XRESOURCE_FILES
               break;
 #    endif
             }
         }
     }
 #   endif
 #   endif
 #  endif
 # else				/* USE_XGETDEFAULT */
     /* get resources the hard way, but save lots of memory */
-    FILE           *fd = NULL;
+    FILE *fd = NULL;
-    char           *home;
+    char *home;
     if ((home = getenv ("HOME")) != NULL)
       {
-        unsigned int    i, len = strlen (home) + 2;
+        unsigned int i, len = strlen (home) + 2;
-        char           *f = NULL;
+        char *f = NULL;
         for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++)
           {
-            f = (char *)rxvt_realloc (f, (len + strlen (xnames[i])) * sizeof (char));
+            f = (char *)rxvt_realloc (f, len + strlen (xnames[i]));
             sprintf (f, "%s/%s", home, xnames[i]);
             if ((fd = fopen (f, "r")) != NULL)
               break;
           }
         free (f);
       }
     /*
     * The normal order to match resources is the following:
     * @ global resources (partial match, ~/.Xdefaults)

Diff Legend

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

Comparing rxvt-unicode/src/xdefaults.C (file contents): Revision 1.42 by root, Wed Dec 1 02:12:18 2004 UTC vs. Revision 1.49 by root, Thu Feb 3 10:24:10 2005 UTC

Diff Legend

Comparing rxvt-unicode/src/xdefaults.C (file contents):
Revision 1.42 by root, Wed Dec 1 02:12:18 2004 UTC vs.
Revision 1.49 by root, Thu Feb 3 10:24:10 2005 UTC