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.28 by root, Fri Jul 30 22:36:42 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 $
5 * 4 *
6 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
7 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 6 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
8 * - original version 7 * - original version
9 * Copyright (c) 1997,1998 mj olesen <olesen@me.queensu.ca> 8 * Copyright (c) 1997,1998 mj olesen <olesen@me.queensu.ca>
9 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
10 * 10 *
11 * This program is free software; you can redistribute it and/or modify 11 * This program is free software; you can redistribute it and/or modify
12 * it under the terms of the GNU General Public License as published by 12 * it under the terms of the GNU General Public License as published by
13 * the Free Software Foundation; either version 2 of the License, or 13 * the Free Software Foundation; either version 2 of the License, or
14 * (at your option) any later version. 14 * (at your option) any later version.
… …
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
113#endif
114#ifdef OFF_FOCUS_FADING
115 STRG (Rs_fade, "fading", "fade", "%", "make colors x% darker when urxvt is losing focus."),
116#endif
117#ifdef TINTING
118 STRG (Rs_shade, "shading", "sh", "%", "shade background by x% when tinting."),
121#endif 119#endif
122 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"), 120 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"),
123#ifndef NO_BELL 121#ifndef NO_BELL
124 BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, "visual bell"), 122 BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, "visual bell"),
125# if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION) 123# if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION)
… …
128#endif 126#endif
129#ifdef META8_OPTION 127#ifdef META8_OPTION
130 BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, NULL), 128 BOOL (Rs_meta8, "meta8", NULL, Opt_meta8, NULL),
131#endif 129#endif
132#ifdef MOUSE_WHEEL 130#ifdef MOUSE_WHEEL
133 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, 131 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 132#endif
140#ifndef NO_FRILLS 133#ifndef NO_FRILLS
141 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, 134 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, "triple click word selection"),
142 "triple click word selection"), 135 BOOL (Rs_insecure, "insecure", "insecure", Opt_insecure, "enable possibly insecure escape sequences"),
143#endif 136#endif
144#ifdef CURSOR_BLINK 137#ifdef CURSOR_BLINK
145 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"), 138 BOOL (Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"),
146#endif 139#endif
147#ifdef POINTER_BLANK 140#ifdef POINTER_BLANK
… …
166 RSTRG (Rs_color + minBrightCOLOR + 5, "color13", "color"), 159 RSTRG (Rs_color + minBrightCOLOR + 5, "color13", "color"),
167 RSTRG (Rs_color + minBrightCOLOR + 6, "color14", "color"), 160 RSTRG (Rs_color + minBrightCOLOR + 6, "color14", "color"),
168 RSTRG (Rs_color + minBrightCOLOR + 7, "color15", "color"), 161 RSTRG (Rs_color + minBrightCOLOR + 7, "color15", "color"),
169#endif /* NO_BRIGHTCOLOR */ 162#endif /* NO_BRIGHTCOLOR */
170#ifndef NO_BOLD_UNDERLINE_REVERSE 163#ifndef NO_BOLD_UNDERLINE_REVERSE
164 BOOL (Rs_realBold, "realBold", "rb", Opt_realBold, "use bold fonts for bold text"),
171 RSTRG (Rs_color + Color_BD, "colorBD", "color"), 165 RSTRG (Rs_color + Color_BD, "colorBD", "color"),
172 RSTRG (Rs_color + Color_UL, "colorUL", "color"), 166 RSTRG (Rs_color + Color_UL, "colorUL", "color"),
173 RSTRG (Rs_color + Color_RV, "colorRV", "color"), 167 RSTRG (Rs_color + Color_RV, "colorRV", "color"),
174#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 168#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
175#ifdef KEEP_SCROLLCOLOR 169#ifdef KEEP_SCROLLCOLOR
… …
181#endif 175#endif
182#if defined (XPM_BACKGROUND) || (MENUBAR_MAX) 176#if defined (XPM_BACKGROUND) || (MENUBAR_MAX)
183 RSTRG (Rs_path, "path", "search path"), 177 RSTRG (Rs_path, "path", "search path"),
184#endif /* defined (XPM_BACKGROUND) || (MENUBAR_MAX) */ 178#endif /* defined (XPM_BACKGROUND) || (MENUBAR_MAX) */
185#ifdef XPM_BACKGROUND 179#ifdef XPM_BACKGROUND
186 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", 180 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
187 "background pixmap"),
188#endif /* XPM_BACKGROUND */ 181#endif /* XPM_BACKGROUND */
189#if (MENUBAR_MAX) 182#if (MENUBAR_MAX)
190 RSTRG (Rs_menu, "menu", "name[;tag]"), 183 RSTRG (Rs_menu, "menu", "name[;tag]"),
191#endif 184#endif
192 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 185 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
193 /* fonts: command-line option = resource name */ 186 /* fonts: command-line option = resource name */
194#ifdef USE_XIM 187#ifdef USE_XIM
195 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), 188 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
196 STRG (Rs_preeditType, "preeditType", "pt", "style", 189 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) 190#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
199 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"), 191 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"),
200#endif 192#endif
201#endif /* USE_XIM */ 193#endif /* USE_XIM */
202 STRG (Rs_name, NULL, "name", "string", 194 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"), 195 STRG (Rs_title, "title", "title", "string", "title name for window"),
205 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */ 196 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */
206 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"), 197 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),
207#ifndef NO_CURSORCOLOR 198#ifndef NO_CURSORCOLOR
208 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), 199 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
209 /* command-line option = resource name */ 200 /* command-line option = resource name */
210 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 201 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
211#endif /* NO_CURSORCOLOR */ 202#endif /* NO_CURSORCOLOR */
212 STRG (Rs_color + Color_pointer, "pointerColor", "pr", "color", 203 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
213 "pointer color"), 204 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
214 STRG (Rs_color + Color_border, "borderColor", "bd", "color", 205 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
215 "border color"),
216 STRG (Rs_saveLines, "saveLines", "sl", "number", 206 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),
217 "number of scrolled lines to save"),
218#ifndef NO_FRILLS 207#ifndef NO_FRILLS
219 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", 208 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), 209 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
222 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 210 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
223 STRG (Rs_int_bwidth, "internalBorder", "b", "number", 211 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
224 "internal border in pixels"),
225#endif 212#endif
226#ifndef NO_LINESPACE 213#ifndef NO_LINESPACE
227 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", 214 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
228 "number of extra pixels between rows"),
229#endif 215#endif
230 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", 216 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"),
231 "scrollbar thickness/width in pixels"),
232#ifdef POINTER_BLANK 217#ifdef POINTER_BLANK
233 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 218 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
234#endif 219#endif
235#ifndef NO_BACKSPACE_KEY 220#ifndef NO_BACKSPACE_KEY
236 RSTRG (Rs_backspace_key, "backspacekey", "string"), 221 RSTRG (Rs_backspace_key, "backspacekey", "string"),
… …
244 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"), 229 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"),
245#endif 230#endif
246#ifdef PRINTPIPE 231#ifdef PRINTPIPE
247 RSTRG (Rs_print_pipe, "print-pipe", "string"), 232 RSTRG (Rs_print_pipe, "print-pipe", "string"),
248#endif 233#endif
249#if defined (HOTKEY_CTRL) || defined (HOTKEY_META) 234 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"), 235 INFO ("xrm", "string", "X resource"),
256#ifdef CUTCHAR_RESOURCE 236#ifdef CUTCHAR_RESOURCE
257 RSTRG (Rs_cutchars, "cutchars", "string"), 237 RSTRG (Rs_cutchars, "cutchars", "string"),
258#endif /* CUTCHAR_RESOURCE */ 238#endif /* CUTCHAR_RESOURCE */
259#ifdef ACS_ASCII
260 RSTRG (Rs_acs_chars, "acsChars", "string"),
261#endif /* ACS_ASCII */
262 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 239 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
240#ifndef NO_SECONDARY_SCREEN
241 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"),
242 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"),
243#endif
263 INFO ("e", "command arg ...", "command to execute") 244 INFO ("e", "command arg ...", "command to execute")
264 }; 245 };
265 246
266#undef INFO 247#undef INFO
267#undef STRG 248#undef STRG
… …
294 "24bit," 275 "24bit,"
295#endif 276#endif
296#if defined(USE_XIM) 277#if defined(USE_XIM)
297 "XIM," 278 "XIM,"
298#endif 279#endif
299#if defined(MULTICHAR_SET)
300 "multichar_languages,"
301#endif
302 "scrollbars=" 280 "scrollbars="
303#if !defined(HAVE_SCROLLBARS) 281#if !defined(HAVE_SCROLLBARS)
304 "NONE" 282 "NONE"
305#else 283#else
284# if defined(PLAIN_SCROLLBAR)
285 "plain"
286# if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
287 "+"
288# endif
289# endif
306# if defined(RXVT_SCROLLBAR) 290# if defined(RXVT_SCROLLBAR)
307 "rxvt" 291 "rxvt"
308# if defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) 292# if defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
309 "+" 293 "+"
310# endif 294# endif
… …
348/*{{{ usage: */ 332/*{{{ usage: */
349/*----------------------------------------------------------------------*/ 333/*----------------------------------------------------------------------*/
350static void 334static void
351rxvt_usage (int type) 335rxvt_usage (int type)
352{ 336{
353 unsigned int i, col; 337 unsigned int i, col;
354 338
355 write (STDERR_FILENO, releasestring, sizeof (releasestring) - 1); 339 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 340
359 switch (type) 341 switch (type)
360 { 342 {
361 case 0: /* brief listing */ 343 case 0: /* brief listing */
362 fprintf (stderr, " [-help] [--help]\n"); 344 rxvt_log (" [-help] [--help]\n");
345
363 for (col = 1, i = 0; i < optList_size (); i++) 346 for (col = 1, i = 0; i < optList_size (); i++)
364 if (optList[i].desc != NULL) 347 if (optList[i].desc != NULL)
365 { 348 {
366 int len = 0; 349 int len = 0;
367 350
… …
376#endif 359#endif
377 len += 4 + STRLEN (optList[i].opt) + (optList_isBool (i) ? 2: 0); 360 len += 4 + STRLEN (optList[i].opt) + (optList_isBool (i) ? 2: 0);
378 col += len; 361 col += len;
379 if (col > 79) 362 if (col > 79)
380 { /* assume regular width */ 363 { /* assume regular width */
381 putc ('\n', stderr); 364 rxvt_log ("\n");
382 col = 1 + len; 365 col = 1 + len;
383 } 366 }
367
384 fprintf (stderr, " [-%s%s", (optList_isBool (i) ? "/+" : ""), 368 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
385 optList[i].opt);
386 if (optList_strlen (i)) 369 if (optList_strlen (i))
387 fprintf (stderr, " %s]", optList[i].arg); 370 rxvt_log (" %s]", optList[i].arg);
388 else 371 else
389 fprintf (stderr, "]"); 372 rxvt_log ("]");
390 } 373 }
391 break; 374 break;
392 375
393 case 1: /* full command-line listing */ 376 case 1: /* full command-line listing */
394 fprintf (stderr, " [options] [-e command args]\n\n" 377 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
395 "where options include:\n"); 378
396 for (i = 0; i < optList_size (); i++) 379 for (i = 0; i < optList_size (); i++)
397 if (optList[i].desc != NULL) 380 if (optList[i].desc != NULL)
398 { 381 {
399#ifdef DEBUG_STRICT 382#ifdef DEBUG_STRICT
400 assert (optList[i].opt != NULL); 383 assert (optList[i].opt != NULL);
401#endif 384#endif
402 fprintf (stderr, " %s%s %-*s%s%s\n", 385 rxvt_log (" %s%s %-*s%s%s\n",
403 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, 386 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
404 (INDENT - STRLEN (optList[i].opt) 387 (INDENT - STRLEN (optList[i].opt)
405 + (optList_isBool (i) ? 0 : 2)), 388 + (optList_isBool (i) ? 0 : 2)),
406 (optList[i].arg ? optList[i].arg : ""), 389 (optList[i].arg ? optList[i].arg : ""),
407 (optList_isBool (i) ? "turn on/off " : ""), 390 (optList_isBool (i) ? "turn on/off " : ""),
408 optList[i].desc); 391 optList[i].desc);
409 } 392 }
410 fprintf (stderr, "\n --help to list long-options"); 393 rxvt_log ("\n --help to list long-options");
411 break; 394 break;
412 395
413 case 2: /* full resource listing */ 396 case 2: /* full resource listing */
414 fprintf (stderr,
415 " [options] [-e command args]\n\n" 397 rxvt_log (" [options] [-e command args]\n\n"
416 "where resources (long-options) include:\n"); 398 "where resources (long-options) include:\n");
417 399
418 for (i = 0; i < optList_size (); i++) 400 for (i = 0; i < optList_size (); i++)
419 if (optList[i].kw != NULL) 401 if (optList[i].kw != NULL)
420 fprintf (stderr, " %s: %*s%s\n", 402 rxvt_log (" %s: %*s%s\n",
421 optList[i].kw, 403 optList[i].kw,
422 (INDENT - STRLEN (optList[i].kw)), "", /* XXX */ 404 (INDENT - STRLEN (optList[i].kw)), "", /* XXX */
423 (optList_isBool (i) ? "boolean" : optList[i].arg)); 405 (optList_isBool (i) ? "boolean" : optList[i].arg));
424#ifdef KEYSYM_RESOURCE 406#ifdef KEYSYM_RESOURCE
425 fprintf (stderr, " " "keysym.sym" ": %*s%s\n", 407 rxvt_log (" " "keysym.sym" ": %*s%s\n",
426 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */ 408 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */
427 "keysym"); 409 "keysym");
428#endif 410#endif
429 fprintf (stderr, "\n -help to list options"); 411 rxvt_log ("\n -help to list options");
430 break; 412 break;
431 } 413 }
432 fprintf (stderr, "\n\n"); 414
433 exit (EXIT_FAILURE); 415 rxvt_log ("\n\n");
416 rxvt_exit_failure ();
434 /* NOTREACHED */ 417 /* NOTREACHED */
435} 418}
436 419
437/*}}} */ 420/*}}} */
438 421
… …
465 longopt = *opt++; /* long option */ 448 longopt = *opt++; /* long option */
466 } 449 }
467 else 450 else
468 { 451 {
469 bad_option = 1; 452 bad_option = 1;
470 rxvt_print_error ("bad option \"%s\"", opt); 453 rxvt_warn ("\"%s\": malformed option.\n", opt);
471 continue; 454 continue;
472 } 455 }
473 456
474 if (!STRCMP (opt, "help")) 457 if (!STRCMP (opt, "help"))
475 rxvt_usage (longopt ? 2 : 1); 458 rxvt_usage (longopt ? 2 : 1);
… …
485 468
486 if (entry < optList_size ()) 469 if (entry < optList_size ())
487 { 470 {
488 if (optList_isReverse (entry)) 471 if (optList_isReverse (entry))
489 flag = flag == On ? Off : On; 472 flag = flag == On ? Off : On;
473
490 if (optList_strlen (entry)) 474 if (optList_strlen (entry))
491 { /* string value */
492 const char *str = argv[++i];
493
494#ifdef DEBUG_RESOURCES
495 fprintf (stderr, "string (%s,%s) = ",
496 optList[entry].opt ? optList[entry].opt : "nil",
497 optList[entry].kw ? optList[entry].kw : "nil");
498#endif
499 if (flag == On && str && (optList[entry].doff != -1))
500 { 475 {
501#ifdef DEBUG_RESOURCES
502 fprintf (stderr, "\"%s\"\n", str);
503#endif
504 rs[optList[entry].doff] = str;
505 /* 476 /*
506 * special cases are handled in main.c:main () to allow 477 * special cases are handled in main.c:main () to allow
507 * X resources to set these values before we settle for 478 * X resources to set these values before we settle for
508 * default values 479 * default values
509 */ 480 */
510 }
511#ifdef DEBUG_RESOURCES
512 else
513 fprintf (stderr, "???\n");
514#endif
515 481
482 if (optList[entry].doff != -1)
483 rs[optList[entry].doff] = flag == On && argv[i+1]
484 ? argv[++i] : 0;
516 } 485 }
517 else 486 else
518 { /* boolean value */ 487 { /* boolean value */
519#ifdef DEBUG_RESOURCES 488#ifdef DEBUG_RESOURCES
520 fprintf (stderr, "boolean (%s,%s) = %s\n", 489 fprintf (stderr, "boolean (%s,%s) = %s\n",
… …
532 else 501 else
533#ifdef KEYSYM_RESOURCE 502#ifdef KEYSYM_RESOURCE
534 /* if (!STRNCMP (opt, "keysym.", sizeof ("keysym.") - 1)) */ 503 /* if (!STRNCMP (opt, "keysym.", sizeof ("keysym.") - 1)) */
535 if (rxvt_Str_match (opt, "keysym.")) 504 if (rxvt_Str_match (opt, "keysym."))
536 { 505 {
537 const char *str = argv[++i]; 506 const char *str = argv[++i];
538 507
539 if (str != NULL) 508 if (str != NULL)
540 parse_keysym (opt + sizeof ("keysym.") - 1, str); 509 parse_keysym (opt + sizeof ("keysym.") - 1, str);
541 } 510 }
542 else 511 else
543#endif 512#endif
513 {
544 bad_option = 1; 514 bad_option = 1;
515 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
516 }
545 } 517 }
546 518
547 if (bad_option) 519 if (bad_option)
548 rxvt_usage (0); 520 rxvt_usage (0);
549} 521}
… …
671 * the matching algorithm used for memory-save fake resources 643 * the matching algorithm used for memory-save fake resources
672 */ 644 */
673void 645void
674rxvt_term::get_xdefaults (FILE *stream, const char *name) 646rxvt_term::get_xdefaults (FILE *stream, const char *name)
675{ 647{
676 unsigned int len; 648 unsigned int len;
677 char *str, buffer[256]; 649 char *str, buffer[256];
678 650
679 if (stream == NULL) 651 if (stream == NULL)
680 return; 652 return;
653
681 len = STRLEN (name); 654 len = STRLEN (name);
682 while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL) 655 while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL)
683 { 656 {
684 unsigned int entry, n; 657 unsigned int entry, n;
685 658
… …
694# ifdef KEYSYM_RESOURCE 667# ifdef KEYSYM_RESOURCE
695 if (!parse_keysym (str, NULL)) 668 if (!parse_keysym (str, NULL))
696# endif /* KEYSYM_RESOURCE */ 669# endif /* KEYSYM_RESOURCE */
697 for (entry = 0; entry < optList_size (); entry++) 670 for (entry = 0; entry < optList_size (); entry++)
698 { 671 {
699 const char *kw = optList[entry].kw; 672 const char *kw = optList[entry].kw;
700 673
701 if (kw == NULL) 674 if (kw == NULL)
702 continue; 675 continue;
676
703 n = STRLEN (kw); 677 n = STRLEN (kw);
704 if (str[n] == ':' && rxvt_Str_match (str, kw)) 678 if (str[n] == ':' && rxvt_Str_match (str, kw))
705 { 679 {
706 /* skip `keyword:' */ 680 /* skip `keyword:' */
707 str += (n + 1); 681 str += n + 1;
708 rxvt_Str_trim (str); 682 rxvt_Str_trim (str);
709 n = STRLEN (str); 683 n = STRLEN (str);
710 if (n && rs[optList[entry].doff] == NULL) 684 if (n && rs[optList[entry].doff] == NULL)
711 { 685 {
712 /* not already set */ 686 /* not already set */
713 int s; 687 int s;
714 char *p = (char *)rxvt_malloc ((n + 1) * sizeof (char)); 688 char *p = 0;
715 689
690 for (int o = 0;;)
691 {
692 p = (char *)rxvt_realloc (p, o + n + 1);
716 STRCPY (p, str); 693 MEMCPY (p + o, str, n);
694 o += n;
695 p[o] = 0;
696
697 if (o == 0 || p[o - 1] != '\\') // continuation line
698 break;
699
700 o--; // eat "\"
701
702 if ((str = fgets (buffer, sizeof (buffer), stream)) == NULL)
703 break;
704
705 rxvt_Str_trim (str);
706 n = STRLEN (str);
707 }
708
717 rs[optList[entry].doff] = p; 709 rs[optList[entry].doff] = p;
710 allocated.push_back (p);
711
718 if (optList_isBool (entry)) 712 if (optList_isBool (entry))
719 { 713 {
720 s = STRCASECMP (str, "TRUE") == 0 714 s = STRCASECMP (str, "TRUE") == 0
721 || STRCASECMP (str, "YES") == 0 715 || STRCASECMP (str, "YES") == 0
722 || STRCASECMP (str, "ON") == 0 716 || STRCASECMP (str, "ON") == 0
723 || STRCASECMP (str, "1") == 0; 717 || STRCASECMP (str, "1") == 0;
718
724 if (optList_isReverse (entry)) 719 if (optList_isReverse (entry))
725 s = !s; 720 s = !s;
721
726 if (s) 722 if (s)
727 Options |= (optList[entry].flag); 723 Options |= optList[entry].flag;
728 else 724 else
729 Options &= ~ (optList[entry].flag); 725 Options &= ~optList[entry].flag;
730 } 726 }
731 } 727 }
728
732 break; 729 break;
733 } 730 }
734 } 731 }
735 } 732 }
733
736 rewind (stream); 734 rewind (stream);
737} 735}
738 736
739/*}}} */ 737/*}}} */
740# endif /* ! USE_XGETDEFAULT */ 738# endif /* ! USE_XGETDEFAULT */
… …
751#ifndef NO_RESOURCES 749#ifndef NO_RESOURCES
752 750
753# if defined XAPPLOADDIR 751# if defined XAPPLOADDIR
754# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 752# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
755 /* Compute the path of the possibly available localized Rxvt file */ 753 /* Compute the path of the possibly available localized Rxvt file */
756 char *localepath = NULL; 754 char *localepath = NULL;
757 755
758 if (locale != NULL) 756 if (locale != NULL)
759 { /* XXX: must limit length of string */ 757 { /* XXX: must limit length of string */
760 localepath = (char *)rxvt_malloc (256); 758 localepath = (char *)rxvt_malloc (256);
761 sprintf (localepath, XAPPLOADDIRLOCALE "/" APL_SUBCLASS, 759 sprintf (localepath, XAPPLOADDIRLOCALE "/" RESCLASS,
762 (int) (258 - sizeof (XAPPLOADDIRLOCALE) - sizeof (APL_SUBCLASS)), 760 (int) (258 - sizeof (XAPPLOADDIRLOCALE) - sizeof (RESCLASS)),
763 locale); /* 258 = 255 + 4 (-.*s) - 1 (/) */ 761 locale); /* 258 = 255 + 4 (-.*s) - 1 (/) */
764 } 762 }
765 763
766 { 764 {
767# endif 765# endif
… …
769 767
770# ifdef USE_XGETDEFAULT 768# ifdef USE_XGETDEFAULT
771 /* 769 /*
772 * get resources using the X library function 770 * get resources using the X library function
773 */ 771 */
774 int entry; 772 int entry;
775 773
776# ifdef XrmEnumOneLevel 774# ifdef XrmEnumOneLevel
777 int i; 775 int i;
778 char *displayResource, *xe; 776 char *displayResource, *xe;
779 XrmName name_prefix[3]; 777 XrmName name_prefix[3];
780 XrmClass class_prefix[3]; 778 XrmClass class_prefix[3];
781 XrmDatabase database, rdb1; 779 XrmDatabase database, rdb1;
782 char fname[1024]; 780 char fname[1024];
783 781
784 XrmInitialize (); 782 XrmInitialize ();
785 database = NULL; 783 database = NULL;
786 784
787 /* Get any Xserver defaults */ 785 /* Get any Xserver defaults */
… …
800 798
801 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++) 799 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++)
802 { 800 {
803 sprintf (fname, "%-.*s/%s", sizeof (fname) - STRLEN (xnames[i]) - 2, 801 sprintf (fname, "%-.*s/%s", sizeof (fname) - STRLEN (xnames[i]) - 2,
804 ptr, xnames[i]); 802 ptr, xnames[i]);
805 if ((rdb1 = XrmGetFileDatabase (fname)) != NULL) 803 if ((rdb1 = XrmGetFileDatabase (fname)))
806 { 804 {
807 XrmMergeDatabases (rdb1, &database); 805 XrmMergeDatabases (rdb1, &database);
808# ifndef HAVE_BOTH_XRESOURCE_FILES 806# ifndef HAVE_BOTH_XRESOURCE_FILES
809 break; 807 break;
810# endif 808# endif
… …
822 820
823 /* Add in Rxvt file */ 821 /* Add in Rxvt file */
824# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 822# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
825 if (localepath == NULL || (rdb1 = XrmGetFileDatabase (localepath)) == NULL) 823 if (localepath == NULL || (rdb1 = XrmGetFileDatabase (localepath)) == NULL)
826# endif 824# endif
827 rdb1 = XrmGetFileDatabase (XAPPLOADDIR "/" APL_SUBCLASS); 825 rdb1 = XrmGetFileDatabase (XAPPLOADDIR "/" RESCLASS);
826
828 if (rdb1 != NULL) 827 if (rdb1 != NULL)
829 XrmMergeDatabases (rdb1, &database); 828 XrmMergeDatabases (rdb1, &database);
830 829
831 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */ 830 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
832 if ((xe = (char *)getenv ("XAPPLRESDIR")) != NULL) 831 if ((xe = (char *)getenv ("XAPPLRESDIR")) != NULL)
833 { 832 {
834 sprintf (fname, "%-.*s/" APL_SUBCLASS, sizeof (fname) 833 sprintf (fname, "%-.*s/" RESCLASS, sizeof (fname)
835 - sizeof (APL_SUBCLASS) - 2, xe); 834 - sizeof (RESCLASS) - 2, xe);
836 if ((rdb1 = XrmGetFileDatabase (fname)) != NULL) 835 if ((rdb1 = XrmGetFileDatabase (fname)) != NULL)
837 XrmMergeDatabases (rdb1, &database); 836 XrmMergeDatabases (rdb1, &database);
838 } 837 }
839 838
840 XrmSetDatabase (display, database); 839 XrmSetDatabase (display, database);
… …
854 853
855 p = XGetDefault (display, name, kw); 854 p = XGetDefault (display, name, kw);
856 p0 = XGetDefault (display, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw); 855 p0 = XGetDefault (display, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw);
857 if (p == NULL || (p0 && STRCMP (p, p0) == 0)) 856 if (p == NULL || (p0 && STRCMP (p, p0) == 0))
858 { 857 {
859 p = XGetDefault (display, APL_SUBCLASS, kw); 858 p = XGetDefault (display, RESCLASS, kw);
859#ifdef RESFALLBACK
860 if (p == NULL || (p0 && STRCMP (p, p0) == 0)) 860 if (p == NULL || (p0 && STRCMP (p, p0) == 0))
861 p = XGetDefault (display, APL_CLASS, kw); 861 p = XGetDefault (display, RESFALLBACK, kw);
862#endif
862 } 863 }
864
863 if (p == NULL && p0) 865 if (p == NULL && p0)
864 p = p0; 866 p = p0;
867
865 if (p) 868 if (p)
866 { 869 {
867 rs[optList[entry].doff] = p; 870 rs[optList[entry].doff] = p;
868 871
869 if (optList_isBool (entry)) 872 if (optList_isBool (entry))
… …
888# ifdef XrmEnumOneLevel 891# ifdef XrmEnumOneLevel
889# ifdef KEYSYM_RESOURCE 892# ifdef KEYSYM_RESOURCE
890 name_prefix[0] = XrmStringToName (name); 893 name_prefix[0] = XrmStringToName (name);
891 name_prefix[1] = XrmStringToName ("keysym"); 894 name_prefix[1] = XrmStringToName ("keysym");
892 name_prefix[2] = NULLQUARK; 895 name_prefix[2] = NULLQUARK;
893 class_prefix[0] = XrmStringToName (APL_SUBCLASS); 896 class_prefix[0] = XrmStringToName (RESCLASS);
894 class_prefix[1] = XrmStringToName ("Keysym"); 897 class_prefix[1] = XrmStringToName ("Keysym");
895 class_prefix[2] = NULLQUARK; 898 class_prefix[2] = NULLQUARK;
896 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 899 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
897 XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix, 900 XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix,
898 XrmEnumOneLevel, rxvt_define_key, NULL); 901 XrmEnumOneLevel, rxvt_define_key, NULL);
902# ifdef RESFALLBACK
899 name_prefix[0] = XrmStringToName (APL_CLASS); 903 name_prefix[0] = XrmStringToName (RESFALLBACK);
900 name_prefix[1] = XrmStringToName ("keysym"); 904 name_prefix[1] = XrmStringToName ("keysym");
901 class_prefix[0] = XrmStringToName (APL_CLASS); 905 class_prefix[0] = XrmStringToName (RESFALLBACK);
902 class_prefix[1] = XrmStringToName ("Keysym"); 906 class_prefix[1] = XrmStringToName ("Keysym");
903 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 907 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
904 XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix, 908 XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix,
905 XrmEnumOneLevel, rxvt_define_key, NULL); 909 XrmEnumOneLevel, rxvt_define_key, NULL);
910# endif
906# endif 911# endif
907# endif 912# endif
908 913
909# else /* USE_XGETDEFAULT */ 914# else /* USE_XGETDEFAULT */
910 /* get resources the hard way, but save lots of memory */ 915 /* 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 953 * Also, use a special sub-class so that we can use either or both of
949 * "XTerm" and "Rxvt" as class names. 954 * "XTerm" and "Rxvt" as class names.
950 */ 955 */
951 956
952 get_xdefaults (fd, name); 957 get_xdefaults (fd, name);
953 get_xdefaults (fd, APL_SUBCLASS); 958 get_xdefaults (fd, RESCLASS);
959# ifdef RESFALLBACK
960 get_xdefaults (fd, RESFALLBACK);
961# endif
954 962
955# if defined(XAPPLOADDIR) && defined(USE_XAPPLOADDIR) 963# if defined(XAPPLOADDIR) && defined(USE_XAPPLOADDIR)
956
957 { 964 {
958 FILE *ad = NULL; 965 FILE *ad = NULL;
959 966
960# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 967# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
961 if (localepath == NULL || (ad = fopen (localepath, "r")) == NULL) 968 if (localepath == NULL || (ad = fopen (localepath, "r")) == NULL)
962# endif 969# endif
963 ad = fopen (XAPPLOADDIR "/" APL_SUBCLASS, "r"); 970 ad = fopen (XAPPLOADDIR "/" RESCLASS, "r");
964 if (ad != NULL) 971 if (ad != NULL)
965 { 972 {
966 get_xdefaults (ad, APL_SUBCLASS); 973 get_xdefaults (ad, RESCLASS);
967 get_xdefaults (ad, ""); 974 get_xdefaults (ad, "");
968 fclose (ad); 975 fclose (ad);
969 } 976 }
970 } 977 }
971# endif /* XAPPLOADDIR */ 978# endif /* XAPPLOADDIR */
972 979
973 get_xdefaults (fd, APL_CLASS);
974 get_xdefaults (fd, ""); /* partial match */ 980 get_xdefaults (fd, ""); /* partial match */
975 if (fd != NULL) 981 if (fd != NULL)
976 fclose (fd); 982 fclose (fd);
977# endif /* USE_XGETDEFAULT */ 983# endif /* USE_XGETDEFAULT */
978 984
… …
985 free (localepath); 991 free (localepath);
986# endif 992# endif
987# endif 993# endif
988 994
989#endif /* NO_RESOURCES */ 995#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} 996}
1007 997
1008/*}}} */ 998/*}}} */
1009/*----------------------- end-of-file (C source) -----------------------*/ 999/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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