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

Diff Legend

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