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.147 by sf-exg, Wed Oct 13 23:04:57 2010 UTC vs.
Revision 1.191 by sf-exg, Thu Jul 14 05:10:06 2016 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,2015 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 %."),
117 STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "gaussian blur radii to apply to the root background"), 123 STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "gaussian blur radii to apply to the root background"),
… …
188 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 194 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
189#endif /* NO_CURSORCOLOR */ 195#endif /* NO_CURSORCOLOR */
190 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), 196 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
191 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"),
192 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), 198 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
193#ifdef BG_IMAGE_FROM_FILE 199#if BG_IMAGE_FROM_FILE
194 RSTRG (Rs_path, "path", "search path"), 200 RSTRG (Rs_path, "path", "search path"),
195 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), 201 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
202#endif
196# if ENABLE_EWMH 203#if ENABLE_EWMH
197 STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"), 204 STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"),
198# endif 205#endif
206#ifdef HAVE_XMU
207 RSTRG (Rs_pointerShape, "pointerShape", "string"),
199#endif 208#endif
200 /* fonts: command-line option = resource name */ 209 /* fonts: command-line option = resource name */
201 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 210 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
202#if ENABLE_STYLES 211#if ENABLE_STYLES
203 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), 212 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
204 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"), 213 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"),
205 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"), 214 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"),
206 BOOL (Rs_intensityStyles, "intensityStyles", "is", Opt_intensityStyles, 0, "font styles imply intensity changes"), 215 BOOL (Rs_intensityStyles, "intensityStyles", "is", Opt_intensityStyles, 0, "font styles imply intensity changes"),
207#endif 216#endif
208#ifdef USE_XIM 217#if USE_XIM
209 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), 218 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
210 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"), 219 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"),
211 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"), 220 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"),
212 STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"), 221 STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"),
213#endif /* USE_XIM */ 222#endif /* USE_XIM */
… …
218 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"), 227 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),
219#if ENABLE_XEMBED 228#if ENABLE_XEMBED
220 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"), 229 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"),
221#endif 230#endif
222#if XFT 231#if XFT
232 BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL),
233#endif
234#if ENABLE_FRILLS
223 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"), 235 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
224 BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL), 236 STRG (Rs_visual, "visual", "visual", "number", "visual id to request"),
225#endif
226#if ENABLE_FRILLS
227 RSTRG (Rs_transient_for, "transient-for", "windowid"), 237 RSTRG (Rs_transient_for, "transient-for", "windowid"),
228 BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, 0, "set override-redirect on the terminal window"), 238 BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, 0, "set override-redirect on the terminal window"),
229 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"), 239 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"),
230 BOOL (Rs_hold, "hold", "hold", Opt_hold, 0, "retain window after shell exit"), 240 BOOL (Rs_hold, "hold", "hold", Opt_hold, 0, "retain window after shell exit"),
231 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), 241 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
… …
266#endif 276#endif
267#if ISO_14755 277#if ISO_14755
268 BOOL (Rs_iso14755, "iso14755", NULL, Opt_iso14755, 0, NULL), 278 BOOL (Rs_iso14755, "iso14755", NULL, Opt_iso14755, 0, NULL),
269 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL), 279 BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL),
270#endif 280#endif
271#ifdef HAVE_AFTERIMAGE 281#ifndef NO_RESOURCES
272 STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."), 282 RINFO ("xrm", "string"),
283#endif
284#ifdef KEYSYM_RESOURCE
285 RINFO ("keysym.sym", "keysym"),
273#endif 286#endif
274 INFO ("e", "command arg ...", "command to execute") 287 INFO ("e", "command arg ...", "command to execute")
275 }; 288 };
276 289
277#undef INFO 290#undef INFO
291#undef RINFO
278#undef STRG 292#undef STRG
279#undef RSTRG 293#undef RSTRG
280#undef SWCH 294#undef SWCH
281#undef BOOL 295#undef BOOL
282 296
… …
325#endif 339#endif
326#if defined(ENABLE_TRANSPARENCY) 340#if defined(ENABLE_TRANSPARENCY)
327 "transparent," 341 "transparent,"
328 "tint," 342 "tint,"
329#endif 343#endif
330#if HAVE_AFTERIMAGE 344#if HAVE_PIXBUF
331 "afterimage," 345 "pixbuf,"
332#endif 346#endif
333#if defined(USE_XIM) 347#if defined(USE_XIM)
334 "XIM," 348 "XIM,"
335#endif 349#endif
336#if defined(NO_BACKSPACE_KEY) 350#if defined(NO_BACKSPACE_KEY)
… …
376#if defined(XTERM_SCROLLBAR) 390#if defined(XTERM_SCROLLBAR)
377 "+xterm" 391 "+xterm"
378#endif 392#endif
379 "\nUsage: "; /* Usage */ 393 "\nUsage: "; /* Usage */
380 394
381#define INDENT 18 395#define INDENT 28
382 396
383const char rxvt_term::resval_undef [] = "<undef>"; 397const char rxvt_term::resval_undef [] = "<undef>";
384const char rxvt_term::resval_on [] = "on"; 398const char rxvt_term::resval_on [] = "on";
385const char rxvt_term::resval_off [] = "off"; 399const char rxvt_term::resval_off [] = "off";
386 400
387/*{{{ usage: */ 401/*{{{ usage: */
388/*----------------------------------------------------------------------*/ 402/*----------------------------------------------------------------------*/
389static void 403void
390rxvt_usage (int type) 404rxvt_term::rxvt_usage (int type)
391{ 405{
392 unsigned int i, col; 406 unsigned int i, col;
393 407
394 rxvt_log ("%s%s%s", releasestring, optionsstring, RESNAME); 408 rxvt_log ("%s%s%s", releasestring, optionsstring, RESNAME);
395 409
396 switch (type) 410 switch (type)
397 { 411 {
398 case 0: /* brief listing */ 412 case 0: /* brief listing */
399 rxvt_log (" [-help] [--help]\n"); 413 rxvt_log (" [-help] [--help]\n");
400 414
401 for (col = 1, i = 0; i < optList_size; i++) 415 for (col = 1, i = 0; i < ecb_array_length (optList); i++)
402 if (optList[i].desc != NULL) 416 if (optList[i].desc != NULL)
403 { 417 {
404 int len = 0; 418 int len = 0;
405 419
406 if (optList[i].arg) 420 if (optList[i].arg)
407 len = strlen (optList[i].arg) + 1; 421 len = strlen (optList[i].arg) + 1;
422
408 assert (optList[i].opt != NULL); 423 assert (optList[i].opt != NULL);
409 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); 424 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2 : 0);
410 col += len; 425 col += len;
426
411 if (col > 79) 427 if (col > 79)
412 { 428 {
413 /* assume regular width */ 429 /* assume regular width */
414 rxvt_log ("\n"); 430 rxvt_log ("\n");
415 col = 1 + len; 431 col = 1 + len;
416 } 432 }
417 433
418 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); 434 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
435
419 if (optList[i].arg) 436 if (optList[i].arg)
420 rxvt_log (" %s]", optList[i].arg); 437 rxvt_log (" %s]", optList[i].arg);
421 else 438 else
422 rxvt_log ("]"); 439 rxvt_log ("]");
423 } 440 }
424 break; 441 break;
425 442
426 case 1: /* full command-line listing */ 443 case 1: /* full command-line listing */
427 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n"); 444 rxvt_log (" [options] [-e command args]\n\nwhere options include:\n");
428 445
429 for (i = 0; i < optList_size; i++) 446 for (i = 0; i < ecb_array_length (optList); i++)
430 if (optList[i].desc != NULL) 447 if (optList[i].desc != NULL)
431 { 448 {
432 assert (optList[i].opt != NULL); 449 assert (optList[i].opt != NULL);
433 rxvt_log (" %s%s %-*s%s%s\n", 450 rxvt_log (" %s%s %-*s%s%s\n",
434 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, 451 (optList_isBool (i) ? "-/+" : "-"), optList[i].opt,
… …
436 + (optList_isBool (i) ? 0 : 2)), 453 + (optList_isBool (i) ? 0 : 2)),
437 (optList[i].arg ? optList[i].arg : ""), 454 (optList[i].arg ? optList[i].arg : ""),
438 (optList_isBool (i) ? "turn on/off " : ""), 455 (optList_isBool (i) ? "turn on/off " : ""),
439 optList[i].desc); 456 optList[i].desc);
440 } 457 }
458
459#if ENABLE_PERL
460 rxvt_perl.init (this);
461 rxvt_perl.usage (this, 1);
462#endif
463
441 rxvt_log ("\n --help to list long-options"); 464 rxvt_log ("\n --help to list long-options");
442 break; 465 break;
443 466
444 case 2: /* full resource listing */ 467 case 2: /* full resource listing */
445 rxvt_log (" [options] [-e command args]\n\n" 468 rxvt_log (" [options] [-e command args]\n\n"
446 "where resources (long-options) include:\n"); 469 "where resources (long-options) include:\n");
447 470
448 for (i = 0; i < optList_size; i++) 471 for (i = 0; i < ecb_array_length (optList); i++)
449 if (optList[i].kw != NULL) 472 if (optList[i].kw != NULL)
450 rxvt_log (" %s: %*s%s\n", 473 rxvt_log (" %s: %*s%s\n",
451 optList[i].kw, 474 optList[i].kw,
452 (INDENT - strlen (optList[i].kw)), "", /* XXX */ 475 (INDENT + 2 - strlen (optList[i].kw)), "", /* XXX */
453 (optList_isBool (i) ? "boolean" : optList[i].arg)); 476 (optList_isBool (i) ? "boolean" : optList[i].arg));
454#ifdef KEYSYM_RESOURCE 477
455 rxvt_log (" " "keysym.sym" ": %*s%s\n", 478#if ENABLE_PERL
456 (INDENT - sizeof ("keysym.sym") + 1), "", /* XXX */ 479 rxvt_perl.init (this);
457 "keysym"); 480 rxvt_perl.usage (this, 2);
458#endif 481#endif
482
459 rxvt_log ("\n -help to list options"); 483 rxvt_log ("\n -help to list options");
460 break; 484 break;
461 } 485 }
462 486
463 rxvt_log ("\n\n"); 487 rxvt_log ("\n\n");
464 rxvt_exit_failure (); 488 rxvt_exit_failure ();
465 /* NOTREACHED */
466} 489}
467 490
468/*}}} */ 491/*}}} */
469 492
470/*{{{ get command-line options before getting resources */ 493/*{{{ get command-line options before getting resources */
471void 494const char **
472rxvt_term::get_options (int argc, const char *const *argv) 495rxvt_term::get_options (int argc, const char *const *argv)
473{ 496{
474 int i, bad_option = 0; 497 int i, bad_option = 0;
475 498
476 for (i = 1; i < argc; i++) 499 for (i = 1; i < argc; i++)
… …
507 530
508 if (!strcmp (opt, "h")) 531 if (!strcmp (opt, "h"))
509 rxvt_usage (0); 532 rxvt_usage (0);
510 533
511 /* feature: always try to match long-options */ 534 /* feature: always try to match long-options */
512 for (entry = 0; entry < optList_size; entry++) 535 for (entry = 0; entry < ecb_array_length (optList); entry++)
513 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw)) 536 if ((optList[entry].kw && !strcmp (opt, optList[entry].kw))
514 || (!longopt 537 || (!longopt
515 && optList[entry].opt && !strcmp (opt, optList[entry].opt))) 538 && optList[entry].opt && !strcmp (opt, optList[entry].opt)))
516 break; 539 break;
517 540
518 if (entry < optList_size) 541 if (entry < ecb_array_length (optList)
542 && !optList_isInfo (entry))
519 { 543 {
520 if (optList_isReverse (entry)) 544 if (optList_isReverse (entry))
521 flag = !flag; 545 flag = !flag;
522 546
523 if (optList_isString (entry)) 547 if (optList_isString (entry))
524 { 548 {
525 /* 549 /*
526 * special cases are handled in main.c:main () to allow 550 * special cases are handled in init_resources () to allow
527 * X resources to set these values before we settle for 551 * X resources to set these values before we settle for
528 * default values 552 * default values
529 */ 553 */
530 554
531 if (optList[entry].doff != -1) 555 if (optList[entry].doff != -1)
532 { 556 {
533 if (flag && i+1 == argc) 557 if (flag && i + 1 == argc)
534 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]); 558 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]);
535 559
536 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef; 560 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef;
537 } 561 }
538 } 562 }
… …
546 } 570 }
547 } 571 }
548#ifndef NO_RESOURCES 572#ifndef NO_RESOURCES
549 else if (!strcmp (opt, "xrm")) 573 else if (!strcmp (opt, "xrm"))
550 { 574 {
551 if (i+1 < argc) 575 if (i + 1 < argc)
552 XrmPutLineResource (&option_db, argv[++i]); 576 XrmPutLineResource (&option_db, argv[++i]);
553 } 577 }
554#endif 578#endif
555#ifdef KEYSYM_RESOURCE 579#ifdef KEYSYM_RESOURCE
556 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) 580 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
557 { 581 {
558 if (i+1 < argc) 582 if (i + 1 < argc)
559 { 583 {
560 char *res = rxvt_temp_buf<char> (strlen (opt) + strlen (argv[++i]) + 6); 584 char *res = rxvt_temp_buf<char> (strlen (opt) + strlen (argv[++i]) + 6);
561 sprintf (res, "*.%s: %s\n", opt, argv[i]); 585 sprintf (res, "*.%s: %s\n", opt, argv[i]);
562 XrmPutLineResource (&option_db, res); 586 XrmPutLineResource (&option_db, res);
563 } 587 }
564 } 588 }
565#endif 589#endif
590 else if (!strcmp (opt, "e"))
591 {
592 if (i + 1 < argc)
593 return (const char **)argv + i + 1;
594
595 rxvt_warn ("option '-e' requires an argument, aborting.\n");
596 bad_option = 1;
597 }
566 else 598 else
567 { 599 {
600#if ENABLE_PERL
601 rxvt_perl.init (this);
602
603 if (int flags = rxvt_perl.parse_resource (this, opt, true, longopt, flag, argv [i + 1]))
604 {
605 if (flags & rxvt_perl.RESOURCE_ARG)
606 {
607 if (i + 1 == argc)
608 {
609 rxvt_warn ("option '%s' requires an argument.\n", argv [i]);
568 bad_option = 1; 610 bad_option = 1;
611 }
612 else
613 ++i;
614 }
615 }
616 else
617#endif
618 {
569 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); 619 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
620 bad_option = 1;
621 }
570 } 622 }
571 } 623 }
572 624
573 if (bad_option) 625 if (bad_option)
574 rxvt_usage (0); 626 rxvt_usage (0);
627
628 return 0;
575} 629}
576 630
577/*}}} */ 631/*}}} */
578 632
579#ifndef NO_RESOURCES
580/*----------------------------------------------------------------------*/ 633/*----------------------------------------------------------------------*/
581 634
582# ifdef KEYSYM_RESOURCE 635#ifdef KEYSYM_RESOURCE
636static void
637rxvt_define_key (rxvt_term *term, const char *k, const char *v)
638{
639 term->bind_action (k, v);
640}
641
583/* 642/*
584 * Define key from XrmEnumerateDatabase. 643 * Define key from XrmEnumerateDatabase.
585 * quarks will be something like 644 * quarks will be something like
586 * "rxvt" "keysym" "0xFF01" 645 * "rxvt" "keysym" "0xFF01"
587 * value will be a string 646 * value will be a string
588 */ 647 */
589/* ARGSUSED */ 648static int
590int 649rxvt_enumerate_helper (
591rxvt_define_key (XrmDatabase *database UNUSED, 650 XrmDatabase *database ecb_unused,
592 XrmBindingList bindings UNUSED, 651 XrmBindingList bindings ecb_unused,
593 XrmQuarkList quarks, 652 XrmQuarkList quarks,
594 XrmRepresentation *type UNUSED, 653 XrmRepresentation *type ecb_unused,
595 XrmValue *value, 654 XrmValue *value,
596 XPointer closure UNUSED) 655 XPointer closure
656)
597{ 657{
598 int last; 658 int last;
599 659
600 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ 660 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
601 ; 661 ;
602 662
603 last--; 663 rxvt_term *term = (rxvt_term *)(((void **)closure)[0]);
604 GET_R->parse_keysym (XrmQuarkToString (quarks[last]), (char *)value->addr);//D//TODO 664 void (*cb)(rxvt_term *, const char *, const char *)
665 = (void (*)(rxvt_term *, const char *, const char *))
666 (((void **)closure)[1]);
667
668 cb (term, XrmQuarkToString (quarks[last - 1]), (char *)value->addr);
669
605 return False; 670 return False;
606} 671}
607 672
608/* 673/*
609 * look for something like this (XK_Delete) 674 * look for something like this (XK_Delete)
… …
644 { "4", 1, Mod4Mask }, 709 { "4", 1, Mod4Mask },
645 { "5", 1, Mod5Mask }, 710 { "5", 1, Mod5Mask },
646}; 711};
647 712
648int 713int
649rxvt_term::parse_keysym (const char *str, const char *arg) 714rxvt_term::parse_keysym (const char *str, unsigned int &state)
650{ 715{
651 int sym; 716 int sym;
652 unsigned int state = 0;
653 const char *key = strrchr (str, '-'); 717 const char *key = strrchr (str, '-');
718
719 state = 0;
654 720
655 if (!key) 721 if (!key)
656 key = str; 722 key = str;
657 else 723 else
658 key++; 724 key++;
659 725
660 // string or key is empty 726 // string or key is empty
661 if (*arg == '\0' || *key == '\0') 727 if (*key == '\0')
662 return -1; 728 return -1;
663 729
664 // parse modifiers 730 // parse modifiers
665 while (str < key) 731 while (str < key)
666 { 732 {
667 unsigned int i; 733 unsigned int i;
668 734
669 for (i=0; i < sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t); ++i) 735 for (i = 0; i < ecb_array_length (keysym_vocabulary); ++i)
670 { 736 {
671 if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0) 737 if (strncmp (str, keysym_vocabulary [i].name, keysym_vocabulary [i].len) == 0)
672 { 738 {
673 state |= keysym_vocabulary[i].value; 739 state |= keysym_vocabulary[i].value;
674 str += keysym_vocabulary[i].len; 740 str += keysym_vocabulary[i].len;
675 break; 741 break;
676 } 742 }
677 } 743 }
678 744
679 if (i >= sizeof (keysym_vocabulary) / sizeof (keysym_vocabulary_t)) 745 if (i >= ecb_array_length (keysym_vocabulary))
680 return -1; 746 return -1;
681 747
682 if (*str == '-') 748 if (*str == '-')
683 ++str; 749 ++str;
684 } 750 }
… …
691 sym = strtol (str, &end, 16); 757 sym = strtol (str, &end, 16);
692 if (*end) 758 if (*end)
693 return -1; 759 return -1;
694 } 760 }
695 761
762 return sym;
763}
764
765int
766rxvt_term::bind_action (const char *str, const char *arg)
767{
768 int sym;
769 unsigned int state;
770
771 if (*arg == '\0' || (sym = parse_keysym (str, state)) == -1)
772 return -1;
773
774 wchar_t *ws = rxvt_mbstowcs (arg);
775 if (!HOOK_INVOKE ((this, HOOK_REGISTER_COMMAND, DT_INT, sym, DT_INT, state, DT_WCS_LEN, ws, wcslen (ws), DT_END)))
696 keyboard->register_user_translation (sym, state, arg); 776 keyboard->register_action (sym, state, ws);
777
778 free (ws);
697 return 1; 779 return 1;
698} 780}
699 781
700# endif /* KEYSYM_RESOURCE */ 782#endif /* KEYSYM_RESOURCE */
701#endif /* NO_RESOURCES */
702 783
703static char * 784static char *
704get_res (XrmDatabase database, const char *program, const char *option) 785get_res (XrmDatabase database, const char *program, const char *option)
705{ 786{
706 char resource[512]; 787 char resource[512];
… …
744 XrmMergeDatabases (option_db, &database); 825 XrmMergeDatabases (option_db, &database);
745 option_db = NULL; 826 option_db = NULL;
746 /* 827 /*
747 * Query resources for options that affect us 828 * Query resources for options that affect us
748 */ 829 */
749 for (int entry = 0; entry < optList_size; entry++) 830 for (int entry = 0; entry < ecb_array_length (optList); entry++)
750 { 831 {
751 int s; 832 int s;
752 const char *kw = optList[entry].kw; 833 const char *kw = optList[entry].kw;
753 834
754 if (kw == NULL || rs[optList[entry].doff] != NULL) 835 if (kw == NULL || rs[optList[entry].doff] != NULL)
… …
774 855
775 set_option (optList[entry].index, s); 856 set_option (optList[entry].index, s);
776 } 857 }
777 } 858 }
778 } 859 }
860#endif /* NO_RESOURCES */
861}
779 862
863void
864rxvt_term::enumerate_resources (void (*cb)(rxvt_term *, const char *, const char *), const char *name_p, const char *class_p)
865{
780 /* 866 /*
781 * [R5 or later]: enumerate the resource database 867 * [R5 or later]: enumerate the resource database
782 */ 868 */
783# ifdef KEYSYM_RESOURCE 869#ifdef KEYSYM_RESOURCE
870 void *closure[2] = {
871 (void *)this,
872 (void *)cb,
873 };
874
875 XrmDatabase database = XrmGetDatabase (dpy);
784 XrmName name_prefix[3]; 876 XrmName name_prefix[3];
785 XrmClass class_prefix[3]; 877 XrmClass class_prefix[3];
786 878
787 name_prefix[0] = XrmStringToName (rs[Rs_name]); 879 name_prefix[1] = name_p ? XrmStringToName (name_p) : NULLQUARK;
788 name_prefix[1] = XrmStringToName ("keysym");
789 name_prefix[2] = NULLQUARK; 880 name_prefix[2] = NULLQUARK;
790 class_prefix[0] = XrmStringToName (RESCLASS); 881 class_prefix[1] = class_p ? XrmStringToName (class_p) : NULLQUARK;
791 class_prefix[1] = XrmStringToName ("Keysym");
792 class_prefix[2] = NULLQUARK; 882 class_prefix[2] = NULLQUARK;
883
884# ifdef RESFALLBACK
885 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK);
793 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 886 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
794 XrmEnumerateDatabase (database, name_prefix, class_prefix, 887 XrmEnumerateDatabase (database, name_prefix, class_prefix,
795 XrmEnumOneLevel, rxvt_define_key, NULL); 888 XrmEnumOneLevel, rxvt_enumerate_helper, (XPointer)closure);
796# ifdef RESFALLBACK 889# endif
797 name_prefix[0] = XrmStringToName (RESFALLBACK); 890
798 name_prefix[1] = XrmStringToName ("keysym");
799 class_prefix[0] = XrmStringToName (RESFALLBACK); 891 name_prefix[0] = class_prefix[0] = XrmStringToName (RESCLASS);
800 class_prefix[1] = XrmStringToName ("Keysym");
801 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
802 XrmEnumerateDatabase (database, name_prefix, class_prefix, 892 XrmEnumerateDatabase (database, name_prefix, class_prefix,
803 XrmEnumOneLevel, rxvt_define_key, NULL); 893 XrmEnumOneLevel, rxvt_enumerate_helper, (XPointer)closure);
804# endif 894
895 name_prefix[0] = class_prefix[0] = XrmStringToName (rs[Rs_name]);
896 XrmEnumerateDatabase (database, name_prefix, class_prefix,
897 XrmEnumOneLevel, rxvt_enumerate_helper, (XPointer)closure);
805# endif 898#endif
899}
806 900
807#endif /* NO_RESOURCES */ 901void
902rxvt_term::extract_keysym_resources ()
903{
904#ifdef KEYSYM_RESOURCE
905 enumerate_keysym_resources (rxvt_define_key);
906#endif
808} 907}
809 908
810/*----------------------- end-of-file (C source) -----------------------*/ 909/*----------------------- end-of-file (C source) -----------------------*/
910

Diff Legend

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