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.12 by pcg, Sun Feb 22 08:09:38 2004 UTC vs.
Revision 1.25 by root, Mon Jul 26 14:57:12 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: xdefaults.c 2 * File: xdefaults.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: xdefaults.C,v 1.12 2004/02/22 08:09:38 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
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
… …
166 RSTRG (Rs_color + minBrightCOLOR + 5, "color13", "color"), 153 RSTRG (Rs_color + minBrightCOLOR + 5, "color13", "color"),
167 RSTRG (Rs_color + minBrightCOLOR + 6, "color14", "color"), 154 RSTRG (Rs_color + minBrightCOLOR + 6, "color14", "color"),
168 RSTRG (Rs_color + minBrightCOLOR + 7, "color15", "color"), 155 RSTRG (Rs_color + minBrightCOLOR + 7, "color15", "color"),
169#endif /* NO_BRIGHTCOLOR */ 156#endif /* NO_BRIGHTCOLOR */
170#ifndef NO_BOLD_UNDERLINE_REVERSE 157#ifndef NO_BOLD_UNDERLINE_REVERSE
158 BOOL (Rs_realBold, "realBold", "rb", Opt_realBold, "use bold fonts for bold text"),
171 RSTRG (Rs_color + Color_BD, "colorBD", "color"), 159 RSTRG (Rs_color + Color_BD, "colorBD", "color"),
172 RSTRG (Rs_color + Color_UL, "colorUL", "color"), 160 RSTRG (Rs_color + Color_UL, "colorUL", "color"),
173 RSTRG (Rs_color + Color_RV, "colorRV", "color"), 161 RSTRG (Rs_color + Color_RV, "colorRV", "color"),
174#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 162#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
175#ifdef KEEP_SCROLLCOLOR 163#ifdef KEEP_SCROLLCOLOR
… …
181#endif 169#endif
182#if defined (XPM_BACKGROUND) || (MENUBAR_MAX) 170#if defined (XPM_BACKGROUND) || (MENUBAR_MAX)
183 RSTRG (Rs_path, "path", "search path"), 171 RSTRG (Rs_path, "path", "search path"),
184#endif /* defined (XPM_BACKGROUND) || (MENUBAR_MAX) */ 172#endif /* defined (XPM_BACKGROUND) || (MENUBAR_MAX) */
185#ifdef XPM_BACKGROUND 173#ifdef XPM_BACKGROUND
186 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", 174 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
187 "background pixmap"),
188#endif /* XPM_BACKGROUND */ 175#endif /* XPM_BACKGROUND */
189#if (MENUBAR_MAX) 176#if (MENUBAR_MAX)
190 RSTRG (Rs_menu, "menu", "name[;tag]"), 177 RSTRG (Rs_menu, "menu", "name[;tag]"),
191#endif 178#endif
192 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 179 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
193 /* fonts: command-line option = resource name */ 180 /* fonts: command-line option = resource name */
194#ifdef USE_XIM 181#ifdef USE_XIM
195 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), 182 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
196 STRG (Rs_preeditType, "preeditType", "pt", "style", 183 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) 184#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
199 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"), 185 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"),
200#endif 186#endif
201#endif /* USE_XIM */ 187#endif /* USE_XIM */
202 STRG (Rs_name, NULL, "name", "string", 188 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"), 189 STRG (Rs_title, "title", "title", "string", "title name for window"),
205 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */ 190 STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */
206 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"), 191 STRG (Rs_iconName, "iconName", "n", "string", "icon name for window"),
207#ifndef NO_CURSORCOLOR 192#ifndef NO_CURSORCOLOR
208 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), 193 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
209 /* command-line option = resource name */ 194 /* command-line option = resource name */
210 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 195 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
211#endif /* NO_CURSORCOLOR */ 196#endif /* NO_CURSORCOLOR */
212 STRG (Rs_color + Color_pointer, "pointerColor", "pr", "color", 197 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
213 "pointer color"), 198 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
214 STRG (Rs_color + Color_border, "borderColor", "bd", "color", 199 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
215 "border color"),
216 STRG (Rs_saveLines, "saveLines", "sl", "number", 200 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),
217 "number of scrolled lines to save"),
218#ifndef NO_FRILLS 201#ifndef NO_FRILLS
219 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", 202 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), 203 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
222 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 204 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
223 STRG (Rs_int_bwidth, "internalBorder", "b", "number", 205 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
224 "internal border in pixels"),
225#endif 206#endif
226#ifndef NO_LINESPACE 207#ifndef NO_LINESPACE
227 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", 208 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
228 "number of extra pixels between rows"),
229#endif 209#endif
230 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", 210 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"),
231 "scrollbar thickness/width in pixels"),
232#ifdef POINTER_BLANK 211#ifdef POINTER_BLANK
233 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 212 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
234#endif 213#endif
235#ifndef NO_BACKSPACE_KEY 214#ifndef NO_BACKSPACE_KEY
236 RSTRG (Rs_backspace_key, "backspacekey", "string"), 215 RSTRG (Rs_backspace_key, "backspacekey", "string"),
… …
244 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"), 223 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"),
245#endif 224#endif
246#ifdef PRINTPIPE 225#ifdef PRINTPIPE
247 RSTRG (Rs_print_pipe, "print-pipe", "string"), 226 RSTRG (Rs_print_pipe, "print-pipe", "string"),
248#endif 227#endif
249#if defined (HOTKEY_CTRL) || defined (HOTKEY_META) 228 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"), 229 INFO ("xrm", "string", "X resource"),
256#ifdef CUTCHAR_RESOURCE 230#ifdef CUTCHAR_RESOURCE
257 RSTRG (Rs_cutchars, "cutchars", "string"), 231 RSTRG (Rs_cutchars, "cutchars", "string"),
258#endif /* CUTCHAR_RESOURCE */ 232#endif /* CUTCHAR_RESOURCE */
259#ifdef ACS_ASCII
260 RSTRG (Rs_acs_chars, "acsChars", "string"),
261#endif /* ACS_ASCII */
262 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 233 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
234#ifndef NO_SECONDARY_SCREEN
235 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, "enable secondary screen"),
236 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, "enable secondary screen scroll"),
237#endif
263 INFO ("e", "command arg ...", "command to execute") 238 INFO ("e", "command arg ...", "command to execute")
264 }; 239 };
265 240
266#undef INFO 241#undef INFO
267#undef STRG 242#undef STRG
… …
294 "24bit," 269 "24bit,"
295#endif 270#endif
296#if defined(USE_XIM) 271#if defined(USE_XIM)
297 "XIM," 272 "XIM,"
298#endif 273#endif
299#if defined(MULTICHAR_SET)
300 "multichar_languages,"
301#endif
302 "scrollbars=" 274 "scrollbars="
303#if !defined(HAVE_SCROLLBARS) 275#if !defined(HAVE_SCROLLBARS)
304 "NONE" 276 "NONE"
305#else 277#else
278# if defined(PLAIN_SCROLLBAR)
279 "plain"
280# if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
281 "+"
282# endif
283# endif
306# if defined(RXVT_SCROLLBAR) 284# if defined(RXVT_SCROLLBAR)
307 "rxvt" 285 "rxvt"
308# if defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) 286# if defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
309 "+" 287 "+"
310# endif 288# endif
… …
348/*{{{ usage: */ 326/*{{{ usage: */
349/*----------------------------------------------------------------------*/ 327/*----------------------------------------------------------------------*/
350static void 328static void
351rxvt_usage (int type) 329rxvt_usage (int type)
352{ 330{
353 unsigned int i, col; 331 unsigned int i, col;
354 332
355 write (STDERR_FILENO, releasestring, sizeof (releasestring) - 1); 333 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 334
359 switch (type) 335 switch (type)
360 { 336 {
361 case 0: /* brief listing */ 337 case 0: /* brief listing */
362 fprintf (stderr, " [-help] [--help]\n"); 338 rxvt_log (" [-help] [--help]\n");
339
363 for (col = 1, i = 0; i < optList_size (); i++) 340 for (col = 1, i = 0; i < optList_size (); i++)
364 if (optList[i].desc != NULL) 341 if (optList[i].desc != NULL)
365 { 342 {
366 int len = 0; 343 int len = 0;
367 344
… …
376#endif 353#endif
377 len += 4 + STRLEN (optList[i].opt) + (optList_isBool (i) ? 2: 0); 354 len += 4 + STRLEN (optList[i].opt) + (optList_isBool (i) ? 2: 0);
378 col += len; 355 col += len;
379 if (col > 79) 356 if (col > 79)
380 { /* assume regular width */ 357 { /* assume regular width */
381 putc ('\n', stderr); 358 rxvt_log ("\n");
382 col = 1 + len; 359 col = 1 + len;
383 } 360 }
361
384 fprintf (stderr, " [-%s%s", (optList_isBool (i) ? "/+" : ""), 362 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
385 optList[i].opt);
386 if (optList_strlen (i)) 363 if (optList_strlen (i))
387 fprintf (stderr, " %s]", optList[i].arg); 364 rxvt_log (" %s]", optList[i].arg);
388 else 365 else
389 fprintf (stderr, "]"); 366 rxvt_log ("]");
390 } 367 }
391 break; 368 break;
392 369
393 case 1: /* full command-line listing */ 370 case 1: /* full command-line listing */
394 fprintf (stderr, " [options] [-e command args]\n\n" 371 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
395 "where options include:\n"); 372
396 for (i = 0; i < optList_size (); i++) 373 for (i = 0; i < optList_size (); i++)
397 if (optList[i].desc != NULL) 374 if (optList[i].desc != NULL)
398 { 375 {
399#ifdef DEBUG_STRICT 376#ifdef DEBUG_STRICT
400 assert (optList[i].opt != NULL); 377 assert (optList[i].opt != NULL);
401#endif 378#endif
402 fprintf (stderr, " %s%s %-*s%s%s\n", 379 rxvt_log (" %s%s %-*s%s%s\n",
403 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, 380 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
404 (INDENT - STRLEN (optList[i].opt) 381 (INDENT - STRLEN (optList[i].opt)
405 + (optList_isBool (i) ? 0 : 2)), 382 + (optList_isBool (i) ? 0 : 2)),
406 (optList[i].arg ? optList[i].arg : ""), 383 (optList[i].arg ? optList[i].arg : ""),
407 (optList_isBool (i) ? "turn on/off " : ""), 384 (optList_isBool (i) ? "turn on/off " : ""),
408 optList[i].desc); 385 optList[i].desc);
409 } 386 }
410 fprintf (stderr, "\n --help to list long-options"); 387 rxvt_log ("\n --help to list long-options");
411 break; 388 break;
412 389
413 case 2: /* full resource listing */ 390 case 2: /* full resource listing */
414 fprintf (stderr,
415 " [options] [-e command args]\n\n" 391 rxvt_log (" [options] [-e command args]\n\n"
416 "where resources (long-options) include:\n"); 392 "where resources (long-options) include:\n");
417 393
418 for (i = 0; i < optList_size (); i++) 394 for (i = 0; i < optList_size (); i++)
419 if (optList[i].kw != NULL) 395 if (optList[i].kw != NULL)
420 fprintf (stderr, " %s: %*s%s\n", 396 rxvt_log (" %s: %*s%s\n",
421 optList[i].kw, 397 optList[i].kw,
422 (INDENT - STRLEN (optList[i].kw)), "", /* XXX */ 398 (INDENT - STRLEN (optList[i].kw)), "", /* XXX */
423 (optList_isBool (i) ? "boolean" : optList[i].arg)); 399 (optList_isBool (i) ? "boolean" : optList[i].arg));
424#ifdef KEYSYM_RESOURCE 400#ifdef KEYSYM_RESOURCE
425 fprintf (stderr, " " "keysym.sym" ": %*s%s\n", 401 rxvt_log (" " "keysym.sym" ": %*s%s\n",
426 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */ 402 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */
427 "keysym"); 403 "keysym");
428#endif 404#endif
429 fprintf (stderr, "\n -help to list options"); 405 rxvt_log ("\n -help to list options");
430 break; 406 break;
431 } 407 }
432 fprintf (stderr, "\n\n"); 408
433 exit (EXIT_FAILURE); 409 rxvt_log ("\n\n");
410 rxvt_exit_failure ();
434 /* NOTREACHED */ 411 /* NOTREACHED */
435} 412}
436 413
437/*}}} */ 414/*}}} */
438 415
… …
465 longopt = *opt++; /* long option */ 442 longopt = *opt++; /* long option */
466 } 443 }
467 else 444 else
468 { 445 {
469 bad_option = 1; 446 bad_option = 1;
470 rxvt_print_error ("bad option \"%s\"", opt); 447 rxvt_warn ("\"%s\": malformed option.\n", opt);
471 continue; 448 continue;
472 } 449 }
473 450
474 if (!STRCMP (opt, "help")) 451 if (!STRCMP (opt, "help"))
475 rxvt_usage (longopt ? 2 : 1); 452 rxvt_usage (longopt ? 2 : 1);
… …
532 else 509 else
533#ifdef KEYSYM_RESOURCE 510#ifdef KEYSYM_RESOURCE
534 /* if (!STRNCMP (opt, "keysym.", sizeof ("keysym.") - 1)) */ 511 /* if (!STRNCMP (opt, "keysym.", sizeof ("keysym.") - 1)) */
535 if (rxvt_Str_match (opt, "keysym.")) 512 if (rxvt_Str_match (opt, "keysym."))
536 { 513 {
537 const char *str = argv[++i]; 514 const char *str = argv[++i];
538 515
539 if (str != NULL) 516 if (str != NULL)
540 parse_keysym (opt + sizeof ("keysym.") - 1, str); 517 parse_keysym (opt + sizeof ("keysym.") - 1, str);
541 } 518 }
542 else 519 else
543#endif 520#endif
521 {
544 bad_option = 1; 522 bad_option = 1;
523 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
524 }
545 } 525 }
546 526
547 if (bad_option) 527 if (bad_option)
548 rxvt_usage (0); 528 rxvt_usage (0);
549} 529}
… …
559 * quarks will be something like 539 * quarks will be something like
560 * "rxvt" "keysym" "0xFF01" 540 * "rxvt" "keysym" "0xFF01"
561 * value will be a string 541 * value will be a string
562 */ 542 */
563/* ARGSUSED */ 543/* ARGSUSED */
564bool 544int
565rxvt_define_key(XrmDatabase *database __attribute__((unused)), XrmBindingList bindings __attribute__((unused)), XrmQuarkList quarks, XrmRepresentation *type __attribute__((unused)), XrmValue *value, XPointer closure __attribute__((unused))) 545rxvt_define_key (XrmDatabase *database __attribute__((unused)),
546 XrmBindingList bindings __attribute__((unused)),
547 XrmQuarkList quarks,
548 XrmRepresentation *type __attribute__((unused)),
549 XrmValue *value,
550 XPointer closure __attribute__((unused)))
566{ 551{
567 int last; 552 int last;
568 553
569 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ 554 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
570 ; 555 ;
… …
666 * the matching algorithm used for memory-save fake resources 651 * the matching algorithm used for memory-save fake resources
667 */ 652 */
668void 653void
669rxvt_term::get_xdefaults (FILE *stream, const char *name) 654rxvt_term::get_xdefaults (FILE *stream, const char *name)
670{ 655{
671 unsigned int len; 656 unsigned int len;
672 char *str, buffer[256]; 657 char *str, buffer[256];
673 658
674 if (stream == NULL) 659 if (stream == NULL)
675 return; 660 return;
661
676 len = STRLEN (name); 662 len = STRLEN (name);
677 while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL) 663 while ((str = fgets (buffer, sizeof (buffer), stream)) != NULL)
678 { 664 {
679 unsigned int entry, n; 665 unsigned int entry, n;
680 666
… …
689# ifdef KEYSYM_RESOURCE 675# ifdef KEYSYM_RESOURCE
690 if (!parse_keysym (str, NULL)) 676 if (!parse_keysym (str, NULL))
691# endif /* KEYSYM_RESOURCE */ 677# endif /* KEYSYM_RESOURCE */
692 for (entry = 0; entry < optList_size (); entry++) 678 for (entry = 0; entry < optList_size (); entry++)
693 { 679 {
694 const char *kw = optList[entry].kw; 680 const char *kw = optList[entry].kw;
695 681
696 if (kw == NULL) 682 if (kw == NULL)
697 continue; 683 continue;
684
698 n = STRLEN (kw); 685 n = STRLEN (kw);
699 if (str[n] == ':' && rxvt_Str_match (str, kw)) 686 if (str[n] == ':' && rxvt_Str_match (str, kw))
700 { 687 {
701 /* skip `keyword:' */ 688 /* skip `keyword:' */
702 str += (n + 1); 689 str += n + 1;
703 rxvt_Str_trim (str); 690 rxvt_Str_trim (str);
704 n = STRLEN (str); 691 n = STRLEN (str);
705 if (n && rs[optList[entry].doff] == NULL) 692 if (n && rs[optList[entry].doff] == NULL)
706 { 693 {
707 /* not already set */ 694 /* not already set */
708 int s; 695 int s;
709 char *p = (char *)rxvt_malloc ((n + 1) * sizeof (char)); 696 char *p = 0;
710 697
698 for (int o = 0;;)
699 {
700 p = (char *)rxvt_realloc (p, o + n + 1);
711 STRCPY (p, str); 701 MEMCPY (p + o, str, n);
702 o += n;
703 p[o] = 0;
704
705 if (o == 0 || p[o - 1] != '\\') // continuation line
706 break;
707
708 o--; // eat "\"
709
710 if ((str = fgets (buffer, sizeof (buffer), stream)) == NULL)
711 break;
712
713 rxvt_Str_trim (str);
714 n = STRLEN (str);
715 }
716
712 rs[optList[entry].doff] = p; 717 rs[optList[entry].doff] = p;
718 allocated.push_back (p);
719
713 if (optList_isBool (entry)) 720 if (optList_isBool (entry))
714 { 721 {
715 s = STRCASECMP (str, "TRUE") == 0 722 s = STRCASECMP (str, "TRUE") == 0
716 || STRCASECMP (str, "YES") == 0 723 || STRCASECMP (str, "YES") == 0
717 || STRCASECMP (str, "ON") == 0 724 || STRCASECMP (str, "ON") == 0
718 || STRCASECMP (str, "1") == 0; 725 || STRCASECMP (str, "1") == 0;
726
719 if (optList_isReverse (entry)) 727 if (optList_isReverse (entry))
720 s = !s; 728 s = !s;
729
721 if (s) 730 if (s)
722 Options |= (optList[entry].flag); 731 Options |= optList[entry].flag;
723 else 732 else
724 Options &= ~ (optList[entry].flag); 733 Options &= ~optList[entry].flag;
725 } 734 }
726 } 735 }
736
727 break; 737 break;
728 } 738 }
729 } 739 }
730 } 740 }
741
731 rewind (stream); 742 rewind (stream);
732} 743}
733 744
734/*}}} */ 745/*}}} */
735# endif /* ! USE_XGETDEFAULT */ 746# endif /* ! USE_XGETDEFAULT */
… …
746#ifndef NO_RESOURCES 757#ifndef NO_RESOURCES
747 758
748# if defined XAPPLOADDIR 759# if defined XAPPLOADDIR
749# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 760# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
750 /* Compute the path of the possibly available localized Rxvt file */ 761 /* Compute the path of the possibly available localized Rxvt file */
751 char *localepath = NULL; 762 char *localepath = NULL;
752 763
753 if (locale != NULL) 764 if (locale != NULL)
754 { /* XXX: must limit length of string */ 765 { /* XXX: must limit length of string */
755 localepath = (char *)rxvt_malloc (256); 766 localepath = (char *)rxvt_malloc (256);
756 sprintf (localepath, XAPPLOADDIRLOCALE "/" APL_SUBCLASS, 767 sprintf (localepath, XAPPLOADDIRLOCALE "/" RESCLASS,
757 (int) (258 - sizeof (XAPPLOADDIRLOCALE) - sizeof (APL_SUBCLASS)), 768 (int) (258 - sizeof (XAPPLOADDIRLOCALE) - sizeof (RESCLASS)),
758 locale); /* 258 = 255 + 4 (-.*s) - 1 (/) */ 769 locale); /* 258 = 255 + 4 (-.*s) - 1 (/) */
759 } 770 }
760 771
761 { 772 {
762# endif 773# endif
… …
764 775
765# ifdef USE_XGETDEFAULT 776# ifdef USE_XGETDEFAULT
766 /* 777 /*
767 * get resources using the X library function 778 * get resources using the X library function
768 */ 779 */
769 int entry; 780 int entry;
770 781
771# ifdef XrmEnumOneLevel 782# ifdef XrmEnumOneLevel
772 int i; 783 int i;
773 char *displayResource, *xe; 784 char *displayResource, *xe;
774 XrmName name_prefix[3]; 785 XrmName name_prefix[3];
775 XrmClass class_prefix[3]; 786 XrmClass class_prefix[3];
776 XrmDatabase database, rdb1; 787 XrmDatabase database, rdb1;
777 char fname[1024]; 788 char fname[1024];
778 789
779 XrmInitialize (); 790 XrmInitialize ();
780 database = NULL; 791 database = NULL;
781 792
782 /* Get any Xserver defaults */ 793 /* Get any Xserver defaults */
… …
795 806
796 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++) 807 for (i = 0; i < (sizeof (xnames) / sizeof (xnames[0])); i++)
797 { 808 {
798 sprintf (fname, "%-.*s/%s", sizeof (fname) - STRLEN (xnames[i]) - 2, 809 sprintf (fname, "%-.*s/%s", sizeof (fname) - STRLEN (xnames[i]) - 2,
799 ptr, xnames[i]); 810 ptr, xnames[i]);
800 if ((rdb1 = XrmGetFileDatabase (fname)) != NULL) 811 if ((rdb1 = XrmGetFileDatabase (fname)))
801 { 812 {
802 XrmMergeDatabases (rdb1, &database); 813 XrmMergeDatabases (rdb1, &database);
803# ifndef HAVE_BOTH_XRESOURCE_FILES 814# ifndef HAVE_BOTH_XRESOURCE_FILES
804 break; 815 break;
805# endif 816# endif
… …
817 828
818 /* Add in Rxvt file */ 829 /* Add in Rxvt file */
819# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 830# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
820 if (localepath == NULL || (rdb1 = XrmGetFileDatabase (localepath)) == NULL) 831 if (localepath == NULL || (rdb1 = XrmGetFileDatabase (localepath)) == NULL)
821# endif 832# endif
822 rdb1 = XrmGetFileDatabase (XAPPLOADDIR "/" APL_SUBCLASS); 833 rdb1 = XrmGetFileDatabase (XAPPLOADDIR "/" RESCLASS);
834
823 if (rdb1 != NULL) 835 if (rdb1 != NULL)
824 XrmMergeDatabases (rdb1, &database); 836 XrmMergeDatabases (rdb1, &database);
825 837
826 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */ 838 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
827 if ((xe = (char *)getenv ("XAPPLRESDIR")) != NULL) 839 if ((xe = (char *)getenv ("XAPPLRESDIR")) != NULL)
828 { 840 {
829 sprintf (fname, "%-.*s/" APL_SUBCLASS, sizeof (fname) 841 sprintf (fname, "%-.*s/" RESCLASS, sizeof (fname)
830 - sizeof (APL_SUBCLASS) - 2, xe); 842 - sizeof (RESCLASS) - 2, xe);
831 if ((rdb1 = XrmGetFileDatabase (fname)) != NULL) 843 if ((rdb1 = XrmGetFileDatabase (fname)) != NULL)
832 XrmMergeDatabases (rdb1, &database); 844 XrmMergeDatabases (rdb1, &database);
833 } 845 }
834 846
835 XrmSetDatabase (display, database); 847 XrmSetDatabase (display, database);
… …
849 861
850 p = XGetDefault (display, name, kw); 862 p = XGetDefault (display, name, kw);
851 p0 = XGetDefault (display, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw); 863 p0 = XGetDefault (display, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw);
852 if (p == NULL || (p0 && STRCMP (p, p0) == 0)) 864 if (p == NULL || (p0 && STRCMP (p, p0) == 0))
853 { 865 {
854 p = XGetDefault (display, APL_SUBCLASS, kw); 866 p = XGetDefault (display, RESCLASS, kw);
867#ifdef RESFALLBACK
855 if (p == NULL || (p0 && STRCMP (p, p0) == 0)) 868 if (p == NULL || (p0 && STRCMP (p, p0) == 0))
856 p = XGetDefault (display, APL_CLASS, kw); 869 p = XGetDefault (display, RESFALLBACK, kw);
870#endif
857 } 871 }
872
858 if (p == NULL && p0) 873 if (p == NULL && p0)
859 p = p0; 874 p = p0;
875
860 if (p) 876 if (p)
861 { 877 {
862 rs[optList[entry].doff] = p; 878 rs[optList[entry].doff] = p;
863 879
864 if (optList_isBool (entry)) 880 if (optList_isBool (entry))
… …
883# ifdef XrmEnumOneLevel 899# ifdef XrmEnumOneLevel
884# ifdef KEYSYM_RESOURCE 900# ifdef KEYSYM_RESOURCE
885 name_prefix[0] = XrmStringToName (name); 901 name_prefix[0] = XrmStringToName (name);
886 name_prefix[1] = XrmStringToName ("keysym"); 902 name_prefix[1] = XrmStringToName ("keysym");
887 name_prefix[2] = NULLQUARK; 903 name_prefix[2] = NULLQUARK;
888 class_prefix[0] = XrmStringToName (APL_SUBCLASS); 904 class_prefix[0] = XrmStringToName (RESCLASS);
889 class_prefix[1] = XrmStringToName ("Keysym"); 905 class_prefix[1] = XrmStringToName ("Keysym");
890 class_prefix[2] = NULLQUARK; 906 class_prefix[2] = NULLQUARK;
891 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 907 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
892 XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix, 908 XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix,
893 XrmEnumOneLevel, rxvt_define_key, NULL); 909 XrmEnumOneLevel, rxvt_define_key, NULL);
910# ifdef RESFALLBACK
894 name_prefix[0] = XrmStringToName (APL_CLASS); 911 name_prefix[0] = XrmStringToName (RESFALLBACK);
895 name_prefix[1] = XrmStringToName ("keysym"); 912 name_prefix[1] = XrmStringToName ("keysym");
896 class_prefix[0] = XrmStringToName (APL_CLASS); 913 class_prefix[0] = XrmStringToName (RESFALLBACK);
897 class_prefix[1] = XrmStringToName ("Keysym"); 914 class_prefix[1] = XrmStringToName ("Keysym");
898 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 915 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
899 XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix, 916 XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix,
900 XrmEnumOneLevel, rxvt_define_key, NULL); 917 XrmEnumOneLevel, rxvt_define_key, NULL);
918# endif
901# endif 919# endif
902# endif 920# endif
903 921
904# else /* USE_XGETDEFAULT */ 922# else /* USE_XGETDEFAULT */
905 /* get resources the hard way, but save lots of memory */ 923 /* get resources the hard way, but save lots of memory */
… …
943 * Also, use a special sub-class so that we can use either or both of 961 * Also, use a special sub-class so that we can use either or both of
944 * "XTerm" and "Rxvt" as class names. 962 * "XTerm" and "Rxvt" as class names.
945 */ 963 */
946 964
947 get_xdefaults (fd, name); 965 get_xdefaults (fd, name);
948 get_xdefaults (fd, APL_SUBCLASS); 966 get_xdefaults (fd, RESCLASS);
967# ifdef RESFALLBACK
968 get_xdefaults (fd, RESFALLBACK);
969# endif
949 970
950# if defined(XAPPLOADDIR) && defined(USE_XAPPLOADDIR) 971# if defined(XAPPLOADDIR) && defined(USE_XAPPLOADDIR)
951
952 { 972 {
953 FILE *ad = NULL; 973 FILE *ad = NULL;
954 974
955# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 975# if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
956 if (localepath == NULL || (ad = fopen (localepath, "r")) == NULL) 976 if (localepath == NULL || (ad = fopen (localepath, "r")) == NULL)
957# endif 977# endif
958 ad = fopen (XAPPLOADDIR "/" APL_SUBCLASS, "r"); 978 ad = fopen (XAPPLOADDIR "/" RESCLASS, "r");
959 if (ad != NULL) 979 if (ad != NULL)
960 { 980 {
961 get_xdefaults (ad, APL_SUBCLASS); 981 get_xdefaults (ad, RESCLASS);
962 get_xdefaults (ad, ""); 982 get_xdefaults (ad, "");
963 fclose (ad); 983 fclose (ad);
964 } 984 }
965 } 985 }
966# endif /* XAPPLOADDIR */ 986# endif /* XAPPLOADDIR */
967 987
968 get_xdefaults (fd, APL_CLASS);
969 get_xdefaults (fd, ""); /* partial match */ 988 get_xdefaults (fd, ""); /* partial match */
970 if (fd != NULL) 989 if (fd != NULL)
971 fclose (fd); 990 fclose (fd);
972# endif /* USE_XGETDEFAULT */ 991# endif /* USE_XGETDEFAULT */
973 992
… …
980 free (localepath); 999 free (localepath);
981# endif 1000# endif
982# endif 1001# endif
983 1002
984#endif /* NO_RESOURCES */ 1003#endif /* NO_RESOURCES */
985
986 /*
987 * even without resources, at least do this setup for command-line
988 * options and command-line long options
989 */
990
991#if defined (HOTKEY_CTRL) || defined (HOTKEY_META)
992 KeySym sym;
993
994 if (rs[Rs_bigfont_key]
995 && ((sym = XStringToKeysym (rs[Rs_bigfont_key])) != 0))
996 ks_bigfont = sym;
997 if (rs[Rs_smallfont_key]
998 && ((sym = XStringToKeysym (rs[Rs_smallfont_key])) != 0))
999 ks_smallfont = sym;
1000#endif
1001} 1004}
1002 1005
1003/*}}} */ 1006/*}}} */
1004/*----------------------- end-of-file (C source) -----------------------*/ 1007/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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