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.128 by ayin, Mon Dec 31 01:16:47 2007 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
… …
63/* SWCH () - `-' flag */ 64/* SWCH () - `-' flag */
64#define SWCH(opt, option, flag, desc) \ 65#define SWCH(opt, option, flag, desc) \
65 { (option), (Optflag_Switch | (flag)), -1, NULL, (opt), NULL, (desc)} 66 { (option), (Optflag_Switch | (flag)), -1, NULL, (opt), NULL, (desc)}
66 67
67/* convenient macros */ 68/* convenient macros */
68#define optList_strlen(i) \ 69#define optList_isString(i) \
69 (optList[i].flag ? 0 : (optList[i].arg ? strlen (optList[i].arg) : 1)) 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_isBool (i)) 410 if (optList[i].arg)
419 { 411 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); 412 assert (optList[i].opt != NULL);
426#endif
427 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); 413 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2 : 0);
428 col += len; 414 col += len;
429 if (col > 79) 415 if (col > 79)
430 { 416 {
431 /* assume regular width */ 417 /* assume regular width */
432 rxvt_log ("\n"); 418 rxvt_log ("\n");
433 col = 1 + len; 419 col = 1 + len;
434 } 420 }
435 421
436 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); 422 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
437 if (optList_strlen (i)) 423 if (optList[i].arg)
438 rxvt_log (" %s]", optList[i].arg); 424 rxvt_log (" %s]", optList[i].arg);
439 else 425 else
440 rxvt_log ("]"); 426 rxvt_log ("]");
441 } 427 }
442 break; 428 break;
443 429
444 case 1: /* full command-line listing */ 430 case 1: /* full command-line listing */
445 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n"); 431 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
446 432
447 for (i = 0; i < optList_size; i++) 433 for (i = 0; i < ecb_array_length (optList); i++)
448 if (optList[i].desc != NULL) 434 if (optList[i].desc != NULL)
449 { 435 {
450#ifdef DEBUG_STRICT
451 assert (optList[i].opt != NULL); 436 assert (optList[i].opt != NULL);
452#endif
453 rxvt_log (" %s%s %-*s%s%s\n", 437 rxvt_log (" %s%s %-*s%s%s\n",
454 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, 438 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
455 (INDENT - strlen (optList[i].opt) 439 (INDENT - strlen (optList[i].opt)
456 + (optList_isBool (i) ? 0 : 2)), 440 + (optList_isBool (i) ? 0 : 2)),
457 (optList[i].arg ? optList[i].arg : ""), 441 (optList[i].arg ? optList[i].arg : ""),
… …
463 447
464 case 2: /* full resource listing */ 448 case 2: /* full resource listing */
465 rxvt_log (" [options] [-e command args]\n\n" 449 rxvt_log (" [options] [-e command args]\n\n"
466 "where resources (long-options) include:\n"); 450 "where resources (long-options) include:\n");
467 451
468 for (i = 0; i < optList_size; i++) 452 for (i = 0; i < ecb_array_length (optList); i++)
469 if (optList[i].kw != NULL) 453 if (optList[i].kw != NULL)
470 rxvt_log (" %s: %*s%s\n", 454 rxvt_log (" %s: %*s%s\n",
471 optList[i].kw, 455 optList[i].kw,
472 (INDENT - strlen (optList[i].kw)), "", /* XXX */ 456 (INDENT - strlen (optList[i].kw)), "", /* XXX */
473 (optList_isBool (i) ? "boolean" : optList[i].arg)); 457 (optList_isBool (i) ? "boolean" : optList[i].arg));
… …
480 break; 464 break;
481 } 465 }
482 466
483 rxvt_log ("\n\n"); 467 rxvt_log ("\n\n");
484 rxvt_exit_failure (); 468 rxvt_exit_failure ();
485 /* NOTREACHED */
486} 469}
487 470
488/*}}} */ 471/*}}} */
489 472
490/*{{{ get command-line options before getting resources */ 473/*{{{ get command-line options before getting resources */
491void 474const char **
492rxvt_term::get_options (int argc, const char *const *argv) 475rxvt_term::get_options (int argc, const char *const *argv)
493{ 476{
494 int i, bad_option = 0; 477 int i, bad_option = 0;
495 478
496 for (i = 1; i < argc; i++) 479 for (i = 1; i < argc; i++)
497 { 480 {
498 unsigned int entry, longopt = 0; 481 unsigned int entry, longopt = 0;
499 const char *flag, *opt; 482 const char *opt;
483 int flag;
500 484
501 opt = argv[i]; 485 opt = argv[i];
502 486
503 if (*opt == '-') 487 if (*opt == '-')
504 { 488 {
505 flag = resval_on; 489 flag = 1;
506 490
507 if (*++opt == '-') 491 if (*++opt == '-')
508 longopt = *opt++; /* long option */ 492 longopt = *opt++; /* long option */
509 } 493 }
510 else if (*opt == '+') 494 else if (*opt == '+')
511 { 495 {
512 flag = resval_off; 496 flag = 0;
513 497
514 if (*++opt == '+') 498 if (*++opt == '+')
515 longopt = *opt++; /* long option */ 499 longopt = *opt++; /* long option */
516 } 500 }
517 else 501 else
… …
526 510
527 if (!strcmp (opt, "h")) 511 if (!strcmp (opt, "h"))
528 rxvt_usage (0); 512 rxvt_usage (0);
529 513
530 /* feature: always try to match long-options */ 514 /* feature: always try to match long-options */
531 for (entry = 0; entry < optList_size; entry++) 515 for (entry = 0; entry < ecb_array_length (optList); entry++)
532 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw)) 516 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))
533 || (!longopt 517 || (!longopt
534 && optList[entry].opt && !strcmp (opt, optList[entry].opt))) 518 && optList[entry].opt && !strcmp (opt, optList[entry].opt)))
535 break; 519 break;
536 520
537 if (entry < optList_size) 521 if (entry < ecb_array_length (optList)
522 && !optList_isInfo (entry))
538 { 523 {
539 if (optList_isReverse (entry)) 524 if (optList_isReverse (entry))
540 flag = flag == resval_on ? resval_off : resval_on; 525 flag = !flag;
541 526
542 if (optList_strlen (entry)) 527 if (optList_isString (entry))
543 { 528 {
544 /* 529 /*
545 * special cases are handled in main.c:main () to allow 530 * special cases are handled in init_resources () to allow
546 * X resources to set these values before we settle for 531 * X resources to set these values before we settle for
547 * default values 532 * default values
548 */ 533 */
549 534
550 if (optList[entry].doff != -1) 535 if (optList[entry].doff != -1)
551 { 536 {
552 if (flag == resval_on && i+1 == argc) 537 if (flag && i+1 == argc)
553 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]); 538 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]);
554 539
555 rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef; 540 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef;
556 } 541 }
557 } 542 }
558 else 543 else
559 { 544 {
560 /* boolean value */ 545 /* boolean value */
561 set_option (optList[entry].index, flag == resval_on); 546 set_option (optList[entry].index, flag);
562 547
563 if (optList[entry].doff != -1) 548 if (optList[entry].doff != -1)
564 rs[optList[entry].doff] = flag; 549 rs[optList[entry].doff] = flag ? resval_on : resval_off;
565 } 550 }
566 } 551 }
567#ifndef NO_RESOURCES 552#ifndef NO_RESOURCES
568 else if (!strcmp (opt, "xrm")) 553 else if (!strcmp (opt, "xrm"))
569 { 554 {
… …
574#ifdef KEYSYM_RESOURCE 559#ifdef KEYSYM_RESOURCE
575 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) 560 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
576 { 561 {
577 if (i+1 < argc) 562 if (i+1 < argc)
578 { 563 {
579 char *res = (char *)malloc (strlen (opt) + strlen (argv[++i]) + 6); 564 char *res = rxvt_temp_buf<char> (strlen (opt) + strlen (argv[++i]) + 6);
580 sprintf (res, "*.%s: %s\n", opt, argv[i]); 565 sprintf (res, "*.%s: %s\n", opt, argv[i]);
581 XrmPutLineResource (&option_db, res); 566 XrmPutLineResource (&option_db, res);
582 free (res);
583 } 567 }
584 } 568 }
585#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 }
586 else 577 else
587 { 578 {
588 bad_option = 1; 579 bad_option = 1;
589 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); 580 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
590 } 581 }
591 } 582 }
592 583
593 if (bad_option) 584 if (bad_option)
594 rxvt_usage (0); 585 rxvt_usage (0);
586
587 return 0;
595} 588}
596 589
597/*}}} */ 590/*}}} */
598 591
599#ifndef NO_RESOURCES 592#ifndef NO_RESOURCES
… …
604 * Define key from XrmEnumerateDatabase. 597 * Define key from XrmEnumerateDatabase.
605 * quarks will be something like 598 * quarks will be something like
606 * "rxvt" "keysym" "0xFF01" 599 * "rxvt" "keysym" "0xFF01"
607 * value will be a string 600 * value will be a string
608 */ 601 */
609/* ARGSUSED */ 602static int
610int
611rxvt_define_key (XrmDatabase *database UNUSED, 603rxvt_define_key (XrmDatabase *database ecb_unused,
612 XrmBindingList bindings UNUSED, 604 XrmBindingList bindings ecb_unused,
613 XrmQuarkList quarks, 605 XrmQuarkList quarks,
614 XrmRepresentation *type UNUSED, 606 XrmRepresentation *type ecb_unused,
615 XrmValue *value, 607 XrmValue *value,
616 XPointer closure UNUSED) 608 XPointer closure ecb_unused)
617{ 609{
618 int last; 610 int last;
619 611
620 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 */
621 ; 613 ;
… …
626} 618}
627 619
628/* 620/*
629 * look for something like this (XK_Delete) 621 * look for something like this (XK_Delete)
630 * rxvt*keysym.0xFFFF: "\177" 622 * 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 */ 623 */
636#define NEWARGLIM 500 /* `reasonable' size */
637 624
638struct keysym_vocabulary_t 625struct keysym_vocabulary_t
639{ 626{
640 const char *name; 627 const char *name;
641 unsigned short len; 628 unsigned short len;
642 unsigned short value; 629 unsigned short value;
643}; 630};
644keysym_vocabulary_t keysym_vocabulary[] = 631static const keysym_vocabulary_t keysym_vocabulary[] =
645{ 632{
646 { "ISOLevel3", 9, Level3Mask }, 633 { "ISOLevel3", 9, Level3Mask },
647 { "AppKeypad", 9, AppKeypadMask }, 634 { "AppKeypad", 9, AppKeypadMask },
648 { "Control", 7, ControlMask }, 635 { "Control", 7, ControlMask },
649 { "NumLock", 7, NumLockMask }, 636 { "NumLock", 7, NumLockMask },
… …
671}; 658};
672 659
673int 660int
674rxvt_term::parse_keysym (const char *str, const char *arg) 661rxvt_term::parse_keysym (const char *str, const char *arg)
675{ 662{
676 int n, sym; 663 int sym;
677 unsigned int state = 0; 664 unsigned int state = 0;
678 const char *pmodend = NULL; 665 const char *key = strrchr (str, '-');
679 char *newarg = NULL;
680 char newargstr[NEWARGLIM];
681 666
682 if (arg == NULL) 667 if (!key)
683 { 668 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 669 else
693 pmodend = str + strlen(str); 670 key++;
694 671
695 for (--pmodend; str < pmodend; --pmodend) 672 // string or key is empty
696 if (*pmodend == '-') 673 if (*arg == '\0' || *key == '\0')
697 break; 674 return -1;
698 675
676 // parse modifiers
699 while (str < pmodend) 677 while (str < key)
700 { 678 {
701 unsigned int i; 679 unsigned int i;
702 680
703 for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i) 681 for (i = 0; i < ecb_array_length (keysym_vocabulary); ++i)
704 { 682 {
705 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)
706 { 684 {
707 state |= keysym_vocabulary[i].value; 685 state |= keysym_vocabulary[i].value;
708 str += keysym_vocabulary[i].len; 686 str += keysym_vocabulary[i].len;
709 break; 687 break;
710 } 688 }
711 } 689 }
712 690
713 if (i >= sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t)) 691 if (i >= ecb_array_length (keysym_vocabulary))
714 return -1; 692 return -1;
715 693
716 if (*str == '-') 694 if (*str == '-')
717 ++str; 695 ++str;
718 } 696 }
719 697
720 /* some scanf () have trouble with a 0x prefix */ 698 // convert keysym name to keysym number
721 if (str[0] == '0' && toupper (str[1]) == 'X') 699 if ((sym = XStringToKeysym (str)) == None)
722 { 700 {
723 str += 2; 701 // fallback on hexadecimal parsing
724 702 char *end;
703 sym = strtol (str, &end, 16);
725 if (arg) 704 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; 705 return -1;
759 } 706 }
760 707
761 if (newarg == NULL) 708 wchar_t *ws = rxvt_mbstowcs (arg);
762 { 709 if (!HOOK_INVOKE ((this, HOOK_REGISTER_COMMAND, DT_INT, sym, DT_INT, state, DT_WCS_LEN, ws, wcslen (ws), DT_END)))
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); 710 keyboard->register_user_translation (sym, state, ws);
711 free (ws);
772 return 1; 712 return 1;
773} 713}
774 714
775# endif /* KEYSYM_RESOURCE */ 715# endif /* KEYSYM_RESOURCE */
776#endif /* NO_RESOURCES */ 716#endif /* NO_RESOURCES */
… …
819 XrmMergeDatabases (option_db, &database); 759 XrmMergeDatabases (option_db, &database);
820 option_db = NULL; 760 option_db = NULL;
821 /* 761 /*
822 * Query resources for options that affect us 762 * Query resources for options that affect us
823 */ 763 */
824 for (int entry = 0; entry < optList_size; entry++) 764 for (int entry = 0; entry < ecb_array_length (optList); entry++)
825 { 765 {
826 int s; 766 int s;
827 const char *kw = optList[entry].kw; 767 const char *kw = optList[entry].kw;
828 768
829 if (kw == NULL || rs[optList[entry].doff] != NULL) 769 if (kw == NULL || rs[optList[entry].doff] != NULL)
… …
849 789
850 set_option (optList[entry].index, s); 790 set_option (optList[entry].index, s);
851 } 791 }
852 } 792 }
853 } 793 }
794#endif /* NO_RESOURCES */
795}
854 796
797void
798rxvt_term::extract_keysym_resources ()
799{
800#ifndef NO_RESOURCES
855 /* 801 /*
856 * [R5 or later]: enumerate the resource database 802 * [R5 or later]: enumerate the resource database
857 */ 803 */
858# ifdef KEYSYM_RESOURCE 804# ifdef KEYSYM_RESOURCE
805 XrmDatabase database = XrmGetDatabase (dpy);
859 XrmName name_prefix[3]; 806 XrmName name_prefix[3];
860 XrmClass class_prefix[3]; 807 XrmClass class_prefix[3];
861 808
862 name_prefix[0] = XrmStringToName (rs[Rs_name]); 809 name_prefix[0] = XrmStringToName (rs[Rs_name]);
863 name_prefix[1] = XrmStringToName ("keysym"); 810 name_prefix[1] = XrmStringToName ("keysym");
… …
867 class_prefix[2] = NULLQUARK; 814 class_prefix[2] = NULLQUARK;
868 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 815 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
869 XrmEnumerateDatabase (database, name_prefix, class_prefix, 816 XrmEnumerateDatabase (database, name_prefix, class_prefix,
870 XrmEnumOneLevel, rxvt_define_key, NULL); 817 XrmEnumOneLevel, rxvt_define_key, NULL);
871# ifdef RESFALLBACK 818# ifdef RESFALLBACK
872 name_prefix[0] = XrmStringToName (RESFALLBACK);
873 name_prefix[1] = XrmStringToName ("keysym");
874 class_prefix[0] = XrmStringToName (RESFALLBACK); 819 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK);
875 class_prefix[1] = XrmStringToName ("Keysym");
876 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 820 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
877 XrmEnumerateDatabase (database, name_prefix, class_prefix, 821 XrmEnumerateDatabase (database, name_prefix, class_prefix,
878 XrmEnumOneLevel, rxvt_define_key, NULL); 822 XrmEnumOneLevel, rxvt_define_key, NULL);
879# endif 823# endif
880# endif 824# endif

Diff Legend

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