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.124 by ayin, Sat Nov 24 10:32:33 2007 UTC vs.
Revision 1.161 by sf-exg, Sun Dec 18 02:25:12 2011 UTC

… …
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 6 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
7 * - original version 7 * - original version
8 * Copyright (c) 1997,1998 mj olesen <olesen@me.queensu.ca> 8 * Copyright (c) 1997,1998 mj olesen <olesen@me.queensu.ca>
9 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 9 * Copyright (c) 2003-2006 Marc Lehmann <schmorp@schmorp.de>
10 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
10 * 11 *
11 * This program is free software; you can redistribute it and/or modify 12 * This program is free software; you can redistribute it and/or modify
12 * it under the terms of the GNU General Public License as published by 13 * it under the terms of the GNU General Public License as published by
13 * the Free Software Foundation; either version 2 of the License, or 14 * the Free Software Foundation; either version 2 of the License, or
14 * (at your option) any later version. 15 * (at your option) any later version.
… …
33 34
34/* place holders used for parsing command-line options */ 35/* place holders used for parsing command-line options */
35#define Optflag_Reverse 1 36#define Optflag_Reverse 1
36#define Optflag_Boolean 2 37#define Optflag_Boolean 2
37#define Optflag_Switch 4 38#define Optflag_Switch 4
39#define Optflag_Info 8
38 40
39/* monolithic option/resource structure: */ 41/* monolithic option/resource structure: */
40/* 42/*
41 * `string' options MUST have a usage argument 43 * `string' options MUST have a usage argument
42 * `switch' and `boolean' options have no argument 44 * `switch' and `boolean' options have no argument
43 * 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 ()
44 */ 46 */
45 47
46/* INFO () - descriptive information only */ 48/* INFO () - descriptive information only */
47#define INFO(opt, arg, desc) \ 49#define INFO(opt, arg, desc) \
48 {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}
49 54
50/* STRG () - command-line option, with/without resource */ 55/* STRG () - command-line option, with/without resource */
51#define STRG(rsp, kw, opt, arg, desc) \ 56#define STRG(rsp, kw, opt, arg, desc) \
52 {0, 0, (rsp), (kw), (opt), (arg), (desc)} 57 {0, 0, (rsp), (kw), (opt), (arg), (desc)}
53 58
… …
62/* SWCH () - `-' flag */ 67/* SWCH () - `-' flag */
63#define SWCH(opt, option, flag, desc) \ 68#define SWCH(opt, option, flag, desc) \
64 { (option), (Optflag_Switch | (flag)), -1, NULL, (opt), NULL, (desc)} 69 { (option), (Optflag_Switch | (flag)), -1, NULL, (opt), NULL, (desc)}
65 70
66/* convenient macros */ 71/* convenient macros */
67#define optList_strlen(i) \ 72#define optList_isString(i) \
68 (optList[i].flag ? 0 : (optList[i].arg ? strlen (optList[i].arg) : 1)) 73 (optList[i].flag == 0)
69#define optList_isBool(i) \ 74#define optList_isBool(i) \
70 (optList[i].flag & Optflag_Boolean) 75 (optList[i].flag & Optflag_Boolean)
71#define optList_isReverse(i) \ 76#define optList_isReverse(i) \
72 (optList[i].flag & Optflag_Reverse) 77 (optList[i].flag & Optflag_Reverse)
73#define optList_size \ 78#define optList_isInfo(i) \
74 (sizeof (optList) / sizeof (optList[0])) 79 (optList[i].flag & Optflag_Info)
75 80
76static const struct 81static const struct
77 { 82 {
78 const uint8_t index; /* Option index */ 83 const uint8_t index; /* Option index */
79 const uint8_t flag; /* Option flag */ 84 const uint8_t flag; /* Option flag */
… …
90 STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */ 95 STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */
91 STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"), 96 STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"),
92 SWCH ("C", Opt_console, 0, "intercept console messages"), 97 SWCH ("C", Opt_console, 0, "intercept console messages"),
93 SWCH ("iconic", Opt_iconic, 0, "start iconic"), 98 SWCH ("iconic", Opt_iconic, 0, "start iconic"),
94 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"),
95 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"), 101 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"),
96 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"), 102 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"),
97 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"), 103 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"),
98 BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"), 104 BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"),
99 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"),
100#if HAVE_SCROLLBARS
101 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"), 106 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"),
102 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"), 107 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"),
103 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"),
104 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"),
105 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"), 110 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"),
106 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"),
107#endif
108 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL), 112 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL),
109 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"),
110 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"), 114 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"),
111 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"), 115 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"),
112#if ENABLE_TRANSPARENCY 116#if ENABLE_TRANSPARENCY
113 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"), 117 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"),
114 BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"), 118 BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"),
115 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"), 119 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
116 STRG (Rs_shade, "shading", "sh", "%", "shade background by x %."), 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"),
117#endif 122#endif
118#if OFF_FOCUS_FADING 123#if OFF_FOCUS_FADING
119 STRG (Rs_fade, "fading", "fade", "%", "fade colors x% percent when rxvt-unicode is losing focus"), 124 STRG (Rs_fade, "fading", "fade", "number", "fade colors by number % when losing focus"),
120 STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"), 125 STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"),
121#endif 126#endif
122 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"), 127 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"),
123#ifndef NO_BELL 128#ifndef NO_BELL
124# if ENABLE_FRILLS 129# if ENABLE_FRILLS
… …
171 RSTRG (Rs_color + Color_RV, "colorRV", "color"), 176 RSTRG (Rs_color + Color_RV, "colorRV", "color"),
172#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 177#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
173#if ENABLE_FRILLS 178#if ENABLE_FRILLS
174 RSTRG (Rs_color + Color_underline, "underlineColor", "color"), 179 RSTRG (Rs_color + Color_underline, "underlineColor", "color"),
175#endif 180#endif
176#ifdef KEEP_SCROLLCOLOR
177 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), 181 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"),
182#ifdef RXVT_SCROLLBAR
178 RSTRG (Rs_color + Color_trough, "troughColor", "color"), 183 RSTRG (Rs_color + Color_trough, "troughColor", "color"),
179#endif /* KEEP_SCROLLCOLOR */ 184#endif
180#ifdef OPTION_HC 185#ifdef OPTION_HC
181 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"),
182#endif 188#endif
183#ifndef NO_CURSORCOLOR 189#ifndef NO_CURSORCOLOR
184 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), 190 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
185 /* command-line option = resource name */ 191 /* command-line option = resource name */
186 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 192 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
… …
189 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"),
190 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), 196 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
191#ifdef BG_IMAGE_FROM_FILE 197#ifdef BG_IMAGE_FROM_FILE
192 RSTRG (Rs_path, "path", "search path"), 198 RSTRG (Rs_path, "path", "search path"),
193 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
194#endif 203#endif
195 /* fonts: command-line option = resource name */ 204 /* fonts: command-line option = resource name */
196 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 205 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
197#if ENABLE_STYLES 206#if ENABLE_STYLES
198 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), 207 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
… …
214#if ENABLE_XEMBED 223#if ENABLE_XEMBED
215 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"),
216#endif 225#endif
217#if XFT 226#if XFT
218 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),
219#endif 229#endif
220#if ENABLE_FRILLS 230#if ENABLE_FRILLS
221 RSTRG (Rs_transient_for, "transient-for", "windowid"), 231 RSTRG (Rs_transient_for, "transient-for", "windowid"),
222 BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, 0, "set override-redirect on the terminal window"), 232 BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, 0, "set override-redirect on the terminal window"),
223 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"), 233 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"),
… …
226 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 236 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
227 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 237 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
228 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 238 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
229 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"), 239 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"),
230 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"),
231#endif 242#endif
232#ifdef BUILTIN_GLYPHS 243#ifdef BUILTIN_GLYPHS
233 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"),
234#endif 245#endif
235#ifdef POINTER_BLANK 246#ifdef POINTER_BLANK
… …
239 RSTRG (Rs_backspace_key, "backspacekey", "string"), 250 RSTRG (Rs_backspace_key, "backspacekey", "string"),
240#endif 251#endif
241#ifndef NO_DELETE_KEY 252#ifndef NO_DELETE_KEY
242 RSTRG (Rs_delete_key, "deletekey", "string"), 253 RSTRG (Rs_delete_key, "deletekey", "string"),
243#endif 254#endif
244 RSTRG (Rs_selectstyle, "selectstyle", "mode"),
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#ifdef HAVE_AFTERIMAGE
267 STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."), 276 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"), 277#endif
278#ifndef NO_RESOURCES
279 RINFO ("xrm", "string"),
280#endif
281#ifdef KEYSYM_RESOURCE
282 RINFO ("keysym.sym", "keysym"),
269#endif 283#endif
270 INFO ("e", "command arg ...", "command to execute") 284 INFO ("e", "command arg ...", "command to execute")
271 }; 285 };
272 286
273#undef INFO 287#undef INFO
288#undef RINFO
274#undef STRG 289#undef STRG
275#undef RSTRG 290#undef RSTRG
276#undef SWCH 291#undef SWCH
277#undef BOOL 292#undef BOOL
278 293
… …
324 "tint," 339 "tint,"
325#endif 340#endif
326#if HAVE_AFTERIMAGE 341#if HAVE_AFTERIMAGE
327 "afterimage," 342 "afterimage,"
328#endif 343#endif
344#if HAVE_PIXBUF
345 "pixbuf,"
346#endif
329#if defined(USE_XIM) 347#if defined(USE_XIM)
330 "XIM," 348 "XIM,"
331#endif 349#endif
332#if defined(NO_BACKSPACE_KEY) 350#if defined(NO_BACKSPACE_KEY)
333 "no_backspace," 351 "no_backspace,"
… …
360 "pointerBlank," 378 "pointerBlank,"
361#endif 379#endif
362#if defined(NO_RESOURCES) 380#if defined(NO_RESOURCES)
363 "NoResources," 381 "NoResources,"
364#endif 382#endif
365 "scrollbars=" 383 "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) 384#if defined(RXVT_SCROLLBAR)
376 "rxvt" 385 "+rxvt"
377# if defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
378 "+"
379# endif
380# endif 386#endif
381# if defined(NEXT_SCROLLBAR) 387#if defined(NEXT_SCROLLBAR)
382 "NeXT" 388 "+NeXT"
383# if defined(XTERM_SCROLLBAR)
384 "+"
385# endif
386# endif 389#endif
387# if defined(XTERM_SCROLLBAR) 390#if defined(XTERM_SCROLLBAR)
388 "xterm" 391 "+xterm"
389# endif
390#endif 392#endif
391 "\nUsage: "; /* Usage */ 393 "\nUsage: "; /* Usage */
392 394
393#define INDENT 18 395#define INDENT 18
394 396
… …
408 switch (type) 410 switch (type)
409 { 411 {
410 case 0: /* brief listing */ 412 case 0: /* brief listing */
411 rxvt_log (" [-help] [--help]\n"); 413 rxvt_log (" [-help] [--help]\n");
412 414
413 for (col = 1, i = 0; i < optList_size; i++) 415 for (col = 1, i = 0; i < ecb_array_length (optList); i++)
414 if (optList[i].desc != NULL) 416 if (optList[i].desc != NULL)
415 { 417 {
416 int len = 0; 418 int len = 0;
417 419
418 if (!optList_isBool (i)) 420 if (optList[i].arg)
419 { 421 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); 422 assert (optList[i].opt != NULL);
426#endif
427 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); 423 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2 : 0);
428 col += len; 424 col += len;
429 if (col > 79) 425 if (col > 79)
426 {
430 { /* assume regular width */ 427 /* assume regular width */
431 rxvt_log ("\n"); 428 rxvt_log ("\n");
432 col = 1 + len; 429 col = 1 + len;
433 } 430 }
434 431
435 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); 432 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
436 if (optList_strlen (i)) 433 if (optList[i].arg)
437 rxvt_log (" %s]", optList[i].arg); 434 rxvt_log (" %s]", optList[i].arg);
438 else 435 else
439 rxvt_log ("]"); 436 rxvt_log ("]");
440 } 437 }
441 break; 438 break;
442 439
443 case 1: /* full command-line listing */ 440 case 1: /* full command-line listing */
444 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n"); 441 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
445 442
446 for (i = 0; i < optList_size; i++) 443 for (i = 0; i < ecb_array_length (optList); i++)
447 if (optList[i].desc != NULL) 444 if (optList[i].desc != NULL)
448 { 445 {
449#ifdef DEBUG_STRICT
450 assert (optList[i].opt != NULL); 446 assert (optList[i].opt != NULL);
451#endif
452 rxvt_log (" %s%s %-*s%s%s\n", 447 rxvt_log (" %s%s %-*s%s%s\n",
453 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, 448 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
454 (INDENT - strlen (optList[i].opt) 449 (INDENT - strlen (optList[i].opt)
455 + (optList_isBool (i) ? 0 : 2)), 450 + (optList_isBool (i) ? 0 : 2)),
456 (optList[i].arg ? optList[i].arg : ""), 451 (optList[i].arg ? optList[i].arg : ""),
… …
462 457
463 case 2: /* full resource listing */ 458 case 2: /* full resource listing */
464 rxvt_log (" [options] [-e command args]\n\n" 459 rxvt_log (" [options] [-e command args]\n\n"
465 "where resources (long-options) include:\n"); 460 "where resources (long-options) include:\n");
466 461
467 for (i = 0; i < optList_size; i++) 462 for (i = 0; i < ecb_array_length (optList); i++)
468 if (optList[i].kw != NULL) 463 if (optList[i].kw != NULL)
469 rxvt_log (" %s: %*s%s\n", 464 rxvt_log (" %s: %*s%s\n",
470 optList[i].kw, 465 optList[i].kw,
471 (INDENT - strlen (optList[i].kw)), "", /* XXX */ 466 (INDENT - strlen (optList[i].kw)), "", /* XXX */
472 (optList_isBool (i) ? "boolean" : optList[i].arg)); 467 (optList_isBool (i) ? "boolean" : optList[i].arg));
473#ifdef KEYSYM_RESOURCE
474 rxvt_log (" " "keysym.sym" ": %*s%s\n",
475 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */
476 "keysym");
477#endif
478 rxvt_log ("\n -help to list options"); 468 rxvt_log ("\n -help to list options");
479 break; 469 break;
480 } 470 }
481 471
482 rxvt_log ("\n\n"); 472 rxvt_log ("\n\n");
483 rxvt_exit_failure (); 473 rxvt_exit_failure ();
484 /* NOTREACHED */
485} 474}
486 475
487/*}}} */ 476/*}}} */
488 477
489/*{{{ get command-line options before getting resources */ 478/*{{{ get command-line options before getting resources */
490void 479const char **
491rxvt_term::get_options (int argc, const char *const *argv) 480rxvt_term::get_options (int argc, const char *const *argv)
492{ 481{
493 int i, bad_option = 0; 482 int i, bad_option = 0;
494 483
495 for (i = 1; i < argc; i++) 484 for (i = 1; i < argc; i++)
496 { 485 {
497 unsigned int entry, longopt = 0; 486 unsigned int entry, longopt = 0;
498 const char *flag, *opt; 487 const char *opt;
488 int flag;
499 489
500 opt = argv[i]; 490 opt = argv[i];
501 491
502 if (*opt == '-') 492 if (*opt == '-')
503 { 493 {
504 flag = resval_on; 494 flag = 1;
505 495
506 if (*++opt == '-') 496 if (*++opt == '-')
507 longopt = *opt++; /* long option */ 497 longopt = *opt++; /* long option */
508 } 498 }
509 else if (*opt == '+') 499 else if (*opt == '+')
510 { 500 {
511 flag = resval_off; 501 flag = 0;
512 502
513 if (*++opt == '+') 503 if (*++opt == '+')
514 longopt = *opt++; /* long option */ 504 longopt = *opt++; /* long option */
515 } 505 }
516 else 506 else
… …
525 515
526 if (!strcmp (opt, "h")) 516 if (!strcmp (opt, "h"))
527 rxvt_usage (0); 517 rxvt_usage (0);
528 518
529 /* feature: always try to match long-options */ 519 /* feature: always try to match long-options */
530 for (entry = 0; entry < optList_size; entry++) 520 for (entry = 0; entry < ecb_array_length (optList); entry++)
531 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw)) 521 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))
532 || (!longopt 522 || (!longopt
533 && optList[entry].opt && !strcmp (opt, optList[entry].opt))) 523 && optList[entry].opt && !strcmp (opt, optList[entry].opt)))
534 break; 524 break;
535 525
536 if (entry < optList_size) 526 if (entry < ecb_array_length (optList)
527 && !optList_isInfo (entry))
537 { 528 {
538 if (optList_isReverse (entry)) 529 if (optList_isReverse (entry))
539 flag = flag == resval_on ? resval_off : resval_on; 530 flag = !flag;
540 531
541 if (optList_strlen (entry)) 532 if (optList_isString (entry))
542 { 533 {
543 /* 534 /*
544 * special cases are handled in main.c:main () to allow 535 * special cases are handled in init_resources () to allow
545 * X resources to set these values before we settle for 536 * X resources to set these values before we settle for
546 * default values 537 * default values
547 */ 538 */
548 539
549 if (optList[entry].doff != -1) 540 if (optList[entry].doff != -1)
550 { 541 {
551 if (flag == resval_on && i+1 == argc) 542 if (flag && i+1 == argc)
552 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]); 543 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]);
553 544
554 rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef; 545 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef;
555 } 546 }
556 } 547 }
557 else 548 else
549 {
558 { /* boolean value */ 550 /* boolean value */
559 set_option (optList[entry].index, flag == resval_on); 551 set_option (optList[entry].index, flag);
560 552
561 if (optList[entry].doff != -1) 553 if (optList[entry].doff != -1)
562 rs[optList[entry].doff] = flag; 554 rs[optList[entry].doff] = flag ? resval_on : resval_off;
563 } 555 }
564 } 556 }
565#ifndef NO_RESOURCES 557#ifndef NO_RESOURCES
566 else if (!strcmp (opt, "xrm")) 558 else if (!strcmp (opt, "xrm"))
567 { 559 {
… …
572#ifdef KEYSYM_RESOURCE 564#ifdef KEYSYM_RESOURCE
573 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) 565 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
574 { 566 {
575 if (i+1 < argc) 567 if (i+1 < argc)
576 { 568 {
577 char *res = (char *)malloc (strlen (opt) + strlen (argv[++i]) + 6); 569 char *res = rxvt_temp_buf<char> (strlen (opt) + strlen (argv[++i]) + 6);
578 sprintf (res, "*.%s: %s\n", opt, argv[i]); 570 sprintf (res, "*.%s: %s\n", opt, argv[i]);
579 XrmPutLineResource (&option_db, res); 571 XrmPutLineResource (&option_db, res);
580 free (res);
581 } 572 }
582 } 573 }
583#endif 574#endif
575 else if (!strcmp (opt, "e"))
576 {
577 if (i+1 == argc)
578 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
579
580 return (const char **)argv + i + 1;
581 }
584 else 582 else
585 { 583 {
586 bad_option = 1; 584 bad_option = 1;
587 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); 585 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
588 } 586 }
589 } 587 }
590 588
591 if (bad_option) 589 if (bad_option)
592 rxvt_usage (0); 590 rxvt_usage (0);
591
592 return 0;
593} 593}
594 594
595/*}}} */ 595/*}}} */
596 596
597#ifndef NO_RESOURCES 597#ifndef NO_RESOURCES
… …
602 * Define key from XrmEnumerateDatabase. 602 * Define key from XrmEnumerateDatabase.
603 * quarks will be something like 603 * quarks will be something like
604 * "rxvt" "keysym" "0xFF01" 604 * "rxvt" "keysym" "0xFF01"
605 * value will be a string 605 * value will be a string
606 */ 606 */
607/* ARGSUSED */ 607static int
608int
609rxvt_define_key (XrmDatabase *database UNUSED, 608rxvt_define_key (XrmDatabase *database ecb_unused,
610 XrmBindingList bindings UNUSED, 609 XrmBindingList bindings ecb_unused,
611 XrmQuarkList quarks, 610 XrmQuarkList quarks,
612 XrmRepresentation *type UNUSED, 611 XrmRepresentation *type ecb_unused,
613 XrmValue *value, 612 XrmValue *value,
614 XPointer closure UNUSED) 613 XPointer closure ecb_unused)
615{ 614{
616 int last; 615 int last;
617 616
618 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ 617 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
619 ; 618 ;
… …
624} 623}
625 624
626/* 625/*
627 * look for something like this (XK_Delete) 626 * look for something like this (XK_Delete)
628 * rxvt*keysym.0xFFFF: "\177" 627 * rxvt*keysym.0xFFFF: "\177"
629 *
630 * arg will be
631 * NULL for ~/.Xdefaults and
632 * non-NULL for command-line options (need to allocate)
633 */ 628 */
634#define NEWARGLIM 500 /* `reasonable' size */
635 629
636struct keysym_vocabulary_t 630struct keysym_vocabulary_t
637{ 631{
638 const char *name; 632 const char *name;
639 unsigned short len; 633 unsigned short len;
640 unsigned short value; 634 unsigned short value;
641}; 635};
642keysym_vocabulary_t keysym_vocabulary[] = 636static const keysym_vocabulary_t keysym_vocabulary[] =
643{ 637{
644 { "ISOLevel3", 9, Level3Mask }, 638 { "ISOLevel3", 9, Level3Mask },
645 { "AppKeypad", 9, AppKeypadMask }, 639 { "AppKeypad", 9, AppKeypadMask },
646 { "Control", 7, ControlMask }, 640 { "Control", 7, ControlMask },
647 { "NumLock", 7, NumLockMask }, 641 { "NumLock", 7, NumLockMask },
… …
669}; 663};
670 664
671int 665int
672rxvt_term::parse_keysym (const char *str, const char *arg) 666rxvt_term::parse_keysym (const char *str, const char *arg)
673{ 667{
674 int n, sym; 668 int sym;
675 unsigned int state = 0; 669 unsigned int state = 0;
676 const char *pmodend = NULL; 670 const char *key = strrchr (str, '-');
677 char *newarg = NULL;
678 char newargstr[NEWARGLIM];
679 671
680 if (arg == NULL) 672 if (!key)
681 { 673 key = str;
682 n = sizeof ("keysym.") - 1;
683 if (strncmp (str, "keysym.", n))
684 return 0;
685
686 str += n; /* skip `keysym.' */
687 if (!(pmodend = strchr (str, ':')))
688 return -1;
689 }
690 else 674 else
691 pmodend = str + strlen(str); 675 key++;
692 676
693 for (--pmodend; str < pmodend; --pmodend) 677 // string or key is empty
694 if (*pmodend == '-') 678 if (*arg == '\0' || *key == '\0')
695 break; 679 return -1;
696 680
681 // parse modifiers
697 while (str < pmodend) 682 while (str < key)
698 { 683 {
699 unsigned int i; 684 unsigned int i;
700 685
701 for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i) 686 for (i = 0; i < ecb_array_length (keysym_vocabulary); ++i)
702 { 687 {
703 if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0) 688 if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0)
704 { 689 {
705 state |= keysym_vocabulary[i].value; 690 state |= keysym_vocabulary[i].value;
706 str += keysym_vocabulary[i].len; 691 str += keysym_vocabulary[i].len;
707 break; 692 break;
708 } 693 }
709 } 694 }
710 695
711 if (i >= sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t)) 696 if (i >= ecb_array_length (keysym_vocabulary))
712 return -1; 697 return -1;
713 698
714 if (*str == '-') 699 if (*str == '-')
715 ++str; 700 ++str;
716 } 701 }
717 702
718 /* some scanf () have trouble with a 0x prefix */ 703 // convert keysym name to keysym number
719 if (str[0] == '0' && toupper (str[1]) == 'X') 704 if ((sym = XStringToKeysym (str)) == None)
720 { 705 {
721 str += 2; 706 // fallback on hexadecimal parsing
722 707 char *end;
708 sym = strtol (str, &end, 16);
723 if (arg) 709 if (*end)
724 {
725 if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1)
726 return -1;
727 }
728 else
729 {
730 if (sscanf (str, "%x:", &sym) != 1)
731 return -1;
732
733 /* cue to ':', it's there since sscanf () worked */
734 strncpy (newargstr, strchr (str, ':') + 1, NEWARGLIM - 1);
735 newargstr[NEWARGLIM - 1] = '\0';
736 newarg = newargstr;
737 }
738 }
739 else
740 {
741 /*
742 * convert keysym name to keysym number
743 */
744 strncpy (newargstr, str, NEWARGLIM - 1);
745 newargstr[NEWARGLIM - 1] = '\0';
746
747 if (arg == NULL)
748 {
749 if ((newarg = strchr (newargstr, ':')) == NULL)
750 return -1;
751
752 *newarg++ = '\0'; /* terminate keysym name */
753 }
754
755 if ((sym = XStringToKeysym (newargstr)) == None)
756 return -1; 710 return -1;
757 } 711 }
758 712
759 if (newarg == NULL) 713 wchar_t *ws = rxvt_mbstowcs (arg);
760 { 714 if (!HOOK_INVOKE ((this, HOOK_REGISTER_COMMAND, DT_INT, sym, DT_INT, state, DT_WCS_LEN, ws, wcslen (ws), DT_END)))
761 strncpy (newargstr, arg, NEWARGLIM - 1);
762 newargstr[NEWARGLIM - 1] = '\0';
763 newarg = newargstr;
764 }
765
766 if (*newarg == '\0')
767 return -1;
768
769 keyboard->register_user_translation (sym, state, newarg); 715 keyboard->register_user_translation (sym, state, ws);
716 free (ws);
770 return 1; 717 return 1;
771} 718}
772 719
773# endif /* KEYSYM_RESOURCE */ 720# endif /* KEYSYM_RESOURCE */
774#endif /* NO_RESOURCES */ 721#endif /* NO_RESOURCES */
… …
817 XrmMergeDatabases (option_db, &database); 764 XrmMergeDatabases (option_db, &database);
818 option_db = NULL; 765 option_db = NULL;
819 /* 766 /*
820 * Query resources for options that affect us 767 * Query resources for options that affect us
821 */ 768 */
822 for (int entry = 0; entry < optList_size; entry++) 769 for (int entry = 0; entry < ecb_array_length (optList); entry++)
823 { 770 {
824 int s; 771 int s;
825 const char *kw = optList[entry].kw; 772 const char *kw = optList[entry].kw;
826 773
827 if (kw == NULL || rs[optList[entry].doff] != NULL) 774 if (kw == NULL || rs[optList[entry].doff] != NULL)
… …
847 794
848 set_option (optList[entry].index, s); 795 set_option (optList[entry].index, s);
849 } 796 }
850 } 797 }
851 } 798 }
799#endif /* NO_RESOURCES */
800}
852 801
802void
803rxvt_term::extract_keysym_resources ()
804{
805#ifndef NO_RESOURCES
853 /* 806 /*
854 * [R5 or later]: enumerate the resource database 807 * [R5 or later]: enumerate the resource database
855 */ 808 */
856# ifdef KEYSYM_RESOURCE 809# ifdef KEYSYM_RESOURCE
810 XrmDatabase database = XrmGetDatabase (dpy);
857 XrmName name_prefix[3]; 811 XrmName name_prefix[3];
858 XrmClass class_prefix[3]; 812 XrmClass class_prefix[3];
859 813
860 name_prefix[0] = XrmStringToName (rs[Rs_name]); 814 name_prefix[0] = XrmStringToName (rs[Rs_name]);
861 name_prefix[1] = XrmStringToName ("keysym"); 815 name_prefix[1] = XrmStringToName ("keysym");
… …
865 class_prefix[2] = NULLQUARK; 819 class_prefix[2] = NULLQUARK;
866 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 820 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
867 XrmEnumerateDatabase (database, name_prefix, class_prefix, 821 XrmEnumerateDatabase (database, name_prefix, class_prefix,
868 XrmEnumOneLevel, rxvt_define_key, NULL); 822 XrmEnumOneLevel, rxvt_define_key, NULL);
869# ifdef RESFALLBACK 823# ifdef RESFALLBACK
870 name_prefix[0] = XrmStringToName (RESFALLBACK);
871 name_prefix[1] = XrmStringToName ("keysym");
872 class_prefix[0] = XrmStringToName (RESFALLBACK); 824 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK);
873 class_prefix[1] = XrmStringToName ("Keysym");
874 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 825 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
875 XrmEnumerateDatabase (database, name_prefix, class_prefix, 826 XrmEnumerateDatabase (database, name_prefix, class_prefix,
876 XrmEnumOneLevel, rxvt_define_key, NULL); 827 XrmEnumOneLevel, rxvt_define_key, NULL);
877# endif 828# endif
878# endif 829# endif

Diff Legend

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