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.122 by ayin, Thu Nov 22 15:07:10 2007 UTC vs.
Revision 1.162 by sf-exg, Sat Feb 4 21:47:06 2012 UTC

… …
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 6 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
7 * - original version 7 * - original version
8 * Copyright (c) 1997,1998 mj olesen <olesen@me.queensu.ca> 8 * Copyright (c) 1997,1998 mj olesen <olesen@me.queensu.ca>
9 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 9 * Copyright (c) 2003-2006 Marc Lehmann <schmorp@schmorp.de>
10 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
10 * 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"),
… …
225 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), 235 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
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"),
240 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
241 STRG (Rs_letterSpace, "letterSpace", "letsp", "number", "letter spacing adjustment"),
242#endif
243#ifdef BUILTIN_GLYPHS
230 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"),
231 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
232#endif 245#endif
233#ifdef POINTER_BLANK 246#ifdef POINTER_BLANK
234 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 247 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
235#endif 248#endif
236#ifndef NO_BACKSPACE_KEY 249#ifndef NO_BACKSPACE_KEY
237 RSTRG (Rs_backspace_key, "backspacekey", "string"), 250 RSTRG (Rs_backspace_key, "backspacekey", "string"),
238#endif 251#endif
239#ifndef NO_DELETE_KEY 252#ifndef NO_DELETE_KEY
240 RSTRG (Rs_delete_key, "deletekey", "string"), 253 RSTRG (Rs_delete_key, "deletekey", "string"),
241#endif 254#endif
242 RSTRG (Rs_selectstyle, "selectstyle", "mode"),
243#ifdef PRINTPIPE 255#ifdef PRINTPIPE
244 RSTRG (Rs_print_pipe, "print-pipe", "string"), 256 RSTRG (Rs_print_pipe, "print-pipe", "string"),
245#endif 257#endif
246 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"),
247#ifdef CUTCHAR_RESOURCE
248 RSTRG (Rs_cutchars, "cutchars", "string"), 259 RSTRG (Rs_cutchars, "cutchars", "string"),
249#endif /* CUTCHAR_RESOURCE */
250 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 260 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
251#ifndef NO_SECONDARY_SCREEN 261#ifndef NO_SECONDARY_SCREEN
252 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"), 262 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"),
253 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"),
254#endif 264#endif
… …
257 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
258 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
259 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"),
260#endif 270#endif
261#if ISO_14755 271#if ISO_14755
272 BOOL (Rs_iso14755, "iso14755", NULL, Opt_iso14755, 0, NULL),
262 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),
263#endif 274#endif
264#ifdef HAVE_AFTERIMAGE
265 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
268#ifndef NO_RESOURCES 275#ifndef NO_RESOURCES
269 INFO ("xrm", "string", "X resource"), 276 RINFO ("xrm", "string"),
277#endif
278#ifdef KEYSYM_RESOURCE
279 RINFO ("keysym.sym", "keysym"),
270#endif 280#endif
271 INFO ("e", "command arg ...", "command to execute") 281 INFO ("e", "command arg ...", "command to execute")
272 }; 282 };
273 283
274#undef INFO 284#undef INFO
285#undef RINFO
275#undef STRG 286#undef STRG
276#undef RSTRG 287#undef RSTRG
277#undef SWCH 288#undef SWCH
278#undef BOOL 289#undef BOOL
279 290
… …
322#endif 333#endif
323#if defined(ENABLE_TRANSPARENCY) 334#if defined(ENABLE_TRANSPARENCY)
324 "transparent," 335 "transparent,"
325 "tint," 336 "tint,"
326#endif 337#endif
327#if HAVE_AFTERIMAGE 338#if HAVE_PIXBUF
328 "afterimage," 339 "pixbuf,"
329#endif 340#endif
330#if defined(USE_XIM) 341#if defined(USE_XIM)
331 "XIM," 342 "XIM,"
332#endif 343#endif
333#if defined(NO_BACKSPACE_KEY) 344#if defined(NO_BACKSPACE_KEY)
… …
361 "pointerBlank," 372 "pointerBlank,"
362#endif 373#endif
363#if defined(NO_RESOURCES) 374#if defined(NO_RESOURCES)
364 "NoResources," 375 "NoResources,"
365#endif 376#endif
366 "scrollbars=" 377 "scrollbars=plain"
367#if !defined(HAVE_SCROLLBARS)
368 "NONE"
369#else
370# if defined(PLAIN_SCROLLBAR)
371 "plain"
372# if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
373 "+"
374# endif
375# endif
376# if defined(RXVT_SCROLLBAR) 378#if defined(RXVT_SCROLLBAR)
377 "rxvt" 379 "+rxvt"
378# if defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
379 "+"
380# endif
381# endif 380#endif
382# if defined(NEXT_SCROLLBAR) 381#if defined(NEXT_SCROLLBAR)
383 "NeXT" 382 "+NeXT"
384# if defined(XTERM_SCROLLBAR)
385 "+"
386# endif
387# endif 383#endif
388# if defined(XTERM_SCROLLBAR) 384#if defined(XTERM_SCROLLBAR)
389 "xterm" 385 "+xterm"
390# endif
391#endif 386#endif
392 "\nUsage: "; /* Usage */ 387 "\nUsage: "; /* Usage */
393 388
394#define INDENT 18 389#define INDENT 18
395 390
… …
409 switch (type) 404 switch (type)
410 { 405 {
411 case 0: /* brief listing */ 406 case 0: /* brief listing */
412 rxvt_log (" [-help] [--help]\n"); 407 rxvt_log (" [-help] [--help]\n");
413 408
414 for (col = 1, i = 0; i < optList_size; i++) 409 for (col = 1, i = 0; i < ecb_array_length (optList); i++)
415 if (optList[i].desc != NULL) 410 if (optList[i].desc != NULL)
416 { 411 {
417 int len = 0; 412 int len = 0;
418 413
419 if (!optList_isBool (i)) 414 if (optList[i].arg)
420 { 415 len = strlen (optList[i].arg) + 1;
421 len = optList_strlen (i);
422 if (len > 0)
423 len++; /* account for space */
424 }
425#ifdef DEBUG_STRICT
426 assert (optList[i].opt != NULL); 416 assert (optList[i].opt != NULL);
427#endif
428 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); 417 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2 : 0);
429 col += len; 418 col += len;
430 if (col > 79) 419 if (col > 79)
420 {
431 { /* assume regular width */ 421 /* assume regular width */
432 rxvt_log ("\n"); 422 rxvt_log ("\n");
433 col = 1 + len; 423 col = 1 + len;
434 } 424 }
435 425
436 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); 426 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
437 if (optList_strlen (i)) 427 if (optList[i].arg)
438 rxvt_log (" %s]", optList[i].arg); 428 rxvt_log (" %s]", optList[i].arg);
439 else 429 else
440 rxvt_log ("]"); 430 rxvt_log ("]");
441 } 431 }
442 break; 432 break;
443 433
444 case 1: /* full command-line listing */ 434 case 1: /* full command-line listing */
445 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n"); 435 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
446 436
447 for (i = 0; i < optList_size; i++) 437 for (i = 0; i < ecb_array_length (optList); i++)
448 if (optList[i].desc != NULL) 438 if (optList[i].desc != NULL)
449 { 439 {
450#ifdef DEBUG_STRICT
451 assert (optList[i].opt != NULL); 440 assert (optList[i].opt != NULL);
452#endif
453 rxvt_log (" %s%s %-*s%s%s\n", 441 rxvt_log (" %s%s %-*s%s%s\n",
454 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, 442 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
455 (INDENT - strlen (optList[i].opt) 443 (INDENT - strlen (optList[i].opt)
456 + (optList_isBool (i) ? 0 : 2)), 444 + (optList_isBool (i) ? 0 : 2)),
457 (optList[i].arg ? optList[i].arg : ""), 445 (optList[i].arg ? optList[i].arg : ""),
… …
463 451
464 case 2: /* full resource listing */ 452 case 2: /* full resource listing */
465 rxvt_log (" [options] [-e command args]\n\n" 453 rxvt_log (" [options] [-e command args]\n\n"
466 "where resources (long-options) include:\n"); 454 "where resources (long-options) include:\n");
467 455
468 for (i = 0; i < optList_size; i++) 456 for (i = 0; i < ecb_array_length (optList); i++)
469 if (optList[i].kw != NULL) 457 if (optList[i].kw != NULL)
470 rxvt_log (" %s: %*s%s\n", 458 rxvt_log (" %s: %*s%s\n",
471 optList[i].kw, 459 optList[i].kw,
472 (INDENT - strlen (optList[i].kw)), "", /* XXX */ 460 (INDENT - strlen (optList[i].kw)), "", /* XXX */
473 (optList_isBool (i) ? "boolean" : optList[i].arg)); 461 (optList_isBool (i) ? "boolean" : optList[i].arg));
474#ifdef KEYSYM_RESOURCE
475 rxvt_log (" " "keysym.sym" ": %*s%s\n",
476 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */
477 "keysym");
478#endif
479 rxvt_log ("\n -help to list options"); 462 rxvt_log ("\n -help to list options");
480 break; 463 break;
481 } 464 }
482 465
483 rxvt_log ("\n\n"); 466 rxvt_log ("\n\n");
484 rxvt_exit_failure (); 467 rxvt_exit_failure ();
485 /* NOTREACHED */
486} 468}
487 469
488/*}}} */ 470/*}}} */
489 471
490/*{{{ get command-line options before getting resources */ 472/*{{{ get command-line options before getting resources */
491void 473const char **
492rxvt_term::get_options (int argc, const char *const *argv) 474rxvt_term::get_options (int argc, const char *const *argv)
493{ 475{
494 int i, bad_option = 0; 476 int i, bad_option = 0;
495 477
496 for (i = 1; i < argc; i++) 478 for (i = 1; i < argc; i++)
497 { 479 {
498 unsigned int entry, longopt = 0; 480 unsigned int entry, longopt = 0;
499 const char *flag, *opt; 481 const char *opt;
482 int flag;
500 483
501 opt = argv[i]; 484 opt = argv[i];
502 485
503 if (*opt == '-') 486 if (*opt == '-')
504 { 487 {
505 flag = resval_on; 488 flag = 1;
506 489
507 if (*++opt == '-') 490 if (*++opt == '-')
508 longopt = *opt++; /* long option */ 491 longopt = *opt++; /* long option */
509 } 492 }
510 else if (*opt == '+') 493 else if (*opt == '+')
511 { 494 {
512 flag = resval_off; 495 flag = 0;
513 496
514 if (*++opt == '+') 497 if (*++opt == '+')
515 longopt = *opt++; /* long option */ 498 longopt = *opt++; /* long option */
516 } 499 }
517 else 500 else
… …
526 509
527 if (!strcmp (opt, "h")) 510 if (!strcmp (opt, "h"))
528 rxvt_usage (0); 511 rxvt_usage (0);
529 512
530 /* feature: always try to match long-options */ 513 /* feature: always try to match long-options */
531 for (entry = 0; entry < optList_size; entry++) 514 for (entry = 0; entry < ecb_array_length (optList); entry++)
532 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw)) 515 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))
533 || (!longopt 516 || (!longopt
534 && optList[entry].opt && !strcmp (opt, optList[entry].opt))) 517 && optList[entry].opt && !strcmp (opt, optList[entry].opt)))
535 break; 518 break;
536 519
537 if (entry < optList_size) 520 if (entry < ecb_array_length (optList)
521 && !optList_isInfo (entry))
538 { 522 {
539 if (optList_isReverse (entry)) 523 if (optList_isReverse (entry))
540 flag = flag == resval_on ? resval_off : resval_on; 524 flag = !flag;
541 525
542 if (optList_strlen (entry)) 526 if (optList_isString (entry))
543 { 527 {
544 /* 528 /*
545 * special cases are handled in main.c:main () to allow 529 * special cases are handled in init_resources () to allow
546 * X resources to set these values before we settle for 530 * X resources to set these values before we settle for
547 * default values 531 * default values
548 */ 532 */
549 533
550 if (optList[entry].doff != -1) 534 if (optList[entry].doff != -1)
551 { 535 {
552 if (flag == resval_on && i+1 == argc) 536 if (flag && i+1 == argc)
553 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]); 537 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]);
554 538
555 rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef; 539 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef;
556 } 540 }
557 } 541 }
558 else 542 else
543 {
559 { /* boolean value */ 544 /* boolean value */
560 set_option (optList[entry].index, flag == resval_on); 545 set_option (optList[entry].index, flag);
561 546
562 if (optList[entry].doff != -1) 547 if (optList[entry].doff != -1)
563 rs[optList[entry].doff] = flag; 548 rs[optList[entry].doff] = flag ? resval_on : resval_off;
564 } 549 }
565 } 550 }
551#ifndef NO_RESOURCES
552 else if (!strcmp (opt, "xrm"))
553 {
554 if (i+1 < argc)
555 XrmPutLineResource (&option_db, argv[++i]);
556 }
557#endif
566#ifdef KEYSYM_RESOURCE 558#ifdef KEYSYM_RESOURCE
567 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) 559 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
568 { 560 {
569 if (i+1 < argc) 561 if (i+1 < argc)
570 { 562 {
571 char *res = (char *)malloc (strlen (opt) + strlen (argv[++i]) + 6); 563 char *res = rxvt_temp_buf<char> (strlen (opt) + strlen (argv[++i]) + 6);
572 sprintf (res, "*.%s: %s\n", opt, argv[i]); 564 sprintf (res, "*.%s: %s\n", opt, argv[i]);
573 XrmPutLineResource (&option_db, res); 565 XrmPutLineResource (&option_db, res);
574 free (res);
575 } 566 }
576 } 567 }
577#endif 568#endif
569 else if (!strcmp (opt, "e"))
570 {
571 if (i+1 == argc)
572 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
573
574 return (const char **)argv + i + 1;
575 }
578 else 576 else
579 { 577 {
580 bad_option = 1; 578 bad_option = 1;
581 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); 579 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
582 } 580 }
583 } 581 }
584 582
585 if (bad_option) 583 if (bad_option)
586 rxvt_usage (0); 584 rxvt_usage (0);
585
586 return 0;
587} 587}
588 588
589/*}}} */ 589/*}}} */
590 590
591#ifndef NO_RESOURCES 591#ifndef NO_RESOURCES
… …
596 * Define key from XrmEnumerateDatabase. 596 * Define key from XrmEnumerateDatabase.
597 * quarks will be something like 597 * quarks will be something like
598 * "rxvt" "keysym" "0xFF01" 598 * "rxvt" "keysym" "0xFF01"
599 * value will be a string 599 * value will be a string
600 */ 600 */
601/* ARGSUSED */ 601static int
602int
603rxvt_define_key (XrmDatabase *database UNUSED, 602rxvt_define_key (XrmDatabase *database ecb_unused,
604 XrmBindingList bindings UNUSED, 603 XrmBindingList bindings ecb_unused,
605 XrmQuarkList quarks, 604 XrmQuarkList quarks,
606 XrmRepresentation *type UNUSED, 605 XrmRepresentation *type ecb_unused,
607 XrmValue *value, 606 XrmValue *value,
608 XPointer closure UNUSED) 607 XPointer closure ecb_unused)
609{ 608{
610 int last; 609 int last;
611 610
612 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ 611 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
613 ; 612 ;
… …
618} 617}
619 618
620/* 619/*
621 * look for something like this (XK_Delete) 620 * look for something like this (XK_Delete)
622 * rxvt*keysym.0xFFFF: "\177" 621 * rxvt*keysym.0xFFFF: "\177"
623 *
624 * arg will be
625 * NULL for ~/.Xdefaults and
626 * non-NULL for command-line options (need to allocate)
627 */ 622 */
628#define NEWARGLIM 500 /* `reasonable' size */
629 623
630struct keysym_vocabulary_t 624struct keysym_vocabulary_t
631{ 625{
632 const char *name; 626 const char *name;
633 unsigned short len; 627 unsigned short len;
634 unsigned short value; 628 unsigned short value;
635}; 629};
636keysym_vocabulary_t keysym_vocabulary[] = 630static const keysym_vocabulary_t keysym_vocabulary[] =
637{ 631{
638 { "ISOLevel3", 9, Level3Mask }, 632 { "ISOLevel3", 9, Level3Mask },
639 { "AppKeypad", 9, AppKeypadMask }, 633 { "AppKeypad", 9, AppKeypadMask },
640 { "Control", 7, ControlMask }, 634 { "Control", 7, ControlMask },
641 { "NumLock", 7, NumLockMask }, 635 { "NumLock", 7, NumLockMask },
… …
663}; 657};
664 658
665int 659int
666rxvt_term::parse_keysym (const char *str, const char *arg) 660rxvt_term::parse_keysym (const char *str, const char *arg)
667{ 661{
668 int n, sym; 662 int sym;
669 unsigned int state = 0; 663 unsigned int state = 0;
670 const char *pmodend = NULL; 664 const char *key = strrchr (str, '-');
671 char *newarg = NULL;
672 char newargstr[NEWARGLIM];
673 665
674 if (arg == NULL) 666 if (!key)
675 { 667 key = str;
676 n = sizeof ("keysym.") - 1;
677 if (strncmp (str, "keysym.", n))
678 return 0;
679
680 str += n; /* skip `keysym.' */
681 if (!(pmodend = strchr (str, ':')))
682 return -1;
683 }
684 else 668 else
685 pmodend = str + strlen(str); 669 key++;
686 670
687 for (--pmodend; str < pmodend; --pmodend) 671 // string or key is empty
688 if (*pmodend == '-') 672 if (*arg == '\0' || *key == '\0')
689 break; 673 return -1;
690 674
675 // parse modifiers
691 while (str < pmodend) 676 while (str < key)
692 { 677 {
693 unsigned int i; 678 unsigned int i;
694 679
695 for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i) 680 for (i = 0; i < ecb_array_length (keysym_vocabulary); ++i)
696 { 681 {
697 if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0) 682 if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0)
698 { 683 {
699 state |= keysym_vocabulary[i].value; 684 state |= keysym_vocabulary[i].value;
700 str += keysym_vocabulary[i].len; 685 str += keysym_vocabulary[i].len;
701 break; 686 break;
702 } 687 }
703 } 688 }
704 689
705 if (i >= sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t)) 690 if (i >= ecb_array_length (keysym_vocabulary))
706 return -1; 691 return -1;
707 692
708 if (*str == '-') 693 if (*str == '-')
709 ++str; 694 ++str;
710 } 695 }
711 696
712 /* some scanf () have trouble with a 0x prefix */ 697 // convert keysym name to keysym number
713 if (str[0] == '0' && toupper (str[1]) == 'X') 698 if ((sym = XStringToKeysym (str)) == None)
714 { 699 {
715 str += 2; 700 // fallback on hexadecimal parsing
716 701 char *end;
702 sym = strtol (str, &end, 16);
717 if (arg) 703 if (*end)
718 {
719 if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1)
720 return -1;
721 }
722 else
723 {
724 if (sscanf (str, "%x:", &sym) != 1)
725 return -1;
726
727 /* cue to ':', it's there since sscanf () worked */
728 strncpy (newargstr, strchr (str, ':') + 1, NEWARGLIM - 1);
729 newargstr[NEWARGLIM - 1] = '\0';
730 newarg = newargstr;
731 }
732 }
733 else
734 {
735 /*
736 * convert keysym name to keysym number
737 */
738 strncpy (newargstr, str, NEWARGLIM - 1);
739 newargstr[NEWARGLIM - 1] = '\0';
740
741 if (arg == NULL)
742 {
743 if ((newarg = strchr (newargstr, ':')) == NULL)
744 return -1;
745
746 *newarg++ = '\0'; /* terminate keysym name */
747 }
748
749 if ((sym = XStringToKeysym (newargstr)) == None)
750 return -1; 704 return -1;
751 } 705 }
752 706
753 if (newarg == NULL) 707 wchar_t *ws = rxvt_mbstowcs (arg);
754 { 708 if (!HOOK_INVOKE ((this, HOOK_REGISTER_COMMAND, DT_INT, sym, DT_INT, state, DT_WCS_LEN, ws, wcslen (ws), DT_END)))
755 strncpy (newargstr, arg, NEWARGLIM - 1);
756 newargstr[NEWARGLIM - 1] = '\0';
757 newarg = newargstr;
758 }
759
760 if (*newarg == '\0')
761 return -1;
762
763 keyboard->register_user_translation (sym, state, newarg); 709 keyboard->register_user_translation (sym, state, ws);
710 free (ws);
764 return 1; 711 return 1;
765} 712}
766 713
767# endif /* KEYSYM_RESOURCE */ 714# endif /* KEYSYM_RESOURCE */
768#endif /* NO_RESOURCES */ 715#endif /* NO_RESOURCES */
… …
811 XrmMergeDatabases (option_db, &database); 758 XrmMergeDatabases (option_db, &database);
812 option_db = NULL; 759 option_db = NULL;
813 /* 760 /*
814 * Query resources for options that affect us 761 * Query resources for options that affect us
815 */ 762 */
816 for (int entry = 0; entry < optList_size; entry++) 763 for (int entry = 0; entry < ecb_array_length (optList); entry++)
817 { 764 {
818 int s; 765 int s;
819 const char *kw = optList[entry].kw; 766 const char *kw = optList[entry].kw;
820 767
821 if (kw == NULL || rs[optList[entry].doff] != NULL) 768 if (kw == NULL || rs[optList[entry].doff] != NULL)
… …
841 788
842 set_option (optList[entry].index, s); 789 set_option (optList[entry].index, s);
843 } 790 }
844 } 791 }
845 } 792 }
793#endif /* NO_RESOURCES */
794}
846 795
796void
797rxvt_term::extract_keysym_resources ()
798{
799#ifndef NO_RESOURCES
847 /* 800 /*
848 * [R5 or later]: enumerate the resource database 801 * [R5 or later]: enumerate the resource database
849 */ 802 */
850# ifdef KEYSYM_RESOURCE 803# ifdef KEYSYM_RESOURCE
804 XrmDatabase database = XrmGetDatabase (dpy);
851 XrmName name_prefix[3]; 805 XrmName name_prefix[3];
852 XrmClass class_prefix[3]; 806 XrmClass class_prefix[3];
853 807
854 name_prefix[0] = XrmStringToName (rs[Rs_name]); 808 name_prefix[0] = XrmStringToName (rs[Rs_name]);
855 name_prefix[1] = XrmStringToName ("keysym"); 809 name_prefix[1] = XrmStringToName ("keysym");
… …
859 class_prefix[2] = NULLQUARK; 813 class_prefix[2] = NULLQUARK;
860 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 814 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
861 XrmEnumerateDatabase (database, name_prefix, class_prefix, 815 XrmEnumerateDatabase (database, name_prefix, class_prefix,
862 XrmEnumOneLevel, rxvt_define_key, NULL); 816 XrmEnumOneLevel, rxvt_define_key, NULL);
863# ifdef RESFALLBACK 817# ifdef RESFALLBACK
864 name_prefix[0] = XrmStringToName (RESFALLBACK);
865 name_prefix[1] = XrmStringToName ("keysym");
866 class_prefix[0] = XrmStringToName (RESFALLBACK); 818 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK);
867 class_prefix[1] = XrmStringToName ("Keysym");
868 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 819 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
869 XrmEnumerateDatabase (database, name_prefix, class_prefix, 820 XrmEnumerateDatabase (database, name_prefix, class_prefix,
870 XrmEnumOneLevel, rxvt_define_key, NULL); 821 XrmEnumOneLevel, rxvt_define_key, NULL);
871# endif 822# endif
872# endif 823# endif

Diff Legend

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