--- rxvt-unicode/src/xdefaults.C 2004/02/13 12:11:05 1.10 +++ rxvt-unicode/src/xdefaults.C 2004/02/13 12:16:21 1.11 @@ -1,7 +1,7 @@ /*--------------------------------*-C-*---------------------------------* * File: xdefaults.c *----------------------------------------------------------------------* - * $Id: xdefaults.C,v 1.10 2004/02/13 12:11:05 pcg Exp $ + * $Id: xdefaults.C,v 1.11 2004/02/13 12:16:21 pcg Exp $ * * All portions of code are copyright by their respective author/s. * Copyright (c) 1994 Robert Nation @@ -40,38 +40,38 @@ /* * `string' options MUST have a usage argument * `switch' and `boolean' options have no argument - * if there's no desc(ription), it won't appear in rxvt_usage() + * if there's no desc (ription), it won't appear in rxvt_usage () */ -/* INFO() - descriptive information only */ +/* INFO () - descriptive information only */ #define INFO(opt, arg, desc) \ {0, -1, NULL, (opt), (arg), (desc)} -/* STRG() - command-line option, with/without resource */ +/* STRG () - command-line option, with/without resource */ #define STRG(rsp, kw, opt, arg, desc) \ {0, (rsp), (kw), (opt), (arg), (desc)} -/* RSTRG() - resource/long-option */ +/* RSTRG () - resource/long-option */ #define RSTRG(rsp, kw, arg) \ {0, (rsp), (kw), NULL, (arg), NULL} -/* BOOL() - regular boolean `-/+' flag */ +/* BOOL () - regular boolean `-/+' flag */ #define BOOL(rsp, kw, opt, flag, desc) \ - {(Opt_Boolean|(flag)), (rsp), (kw), (opt), NULL, (desc)} + { (Opt_Boolean| (flag)), (rsp), (kw), (opt), NULL, (desc)} -/* SWCH() - `-' flag */ +/* SWCH () - `-' flag */ #define SWCH(opt, flag, desc) \ - {(flag), -1, NULL, (opt), NULL, (desc)} + { (flag), -1, NULL, (opt), NULL, (desc)} /* convenient macros */ #define optList_strlen(i) \ - (optList[i].flag ? 0 : (optList[i].arg ? STRLEN(optList[i].arg) : 1)) + (optList[i].flag ? 0 : (optList[i].arg ? STRLEN (optList[i].arg) : 1)) #define optList_isBool(i) \ (optList[i].flag & Opt_Boolean) #define optList_isReverse(i) \ (optList[i].flag & Opt_Reverse) #define optList_size() \ - (sizeof(optList) / sizeof(optList[0])) + (sizeof (optList) / sizeof (optList[0])) static const struct { @@ -83,189 +83,189 @@ const char *desc; /* description */ } 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", + 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_geometry, NULL, "g", NULL, NULL), /* short form */ - STRG(Rs_geometry, "geometry", "geometry", "geometry", + STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */ + 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, + 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_loginShell, "loginShell", "ls", Opt_loginShell, "login shell"), - BOOL(Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, "jump scrolling"), + 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, + 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", + BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, "scrollbar without a trough"), #endif - BOOL(Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, + BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, NULL), - BOOL(Rs_scrollTtyOutput, NULL, "si", Opt_Reverse | Opt_scrollTtyOutput, + BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_Reverse | Opt_scrollTtyOutput, "scroll-on-tty-output inhibit"), - BOOL(Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, + BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, "scroll-on-keypress"), - BOOL(Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, + BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, "scroll-with-buffer"), #ifdef TRANSPARENT - BOOL(Rs_transparent, "inheritPixmap", "ip", Opt_transparent, + BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, "inherit parent pixmap"), - BOOL(Rs_transparent_all, "inheritPixmapforce", "ipf", Opt_transparent_all, + BOOL (Rs_transparent_all, "inheritPixmapforce", "ipf", Opt_transparent_all, "forcefully inherit root pixmap"), - SWCH("tr", Opt_transparent, NULL), + SWCH ("tr", Opt_transparent, NULL), #endif - BOOL(Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"), + BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"), #ifndef NO_BELL - BOOL(Rs_visualBell, "visualBell", "vb", Opt_visualBell, "visual bell"), + BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, "visual bell"), # if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION) - BOOL(Rs_mapAlert, "mapAlert", NULL, Opt_mapAlert, NULL), + BOOL (Rs_mapAlert, "mapAlert", NULL, Opt_mapAlert, NULL), # endif #endif #ifdef META8_OPTION - BOOL(Rs_meta8, "meta8", NULL, Opt_meta8, NULL), + BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, NULL), #endif #ifdef MOUSE_WHEEL - BOOL(Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, + BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, NULL), #endif #ifdef MULTICHAR_SET - BOOL(Rs_mc_hack, "multibyte_cursor", "mcc", Opt_mc_hack, + BOOL (Rs_mc_hack, "multibyte_cursor", "mcc", Opt_mc_hack, "Multibyte character cursor movement"), #endif #ifndef NO_FRILLS - BOOL(Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, + BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, "triple click word selection"), #endif #ifdef CURSOR_BLINK - BOOL(Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"), + BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"), #endif #ifdef POINTER_BLANK - BOOL(Rs_pointerBlank, "pointerBlank", "pb", Opt_pointerBlank, "switch off pointer after delay"), + BOOL (Rs_pointerBlank, "pointerBlank", "pb", Opt_pointerBlank, "switch off pointer after delay"), #endif - STRG(Rs_color + Color_bg, "background", "bg", "color", "background color"), - STRG(Rs_color + Color_fg, "foreground", "fg", "color", "foreground color"), - RSTRG(Rs_color + minCOLOR + 0, "color0", "color"), - RSTRG(Rs_color + minCOLOR + 1, "color1", "color"), - RSTRG(Rs_color + minCOLOR + 2, "color2", "color"), - RSTRG(Rs_color + minCOLOR + 3, "color3", "color"), - RSTRG(Rs_color + minCOLOR + 4, "color4", "color"), - RSTRG(Rs_color + minCOLOR + 5, "color5", "color"), - RSTRG(Rs_color + minCOLOR + 6, "color6", "color"), - RSTRG(Rs_color + minCOLOR + 7, "color7", "color"), + STRG (Rs_color + Color_bg, "background", "bg", "color", "background color"), + STRG (Rs_color + Color_fg, "foreground", "fg", "color", "foreground color"), + RSTRG (Rs_color + minCOLOR + 0, "color0", "color"), + RSTRG (Rs_color + minCOLOR + 1, "color1", "color"), + RSTRG (Rs_color + minCOLOR + 2, "color2", "color"), + RSTRG (Rs_color + minCOLOR + 3, "color3", "color"), + RSTRG (Rs_color + minCOLOR + 4, "color4", "color"), + RSTRG (Rs_color + minCOLOR + 5, "color5", "color"), + RSTRG (Rs_color + minCOLOR + 6, "color6", "color"), + RSTRG (Rs_color + minCOLOR + 7, "color7", "color"), #ifndef NO_BRIGHTCOLOR - RSTRG(Rs_color + minBrightCOLOR + 0, "color8", "color"), - RSTRG(Rs_color + minBrightCOLOR + 1, "color9", "color"), - RSTRG(Rs_color + minBrightCOLOR + 2, "color10", "color"), - RSTRG(Rs_color + minBrightCOLOR + 3, "color11", "color"), - RSTRG(Rs_color + minBrightCOLOR + 4, "color12", "color"), - RSTRG(Rs_color + minBrightCOLOR + 5, "color13", "color"), - RSTRG(Rs_color + minBrightCOLOR + 6, "color14", "color"), - RSTRG(Rs_color + minBrightCOLOR + 7, "color15", "color"), + RSTRG (Rs_color + minBrightCOLOR + 0, "color8", "color"), + RSTRG (Rs_color + minBrightCOLOR + 1, "color9", "color"), + RSTRG (Rs_color + minBrightCOLOR + 2, "color10", "color"), + RSTRG (Rs_color + minBrightCOLOR + 3, "color11", "color"), + RSTRG (Rs_color + minBrightCOLOR + 4, "color12", "color"), + RSTRG (Rs_color + minBrightCOLOR + 5, "color13", "color"), + RSTRG (Rs_color + minBrightCOLOR + 6, "color14", "color"), + RSTRG (Rs_color + minBrightCOLOR + 7, "color15", "color"), #endif /* NO_BRIGHTCOLOR */ #ifndef NO_BOLD_UNDERLINE_REVERSE - RSTRG(Rs_color + Color_BD, "colorBD", "color"), - RSTRG(Rs_color + Color_UL, "colorUL", "color"), - RSTRG(Rs_color + Color_RV, "colorRV", "color"), + RSTRG (Rs_color + Color_BD, "colorBD", "color"), + RSTRG (Rs_color + Color_UL, "colorUL", "color"), + RSTRG (Rs_color + Color_RV, "colorRV", "color"), #endif /* ! NO_BOLD_UNDERLINE_REVERSE */ #ifdef KEEP_SCROLLCOLOR - RSTRG(Rs_color + Color_scroll, "scrollColor", "color"), - RSTRG(Rs_color + Color_trough, "troughColor", "color"), + 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"), + STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"), #endif #if defined (XPM_BACKGROUND) || (MENUBAR_MAX) - RSTRG(Rs_path, "path", "search path"), + RSTRG (Rs_path, "path", "search path"), #endif /* defined (XPM_BACKGROUND) || (MENUBAR_MAX) */ #ifdef XPM_BACKGROUND - STRG(Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", + STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), #endif /* XPM_BACKGROUND */ #if (MENUBAR_MAX) - RSTRG(Rs_menu, "menu", "name[;tag]"), + RSTRG (Rs_menu, "menu", "name[;tag]"), #endif - STRG(Rs_font, "font", "fn", "fontname", "normal text font"), + STRG (Rs_font, "font", "fn", "fontname", "normal text font"), /* 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", + 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"), + STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"), #endif #endif /* USE_XIM */ #ifdef GREEK_SUPPORT - STRG(Rs_greek_keyboard, "greek_keyboard", "grk", "mode", + STRG (Rs_greek_keyboard, "greek_keyboard", "grk", "mode", "greek keyboard mapping; mode = iso | ibm"), - RSTRG(Rs_greektoggle_key, "greektoggle_key", "keysym"), + RSTRG (Rs_greektoggle_key, "greektoggle_key", "keysym"), #endif - STRG(Rs_name, NULL, "name", "string", + 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"), + 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"), + STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), /* command-line option = resource name */ - RSTRG(Rs_color + Color_cursor2, "cursorColor2", "color"), + RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), #endif /* NO_CURSORCOLOR */ - STRG(Rs_color + Color_pointer, "pointerColor", "pr", "color", + STRG (Rs_color + Color_pointer, "pointerColor", "pr", "color", "pointer color"), - STRG(Rs_color + Color_border, "borderColor", "bd", "color", + STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), - STRG(Rs_saveLines, "saveLines", "sl", "number", + STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"), #ifndef NO_FRILLS - STRG(Rs_ext_bwidth, "externalBorder", "w", "number", + 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", + 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"), #endif #ifndef NO_LINESPACE - STRG(Rs_lineSpace, "lineSpace", "lsp", "number", + STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"), #endif - STRG(Rs_scrollBar_thickness, "thickness", "sbt", "number", + STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"), #ifdef POINTER_BLANK - RSTRG(Rs_pointerBlankDelay, "pointerBlankDelay", "number"), + RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), #endif #ifndef NO_BACKSPACE_KEY - RSTRG(Rs_backspace_key, "backspacekey", "string"), + RSTRG (Rs_backspace_key, "backspacekey", "string"), #endif #ifndef NO_DELETE_KEY - RSTRG(Rs_delete_key, "deletekey", "string"), + RSTRG (Rs_delete_key, "deletekey", "string"), #endif - RSTRG(Rs_selectstyle, "selectstyle", "mode"), - RSTRG(Rs_scrollstyle, "scrollstyle", "mode"), + RSTRG (Rs_selectstyle, "selectstyle", "mode"), + RSTRG (Rs_scrollstyle, "scrollstyle", "mode"), #ifdef HAVE_SCROLLBARS - RSTRG(Rs_scrollBar_align, "scrollBar_align", "mode"), + RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"), #endif #ifdef PRINTPIPE - RSTRG(Rs_print_pipe, "print-pipe", "string"), + 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"), + RSTRG (Rs_bigfont_key, "bigfont_key", "keysym"), + RSTRG (Rs_smallfont_key, "smallfont_key", "keysym"), #endif - STRG(Rs_modifier, "modifier", "mod", "modifier", + STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"), - INFO("xrm", "string", "X resource"), + INFO ("xrm", "string", "X resource"), #ifdef CUTCHAR_RESOURCE - RSTRG(Rs_cutchars, "cutchars", "string"), + RSTRG (Rs_cutchars, "cutchars", "string"), #endif /* CUTCHAR_RESOURCE */ #ifdef ACS_ASCII - RSTRG(Rs_acs_chars, "acsChars", "string"), + RSTRG (Rs_acs_chars, "acsChars", "string"), #endif /* ACS_ASCII */ - RSTRG(Rs_answerbackstring, "answerbackString", "string"), - INFO("e", "command arg ...", "command to execute") + RSTRG (Rs_answerbackstring, "answerbackString", "string"), + INFO ("e", "command arg ...", "command to execute") }; #undef INFO @@ -359,89 +359,89 @@ /*{{{ usage: */ /*----------------------------------------------------------------------*/ static void -rxvt_usage(int type) +rxvt_usage (int type) { unsigned int i, col; - write(STDERR_FILENO, releasestring, sizeof(releasestring) - 1); - write(STDERR_FILENO, optionsstring, sizeof(optionsstring) - 1); - write(STDERR_FILENO, APL_NAME, sizeof(APL_NAME) - 1); + write (STDERR_FILENO, releasestring, sizeof (releasestring) - 1); + write (STDERR_FILENO, optionsstring, sizeof (optionsstring) - 1); + write (STDERR_FILENO, APL_NAME, sizeof (APL_NAME) - 1); switch (type) { case 0: /* brief listing */ - fprintf(stderr, " [-help] [--help]\n"); - for (col = 1, i = 0; i < optList_size(); i++) + fprintf (stderr, " [-help] [--help]\n"); + for (col = 1, i = 0; i < optList_size (); i++) if (optList[i].desc != NULL) { int len = 0; - if (!optList_isBool(i)) + if (!optList_isBool (i)) { - len = optList_strlen(i); + len = optList_strlen (i); if (len > 0) len++; /* account for space */ } #ifdef DEBUG_STRICT - assert(optList[i].opt != NULL); + assert (optList[i].opt != NULL); #endif - len += 4 + STRLEN(optList[i].opt) + (optList_isBool(i) ? 2: 0); + len += 4 + STRLEN (optList[i].opt) + (optList_isBool (i) ? 2: 0); col += len; if (col > 79) { /* assume regular width */ - putc('\n', stderr); + putc ('\n', stderr); col = 1 + len; } - fprintf(stderr, " [-%s%s", (optList_isBool(i) ? "/+" : ""), + fprintf (stderr, " [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); - if (optList_strlen(i)) - fprintf(stderr, " %s]", optList[i].arg); + if (optList_strlen (i)) + fprintf (stderr, " %s]", optList[i].arg); else - fprintf(stderr, "]"); + fprintf (stderr, "]"); } break; case 1: /* full command-line listing */ - fprintf(stderr, " [options] [-e command args]\n\n" + fprintf (stderr, " [options] [-e command args]\n\n" "where 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 - assert(optList[i].opt != NULL); + 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)), + 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_isBool (i) ? "turn on/off " : ""), optList[i].desc); } - fprintf(stderr, "\n --help to list long-options"); + fprintf (stderr, "\n --help to list long-options"); break; case 2: /* full resource listing */ - fprintf(stderr, + fprintf (stderr, " [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) - fprintf(stderr, " %s: %*s%s\n", + fprintf (stderr, " %s: %*s%s\n", optList[i].kw, - (INDENT - STRLEN(optList[i].kw)), "", /* XXX */ - (optList_isBool(i) ? "boolean" : optList[i].arg)); + (INDENT - STRLEN (optList[i].kw)), "", /* XXX */ + (optList_isBool (i) ? "boolean" : optList[i].arg)); #ifdef KEYSYM_RESOURCE - fprintf(stderr, " " "keysym.sym" ": %*s%s\n", - (INDENT - sizeof("keysym.sym") + 1), "", /* XXX */ + fprintf (stderr, " " "keysym.sym" ": %*s%s\n", + (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */ "keysym"); #endif - fprintf(stderr, "\n -help to list options"); + fprintf (stderr, "\n -help to list options"); break; } - fprintf(stderr, "\n\n"); - exit(EXIT_FAILURE); + fprintf (stderr, "\n\n"); + exit (EXIT_FAILURE); /* NOTREACHED */ } @@ -461,7 +461,7 @@ opt = argv[i]; #ifdef DEBUG_RESOURCES - fprintf(stderr, "argv[%d] = %s: ", i, opt); + fprintf (stderr, "argv[%d] = %s: ", i, opt); #endif if (*opt == '-') { @@ -478,63 +478,63 @@ else { bad_option = 1; - rxvt_print_error("bad option \"%s\"", opt); + rxvt_print_error ("bad option \"%s\"", opt); continue; } - if (!STRCMP(opt, "help")) - rxvt_usage(longopt ? 2 : 1); - if (!STRCMP(opt, "h")) - rxvt_usage(0); + if (!STRCMP (opt, "help")) + rxvt_usage (longopt ? 2 : 1); + if (!STRCMP (opt, "h")) + rxvt_usage (0); /* feature: always try to match long-options */ - for (entry = 0; entry < optList_size(); entry++) - if ((optList[entry].kw && !STRCMP(opt, optList[entry].kw)) + 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))) + && optList[entry].opt && !STRCMP (opt, optList[entry].opt))) break; - if (entry < optList_size()) + if (entry < optList_size ()) { - if (optList_isReverse(entry)) + if (optList_isReverse (entry)) flag = flag == On ? Off : On; - if (optList_strlen(entry)) + if (optList_strlen (entry)) { /* string value */ const char *str = argv[++i]; #ifdef DEBUG_RESOURCES - fprintf(stderr, "string (%s,%s) = ", + 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); + fprintf (stderr, "\"%s\"\n", str); #endif rs[optList[entry].doff] = str; /* - * special cases are handled in main.c:main() to allow + * 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"); + fprintf (stderr, "???\n"); #endif } else { /* boolean value */ #ifdef DEBUG_RESOURCES - fprintf(stderr, "boolean (%s,%s) = %s\n", + fprintf (stderr, "boolean (%s,%s) = %s\n", optList[entry].opt, optList[entry].kw, flag); #endif if (flag == On) Options |= (optList[entry].flag); else - Options &= ~(optList[entry].flag); + Options &= ~ (optList[entry].flag); if (optList[entry].doff != -1) rs[optList[entry].doff] = flag; @@ -542,13 +542,13 @@ } else #ifdef KEYSYM_RESOURCE - /* if (!STRNCMP(opt, "keysym.", sizeof("keysym.") - 1)) */ - if (rxvt_Str_match(opt, "keysym.")) + /* if (!STRNCMP (opt, "keysym.", sizeof ("keysym.") - 1)) */ + if (rxvt_Str_match (opt, "keysym.")) { const char *str = argv[++i]; if (str != NULL) - parse_keysym (opt + sizeof("keysym.") - 1, str); + parse_keysym (opt + sizeof ("keysym.") - 1, str); } else #endif @@ -556,7 +556,7 @@ } if (bad_option) - rxvt_usage(0); + rxvt_usage (0); } /*}}} */ @@ -580,7 +580,7 @@ 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 + GET_R->parse_keysym (XrmQuarkToString (quarks[last]), (char *)value->addr);//D//TODO return False; } @@ -602,27 +602,27 @@ if (arg == NULL) { - if ((n = rxvt_Str_match(str, "keysym.")) == 0) + if ((n = rxvt_Str_match (str, "keysym.")) == 0) return 0; str += n; /* skip `keysym.' */ } - /* some scanf() have trouble with a 0x prefix */ - if (isdigit(str[0])) + /* 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; if (arg) { - if (sscanf(str, (STRCHR(str, ':') ? "%x:" : "%x"), &sym) != 1) + if (sscanf (str, (STRCHR (str, ':') ? "%x:" : "%x"), &sym) != 1) return -1; } else { - if (sscanf(str, "%x:", &sym) != 1) + if (sscanf (str, "%x:", &sym) != 1) return -1; - /* cue to ':', it's there since sscanf() worked */ - STRNCPY(newargstr, STRCHR(str, ':') + 1, NEWARGLIM - 1); + /* cue to ':', it's there since sscanf () worked */ + STRNCPY (newargstr, STRCHR (str, ':') + 1, NEWARGLIM - 1); newargstr[NEWARGLIM - 1] = '\0'; newarg = newargstr; } @@ -632,15 +632,15 @@ /* * convert keysym name to keysym number */ - STRNCPY(newargstr, str, NEWARGLIM - 1); + STRNCPY (newargstr, str, NEWARGLIM - 1); newargstr[NEWARGLIM - 1] = '\0'; if (arg == NULL) { - if ((newarg = STRCHR(newargstr, ':')) == NULL) + if ((newarg = STRCHR (newargstr, ':')) == NULL) return -1; *newarg++ = '\0'; /* terminate keysym name */ } - if ((sym = XStringToKeysym(newargstr)) == None) + if ((sym = XStringToKeysym (newargstr)) == None) return -1; } @@ -652,18 +652,18 @@ if (newarg == NULL) { - STRNCPY(newargstr, arg, NEWARGLIM - 1); + STRNCPY (newargstr, arg, NEWARGLIM - 1); newargstr[NEWARGLIM - 1] = '\0'; newarg = newargstr; } - rxvt_Str_trim(newarg); - if (*newarg == '\0' || (n = rxvt_Str_escaped(newarg)) == 0) + 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)); + MIN_IT (n, 255); + key_string = (char *)rxvt_malloc ((n + 1) * sizeof (char)); key_string[0] = n; - STRNCPY(key_string + 1, newarg, n); + STRNCPY (key_string + 1, newarg, n); Keysym_map[sym] = (unsigned char *)key_string; return 1; @@ -672,7 +672,7 @@ # endif /* KEYSYM_RESOURCE */ # ifndef USE_XGETDEFAULT -/*{{{ rxvt_get_xdefaults() */ +/*{{{ rxvt_get_xdefaults () */ /* * the matching algorithm used for memory-save fake resources */ @@ -684,62 +684,62 @@ if (stream == NULL) return; - len = STRLEN(name); - while ((str = fgets(buffer, sizeof(buffer), stream)) != NULL) + len = STRLEN (name); + while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL) { unsigned int entry, n; - while (*str && isspace(*str)) + while (*str && isspace (*str)) str++; /* leading whitespace */ if ((str[len] != '*' && str[len] != '.') - || (len && STRNCMP(str, name, len))) + || (len && STRNCMP (str, name, len))) continue; str += (len + 1); /* skip `name*' or `name.' */ # 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; if (kw == NULL) continue; n = STRLEN (kw); - if (str[n] == ':' && rxvt_Str_match(str, kw)) + if (str[n] == ':' && rxvt_Str_match (str, kw)) { /* skip `keyword:' */ str += (n + 1); - rxvt_Str_trim(str); - n = STRLEN(str); + rxvt_Str_trim (str); + n = STRLEN (str); if (n && rs[optList[entry].doff] == NULL) { /* not already set */ int s; - char *p = (char *)rxvt_malloc((n + 1) * sizeof(char)); + char *p = (char *)rxvt_malloc ((n + 1) * sizeof (char)); - STRCPY(p, str); + STRCPY (p, str); rs[optList[entry].doff] = p; - if (optList_isBool(entry)) + 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 = 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); else - Options &= ~(optList[entry].flag); + Options &= ~ (optList[entry].flag); } } break; } } } - rewind(stream); + rewind (stream); } /*}}} */ @@ -748,11 +748,11 @@ /*{{{ read the resources files */ /* - * using XGetDefault() or the hand-rolled replacement + * using XGetDefault () or the hand-rolled replacement */ /* ARGSUSED */ void -rxvt_term::extract_resources (Display *display __attribute__((unused)), const char *name) +rxvt_term::extract_resources (Display *display __attribute__ ((unused)), const char *name) { #ifndef NO_RESOURCES @@ -763,9 +763,9 @@ if (locale != NULL) { /* XXX: must limit length of string */ - localepath = (char *)rxvt_malloc(256); - sprintf(localepath, XAPPLOADDIRLOCALE "/" APL_SUBCLASS, - (int)(258 - sizeof(XAPPLOADDIRLOCALE) - sizeof(APL_SUBCLASS)), + localepath = (char *)rxvt_malloc (256); + sprintf (localepath, XAPPLOADDIRLOCALE "/" APL_SUBCLASS, + (int) (258 - sizeof (XAPPLOADDIRLOCALE) - sizeof (APL_SUBCLASS)), locale); /* 258 = 255 + 4 (-.*s) - 1 (/) */ } @@ -787,30 +787,30 @@ XrmDatabase database, rdb1; char fname[1024]; - XrmInitialize(); + XrmInitialize (); database = NULL; /* Get any Xserver defaults */ - displayResource = XResourceManagerString(display); + displayResource = XResourceManagerString (display); if (displayResource != NULL) - database = XrmGetStringDatabase(displayResource); + database = XrmGetStringDatabase (displayResource); # ifdef HAVE_EXTRA_XRESOURCE_FILES /* Add in ~/.Xdefaults or ~/.Xresources */ { char *ptr; - if ((ptr = (char *)getenv("HOME")) == NULL) + if ((ptr = (char *)getenv ("HOME")) == NULL) ptr = "."; - for (i = 0; i < (sizeof(xnames) / sizeof(xnames[0])); i++) + for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++) { - sprintf(fname, "%-.*s/%s", sizeof(fname) - STRLEN(xnames[i]) - 2, + sprintf (fname, "%-.*s/%s", sizeof (fname) - STRLEN (xnames[i]) - 2, ptr, xnames[i]); - if ((rdb1 = XrmGetFileDatabase(fname)) != NULL) + if ((rdb1 = XrmGetFileDatabase (fname)) != NULL) { - XrmMergeDatabases(rdb1, &database); + XrmMergeDatabases (rdb1, &database); # ifndef HAVE_BOTH_XRESOURCE_FILES break; # endif @@ -822,34 +822,34 @@ /* Add in XENVIRONMENT file */ - if ((xe = (char *)getenv("XENVIRONMENT")) != NULL - && (rdb1 = XrmGetFileDatabase(xe)) != NULL) - XrmMergeDatabases(rdb1, &database); + if ((xe = (char *)getenv ("XENVIRONMENT")) != NULL + && (rdb1 = XrmGetFileDatabase (xe)) != NULL) + XrmMergeDatabases (rdb1, &database); /* Add in Rxvt file */ # if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) - if (localepath == NULL || (rdb1 = XrmGetFileDatabase(localepath)) == NULL) + if (localepath == NULL || (rdb1 = XrmGetFileDatabase (localepath)) == NULL) # endif - rdb1 = XrmGetFileDatabase(XAPPLOADDIR "/" APL_SUBCLASS); + rdb1 = XrmGetFileDatabase (XAPPLOADDIR "/" APL_SUBCLASS); if (rdb1 != NULL) - XrmMergeDatabases(rdb1, &database); + XrmMergeDatabases (rdb1, &database); /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */ - if ((xe = (char *)getenv("XAPPLRESDIR")) != NULL) + if ((xe = (char *)getenv ("XAPPLRESDIR")) != NULL) { - sprintf(fname, "%-.*s/" APL_SUBCLASS, sizeof(fname) - - sizeof(APL_SUBCLASS) - 2, xe); - if ((rdb1 = XrmGetFileDatabase(fname)) != NULL) - XrmMergeDatabases(rdb1, &database); + sprintf (fname, "%-.*s/" APL_SUBCLASS, sizeof (fname) + - sizeof (APL_SUBCLASS) - 2, xe); + if ((rdb1 = XrmGetFileDatabase (fname)) != NULL) + XrmMergeDatabases (rdb1, &database); } - XrmSetDatabase(display, database); + XrmSetDatabase (display, database); # endif /* * Query resources for options that affect us */ - for (entry = 0; entry < optList_size(); entry++) + for (entry = 0; entry < optList_size (); entry++) { int s; char *p, *p0; @@ -858,13 +858,13 @@ 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, name, kw); + p0 = XGetDefault (display, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw); + if (p == NULL || (p0 && STRCMP (p, p0) == 0)) { - p = XGetDefault(display, APL_SUBCLASS, kw); - if (p == NULL || (p0 && STRCMP(p, p0) == 0)) - p = XGetDefault(display, APL_CLASS, kw); + p = XGetDefault (display, APL_SUBCLASS, kw); + if (p == NULL || (p0 && STRCMP (p, p0) == 0)) + p = XGetDefault (display, APL_CLASS, kw); } if (p == NULL && p0) p = p0; @@ -872,18 +872,18 @@ { rs[optList[entry].doff] = p; - if (optList_isBool(entry)) + 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 = 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); + Options &= ~ (optList[entry].flag); } } } @@ -893,21 +893,21 @@ */ # ifdef XrmEnumOneLevel # ifdef KEYSYM_RESOURCE - name_prefix[0] = XrmStringToName(name); - name_prefix[1] = XrmStringToName("keysym"); + name_prefix[0] = XrmStringToName (name); + name_prefix[1] = XrmStringToName ("keysym"); name_prefix[2] = NULLQUARK; - class_prefix[0] = XrmStringToName(APL_SUBCLASS); - class_prefix[1] = XrmStringToName("Keysym"); + class_prefix[0] = XrmStringToName (APL_SUBCLASS); + 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, + /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ + XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix, XrmEnumOneLevel, rxvt_define_key, NULL); - name_prefix[0] = XrmStringToName(APL_CLASS); - name_prefix[1] = XrmStringToName("keysym"); - class_prefix[0] = XrmStringToName(APL_CLASS); - class_prefix[1] = XrmStringToName("Keysym"); - /* XXX: Need to check sizeof(rxvt_t) == sizeof(XPointer) */ - XrmEnumerateDatabase(XrmGetDatabase(display), name_prefix, class_prefix, + name_prefix[0] = XrmStringToName (APL_CLASS); + name_prefix[1] = XrmStringToName ("keysym"); + class_prefix[0] = XrmStringToName (APL_CLASS); + 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 # endif @@ -917,21 +917,21 @@ FILE *fd = NULL; char *home; - if ((home = getenv("HOME")) != NULL) + if ((home = getenv ("HOME")) != NULL) { - unsigned int i, len = STRLEN(home) + 2; + unsigned int i, len = STRLEN (home) + 2; char *f = NULL; - for (i = 0; i < (sizeof(xnames) / sizeof(xnames[0])); i++) + 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])) * sizeof (char)); - sprintf(f, "%s/%s", home, xnames[i]); + sprintf (f, "%s/%s", home, xnames[i]); - if ((fd = fopen(f, "r")) != NULL) + if ((fd = fopen (f, "r")) != NULL) break; } - free(f); + free (f); } /* * The normal order to match resources is the following: @@ -964,14 +964,14 @@ FILE *ad = NULL; # if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) - if (localepath == NULL || (ad = fopen(localepath, "r")) == NULL) + if (localepath == NULL || (ad = fopen (localepath, "r")) == NULL) # endif - ad = fopen(XAPPLOADDIR "/" APL_SUBCLASS, "r"); + ad = fopen (XAPPLOADDIR "/" APL_SUBCLASS, "r"); if (ad != NULL) { get_xdefaults (ad, APL_SUBCLASS); get_xdefaults (ad, ""); - fclose(ad); + fclose (ad); } } # endif /* XAPPLOADDIR */ @@ -979,7 +979,7 @@ get_xdefaults (fd, APL_CLASS); get_xdefaults (fd, ""); /* partial match */ if (fd != NULL) - fclose(fd); + fclose (fd); # endif /* USE_XGETDEFAULT */ # if defined XAPPLOADDIR @@ -988,7 +988,7 @@ } /* Free the path of the possibly available localized Rxvt file */ - free(localepath); + free (localepath); # endif # endif @@ -1006,16 +1006,16 @@ /* void set_greek_keyboard (const char * str); */ if (rs[Rs_greek_keyboard]) { - if (!STRCMP(rs[Rs_greek_keyboard], "iso")) - greek_setmode(GREEK_ELOT928); /* former -grk9 */ - else if (!STRCMP(rs[Rs_greek_keyboard], "ibm")) - greek_setmode(GREEK_IBM437); /* former -grk4 */ + if (!STRCMP (rs[Rs_greek_keyboard], "iso")) + greek_setmode (GREEK_ELOT928); /* former -grk9 */ + else if (!STRCMP (rs[Rs_greek_keyboard], "ibm")) + greek_setmode (GREEK_IBM437); /* former -grk4 */ } { KeySym sym; if (rs[Rs_greektoggle_key] - && ((sym = XStringToKeysym(rs[Rs_greektoggle_key])) != 0)) + && ((sym = XStringToKeysym (rs[Rs_greektoggle_key])) != 0)) ks_greekmodeswith = sym; } #endif /* GREEK_SUPPORT */ @@ -1026,10 +1026,10 @@ KeySym sym; if (rs[Rs_bigfont_key] - && ((sym = XStringToKeysym(rs[Rs_bigfont_key])) != 0)) + && ((sym = XStringToKeysym (rs[Rs_bigfont_key])) != 0)) ks_bigfont = sym; if (rs[Rs_smallfont_key] - && ((sym = XStringToKeysym(rs[Rs_smallfont_key])) != 0)) + && ((sym = XStringToKeysym (rs[Rs_smallfont_key])) != 0)) ks_smallfont = sym; } #endif