--- rxvt-unicode/src/xdefaults.C 2004/07/26 14:57:12 1.25 +++ rxvt-unicode/src/xdefaults.C 2005/01/16 19:20:30 1.46 @@ -30,7 +30,10 @@ #include "../config.h" /* NECESSARY */ #include "rxvt.h" /* NECESSARY */ #include "version.h" -#include "xdefaults.intpro" /* PROTOS for internal routines */ + +#ifdef KEYSYM_RESOURCE +#include "keyboard.h" +#endif /* #define DEBUG_RESOURCES */ @@ -65,7 +68,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) \ @@ -94,6 +97,7 @@ 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_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, "tab characters are pastable"), #ifdef HAVE_SCROLLBARS BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, "scrollbar"), BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, "scrollbar right"), @@ -111,6 +115,12 @@ 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 rxvt-unicode 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 BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, "visual bell"), @@ -124,7 +134,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 @@ -155,11 +165,14 @@ 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 */ +#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"), @@ -176,8 +189,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"), @@ -198,13 +216,12 @@ 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), STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), -#endif -#ifndef NO_LINESPACE + BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"), 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"), @@ -245,29 +262,61 @@ #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 + "encodings=eu+vn" +#if ENCODING_JP + "+jp" +#endif +#if ENCODING_JP_EXT + "+jp-ext" +#endif +#if ENCODING_KR + "+kr" +#endif +#if ENCODING_ZH + "+zh" +#endif +#if ENCODING_ZH_EXT + "+zh-ext" +#endif + "," +#if OFF_FOCUS_FADING + "fade," +#endif #if defined(XPM_BACKGROUND) "XPM," #endif #if defined(TRANSPARENT) "transparent," #endif +#if TINTING + "tint," +#endif #if defined(UTMP_SUPPORT) "utmp," #endif #if defined(MENUBAR) "menubar," #endif -#if !defined(NO_FRILLS) - "frills," -#endif -#if !defined(NO_LINESPACE) - "linespace," -#endif -#if defined(PREFER_24BIT) - "24bit," -#endif #if defined(USE_XIM) "XIM," #endif @@ -304,11 +353,35 @@ #if defined(NO_DELETE_KEY) "no_delete," #endif +#if EIGHT_BIT_CONTROLS + "8bitctrls," +#endif #if !defined(NO_STRINGS) "strings," #endif -#if defined(TTY_256COLOR) - "256colour," +#if defined(ENABLE_FRILLS) + "frills," +#endif +#if defined(PREFER_24BIT) + "24bit," +#endif +#if defined(SELECTION_SCROLLING) + "selectionscrolling," +#endif +#if MOUSE_WHEEL + "wheel," +#endif +#if MOUSE_SLIP_WHEELING + "slipwheel," +#endif +#if defined(SMART_RESIZE) + "smart-resize," +#endif +#if defined(CURSOR_BLINK) + "cursorBlink," +#endif +#if defined(POINTER_BLANK) + "pointerBlank," #endif #if defined(NO_RESOURCES) "NoResources" @@ -351,7 +424,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 */ @@ -378,7 +451,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 " : ""), @@ -395,7 +468,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", @@ -448,48 +521,34 @@ 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 ()) { 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 */ @@ -498,9 +557,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; @@ -508,7 +567,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]; @@ -567,27 +626,96 @@ * 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) + if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1) return -1; } else @@ -596,7 +724,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; } @@ -606,40 +734,33 @@ /* * 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) 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); + 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; } @@ -659,7 +780,7 @@ if (stream == NULL) return; - len = STRLEN (name); + len = strlen (name); while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL) { unsigned int entry, n; @@ -668,7 +789,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.' */ @@ -682,13 +803,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 */ @@ -698,7 +819,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; @@ -711,7 +832,7 @@ break; rxvt_Str_trim (str); - n = STRLEN (str); + n = strlen (str); } rs[optList[entry].doff] = p; @@ -719,18 +840,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; } } @@ -799,14 +920,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))) { @@ -861,11 +982,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 } @@ -879,16 +1000,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); } } } @@ -926,12 +1047,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]);