--- rxvt-unicode/src/xdefaults.C 2004/08/13 03:36:57 1.30 +++ rxvt-unicode/src/xdefaults.C 2004/08/22 01:45:12 1.40 @@ -30,7 +30,6 @@ #include "../config.h" /* NECESSARY */ #include "rxvt.h" /* NECESSARY */ #include "version.h" -#include "xdefaults.intpro" /* PROTOS for internal routines */ /* #define DEBUG_RESOURCES */ @@ -65,7 +64,7 @@ /* 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) \ @@ -112,7 +111,7 @@ #endif #endif #ifdef OFF_FOCUS_FADING - STRG (Rs_fade, "fading", "fade", "%", "make colors x% darker when urxvt is losing focus."), + STRG (Rs_fade, "fading", "fade", "%", "make colors x% darker when rxvt-unicode is losing focus."), #endif #ifdef TINTING STRG (Rs_shade, "shading", "sh", "%", "shade background by x% when tinting."), @@ -130,7 +129,7 @@ #ifdef MOUSE_WHEEL BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, NULL), #endif -#ifndef NO_FRILLS +#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"), #endif @@ -161,8 +160,8 @@ 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_IT, "colorIT", "color"), RSTRG (Rs_color + Color_UL, "colorUL", "color"), RSTRG (Rs_color + Color_RV, "colorRV", "color"), #endif /* ! NO_BOLD_UNDERLINE_REVERSE */ @@ -182,8 +181,13 @@ #if (MENUBAR_MAX) RSTRG (Rs_menu, "menu", "name[;tag]"), #endif - STRG (Rs_font, "font", "fn", "fontname", "normal text font"), /* fonts: command-line option = resource name */ + STRG (Rs_font, "font", "fn", "fontname", "normal text font"), +#if ENABLE_STYLES + 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"), +#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"), @@ -204,7 +208,7 @@ 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 +#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), @@ -252,11 +256,23 @@ #undef BOOL /*}}} */ -static const char releasestring[] = "Rxvt v" VERSION " - released: " DATE "\n"; -static const char optionsstring[] = "Options: " +static const char releasestring[] = "rxvt-unicode (" RXVTNAME ") v" VERSION " - released: " DATE "\n"; +static const char optionsstring[] = "options: " #if XFT "xft," #endif +#if ENABLE_STYLES + "styles," +#endif +#if ENABLE_COMBINING + "combining," +#endif +#if TEXT_BLINK + "blink," +#endif +#if ISO_14755 + "iso14755," +#endif #if UNICODE_3 "unicode3," #endif @@ -277,12 +293,6 @@ "+cn-ext" #endif "," -#if ENABLE_COMBINING - "combining," -#endif -#if TEXT_BLINK - "blink," -#endif #if OFF_FOCUS_FADING "fade," #endif @@ -343,7 +353,7 @@ #if !defined(NO_STRINGS) "strings," #endif -#if !defined(NO_FRILLS) +#if defined(ENABLE_FRILLS) "frills," #endif #if !defined(NO_LINESPACE) @@ -364,9 +374,6 @@ #if defined(SMART_RESIZE) "smart-resize," #endif -#if defined(TTY_256COLOR) - "256colour," -#endif #if defined(CURSOR_BLINK) "cursorBlink," #endif @@ -414,7 +421,7 @@ #ifdef DEBUG_STRICT 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 */ @@ -441,7 +448,7 @@ #endif rxvt_log (" %s%s %-*s%s%s\n", (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, - (INDENT - STRLEN (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 " : ""), @@ -458,7 +465,7 @@ if (optList[i].kw != NULL) rxvt_log (" %s: %*s%s\n", optList[i].kw, - (INDENT - STRLEN (optList[i].kw)), "", /* XXX */ + (INDENT - strlen (optList[i].kw)), "", /* XXX */ (optList_isBool (i) ? "boolean" : optList[i].arg)); #ifdef KEYSYM_RESOURCE rxvt_log (" " "keysym.sym" ": %*s%s\n", @@ -511,16 +518,16 @@ continue; } - if (!STRCMP (opt, "help")) + if (!strcmp (opt, "help")) rxvt_usage (longopt ? 2 : 1); - if (!STRCMP (opt, "h")) + 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)) + 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 ()) @@ -547,9 +554,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; @@ -557,7 +564,7 @@ } else #ifdef KEYSYM_RESOURCE - /* if (!STRNCMP (opt, "keysym.", sizeof ("keysym.") - 1)) */ + /* if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) */ if (rxvt_Str_match (opt, "keysym.")) { const char *str = argv[++i]; @@ -636,7 +643,7 @@ 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 @@ -645,7 +652,7 @@ return -1; /* cue to ':', it's there since sscanf () worked */ - STRNCPY (newargstr, STRCHR (str, ':') + 1, NEWARGLIM - 1); + strncpy (newargstr, strchr (str, ':') + 1, NEWARGLIM - 1); newargstr[NEWARGLIM - 1] = '\0'; newarg = newargstr; } @@ -655,11 +662,11 @@ /* * 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 */ } @@ -675,7 +682,7 @@ if (newarg == NULL) { - STRNCPY (newargstr, arg, NEWARGLIM - 1); + strncpy (newargstr, arg, NEWARGLIM - 1); newargstr[NEWARGLIM - 1] = '\0'; newarg = newargstr; } @@ -686,7 +693,7 @@ 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; @@ -708,7 +715,7 @@ if (stream == NULL) return; - len = STRLEN (name); + len = strlen (name); while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL) { unsigned int entry, n; @@ -717,7 +724,7 @@ 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.' */ @@ -731,13 +738,13 @@ if (kw == NULL) continue; - n = STRLEN (kw); + n = strlen (kw); if (str[n] == ':' && rxvt_Str_match (str, kw)) { /* skip `keyword:' */ str += n + 1; rxvt_Str_trim (str); - n = STRLEN (str); + n = strlen (str); if (n && rs[optList[entry].doff] == NULL) { /* not already set */ @@ -747,7 +754,7 @@ for (int o = 0;;) { p = (char *)rxvt_realloc (p, o + n + 1); - MEMCPY (p + o, str, n); + memcpy (p + o, str, n); o += n; p[o] = 0; @@ -760,7 +767,7 @@ break; rxvt_Str_trim (str); - n = STRLEN (str); + n = strlen (str); } rs[optList[entry].doff] = p; @@ -768,18 +775,18 @@ 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 + || 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; } } @@ -848,14 +855,14 @@ # ifdef HAVE_EXTRA_XRESOURCE_FILES /* Add in ~/.Xdefaults or ~/.Xresources */ { - char *ptr; + char *ptr; if ((ptr = (char *)getenv ("HOME")) == NULL) ptr = "."; 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))) { @@ -910,11 +917,11 @@ p = XGetDefault (display, name, kw); p0 = XGetDefault (display, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw); - if (p == NULL || (p0 && STRCMP (p, p0) == 0)) + if (p == NULL || (p0 && strcmp (p, p0) == 0)) { p = XGetDefault (display, RESCLASS, kw); #ifdef RESFALLBACK - if (p == NULL || (p0 && STRCMP (p, p0) == 0)) + if (p == NULL || (p0 && strcmp (p, p0) == 0)) p = XGetDefault (display, RESFALLBACK, kw); #endif } @@ -928,16 +935,16 @@ if (optList_isBool (entry)) { - s = STRCASECMP (p, "TRUE") == 0 - || STRCASECMP (p, "YES") == 0 - || STRCASECMP (p, "ON") == 0 - || STRCASECMP (p, "1") == 0; + 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); + options |= (optList[entry].flag); else - Options &= ~ (optList[entry].flag); + options &= ~ (optList[entry].flag); } } } @@ -975,12 +982,12 @@ 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++) { - 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]);