--- rxvt-unicode/src/xdefaults.C 2004/12/01 02:12:18 1.42 +++ rxvt-unicode/src/xdefaults.C 2005/12/31 16:06:48 1.63 @@ -31,9 +31,13 @@ #include "rxvt.h" /* NECESSARY */ #include "version.h" -/* #define DEBUG_RESOURCES */ +#include -static const char *const xnames[2] = { ".Xdefaults", ".Xresources" }; +#ifdef KEYSYM_RESOURCE +#include "keyboard.h" +#endif + +/* #define DEBUG_RESOURCES */ /*{{{ monolithic option/resource structure: */ /* @@ -69,7 +73,7 @@ (optList[i].flag & Opt_Boolean) #define optList_isReverse(i) \ (optList[i].flag & Opt_Reverse) -#define optList_size() \ +#define optList_size \ (sizeof (optList) / sizeof (optList[0])) static const struct @@ -94,27 +98,30 @@ 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 +#if 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"), -#ifdef TRANSPARENT +#if TRANSPARENT BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, "inherit parent pixmap"), - BOOL (Rs_transparent_all, "inheritPixmapforce", "ipf", Opt_transparent_all, "forcefully inherit root pixmap"), SWCH ("tr", Opt_transparent, NULL), -#if TINTING +# if TINTING STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"), +# endif #endif +#if OFF_FOCUS_FADING + STRG (Rs_fade, "fading", "fade", "%", "fade colors x% percent when rxvt-unicode is losing focus"), + STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"), #endif -#ifdef OFF_FOCUS_FADING - STRG (Rs_fade, "fading", "fade", "%", "make colors x% darker when rxvt-unicode is losing focus."), -#endif -#ifdef TINTING +#if TINTING STRG (Rs_shade, "shading", "sh", "%", "shade background by x% when tinting."), #endif BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"), @@ -133,8 +140,9 @@ #if ENABLE_FRILLS BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, "triple click word selection"), BOOL (Rs_insecure, "insecure", "insecure", Opt_insecure, "enable possibly insecure escape sequences"), + BOOL (Rs_cursorUnderline, "cursorUnderline", "uc", Opt_cursorUnderline, "underline cursor"), #endif -#ifdef CURSOR_BLINK +#if CURSOR_BLINK BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"), #endif #ifdef POINTER_BLANK @@ -166,6 +174,9 @@ 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"), @@ -173,6 +184,14 @@ #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) */ @@ -188,38 +207,32 @@ 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, "font styles imply intensity changes"), #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_XEMBED + STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"), +#endif #if ENABLE_FRILLS + STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"), + BOOL (Rs_hold, "hold", "hold", Opt_hold, "retain window after shell exit"), 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 @@ -230,15 +243,10 @@ 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 */ @@ -247,6 +255,11 @@ BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"), BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"), #endif +#if 0 && TODO +#if !defined(NO_RESOURCES) && defined(USE_XGETDEFAULT) + INFO ("xrm", "string", "X resource"), +#endif +#endif INFO ("e", "command arg ...", "command to execute") }; @@ -357,9 +370,6 @@ #if defined(ENABLE_FRILLS) "frills," #endif -#if !defined(NO_LINESPACE) - "linespace," -#endif #if defined(PREFER_24BIT) "24bit," #endif @@ -408,7 +418,7 @@ case 0: /* brief listing */ rxvt_log (" [-help] [--help]\n"); - for (col = 1, i = 0; i < optList_size (); i++) + for (col = 1, i = 0; i < optList_size; i++) if (optList[i].desc != NULL) { int len = 0; @@ -441,7 +451,7 @@ 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 < optList_size; i++) if (optList[i].desc != NULL) { #ifdef DEBUG_STRICT @@ -462,7 +472,7 @@ 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 < optList_size; i++) if (optList[i].kw != NULL) rxvt_log (" %s: %*s%s\n", optList[i].kw, @@ -493,8 +503,8 @@ for (i = 1; i < argc; i++) { - unsigned int entry, longopt = 0; - const char *flag, *opt; + unsigned int entry, longopt = 0; + const char *flag, *opt; opt = argv[i]; #ifdef DEBUG_RESOURCES @@ -525,13 +535,13 @@ rxvt_usage (0); /* feature: always try to match long-options */ - for (entry = 0; entry < optList_size (); entry++) + for (entry = 0; entry < optList_size; 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 < optList_size) { if (optList_isReverse (entry)) flag = flag == On ? Off : On; @@ -555,9 +565,9 @@ optList[entry].opt, optList[entry].kw, flag); #endif if (flag == On) - options |= (optList[entry].flag); + options |= optList[entry].flag; else - options &= ~ (optList[entry].flag); + options &= ~optList[entry].flag; if (optList[entry].doff != -1) rs[optList[entry].doff] = flag; @@ -606,10 +616,11 @@ 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; @@ -624,24 +635,93 @@ * 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; - char *key_string, *newarg = NULL; - char newargstr[NEWARGLIM]; + int n, sym; + unsigned int state = 0; + const char *pmodend = NULL; + char *newarg = NULL; + 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) @@ -665,38 +745,31 @@ */ 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; - strncpy (key_string + 1, newarg, n); - Keysym_map[sym] = (unsigned char *)key_string; + keyboard->register_user_translation (sym, state, newarg); return 1; } @@ -719,7 +792,7 @@ len = strlen (name); while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL) { - unsigned int entry, n; + unsigned int entry, n; while (*str && isspace (*str)) str++; /* leading whitespace */ @@ -732,7 +805,7 @@ # ifdef KEYSYM_RESOURCE if (!parse_keysym (str, NULL)) # endif /* KEYSYM_RESOURCE */ - for (entry = 0; entry < optList_size (); entry++) + for (entry = 0; entry < optList_size; entry++) { const char *kw = optList[entry].kw; @@ -746,6 +819,7 @@ str += n + 1; rxvt_Str_trim (str); n = strlen (str); + if (n && rs[optList[entry].doff] == NULL) { /* not already set */ @@ -776,10 +850,10 @@ if (optList_isBool (entry)) { - s = strcasecmp (str, "TRUE") == 0 - || strcasecmp (str, "YES") == 0 - || strcasecmp (str, "ON") == 0 - || strcasecmp (str, "1") == 0; + s = strcasecmp (str, "true") == 0 + || strcasecmp (str, "yes") == 0 + || strcasecmp (str, "on") == 0 + || strcmp (str, "1") == 0; if (optList_isReverse (entry)) s = !s; @@ -809,254 +883,251 @@ */ /* ARGSUSED */ void -rxvt_term::extract_resources (Display *display __attribute__ ((unused)), const char *name) +rxvt_term::extract_resources () { + dDisp; + #ifndef NO_RESOURCES + char *homedir = (char *)getenv ("HOME"); + char fname[1024]; + # if defined XAPPLOADDIR # if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) /* Compute the path of the possibly available localized Rxvt file */ - char *localepath = NULL; + char localepath[1024]; - if (locale != NULL) - { /* XXX: must limit length of string */ - localepath = (char *)rxvt_malloc (256); - sprintf (localepath, XAPPLOADDIRLOCALE "/" RESCLASS, - (int) (258 - sizeof (XAPPLOADDIRLOCALE) - sizeof (RESCLASS)), - locale); /* 258 = 255 + 4 (-.*s) - 1 (/) */ - } - - { + if (locale) + snprintf (localepath, sizeof (localepath), XAPPLOADDIRLOCALE "/" RESCLASS, locale); + else + localepath[0] = 0; # endif # endif # ifdef USE_XGETDEFAULT - /* - * get resources using the X library function - */ - int entry; + /* + * get resources using the X library function + */ + int entry; # ifdef XrmEnumOneLevel - int i; - char *displayResource, *xe; - XrmName name_prefix[3]; - XrmClass class_prefix[3]; - XrmDatabase database, rdb1; - char fname[1024]; - - XrmInitialize (); - database = NULL; - - /* Get any Xserver defaults */ - - displayResource = XResourceManagerString (display); - if (displayResource != NULL) - database = XrmGetStringDatabase (displayResource); + char *displayResource, *xe; + XrmName name_prefix[3]; + XrmClass class_prefix[3]; + XrmDatabase database, rdb1; + + XrmInitialize (); + database = NULL; + + // for ordering, see for example http://www.faqs.org/faqs/Xt-FAQ/ Subject: 20 -# ifdef HAVE_EXTRA_XRESOURCE_FILES - /* Add in ~/.Xdefaults or ~/.Xresources */ + // 6. System wide per application default file. + /* Add in Rxvt file */ +# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) + if (*localepath + && ((rdb1 = XrmGetFileDatabase (localepath)) + || (rdb1 = XrmGetFileDatabase (XAPPLOADDIR "/" RESCLASS)))) +# endif + XrmMergeDatabases (rdb1, &database); + + /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */ + if ((xe = (char *)getenv ("XAPPLRESDIR"))) { - char *ptr; + snprintf (fname, sizeof (fname), "%s/%s", xe, RESCLASS); - if ((ptr = (char *)getenv ("HOME")) == NULL) - ptr = "."; + if ((rdb1 = XrmGetFileDatabase (fname))) + XrmMergeDatabases (rdb1, &database); + } - for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++) - { - sprintf (fname, "%-.*s/%s", sizeof (fname) - strlen (xnames[i]) - 2, - ptr, xnames[i]); - if ((rdb1 = XrmGetFileDatabase (fname))) - { - XrmMergeDatabases (rdb1, &database); -# ifndef HAVE_BOTH_XRESOURCE_FILES - break; -# endif + // 5. User's per application default file. + // none - } - } + // 4. User's defaults file. + /* Get any Xserver defaults */ + displayResource = XResourceManagerString (disp); + if (displayResource != NULL) + { + if ((rdb1 = XrmGetStringDatabase (displayResource))) + XrmMergeDatabases (rdb1, &database); } -# endif + else if (homedir) + { + snprintf (fname, sizeof (fname), "%s/.Xdefaults", homedir); - /* Add in XENVIRONMENT file */ + if ((rdb1 = XrmGetFileDatabase (fname))) + XrmMergeDatabases (rdb1, &database); + } - if ((xe = (char *)getenv ("XENVIRONMENT")) != NULL - && (rdb1 = XrmGetFileDatabase (xe)) != NULL) - XrmMergeDatabases (rdb1, &database); + /* Get screen specific resources */ + displayResource = XScreenResourceString (ScreenOfDisplay (disp, display->screen)); + if (displayResource != NULL) + { + if ((rdb1 = XrmGetStringDatabase (displayResource))) + /* Merge with screen-independent resources */ + XrmMergeDatabases (rdb1, &database); - /* Add in Rxvt file */ -# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) - if (localepath == NULL || (rdb1 = XrmGetFileDatabase (localepath)) == NULL) -# endif - rdb1 = XrmGetFileDatabase (XAPPLOADDIR "/" RESCLASS); + XFree (displayResource); + } - if (rdb1 != NULL) - XrmMergeDatabases (rdb1, &database); + // 3. User's per host defaults file + /* Add in XENVIRONMENT file */ + if ((xe = (char *)getenv ("XENVIRONMENT")) + && (rdb1 = XrmGetFileDatabase (xe))) + XrmMergeDatabases (rdb1, &database); + else if (homedir) + { + struct utsname un; - /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */ - if ((xe = (char *)getenv ("XAPPLRESDIR")) != NULL) - { - sprintf (fname, "%-.*s/" RESCLASS, sizeof (fname) - - sizeof (RESCLASS) - 2, xe); - if ((rdb1 = XrmGetFileDatabase (fname)) != NULL) - XrmMergeDatabases (rdb1, &database); - } + if (!uname (&un)) + { + snprintf (fname, sizeof (fname), "%s/.Xdefaults-%s", homedir, un.nodename); - XrmSetDatabase (display, database); + if ((rdb1 = XrmGetFileDatabase (fname))) + XrmMergeDatabases (rdb1, &database); + } + } + + XrmSetDatabase (disp, database); # endif - /* - * Query resources for options that affect us - */ - for (entry = 0; entry < optList_size (); entry++) - { - int s; - char *p, *p0; - const char *kw = optList[entry].kw; - - if (kw == NULL || rs[optList[entry].doff] != NULL) - continue; /* previously set */ - - p = XGetDefault (display, name, kw); - p0 = XGetDefault (display, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw); - if (p == NULL || (p0 && strcmp (p, p0) == 0)) - { - p = XGetDefault (display, RESCLASS, kw); + /* + * Query resources for options that affect us + */ + for (entry = 0; entry < optList_size; entry++) + { + int s; + char *p, *p0; + const char *kw = optList[entry].kw; + + if (kw == NULL || rs[optList[entry].doff] != NULL) + continue; /* previously set */ + + p = XGetDefault (disp, rs[Rs_name], kw); + p0 = XGetDefault (disp, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw); + if (p == NULL || (p0 && strcmp (p, p0) == 0)) + { + p = XGetDefault (disp, RESCLASS, kw); #ifdef RESFALLBACK - if (p == NULL || (p0 && strcmp (p, p0) == 0)) - p = XGetDefault (display, RESFALLBACK, kw); + if (p == NULL || (p0 && strcmp (p, p0) == 0)) + p = XGetDefault (disp, RESFALLBACK, kw); #endif - } + } - if (p == NULL && p0) - p = p0; + if (p == NULL && p0) + p = p0; - if (p) - { - rs[optList[entry].doff] = p; + if (p) + { + rs[optList[entry].doff] = p; - if (optList_isBool (entry)) - { - s = strcasecmp (p, "TRUE") == 0 - || strcasecmp (p, "YES") == 0 - || strcasecmp (p, "ON") == 0 - || strcasecmp (p, "1") == 0; - if (optList_isReverse (entry)) - s = !s; - if (s) - options |= (optList[entry].flag); - else - options &= ~ (optList[entry].flag); - } - } - } + if (optList_isBool (entry)) + { + s = strcasecmp (p, "TRUE") == 0 + || strcasecmp (p, "YES") == 0 + || strcasecmp (p, "ON") == 0 + || strcasecmp (p, "1") == 0; - /* - * [R5 or later]: enumerate the resource database - */ -# ifdef XrmEnumOneLevel -# ifdef KEYSYM_RESOURCE - name_prefix[0] = XrmStringToName (name); - name_prefix[1] = XrmStringToName ("keysym"); - name_prefix[2] = NULLQUARK; - class_prefix[0] = XrmStringToName (RESCLASS); - class_prefix[1] = XrmStringToName ("Keysym"); - class_prefix[2] = NULLQUARK; - /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ - XrmEnumerateDatabase (XrmGetDatabase (display), 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); - class_prefix[1] = XrmStringToName ("Keysym"); - /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ - XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix, - XrmEnumOneLevel, rxvt_define_key, NULL); -# endif + if (optList_isReverse (entry)) + s = !s; + + if (s) + options |= optList[entry].flag; + else + options &= ~optList[entry].flag; + } + } + } + + /* + * [R5 or later]: enumerate the resource database + */ +# ifdef KEYSYM_RESOURCE + name_prefix[0] = XrmStringToName (rs[Rs_name]); + name_prefix[1] = XrmStringToName ("keysym"); + name_prefix[2] = NULLQUARK; + class_prefix[0] = XrmStringToName (RESCLASS); + class_prefix[1] = XrmStringToName ("Keysym"); + class_prefix[2] = NULLQUARK; + /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ + XrmEnumerateDatabase (XrmGetDatabase (disp), 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); + class_prefix[1] = XrmStringToName ("Keysym"); + /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ + XrmEnumerateDatabase (XrmGetDatabase (disp), name_prefix, class_prefix, + XrmEnumOneLevel, rxvt_define_key, NULL); # endif # endif # else /* USE_XGETDEFAULT */ - /* get resources the hard way, but save lots of memory */ - FILE *fd = NULL; - char *home; + /* get resources the hard way, but save lots of memory */ + FILE *fd = NULL; - if ((home = getenv ("HOME")) != NULL) - { - unsigned int i, len = strlen (home) + 2; - char *f = NULL; - - for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++) - { - f = (char *)rxvt_realloc (f, (len + strlen (xnames[i])) * sizeof (char)); + if (homedir) + { + static const char *const xnames[2] = { ".Xdefaults", ".Xresources" }; - sprintf (f, "%s/%s", home, xnames[i]); + for (int i = 0; i < (sizeof (xnames) / sizeof (xnames [0])); i++) + { + snprintf (fname, sizeof (fname), "%s/%s", homedir, 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) - * @ application file resources (XAPPLOADDIR/Rxvt) - * @ class resources (~/.Xdefaults) - * @ private resources (~/.Xdefaults) - * - * However, for the hand-rolled resources, the matching algorithm - * checks if a resource string value has already been allocated - * and won't overwrite it with (in this case) a less specific - * resource value. - * - * This avoids multiple allocation. Also, when we've called this - * routine command-line string options have already been applied so we - * needn't to allocate for those resources. - * - * So, search in resources from most to least specific. - * - * Also, use a special sub-class so that we can use either or both of - * "XTerm" and "Rxvt" as class names. - */ + if ((fd = fopen (fname, "r")) != NULL) + break; + } + } + /* + * The normal order to match resources is the following: + * @ global resources (partial match, ~/.Xdefaults) + * @ application file resources (XAPPLOADDIR/Rxvt) + * @ class resources (~/.Xdefaults) + * @ private resources (~/.Xdefaults) + * + * However, for the hand-rolled resources, the matching algorithm + * checks if a resource string value has already been allocated + * and won't overwrite it with (in this case) a less specific + * resource value. + * + * This avoids multiple allocation. Also, when we've called this + * routine command-line string options have already been applied so we + * needn't to allocate for those resources. + * + * So, search in resources from most to least specific. + * + * Also, use a special sub-class so that we can use either or both of + * "XTerm" and "Rxvt" as class names. + */ - get_xdefaults (fd, name); - get_xdefaults (fd, RESCLASS); + get_xdefaults (fd, rs[Rs_name]); + get_xdefaults (fd, RESCLASS); # ifdef RESFALLBACK - get_xdefaults (fd, RESFALLBACK); + get_xdefaults (fd, RESFALLBACK); # endif # if defined(XAPPLOADDIR) && defined(USE_XAPPLOADDIR) - { - FILE *ad = NULL; + { + FILE *ad = NULL; # if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) - if (localepath == NULL || (ad = fopen (localepath, "r")) == NULL) + if (!*localepath || (ad = fopen (localepath, "r")) == NULL) # endif - ad = fopen (XAPPLOADDIR "/" RESCLASS, "r"); - if (ad != NULL) - { - get_xdefaults (ad, RESCLASS); - get_xdefaults (ad, ""); - fclose (ad); - } - } + ad = fopen (XAPPLOADDIR "/" RESCLASS, "r"); + if (ad != NULL) + { + get_xdefaults (ad, RESCLASS); + get_xdefaults (ad, ""); + fclose (ad); + } + } # endif /* XAPPLOADDIR */ - get_xdefaults (fd, ""); /* partial match */ - if (fd != NULL) - fclose (fd); + get_xdefaults (fd, ""); /* partial match */ + if (fd != NULL) + fclose (fd); # endif /* USE_XGETDEFAULT */ -# if defined XAPPLOADDIR -# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) - - } - - /* Free the path of the possibly available localized Rxvt file */ - free (localepath); -# endif -# endif - #endif /* NO_RESOURCES */ }