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.132 by ayin, Sun Jan 20 01:15:35 2008 UTC vs.
Revision 1.160 by sf-exg, Sun Dec 18 02:14:59 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 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
11 * 11 *
12 * 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
13 * 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
14 * the Free Software Foundation; either version 2 of the License, or 14 * the Free Software Foundation; either version 2 of the License, or
… …
34 34
35/* place holders used for parsing command-line options */ 35/* place holders used for parsing command-line options */
36#define Optflag_Reverse 1 36#define Optflag_Reverse 1
37#define Optflag_Boolean 2 37#define Optflag_Boolean 2
38#define Optflag_Switch 4 38#define Optflag_Switch 4
39#define Optflag_Info 8
39 40
40/* monolithic option/resource structure: */ 41/* monolithic option/resource structure: */
41/* 42/*
42 * `string' options MUST have a usage argument 43 * `string' options MUST have a usage argument
43 * `switch' and `boolean' options have no argument 44 * `switch' and `boolean' options have no argument
44 * if there's no desc (ription), it won't appear in rxvt_usage () 45 * if there's no desc (ription), it won't appear in rxvt_usage ()
45 */ 46 */
46 47
47/* INFO () - descriptive information only */ 48/* INFO () - descriptive information only */
48#define INFO(opt, arg, desc) \ 49#define INFO(opt, arg, desc) \
49 {0, 0, -1, NULL, (opt), (arg), (desc)} 50 {0, Optflag_Info, -1, NULL, (opt), (arg), (desc)}
50 51
51/* STRG () - command-line option, with/without resource */ 52/* STRG () - command-line option, with/without resource */
52#define STRG(rsp, kw, opt, arg, desc) \ 53#define STRG(rsp, kw, opt, arg, desc) \
53 {0, 0, (rsp), (kw), (opt), (arg), (desc)} 54 {0, 0, (rsp), (kw), (opt), (arg), (desc)}
54 55
… …
69 (optList[i].flag == 0) 70 (optList[i].flag == 0)
70#define optList_isBool(i) \ 71#define optList_isBool(i) \
71 (optList[i].flag & Optflag_Boolean) 72 (optList[i].flag & Optflag_Boolean)
72#define optList_isReverse(i) \ 73#define optList_isReverse(i) \
73 (optList[i].flag & Optflag_Reverse) 74 (optList[i].flag & Optflag_Reverse)
74#define optList_size \ 75#define optList_isInfo(i) \
75 (sizeof (optList) / sizeof (optList[0])) 76 (optList[i].flag & Optflag_Info)
76 77
77static const struct 78static const struct
78 { 79 {
79 const uint8_t index; /* Option index */ 80 const uint8_t index; /* Option index */
80 const uint8_t flag; /* Option flag */ 81 const uint8_t flag; /* Option flag */
… …
91 STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */ 92 STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */
92 STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"), 93 STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"),
93 SWCH ("C", Opt_console, 0, "intercept console messages"), 94 SWCH ("C", Opt_console, 0, "intercept console messages"),
94 SWCH ("iconic", Opt_iconic, 0, "start iconic"), 95 SWCH ("iconic", Opt_iconic, 0, "start iconic"),
95 SWCH ("ic", Opt_iconic, 0, NULL), /* short form */ 96 SWCH ("ic", Opt_iconic, 0, NULL), /* short form */
97 STRG (Rs_chdir, "chdir", "cd", "string", "start shell in this directory"),
96 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"), 98 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"),
97 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"), 99 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"),
98 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"), 100 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"),
99 BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"), 101 BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"),
100 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, 0, "tab characters are pastable"), 102 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, 0, "tab characters are pastable"),
101#if HAVE_SCROLLBARS
102 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"), 103 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"),
103 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"), 104 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"),
104 BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, 0, "scrollbar right"), 105 BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, 0, "scrollbar right"),
105 BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, 0, "scrollbar without a trough"), 106 BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, 0, "scrollbar without a trough"),
106 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"), 107 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"),
107 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"), 108 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"),
108#endif
109 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL), 109 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL),
110 BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_scrollTtyOutput, Optflag_Reverse, "scroll-on-tty-output inhibit"), 110 BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_scrollTtyOutput, Optflag_Reverse, "scroll-on-tty-output inhibit"),
111 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"), 111 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"),
112 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"), 112 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"),
113#if ENABLE_TRANSPARENCY 113#if ENABLE_TRANSPARENCY
114 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"), 114 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"),
115 BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"), 115 BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"),
116 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"), 116 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
117 STRG (Rs_shade, "shading", "sh", "number", "shade background by number %."), 117 STRG (Rs_shade, "shading", "sh", "number", "shade background by number %."),
118 STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "gaussian blur radii to apply to the root background"),
118#endif 119#endif
119#if OFF_FOCUS_FADING 120#if OFF_FOCUS_FADING
120 STRG (Rs_fade, "fading", "fade", "number", "fade colors by number % when losing focus"), 121 STRG (Rs_fade, "fading", "fade", "number", "fade colors by number % when losing focus"),
121 STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"), 122 STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"),
122#endif 123#endif
… …
172 RSTRG (Rs_color + Color_RV, "colorRV", "color"), 173 RSTRG (Rs_color + Color_RV, "colorRV", "color"),
173#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 174#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
174#if ENABLE_FRILLS 175#if ENABLE_FRILLS
175 RSTRG (Rs_color + Color_underline, "underlineColor", "color"), 176 RSTRG (Rs_color + Color_underline, "underlineColor", "color"),
176#endif 177#endif
177#ifdef KEEP_SCROLLCOLOR
178 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), 178 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"),
179#ifdef RXVT_SCROLLBAR
179 RSTRG (Rs_color + Color_trough, "troughColor", "color"), 180 RSTRG (Rs_color + Color_trough, "troughColor", "color"),
180#endif /* KEEP_SCROLLCOLOR */ 181#endif
181#ifdef OPTION_HC 182#ifdef OPTION_HC
182 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"), 183 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"),
184 RSTRG (Rs_color + Color_HTC, "highlightTextColor", "color"),
183#endif 185#endif
184#ifndef NO_CURSORCOLOR 186#ifndef NO_CURSORCOLOR
185 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), 187 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
186 /* command-line option = resource name */ 188 /* command-line option = resource name */
187 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 189 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
… …
190 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"), 192 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
191 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), 193 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
192#ifdef BG_IMAGE_FROM_FILE 194#ifdef BG_IMAGE_FROM_FILE
193 RSTRG (Rs_path, "path", "search path"), 195 RSTRG (Rs_path, "path", "search path"),
194 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), 196 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
197# if ENABLE_EWMH
198 STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"),
199# endif
195#endif 200#endif
196 /* fonts: command-line option = resource name */ 201 /* fonts: command-line option = resource name */
197 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 202 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
198#if ENABLE_STYLES 203#if ENABLE_STYLES
199 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), 204 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
… …
215#if ENABLE_XEMBED 220#if ENABLE_XEMBED
216 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"), 221 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"),
217#endif 222#endif
218#if XFT 223#if XFT
219 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"), 224 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
225 BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL),
220#endif 226#endif
221#if ENABLE_FRILLS 227#if ENABLE_FRILLS
222 RSTRG (Rs_transient_for, "transient-for", "windowid"), 228 RSTRG (Rs_transient_for, "transient-for", "windowid"),
223 BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, 0, "set override-redirect on the terminal window"), 229 BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, 0, "set override-redirect on the terminal window"),
224 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"), 230 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"),
… …
227 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 233 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
228 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 234 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
229 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 235 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
230 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"), 236 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"),
231 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"), 237 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
238 STRG (Rs_letterSpace, "letterSpace", "letsp", "number", "letter spacing adjustment"),
232#endif 239#endif
233#ifdef BUILTIN_GLYPHS 240#ifdef BUILTIN_GLYPHS
234 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"), 241 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"),
235#endif 242#endif
236#ifdef POINTER_BLANK 243#ifdef POINTER_BLANK
… …
244#endif 251#endif
245#ifdef PRINTPIPE 252#ifdef PRINTPIPE
246 RSTRG (Rs_print_pipe, "print-pipe", "string"), 253 RSTRG (Rs_print_pipe, "print-pipe", "string"),
247#endif 254#endif
248 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"), 255 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"),
249#ifdef CUTCHAR_RESOURCE
250 RSTRG (Rs_cutchars, "cutchars", "string"), 256 RSTRG (Rs_cutchars, "cutchars", "string"),
251#endif /* CUTCHAR_RESOURCE */
252 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 257 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
253#ifndef NO_SECONDARY_SCREEN 258#ifndef NO_SECONDARY_SCREEN
254 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"), 259 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"),
255 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"), 260 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"),
256#endif 261#endif
… …
259 RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO 264 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 265 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"), 266 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"),
262#endif 267#endif
263#if ISO_14755 268#if ISO_14755
269 BOOL (Rs_iso14755, "iso14755", NULL, Opt_iso14755, 0, NULL),
264 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL), 270 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL),
265#endif 271#endif
266#ifdef HAVE_AFTERIMAGE 272#ifdef HAVE_AFTERIMAGE
267 STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."), 273 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 274#endif
270 INFO ("e", "command arg ...", "command to execute") 275 INFO ("e", "command arg ...", "command to execute")
271 }; 276 };
272 277
273#undef INFO 278#undef INFO
… …
324 "tint," 329 "tint,"
325#endif 330#endif
326#if HAVE_AFTERIMAGE 331#if HAVE_AFTERIMAGE
327 "afterimage," 332 "afterimage,"
328#endif 333#endif
334#if HAVE_PIXBUF
335 "pixbuf,"
336#endif
329#if defined(USE_XIM) 337#if defined(USE_XIM)
330 "XIM," 338 "XIM,"
331#endif 339#endif
332#if defined(NO_BACKSPACE_KEY) 340#if defined(NO_BACKSPACE_KEY)
333 "no_backspace," 341 "no_backspace,"
… …
360 "pointerBlank," 368 "pointerBlank,"
361#endif 369#endif
362#if defined(NO_RESOURCES) 370#if defined(NO_RESOURCES)
363 "NoResources," 371 "NoResources,"
364#endif 372#endif
365 "scrollbars=" 373 "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) 374#if defined(RXVT_SCROLLBAR)
376 "rxvt" 375 "+rxvt"
377# if defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
378 "+"
379# endif
380# endif 376#endif
381# if defined(NEXT_SCROLLBAR) 377#if defined(NEXT_SCROLLBAR)
382 "NeXT" 378 "+NeXT"
383# if defined(XTERM_SCROLLBAR)
384 "+"
385# endif
386# endif 379#endif
387# if defined(XTERM_SCROLLBAR) 380#if defined(XTERM_SCROLLBAR)
388 "xterm" 381 "+xterm"
389# endif
390#endif 382#endif
391 "\nUsage: "; /* Usage */ 383 "\nUsage: "; /* Usage */
392 384
393#define INDENT 18 385#define INDENT 18
394 386
… …
408 switch (type) 400 switch (type)
409 { 401 {
410 case 0: /* brief listing */ 402 case 0: /* brief listing */
411 rxvt_log (" [-help] [--help]\n"); 403 rxvt_log (" [-help] [--help]\n");
412 404
413 for (col = 1, i = 0; i < optList_size; i++) 405 for (col = 1, i = 0; i < ecb_array_length (optList); i++)
414 if (optList[i].desc != NULL) 406 if (optList[i].desc != NULL)
415 { 407 {
416 int len = 0; 408 int len = 0;
417 409
418 if (optList[i].arg) 410 if (optList[i].arg)
419 len = strlen (optList[i].arg) + 1; 411 len = strlen (optList[i].arg) + 1;
420#ifdef DEBUG_STRICT
421 assert (optList[i].opt != NULL); 412 assert (optList[i].opt != NULL);
422#endif
423 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); 413 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2 : 0);
424 col += len; 414 col += len;
425 if (col > 79) 415 if (col > 79)
426 { 416 {
427 /* assume regular width */ 417 /* assume regular width */
428 rxvt_log ("\n"); 418 rxvt_log ("\n");
… …
438 break; 428 break;
439 429
440 case 1: /* full command-line listing */ 430 case 1: /* full command-line listing */
441 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n"); 431 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
442 432
443 for (i = 0; i < optList_size; i++) 433 for (i = 0; i < ecb_array_length (optList); i++)
444 if (optList[i].desc != NULL) 434 if (optList[i].desc != NULL)
445 { 435 {
446#ifdef DEBUG_STRICT
447 assert (optList[i].opt != NULL); 436 assert (optList[i].opt != NULL);
448#endif
449 rxvt_log (" %s%s %-*s%s%s\n", 437 rxvt_log (" %s%s %-*s%s%s\n",
450 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, 438 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
451 (INDENT - strlen (optList[i].opt) 439 (INDENT - strlen (optList[i].opt)
452 + (optList_isBool (i) ? 0 : 2)), 440 + (optList_isBool (i) ? 0 : 2)),
453 (optList[i].arg ? optList[i].arg : ""), 441 (optList[i].arg ? optList[i].arg : ""),
… …
459 447
460 case 2: /* full resource listing */ 448 case 2: /* full resource listing */
461 rxvt_log (" [options] [-e command args]\n\n" 449 rxvt_log (" [options] [-e command args]\n\n"
462 "where resources (long-options) include:\n"); 450 "where resources (long-options) include:\n");
463 451
464 for (i = 0; i < optList_size; i++) 452 for (i = 0; i < ecb_array_length (optList); i++)
465 if (optList[i].kw != NULL) 453 if (optList[i].kw != NULL)
466 rxvt_log (" %s: %*s%s\n", 454 rxvt_log (" %s: %*s%s\n",
467 optList[i].kw, 455 optList[i].kw,
468 (INDENT - strlen (optList[i].kw)), "", /* XXX */ 456 (INDENT - strlen (optList[i].kw)), "", /* XXX */
469 (optList_isBool (i) ? "boolean" : optList[i].arg)); 457 (optList_isBool (i) ? "boolean" : optList[i].arg));
… …
476 break; 464 break;
477 } 465 }
478 466
479 rxvt_log ("\n\n"); 467 rxvt_log ("\n\n");
480 rxvt_exit_failure (); 468 rxvt_exit_failure ();
481 /* NOTREACHED */
482} 469}
483 470
484/*}}} */ 471/*}}} */
485 472
486/*{{{ get command-line options before getting resources */ 473/*{{{ get command-line options before getting resources */
487void 474const char **
488rxvt_term::get_options (int argc, const char *const *argv) 475rxvt_term::get_options (int argc, const char *const *argv)
489{ 476{
490 int i, bad_option = 0; 477 int i, bad_option = 0;
491 478
492 for (i = 1; i < argc; i++) 479 for (i = 1; i < argc; i++)
… …
523 510
524 if (!strcmp (opt, "h")) 511 if (!strcmp (opt, "h"))
525 rxvt_usage (0); 512 rxvt_usage (0);
526 513
527 /* feature: always try to match long-options */ 514 /* feature: always try to match long-options */
528 for (entry = 0; entry < optList_size; entry++) 515 for (entry = 0; entry < ecb_array_length (optList); entry++)
529 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw)) 516 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))
530 || (!longopt 517 || (!longopt
531 && optList[entry].opt && !strcmp (opt, optList[entry].opt))) 518 && optList[entry].opt && !strcmp (opt, optList[entry].opt)))
532 break; 519 break;
533 520
534 if (entry < optList_size) 521 if (entry < ecb_array_length (optList)
522 && !optList_isInfo (entry))
535 { 523 {
536 if (optList_isReverse (entry)) 524 if (optList_isReverse (entry))
537 flag = !flag; 525 flag = !flag;
538 526
539 if (optList_isString (entry)) 527 if (optList_isString (entry))
540 { 528 {
541 /* 529 /*
542 * special cases are handled in main.c:main () to allow 530 * special cases are handled in init_resources () to allow
543 * X resources to set these values before we settle for 531 * X resources to set these values before we settle for
544 * default values 532 * default values
545 */ 533 */
546 534
547 if (optList[entry].doff != -1) 535 if (optList[entry].doff != -1)
… …
571#ifdef KEYSYM_RESOURCE 559#ifdef KEYSYM_RESOURCE
572 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) 560 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
573 { 561 {
574 if (i+1 < argc) 562 if (i+1 < argc)
575 { 563 {
576 char *res = (char *)malloc (strlen (opt) + strlen (argv[++i]) + 6); 564 char *res = rxvt_temp_buf<char> (strlen (opt) + strlen (argv[++i]) + 6);
577 sprintf (res, "*.%s: %s\n", opt, argv[i]); 565 sprintf (res, "*.%s: %s\n", opt, argv[i]);
578 XrmPutLineResource (&option_db, res); 566 XrmPutLineResource (&option_db, res);
579 free (res);
580 } 567 }
581 } 568 }
582#endif 569#endif
570 else if (!strcmp (opt, "e"))
571 {
572 if (i+1 == argc)
573 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
574
575 return (const char **)argv + i + 1;
576 }
583 else 577 else
584 { 578 {
585 bad_option = 1; 579 bad_option = 1;
586 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); 580 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
587 } 581 }
588 } 582 }
589 583
590 if (bad_option) 584 if (bad_option)
591 rxvt_usage (0); 585 rxvt_usage (0);
586
587 return 0;
592} 588}
593 589
594/*}}} */ 590/*}}} */
595 591
596#ifndef NO_RESOURCES 592#ifndef NO_RESOURCES
… …
601 * Define key from XrmEnumerateDatabase. 597 * Define key from XrmEnumerateDatabase.
602 * quarks will be something like 598 * quarks will be something like
603 * "rxvt" "keysym" "0xFF01" 599 * "rxvt" "keysym" "0xFF01"
604 * value will be a string 600 * value will be a string
605 */ 601 */
606/* ARGSUSED */ 602static int
607int
608rxvt_define_key (XrmDatabase *database UNUSED, 603rxvt_define_key (XrmDatabase *database ecb_unused,
609 XrmBindingList bindings UNUSED, 604 XrmBindingList bindings ecb_unused,
610 XrmQuarkList quarks, 605 XrmQuarkList quarks,
611 XrmRepresentation *type UNUSED, 606 XrmRepresentation *type ecb_unused,
612 XrmValue *value, 607 XrmValue *value,
613 XPointer closure UNUSED) 608 XPointer closure ecb_unused)
614{ 609{
615 int last; 610 int last;
616 611
617 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ 612 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
618 ; 613 ;
… …
681 // parse modifiers 676 // parse modifiers
682 while (str < key) 677 while (str < key)
683 { 678 {
684 unsigned int i; 679 unsigned int i;
685 680
686 for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i) 681 for (i = 0; i < ecb_array_length (keysym_vocabulary); ++i)
687 { 682 {
688 if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0) 683 if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0)
689 { 684 {
690 state |= keysym_vocabulary[i].value; 685 state |= keysym_vocabulary[i].value;
691 str += keysym_vocabulary[i].len; 686 str += keysym_vocabulary[i].len;
692 break; 687 break;
693 } 688 }
694 } 689 }
695 690
696 if (i >= sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t)) 691 if (i >= ecb_array_length (keysym_vocabulary))
697 return -1; 692 return -1;
698 693
699 if (*str == '-') 694 if (*str == '-')
700 ++str; 695 ++str;
701 } 696 }
… …
706 // fallback on hexadecimal parsing 701 // fallback on hexadecimal parsing
707 char *end; 702 char *end;
708 sym = strtol (str, &end, 16); 703 sym = strtol (str, &end, 16);
709 if (*end) 704 if (*end)
710 return -1; 705 return -1;
711 } 706 }
712 707
708 wchar_t *ws = rxvt_mbstowcs (arg);
709 if (!HOOK_INVOKE ((this, HOOK_REGISTER_COMMAND, DT_INT, sym, DT_INT, state, DT_WCS_LEN, ws, wcslen (ws), DT_END)))
713 keyboard->register_user_translation (sym, state, arg); 710 keyboard->register_user_translation (sym, state, ws);
711 free (ws);
714 return 1; 712 return 1;
715} 713}
716 714
717# endif /* KEYSYM_RESOURCE */ 715# endif /* KEYSYM_RESOURCE */
718#endif /* NO_RESOURCES */ 716#endif /* NO_RESOURCES */
… …
761 XrmMergeDatabases (option_db, &database); 759 XrmMergeDatabases (option_db, &database);
762 option_db = NULL; 760 option_db = NULL;
763 /* 761 /*
764 * Query resources for options that affect us 762 * Query resources for options that affect us
765 */ 763 */
766 for (int entry = 0; entry < optList_size; entry++) 764 for (int entry = 0; entry < ecb_array_length (optList); entry++)
767 { 765 {
768 int s; 766 int s;
769 const char *kw = optList[entry].kw; 767 const char *kw = optList[entry].kw;
770 768
771 if (kw == NULL || rs[optList[entry].doff] != NULL) 769 if (kw == NULL || rs[optList[entry].doff] != NULL)
… …
791 789
792 set_option (optList[entry].index, s); 790 set_option (optList[entry].index, s);
793 } 791 }
794 } 792 }
795 } 793 }
794#endif /* NO_RESOURCES */
795}
796 796
797void
798rxvt_term::extract_keysym_resources ()
799{
800#ifndef NO_RESOURCES
797 /* 801 /*
798 * [R5 or later]: enumerate the resource database 802 * [R5 or later]: enumerate the resource database
799 */ 803 */
800# ifdef KEYSYM_RESOURCE 804# ifdef KEYSYM_RESOURCE
805 XrmDatabase database = XrmGetDatabase (dpy);
801 XrmName name_prefix[3]; 806 XrmName name_prefix[3];
802 XrmClass class_prefix[3]; 807 XrmClass class_prefix[3];
803 808
804 name_prefix[0] = XrmStringToName (rs[Rs_name]); 809 name_prefix[0] = XrmStringToName (rs[Rs_name]);
805 name_prefix[1] = XrmStringToName ("keysym"); 810 name_prefix[1] = XrmStringToName ("keysym");
… …
809 class_prefix[2] = NULLQUARK; 814 class_prefix[2] = NULLQUARK;
810 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 815 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
811 XrmEnumerateDatabase (database, name_prefix, class_prefix, 816 XrmEnumerateDatabase (database, name_prefix, class_prefix,
812 XrmEnumOneLevel, rxvt_define_key, NULL); 817 XrmEnumOneLevel, rxvt_define_key, NULL);
813# ifdef RESFALLBACK 818# ifdef RESFALLBACK
814 name_prefix[0] = XrmStringToName (RESFALLBACK);
815 name_prefix[1] = XrmStringToName ("keysym");
816 class_prefix[0] = XrmStringToName (RESFALLBACK); 819 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK);
817 class_prefix[1] = XrmStringToName ("Keysym");
818 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 820 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
819 XrmEnumerateDatabase (database, name_prefix, class_prefix, 821 XrmEnumerateDatabase (database, name_prefix, class_prefix,
820 XrmEnumOneLevel, rxvt_define_key, NULL); 822 XrmEnumOneLevel, rxvt_define_key, NULL);
821# endif 823# endif
822# endif 824# endif

Diff Legend

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