--- rxvt-unicode/src/xdefaults.C 2007/09/12 21:06:08 1.114 +++ rxvt-unicode/src/xdefaults.C 2008/01/20 01:15:35 1.132 @@ -7,6 +7,7 @@ * - original version * Copyright (c) 1997,1998 mj olesen * Copyright (c) 2003-2006 Marc Lehmann + * Copyright (c) 2007 Emanuele Giaquinta * * 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 @@ -64,8 +65,8 @@ { (option), (Optflag_Switch | (flag)), -1, NULL, (opt), NULL, (desc)} /* convenient macros */ -#define optList_strlen(i) \ - (optList[i].flag ? 0 : (optList[i].arg ? strlen (optList[i].arg) : 1)) +#define optList_isString(i) \ + (optList[i].flag == 0) #define optList_isBool(i) \ (optList[i].flag & Optflag_Boolean) #define optList_isReverse(i) \ @@ -111,12 +112,12 @@ BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"), #if ENABLE_TRANSPARENCY BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"), - SWCH ("tr", Opt_transparent, 0, NULL), + 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", "%", "shade background by x %."), + STRG (Rs_shade, "shading", "sh", "number", "shade background by number %."), #endif #if OFF_FOCUS_FADING - STRG (Rs_fade, "fading", "fade", "%", "fade colors x% percent when rxvt-unicode is losing focus"), + 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 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"), @@ -169,14 +170,14 @@ 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 */ +#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 */ +#endif /* KEEP_SCROLLCOLOR */ #ifdef OPTION_HC STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"), #endif @@ -184,7 +185,7 @@ 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 */ +#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"), @@ -205,7 +206,7 @@ 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 /* 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 */ @@ -227,9 +228,11 @@ 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, 0, "borderless window"), - BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"), STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"), #endif +#ifdef BUILTIN_GLYPHS + BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"), +#endif #ifdef POINTER_BLANK RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), #endif @@ -239,14 +242,13 @@ #ifndef NO_DELETE_KEY RSTRG (Rs_delete_key, "deletekey", "string"), #endif - RSTRG (Rs_selectstyle, "selectstyle", "mode"), #ifdef PRINTPIPE RSTRG (Rs_print_pipe, "print-pipe", "string"), #endif STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"), #ifdef CUTCHAR_RESOURCE RSTRG (Rs_cutchars, "cutchars", "string"), -#endif /* CUTCHAR_RESOURCE */ +#endif /* CUTCHAR_RESOURCE */ RSTRG (Rs_answerbackstring, "answerbackString", "string"), #ifndef NO_SECONDARY_SCREEN BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"), @@ -265,9 +267,6 @@ 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"), #endif -#ifndef NO_RESOURCES - INFO ("xrm", "string", "X resource"), -#endif INFO ("e", "command arg ...", "command to execute") }; @@ -416,25 +415,22 @@ { int len = 0; - if (!optList_isBool (i)) - { - len = optList_strlen (i); - if (len > 0) - len++; /* account for space */ - } + if (optList[i].arg) + len = strlen (optList[i].arg) + 1; #ifdef DEBUG_STRICT assert (optList[i].opt != NULL); #endif len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); col += len; if (col > 79) - { /* assume regular width */ + { + /* assume regular width */ rxvt_log ("\n"); col = 1 + len; } rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); - if (optList_strlen (i)) + if (optList[i].arg) rxvt_log (" %s]", optList[i].arg); else rxvt_log ("]"); @@ -496,20 +492,21 @@ for (i = 1; i < argc; i++) { unsigned int entry, longopt = 0; - const char *flag, *opt; + const char *opt; + int flag; opt = argv[i]; if (*opt == '-') { - flag = resval_on; + flag = 1; if (*++opt == '-') longopt = *opt++; /* long option */ } else if (*opt == '+') { - flag = resval_off; + flag = 0; if (*++opt == '+') longopt = *opt++; /* long option */ @@ -537,9 +534,9 @@ if (entry < optList_size) { if (optList_isReverse (entry)) - flag = flag == resval_on ? resval_off : resval_on; + flag = !flag; - if (optList_strlen (entry)) + if (optList_isString (entry)) { /* * special cases are handled in main.c:main () to allow @@ -549,35 +546,45 @@ if (optList[entry].doff != -1) { - if (flag == resval_on && !argv [i+1]) - rxvt_fatal ("option '%s' needs an argument, aborting.\n", argv [i]); + if (flag && i+1 == argc) + rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]); - rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef; + rs[optList[entry].doff] = flag ? argv[++i] : resval_undef; } } else - { /* boolean value */ - set_option (optList[entry].index, flag == resval_on); + { + /* boolean value */ + set_option (optList[entry].index, flag); if (optList[entry].doff != -1) - rs[optList[entry].doff] = flag; + rs[optList[entry].doff] = flag ? resval_on : resval_off; } } - else +#ifndef NO_RESOURCES + else if (!strcmp (opt, "xrm")) + { + if (i+1 < argc) + XrmPutLineResource (&option_db, argv[++i]); + } +#endif #ifdef KEYSYM_RESOURCE - if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) - { - const char *str = argv[++i]; - - if (str != NULL) - parse_keysym (opt + sizeof ("keysym.") - 1, str); - } - else -#endif - { - bad_option = 1; - rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); - } + else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) + { + if (i+1 < argc) + { + char *res = (char *)malloc (strlen (opt) + strlen (argv[++i]) + 6); + sprintf (res, "*.%s: %s\n", opt, argv[i]); + XrmPutLineResource (&option_db, res); + free (res); + } + } +#endif + else + { + bad_option = 1; + rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); + } } if (bad_option) @@ -618,12 +625,7 @@ /* * look for something like this (XK_Delete) * rxvt*keysym.0xFFFF: "\177" - * - * 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 { @@ -631,7 +633,7 @@ unsigned short len; unsigned short value; }; -keysym_vocabulary_t keysym_vocabulary[] = +static const keysym_vocabulary_t keysym_vocabulary[] = { { "ISOLevel3", 9, Level3Mask }, { "AppKeypad", 9, AppKeypadMask }, @@ -663,30 +665,21 @@ int rxvt_term::parse_keysym (const char *str, const char *arg) { - int n, sym; + int sym; unsigned int state = 0; - const char *pmodend = NULL; - char *newarg = NULL; - char newargstr[NEWARGLIM]; - - if (arg == NULL) - { - n = sizeof ("keysym.") - 1; - if (strncmp (str, "keysym.", n)) - return 0; + const char *key = strrchr (str, '-'); - str += n; /* skip `keysym.' */ - if (!(pmodend = strchr (str, ':'))) - return -1; - } + if (!key) + key = str; else - pmodend = str + strlen(str); + key++; - for (--pmodend; str < pmodend; --pmodend) - if (*pmodend == '-') - break; + // string or key is empty + if (*arg == '\0' || *key == '\0') + return -1; - while (str < pmodend) + // parse modifiers + while (str < key) { unsigned int i; @@ -707,63 +700,22 @@ ++str; } - /* some scanf () have trouble with a 0x prefix */ - if (str[0] == '0' && toupper (str[1]) == 'X') - { - str += 2; - - if (arg) - { - if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1) - return -1; - } - else - { - if (sscanf (str, "%x:", &sym) != 1) - return -1; - - /* cue to ':', it's there since sscanf () worked */ - strncpy (newargstr, strchr (str, ':') + 1, NEWARGLIM - 1); - newargstr[NEWARGLIM - 1] = '\0'; - newarg = newargstr; - } - } - else + // convert keysym name to keysym number + if ((sym = XStringToKeysym (str)) == None) { - /* - * 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) + // fallback on hexadecimal parsing + char *end; + sym = strtol (str, &end, 16); + if (*end) return -1; - } + } - if (newarg == NULL) - { - strncpy (newargstr, arg, NEWARGLIM - 1); - newargstr[NEWARGLIM - 1] = '\0'; - newarg = newargstr; - } - - if (*newarg == '\0') - return -1; - - keyboard->register_user_translation (sym, state, newarg); + keyboard->register_user_translation (sym, state, arg); return 1; } -# endif /* KEYSYM_RESOURCE */ -#endif /* NO_RESOURCES */ +# endif /* KEYSYM_RESOURCE */ +#endif /* NO_RESOURCES */ static char * get_res (XrmDatabase database, const char *program, const char *option) @@ -805,6 +757,9 @@ rxvt_term::extract_resources () { #ifndef NO_RESOURCES + XrmDatabase database = XrmGetDatabase (dpy); + XrmMergeDatabases (option_db, &database); + option_db = NULL; /* * Query resources for options that affect us */ @@ -843,7 +798,6 @@ * [R5 or later]: enumerate the resource database */ # ifdef KEYSYM_RESOURCE - XrmDatabase database = XrmGetDatabase (dpy); XrmName name_prefix[3]; XrmClass class_prefix[3]; @@ -867,7 +821,7 @@ # endif # endif -#endif /* NO_RESOURCES */ +#endif /* NO_RESOURCES */ } /*----------------------- end-of-file (C source) -----------------------*/