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.127 by ayin, Mon Dec 17 23:52:45 2007 UTC vs.
Revision 1.156 by sf-exg, Tue Nov 29 16:44:13 2011 UTC

… …
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 6 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
7 * - original version 7 * - original version
8 * 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-2006 Marc Lehmann <pcg@goof.com> 9 * Copyright (c) 2003-2006 Marc Lehmann <schmorp@schmorp.de>
10 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
10 * 11 *
11 * This program is free software; you can redistribute it and/or modify 12 * 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 13 * 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 14 * the Free Software Foundation; either version 2 of the License, or
14 * (at your option) any later version. 15 * (at your option) any later version.
… …
62/* SWCH () - `-' flag */ 63/* SWCH () - `-' flag */
63#define SWCH(opt, option, flag, desc) \ 64#define SWCH(opt, option, flag, desc) \
64 { (option), (Optflag_Switch | (flag)), -1, NULL, (opt), NULL, (desc)} 65 { (option), (Optflag_Switch | (flag)), -1, NULL, (opt), NULL, (desc)}
65 66
66/* convenient macros */ 67/* convenient macros */
67#define optList_strlen(i) \ 68#define optList_isString(i) \
68 (optList[i].flag ? 0 : (optList[i].arg ? strlen (optList[i].arg) : 1)) 69 (optList[i].flag == 0)
69#define optList_isBool(i) \ 70#define optList_isBool(i) \
70 (optList[i].flag & Optflag_Boolean) 71 (optList[i].flag & Optflag_Boolean)
71#define optList_isReverse(i) \ 72#define optList_isReverse(i) \
72 (optList[i].flag & Optflag_Reverse) 73 (optList[i].flag & Optflag_Reverse)
73#define optList_size \
74 (sizeof (optList) / sizeof (optList[0]))
75 74
76static const struct 75static const struct
77 { 76 {
78 const uint8_t index; /* Option index */ 77 const uint8_t index; /* Option index */
79 const uint8_t flag; /* Option flag */ 78 const uint8_t flag; /* Option flag */
… …
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", "size (in characters) and position"), 90 STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"),
92 SWCH ("C", Opt_console, 0, "intercept console messages"), 91 SWCH ("C", Opt_console, 0, "intercept console messages"),
93 SWCH ("iconic", Opt_iconic, 0, "start iconic"), 92 SWCH ("iconic", Opt_iconic, 0, "start iconic"),
94 SWCH ("ic", Opt_iconic, 0, NULL), /* short form */ 93 SWCH ("ic", Opt_iconic, 0, NULL), /* short form */
94 STRG (Rs_chdir, "chdir", "cd", "string", "start shell in this directory"),
95 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"), 95 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"),
96 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"), 96 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"),
97 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"), 97 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"),
98 BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"), 98 BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"),
99 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, 0, "tab characters are pastable"), 99 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, 0, "tab characters are pastable"),
100#if HAVE_SCROLLBARS
101 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"), 100 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"),
102 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"), 101 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"),
103 BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, 0, "scrollbar right"), 102 BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, 0, "scrollbar right"),
104 BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, 0, "scrollbar without a trough"), 103 BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, 0, "scrollbar without a trough"),
105 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"), 104 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"),
106 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"), 105 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"),
107#endif
108 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL), 106 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL),
109 BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_scrollTtyOutput, Optflag_Reverse, "scroll-on-tty-output inhibit"), 107 BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_scrollTtyOutput, Optflag_Reverse, "scroll-on-tty-output inhibit"),
110 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"), 108 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"),
111 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"), 109 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"),
112#if ENABLE_TRANSPARENCY 110#if ENABLE_TRANSPARENCY
113 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"), 111 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"),
114 BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"), 112 BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"),
115 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"), 113 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
116 STRG (Rs_shade, "shading", "sh", "number", "shade background by number %."), 114 STRG (Rs_shade, "shading", "sh", "number", "shade background by number %."),
115 STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "gaussian blur radii to apply to the root background"),
117#endif 116#endif
118#if OFF_FOCUS_FADING 117#if OFF_FOCUS_FADING
119 STRG (Rs_fade, "fading", "fade", "number", "fade colors by number % when losing focus"), 118 STRG (Rs_fade, "fading", "fade", "number", "fade colors by number % when losing focus"),
120 STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"), 119 STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"),
121#endif 120#endif
… …
171 RSTRG (Rs_color + Color_RV, "colorRV", "color"), 170 RSTRG (Rs_color + Color_RV, "colorRV", "color"),
172#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 171#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
173#if ENABLE_FRILLS 172#if ENABLE_FRILLS
174 RSTRG (Rs_color + Color_underline, "underlineColor", "color"), 173 RSTRG (Rs_color + Color_underline, "underlineColor", "color"),
175#endif 174#endif
176#ifdef KEEP_SCROLLCOLOR
177 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), 175 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"),
176#ifdef RXVT_SCROLLBAR
178 RSTRG (Rs_color + Color_trough, "troughColor", "color"), 177 RSTRG (Rs_color + Color_trough, "troughColor", "color"),
179#endif /* KEEP_SCROLLCOLOR */ 178#endif
180#ifdef OPTION_HC 179#ifdef OPTION_HC
181 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"), 180 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"),
181 RSTRG (Rs_color + Color_HTC, "highlightTextColor", "color"),
182#endif 182#endif
183#ifndef NO_CURSORCOLOR 183#ifndef NO_CURSORCOLOR
184 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), 184 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
185 /* command-line option = resource name */ 185 /* command-line option = resource name */
186 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 186 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
… …
189 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"), 189 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
190 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), 190 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
191#ifdef BG_IMAGE_FROM_FILE 191#ifdef BG_IMAGE_FROM_FILE
192 RSTRG (Rs_path, "path", "search path"), 192 RSTRG (Rs_path, "path", "search path"),
193 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), 193 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
194# if ENABLE_EWMH
195 STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"),
196# endif
194#endif 197#endif
195 /* fonts: command-line option = resource name */ 198 /* fonts: command-line option = resource name */
196 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 199 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
197#if ENABLE_STYLES 200#if ENABLE_STYLES
198 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), 201 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
… …
214#if ENABLE_XEMBED 217#if ENABLE_XEMBED
215 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"), 218 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"),
216#endif 219#endif
217#if XFT 220#if XFT
218 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"), 221 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
222 BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL),
219#endif 223#endif
220#if ENABLE_FRILLS 224#if ENABLE_FRILLS
221 RSTRG (Rs_transient_for, "transient-for", "windowid"), 225 RSTRG (Rs_transient_for, "transient-for", "windowid"),
222 BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, 0, "set override-redirect on the terminal window"), 226 BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, 0, "set override-redirect on the terminal window"),
223 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"), 227 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"),
… …
226 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 230 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
227 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 231 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
228 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 232 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
229 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"), 233 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"),
230 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"), 234 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
235 STRG (Rs_letterSpace, "letterSpace", "letsp", "number", "letter spacing adjustment"),
231#endif 236#endif
232#ifdef BUILTIN_GLYPHS 237#ifdef BUILTIN_GLYPHS
233 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"), 238 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"),
234#endif 239#endif
235#ifdef POINTER_BLANK 240#ifdef POINTER_BLANK
… …
243#endif 248#endif
244#ifdef PRINTPIPE 249#ifdef PRINTPIPE
245 RSTRG (Rs_print_pipe, "print-pipe", "string"), 250 RSTRG (Rs_print_pipe, "print-pipe", "string"),
246#endif 251#endif
247 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"), 252 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"),
248#ifdef CUTCHAR_RESOURCE
249 RSTRG (Rs_cutchars, "cutchars", "string"), 253 RSTRG (Rs_cutchars, "cutchars", "string"),
250#endif /* CUTCHAR_RESOURCE */
251 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 254 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
252#ifndef NO_SECONDARY_SCREEN 255#ifndef NO_SECONDARY_SCREEN
253 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"), 256 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"),
254 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"), 257 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"),
255#endif 258#endif
… …
258 RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO 261 RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO
259 RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO 262 RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO
260 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"), 263 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"),
261#endif 264#endif
262#if ISO_14755 265#if ISO_14755
266 BOOL (Rs_iso14755, "iso14755", NULL, Opt_iso14755, 0, NULL),
263 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL), 267 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL),
264#endif 268#endif
265#ifdef HAVE_AFTERIMAGE 269#ifdef HAVE_AFTERIMAGE
266 STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."), 270 STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."),
267 STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "Gaussian Blur radii to apply to the root background"),
268#endif 271#endif
269 INFO ("e", "command arg ...", "command to execute") 272 INFO ("e", "command arg ...", "command to execute")
270 }; 273 };
271 274
272#undef INFO 275#undef INFO
… …
323 "tint," 326 "tint,"
324#endif 327#endif
325#if HAVE_AFTERIMAGE 328#if HAVE_AFTERIMAGE
326 "afterimage," 329 "afterimage,"
327#endif 330#endif
331#if HAVE_PIXBUF
332 "pixbuf,"
333#endif
328#if defined(USE_XIM) 334#if defined(USE_XIM)
329 "XIM," 335 "XIM,"
330#endif 336#endif
331#if defined(NO_BACKSPACE_KEY) 337#if defined(NO_BACKSPACE_KEY)
332 "no_backspace," 338 "no_backspace,"
… …
359 "pointerBlank," 365 "pointerBlank,"
360#endif 366#endif
361#if defined(NO_RESOURCES) 367#if defined(NO_RESOURCES)
362 "NoResources," 368 "NoResources,"
363#endif 369#endif
364 "scrollbars=" 370 "scrollbars=plain"
365#if !defined(HAVE_SCROLLBARS)
366 "NONE"
367#else
368# if defined(PLAIN_SCROLLBAR)
369 "plain"
370# if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
371 "+"
372# endif
373# endif
374# if defined(RXVT_SCROLLBAR) 371#if defined(RXVT_SCROLLBAR)
375 "rxvt" 372 "+rxvt"
376# if defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
377 "+"
378# endif
379# endif 373#endif
380# if defined(NEXT_SCROLLBAR) 374#if defined(NEXT_SCROLLBAR)
381 "NeXT" 375 "+NeXT"
382# if defined(XTERM_SCROLLBAR)
383 "+"
384# endif
385# endif 376#endif
386# if defined(XTERM_SCROLLBAR) 377#if defined(XTERM_SCROLLBAR)
387 "xterm" 378 "+xterm"
388# endif
389#endif 379#endif
390 "\nUsage: "; /* Usage */ 380 "\nUsage: "; /* Usage */
391 381
392#define INDENT 18 382#define INDENT 18
393 383
… …
407 switch (type) 397 switch (type)
408 { 398 {
409 case 0: /* brief listing */ 399 case 0: /* brief listing */
410 rxvt_log (" [-help] [--help]\n"); 400 rxvt_log (" [-help] [--help]\n");
411 401
412 for (col = 1, i = 0; i < optList_size; i++) 402 for (col = 1, i = 0; i < ecb_array_length (optList); i++)
413 if (optList[i].desc != NULL) 403 if (optList[i].desc != NULL)
414 { 404 {
415 int len = 0; 405 int len = 0;
416 406
417 if (!optList_isBool (i)) 407 if (optList[i].arg)
418 { 408 len = strlen (optList[i].arg) + 1;
419 len = optList_strlen (i);
420 if (len > 0)
421 len++; /* account for space */
422 }
423#ifdef DEBUG_STRICT
424 assert (optList[i].opt != NULL); 409 assert (optList[i].opt != NULL);
425#endif
426 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); 410 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2 : 0);
427 col += len; 411 col += len;
428 if (col > 79) 412 if (col > 79)
429 { 413 {
430 /* assume regular width */ 414 /* assume regular width */
431 rxvt_log ("\n"); 415 rxvt_log ("\n");
432 col = 1 + len; 416 col = 1 + len;
433 } 417 }
434 418
435 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); 419 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
436 if (optList_strlen (i)) 420 if (optList[i].arg)
437 rxvt_log (" %s]", optList[i].arg); 421 rxvt_log (" %s]", optList[i].arg);
438 else 422 else
439 rxvt_log ("]"); 423 rxvt_log ("]");
440 } 424 }
441 break; 425 break;
442 426
443 case 1: /* full command-line listing */ 427 case 1: /* full command-line listing */
444 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n"); 428 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
445 429
446 for (i = 0; i < optList_size; i++) 430 for (i = 0; i < ecb_array_length (optList); i++)
447 if (optList[i].desc != NULL) 431 if (optList[i].desc != NULL)
448 { 432 {
449#ifdef DEBUG_STRICT
450 assert (optList[i].opt != NULL); 433 assert (optList[i].opt != NULL);
451#endif
452 rxvt_log (" %s%s %-*s%s%s\n", 434 rxvt_log (" %s%s %-*s%s%s\n",
453 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, 435 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
454 (INDENT - strlen (optList[i].opt) 436 (INDENT - strlen (optList[i].opt)
455 + (optList_isBool (i) ? 0 : 2)), 437 + (optList_isBool (i) ? 0 : 2)),
456 (optList[i].arg ? optList[i].arg : ""), 438 (optList[i].arg ? optList[i].arg : ""),
… …
462 444
463 case 2: /* full resource listing */ 445 case 2: /* full resource listing */
464 rxvt_log (" [options] [-e command args]\n\n" 446 rxvt_log (" [options] [-e command args]\n\n"
465 "where resources (long-options) include:\n"); 447 "where resources (long-options) include:\n");
466 448
467 for (i = 0; i < optList_size; i++) 449 for (i = 0; i < ecb_array_length (optList); i++)
468 if (optList[i].kw != NULL) 450 if (optList[i].kw != NULL)
469 rxvt_log (" %s: %*s%s\n", 451 rxvt_log (" %s: %*s%s\n",
470 optList[i].kw, 452 optList[i].kw,
471 (INDENT - strlen (optList[i].kw)), "", /* XXX */ 453 (INDENT - strlen (optList[i].kw)), "", /* XXX */
472 (optList_isBool (i) ? "boolean" : optList[i].arg)); 454 (optList_isBool (i) ? "boolean" : optList[i].arg));
… …
479 break; 461 break;
480 } 462 }
481 463
482 rxvt_log ("\n\n"); 464 rxvt_log ("\n\n");
483 rxvt_exit_failure (); 465 rxvt_exit_failure ();
484 /* NOTREACHED */
485} 466}
486 467
487/*}}} */ 468/*}}} */
488 469
489/*{{{ get command-line options before getting resources */ 470/*{{{ get command-line options before getting resources */
… …
493 int i, bad_option = 0; 474 int i, bad_option = 0;
494 475
495 for (i = 1; i < argc; i++) 476 for (i = 1; i < argc; i++)
496 { 477 {
497 unsigned int entry, longopt = 0; 478 unsigned int entry, longopt = 0;
498 const char *flag, *opt; 479 const char *opt;
480 int flag;
499 481
500 opt = argv[i]; 482 opt = argv[i];
501 483
502 if (*opt == '-') 484 if (*opt == '-')
503 { 485 {
504 flag = resval_on; 486 flag = 1;
505 487
506 if (*++opt == '-') 488 if (*++opt == '-')
507 longopt = *opt++; /* long option */ 489 longopt = *opt++; /* long option */
508 } 490 }
509 else if (*opt == '+') 491 else if (*opt == '+')
510 { 492 {
511 flag = resval_off; 493 flag = 0;
512 494
513 if (*++opt == '+') 495 if (*++opt == '+')
514 longopt = *opt++; /* long option */ 496 longopt = *opt++; /* long option */
515 } 497 }
516 else 498 else
… …
525 507
526 if (!strcmp (opt, "h")) 508 if (!strcmp (opt, "h"))
527 rxvt_usage (0); 509 rxvt_usage (0);
528 510
529 /* feature: always try to match long-options */ 511 /* feature: always try to match long-options */
530 for (entry = 0; entry < optList_size; entry++) 512 for (entry = 0; entry < ecb_array_length (optList); entry++)
531 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw)) 513 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))
532 || (!longopt 514 || (!longopt
533 && optList[entry].opt && !strcmp (opt, optList[entry].opt))) 515 && optList[entry].opt && !strcmp (opt, optList[entry].opt)))
534 break; 516 break;
535 517
536 if (entry < optList_size) 518 if (entry < ecb_array_length (optList))
537 { 519 {
538 if (optList_isReverse (entry)) 520 if (optList_isReverse (entry))
539 flag = flag == resval_on ? resval_off : resval_on; 521 flag = !flag;
540 522
541 if (optList_strlen (entry)) 523 if (optList_isString (entry))
542 { 524 {
543 /* 525 /*
544 * special cases are handled in main.c:main () to allow 526 * special cases are handled in init_resources () to allow
545 * X resources to set these values before we settle for 527 * X resources to set these values before we settle for
546 * default values 528 * default values
547 */ 529 */
548 530
549 if (optList[entry].doff != -1) 531 if (optList[entry].doff != -1)
550 { 532 {
551 if (flag == resval_on && i+1 == argc) 533 if (flag && i+1 == argc)
552 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]); 534 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]);
553 535
554 rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef; 536 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef;
555 } 537 }
556 } 538 }
557 else 539 else
558 { 540 {
559 /* boolean value */ 541 /* boolean value */
560 set_option (optList[entry].index, flag == resval_on); 542 set_option (optList[entry].index, flag);
561 543
562 if (optList[entry].doff != -1) 544 if (optList[entry].doff != -1)
563 rs[optList[entry].doff] = flag; 545 rs[optList[entry].doff] = flag ? resval_on : resval_off;
564 } 546 }
565 } 547 }
566#ifndef NO_RESOURCES 548#ifndef NO_RESOURCES
567 else if (!strcmp (opt, "xrm")) 549 else if (!strcmp (opt, "xrm"))
568 { 550 {
… …
573#ifdef KEYSYM_RESOURCE 555#ifdef KEYSYM_RESOURCE
574 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) 556 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
575 { 557 {
576 if (i+1 < argc) 558 if (i+1 < argc)
577 { 559 {
578 char *res = (char *)malloc (strlen (opt) + strlen (argv[++i]) + 6); 560 char *res = rxvt_temp_buf<char> (strlen (opt) + strlen (argv[++i]) + 6);
579 sprintf (res, "*.%s: %s\n", opt, argv[i]); 561 sprintf (res, "*.%s: %s\n", opt, argv[i]);
580 XrmPutLineResource (&option_db, res); 562 XrmPutLineResource (&option_db, res);
581 free (res);
582 } 563 }
583 } 564 }
584#endif 565#endif
585 else 566 else
586 { 567 {
… …
603 * Define key from XrmEnumerateDatabase. 584 * Define key from XrmEnumerateDatabase.
604 * quarks will be something like 585 * quarks will be something like
605 * "rxvt" "keysym" "0xFF01" 586 * "rxvt" "keysym" "0xFF01"
606 * value will be a string 587 * value will be a string
607 */ 588 */
608/* ARGSUSED */
609int 589int
610rxvt_define_key (XrmDatabase *database UNUSED, 590rxvt_define_key (XrmDatabase *database ecb_unused,
611 XrmBindingList bindings UNUSED, 591 XrmBindingList bindings ecb_unused,
612 XrmQuarkList quarks, 592 XrmQuarkList quarks,
613 XrmRepresentation *type UNUSED, 593 XrmRepresentation *type ecb_unused,
614 XrmValue *value, 594 XrmValue *value,
615 XPointer closure UNUSED) 595 XPointer closure ecb_unused)
616{ 596{
617 int last; 597 int last;
618 598
619 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ 599 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
620 ; 600 ;
… …
625} 605}
626 606
627/* 607/*
628 * look for something like this (XK_Delete) 608 * look for something like this (XK_Delete)
629 * rxvt*keysym.0xFFFF: "\177" 609 * rxvt*keysym.0xFFFF: "\177"
630 *
631 * arg will be
632 * NULL for ~/.Xdefaults and
633 * non-NULL for command-line options (need to allocate)
634 */ 610 */
635#define NEWARGLIM 500 /* `reasonable' size */
636 611
637struct keysym_vocabulary_t 612struct keysym_vocabulary_t
638{ 613{
639 const char *name; 614 const char *name;
640 unsigned short len; 615 unsigned short len;
641 unsigned short value; 616 unsigned short value;
642}; 617};
643keysym_vocabulary_t keysym_vocabulary[] = 618static const keysym_vocabulary_t keysym_vocabulary[] =
644{ 619{
645 { "ISOLevel3", 9, Level3Mask }, 620 { "ISOLevel3", 9, Level3Mask },
646 { "AppKeypad", 9, AppKeypadMask }, 621 { "AppKeypad", 9, AppKeypadMask },
647 { "Control", 7, ControlMask }, 622 { "Control", 7, ControlMask },
648 { "NumLock", 7, NumLockMask }, 623 { "NumLock", 7, NumLockMask },
… …
670}; 645};
671 646
672int 647int
673rxvt_term::parse_keysym (const char *str, const char *arg) 648rxvt_term::parse_keysym (const char *str, const char *arg)
674{ 649{
675 int n, sym; 650 int sym;
676 unsigned int state = 0; 651 unsigned int state = 0;
677 const char *pmodend = NULL; 652 const char *key = strrchr (str, '-');
678 char *newarg = NULL;
679 char newargstr[NEWARGLIM];
680 653
681 if (arg == NULL) 654 if (!key)
682 { 655 key = str;
683 n = sizeof ("keysym.") - 1;
684 if (strncmp (str, "keysym.", n))
685 return 0;
686
687 str += n; /* skip `keysym.' */
688 if (!(pmodend = strchr (str, ':')))
689 return -1;
690 }
691 else 656 else
692 pmodend = str + strlen(str); 657 key++;
693 658
694 for (--pmodend; str < pmodend; --pmodend) 659 // string or key is empty
695 if (*pmodend == '-') 660 if (*arg == '\0' || *key == '\0')
696 break; 661 return -1;
697 662
663 // parse modifiers
698 while (str < pmodend) 664 while (str < key)
699 { 665 {
700 unsigned int i; 666 unsigned int i;
701 667
702 for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i) 668 for (i = 0; i < ecb_array_length (keysym_vocabulary); ++i)
703 { 669 {
704 if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0) 670 if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0)
705 { 671 {
706 state |= keysym_vocabulary[i].value; 672 state |= keysym_vocabulary[i].value;
707 str += keysym_vocabulary[i].len; 673 str += keysym_vocabulary[i].len;
708 break; 674 break;
709 } 675 }
710 } 676 }
711 677
712 if (i >= sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t)) 678 if (i >= ecb_array_length (keysym_vocabulary))
713 return -1; 679 return -1;
714 680
715 if (*str == '-') 681 if (*str == '-')
716 ++str; 682 ++str;
717 } 683 }
718 684
719 /* some scanf () have trouble with a 0x prefix */ 685 // convert keysym name to keysym number
720 if (str[0] == '0' && toupper (str[1]) == 'X') 686 if ((sym = XStringToKeysym (str)) == None)
721 { 687 {
722 str += 2; 688 // fallback on hexadecimal parsing
723 689 char *end;
690 sym = strtol (str, &end, 16);
724 if (arg) 691 if (*end)
725 {
726 if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1)
727 return -1;
728 }
729 else
730 {
731 if (sscanf (str, "%x:", &sym) != 1)
732 return -1;
733
734 /* cue to ':', it's there since sscanf () worked */
735 strncpy (newargstr, strchr (str, ':') + 1, NEWARGLIM - 1);
736 newargstr[NEWARGLIM - 1] = '\0';
737 newarg = newargstr;
738 }
739 }
740 else
741 {
742 /*
743 * convert keysym name to keysym number
744 */
745 strncpy (newargstr, str, NEWARGLIM - 1);
746 newargstr[NEWARGLIM - 1] = '\0';
747
748 if (arg == NULL)
749 {
750 if ((newarg = strchr (newargstr, ':')) == NULL)
751 return -1;
752
753 *newarg++ = '\0'; /* terminate keysym name */
754 }
755
756 if ((sym = XStringToKeysym (newargstr)) == None)
757 return -1; 692 return -1;
758 } 693 }
759 694
760 if (newarg == NULL)
761 {
762 strncpy (newargstr, arg, NEWARGLIM - 1);
763 newargstr[NEWARGLIM - 1] = '\0';
764 newarg = newargstr;
765 }
766
767 if (*newarg == '\0')
768 return -1;
769
770 keyboard->register_user_translation (sym, state, newarg); 695 keyboard->register_user_translation (sym, state, arg);
771 return 1; 696 return 1;
772} 697}
773 698
774# endif /* KEYSYM_RESOURCE */ 699# endif /* KEYSYM_RESOURCE */
775#endif /* NO_RESOURCES */ 700#endif /* NO_RESOURCES */
… …
818 XrmMergeDatabases (option_db, &database); 743 XrmMergeDatabases (option_db, &database);
819 option_db = NULL; 744 option_db = NULL;
820 /* 745 /*
821 * Query resources for options that affect us 746 * Query resources for options that affect us
822 */ 747 */
823 for (int entry = 0; entry < optList_size; entry++) 748 for (int entry = 0; entry < ecb_array_length (optList); entry++)
824 { 749 {
825 int s; 750 int s;
826 const char *kw = optList[entry].kw; 751 const char *kw = optList[entry].kw;
827 752
828 if (kw == NULL || rs[optList[entry].doff] != NULL) 753 if (kw == NULL || rs[optList[entry].doff] != NULL)
… …
866 class_prefix[2] = NULLQUARK; 791 class_prefix[2] = NULLQUARK;
867 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 792 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
868 XrmEnumerateDatabase (database, name_prefix, class_prefix, 793 XrmEnumerateDatabase (database, name_prefix, class_prefix,
869 XrmEnumOneLevel, rxvt_define_key, NULL); 794 XrmEnumOneLevel, rxvt_define_key, NULL);
870# ifdef RESFALLBACK 795# ifdef RESFALLBACK
871 name_prefix[0] = XrmStringToName (RESFALLBACK);
872 name_prefix[1] = XrmStringToName ("keysym");
873 class_prefix[0] = XrmStringToName (RESFALLBACK); 796 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK);
874 class_prefix[1] = XrmStringToName ("Keysym");
875 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 797 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
876 XrmEnumerateDatabase (database, name_prefix, class_prefix, 798 XrmEnumerateDatabase (database, name_prefix, class_prefix,
877 XrmEnumOneLevel, rxvt_define_key, NULL); 799 XrmEnumOneLevel, rxvt_define_key, NULL);
878# endif 800# endif
879# endif 801# endif

Diff Legend

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