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.144 by sf-exg, Sun Jan 31 09:02:48 2010 UTC vs.
Revision 1.184 by sf-exg, Mon Oct 13 17:05:32 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 3 of the License, or
15 * (at your option) any later version. 15 * (at your option) any later version.
16 * 16 *
17 * This program is distributed in the hope that it will be useful, 17 * This program is distributed in the hope that it will be useful,
18 * but WITHOUT ANY WARRANTY; without even the implied warranty of 18 * but WITHOUT ANY WARRANTY; without even the implied warranty of
19 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 19 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
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 */
… …
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 */
96 STRG (Rs_chdir, "chdir", "cd", "string", "start shell in this directory"), 100 STRG (Rs_chdir, "chdir", "cd", "string", "start shell in this directory"),
101 SWCH ("dockapp", Opt_dockapp, 0, "start as dockapp"),
97 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"), 102 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"),
98 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"), 103 BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"),
104 STRG (Rs_multiClickTime, "multiClickTime", "mc", "number", "maximum time (in ms) between multi-click selections"),
99 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"), 105 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"),
100 BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"), 106 BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"),
101 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, 0, "tab characters are pastable"), 107 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, 0, "tab characters are pastable"),
102 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"), 108 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"),
103 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"), 109 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"),
… …
107 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"), 113 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"),
108 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL), 114 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL),
109 BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_scrollTtyOutput, Optflag_Reverse, "scroll-on-tty-output inhibit"), 115 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"), 116 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"),
111 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"), 117 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"),
112#if ENABLE_TRANSPARENCY 118#if BG_IMAGE_FROM_ROOT
113 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"), 119 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"),
114 BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"), 120 BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"),
115 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"), 121 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
116 STRG (Rs_shade, "shading", "sh", "number", "shade background by number %."), 122 STRG (Rs_shade, "shading", "sh", "number", "shade background by number %."),
123 STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "gaussian blur radii to apply to the root background"),
117#endif 124#endif
118#if OFF_FOCUS_FADING 125#if OFF_FOCUS_FADING
119 STRG (Rs_fade, "fading", "fade", "number", "fade colors by number % when losing focus"), 126 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"), 127 STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"),
121#endif 128#endif
… …
177#ifdef RXVT_SCROLLBAR 184#ifdef RXVT_SCROLLBAR
178 RSTRG (Rs_color + Color_trough, "troughColor", "color"), 185 RSTRG (Rs_color + Color_trough, "troughColor", "color"),
179#endif 186#endif
180#ifdef OPTION_HC 187#ifdef OPTION_HC
181 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"), 188 STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"),
189 RSTRG (Rs_color + Color_HTC, "highlightTextColor", "color"),
182#endif 190#endif
183#ifndef NO_CURSORCOLOR 191#ifndef NO_CURSORCOLOR
184 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), 192 STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
185 /* command-line option = resource name */ 193 /* command-line option = resource name */
186 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 194 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
187#endif /* NO_CURSORCOLOR */ 195#endif /* NO_CURSORCOLOR */
188 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), 196 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
189 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"), 197 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
190 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), 198 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
191#ifdef BG_IMAGE_FROM_FILE 199#if BG_IMAGE_FROM_FILE
192 RSTRG (Rs_path, "path", "search path"), 200 RSTRG (Rs_path, "path", "search path"),
193 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), 201 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
202#endif
203#if ENABLE_EWMH
204 STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"),
194#endif 205#endif
195 /* fonts: command-line option = resource name */ 206 /* fonts: command-line option = resource name */
196 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 207 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
197#if ENABLE_STYLES 208#if ENABLE_STYLES
198 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), 209 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
199 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"), 210 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"),
200 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"), 211 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"),
201 BOOL (Rs_intensityStyles, "intensityStyles", "is", Opt_intensityStyles, 0, "font styles imply intensity changes"), 212 BOOL (Rs_intensityStyles, "intensityStyles", "is", Opt_intensityStyles, 0, "font styles imply intensity changes"),
202#endif 213#endif
203#ifdef USE_XIM 214#if USE_XIM
204 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), 215 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
205 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"), 216 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"),
206 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"), 217 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"),
207 STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"), 218 STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"),
208#endif /* USE_XIM */ 219#endif /* USE_XIM */
… …
213 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"), 224 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),
214#if ENABLE_XEMBED 225#if ENABLE_XEMBED
215 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"), 226 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"),
216#endif 227#endif
217#if XFT 228#if XFT
229 BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL),
230#endif
231#if ENABLE_FRILLS
218 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"), 232 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
219 BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL), 233 STRG (Rs_visual, "visual", "visual", "number", "visual id to request"),
220#endif
221#if ENABLE_FRILLS
222 RSTRG (Rs_transient_for, "transient-for", "windowid"), 234 RSTRG (Rs_transient_for, "transient-for", "windowid"),
223 BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, 0, "set override-redirect on the terminal window"), 235 BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, 0, "set override-redirect on the terminal window"),
224 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"), 236 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"),
225 BOOL (Rs_hold, "hold", "hold", Opt_hold, 0, "retain window after shell exit"), 237 BOOL (Rs_hold, "hold", "hold", Opt_hold, 0, "retain window after shell exit"),
226 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), 238 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
… …
261#endif 273#endif
262#if ISO_14755 274#if ISO_14755
263 BOOL (Rs_iso14755, "iso14755", NULL, Opt_iso14755, 0, NULL), 275 BOOL (Rs_iso14755, "iso14755", NULL, Opt_iso14755, 0, NULL),
264 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL), 276 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL),
265#endif 277#endif
266#ifdef HAVE_AFTERIMAGE 278#ifndef NO_RESOURCES
267 STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."), 279 RINFO ("xrm", "string"),
268 STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "gaussian blur radii to apply to the root background"),
269# if ENABLE_EWMH
270 STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"),
271# endif 280#endif
281#ifdef KEYSYM_RESOURCE
282 RINFO ("keysym.sym", "keysym"),
272#endif 283#endif
273 INFO ("e", "command arg ...", "command to execute") 284 INFO ("e", "command arg ...", "command to execute")
274 }; 285 };
275 286
276#undef INFO 287#undef INFO
288#undef RINFO
277#undef STRG 289#undef STRG
278#undef RSTRG 290#undef RSTRG
279#undef SWCH 291#undef SWCH
280#undef BOOL 292#undef BOOL
281 293
… …
324#endif 336#endif
325#if defined(ENABLE_TRANSPARENCY) 337#if defined(ENABLE_TRANSPARENCY)
326 "transparent," 338 "transparent,"
327 "tint," 339 "tint,"
328#endif 340#endif
329#if HAVE_AFTERIMAGE 341#if HAVE_PIXBUF
330 "afterimage," 342 "pixbuf,"
331#endif 343#endif
332#if defined(USE_XIM) 344#if defined(USE_XIM)
333 "XIM," 345 "XIM,"
334#endif 346#endif
335#if defined(NO_BACKSPACE_KEY) 347#if defined(NO_BACKSPACE_KEY)
… …
375#if defined(XTERM_SCROLLBAR) 387#if defined(XTERM_SCROLLBAR)
376 "+xterm" 388 "+xterm"
377#endif 389#endif
378 "\nUsage: "; /* Usage */ 390 "\nUsage: "; /* Usage */
379 391
380#define INDENT 18 392#define INDENT 28
381 393
382const char rxvt_term::resval_undef [] = "<undef>"; 394const char rxvt_term::resval_undef [] = "<undef>";
383const char rxvt_term::resval_on [] = "on"; 395const char rxvt_term::resval_on [] = "on";
384const char rxvt_term::resval_off [] = "off"; 396const char rxvt_term::resval_off [] = "off";
385 397
386/*{{{ usage: */ 398/*{{{ usage: */
387/*----------------------------------------------------------------------*/ 399/*----------------------------------------------------------------------*/
388static void 400void
389rxvt_usage (int type) 401rxvt_term::rxvt_usage (int type)
390{ 402{
391 unsigned int i, col; 403 unsigned int i, col;
392 404
393 rxvt_log ("%s%s%s", releasestring, optionsstring, RESNAME); 405 rxvt_log ("%s%s%s", releasestring, optionsstring, RESNAME);
394 406
395 switch (type) 407 switch (type)
396 { 408 {
397 case 0: /* brief listing */ 409 case 0: /* brief listing */
398 rxvt_log (" [-help] [--help]\n"); 410 rxvt_log (" [-help] [--help]\n");
399 411
400 for (col = 1, i = 0; i < optList_size; i++) 412 for (col = 1, i = 0; i < ecb_array_length (optList); i++)
401 if (optList[i].desc != NULL) 413 if (optList[i].desc != NULL)
402 { 414 {
403 int len = 0; 415 int len = 0;
404 416
405 if (optList[i].arg) 417 if (optList[i].arg)
406 len = strlen (optList[i].arg) + 1; 418 len = strlen (optList[i].arg) + 1;
419
407 assert (optList[i].opt != NULL); 420 assert (optList[i].opt != NULL);
408 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); 421 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2 : 0);
409 col += len; 422 col += len;
423
410 if (col > 79) 424 if (col > 79)
411 { 425 {
412 /* assume regular width */ 426 /* assume regular width */
413 rxvt_log ("\n"); 427 rxvt_log ("\n");
414 col = 1 + len; 428 col = 1 + len;
415 } 429 }
416 430
417 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); 431 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
432
418 if (optList[i].arg) 433 if (optList[i].arg)
419 rxvt_log (" %s]", optList[i].arg); 434 rxvt_log (" %s]", optList[i].arg);
420 else 435 else
421 rxvt_log ("]"); 436 rxvt_log ("]");
422 } 437 }
423 break; 438 break;
424 439
425 case 1: /* full command-line listing */ 440 case 1: /* full command-line listing */
426 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n"); 441 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
427 442
428 for (i = 0; i < optList_size; i++) 443 for (i = 0; i < ecb_array_length (optList); i++)
429 if (optList[i].desc != NULL) 444 if (optList[i].desc != NULL)
430 { 445 {
431 assert (optList[i].opt != NULL); 446 assert (optList[i].opt != NULL);
432 rxvt_log (" %s%s %-*s%s%s\n", 447 rxvt_log (" %s%s %-*s%s%s\n",
433 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, 448 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
… …
435 + (optList_isBool (i) ? 0 : 2)), 450 + (optList_isBool (i) ? 0 : 2)),
436 (optList[i].arg ? optList[i].arg : ""), 451 (optList[i].arg ? optList[i].arg : ""),
437 (optList_isBool (i) ? "turn on/off " : ""), 452 (optList_isBool (i) ? "turn on/off " : ""),
438 optList[i].desc); 453 optList[i].desc);
439 } 454 }
455
456#if ENABLE_PERL
457 rxvt_perl.init (this);
458 rxvt_perl.usage (this, 1);
459#endif
460
440 rxvt_log ("\n --help to list long-options"); 461 rxvt_log ("\n --help to list long-options");
441 break; 462 break;
442 463
443 case 2: /* full resource listing */ 464 case 2: /* full resource listing */
444 rxvt_log (" [options] [-e command args]\n\n" 465 rxvt_log (" [options] [-e command args]\n\n"
445 "where resources (long-options) include:\n"); 466 "where resources (long-options) include:\n");
446 467
447 for (i = 0; i < optList_size; i++) 468 for (i = 0; i < ecb_array_length (optList); i++)
448 if (optList[i].kw != NULL) 469 if (optList[i].kw != NULL)
449 rxvt_log (" %s: %*s%s\n", 470 rxvt_log (" %s: %*s%s\n",
450 optList[i].kw, 471 optList[i].kw,
451 (INDENT - strlen (optList[i].kw)), "", /* XXX */ 472 (INDENT + 2 - strlen (optList[i].kw)), "", /* XXX */
452 (optList_isBool (i) ? "boolean" : optList[i].arg)); 473 (optList_isBool (i) ? "boolean" : optList[i].arg));
453#ifdef KEYSYM_RESOURCE 474
454 rxvt_log (" " "keysym.sym" ": %*s%s\n", 475#if ENABLE_PERL
455 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */ 476 rxvt_perl.init (this);
456 "keysym"); 477 rxvt_perl.usage (this, 2);
457#endif 478#endif
479
458 rxvt_log ("\n -help to list options"); 480 rxvt_log ("\n -help to list options");
459 break; 481 break;
460 } 482 }
461 483
462 rxvt_log ("\n\n"); 484 rxvt_log ("\n\n");
463 rxvt_exit_failure (); 485 rxvt_exit_failure ();
464 /* NOTREACHED */
465} 486}
466 487
467/*}}} */ 488/*}}} */
468 489
469/*{{{ get command-line options before getting resources */ 490/*{{{ get command-line options before getting resources */
470void 491const char **
471rxvt_term::get_options (int argc, const char *const *argv) 492rxvt_term::get_options (int argc, const char *const *argv)
472{ 493{
473 int i, bad_option = 0; 494 int i, bad_option = 0;
474 495
475 for (i = 1; i < argc; i++) 496 for (i = 1; i < argc; i++)
… …
506 527
507 if (!strcmp (opt, "h")) 528 if (!strcmp (opt, "h"))
508 rxvt_usage (0); 529 rxvt_usage (0);
509 530
510 /* feature: always try to match long-options */ 531 /* feature: always try to match long-options */
511 for (entry = 0; entry < optList_size; entry++) 532 for (entry = 0; entry < ecb_array_length (optList); entry++)
512 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw)) 533 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))
513 || (!longopt 534 || (!longopt
514 && optList[entry].opt && !strcmp (opt, optList[entry].opt))) 535 && optList[entry].opt && !strcmp (opt, optList[entry].opt)))
515 break; 536 break;
516 537
517 if (entry < optList_size) 538 if (entry < ecb_array_length (optList)
539 && !optList_isInfo (entry))
518 { 540 {
519 if (optList_isReverse (entry)) 541 if (optList_isReverse (entry))
520 flag = !flag; 542 flag = !flag;
521 543
522 if (optList_isString (entry)) 544 if (optList_isString (entry))
523 { 545 {
524 /* 546 /*
525 * special cases are handled in main.c:main () to allow 547 * special cases are handled in init_resources () to allow
526 * X resources to set these values before we settle for 548 * X resources to set these values before we settle for
527 * default values 549 * default values
528 */ 550 */
529 551
530 if (optList[entry].doff != -1) 552 if (optList[entry].doff != -1)
531 { 553 {
532 if (flag && i+1 == argc) 554 if (flag && i + 1 == argc)
533 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]); 555 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]);
534 556
535 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef; 557 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef;
536 } 558 }
537 } 559 }
… …
545 } 567 }
546 } 568 }
547#ifndef NO_RESOURCES 569#ifndef NO_RESOURCES
548 else if (!strcmp (opt, "xrm")) 570 else if (!strcmp (opt, "xrm"))
549 { 571 {
550 if (i+1 < argc) 572 if (i + 1 < argc)
551 XrmPutLineResource (&option_db, argv[++i]); 573 XrmPutLineResource (&option_db, argv[++i]);
552 } 574 }
553#endif 575#endif
554#ifdef KEYSYM_RESOURCE 576#ifdef KEYSYM_RESOURCE
555 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) 577 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
556 { 578 {
557 if (i+1 < argc) 579 if (i + 1 < argc)
558 { 580 {
559 char *res = rxvt_temp_buf<char> (strlen (opt) + strlen (argv[++i]) + 6); 581 char *res = rxvt_temp_buf<char> (strlen (opt) + strlen (argv[++i]) + 6);
560 sprintf (res, "*.%s: %s\n", opt, argv[i]); 582 sprintf (res, "*.%s: %s\n", opt, argv[i]);
561 XrmPutLineResource (&option_db, res); 583 XrmPutLineResource (&option_db, res);
562 } 584 }
563 } 585 }
564#endif 586#endif
587 else if (!strcmp (opt, "e"))
588 {
589 if (i + 1 < argc)
590 return (const char **)argv + i + 1;
591
592 rxvt_warn ("option '-e' requires an argument, aborting.\n");
593 bad_option = 1;
594 }
565 else 595 else
566 { 596 {
597#if ENABLE_PERL
598 rxvt_perl.init (this);
599
600 if (int flags = rxvt_perl.parse_resource (this, opt, true, longopt, flag, argv [i + 1]))
601 {
602 if (flags & rxvt_perl.RESOURCE_ARG)
603 {
604 if (i + 1 == argc)
605 {
606 rxvt_warn ("option '%s' requires an argument.\n", argv [i]);
567 bad_option = 1; 607 bad_option = 1;
608 }
609 else
610 ++i;
611 }
612 }
613 else
614#endif
615 {
568 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); 616 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
617 bad_option = 1;
618 }
569 } 619 }
570 } 620 }
571 621
572 if (bad_option) 622 if (bad_option)
573 rxvt_usage (0); 623 rxvt_usage (0);
624
625 return 0;
574} 626}
575 627
576/*}}} */ 628/*}}} */
577 629
578#ifndef NO_RESOURCES 630#ifndef NO_RESOURCES
579/*----------------------------------------------------------------------*/ 631/*----------------------------------------------------------------------*/
580 632
581# ifdef KEYSYM_RESOURCE 633# ifdef KEYSYM_RESOURCE
634static void
635rxvt_define_key (rxvt_term *term, const char *k, const char *v)
636{
637 term->bind_action (k, v);
638}
639
582/* 640/*
583 * Define key from XrmEnumerateDatabase. 641 * Define key from XrmEnumerateDatabase.
584 * quarks will be something like 642 * quarks will be something like
585 * "rxvt" "keysym" "0xFF01" 643 * "rxvt" "keysym" "0xFF01"
586 * value will be a string 644 * value will be a string
587 */ 645 */
588/* ARGSUSED */ 646static int
589int 647rxvt_keysym_enumerate_helper (
590rxvt_define_key (XrmDatabase *database UNUSED, 648 XrmDatabase *database ecb_unused,
591 XrmBindingList bindings UNUSED, 649 XrmBindingList bindings ecb_unused,
592 XrmQuarkList quarks, 650 XrmQuarkList quarks,
593 XrmRepresentation *type UNUSED, 651 XrmRepresentation *type ecb_unused,
594 XrmValue *value, 652 XrmValue *value,
595 XPointer closure UNUSED) 653 XPointer closure
654)
596{ 655{
597 int last; 656 int last;
598 657
599 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ 658 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
600 ; 659 ;
601 660
602 last--; 661 rxvt_term *term = (rxvt_term *)(((void **)closure)[0]);
603 GET_R->parse_keysym (XrmQuarkToString (quarks[last]), (char *)value->addr);//D//TODO 662 void (*cb)(rxvt_term *, const char *, const char *)
663 = (void (*)(rxvt_term *, const char *, const char *))
664 (((void **)closure)[1]);
665
666 cb (term, XrmQuarkToString (quarks[last - 1]), (char *)value->addr);
667
604 return False; 668 return False;
605} 669}
606 670
607/* 671/*
608 * look for something like this (XK_Delete) 672 * look for something like this (XK_Delete)
… …
643 { "4", 1, Mod4Mask }, 707 { "4", 1, Mod4Mask },
644 { "5", 1, Mod5Mask }, 708 { "5", 1, Mod5Mask },
645}; 709};
646 710
647int 711int
648rxvt_term::parse_keysym (const char *str, const char *arg) 712rxvt_term::parse_keysym (const char *str, unsigned int &state)
649{ 713{
650 int sym; 714 int sym;
651 unsigned int state = 0;
652 const char *key = strrchr (str, '-'); 715 const char *key = strrchr (str, '-');
716
717 state = 0;
653 718
654 if (!key) 719 if (!key)
655 key = str; 720 key = str;
656 else 721 else
657 key++; 722 key++;
658 723
659 // string or key is empty 724 // string or key is empty
660 if (*arg == '\0' || *key == '\0') 725 if (*key == '\0')
661 return -1; 726 return -1;
662 727
663 // parse modifiers 728 // parse modifiers
664 while (str < key) 729 while (str < key)
665 { 730 {
666 unsigned int i; 731 unsigned int i;
667 732
668 for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i) 733 for (i = 0; i < ecb_array_length (keysym_vocabulary); ++i)
669 { 734 {
670 if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0) 735 if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0)
671 { 736 {
672 state |= keysym_vocabulary[i].value; 737 state |= keysym_vocabulary[i].value;
673 str += keysym_vocabulary[i].len; 738 str += keysym_vocabulary[i].len;
674 break; 739 break;
675 } 740 }
676 } 741 }
677 742
678 if (i >= sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t)) 743 if (i >= ecb_array_length (keysym_vocabulary))
679 return -1; 744 return -1;
680 745
681 if (*str == '-') 746 if (*str == '-')
682 ++str; 747 ++str;
683 } 748 }
… …
690 sym = strtol (str, &end, 16); 755 sym = strtol (str, &end, 16);
691 if (*end) 756 if (*end)
692 return -1; 757 return -1;
693 } 758 }
694 759
760 return sym;
761}
762
763int
764rxvt_term::bind_action (const char *str, const char *arg)
765{
766 int sym;
767 unsigned int state;
768
769 if (*arg == '\0' || (sym = parse_keysym (str, state)) == -1)
770 return -1;
771
772 wchar_t *ws = rxvt_mbstowcs (arg);
773 if (!HOOK_INVOKE ((this, HOOK_REGISTER_COMMAND, DT_INT, sym, DT_INT, state, DT_WCS_LEN, ws, wcslen (ws), DT_END)))
695 keyboard->register_user_translation (sym, state, arg); 774 keyboard->register_action (sym, state, ws);
775
776 free (ws);
696 return 1; 777 return 1;
697} 778}
698 779
699# endif /* KEYSYM_RESOURCE */ 780# endif /* KEYSYM_RESOURCE */
700#endif /* NO_RESOURCES */ 781#endif /* NO_RESOURCES */
… …
743 XrmMergeDatabases (option_db, &database); 824 XrmMergeDatabases (option_db, &database);
744 option_db = NULL; 825 option_db = NULL;
745 /* 826 /*
746 * Query resources for options that affect us 827 * Query resources for options that affect us
747 */ 828 */
748 for (int entry = 0; entry < optList_size; entry++) 829 for (int entry = 0; entry < ecb_array_length (optList); entry++)
749 { 830 {
750 int s; 831 int s;
751 const char *kw = optList[entry].kw; 832 const char *kw = optList[entry].kw;
752 833
753 if (kw == NULL || rs[optList[entry].doff] != NULL) 834 if (kw == NULL || rs[optList[entry].doff] != NULL)
… …
773 854
774 set_option (optList[entry].index, s); 855 set_option (optList[entry].index, s);
775 } 856 }
776 } 857 }
777 } 858 }
859#endif /* NO_RESOURCES */
860}
778 861
862void
863rxvt_term::enumerate_keysym_resources (void (*cb)(rxvt_term *, const char *, const char *))
864{
865#ifndef NO_RESOURCES
779 /* 866 /*
780 * [R5 or later]: enumerate the resource database 867 * [R5 or later]: enumerate the resource database
781 */ 868 */
782# ifdef KEYSYM_RESOURCE 869# ifdef KEYSYM_RESOURCE
870 void *closure[2] = {
871 (void *)this,
872 (void *)cb,
873 };
874
875 XrmDatabase database = XrmGetDatabase (dpy);
783 XrmName name_prefix[3]; 876 XrmName name_prefix[3];
784 XrmClass class_prefix[3]; 877 XrmClass class_prefix[3];
785 878
786 name_prefix[0] = XrmStringToName (rs[Rs_name]); 879 name_prefix[0] = XrmStringToName (rs[Rs_name]);
787 name_prefix[1] = XrmStringToName ("keysym"); 880 name_prefix[1] = XrmStringToName ("keysym");
… …
789 class_prefix[0] = XrmStringToName (RESCLASS); 882 class_prefix[0] = XrmStringToName (RESCLASS);
790 class_prefix[1] = XrmStringToName ("Keysym"); 883 class_prefix[1] = XrmStringToName ("Keysym");
791 class_prefix[2] = NULLQUARK; 884 class_prefix[2] = NULLQUARK;
792 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 885 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
793 XrmEnumerateDatabase (database, name_prefix, class_prefix, 886 XrmEnumerateDatabase (database, name_prefix, class_prefix,
794 XrmEnumOneLevel, rxvt_define_key, NULL); 887 XrmEnumOneLevel, rxvt_keysym_enumerate_helper, (XPointer)closure);
795# ifdef RESFALLBACK 888# ifdef RESFALLBACK
796 name_prefix[0] = XrmStringToName (RESFALLBACK);
797 name_prefix[1] = XrmStringToName ("keysym");
798 class_prefix[0] = XrmStringToName (RESFALLBACK); 889 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK);
799 class_prefix[1] = XrmStringToName ("Keysym");
800 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 890 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
801 XrmEnumerateDatabase (database, name_prefix, class_prefix, 891 XrmEnumerateDatabase (database, name_prefix, class_prefix,
802 XrmEnumOneLevel, rxvt_define_key, NULL); 892 XrmEnumOneLevel, rxvt_keysym_enumerate_helper, (XPointer)closure);
803# endif 893# endif
804# endif 894# endif
805 895
806#endif /* NO_RESOURCES */ 896#endif /* NO_RESOURCES */
807} 897}
808 898
899void
900rxvt_term::extract_keysym_resources ()
901{
902 enumerate_keysym_resources (rxvt_define_key);
903}
904
809/*----------------------- end-of-file (C source) -----------------------*/ 905/*----------------------- end-of-file (C source) -----------------------*/
906

Diff Legend

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