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.123 by ayin, Fri Nov 23 11:17:37 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 * 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)}
49 51
50/* STRG () - command-line option, with/without resource */ 52/* STRG () - command-line option, with/without resource */
51#define STRG(rsp, kw, opt, arg, desc) \ 53#define STRG(rsp, kw, opt, arg, desc) \
52 {0, 0, (rsp), (kw), (opt), (arg), (desc)} 54 {0, 0, (rsp), (kw), (opt), (arg), (desc)}
53 55
… …
62/* SWCH () - `-' flag */ 64/* SWCH () - `-' flag */
63#define SWCH(opt, option, flag, desc) \ 65#define SWCH(opt, option, flag, desc) \
64 { (option), (Optflag_Switch | (flag)), -1, NULL, (opt), NULL, (desc)} 66 { (option), (Optflag_Switch | (flag)), -1, NULL, (opt), NULL, (desc)}
65 67
66/* convenient macros */ 68/* convenient macros */
67#define optList_strlen(i) \ 69#define optList_isString(i) \
68 (optList[i].flag ? 0 : (optList[i].arg ? strlen (optList[i].arg) : 1)) 70 (optList[i].flag == 0)
69#define optList_isBool(i) \ 71#define optList_isBool(i) \
70 (optList[i].flag & Optflag_Boolean) 72 (optList[i].flag & Optflag_Boolean)
71#define optList_isReverse(i) \ 73#define optList_isReverse(i) \
72 (optList[i].flag & Optflag_Reverse) 74 (optList[i].flag & Optflag_Reverse)
73#define optList_size \ 75#define optList_isInfo(i) \
74 (sizeof (optList) / sizeof (optList[0])) 76 (optList[i].flag & Optflag_Info)
75 77
76static const struct 78static const struct
77 { 79 {
78 const uint8_t index; /* Option index */ 80 const uint8_t index; /* Option index */
79 const uint8_t flag; /* Option flag */ 81 const uint8_t flag; /* Option flag */
… …
90 STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */ 92 STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */
91 STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"), 93 STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"),
92 SWCH ("C", Opt_console, 0, "intercept console messages"), 94 SWCH ("C", Opt_console, 0, "intercept console messages"),
93 SWCH ("iconic", Opt_iconic, 0, "start iconic"), 95 SWCH ("iconic", Opt_iconic, 0, "start iconic"),
94 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"),
95 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"), 98 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"),
96 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"), 99 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"),
97 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"), 100 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"),
98 BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"), 101 BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"),
99 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"),
100#if HAVE_SCROLLBARS
101 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"), 103 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"),
102 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"), 104 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"),
103 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"),
104 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"),
105 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"), 107 RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"),
106 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"),
107#endif
108 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL), 109 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL),
109 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"),
110 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"), 111 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"),
111 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"), 112 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"),
112#if ENABLE_TRANSPARENCY 113#if ENABLE_TRANSPARENCY
113 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"), 114 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"),
114 BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"), 115 BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"),
115 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"), 116 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
116 STRG (Rs_shade, "shading", "sh", "%", "shade background by x %."), 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"),
117#endif 119#endif
118#if OFF_FOCUS_FADING 120#if OFF_FOCUS_FADING
119 STRG (Rs_fade, "fading", "fade", "%", "fade colors x% percent when rxvt-unicode is losing focus"), 121 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"), 122 STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"),
121#endif 123#endif
122 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"), 124 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"),
123#ifndef NO_BELL 125#ifndef NO_BELL
124# if ENABLE_FRILLS 126# if ENABLE_FRILLS
… …
171 RSTRG (Rs_color + Color_RV, "colorRV", "color"), 173 RSTRG (Rs_color + Color_RV, "colorRV", "color"),
172#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 174#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
173#if ENABLE_FRILLS 175#if ENABLE_FRILLS
174 RSTRG (Rs_color + Color_underline, "underlineColor", "color"), 176 RSTRG (Rs_color + Color_underline, "underlineColor", "color"),
175#endif 177#endif
176#ifdef KEEP_SCROLLCOLOR
177 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), 178 RSTRG (Rs_color + Color_scroll, "scrollColor", "color"),
179#ifdef RXVT_SCROLLBAR
178 RSTRG (Rs_color + Color_trough, "troughColor", "color"), 180 RSTRG (Rs_color + Color_trough, "troughColor", "color"),
179#endif /* KEEP_SCROLLCOLOR */ 181#endif
180#ifdef OPTION_HC 182#ifdef OPTION_HC
181 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"),
182#endif 185#endif
183#ifndef NO_CURSORCOLOR 186#ifndef NO_CURSORCOLOR
184 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), 187 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
185 /* command-line option = resource name */ 188 /* command-line option = resource name */
186 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 189 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
… …
189 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"),
190 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), 193 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
191#ifdef BG_IMAGE_FROM_FILE 194#ifdef BG_IMAGE_FROM_FILE
192 RSTRG (Rs_path, "path", "search path"), 195 RSTRG (Rs_path, "path", "search path"),
193 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
194#endif 200#endif
195 /* fonts: command-line option = resource name */ 201 /* fonts: command-line option = resource name */
196 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 202 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
197#if ENABLE_STYLES 203#if ENABLE_STYLES
198 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), 204 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
… …
214#if ENABLE_XEMBED 220#if ENABLE_XEMBED
215 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"),
216#endif 222#endif
217#if XFT 223#if XFT
218 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),
219#endif 226#endif
220#if ENABLE_FRILLS 227#if ENABLE_FRILLS
221 RSTRG (Rs_transient_for, "transient-for", "windowid"), 228 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"), 229 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"), 230 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"),
… …
225 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), 232 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
226 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 233 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
227 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 234 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
228 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 235 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
229 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"), 236 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"),
237 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
238 STRG (Rs_letterSpace, "letterSpace", "letsp", "number", "letter spacing adjustment"),
239#endif
240#ifdef BUILTIN_GLYPHS
230 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"),
231 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
232#endif 242#endif
233#ifdef POINTER_BLANK 243#ifdef POINTER_BLANK
234 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 244 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
235#endif 245#endif
236#ifndef NO_BACKSPACE_KEY 246#ifndef NO_BACKSPACE_KEY
237 RSTRG (Rs_backspace_key, "backspacekey", "string"), 247 RSTRG (Rs_backspace_key, "backspacekey", "string"),
238#endif 248#endif
239#ifndef NO_DELETE_KEY 249#ifndef NO_DELETE_KEY
240 RSTRG (Rs_delete_key, "deletekey", "string"), 250 RSTRG (Rs_delete_key, "deletekey", "string"),
241#endif 251#endif
242 RSTRG (Rs_selectstyle, "selectstyle", "mode"),
243#ifdef PRINTPIPE 252#ifdef PRINTPIPE
244 RSTRG (Rs_print_pipe, "print-pipe", "string"), 253 RSTRG (Rs_print_pipe, "print-pipe", "string"),
245#endif 254#endif
246 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"),
247#ifdef CUTCHAR_RESOURCE
248 RSTRG (Rs_cutchars, "cutchars", "string"), 256 RSTRG (Rs_cutchars, "cutchars", "string"),
249#endif /* CUTCHAR_RESOURCE */
250 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 257 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
251#ifndef NO_SECONDARY_SCREEN 258#ifndef NO_SECONDARY_SCREEN
252 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"), 259 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"),
253 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"),
254#endif 261#endif
… …
257 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
258 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
259 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"),
260#endif 267#endif
261#if ISO_14755 268#if ISO_14755
269 BOOL (Rs_iso14755, "iso14755", NULL, Opt_iso14755, 0, NULL),
262 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),
263#endif 271#endif
264#ifdef HAVE_AFTERIMAGE 272#ifdef HAVE_AFTERIMAGE
265 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..."),
266 STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "Gaussian Blur radii to apply to the root background"),
267#endif 274#endif
268 INFO ("e", "command arg ...", "command to execute") 275 INFO ("e", "command arg ...", "command to execute")
269 }; 276 };
270 277
271#undef INFO 278#undef INFO
… …
322 "tint," 329 "tint,"
323#endif 330#endif
324#if HAVE_AFTERIMAGE 331#if HAVE_AFTERIMAGE
325 "afterimage," 332 "afterimage,"
326#endif 333#endif
334#if HAVE_PIXBUF
335 "pixbuf,"
336#endif
327#if defined(USE_XIM) 337#if defined(USE_XIM)
328 "XIM," 338 "XIM,"
329#endif 339#endif
330#if defined(NO_BACKSPACE_KEY) 340#if defined(NO_BACKSPACE_KEY)
331 "no_backspace," 341 "no_backspace,"
… …
358 "pointerBlank," 368 "pointerBlank,"
359#endif 369#endif
360#if defined(NO_RESOURCES) 370#if defined(NO_RESOURCES)
361 "NoResources," 371 "NoResources,"
362#endif 372#endif
363 "scrollbars=" 373 "scrollbars=plain"
364#if !defined(HAVE_SCROLLBARS)
365 "NONE"
366#else
367# if defined(PLAIN_SCROLLBAR)
368 "plain"
369# if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
370 "+"
371# endif
372# endif
373# if defined(RXVT_SCROLLBAR) 374#if defined(RXVT_SCROLLBAR)
374 "rxvt" 375 "+rxvt"
375# if defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
376 "+"
377# endif
378# endif 376#endif
379# if defined(NEXT_SCROLLBAR) 377#if defined(NEXT_SCROLLBAR)
380 "NeXT" 378 "+NeXT"
381# if defined(XTERM_SCROLLBAR)
382 "+"
383# endif
384# endif 379#endif
385# if defined(XTERM_SCROLLBAR) 380#if defined(XTERM_SCROLLBAR)
386 "xterm" 381 "+xterm"
387# endif
388#endif 382#endif
389 "\nUsage: "; /* Usage */ 383 "\nUsage: "; /* Usage */
390 384
391#define INDENT 18 385#define INDENT 18
392 386
… …
406 switch (type) 400 switch (type)
407 { 401 {
408 case 0: /* brief listing */ 402 case 0: /* brief listing */
409 rxvt_log (" [-help] [--help]\n"); 403 rxvt_log (" [-help] [--help]\n");
410 404
411 for (col = 1, i = 0; i < optList_size; i++) 405 for (col = 1, i = 0; i < ecb_array_length (optList); i++)
412 if (optList[i].desc != NULL) 406 if (optList[i].desc != NULL)
413 { 407 {
414 int len = 0; 408 int len = 0;
415 409
416 if (!optList_isBool (i)) 410 if (optList[i].arg)
417 { 411 len = strlen (optList[i].arg) + 1;
418 len = optList_strlen (i);
419 if (len > 0)
420 len++; /* account for space */
421 }
422#ifdef DEBUG_STRICT
423 assert (optList[i].opt != NULL); 412 assert (optList[i].opt != NULL);
424#endif
425 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); 413 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2 : 0);
426 col += len; 414 col += len;
427 if (col > 79) 415 if (col > 79)
416 {
428 { /* assume regular width */ 417 /* assume regular width */
429 rxvt_log ("\n"); 418 rxvt_log ("\n");
430 col = 1 + len; 419 col = 1 + len;
431 } 420 }
432 421
433 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); 422 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
434 if (optList_strlen (i)) 423 if (optList[i].arg)
435 rxvt_log (" %s]", optList[i].arg); 424 rxvt_log (" %s]", optList[i].arg);
436 else 425 else
437 rxvt_log ("]"); 426 rxvt_log ("]");
438 } 427 }
439 break; 428 break;
440 429
441 case 1: /* full command-line listing */ 430 case 1: /* full command-line listing */
442 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n"); 431 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
443 432
444 for (i = 0; i < optList_size; i++) 433 for (i = 0; i < ecb_array_length (optList); i++)
445 if (optList[i].desc != NULL) 434 if (optList[i].desc != NULL)
446 { 435 {
447#ifdef DEBUG_STRICT
448 assert (optList[i].opt != NULL); 436 assert (optList[i].opt != NULL);
449#endif
450 rxvt_log (" %s%s %-*s%s%s\n", 437 rxvt_log (" %s%s %-*s%s%s\n",
451 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, 438 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
452 (INDENT - strlen (optList[i].opt) 439 (INDENT - strlen (optList[i].opt)
453 + (optList_isBool (i) ? 0 : 2)), 440 + (optList_isBool (i) ? 0 : 2)),
454 (optList[i].arg ? optList[i].arg : ""), 441 (optList[i].arg ? optList[i].arg : ""),
… …
460 447
461 case 2: /* full resource listing */ 448 case 2: /* full resource listing */
462 rxvt_log (" [options] [-e command args]\n\n" 449 rxvt_log (" [options] [-e command args]\n\n"
463 "where resources (long-options) include:\n"); 450 "where resources (long-options) include:\n");
464 451
465 for (i = 0; i < optList_size; i++) 452 for (i = 0; i < ecb_array_length (optList); i++)
466 if (optList[i].kw != NULL) 453 if (optList[i].kw != NULL)
467 rxvt_log (" %s: %*s%s\n", 454 rxvt_log (" %s: %*s%s\n",
468 optList[i].kw, 455 optList[i].kw,
469 (INDENT - strlen (optList[i].kw)), "", /* XXX */ 456 (INDENT - strlen (optList[i].kw)), "", /* XXX */
470 (optList_isBool (i) ? "boolean" : optList[i].arg)); 457 (optList_isBool (i) ? "boolean" : optList[i].arg));
… …
477 break; 464 break;
478 } 465 }
479 466
480 rxvt_log ("\n\n"); 467 rxvt_log ("\n\n");
481 rxvt_exit_failure (); 468 rxvt_exit_failure ();
482 /* NOTREACHED */
483} 469}
484 470
485/*}}} */ 471/*}}} */
486 472
487/*{{{ get command-line options before getting resources */ 473/*{{{ get command-line options before getting resources */
488void 474const char **
489rxvt_term::get_options (int argc, const char *const *argv) 475rxvt_term::get_options (int argc, const char *const *argv)
490{ 476{
491 int i, bad_option = 0; 477 int i, bad_option = 0;
492 478
493 for (i = 1; i < argc; i++) 479 for (i = 1; i < argc; i++)
494 { 480 {
495 unsigned int entry, longopt = 0; 481 unsigned int entry, longopt = 0;
496 const char *flag, *opt; 482 const char *opt;
483 int flag;
497 484
498 opt = argv[i]; 485 opt = argv[i];
499 486
500 if (*opt == '-') 487 if (*opt == '-')
501 { 488 {
502 flag = resval_on; 489 flag = 1;
503 490
504 if (*++opt == '-') 491 if (*++opt == '-')
505 longopt = *opt++; /* long option */ 492 longopt = *opt++; /* long option */
506 } 493 }
507 else if (*opt == '+') 494 else if (*opt == '+')
508 { 495 {
509 flag = resval_off; 496 flag = 0;
510 497
511 if (*++opt == '+') 498 if (*++opt == '+')
512 longopt = *opt++; /* long option */ 499 longopt = *opt++; /* long option */
513 } 500 }
514 else 501 else
… …
523 510
524 if (!strcmp (opt, "h")) 511 if (!strcmp (opt, "h"))
525 rxvt_usage (0); 512 rxvt_usage (0);
526 513
527 /* feature: always try to match long-options */ 514 /* feature: always try to match long-options */
528 for (entry = 0; entry < optList_size; entry++) 515 for (entry = 0; entry < ecb_array_length (optList); entry++)
529 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw)) 516 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))
530 || (!longopt 517 || (!longopt
531 && optList[entry].opt && !strcmp (opt, optList[entry].opt))) 518 && optList[entry].opt && !strcmp (opt, optList[entry].opt)))
532 break; 519 break;
533 520
534 if (entry < optList_size) 521 if (entry < ecb_array_length (optList)
522 && !optList_isInfo (entry))
535 { 523 {
536 if (optList_isReverse (entry)) 524 if (optList_isReverse (entry))
537 flag = flag == resval_on ? resval_off : resval_on; 525 flag = !flag;
538 526
539 if (optList_strlen (entry)) 527 if (optList_isString (entry))
540 { 528 {
541 /* 529 /*
542 * special cases are handled in main.c:main () to allow 530 * special cases are handled in init_resources () to allow
543 * X resources to set these values before we settle for 531 * X resources to set these values before we settle for
544 * default values 532 * default values
545 */ 533 */
546 534
547 if (optList[entry].doff != -1) 535 if (optList[entry].doff != -1)
548 { 536 {
549 if (flag == resval_on && i+1 == argc) 537 if (flag && i+1 == argc)
550 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]); 538 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]);
551 539
552 rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef; 540 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef;
553 } 541 }
554 } 542 }
555 else 543 else
544 {
556 { /* boolean value */ 545 /* boolean value */
557 set_option (optList[entry].index, flag == resval_on); 546 set_option (optList[entry].index, flag);
558 547
559 if (optList[entry].doff != -1) 548 if (optList[entry].doff != -1)
560 rs[optList[entry].doff] = flag; 549 rs[optList[entry].doff] = flag ? resval_on : resval_off;
561 } 550 }
562 } 551 }
563#ifndef NO_RESOURCES 552#ifndef NO_RESOURCES
564 else if (!strcmp (opt, "xrm")) 553 else if (!strcmp (opt, "xrm"))
565 { 554 {
… …
570#ifdef KEYSYM_RESOURCE 559#ifdef KEYSYM_RESOURCE
571 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) 560 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
572 { 561 {
573 if (i+1 < argc) 562 if (i+1 < argc)
574 { 563 {
575 char *res = (char *)malloc (strlen (opt) + strlen (argv[++i]) + 6); 564 char *res = rxvt_temp_buf<char> (strlen (opt) + strlen (argv[++i]) + 6);
576 sprintf (res, "*.%s: %s\n", opt, argv[i]); 565 sprintf (res, "*.%s: %s\n", opt, argv[i]);
577 XrmPutLineResource (&option_db, res); 566 XrmPutLineResource (&option_db, res);
578 free (res);
579 } 567 }
580 } 568 }
581#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 }
582 else 577 else
583 { 578 {
584 bad_option = 1; 579 bad_option = 1;
585 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); 580 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
586 } 581 }
587 } 582 }
588 583
589 if (bad_option) 584 if (bad_option)
590 rxvt_usage (0); 585 rxvt_usage (0);
586
587 return 0;
591} 588}
592 589
593/*}}} */ 590/*}}} */
594 591
595#ifndef NO_RESOURCES 592#ifndef NO_RESOURCES
… …
600 * Define key from XrmEnumerateDatabase. 597 * Define key from XrmEnumerateDatabase.
601 * quarks will be something like 598 * quarks will be something like
602 * "rxvt" "keysym" "0xFF01" 599 * "rxvt" "keysym" "0xFF01"
603 * value will be a string 600 * value will be a string
604 */ 601 */
605/* ARGSUSED */ 602static int
606int
607rxvt_define_key (XrmDatabase *database UNUSED, 603rxvt_define_key (XrmDatabase *database ecb_unused,
608 XrmBindingList bindings UNUSED, 604 XrmBindingList bindings ecb_unused,
609 XrmQuarkList quarks, 605 XrmQuarkList quarks,
610 XrmRepresentation *type UNUSED, 606 XrmRepresentation *type ecb_unused,
611 XrmValue *value, 607 XrmValue *value,
612 XPointer closure UNUSED) 608 XPointer closure ecb_unused)
613{ 609{
614 int last; 610 int last;
615 611
616 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 */
617 ; 613 ;
… …
622} 618}
623 619
624/* 620/*
625 * look for something like this (XK_Delete) 621 * look for something like this (XK_Delete)
626 * rxvt*keysym.0xFFFF: "\177" 622 * rxvt*keysym.0xFFFF: "\177"
627 *
628 * arg will be
629 * NULL for ~/.Xdefaults and
630 * non-NULL for command-line options (need to allocate)
631 */ 623 */
632#define NEWARGLIM 500 /* `reasonable' size */
633 624
634struct keysym_vocabulary_t 625struct keysym_vocabulary_t
635{ 626{
636 const char *name; 627 const char *name;
637 unsigned short len; 628 unsigned short len;
638 unsigned short value; 629 unsigned short value;
639}; 630};
640keysym_vocabulary_t keysym_vocabulary[] = 631static const keysym_vocabulary_t keysym_vocabulary[] =
641{ 632{
642 { "ISOLevel3", 9, Level3Mask }, 633 { "ISOLevel3", 9, Level3Mask },
643 { "AppKeypad", 9, AppKeypadMask }, 634 { "AppKeypad", 9, AppKeypadMask },
644 { "Control", 7, ControlMask }, 635 { "Control", 7, ControlMask },
645 { "NumLock", 7, NumLockMask }, 636 { "NumLock", 7, NumLockMask },
… …
667}; 658};
668 659
669int 660int
670rxvt_term::parse_keysym (const char *str, const char *arg) 661rxvt_term::parse_keysym (const char *str, const char *arg)
671{ 662{
672 int n, sym; 663 int sym;
673 unsigned int state = 0; 664 unsigned int state = 0;
674 const char *pmodend = NULL; 665 const char *key = strrchr (str, '-');
675 char *newarg = NULL;
676 char newargstr[NEWARGLIM];
677 666
678 if (arg == NULL) 667 if (!key)
679 { 668 key = str;
680 n = sizeof ("keysym.") - 1;
681 if (strncmp (str, "keysym.", n))
682 return 0;
683
684 str += n; /* skip `keysym.' */
685 if (!(pmodend = strchr (str, ':')))
686 return -1;
687 }
688 else 669 else
689 pmodend = str + strlen(str); 670 key++;
690 671
691 for (--pmodend; str < pmodend; --pmodend) 672 // string or key is empty
692 if (*pmodend == '-') 673 if (*arg == '\0' || *key == '\0')
693 break; 674 return -1;
694 675
676 // parse modifiers
695 while (str < pmodend) 677 while (str < key)
696 { 678 {
697 unsigned int i; 679 unsigned int i;
698 680
699 for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i) 681 for (i = 0; i < ecb_array_length (keysym_vocabulary); ++i)
700 { 682 {
701 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)
702 { 684 {
703 state |= keysym_vocabulary[i].value; 685 state |= keysym_vocabulary[i].value;
704 str += keysym_vocabulary[i].len; 686 str += keysym_vocabulary[i].len;
705 break; 687 break;
706 } 688 }
707 } 689 }
708 690
709 if (i >= sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t)) 691 if (i >= ecb_array_length (keysym_vocabulary))
710 return -1; 692 return -1;
711 693
712 if (*str == '-') 694 if (*str == '-')
713 ++str; 695 ++str;
714 } 696 }
715 697
716 /* some scanf () have trouble with a 0x prefix */ 698 // convert keysym name to keysym number
717 if (str[0] == '0' && toupper (str[1]) == 'X') 699 if ((sym = XStringToKeysym (str)) == None)
718 { 700 {
719 str += 2; 701 // fallback on hexadecimal parsing
720 702 char *end;
703 sym = strtol (str, &end, 16);
721 if (arg) 704 if (*end)
722 {
723 if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1)
724 return -1;
725 }
726 else
727 {
728 if (sscanf (str, "%x:", &sym) != 1)
729 return -1;
730
731 /* cue to ':', it's there since sscanf () worked */
732 strncpy (newargstr, strchr (str, ':') + 1, NEWARGLIM - 1);
733 newargstr[NEWARGLIM - 1] = '\0';
734 newarg = newargstr;
735 }
736 }
737 else
738 {
739 /*
740 * convert keysym name to keysym number
741 */
742 strncpy (newargstr, str, NEWARGLIM - 1);
743 newargstr[NEWARGLIM - 1] = '\0';
744
745 if (arg == NULL)
746 {
747 if ((newarg = strchr (newargstr, ':')) == NULL)
748 return -1;
749
750 *newarg++ = '\0'; /* terminate keysym name */
751 }
752
753 if ((sym = XStringToKeysym (newargstr)) == None)
754 return -1; 705 return -1;
755 } 706 }
756 707
757 if (newarg == NULL) 708 wchar_t *ws = rxvt_mbstowcs (arg);
758 { 709 if (!HOOK_INVOKE ((this, HOOK_REGISTER_COMMAND, DT_INT, sym, DT_INT, state, DT_WCS_LEN, ws, wcslen (ws), DT_END)))
759 strncpy (newargstr, arg, NEWARGLIM - 1);
760 newargstr[NEWARGLIM - 1] = '\0';
761 newarg = newargstr;
762 }
763
764 if (*newarg == '\0')
765 return -1;
766
767 keyboard->register_user_translation (sym, state, newarg); 710 keyboard->register_user_translation (sym, state, ws);
711 free (ws);
768 return 1; 712 return 1;
769} 713}
770 714
771# endif /* KEYSYM_RESOURCE */ 715# endif /* KEYSYM_RESOURCE */
772#endif /* NO_RESOURCES */ 716#endif /* NO_RESOURCES */
… …
815 XrmMergeDatabases (option_db, &database); 759 XrmMergeDatabases (option_db, &database);
816 option_db = NULL; 760 option_db = NULL;
817 /* 761 /*
818 * Query resources for options that affect us 762 * Query resources for options that affect us
819 */ 763 */
820 for (int entry = 0; entry < optList_size; entry++) 764 for (int entry = 0; entry < ecb_array_length (optList); entry++)
821 { 765 {
822 int s; 766 int s;
823 const char *kw = optList[entry].kw; 767 const char *kw = optList[entry].kw;
824 768
825 if (kw == NULL || rs[optList[entry].doff] != NULL) 769 if (kw == NULL || rs[optList[entry].doff] != NULL)
… …
845 789
846 set_option (optList[entry].index, s); 790 set_option (optList[entry].index, s);
847 } 791 }
848 } 792 }
849 } 793 }
794#endif /* NO_RESOURCES */
795}
850 796
797void
798rxvt_term::extract_keysym_resources ()
799{
800#ifndef NO_RESOURCES
851 /* 801 /*
852 * [R5 or later]: enumerate the resource database 802 * [R5 or later]: enumerate the resource database
853 */ 803 */
854# ifdef KEYSYM_RESOURCE 804# ifdef KEYSYM_RESOURCE
805 XrmDatabase database = XrmGetDatabase (dpy);
855 XrmName name_prefix[3]; 806 XrmName name_prefix[3];
856 XrmClass class_prefix[3]; 807 XrmClass class_prefix[3];
857 808
858 name_prefix[0] = XrmStringToName (rs[Rs_name]); 809 name_prefix[0] = XrmStringToName (rs[Rs_name]);
859 name_prefix[1] = XrmStringToName ("keysym"); 810 name_prefix[1] = XrmStringToName ("keysym");
… …
863 class_prefix[2] = NULLQUARK; 814 class_prefix[2] = NULLQUARK;
864 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 815 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
865 XrmEnumerateDatabase (database, name_prefix, class_prefix, 816 XrmEnumerateDatabase (database, name_prefix, class_prefix,
866 XrmEnumOneLevel, rxvt_define_key, NULL); 817 XrmEnumOneLevel, rxvt_define_key, NULL);
867# ifdef RESFALLBACK 818# ifdef RESFALLBACK
868 name_prefix[0] = XrmStringToName (RESFALLBACK);
869 name_prefix[1] = XrmStringToName ("keysym");
870 class_prefix[0] = XrmStringToName (RESFALLBACK); 819 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK);
871 class_prefix[1] = XrmStringToName ("Keysym");
872 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 820 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
873 XrmEnumerateDatabase (database, name_prefix, class_prefix, 821 XrmEnumerateDatabase (database, name_prefix, class_prefix,
874 XrmEnumOneLevel, rxvt_define_key, NULL); 822 XrmEnumOneLevel, rxvt_define_key, NULL);
875# endif 823# endif
876# endif 824# endif

Diff Legend

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