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.125 by ayin, Mon Nov 26 11:20:16 2007 UTC vs.
Revision 1.152 by sf-exg, Fri Apr 29 13:08:24 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", "%", "shade background by x %."), 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", "%", "fade colors x% percent when rxvt-unicode is 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
122 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"), 121 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"),
123#ifndef NO_BELL 122#ifndef NO_BELL
124# if ENABLE_FRILLS 123# if ENABLE_FRILLS
… …
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
… …
239 RSTRG (Rs_backspace_key, "backspacekey", "string"), 244 RSTRG (Rs_backspace_key, "backspacekey", "string"),
240#endif 245#endif
241#ifndef NO_DELETE_KEY 246#ifndef NO_DELETE_KEY
242 RSTRG (Rs_delete_key, "deletekey", "string"), 247 RSTRG (Rs_delete_key, "deletekey", "string"),
243#endif 248#endif
244 RSTRG (Rs_selectstyle, "selectstyle", "mode"),
245#ifdef PRINTPIPE 249#ifdef PRINTPIPE
246 RSTRG (Rs_print_pipe, "print-pipe", "string"), 250 RSTRG (Rs_print_pipe, "print-pipe", "string"),
247#endif 251#endif
248 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"),
249#ifdef CUTCHAR_RESOURCE
250 RSTRG (Rs_cutchars, "cutchars", "string"), 253 RSTRG (Rs_cutchars, "cutchars", "string"),
251#endif /* CUTCHAR_RESOURCE */
252 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 254 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
253#ifndef NO_SECONDARY_SCREEN 255#ifndef NO_SECONDARY_SCREEN
254 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"), 256 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"),
255 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"),
256#endif 258#endif
… …
259 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
260 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
261 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"),
262#endif 264#endif
263#if ISO_14755 265#if ISO_14755
266 BOOL (Rs_iso14755, "iso14755", NULL, Opt_iso14755, 0, NULL),
264 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),
265#endif 268#endif
266#ifdef HAVE_AFTERIMAGE 269#ifdef HAVE_AFTERIMAGE
267 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..."),
268 STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "Gaussian Blur radii to apply to the root background"),
269#endif 271#endif
270 INFO ("e", "command arg ...", "command to execute") 272 INFO ("e", "command arg ...", "command to execute")
271 }; 273 };
272 274
273#undef INFO 275#undef INFO
… …
324 "tint," 326 "tint,"
325#endif 327#endif
326#if HAVE_AFTERIMAGE 328#if HAVE_AFTERIMAGE
327 "afterimage," 329 "afterimage,"
328#endif 330#endif
331#if HAVE_PIXBUF
332 "pixbuf,"
333#endif
329#if defined(USE_XIM) 334#if defined(USE_XIM)
330 "XIM," 335 "XIM,"
331#endif 336#endif
332#if defined(NO_BACKSPACE_KEY) 337#if defined(NO_BACKSPACE_KEY)
333 "no_backspace," 338 "no_backspace,"
… …
360 "pointerBlank," 365 "pointerBlank,"
361#endif 366#endif
362#if defined(NO_RESOURCES) 367#if defined(NO_RESOURCES)
363 "NoResources," 368 "NoResources,"
364#endif 369#endif
365 "scrollbars=" 370 "scrollbars=plain"
366#if !defined(HAVE_SCROLLBARS)
367 "NONE"
368#else
369# if defined(PLAIN_SCROLLBAR)
370 "plain"
371# if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
372 "+"
373# endif
374# endif
375# if defined(RXVT_SCROLLBAR) 371#if defined(RXVT_SCROLLBAR)
376 "rxvt" 372 "+rxvt"
377# if defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
378 "+"
379# endif
380# endif 373#endif
381# if defined(NEXT_SCROLLBAR) 374#if defined(NEXT_SCROLLBAR)
382 "NeXT" 375 "+NeXT"
383# if defined(XTERM_SCROLLBAR)
384 "+"
385# endif
386# endif 376#endif
387# if defined(XTERM_SCROLLBAR) 377#if defined(XTERM_SCROLLBAR)
388 "xterm" 378 "+xterm"
389# endif
390#endif 379#endif
391 "\nUsage: "; /* Usage */ 380 "\nUsage: "; /* Usage */
392 381
393#define INDENT 18 382#define INDENT 18
394 383
… …
408 switch (type) 397 switch (type)
409 { 398 {
410 case 0: /* brief listing */ 399 case 0: /* brief listing */
411 rxvt_log (" [-help] [--help]\n"); 400 rxvt_log (" [-help] [--help]\n");
412 401
413 for (col = 1, i = 0; i < optList_size; i++) 402 for (col = 1, i = 0; i < ARRAY_LENGTH(optList); i++)
414 if (optList[i].desc != NULL) 403 if (optList[i].desc != NULL)
415 { 404 {
416 int len = 0; 405 int len = 0;
417 406
418 if (!optList_isBool (i)) 407 if (optList[i].arg)
419 { 408 len = strlen (optList[i].arg) + 1;
420 len = optList_strlen (i);
421 if (len > 0)
422 len++; /* account for space */
423 }
424#ifdef DEBUG_STRICT
425 assert (optList[i].opt != NULL); 409 assert (optList[i].opt != NULL);
426#endif
427 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); 410 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2 : 0);
428 col += len; 411 col += len;
429 if (col > 79) 412 if (col > 79)
430 { 413 {
431 /* assume regular width */ 414 /* assume regular width */
432 rxvt_log ("\n"); 415 rxvt_log ("\n");
433 col = 1 + len; 416 col = 1 + len;
434 } 417 }
435 418
436 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); 419 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
437 if (optList_strlen (i)) 420 if (optList[i].arg)
438 rxvt_log (" %s]", optList[i].arg); 421 rxvt_log (" %s]", optList[i].arg);
439 else 422 else
440 rxvt_log ("]"); 423 rxvt_log ("]");
441 } 424 }
442 break; 425 break;
443 426
444 case 1: /* full command-line listing */ 427 case 1: /* full command-line listing */
445 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n"); 428 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
446 429
447 for (i = 0; i < optList_size; i++) 430 for (i = 0; i < ARRAY_LENGTH(optList); i++)
448 if (optList[i].desc != NULL) 431 if (optList[i].desc != NULL)
449 { 432 {
450#ifdef DEBUG_STRICT
451 assert (optList[i].opt != NULL); 433 assert (optList[i].opt != NULL);
452#endif
453 rxvt_log (" %s%s %-*s%s%s\n", 434 rxvt_log (" %s%s %-*s%s%s\n",
454 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, 435 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
455 (INDENT - strlen (optList[i].opt) 436 (INDENT - strlen (optList[i].opt)
456 + (optList_isBool (i) ? 0 : 2)), 437 + (optList_isBool (i) ? 0 : 2)),
457 (optList[i].arg ? optList[i].arg : ""), 438 (optList[i].arg ? optList[i].arg : ""),
… …
463 444
464 case 2: /* full resource listing */ 445 case 2: /* full resource listing */
465 rxvt_log (" [options] [-e command args]\n\n" 446 rxvt_log (" [options] [-e command args]\n\n"
466 "where resources (long-options) include:\n"); 447 "where resources (long-options) include:\n");
467 448
468 for (i = 0; i < optList_size; i++) 449 for (i = 0; i < ARRAY_LENGTH(optList); i++)
469 if (optList[i].kw != NULL) 450 if (optList[i].kw != NULL)
470 rxvt_log (" %s: %*s%s\n", 451 rxvt_log (" %s: %*s%s\n",
471 optList[i].kw, 452 optList[i].kw,
472 (INDENT - strlen (optList[i].kw)), "", /* XXX */ 453 (INDENT - strlen (optList[i].kw)), "", /* XXX */
473 (optList_isBool (i) ? "boolean" : optList[i].arg)); 454 (optList_isBool (i) ? "boolean" : optList[i].arg));
… …
494 int i, bad_option = 0; 475 int i, bad_option = 0;
495 476
496 for (i = 1; i < argc; i++) 477 for (i = 1; i < argc; i++)
497 { 478 {
498 unsigned int entry, longopt = 0; 479 unsigned int entry, longopt = 0;
499 const char *flag, *opt; 480 const char *opt;
481 int flag;
500 482
501 opt = argv[i]; 483 opt = argv[i];
502 484
503 if (*opt == '-') 485 if (*opt == '-')
504 { 486 {
505 flag = resval_on; 487 flag = 1;
506 488
507 if (*++opt == '-') 489 if (*++opt == '-')
508 longopt = *opt++; /* long option */ 490 longopt = *opt++; /* long option */
509 } 491 }
510 else if (*opt == '+') 492 else if (*opt == '+')
511 { 493 {
512 flag = resval_off; 494 flag = 0;
513 495
514 if (*++opt == '+') 496 if (*++opt == '+')
515 longopt = *opt++; /* long option */ 497 longopt = *opt++; /* long option */
516 } 498 }
517 else 499 else
… …
526 508
527 if (!strcmp (opt, "h")) 509 if (!strcmp (opt, "h"))
528 rxvt_usage (0); 510 rxvt_usage (0);
529 511
530 /* feature: always try to match long-options */ 512 /* feature: always try to match long-options */
531 for (entry = 0; entry < optList_size; entry++) 513 for (entry = 0; entry < ARRAY_LENGTH(optList); entry++)
532 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw)) 514 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))
533 || (!longopt 515 || (!longopt
534 && optList[entry].opt && !strcmp (opt, optList[entry].opt))) 516 && optList[entry].opt && !strcmp (opt, optList[entry].opt)))
535 break; 517 break;
536 518
537 if (entry < optList_size) 519 if (entry < ARRAY_LENGTH(optList))
538 { 520 {
539 if (optList_isReverse (entry)) 521 if (optList_isReverse (entry))
540 flag = flag == resval_on ? resval_off : resval_on; 522 flag = !flag;
541 523
542 if (optList_strlen (entry)) 524 if (optList_isString (entry))
543 { 525 {
544 /* 526 /*
545 * special cases are handled in main.c:main () to allow 527 * special cases are handled in main.c:main () to allow
546 * X resources to set these values before we settle for 528 * X resources to set these values before we settle for
547 * default values 529 * default values
548 */ 530 */
549 531
550 if (optList[entry].doff != -1) 532 if (optList[entry].doff != -1)
551 { 533 {
552 if (flag == resval_on && i+1 == argc) 534 if (flag && i+1 == argc)
553 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]); 535 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]);
554 536
555 rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef; 537 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef;
556 } 538 }
557 } 539 }
558 else 540 else
559 { 541 {
560 /* boolean value */ 542 /* boolean value */
561 set_option (optList[entry].index, flag == resval_on); 543 set_option (optList[entry].index, flag);
562 544
563 if (optList[entry].doff != -1) 545 if (optList[entry].doff != -1)
564 rs[optList[entry].doff] = flag; 546 rs[optList[entry].doff] = flag ? resval_on : resval_off;
565 } 547 }
566 } 548 }
567#ifndef NO_RESOURCES 549#ifndef NO_RESOURCES
568 else if (!strcmp (opt, "xrm")) 550 else if (!strcmp (opt, "xrm"))
569 { 551 {
… …
574#ifdef KEYSYM_RESOURCE 556#ifdef KEYSYM_RESOURCE
575 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) 557 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
576 { 558 {
577 if (i+1 < argc) 559 if (i+1 < argc)
578 { 560 {
579 char *res = (char *)malloc (strlen (opt) + strlen (argv[++i]) + 6); 561 char *res = rxvt_temp_buf<char> (strlen (opt) + strlen (argv[++i]) + 6);
580 sprintf (res, "*.%s: %s\n", opt, argv[i]); 562 sprintf (res, "*.%s: %s\n", opt, argv[i]);
581 XrmPutLineResource (&option_db, res); 563 XrmPutLineResource (&option_db, res);
582 free (res);
583 } 564 }
584 } 565 }
585#endif 566#endif
586 else 567 else
587 { 568 {
… …
604 * Define key from XrmEnumerateDatabase. 585 * Define key from XrmEnumerateDatabase.
605 * quarks will be something like 586 * quarks will be something like
606 * "rxvt" "keysym" "0xFF01" 587 * "rxvt" "keysym" "0xFF01"
607 * value will be a string 588 * value will be a string
608 */ 589 */
609/* ARGSUSED */
610int 590int
611rxvt_define_key (XrmDatabase *database UNUSED, 591rxvt_define_key (XrmDatabase *database UNUSED,
612 XrmBindingList bindings UNUSED, 592 XrmBindingList bindings UNUSED,
613 XrmQuarkList quarks, 593 XrmQuarkList quarks,
614 XrmRepresentation *type UNUSED, 594 XrmRepresentation *type UNUSED,
… …
626} 606}
627 607
628/* 608/*
629 * look for something like this (XK_Delete) 609 * look for something like this (XK_Delete)
630 * rxvt*keysym.0xFFFF: "\177" 610 * rxvt*keysym.0xFFFF: "\177"
631 *
632 * arg will be
633 * NULL for ~/.Xdefaults and
634 * non-NULL for command-line options (need to allocate)
635 */ 611 */
636#define NEWARGLIM 500 /* `reasonable' size */
637 612
638struct keysym_vocabulary_t 613struct keysym_vocabulary_t
639{ 614{
640 const char *name; 615 const char *name;
641 unsigned short len; 616 unsigned short len;
642 unsigned short value; 617 unsigned short value;
643}; 618};
644keysym_vocabulary_t keysym_vocabulary[] = 619static const keysym_vocabulary_t keysym_vocabulary[] =
645{ 620{
646 { "ISOLevel3", 9, Level3Mask }, 621 { "ISOLevel3", 9, Level3Mask },
647 { "AppKeypad", 9, AppKeypadMask }, 622 { "AppKeypad", 9, AppKeypadMask },
648 { "Control", 7, ControlMask }, 623 { "Control", 7, ControlMask },
649 { "NumLock", 7, NumLockMask }, 624 { "NumLock", 7, NumLockMask },
… …
671}; 646};
672 647
673int 648int
674rxvt_term::parse_keysym (const char *str, const char *arg) 649rxvt_term::parse_keysym (const char *str, const char *arg)
675{ 650{
676 int n, sym; 651 int sym;
677 unsigned int state = 0; 652 unsigned int state = 0;
678 const char *pmodend = NULL; 653 const char *key = strrchr (str, '-');
679 char *newarg = NULL;
680 char newargstr[NEWARGLIM];
681 654
682 if (arg == NULL) 655 if (!key)
683 { 656 key = str;
684 n = sizeof ("keysym.") - 1;
685 if (strncmp (str, "keysym.", n))
686 return 0;
687
688 str += n; /* skip `keysym.' */
689 if (!(pmodend = strchr (str, ':')))
690 return -1;
691 }
692 else 657 else
693 pmodend = str + strlen(str); 658 key++;
694 659
695 for (--pmodend; str < pmodend; --pmodend) 660 // string or key is empty
696 if (*pmodend == '-') 661 if (*arg == '\0' || *key == '\0')
697 break; 662 return -1;
698 663
664 // parse modifiers
699 while (str < pmodend) 665 while (str < key)
700 { 666 {
701 unsigned int i; 667 unsigned int i;
702 668
703 for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i) 669 for (i=0; i < ARRAY_LENGTH(keysym_vocabulary); ++i)
704 { 670 {
705 if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0) 671 if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0)
706 { 672 {
707 state |= keysym_vocabulary[i].value; 673 state |= keysym_vocabulary[i].value;
708 str += keysym_vocabulary[i].len; 674 str += keysym_vocabulary[i].len;
709 break; 675 break;
710 } 676 }
711 } 677 }
712 678
713 if (i >= sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t)) 679 if (i >= ARRAY_LENGTH(keysym_vocabulary))
714 return -1; 680 return -1;
715 681
716 if (*str == '-') 682 if (*str == '-')
717 ++str; 683 ++str;
718 } 684 }
719 685
720 /* some scanf () have trouble with a 0x prefix */ 686 // convert keysym name to keysym number
721 if (str[0] == '0' && toupper (str[1]) == 'X') 687 if ((sym = XStringToKeysym (str)) == None)
722 { 688 {
723 str += 2; 689 // fallback on hexadecimal parsing
724 690 char *end;
691 sym = strtol (str, &end, 16);
725 if (arg) 692 if (*end)
726 {
727 if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1)
728 return -1;
729 }
730 else
731 {
732 if (sscanf (str, "%x:", &sym) != 1)
733 return -1;
734
735 /* cue to ':', it's there since sscanf () worked */
736 strncpy (newargstr, strchr (str, ':') + 1, NEWARGLIM - 1);
737 newargstr[NEWARGLIM - 1] = '\0';
738 newarg = newargstr;
739 }
740 }
741 else
742 {
743 /*
744 * convert keysym name to keysym number
745 */
746 strncpy (newargstr, str, NEWARGLIM - 1);
747 newargstr[NEWARGLIM - 1] = '\0';
748
749 if (arg == NULL)
750 {
751 if ((newarg = strchr (newargstr, ':')) == NULL)
752 return -1;
753
754 *newarg++ = '\0'; /* terminate keysym name */
755 }
756
757 if ((sym = XStringToKeysym (newargstr)) == None)
758 return -1; 693 return -1;
759 } 694 }
760 695
761 if (newarg == NULL)
762 {
763 strncpy (newargstr, arg, NEWARGLIM - 1);
764 newargstr[NEWARGLIM - 1] = '\0';
765 newarg = newargstr;
766 }
767
768 if (*newarg == '\0')
769 return -1;
770
771 keyboard->register_user_translation (sym, state, newarg); 696 keyboard->register_user_translation (sym, state, arg);
772 return 1; 697 return 1;
773} 698}
774 699
775# endif /* KEYSYM_RESOURCE */ 700# endif /* KEYSYM_RESOURCE */
776#endif /* NO_RESOURCES */ 701#endif /* NO_RESOURCES */
… …
819 XrmMergeDatabases (option_db, &database); 744 XrmMergeDatabases (option_db, &database);
820 option_db = NULL; 745 option_db = NULL;
821 /* 746 /*
822 * Query resources for options that affect us 747 * Query resources for options that affect us
823 */ 748 */
824 for (int entry = 0; entry < optList_size; entry++) 749 for (int entry = 0; entry < ARRAY_LENGTH(optList); entry++)
825 { 750 {
826 int s; 751 int s;
827 const char *kw = optList[entry].kw; 752 const char *kw = optList[entry].kw;
828 753
829 if (kw == NULL || rs[optList[entry].doff] != NULL) 754 if (kw == NULL || rs[optList[entry].doff] != NULL)

Diff Legend

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