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.164 by sf-exg, Fri May 25 08:27:47 2012 UTC vs.
Revision 1.192 by sf-exg, Thu Jul 14 05:33:26 2016 UTC

… …
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 <schmorp@schmorp.de> 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
… …
96 STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"), 96 STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"),
97 SWCH ("C", Opt_console, 0, "intercept console messages"), 97 SWCH ("C", Opt_console, 0, "intercept console messages"),
98 SWCH ("iconic", Opt_iconic, 0, "start iconic"), 98 SWCH ("iconic", Opt_iconic, 0, "start iconic"),
99 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"), 100 STRG (Rs_chdir, "chdir", "cd", "string", "start shell in this directory"),
101 SWCH ("dockapp", Opt_dockapp, 0, "start as dockapp"),
101 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"), 102 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"),
102 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"),
103 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"), 105 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"),
104 BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"), 106 BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"),
105 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"),
106 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"), 108 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"),
107 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"), 109 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"),
… …
111 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"),
112 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL), 114 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL),
113 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"),
114 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"), 116 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"),
115 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"), 117 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"),
116#if ENABLE_TRANSPARENCY
117 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"),
118 BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"),
119 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
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"),
122#endif
123#if OFF_FOCUS_FADING 118#if OFF_FOCUS_FADING
124 STRG (Rs_fade, "fading", "fade", "number", "fade colors by number % when losing focus"), 119 STRG (Rs_fade, "fading", "fade", "number", "fade colors by number % when losing focus"),
125 STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"), 120 STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"),
126#endif 121#endif
127 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"), 122 BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"),
… …
192 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 187 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
193#endif /* NO_CURSORCOLOR */ 188#endif /* NO_CURSORCOLOR */
194 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), 189 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
195 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"), 190 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
196 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), 191 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
197#ifdef BG_IMAGE_FROM_FILE
198 RSTRG (Rs_path, "path", "search path"),
199 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
200# if ENABLE_EWMH 192#if ENABLE_EWMH
201 STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"), 193 STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"),
202# endif 194#endif
195#ifdef HAVE_XMU
196 RSTRG (Rs_pointerShape, "pointerShape", "string"),
203#endif 197#endif
204 /* fonts: command-line option = resource name */ 198 /* fonts: command-line option = resource name */
205 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 199 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
206#if ENABLE_STYLES 200#if ENABLE_STYLES
207 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), 201 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
208 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"), 202 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"),
209 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"), 203 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"),
210 BOOL (Rs_intensityStyles, "intensityStyles", "is", Opt_intensityStyles, 0, "font styles imply intensity changes"), 204 BOOL (Rs_intensityStyles, "intensityStyles", "is", Opt_intensityStyles, 0, "font styles imply intensity changes"),
211#endif 205#endif
212#ifdef USE_XIM 206#if USE_XIM
213 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), 207 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
214 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"), 208 STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"),
215 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"), 209 STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"),
216 STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"), 210 STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"),
217#endif /* USE_XIM */ 211#endif /* USE_XIM */
… …
222 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"), 216 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),
223#if ENABLE_XEMBED 217#if ENABLE_XEMBED
224 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"), 218 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"),
225#endif 219#endif
226#if XFT 220#if XFT
221 BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL),
222#endif
223#if ENABLE_FRILLS
227 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"), 224 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
228 BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL), 225 STRG (Rs_visual, "visual", "visual", "number", "visual id to request"),
229#endif
230#if ENABLE_FRILLS
231 RSTRG (Rs_transient_for, "transient-for", "windowid"), 226 RSTRG (Rs_transient_for, "transient-for", "windowid"),
232 BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, 0, "set override-redirect on the terminal window"), 227 BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, 0, "set override-redirect on the terminal window"),
233 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"), 228 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"),
234 BOOL (Rs_hold, "hold", "hold", Opt_hold, 0, "retain window after shell exit"), 229 BOOL (Rs_hold, "hold", "hold", Opt_hold, 0, "retain window after shell exit"),
235 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"), 230 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
… …
384#if defined(XTERM_SCROLLBAR) 379#if defined(XTERM_SCROLLBAR)
385 "+xterm" 380 "+xterm"
386#endif 381#endif
387 "\nUsage: "; /* Usage */ 382 "\nUsage: "; /* Usage */
388 383
389#define INDENT 18 384#define INDENT 28
390 385
391const char rxvt_term::resval_undef [] = "<undef>"; 386const char rxvt_term::resval_undef [] = "<undef>";
392const char rxvt_term::resval_on [] = "on"; 387const char rxvt_term::resval_on [] = "on";
393const char rxvt_term::resval_off [] = "off"; 388const char rxvt_term::resval_off [] = "off";
394 389
395/*{{{ usage: */ 390/*{{{ usage: */
396/*----------------------------------------------------------------------*/ 391/*----------------------------------------------------------------------*/
397static void 392void
398rxvt_usage (int type) 393rxvt_term::rxvt_usage (int type)
399{ 394{
400 unsigned int i, col; 395 unsigned int i, col;
401 396
402 rxvt_log ("%s%s%s", releasestring, optionsstring, RESNAME); 397 rxvt_log ("%s%s%s", releasestring, optionsstring, RESNAME);
403 398
… …
411 { 406 {
412 int len = 0; 407 int len = 0;
413 408
414 if (optList[i].arg) 409 if (optList[i].arg)
415 len = strlen (optList[i].arg) + 1; 410 len = strlen (optList[i].arg) + 1;
411
416 assert (optList[i].opt != NULL); 412 assert (optList[i].opt != NULL);
417 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2 : 0); 413 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2 : 0);
418 col += len; 414 col += len;
415
419 if (col > 79) 416 if (col > 79)
420 { 417 {
421 /* assume regular width */ 418 /* assume regular width */
422 rxvt_log ("\n"); 419 rxvt_log ("\n");
423 col = 1 + len; 420 col = 1 + len;
424 } 421 }
425 422
426 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); 423 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
424
427 if (optList[i].arg) 425 if (optList[i].arg)
428 rxvt_log (" %s]", optList[i].arg); 426 rxvt_log (" %s]", optList[i].arg);
429 else 427 else
430 rxvt_log ("]"); 428 rxvt_log ("]");
431 } 429 }
… …
444 + (optList_isBool (i) ? 0 : 2)), 442 + (optList_isBool (i) ? 0 : 2)),
445 (optList[i].arg ? optList[i].arg : ""), 443 (optList[i].arg ? optList[i].arg : ""),
446 (optList_isBool (i) ? "turn on/off " : ""), 444 (optList_isBool (i) ? "turn on/off " : ""),
447 optList[i].desc); 445 optList[i].desc);
448 } 446 }
447
448#if ENABLE_PERL
449 rxvt_perl.init (this);
450 rxvt_perl.usage (this, 1);
451#endif
452
449 rxvt_log ("\n --help to list long-options"); 453 rxvt_log ("\n --help to list long-options");
450 break; 454 break;
451 455
452 case 2: /* full resource listing */ 456 case 2: /* full resource listing */
453 rxvt_log (" [options] [-e command args]\n\n" 457 rxvt_log (" [options] [-e command args]\n\n"
… …
455 459
456 for (i = 0; i < ecb_array_length (optList); i++) 460 for (i = 0; i < ecb_array_length (optList); i++)
457 if (optList[i].kw != NULL) 461 if (optList[i].kw != NULL)
458 rxvt_log (" %s: %*s%s\n", 462 rxvt_log (" %s: %*s%s\n",
459 optList[i].kw, 463 optList[i].kw,
460 (INDENT - strlen (optList[i].kw)), "", /* XXX */ 464 (INDENT + 2 - strlen (optList[i].kw)), "", /* XXX */
461 (optList_isBool (i) ? "boolean" : optList[i].arg)); 465 (optList_isBool (i) ? "boolean" : optList[i].arg));
466
467#if ENABLE_PERL
468 rxvt_perl.init (this);
469 rxvt_perl.usage (this, 2);
470#endif
471
462 rxvt_log ("\n -help to list options"); 472 rxvt_log ("\n -help to list options");
463 break; 473 break;
464 } 474 }
465 475
466 rxvt_log ("\n\n"); 476 rxvt_log ("\n\n");
… …
531 * default values 541 * default values
532 */ 542 */
533 543
534 if (optList[entry].doff != -1) 544 if (optList[entry].doff != -1)
535 { 545 {
536 if (flag && i+1 == argc) 546 if (flag && i + 1 == argc)
537 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]); 547 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]);
538 548
539 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef; 549 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef;
540 } 550 }
541 } 551 }
… …
549 } 559 }
550 } 560 }
551#ifndef NO_RESOURCES 561#ifndef NO_RESOURCES
552 else if (!strcmp (opt, "xrm")) 562 else if (!strcmp (opt, "xrm"))
553 { 563 {
554 if (i+1 < argc) 564 if (i + 1 < argc)
555 XrmPutLineResource (&option_db, argv[++i]); 565 XrmPutLineResource (&option_db, argv[++i]);
556 } 566 }
557#endif 567#endif
558#ifdef KEYSYM_RESOURCE 568#ifdef KEYSYM_RESOURCE
559 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) 569 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
560 { 570 {
561 if (i+1 < argc) 571 if (i + 1 < argc)
562 { 572 {
563 char *res = rxvt_temp_buf<char> (strlen (opt) + strlen (argv[++i]) + 6); 573 char *res = rxvt_temp_buf<char> (strlen (opt) + strlen (argv[++i]) + 6);
564 sprintf (res, "*.%s: %s\n", opt, argv[i]); 574 sprintf (res, "*.%s: %s\n", opt, argv[i]);
565 XrmPutLineResource (&option_db, res); 575 XrmPutLineResource (&option_db, res);
566 } 576 }
567 } 577 }
568#endif 578#endif
569 else if (!strcmp (opt, "e")) 579 else if (!strcmp (opt, "e"))
570 { 580 {
571 if (i+1 == argc) 581 if (i + 1 < argc)
572 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
573
574 return (const char **)argv + i + 1; 582 return (const char **)argv + i + 1;
583
584 rxvt_warn ("option '-e' requires an argument, aborting.\n");
585 bad_option = 1;
575 } 586 }
576 else 587 else
577 { 588 {
589#if ENABLE_PERL
590 rxvt_perl.init (this);
591
592 if (int flags = rxvt_perl.parse_resource (this, opt, true, longopt, flag, argv [i + 1]))
593 {
594 if (flags & rxvt_perl.RESOURCE_ARG)
595 {
596 if (i + 1 == argc)
597 {
598 rxvt_warn ("option '%s' requires an argument.\n", argv [i]);
578 bad_option = 1; 599 bad_option = 1;
600 }
601 else
602 ++i;
603 }
604 }
605 else
606#endif
607 {
579 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); 608 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
609 bad_option = 1;
610 }
580 } 611 }
581 } 612 }
582 613
583 if (bad_option) 614 if (bad_option)
584 rxvt_usage (0); 615 rxvt_usage (0);
… …
586 return 0; 617 return 0;
587} 618}
588 619
589/*}}} */ 620/*}}} */
590 621
591#ifndef NO_RESOURCES
592/*----------------------------------------------------------------------*/ 622/*----------------------------------------------------------------------*/
593 623
594# ifdef KEYSYM_RESOURCE 624#ifdef KEYSYM_RESOURCE
625static void
626rxvt_define_key (rxvt_term *term, const char *k, const char *v)
627{
628 term->bind_action (k, v);
629}
630
595/* 631/*
596 * Define key from XrmEnumerateDatabase. 632 * Define key from XrmEnumerateDatabase.
597 * quarks will be something like 633 * quarks will be something like
598 * "rxvt" "keysym" "0xFF01" 634 * "rxvt" "keysym" "0xFF01"
599 * value will be a string 635 * value will be a string
600 */ 636 */
601static int 637static int
638rxvt_enumerate_helper (
602rxvt_define_key (XrmDatabase *database ecb_unused, 639 XrmDatabase *database ecb_unused,
603 XrmBindingList bindings ecb_unused, 640 XrmBindingList bindings ecb_unused,
604 XrmQuarkList quarks, 641 XrmQuarkList quarks,
605 XrmRepresentation *type ecb_unused, 642 XrmRepresentation *type ecb_unused,
606 XrmValue *value, 643 XrmValue *value,
607 XPointer closure ecb_unused) 644 XPointer closure
645)
608{ 646{
609 int last; 647 int last;
610 648
611 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 */
612 ; 650 ;
613 651
614 last--; 652 rxvt_term *term = (rxvt_term *)(((void **)closure)[0]);
615 GET_R->parse_keysym (XrmQuarkToString (quarks[last]), (char *)value->addr);//D//TODO 653 void (*cb)(rxvt_term *, const char *, const char *)
654 = (void (*)(rxvt_term *, const char *, const char *))
655 (((void **)closure)[1]);
656
657 cb (term, XrmQuarkToString (quarks[last - 1]), (char *)value->addr);
658
616 return False; 659 return False;
617} 660}
618 661
619/* 662/*
620 * look for something like this (XK_Delete) 663 * look for something like this (XK_Delete)
… …
655 { "4", 1, Mod4Mask }, 698 { "4", 1, Mod4Mask },
656 { "5", 1, Mod5Mask }, 699 { "5", 1, Mod5Mask },
657}; 700};
658 701
659int 702int
660rxvt_term::parse_keysym (const char *str, const char *arg) 703rxvt_term::parse_keysym (const char *str, unsigned int &state)
661{ 704{
662 int sym; 705 int sym;
663 unsigned int state = 0;
664 const char *key = strrchr (str, '-'); 706 const char *key = strrchr (str, '-');
707
708 state = 0;
665 709
666 if (!key) 710 if (!key)
667 key = str; 711 key = str;
668 else 712 else
669 key++; 713 key++;
670 714
671 // string or key is empty 715 // string or key is empty
672 if (*arg == '\0' || *key == '\0') 716 if (*key == '\0')
673 return -1; 717 return -1;
674 718
675 // parse modifiers 719 // parse modifiers
676 while (str < key) 720 while (str < key)
677 { 721 {
… …
702 sym = strtol (str, &end, 16); 746 sym = strtol (str, &end, 16);
703 if (*end) 747 if (*end)
704 return -1; 748 return -1;
705 } 749 }
706 750
751 return sym;
752}
753
754int
755rxvt_term::bind_action (const char *str, const char *arg)
756{
757 int sym;
758 unsigned int state;
759
760 if (*arg == '\0' || (sym = parse_keysym (str, state)) == -1)
761 return -1;
762
707 wchar_t *ws = rxvt_mbstowcs (arg); 763 wchar_t *ws = rxvt_mbstowcs (arg);
708 if (!HOOK_INVOKE ((this, HOOK_REGISTER_COMMAND, DT_INT, sym, DT_INT, state, DT_WCS_LEN, ws, wcslen (ws), DT_END))) 764 if (!HOOK_INVOKE ((this, HOOK_REGISTER_COMMAND, DT_INT, sym, DT_INT, state, DT_WCS_LEN, ws, wcslen (ws), DT_END)))
709 keyboard->register_user_translation (sym, state, ws); 765 keyboard->register_action (sym, state, ws);
766
710 free (ws); 767 free (ws);
711 return 1; 768 return 1;
712} 769}
713 770
714# endif /* KEYSYM_RESOURCE */ 771#endif /* KEYSYM_RESOURCE */
715#endif /* NO_RESOURCES */
716 772
717static char * 773static char *
718get_res (XrmDatabase database, const char *program, const char *option) 774get_res (XrmDatabase database, const char *program, const char *option)
719{ 775{
720 char resource[512]; 776 char resource[512];
… …
760 /* 816 /*
761 * Query resources for options that affect us 817 * Query resources for options that affect us
762 */ 818 */
763 for (int entry = 0; entry < ecb_array_length (optList); entry++) 819 for (int entry = 0; entry < ecb_array_length (optList); entry++)
764 { 820 {
821 int s;
765 const char *kw = optList[entry].kw; 822 const char *kw = optList[entry].kw;
766 823
767 if (kw == NULL || rs[optList[entry].doff] != NULL) 824 if (kw == NULL || rs[optList[entry].doff] != NULL)
768 continue; // previously set 825 continue; // previously set
769 826
… …
775 allocated.push_back ((void *)p); 832 allocated.push_back ((void *)p);
776 rs[optList[entry].doff] = p; 833 rs[optList[entry].doff] = p;
777 834
778 if (optList_isBool (entry)) 835 if (optList_isBool (entry))
779 { 836 {
780 bool s = parse_bool_resource (p); 837 s = strcasecmp (p, "TRUE") == 0
838 || strcasecmp (p, "YES") == 0
839 || strcasecmp (p, "ON") == 0
840 || strcasecmp (p, "1") == 0;
781 841
782 if (optList_isReverse (entry)) 842 if (optList_isReverse (entry))
783 s = !s; 843 s = !s;
784 844
785 set_option (optList[entry].index, s); 845 set_option (optList[entry].index, s);
… …
788 } 848 }
789#endif /* NO_RESOURCES */ 849#endif /* NO_RESOURCES */
790} 850}
791 851
792void 852void
793rxvt_term::extract_keysym_resources () 853rxvt_term::enumerate_resources (void (*cb)(rxvt_term *, const char *, const char *), const char *name_p, const char *class_p)
794{
795#if !defined NO_RESOURCES && defined KEYSYM_RESOURCE
796 find_resources ("keysym", "Keysym", XrmEnumOneLevel, rxvt_define_key);
797#endif
798}
799
800#if !defined NO_RESOURCES && (defined KEYSYM_RESOURCE || defined BG_IMAGE_FROM_FILE)
801void
802rxvt_term::find_resources (const char *n_prefix, const char *c_prefix, int mode,
803 Bool (*proc)(XrmDatabase *, XrmBindingList, XrmQuarkList, XrmRepresentation *, XrmValue *, XPointer))
804{ 854{
805 /* 855 /*
806 * [R5 or later]: enumerate the resource database 856 * [R5 or later]: enumerate the resource database
807 */ 857 */
858#ifdef KEYSYM_RESOURCE
859 void *closure[2] = {
860 (void *)this,
861 (void *)cb,
862 };
863
808 XrmDatabase database = XrmGetDatabase (dpy); 864 XrmDatabase database = XrmGetDatabase (dpy);
809 XrmName name_prefix[3]; 865 XrmName name_prefix[3];
810 XrmClass class_prefix[3]; 866 XrmClass class_prefix[3];
811 867
812 name_prefix[0] = XrmStringToName (rs[Rs_name]); 868 name_prefix[1] = name_p ? XrmStringToName (name_p) : NULLQUARK;
813 name_prefix[1] = XrmStringToName (n_prefix);
814 name_prefix[2] = NULLQUARK; 869 name_prefix[2] = NULLQUARK;
815 class_prefix[0] = XrmStringToName (RESCLASS); 870 class_prefix[1] = class_p ? XrmStringToName (class_p) : NULLQUARK;
816 class_prefix[1] = XrmStringToName (c_prefix);
817 class_prefix[2] = NULLQUARK; 871 class_prefix[2] = NULLQUARK;
818 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 872
819 XrmEnumerateDatabase (database, name_prefix, class_prefix,
820 mode, proc, NULL);
821# ifdef RESFALLBACK 873# ifdef RESFALLBACK
822 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK); 874 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK);
823 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 875 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
824 XrmEnumerateDatabase (database, name_prefix, class_prefix, 876 XrmEnumerateDatabase (database, name_prefix, class_prefix,
825 mode, proc, NULL); 877 XrmEnumOneLevel, rxvt_enumerate_helper, (XPointer)closure);
826# endif
827}
828#endif 878# endif
879
880 name_prefix[0] = class_prefix[0] = XrmStringToName (RESCLASS);
881 XrmEnumerateDatabase (database, name_prefix, class_prefix,
882 XrmEnumOneLevel, rxvt_enumerate_helper, (XPointer)closure);
883
884 name_prefix[0] = class_prefix[0] = XrmStringToName (rs[Rs_name]);
885 XrmEnumerateDatabase (database, name_prefix, class_prefix,
886 XrmEnumOneLevel, rxvt_enumerate_helper, (XPointer)closure);
887#endif
888}
889
890void
891rxvt_term::extract_keysym_resources ()
892{
893#ifdef KEYSYM_RESOURCE
894 enumerate_keysym_resources (rxvt_define_key);
895#endif
896}
829 897
830/*----------------------- end-of-file (C source) -----------------------*/ 898/*----------------------- end-of-file (C source) -----------------------*/
899

Diff Legend

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