--- rxvt-unicode/src/xdefaults.C 2004/02/24 21:41:16 1.13 +++ rxvt-unicode/src/xdefaults.C 2004/03/22 15:15:04 1.19 @@ -1,7 +1,7 @@ /*--------------------------------*-C-*---------------------------------* * File: xdefaults.c *----------------------------------------------------------------------* - * $Id: xdefaults.C,v 1.13 2004/02/24 21:41:16 pcg Exp $ + * $Id: xdefaults.C,v 1.19 2004/03/22 15:15:04 pcg Exp $ * * All portions of code are copyright by their respective author/s. * Copyright (c) 1994 Robert Nation @@ -133,10 +133,6 @@ BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, NULL), #endif -#ifdef MULTICHAR_SET - 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, "triple click word selection"), @@ -246,19 +242,12 @@ #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"), 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"), INFO ("e", "command arg ...", "command to execute") }; @@ -296,13 +285,16 @@ #if defined(USE_XIM) "XIM," #endif -#if defined(MULTICHAR_SET) - "multichar_languages," -#endif "scrollbars=" #if !defined(HAVE_SCROLLBARS) "NONE" #else +# if defined(PLAIN_SCROLLBAR) + "plain" +# if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) + "+" +# endif +# endif # if defined(RXVT_SCROLLBAR) "rxvt" # if defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) @@ -350,16 +342,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, APL_NAME, sizeof (APL_NAME) - 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) { @@ -378,59 +369,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 */ } @@ -467,7 +458,7 @@ else { bad_option = 1; - rxvt_print_error ("bad option \"%s\"", opt); + rxvt_warn ("\"%s\": malformed option.\n", opt); continue; } @@ -534,14 +525,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) @@ -673,11 +667,12 @@ void rxvt_term::get_xdefaults (FILE *stream, const char *name) { - unsigned int len; - char *str, buffer[256]; + unsigned int len; + char *str, buffer[256]; if (stream == NULL) return; + len = STRLEN (name); while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL) { @@ -696,43 +691,68 @@ # 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)) { /* skip `keyword:' */ - str += (n + 1); + str += n + 1; 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)); + int s; + char *p = 0; + + for (int o = 0;;) + { + p = (char *)rxvt_realloc (p, o + n + 1); + MEMCPY (p + o, str, n); + o += n; + p[o] = 0; + + if (o == 0 || p[o - 1] != '\\') // continuation line + break; + + o--; // eat "\" + + if ((str = fgets (buffer, sizeof (buffer), stream)) == NULL) + break; + + rxvt_Str_trim (str); + n = STRLEN (str); + } - STRCPY (p, str); 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); } @@ -753,13 +773,13 @@ # 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 */ localepath = (char *)rxvt_malloc (256); - sprintf (localepath, XAPPLOADDIRLOCALE "/" APL_SUBCLASS, - (int) (258 - sizeof (XAPPLOADDIRLOCALE) - sizeof (APL_SUBCLASS)), + sprintf (localepath, XAPPLOADDIRLOCALE "/" RESCLASS, + (int) (258 - sizeof (XAPPLOADDIRLOCALE) - sizeof (RESCLASS)), locale); /* 258 = 255 + 4 (-.*s) - 1 (/) */ } @@ -771,15 +791,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; @@ -802,7 +822,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 @@ -824,15 +844,16 @@ # if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) if (localepath == NULL || (rdb1 = XrmGetFileDatabase (localepath)) == NULL) # endif - rdb1 = XrmGetFileDatabase (XAPPLOADDIR "/" APL_SUBCLASS); + rdb1 = XrmGetFileDatabase (XAPPLOADDIR "/" RESCLASS); + if (rdb1 != NULL) XrmMergeDatabases (rdb1, &database); /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */ if ((xe = (char *)getenv ("XAPPLRESDIR")) != NULL) { - sprintf (fname, "%-.*s/" APL_SUBCLASS, sizeof (fname) - - sizeof (APL_SUBCLASS) - 2, xe); + sprintf (fname, "%-.*s/" RESCLASS, sizeof (fname) + - sizeof (RESCLASS) - 2, xe); if ((rdb1 = XrmGetFileDatabase (fname)) != NULL) XrmMergeDatabases (rdb1, &database); } @@ -856,12 +877,16 @@ p0 = XGetDefault (display, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw); if (p == NULL || (p0 && STRCMP (p, p0) == 0)) { - p = XGetDefault (display, APL_SUBCLASS, kw); + p = XGetDefault (display, RESCLASS, kw); +#ifdef RESFALLBACK if (p == NULL || (p0 && STRCMP (p, p0) == 0)) - p = XGetDefault (display, APL_CLASS, kw); + p = XGetDefault (display, RESFALLBACK, kw); +#endif } + if (p == NULL && p0) p = p0; + if (p) { rs[optList[entry].doff] = p; @@ -890,19 +915,21 @@ name_prefix[0] = XrmStringToName (name); name_prefix[1] = XrmStringToName ("keysym"); name_prefix[2] = NULLQUARK; - class_prefix[0] = XrmStringToName (APL_SUBCLASS); + class_prefix[0] = XrmStringToName (RESCLASS); 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, XrmEnumOneLevel, rxvt_define_key, NULL); - name_prefix[0] = XrmStringToName (APL_CLASS); +# ifdef RESFALLBACK + name_prefix[0] = XrmStringToName (RESFALLBACK); name_prefix[1] = XrmStringToName ("keysym"); - class_prefix[0] = XrmStringToName (APL_CLASS); + class_prefix[0] = XrmStringToName (RESFALLBACK); 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 # endif @@ -950,27 +977,28 @@ */ get_xdefaults (fd, name); - get_xdefaults (fd, APL_SUBCLASS); + get_xdefaults (fd, RESCLASS); +# ifdef RESFALLBACK + get_xdefaults (fd, RESFALLBACK); +# 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) # endif - ad = fopen (XAPPLOADDIR "/" APL_SUBCLASS, "r"); + ad = fopen (XAPPLOADDIR "/" RESCLASS, "r"); if (ad != NULL) { - get_xdefaults (ad, APL_SUBCLASS); + get_xdefaults (ad, RESCLASS); get_xdefaults (ad, ""); fclose (ad); } } # endif /* XAPPLOADDIR */ - get_xdefaults (fd, APL_CLASS); get_xdefaults (fd, ""); /* partial match */ if (fd != NULL) fclose (fd); @@ -987,22 +1015,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 } /*}}} */