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.136 by ayin, Sat Feb 16 15:56:41 2008 UTC vs.
Revision 1.175 by sf-exg, Fri May 2 20:34:24 2014 UTC

… …
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 6 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
7 * - original version 7 * - original version
8 * Copyright (c) 1997,1998 mj olesen <olesen@me.queensu.ca> 8 * Copyright (c) 1997,1998 mj olesen <olesen@me.queensu.ca>
9 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 9 * Copyright (c) 2003-2006 Marc Lehmann <schmorp@schmorp.de>
10 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it> 10 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
11 * 11 *
12 * This program is free software; you can redistribute it and/or modify 12 * This program is free software; you can redistribute it and/or modify
13 * it under the terms of the GNU General Public License as published by 13 * it under the terms of the GNU General Public License as published by
14 * the Free Software Foundation; either version 2 of the License, or 14 * the Free Software Foundation; either version 2 of the License, or
… …
34 34
35/* place holders used for parsing command-line options */ 35/* place holders used for parsing command-line options */
36#define Optflag_Reverse 1 36#define Optflag_Reverse 1
37#define Optflag_Boolean 2 37#define Optflag_Boolean 2
38#define Optflag_Switch 4 38#define Optflag_Switch 4
39#define Optflag_Info 8
39 40
40/* monolithic option/resource structure: */ 41/* monolithic option/resource structure: */
41/* 42/*
42 * `string' options MUST have a usage argument 43 * `string' options MUST have a usage argument
43 * `switch' and `boolean' options have no argument 44 * `switch' and `boolean' options have no argument
44 * if there's no desc (ription), it won't appear in rxvt_usage () 45 * if there's no desc (ription), it won't appear in rxvt_usage ()
45 */ 46 */
46 47
47/* INFO () - descriptive information only */ 48/* INFO () - descriptive information only */
48#define INFO(opt, arg, desc) \ 49#define INFO(opt, arg, desc) \
49 {0, 0, -1, NULL, (opt), (arg), (desc)} 50 {0, Optflag_Info, -1, NULL, (opt), (arg), (desc)}
51
52#define RINFO(kw, arg) \
53 {0, Optflag_Info, -1, (kw), NULL, (arg), NULL}
50 54
51/* STRG () - command-line option, with/without resource */ 55/* STRG () - command-line option, with/without resource */
52#define STRG(rsp, kw, opt, arg, desc) \ 56#define STRG(rsp, kw, opt, arg, desc) \
53 {0, 0, (rsp), (kw), (opt), (arg), (desc)} 57 {0, 0, (rsp), (kw), (opt), (arg), (desc)}
54 58
… …
69 (optList[i].flag == 0) 73 (optList[i].flag == 0)
70#define optList_isBool(i) \ 74#define optList_isBool(i) \
71 (optList[i].flag & Optflag_Boolean) 75 (optList[i].flag & Optflag_Boolean)
72#define optList_isReverse(i) \ 76#define optList_isReverse(i) \
73 (optList[i].flag & Optflag_Reverse) 77 (optList[i].flag & Optflag_Reverse)
74#define optList_size \ 78#define optList_isInfo(i) \
75 (sizeof (optList) / sizeof (optList[0])) 79 (optList[i].flag & Optflag_Info)
76 80
77static const struct 81static const struct
78 { 82 {
79 const uint8_t index; /* Option index */ 83 const uint8_t index; /* Option index */
80 const uint8_t flag; /* Option flag */ 84 const uint8_t flag; /* Option flag */
… …
91 STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */ 95 STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */
92 STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"), 96 STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"),
93 SWCH ("C", Opt_console, 0, "intercept console messages"), 97 SWCH ("C", Opt_console, 0, "intercept console messages"),
94 SWCH ("iconic", Opt_iconic, 0, "start iconic"), 98 SWCH ("iconic", Opt_iconic, 0, "start iconic"),
95 SWCH ("ic", Opt_iconic, 0, NULL), /* short form */ 99 SWCH ("ic", Opt_iconic, 0, NULL), /* short form */
100 STRG (Rs_chdir, "chdir", "cd", "string", "start shell in this directory"),
96 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"), 101 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"),
97 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"), 102 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"),
98 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"), 103 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"),
99 BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"), 104 BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"),
100 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, 0, "tab characters are pastable"), 105 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, 0, "tab characters are pastable"),
… …
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 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL), 112 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL),
108 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"),
109 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"), 114 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"),
110 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"), 115 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"),
111#if ENABLE_TRANSPARENCY 116#if BG_IMAGE_FROM_ROOT
112 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"), 117 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"),
113 BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"), 118 BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"),
114 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"), 119 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
115 STRG (Rs_shade, "shading", "sh", "number", "shade background by number %."), 120 STRG (Rs_shade, "shading", "sh", "number", "shade background by number %."),
121 STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "gaussian blur radii to apply to the root background"),
116#endif 122#endif
117#if OFF_FOCUS_FADING 123#if OFF_FOCUS_FADING
118 STRG (Rs_fade, "fading", "fade", "number", "fade colors by number % when losing focus"), 124 STRG (Rs_fade, "fading", "fade", "number", "fade colors by number % when losing focus"),
119 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"),
120#endif 126#endif
… …
176#ifdef RXVT_SCROLLBAR 182#ifdef RXVT_SCROLLBAR
177 RSTRG (Rs_color + Color_trough, "troughColor", "color"), 183 RSTRG (Rs_color + Color_trough, "troughColor", "color"),
178#endif 184#endif
179#ifdef OPTION_HC 185#ifdef OPTION_HC
180 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"),
181#endif 188#endif
182#ifndef NO_CURSORCOLOR 189#ifndef NO_CURSORCOLOR
183 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), 190 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
184 /* command-line option = resource name */ 191 /* command-line option = resource name */
185 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 192 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
186#endif /* NO_CURSORCOLOR */ 193#endif /* NO_CURSORCOLOR */
187 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), 194 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
188 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"),
189 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), 196 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
190#ifdef BG_IMAGE_FROM_FILE 197#if BG_IMAGE_FROM_FILE
191 RSTRG (Rs_path, "path", "search path"), 198 RSTRG (Rs_path, "path", "search path"),
192 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), 199 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
200#endif
201#if ENABLE_EWMH
202 STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"),
193#endif 203#endif
194 /* fonts: command-line option = resource name */ 204 /* fonts: command-line option = resource name */
195 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 205 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
196#if ENABLE_STYLES 206#if ENABLE_STYLES
197 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), 207 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
198 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"), 208 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"),
199 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"), 209 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"),
200 BOOL (Rs_intensityStyles, "intensityStyles", "is", Opt_intensityStyles, 0, "font styles imply intensity changes"), 210 BOOL (Rs_intensityStyles, "intensityStyles", "is", Opt_intensityStyles, 0, "font styles imply intensity changes"),
201#endif 211#endif
202#ifdef USE_XIM 212#if USE_XIM
203 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), 213 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
204 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"), 214 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"),
205 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"), 215 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"),
206 STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"), 216 STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"),
207#endif /* USE_XIM */ 217#endif /* USE_XIM */
… …
212 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"), 222 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),
213#if ENABLE_XEMBED 223#if ENABLE_XEMBED
214 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"),
215#endif 225#endif
216#if XFT 226#if XFT
227 BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL),
228#endif
229#if ENABLE_FRILLS
217 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"), 230 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
218 BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL), 231 STRG (Rs_visual, "visual", "visual", "number", "visual id to request"),
219#endif
220#if ENABLE_FRILLS
221 RSTRG (Rs_transient_for, "transient-for", "windowid"), 232 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"), 233 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"), 234 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"),
224 BOOL (Rs_hold, "hold", "hold", Opt_hold, 0, "retain window after shell exit"), 235 BOOL (Rs_hold, "hold", "hold", Opt_hold, 0, "retain window after shell exit"),
225 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), 236 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
226 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 237 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
227 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 238 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
228 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), 239 STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
229 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"), 240 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"),
230 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"), 241 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
242 STRG (Rs_letterSpace, "letterSpace", "letsp", "number", "letter spacing adjustment"),
231#endif 243#endif
232#ifdef BUILTIN_GLYPHS 244#ifdef BUILTIN_GLYPHS
233 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"), 245 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"),
234#endif 246#endif
235#ifdef POINTER_BLANK 247#ifdef POINTER_BLANK
… …
256 RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO 268 RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO
257 RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO 269 RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO
258 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"), 270 STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"),
259#endif 271#endif
260#if ISO_14755 272#if ISO_14755
273 BOOL (Rs_iso14755, "iso14755", NULL, Opt_iso14755, 0, NULL),
261 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL), 274 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL),
262#endif 275#endif
263#ifdef HAVE_AFTERIMAGE 276#ifndef NO_RESOURCES
264 STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."), 277 RINFO ("xrm", "string"),
265 STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "Gaussian Blur radii to apply to the root background"), 278#endif
279#ifdef KEYSYM_RESOURCE
280 RINFO ("keysym.sym", "keysym"),
266#endif 281#endif
267 INFO ("e", "command arg ...", "command to execute") 282 INFO ("e", "command arg ...", "command to execute")
268 }; 283 };
269 284
270#undef INFO 285#undef INFO
286#undef RINFO
271#undef STRG 287#undef STRG
272#undef RSTRG 288#undef RSTRG
273#undef SWCH 289#undef SWCH
274#undef BOOL 290#undef BOOL
275 291
… …
318#endif 334#endif
319#if defined(ENABLE_TRANSPARENCY) 335#if defined(ENABLE_TRANSPARENCY)
320 "transparent," 336 "transparent,"
321 "tint," 337 "tint,"
322#endif 338#endif
323#if HAVE_AFTERIMAGE 339#if HAVE_PIXBUF
324 "afterimage," 340 "pixbuf,"
325#endif 341#endif
326#if defined(USE_XIM) 342#if defined(USE_XIM)
327 "XIM," 343 "XIM,"
328#endif 344#endif
329#if defined(NO_BACKSPACE_KEY) 345#if defined(NO_BACKSPACE_KEY)
… …
369#if defined(XTERM_SCROLLBAR) 385#if defined(XTERM_SCROLLBAR)
370 "+xterm" 386 "+xterm"
371#endif 387#endif
372 "\nUsage: "; /* Usage */ 388 "\nUsage: "; /* Usage */
373 389
374#define INDENT 18 390#define INDENT 28
375 391
376const char rxvt_term::resval_undef [] = "<undef>"; 392const char rxvt_term::resval_undef [] = "<undef>";
377const char rxvt_term::resval_on [] = "on"; 393const char rxvt_term::resval_on [] = "on";
378const char rxvt_term::resval_off [] = "off"; 394const char rxvt_term::resval_off [] = "off";
379 395
380/*{{{ usage: */ 396/*{{{ usage: */
381/*----------------------------------------------------------------------*/ 397/*----------------------------------------------------------------------*/
382static void 398void
383rxvt_usage (int type) 399rxvt_term::rxvt_usage (int type)
384{ 400{
385 unsigned int i, col; 401 unsigned int i, col;
386 402
387 rxvt_log ("%s%s%s", releasestring, optionsstring, RESNAME); 403 rxvt_log ("%s%s%s", releasestring, optionsstring, RESNAME);
388 404
389 switch (type) 405 switch (type)
390 { 406 {
391 case 0: /* brief listing */ 407 case 0: /* brief listing */
392 rxvt_log (" [-help] [--help]\n"); 408 rxvt_log (" [-help] [--help]\n");
393 409
394 for (col = 1, i = 0; i < optList_size; i++) 410 for (col = 1, i = 0; i < ecb_array_length (optList); i++)
395 if (optList[i].desc != NULL) 411 if (optList[i].desc != NULL)
396 { 412 {
397 int len = 0; 413 int len = 0;
398 414
399 if (optList[i].arg) 415 if (optList[i].arg)
400 len = strlen (optList[i].arg) + 1; 416 len = strlen (optList[i].arg) + 1;
401#ifdef DEBUG_STRICT 417
402 assert (optList[i].opt != NULL); 418 assert (optList[i].opt != NULL);
403#endif
404 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); 419 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2 : 0);
405 col += len; 420 col += len;
421
406 if (col > 79) 422 if (col > 79)
407 { 423 {
408 /* assume regular width */ 424 /* assume regular width */
409 rxvt_log ("\n"); 425 rxvt_log ("\n");
410 col = 1 + len; 426 col = 1 + len;
411 } 427 }
412 428
413 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); 429 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
430
414 if (optList[i].arg) 431 if (optList[i].arg)
415 rxvt_log (" %s]", optList[i].arg); 432 rxvt_log (" %s]", optList[i].arg);
416 else 433 else
417 rxvt_log ("]"); 434 rxvt_log ("]");
418 } 435 }
419 break; 436 break;
420 437
421 case 1: /* full command-line listing */ 438 case 1: /* full command-line listing */
422 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n"); 439 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
423 440
424 for (i = 0; i < optList_size; i++) 441 for (i = 0; i < ecb_array_length (optList); i++)
425 if (optList[i].desc != NULL) 442 if (optList[i].desc != NULL)
426 { 443 {
427#ifdef DEBUG_STRICT
428 assert (optList[i].opt != NULL); 444 assert (optList[i].opt != NULL);
429#endif
430 rxvt_log (" %s%s %-*s%s%s\n", 445 rxvt_log (" %s%s %-*s%s%s\n",
431 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, 446 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
432 (INDENT - strlen (optList[i].opt) 447 (INDENT - strlen (optList[i].opt)
433 + (optList_isBool (i) ? 0 : 2)), 448 + (optList_isBool (i) ? 0 : 2)),
434 (optList[i].arg ? optList[i].arg : ""), 449 (optList[i].arg ? optList[i].arg : ""),
435 (optList_isBool (i) ? "turn on/off " : ""), 450 (optList_isBool (i) ? "turn on/off " : ""),
436 optList[i].desc); 451 optList[i].desc);
437 } 452 }
453
454#if ENABLE_PERL
455 rxvt_perl.init (this);
456 rxvt_perl.usage (this, 1);
457#endif
458
438 rxvt_log ("\n --help to list long-options"); 459 rxvt_log ("\n --help to list long-options");
439 break; 460 break;
440 461
441 case 2: /* full resource listing */ 462 case 2: /* full resource listing */
442 rxvt_log (" [options] [-e command args]\n\n" 463 rxvt_log (" [options] [-e command args]\n\n"
443 "where resources (long-options) include:\n"); 464 "where resources (long-options) include:\n");
444 465
445 for (i = 0; i < optList_size; i++) 466 for (i = 0; i < ecb_array_length (optList); i++)
446 if (optList[i].kw != NULL) 467 if (optList[i].kw != NULL)
447 rxvt_log (" %s: %*s%s\n", 468 rxvt_log (" %s: %*s%s\n",
448 optList[i].kw, 469 optList[i].kw,
449 (INDENT - strlen (optList[i].kw)), "", /* XXX */ 470 (INDENT + 2 - strlen (optList[i].kw)), "", /* XXX */
450 (optList_isBool (i) ? "boolean" : optList[i].arg)); 471 (optList_isBool (i) ? "boolean" : optList[i].arg));
451#ifdef KEYSYM_RESOURCE 472
452 rxvt_log (" " "keysym.sym" ": %*s%s\n", 473#if ENABLE_PERL
453 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */ 474 rxvt_perl.init (this);
454 "keysym"); 475 rxvt_perl.usage (this, 2);
455#endif 476#endif
477
456 rxvt_log ("\n -help to list options"); 478 rxvt_log ("\n -help to list options");
457 break; 479 break;
458 } 480 }
459 481
460 rxvt_log ("\n\n"); 482 rxvt_log ("\n\n");
461 rxvt_exit_failure (); 483 rxvt_exit_failure ();
462 /* NOTREACHED */
463} 484}
464 485
465/*}}} */ 486/*}}} */
466 487
467/*{{{ get command-line options before getting resources */ 488/*{{{ get command-line options before getting resources */
468void 489const char **
469rxvt_term::get_options (int argc, const char *const *argv) 490rxvt_term::get_options (int argc, const char *const *argv)
470{ 491{
471 int i, bad_option = 0; 492 int i, bad_option = 0;
472 493
473 for (i = 1; i < argc; i++) 494 for (i = 1; i < argc; i++)
… …
504 525
505 if (!strcmp (opt, "h")) 526 if (!strcmp (opt, "h"))
506 rxvt_usage (0); 527 rxvt_usage (0);
507 528
508 /* feature: always try to match long-options */ 529 /* feature: always try to match long-options */
509 for (entry = 0; entry < optList_size; entry++) 530 for (entry = 0; entry < ecb_array_length (optList); entry++)
510 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw)) 531 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))
511 || (!longopt 532 || (!longopt
512 && optList[entry].opt && !strcmp (opt, optList[entry].opt))) 533 && optList[entry].opt && !strcmp (opt, optList[entry].opt)))
513 break; 534 break;
514 535
515 if (entry < optList_size) 536 if (entry < ecb_array_length (optList)
537 && !optList_isInfo (entry))
516 { 538 {
517 if (optList_isReverse (entry)) 539 if (optList_isReverse (entry))
518 flag = !flag; 540 flag = !flag;
519 541
520 if (optList_isString (entry)) 542 if (optList_isString (entry))
521 { 543 {
522 /* 544 /*
523 * special cases are handled in main.c:main () to allow 545 * special cases are handled in init_resources () to allow
524 * X resources to set these values before we settle for 546 * X resources to set these values before we settle for
525 * default values 547 * default values
526 */ 548 */
527 549
528 if (optList[entry].doff != -1) 550 if (optList[entry].doff != -1)
529 { 551 {
530 if (flag && i+1 == argc) 552 if (flag && i + 1 == argc)
531 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]); 553 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]);
532 554
533 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef; 555 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef;
534 } 556 }
535 } 557 }
… …
543 } 565 }
544 } 566 }
545#ifndef NO_RESOURCES 567#ifndef NO_RESOURCES
546 else if (!strcmp (opt, "xrm")) 568 else if (!strcmp (opt, "xrm"))
547 { 569 {
548 if (i+1 < argc) 570 if (i + 1 < argc)
549 XrmPutLineResource (&option_db, argv[++i]); 571 XrmPutLineResource (&option_db, argv[++i]);
550 } 572 }
551#endif 573#endif
552#ifdef KEYSYM_RESOURCE 574#ifdef KEYSYM_RESOURCE
553 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) 575 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
554 { 576 {
555 if (i+1 < argc) 577 if (i + 1 < argc)
556 { 578 {
557 char *res = (char *)malloc (strlen (opt) + strlen (argv[++i]) + 6); 579 char *res = rxvt_temp_buf<char> (strlen (opt) + strlen (argv[++i]) + 6);
558 sprintf (res, "*.%s: %s\n", opt, argv[i]); 580 sprintf (res, "*.%s: %s\n", opt, argv[i]);
559 XrmPutLineResource (&option_db, res); 581 XrmPutLineResource (&option_db, res);
560 free (res);
561 } 582 }
562 } 583 }
563#endif 584#endif
585 else if (!strcmp (opt, "e"))
586 {
587 if (i + 1 < argc)
588 return (const char **)argv + i + 1;
589
590 rxvt_warn ("option '-e' requires an argument, aborting.\n");
591 bad_option = 1;
592 }
564 else 593 else
565 { 594 {
595#if ENABLE_PERL
596 rxvt_perl.init (this);
597
598 if (int flags = rxvt_perl.parse_resource (this, opt, true, longopt, flag, argv [i + 1]))
599 {
600 if (flags & rxvt_perl.RESOURCE_ARG)
601 {
602 if (i + 1 == argc)
603 {
604 rxvt_warn ("option '%s' requires an argument.\n", argv [i]);
566 bad_option = 1; 605 bad_option = 1;
606 }
607 else
608 ++i;
609 }
610 }
611 else
612#endif
613 {
567 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); 614 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
615 bad_option = 1;
616 }
568 } 617 }
569 } 618 }
570 619
571 if (bad_option) 620 if (bad_option)
572 rxvt_usage (0); 621 rxvt_usage (0);
622
623 return 0;
573} 624}
574 625
575/*}}} */ 626/*}}} */
576 627
577#ifndef NO_RESOURCES 628#ifndef NO_RESOURCES
… …
582 * Define key from XrmEnumerateDatabase. 633 * Define key from XrmEnumerateDatabase.
583 * quarks will be something like 634 * quarks will be something like
584 * "rxvt" "keysym" "0xFF01" 635 * "rxvt" "keysym" "0xFF01"
585 * value will be a string 636 * value will be a string
586 */ 637 */
587/* ARGSUSED */ 638static int
588int
589rxvt_define_key (XrmDatabase *database UNUSED, 639rxvt_define_key (XrmDatabase *database ecb_unused,
590 XrmBindingList bindings UNUSED, 640 XrmBindingList bindings ecb_unused,
591 XrmQuarkList quarks, 641 XrmQuarkList quarks,
592 XrmRepresentation *type UNUSED, 642 XrmRepresentation *type ecb_unused,
593 XrmValue *value, 643 XrmValue *value,
594 XPointer closure UNUSED) 644 XPointer closure)
595{ 645{
646 rxvt_term *term = (rxvt_term *)closure;
596 int last; 647 int last;
597 648
598 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ 649 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
599 ; 650 ;
600 651
601 last--; 652 last--;
602 GET_R->parse_keysym (XrmQuarkToString (quarks[last]), (char *)value->addr);//D//TODO 653 term->bind_action (XrmQuarkToString (quarks[last]), (char *)value->addr);
603 return False; 654 return False;
604} 655}
605 656
606/* 657/*
607 * look for something like this (XK_Delete) 658 * look for something like this (XK_Delete)
… …
642 { "4", 1, Mod4Mask }, 693 { "4", 1, Mod4Mask },
643 { "5", 1, Mod5Mask }, 694 { "5", 1, Mod5Mask },
644}; 695};
645 696
646int 697int
647rxvt_term::parse_keysym (const char *str, const char *arg) 698rxvt_term::bind_action (const char *str, const char *arg)
648{ 699{
649 int sym; 700 int sym;
650 unsigned int state = 0; 701 unsigned int state = 0;
651 const char *key = strrchr (str, '-'); 702 const char *key = strrchr (str, '-');
652 703
… …
662 // parse modifiers 713 // parse modifiers
663 while (str < key) 714 while (str < key)
664 { 715 {
665 unsigned int i; 716 unsigned int i;
666 717
667 for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i) 718 for (i = 0; i < ecb_array_length (keysym_vocabulary); ++i)
668 { 719 {
669 if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0) 720 if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0)
670 { 721 {
671 state |= keysym_vocabulary[i].value; 722 state |= keysym_vocabulary[i].value;
672 str += keysym_vocabulary[i].len; 723 str += keysym_vocabulary[i].len;
673 break; 724 break;
674 } 725 }
675 } 726 }
676 727
677 if (i >= sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t)) 728 if (i >= ecb_array_length (keysym_vocabulary))
678 return -1; 729 return -1;
679 730
680 if (*str == '-') 731 if (*str == '-')
681 ++str; 732 ++str;
682 } 733 }
… …
687 // fallback on hexadecimal parsing 738 // fallback on hexadecimal parsing
688 char *end; 739 char *end;
689 sym = strtol (str, &end, 16); 740 sym = strtol (str, &end, 16);
690 if (*end) 741 if (*end)
691 return -1; 742 return -1;
692 } 743 }
693 744
745 wchar_t *ws = rxvt_mbstowcs (arg);
746 if (!HOOK_INVOKE ((this, HOOK_REGISTER_COMMAND, DT_INT, sym, DT_INT, state, DT_WCS_LEN, ws, wcslen (ws), DT_END)))
694 keyboard->register_user_translation (sym, state, arg); 747 keyboard->register_user_translation (sym, state, ws);
748
749 free (ws);
695 return 1; 750 return 1;
696} 751}
697 752
698# endif /* KEYSYM_RESOURCE */ 753# endif /* KEYSYM_RESOURCE */
699#endif /* NO_RESOURCES */ 754#endif /* NO_RESOURCES */
… …
742 XrmMergeDatabases (option_db, &database); 797 XrmMergeDatabases (option_db, &database);
743 option_db = NULL; 798 option_db = NULL;
744 /* 799 /*
745 * Query resources for options that affect us 800 * Query resources for options that affect us
746 */ 801 */
747 for (int entry = 0; entry < optList_size; entry++) 802 for (int entry = 0; entry < ecb_array_length (optList); entry++)
748 { 803 {
749 int s; 804 int s;
750 const char *kw = optList[entry].kw; 805 const char *kw = optList[entry].kw;
751 806
752 if (kw == NULL || rs[optList[entry].doff] != NULL) 807 if (kw == NULL || rs[optList[entry].doff] != NULL)
… …
772 827
773 set_option (optList[entry].index, s); 828 set_option (optList[entry].index, s);
774 } 829 }
775 } 830 }
776 } 831 }
832#endif /* NO_RESOURCES */
833}
777 834
835void
836rxvt_term::extract_keysym_resources ()
837{
838#ifndef NO_RESOURCES
778 /* 839 /*
779 * [R5 or later]: enumerate the resource database 840 * [R5 or later]: enumerate the resource database
780 */ 841 */
781# ifdef KEYSYM_RESOURCE 842# ifdef KEYSYM_RESOURCE
843 XrmDatabase database = XrmGetDatabase (dpy);
782 XrmName name_prefix[3]; 844 XrmName name_prefix[3];
783 XrmClass class_prefix[3]; 845 XrmClass class_prefix[3];
784 846
785 name_prefix[0] = XrmStringToName (rs[Rs_name]); 847 name_prefix[0] = XrmStringToName (rs[Rs_name]);
786 name_prefix[1] = XrmStringToName ("keysym"); 848 name_prefix[1] = XrmStringToName ("keysym");
… …
788 class_prefix[0] = XrmStringToName (RESCLASS); 850 class_prefix[0] = XrmStringToName (RESCLASS);
789 class_prefix[1] = XrmStringToName ("Keysym"); 851 class_prefix[1] = XrmStringToName ("Keysym");
790 class_prefix[2] = NULLQUARK; 852 class_prefix[2] = NULLQUARK;
791 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 853 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
792 XrmEnumerateDatabase (database, name_prefix, class_prefix, 854 XrmEnumerateDatabase (database, name_prefix, class_prefix,
793 XrmEnumOneLevel, rxvt_define_key, NULL); 855 XrmEnumOneLevel, rxvt_define_key, (XPointer)this);
794# ifdef RESFALLBACK 856# ifdef RESFALLBACK
795 name_prefix[0] = XrmStringToName (RESFALLBACK);
796 name_prefix[1] = XrmStringToName ("keysym");
797 class_prefix[0] = XrmStringToName (RESFALLBACK); 857 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK);
798 class_prefix[1] = XrmStringToName ("Keysym");
799 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 858 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
800 XrmEnumerateDatabase (database, name_prefix, class_prefix, 859 XrmEnumerateDatabase (database, name_prefix, class_prefix,
801 XrmEnumOneLevel, rxvt_define_key, NULL); 860 XrmEnumOneLevel, rxvt_define_key, (XPointer)this);
802# endif 861# endif
803# endif 862# endif
804 863
805#endif /* NO_RESOURCES */ 864#endif /* NO_RESOURCES */
806} 865}

Diff Legend

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