ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/xdefaults.C
(Generate patch)

Comparing rxvt-unicode/src/xdefaults.C (file contents):
Revision 1.13 by pcg, Tue Feb 24 21:41:16 2004 UTC vs.
Revision 1.23 by pcg, Fri Apr 2 18:00:01 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: xdefaults.c 2 * File: xdefaults.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: xdefaults.C,v 1.13 2004/02/24 21:41:16 pcg Exp $ 4 * $Id: xdefaults.C,v 1.23 2004/04/02 18:00:01 pcg Exp $
5 * 5 *
6 * All portions of code are copyright by their respective author/s. 6 * All portions of code are copyright by their respective author/s.
7 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 7 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
8 * - original version 8 * - original version
9 * Copyright (c) 1997,1998 mj olesen <olesen@me.queensu.ca> 9 * Copyright (c) 1997,1998 mj olesen <olesen@me.queensu.ca>
… …
83 const char *desc; /* description */ 83 const char *desc; /* description */
84 } 84 }
85optList[] = { 85optList[] = {
86 STRG (Rs_display_name, NULL, "d", NULL, NULL), /* short form */ 86 STRG (Rs_display_name, NULL, "d", NULL, NULL), /* short form */
87 STRG (Rs_display_name, NULL, "display", "string", "X server to contact"), 87 STRG (Rs_display_name, NULL, "display", "string", "X server to contact"),
88 STRG (Rs_term_name, "termName", "tn", "string", 88 STRG (Rs_term_name, "termName", "tn", "string", "value of the TERM environment variable"),
89 "value of the TERM environment variable"),
90 STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */ 89 STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */
91 STRG (Rs_geometry, "geometry", "geometry", "geometry", 90 STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"),
92 "size (in characters) and position"),
93 SWCH ("C", Opt_console, "intercept console messages"), 91 SWCH ("C", Opt_console, "intercept console messages"),
94 SWCH ("iconic", Opt_iconic, "start iconic"), 92 SWCH ("iconic", Opt_iconic, "start iconic"),
95 SWCH ("ic", Opt_iconic, NULL), /* short form */ 93 SWCH ("ic", Opt_iconic, NULL), /* short form */
96 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 94 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, "reverse video"),
97 "reverse video"),
98 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, "login shell"), 95 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, "login shell"),
99 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, "jump scrolling"), 96 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, "jump scrolling"),
100#ifdef HAVE_SCROLLBARS 97#ifdef HAVE_SCROLLBARS
101 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, "scrollbar"), 98 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, "scrollbar"),
102 BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, 99 BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, "scrollbar right"),
103 "scrollbar right"), 100 BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, "scrollbar without a trough"),
104 BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st",
105 Opt_scrollBar_floating, "scrollbar without a trough"),
106#endif 101#endif
107 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 102 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, NULL),
108 NULL),
109 BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_Reverse | Opt_scrollTtyOutput, 103 BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_Reverse | Opt_scrollTtyOutput, "scroll-on-tty-output inhibit"),
110 "scroll-on-tty-output inhibit"),
111 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 104 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, "scroll-on-keypress"),
112 "scroll-on-keypress"),
113 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 105 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, "scroll-with-buffer"),
114 "scroll-with-buffer"),
115#ifdef TRANSPARENT 106#ifdef TRANSPARENT
116 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 107 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, "inherit parent pixmap"),
117 "inherit parent pixmap"),
118 BOOL (Rs_transparent_all, "inheritPixmapforce", "ipf", Opt_transparent_all, 108 BOOL (Rs_transparent_all, "inheritPixmapforce", "ipf", Opt_transparent_all, "forcefully inherit root pixmap"),
119 "forcefully inherit root pixmap"),
120 SWCH ("tr", Opt_transparent, NULL), 109 SWCH ("tr", Opt_transparent, NULL),
110#if TINTING
111 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
112#endif
121#endif 113#endif
122 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"), 114 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"),
123#ifndef NO_BELL 115#ifndef NO_BELL
124 BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, "visual bell"), 116 BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, "visual bell"),
125# if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION) 117# if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION)
… …
128#endif 120#endif
129#ifdef META8_OPTION 121#ifdef META8_OPTION
130 BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, NULL), 122 BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, NULL),
131#endif 123#endif
132#ifdef MOUSE_WHEEL 124#ifdef MOUSE_WHEEL
133 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, 125 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, NULL),
134 NULL),
135#endif
136#ifdef MULTICHAR_SET
137 BOOL (Rs_mc_hack, "multibyte_cursor", "mcc", Opt_mc_hack,
138 "Multibyte character cursor movement"),
139#endif 126#endif
140#ifndef NO_FRILLS 127#ifndef NO_FRILLS
141 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, 128 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, "triple click word selection"),
142 "triple click word selection"), 129 BOOL (Rs_insecure, "insecure", "insecure", Opt_insecure, "enable possibly insecure escape sequences"),
143#endif 130#endif
144#ifdef CURSOR_BLINK 131#ifdef CURSOR_BLINK
145 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"), 132 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"),
146#endif 133#endif
147#ifdef POINTER_BLANK 134#ifdef POINTER_BLANK
… …
181#endif 168#endif
182#if defined (XPM_BACKGROUND) || (MENUBAR_MAX) 169#if defined (XPM_BACKGROUND) || (MENUBAR_MAX)
183 RSTRG (Rs_path, "path", "search path"), 170 RSTRG (Rs_path, "path", "search path"),
184#endif /* defined (XPM_BACKGROUND) || (MENUBAR_MAX) */ 171#endif /* defined (XPM_BACKGROUND) || (MENUBAR_MAX) */
185#ifdef XPM_BACKGROUND 172#ifdef XPM_BACKGROUND
186 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", 173 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
187 "background pixmap"),
188#endif /* XPM_BACKGROUND */ 174#endif /* XPM_BACKGROUND */
189#if (MENUBAR_MAX) 175#if (MENUBAR_MAX)
190 RSTRG (Rs_menu, "menu", "name[;tag]"), 176 RSTRG (Rs_menu, "menu", "name[;tag]"),
191#endif 177#endif
192 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 178 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
193 /* fonts: command-line option = resource name */ 179 /* fonts: command-line option = resource name */
194#ifdef USE_XIM 180#ifdef USE_XIM
195 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), 181 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
196 STRG (Rs_preeditType, "preeditType", "pt", "style", 182 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"),
197 "input style: style = OverTheSpot|OffTheSpot|Root"),
198#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 183#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
199 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"), 184 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"),
200#endif 185#endif
201#endif /* USE_XIM */ 186#endif /* USE_XIM */
202 STRG (Rs_name, NULL, "name", "string", 187 STRG (Rs_name, NULL, "name", "string", "client instance, icon, and title strings"),
203 "client instance, icon, and title strings"),
204 STRG (Rs_title, "title", "title", "string", "title name for window"), 188 STRG (Rs_title, "title", "title", "string", "title name for window"),
205 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */ 189 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */
206 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"), 190 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),
207#ifndef NO_CURSORCOLOR 191#ifndef NO_CURSORCOLOR
208 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), 192 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
209 /* command-line option = resource name */ 193 /* command-line option = resource name */
210 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 194 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
211#endif /* NO_CURSORCOLOR */ 195#endif /* NO_CURSORCOLOR */
212 STRG (Rs_color + Color_pointer, "pointerColor", "pr", "color", 196 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
213 "pointer color"), 197 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
214 STRG (Rs_color + Color_border, "borderColor", "bd", "color", 198 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
215 "border color"),
216 STRG (Rs_saveLines, "saveLines", "sl", "number", 199 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),
217 "number of scrolled lines to save"),
218#ifndef NO_FRILLS 200#ifndef NO_FRILLS
219 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", 201 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
220 "external border in pixels"),
221 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 202 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
222 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 203 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
223 STRG (Rs_int_bwidth, "internalBorder", "b", "number", 204 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
224 "internal border in pixels"),
225#endif 205#endif
226#ifndef NO_LINESPACE 206#ifndef NO_LINESPACE
227 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", 207 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
228 "number of extra pixels between rows"),
229#endif 208#endif
230 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", 209 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"),
231 "scrollbar thickness/width in pixels"),
232#ifdef POINTER_BLANK 210#ifdef POINTER_BLANK
233 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 211 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
234#endif 212#endif
235#ifndef NO_BACKSPACE_KEY 213#ifndef NO_BACKSPACE_KEY
236 RSTRG (Rs_backspace_key, "backspacekey", "string"), 214 RSTRG (Rs_backspace_key, "backspacekey", "string"),
… …
244 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"), 222 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"),
245#endif 223#endif
246#ifdef PRINTPIPE 224#ifdef PRINTPIPE
247 RSTRG (Rs_print_pipe, "print-pipe", "string"), 225 RSTRG (Rs_print_pipe, "print-pipe", "string"),
248#endif 226#endif
249#if defined (HOTKEY_CTRL) || defined (HOTKEY_META) 227 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"),
250 RSTRG (Rs_bigfont_key, "bigfont_key", "keysym"),
251 RSTRG (Rs_smallfont_key, "smallfont_key", "keysym"),
252#endif
253 STRG (Rs_modifier, "modifier", "mod", "modifier",
254 "meta modifier = alt|meta|hyper|super|mod1|...|mod5"),
255 INFO ("xrm", "string", "X resource"), 228 INFO ("xrm", "string", "X resource"),
256#ifdef CUTCHAR_RESOURCE 229#ifdef CUTCHAR_RESOURCE
257 RSTRG (Rs_cutchars, "cutchars", "string"), 230 RSTRG (Rs_cutchars, "cutchars", "string"),
258#endif /* CUTCHAR_RESOURCE */ 231#endif /* CUTCHAR_RESOURCE */
259#ifdef ACS_ASCII
260 RSTRG (Rs_acs_chars, "acsChars", "string"),
261#endif /* ACS_ASCII */
262 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 232 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
233#ifndef NO_SECONDARY_SCREEN
234 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"),
235 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"),
236#endif
263 INFO ("e", "command arg ...", "command to execute") 237 INFO ("e", "command arg ...", "command to execute")
264 }; 238 };
265 239
266#undef INFO 240#undef INFO
267#undef STRG 241#undef STRG
… …
294 "24bit," 268 "24bit,"
295#endif 269#endif
296#if defined(USE_XIM) 270#if defined(USE_XIM)
297 "XIM," 271 "XIM,"
298#endif 272#endif
299#if defined(MULTICHAR_SET)
300 "multichar_languages,"
301#endif
302 "scrollbars=" 273 "scrollbars="
303#if !defined(HAVE_SCROLLBARS) 274#if !defined(HAVE_SCROLLBARS)
304 "NONE" 275 "NONE"
305#else 276#else
277# if defined(PLAIN_SCROLLBAR)
278 "plain"
279# if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
280 "+"
281# endif
282# endif
306# if defined(RXVT_SCROLLBAR) 283# if defined(RXVT_SCROLLBAR)
307 "rxvt" 284 "rxvt"
308# if defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) 285# if defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
309 "+" 286 "+"
310# endif 287# endif
… …
348/*{{{ usage: */ 325/*{{{ usage: */
349/*----------------------------------------------------------------------*/ 326/*----------------------------------------------------------------------*/
350static void 327static void
351rxvt_usage (int type) 328rxvt_usage (int type)
352{ 329{
353 unsigned int i, col; 330 unsigned int i, col;
354 331
355 write (STDERR_FILENO, releasestring, sizeof (releasestring) - 1); 332 rxvt_log ("%s%s%s", releasestring, optionsstring, RESNAME);
356 write (STDERR_FILENO, optionsstring, sizeof (optionsstring) - 1);
357 write (STDERR_FILENO, APL_NAME, sizeof (APL_NAME) - 1);
358 333
359 switch (type) 334 switch (type)
360 { 335 {
361 case 0: /* brief listing */ 336 case 0: /* brief listing */
362 fprintf (stderr, " [-help] [--help]\n"); 337 rxvt_log (" [-help] [--help]\n");
338
363 for (col = 1, i = 0; i < optList_size (); i++) 339 for (col = 1, i = 0; i < optList_size (); i++)
364 if (optList[i].desc != NULL) 340 if (optList[i].desc != NULL)
365 { 341 {
366 int len = 0; 342 int len = 0;
367 343
… …
376#endif 352#endif
377 len += 4 + STRLEN (optList[i].opt) + (optList_isBool (i) ? 2: 0); 353 len += 4 + STRLEN (optList[i].opt) + (optList_isBool (i) ? 2: 0);
378 col += len; 354 col += len;
379 if (col > 79) 355 if (col > 79)
380 { /* assume regular width */ 356 { /* assume regular width */
381 putc ('\n', stderr); 357 rxvt_log ("\n");
382 col = 1 + len; 358 col = 1 + len;
383 } 359 }
360
384 fprintf (stderr, " [-%s%s", (optList_isBool (i) ? "/+" : ""), 361 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
385 optList[i].opt);
386 if (optList_strlen (i)) 362 if (optList_strlen (i))
387 fprintf (stderr, " %s]", optList[i].arg); 363 rxvt_log (" %s]", optList[i].arg);
388 else 364 else
389 fprintf (stderr, "]"); 365 rxvt_log ("]");
390 } 366 }
391 break; 367 break;
392 368
393 case 1: /* full command-line listing */ 369 case 1: /* full command-line listing */
394 fprintf (stderr, " [options] [-e command args]\n\n" 370 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
395 "where options include:\n"); 371
396 for (i = 0; i < optList_size (); i++) 372 for (i = 0; i < optList_size (); i++)
397 if (optList[i].desc != NULL) 373 if (optList[i].desc != NULL)
398 { 374 {
399#ifdef DEBUG_STRICT 375#ifdef DEBUG_STRICT
400 assert (optList[i].opt != NULL); 376 assert (optList[i].opt != NULL);
401#endif 377#endif
402 fprintf (stderr, " %s%s %-*s%s%s\n", 378 rxvt_log (" %s%s %-*s%s%s\n",
403 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, 379 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
404 (INDENT - STRLEN (optList[i].opt) 380 (INDENT - STRLEN (optList[i].opt)
405 + (optList_isBool (i) ? 0 : 2)), 381 + (optList_isBool (i) ? 0 : 2)),
406 (optList[i].arg ? optList[i].arg : ""), 382 (optList[i].arg ? optList[i].arg : ""),
407 (optList_isBool (i) ? "turn on/off " : ""), 383 (optList_isBool (i) ? "turn on/off " : ""),
408 optList[i].desc); 384 optList[i].desc);
409 } 385 }
410 fprintf (stderr, "\n --help to list long-options"); 386 rxvt_log ("\n --help to list long-options");
411 break; 387 break;
412 388
413 case 2: /* full resource listing */ 389 case 2: /* full resource listing */
414 fprintf (stderr,
415 " [options] [-e command args]\n\n" 390 rxvt_log (" [options] [-e command args]\n\n"
416 "where resources (long-options) include:\n"); 391 "where resources (long-options) include:\n");
417 392
418 for (i = 0; i < optList_size (); i++) 393 for (i = 0; i < optList_size (); i++)
419 if (optList[i].kw != NULL) 394 if (optList[i].kw != NULL)
420 fprintf (stderr, " %s: %*s%s\n", 395 rxvt_log (" %s: %*s%s\n",
421 optList[i].kw, 396 optList[i].kw,
422 (INDENT - STRLEN (optList[i].kw)), "", /* XXX */ 397 (INDENT - STRLEN (optList[i].kw)), "", /* XXX */
423 (optList_isBool (i) ? "boolean" : optList[i].arg)); 398 (optList_isBool (i) ? "boolean" : optList[i].arg));
424#ifdef KEYSYM_RESOURCE 399#ifdef KEYSYM_RESOURCE
425 fprintf (stderr, " " "keysym.sym" ": %*s%s\n", 400 rxvt_log (" " "keysym.sym" ": %*s%s\n",
426 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */ 401 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */
427 "keysym"); 402 "keysym");
428#endif 403#endif
429 fprintf (stderr, "\n -help to list options"); 404 rxvt_log ("\n -help to list options");
430 break; 405 break;
431 } 406 }
432 fprintf (stderr, "\n\n"); 407
433 exit (EXIT_FAILURE); 408 rxvt_log ("\n\n");
409 rxvt_exit_failure ();
434 /* NOTREACHED */ 410 /* NOTREACHED */
435} 411}
436 412
437/*}}} */ 413/*}}} */
438 414
… …
465 longopt = *opt++; /* long option */ 441 longopt = *opt++; /* long option */
466 } 442 }
467 else 443 else
468 { 444 {
469 bad_option = 1; 445 bad_option = 1;
470 rxvt_print_error ("bad option \"%s\"", opt); 446 rxvt_warn ("\"%s\": malformed option.\n", opt);
471 continue; 447 continue;
472 } 448 }
473 449
474 if (!STRCMP (opt, "help")) 450 if (!STRCMP (opt, "help"))
475 rxvt_usage (longopt ? 2 : 1); 451 rxvt_usage (longopt ? 2 : 1);
… …
532 else 508 else
533#ifdef KEYSYM_RESOURCE 509#ifdef KEYSYM_RESOURCE
534 /* if (!STRNCMP (opt, "keysym.", sizeof ("keysym.") - 1)) */ 510 /* if (!STRNCMP (opt, "keysym.", sizeof ("keysym.") - 1)) */
535 if (rxvt_Str_match (opt, "keysym.")) 511 if (rxvt_Str_match (opt, "keysym."))
536 { 512 {
537 const char *str = argv[++i]; 513 const char *str = argv[++i];
538 514
539 if (str != NULL) 515 if (str != NULL)
540 parse_keysym (opt + sizeof ("keysym.") - 1, str); 516 parse_keysym (opt + sizeof ("keysym.") - 1, str);
541 } 517 }
542 else 518 else
543#endif 519#endif
520 {
544 bad_option = 1; 521 bad_option = 1;
522 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
523 }
545 } 524 }
546 525
547 if (bad_option) 526 if (bad_option)
548 rxvt_usage (0); 527 rxvt_usage (0);
549} 528}
… …
671 * the matching algorithm used for memory-save fake resources 650 * the matching algorithm used for memory-save fake resources
672 */ 651 */
673void 652void
674rxvt_term::get_xdefaults (FILE *stream, const char *name) 653rxvt_term::get_xdefaults (FILE *stream, const char *name)
675{ 654{
676 unsigned int len; 655 unsigned int len;
677 char *str, buffer[256]; 656 char *str, buffer[256];
678 657
679 if (stream == NULL) 658 if (stream == NULL)
680 return; 659 return;
660
681 len = STRLEN (name); 661 len = STRLEN (name);
682 while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL) 662 while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL)
683 { 663 {
684 unsigned int entry, n; 664 unsigned int entry, n;
685 665
… …
694# ifdef KEYSYM_RESOURCE 674# ifdef KEYSYM_RESOURCE
695 if (!parse_keysym (str, NULL)) 675 if (!parse_keysym (str, NULL))
696# endif /* KEYSYM_RESOURCE */ 676# endif /* KEYSYM_RESOURCE */
697 for (entry = 0; entry < optList_size (); entry++) 677 for (entry = 0; entry < optList_size (); entry++)
698 { 678 {
699 const char *kw = optList[entry].kw; 679 const char *kw = optList[entry].kw;
700 680
701 if (kw == NULL) 681 if (kw == NULL)
702 continue; 682 continue;
683
703 n = STRLEN (kw); 684 n = STRLEN (kw);
704 if (str[n] == ':' && rxvt_Str_match (str, kw)) 685 if (str[n] == ':' && rxvt_Str_match (str, kw))
705 { 686 {
706 /* skip `keyword:' */ 687 /* skip `keyword:' */
707 str += (n + 1); 688 str += n + 1;
708 rxvt_Str_trim (str); 689 rxvt_Str_trim (str);
709 n = STRLEN (str); 690 n = STRLEN (str);
710 if (n && rs[optList[entry].doff] == NULL) 691 if (n && rs[optList[entry].doff] == NULL)
711 { 692 {
712 /* not already set */ 693 /* not already set */
713 int s; 694 int s;
714 char *p = (char *)rxvt_malloc ((n + 1) * sizeof (char)); 695 char *p = 0;
715 696
697 for (int o = 0;;)
698 {
699 p = (char *)rxvt_realloc (p, o + n + 1);
716 STRCPY (p, str); 700 MEMCPY (p + o, str, n);
701 o += n;
702 p[o] = 0;
703
704 if (o == 0 || p[o - 1] != '\\') // continuation line
705 break;
706
707 o--; // eat "\"
708
709 if ((str = fgets (buffer, sizeof (buffer), stream)) == NULL)
710 break;
711
712 rxvt_Str_trim (str);
713 n = STRLEN (str);
714 }
715
717 rs[optList[entry].doff] = p; 716 rs[optList[entry].doff] = p;
717 allocated.push_back (p);
718
718 if (optList_isBool (entry)) 719 if (optList_isBool (entry))
719 { 720 {
720 s = STRCASECMP (str, "TRUE") == 0 721 s = STRCASECMP (str, "TRUE") == 0
721 || STRCASECMP (str, "YES") == 0 722 || STRCASECMP (str, "YES") == 0
722 || STRCASECMP (str, "ON") == 0 723 || STRCASECMP (str, "ON") == 0
723 || STRCASECMP (str, "1") == 0; 724 || STRCASECMP (str, "1") == 0;
725
724 if (optList_isReverse (entry)) 726 if (optList_isReverse (entry))
725 s = !s; 727 s = !s;
728
726 if (s) 729 if (s)
727 Options |= (optList[entry].flag); 730 Options |= optList[entry].flag;
728 else 731 else
729 Options &= ~ (optList[entry].flag); 732 Options &= ~optList[entry].flag;
730 } 733 }
731 } 734 }
735
732 break; 736 break;
733 } 737 }
734 } 738 }
735 } 739 }
740
736 rewind (stream); 741 rewind (stream);
737} 742}
738 743
739/*}}} */ 744/*}}} */
740# endif /* ! USE_XGETDEFAULT */ 745# endif /* ! USE_XGETDEFAULT */
… …
751#ifndef NO_RESOURCES 756#ifndef NO_RESOURCES
752 757
753# if defined XAPPLOADDIR 758# if defined XAPPLOADDIR
754# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 759# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
755 /* Compute the path of the possibly available localized Rxvt file */ 760 /* Compute the path of the possibly available localized Rxvt file */
756 char *localepath = NULL; 761 char *localepath = NULL;
757 762
758 if (locale != NULL) 763 if (locale != NULL)
759 { /* XXX: must limit length of string */ 764 { /* XXX: must limit length of string */
760 localepath = (char *)rxvt_malloc (256); 765 localepath = (char *)rxvt_malloc (256);
761 sprintf (localepath, XAPPLOADDIRLOCALE "/" APL_SUBCLASS, 766 sprintf (localepath, XAPPLOADDIRLOCALE "/" RESCLASS,
762 (int) (258 - sizeof (XAPPLOADDIRLOCALE) - sizeof (APL_SUBCLASS)), 767 (int) (258 - sizeof (XAPPLOADDIRLOCALE) - sizeof (RESCLASS)),
763 locale); /* 258 = 255 + 4 (-.*s) - 1 (/) */ 768 locale); /* 258 = 255 + 4 (-.*s) - 1 (/) */
764 } 769 }
765 770
766 { 771 {
767# endif 772# endif
… …
769 774
770# ifdef USE_XGETDEFAULT 775# ifdef USE_XGETDEFAULT
771 /* 776 /*
772 * get resources using the X library function 777 * get resources using the X library function
773 */ 778 */
774 int entry; 779 int entry;
775 780
776# ifdef XrmEnumOneLevel 781# ifdef XrmEnumOneLevel
777 int i; 782 int i;
778 char *displayResource, *xe; 783 char *displayResource, *xe;
779 XrmName name_prefix[3]; 784 XrmName name_prefix[3];
780 XrmClass class_prefix[3]; 785 XrmClass class_prefix[3];
781 XrmDatabase database, rdb1; 786 XrmDatabase database, rdb1;
782 char fname[1024]; 787 char fname[1024];
783 788
784 XrmInitialize (); 789 XrmInitialize ();
785 database = NULL; 790 database = NULL;
786 791
787 /* Get any Xserver defaults */ 792 /* Get any Xserver defaults */
… …
800 805
801 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++) 806 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++)
802 { 807 {
803 sprintf (fname, "%-.*s/%s", sizeof (fname) - STRLEN (xnames[i]) - 2, 808 sprintf (fname, "%-.*s/%s", sizeof (fname) - STRLEN (xnames[i]) - 2,
804 ptr, xnames[i]); 809 ptr, xnames[i]);
805 if ((rdb1 = XrmGetFileDatabase (fname)) != NULL) 810 if ((rdb1 = XrmGetFileDatabase (fname)))
806 { 811 {
807 XrmMergeDatabases (rdb1, &database); 812 XrmMergeDatabases (rdb1, &database);
808# ifndef HAVE_BOTH_XRESOURCE_FILES 813# ifndef HAVE_BOTH_XRESOURCE_FILES
809 break; 814 break;
810# endif 815# endif
… …
822 827
823 /* Add in Rxvt file */ 828 /* Add in Rxvt file */
824# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 829# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
825 if (localepath == NULL || (rdb1 = XrmGetFileDatabase (localepath)) == NULL) 830 if (localepath == NULL || (rdb1 = XrmGetFileDatabase (localepath)) == NULL)
826# endif 831# endif
827 rdb1 = XrmGetFileDatabase (XAPPLOADDIR "/" APL_SUBCLASS); 832 rdb1 = XrmGetFileDatabase (XAPPLOADDIR "/" RESCLASS);
833
828 if (rdb1 != NULL) 834 if (rdb1 != NULL)
829 XrmMergeDatabases (rdb1, &database); 835 XrmMergeDatabases (rdb1, &database);
830 836
831 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */ 837 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
832 if ((xe = (char *)getenv ("XAPPLRESDIR")) != NULL) 838 if ((xe = (char *)getenv ("XAPPLRESDIR")) != NULL)
833 { 839 {
834 sprintf (fname, "%-.*s/" APL_SUBCLASS, sizeof (fname) 840 sprintf (fname, "%-.*s/" RESCLASS, sizeof (fname)
835 - sizeof (APL_SUBCLASS) - 2, xe); 841 - sizeof (RESCLASS) - 2, xe);
836 if ((rdb1 = XrmGetFileDatabase (fname)) != NULL) 842 if ((rdb1 = XrmGetFileDatabase (fname)) != NULL)
837 XrmMergeDatabases (rdb1, &database); 843 XrmMergeDatabases (rdb1, &database);
838 } 844 }
839 845
840 XrmSetDatabase (display, database); 846 XrmSetDatabase (display, database);
… …
854 860
855 p = XGetDefault (display, name, kw); 861 p = XGetDefault (display, name, kw);
856 p0 = XGetDefault (display, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw); 862 p0 = XGetDefault (display, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw);
857 if (p == NULL || (p0 && STRCMP (p, p0) == 0)) 863 if (p == NULL || (p0 && STRCMP (p, p0) == 0))
858 { 864 {
859 p = XGetDefault (display, APL_SUBCLASS, kw); 865 p = XGetDefault (display, RESCLASS, kw);
866#ifdef RESFALLBACK
860 if (p == NULL || (p0 && STRCMP (p, p0) == 0)) 867 if (p == NULL || (p0 && STRCMP (p, p0) == 0))
861 p = XGetDefault (display, APL_CLASS, kw); 868 p = XGetDefault (display, RESFALLBACK, kw);
869#endif
862 } 870 }
871
863 if (p == NULL && p0) 872 if (p == NULL && p0)
864 p = p0; 873 p = p0;
874
865 if (p) 875 if (p)
866 { 876 {
867 rs[optList[entry].doff] = p; 877 rs[optList[entry].doff] = p;
868 878
869 if (optList_isBool (entry)) 879 if (optList_isBool (entry))
… …
888# ifdef XrmEnumOneLevel 898# ifdef XrmEnumOneLevel
889# ifdef KEYSYM_RESOURCE 899# ifdef KEYSYM_RESOURCE
890 name_prefix[0] = XrmStringToName (name); 900 name_prefix[0] = XrmStringToName (name);
891 name_prefix[1] = XrmStringToName ("keysym"); 901 name_prefix[1] = XrmStringToName ("keysym");
892 name_prefix[2] = NULLQUARK; 902 name_prefix[2] = NULLQUARK;
893 class_prefix[0] = XrmStringToName (APL_SUBCLASS); 903 class_prefix[0] = XrmStringToName (RESCLASS);
894 class_prefix[1] = XrmStringToName ("Keysym"); 904 class_prefix[1] = XrmStringToName ("Keysym");
895 class_prefix[2] = NULLQUARK; 905 class_prefix[2] = NULLQUARK;
896 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 906 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
897 XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix, 907 XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix,
898 XrmEnumOneLevel, rxvt_define_key, NULL); 908 XrmEnumOneLevel, rxvt_define_key, NULL);
909# ifdef RESFALLBACK
899 name_prefix[0] = XrmStringToName (APL_CLASS); 910 name_prefix[0] = XrmStringToName (RESFALLBACK);
900 name_prefix[1] = XrmStringToName ("keysym"); 911 name_prefix[1] = XrmStringToName ("keysym");
901 class_prefix[0] = XrmStringToName (APL_CLASS); 912 class_prefix[0] = XrmStringToName (RESFALLBACK);
902 class_prefix[1] = XrmStringToName ("Keysym"); 913 class_prefix[1] = XrmStringToName ("Keysym");
903 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 914 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
904 XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix, 915 XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix,
905 XrmEnumOneLevel, rxvt_define_key, NULL); 916 XrmEnumOneLevel, rxvt_define_key, NULL);
917# endif
906# endif 918# endif
907# endif 919# endif
908 920
909# else /* USE_XGETDEFAULT */ 921# else /* USE_XGETDEFAULT */
910 /* get resources the hard way, but save lots of memory */ 922 /* get resources the hard way, but save lots of memory */
… …
948 * Also, use a special sub-class so that we can use either or both of 960 * Also, use a special sub-class so that we can use either or both of
949 * "XTerm" and "Rxvt" as class names. 961 * "XTerm" and "Rxvt" as class names.
950 */ 962 */
951 963
952 get_xdefaults (fd, name); 964 get_xdefaults (fd, name);
953 get_xdefaults (fd, APL_SUBCLASS); 965 get_xdefaults (fd, RESCLASS);
966# ifdef RESFALLBACK
967 get_xdefaults (fd, RESFALLBACK);
968# endif
954 969
955# if defined(XAPPLOADDIR) && defined(USE_XAPPLOADDIR) 970# if defined(XAPPLOADDIR) && defined(USE_XAPPLOADDIR)
956
957 { 971 {
958 FILE *ad = NULL; 972 FILE *ad = NULL;
959 973
960# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 974# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
961 if (localepath == NULL || (ad = fopen (localepath, "r")) == NULL) 975 if (localepath == NULL || (ad = fopen (localepath, "r")) == NULL)
962# endif 976# endif
963 ad = fopen (XAPPLOADDIR "/" APL_SUBCLASS, "r"); 977 ad = fopen (XAPPLOADDIR "/" RESCLASS, "r");
964 if (ad != NULL) 978 if (ad != NULL)
965 { 979 {
966 get_xdefaults (ad, APL_SUBCLASS); 980 get_xdefaults (ad, RESCLASS);
967 get_xdefaults (ad, ""); 981 get_xdefaults (ad, "");
968 fclose (ad); 982 fclose (ad);
969 } 983 }
970 } 984 }
971# endif /* XAPPLOADDIR */ 985# endif /* XAPPLOADDIR */
972 986
973 get_xdefaults (fd, APL_CLASS);
974 get_xdefaults (fd, ""); /* partial match */ 987 get_xdefaults (fd, ""); /* partial match */
975 if (fd != NULL) 988 if (fd != NULL)
976 fclose (fd); 989 fclose (fd);
977# endif /* USE_XGETDEFAULT */ 990# endif /* USE_XGETDEFAULT */
978 991
… …
985 free (localepath); 998 free (localepath);
986# endif 999# endif
987# endif 1000# endif
988 1001
989#endif /* NO_RESOURCES */ 1002#endif /* NO_RESOURCES */
990
991 /*
992 * even without resources, at least do this setup for command-line
993 * options and command-line long options
994 */
995
996#if defined (HOTKEY_CTRL) || defined (HOTKEY_META)
997 KeySym sym;
998
999 if (rs[Rs_bigfont_key]
1000 && ((sym = XStringToKeysym (rs[Rs_bigfont_key])) != 0))
1001 ks_bigfont = sym;
1002 if (rs[Rs_smallfont_key]
1003 && ((sym = XStringToKeysym (rs[Rs_smallfont_key])) != 0))
1004 ks_smallfont = sym;
1005#endif
1006} 1003}
1007 1004
1008/*}}} */ 1005/*}}} */
1009/*----------------------- end-of-file (C source) -----------------------*/ 1006/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines