--- rxvt-unicode/src/xdefaults.C 2004/03/04 00:59:10 1.16 +++ rxvt-unicode/src/xdefaults.C 2004/07/30 22:36:42 1.28 @@ -1,12 +1,12 @@ /*--------------------------------*-C-*---------------------------------* - * File: xdefaults.c + * File: xdefaults.C *----------------------------------------------------------------------* - * $Id: xdefaults.C,v 1.16 2004/03/04 00:59:10 pcg Exp $ * * All portions of code are copyright by their respective author/s. * Copyright (c) 1994 Robert Nation * - original version * Copyright (c) 1997,1998 mj olesen + * Copyright (c) 2003-2004 Marc Lehmann * * 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 @@ -85,39 +85,37 @@ optList[] = { STRG (Rs_display_name, NULL, "d", NULL, NULL), /* short form */ STRG (Rs_display_name, NULL, "display", "string", "X server to contact"), - STRG (Rs_term_name, "termName", "tn", "string", - "value of the TERM environment variable"), + STRG (Rs_term_name, "termName", "tn", "string", "value of the TERM environment variable"), STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */ - STRG (Rs_geometry, "geometry", "geometry", "geometry", - "size (in characters) and position"), + STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"), SWCH ("C", Opt_console, "intercept console messages"), SWCH ("iconic", Opt_iconic, "start iconic"), SWCH ("ic", Opt_iconic, NULL), /* short form */ - BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, - "reverse video"), + 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"), #ifdef HAVE_SCROLLBARS 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"), -#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"), + 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"), +#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 - BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, - "inherit parent pixmap"), - BOOL (Rs_transparent_all, "inheritPixmapforce", "ipf", Opt_transparent_all, - "forcefully inherit root pixmap"), + 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 + STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"), +#endif +#endif +#ifdef OFF_FOCUS_FADING + STRG (Rs_fade, "fading", "fade", "%", "make colors x% darker when urxvt is losing focus."), +#endif +#ifdef TINTING + STRG (Rs_shade, "shading", "sh", "%", "shade background by x% when tinting."), #endif BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"), #ifndef NO_BELL @@ -130,12 +128,11 @@ BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, NULL), #endif #ifdef MOUSE_WHEEL - BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, - NULL), + BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, NULL), #endif #ifndef NO_FRILLS - BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, - "triple click word selection"), + BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, "triple click word selection"), + BOOL (Rs_insecure, "insecure", "insecure", Opt_insecure, "enable possibly insecure escape sequences"), #endif #ifdef CURSOR_BLINK BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"), @@ -164,6 +161,7 @@ RSTRG (Rs_color + minBrightCOLOR + 7, "color15", "color"), #endif /* NO_BRIGHTCOLOR */ #ifndef NO_BOLD_UNDERLINE_REVERSE + BOOL (Rs_realBold, "realBold", "rb", Opt_realBold, "use bold fonts for bold text"), RSTRG (Rs_color + Color_BD, "colorBD", "color"), RSTRG (Rs_color + Color_UL, "colorUL", "color"), RSTRG (Rs_color + Color_RV, "colorRV", "color"), @@ -179,8 +177,7 @@ 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_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), #endif /* XPM_BACKGROUND */ #if (MENUBAR_MAX) RSTRG (Rs_menu, "menu", "name[;tag]"), @@ -189,14 +186,12 @@ /* fonts: command-line option = resource name */ #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"), + 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 #endif /* USE_XIM */ - STRG (Rs_name, NULL, "name", "string", - "client instance, icon, and title strings"), + 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"), @@ -205,26 +200,20 @@ /* command-line option = resource name */ RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), #endif /* NO_CURSORCOLOR */ - STRG (Rs_color + Color_pointer, "pointerColor", "pr", "color", - "pointer color"), - STRG (Rs_color + Color_border, "borderColor", "bd", "color", - "border color"), - STRG (Rs_saveLines, "saveLines", "sl", "number", - "number of scrolled lines to save"), + 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"), #ifndef NO_FRILLS - STRG (Rs_ext_bwidth, "externalBorder", "w", "number", - "external border in pixels"), + 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"), + STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), #endif #ifndef NO_LINESPACE - STRG (Rs_lineSpace, "lineSpace", "lsp", "number", - "number of extra pixels between rows"), + 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"), + STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"), #ifdef POINTER_BLANK RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), #endif @@ -242,20 +231,16 @@ #ifdef PRINTPIPE RSTRG (Rs_print_pipe, "print-pipe", "string"), #endif -#if defined (HOTKEY_CTRL) || defined (HOTKEY_META) - RSTRG (Rs_bigfont_key, "bigfont_key", "keysym"), - RSTRG (Rs_smallfont_key, "smallfont_key", "keysym"), -#endif - STRG (Rs_modifier, "modifier", "mod", "modifier", - "meta modifier = alt|meta|hyper|super|mod1|...|mod5"), + 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 */ -#ifdef ACS_ASCII - RSTRG (Rs_acs_chars, "acsChars", "string"), -#endif /* ACS_ASCII */ 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 INFO ("e", "command arg ...", "command to execute") }; @@ -349,16 +334,15 @@ static void rxvt_usage (int type) { - unsigned int i, col; + unsigned int i, col; - write (STDERR_FILENO, releasestring, sizeof (releasestring) - 1); - write (STDERR_FILENO, optionsstring, sizeof (optionsstring) - 1); - write (STDERR_FILENO, RESNAME, sizeof (RESNAME) - 1); + rxvt_log ("%s%s%s", releasestring, optionsstring, RESNAME); switch (type) { case 0: /* brief listing */ - fprintf (stderr, " [-help] [--help]\n"); + rxvt_log (" [-help] [--help]\n"); + for (col = 1, i = 0; i < optList_size (); i++) if (optList[i].desc != NULL) { @@ -377,59 +361,59 @@ col += len; if (col > 79) { /* assume regular width */ - putc ('\n', stderr); + rxvt_log ("\n"); col = 1 + len; } - fprintf (stderr, " [-%s%s", (optList_isBool (i) ? "/+" : ""), - optList[i].opt); + + rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); if (optList_strlen (i)) - fprintf (stderr, " %s]", optList[i].arg); + rxvt_log (" %s]", optList[i].arg); else - fprintf (stderr, "]"); + rxvt_log ("]"); } break; case 1: /* full command-line listing */ - fprintf (stderr, " [options] [-e command args]\n\n" - "where options include:\n"); + rxvt_log (" [options] [-e command args]\n\nwhere options include:\n"); + for (i = 0; i < optList_size (); i++) if (optList[i].desc != NULL) { #ifdef DEBUG_STRICT assert (optList[i].opt != NULL); #endif - fprintf (stderr, " %s%s %-*s%s%s\n", - (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, - (INDENT - STRLEN (optList[i].opt) - + (optList_isBool (i) ? 0 : 2)), - (optList[i].arg ? optList[i].arg : ""), - (optList_isBool (i) ? "turn on/off " : ""), - optList[i].desc); + rxvt_log (" %s%s %-*s%s%s\n", + (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, + (INDENT - STRLEN (optList[i].opt) + + (optList_isBool (i) ? 0 : 2)), + (optList[i].arg ? optList[i].arg : ""), + (optList_isBool (i) ? "turn on/off " : ""), + optList[i].desc); } - fprintf (stderr, "\n --help to list long-options"); + rxvt_log ("\n --help to list long-options"); break; case 2: /* full resource listing */ - fprintf (stderr, - " [options] [-e command args]\n\n" - "where resources (long-options) include:\n"); + rxvt_log (" [options] [-e command args]\n\n" + "where resources (long-options) include:\n"); for (i = 0; i < optList_size (); i++) if (optList[i].kw != NULL) - fprintf (stderr, " %s: %*s%s\n", + 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 - fprintf (stderr, " " "keysym.sym" ": %*s%s\n", + rxvt_log (" " "keysym.sym" ": %*s%s\n", (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */ "keysym"); #endif - fprintf (stderr, "\n -help to list options"); + rxvt_log ("\n -help to list options"); break; } - fprintf (stderr, "\n\n"); - exit (EXIT_FAILURE); + + rxvt_log ("\n\n"); + rxvt_exit_failure (); /* NOTREACHED */ } @@ -466,7 +450,7 @@ else { bad_option = 1; - rxvt_print_error ("bad option \"%s\"", opt); + rxvt_warn ("\"%s\": malformed option.\n", opt); continue; } @@ -486,32 +470,18 @@ { if (optList_isReverse (entry)) flag = flag == On ? Off : On; - if (optList_strlen (entry)) - { /* string value */ - const char *str = argv[++i]; -#ifdef DEBUG_RESOURCES - fprintf (stderr, "string (%s,%s) = ", - optList[entry].opt ? optList[entry].opt : "nil", - optList[entry].kw ? optList[entry].kw : "nil"); -#endif - if (flag == On && str && (optList[entry].doff != -1)) - { -#ifdef DEBUG_RESOURCES - fprintf (stderr, "\"%s\"\n", str); -#endif - rs[optList[entry].doff] = str; - /* - * special cases are handled in main.c:main () to allow - * X resources to set these values before we settle for - * default values - */ - } -#ifdef DEBUG_RESOURCES - else - fprintf (stderr, "???\n"); -#endif + if (optList_strlen (entry)) + { + /* + * special cases are handled in main.c:main () to allow + * X resources to set these values before we settle for + * default values + */ + if (optList[entry].doff != -1) + rs[optList[entry].doff] = flag == On && argv[i+1] + ? argv[++i] : 0; } else { /* boolean value */ @@ -533,14 +503,17 @@ /* if (!STRNCMP (opt, "keysym.", sizeof ("keysym.") - 1)) */ if (rxvt_Str_match (opt, "keysym.")) { - const char *str = argv[++i]; + const char *str = argv[++i]; if (str != NULL) parse_keysym (opt + sizeof ("keysym.") - 1, str); } else #endif - bad_option = 1; + { + bad_option = 1; + rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); + } } if (bad_option) @@ -677,6 +650,7 @@ if (stream == NULL) return; + len = STRLEN (name); while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL) { @@ -695,10 +669,11 @@ # endif /* KEYSYM_RESOURCE */ for (entry = 0; entry < optList_size (); entry++) { - const char *kw = optList[entry].kw; + const char *kw = optList[entry].kw; if (kw == NULL) continue; + n = STRLEN (kw); if (str[n] == ':' && rxvt_Str_match (str, kw)) { @@ -732,24 +707,30 @@ } rs[optList[entry].doff] = p; + allocated.push_back (p); + if (optList_isBool (entry)) { s = STRCASECMP (str, "TRUE") == 0 || STRCASECMP (str, "YES") == 0 || STRCASECMP (str, "ON") == 0 || STRCASECMP (str, "1") == 0; + if (optList_isReverse (entry)) s = !s; + if (s) - Options |= (optList[entry].flag); + Options |= optList[entry].flag; else - Options &= ~ (optList[entry].flag); + Options &= ~optList[entry].flag; } } + break; } } } + rewind (stream); } @@ -770,7 +751,7 @@ # 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 = NULL; if (locale != NULL) { /* XXX: must limit length of string */ @@ -788,15 +769,15 @@ /* * get resources using the X library function */ - int entry; + int entry; # ifdef XrmEnumOneLevel - int i; - char *displayResource, *xe; - XrmName name_prefix[3]; - XrmClass class_prefix[3]; - XrmDatabase database, rdb1; - char fname[1024]; + int i; + char *displayResource, *xe; + XrmName name_prefix[3]; + XrmClass class_prefix[3]; + XrmDatabase database, rdb1; + char fname[1024]; XrmInitialize (); database = NULL; @@ -819,7 +800,7 @@ { sprintf (fname, "%-.*s/%s", sizeof (fname) - STRLEN (xnames[i]) - 2, ptr, xnames[i]); - if ((rdb1 = XrmGetFileDatabase (fname)) != NULL) + if ((rdb1 = XrmGetFileDatabase (fname))) { XrmMergeDatabases (rdb1, &database); # ifndef HAVE_BOTH_XRESOURCE_FILES @@ -980,9 +961,8 @@ # 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) @@ -1013,22 +993,6 @@ # endif #endif /* NO_RESOURCES */ - - /* - * even without resources, at least do this setup for command-line - * options and command-line long options - */ - -#if defined (HOTKEY_CTRL) || defined (HOTKEY_META) - KeySym sym; - - if (rs[Rs_bigfont_key] - && ((sym = XStringToKeysym (rs[Rs_bigfont_key])) != 0)) - ks_bigfont = sym; - if (rs[Rs_smallfont_key] - && ((sym = XStringToKeysym (rs[Rs_smallfont_key])) != 0)) - ks_smallfont = sym; -#endif } /*}}} */