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.189 by sf-exg, Tue Jun 16 11:58:26 2015 UTC

… …
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 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 118#if BG_IMAGE_FROM_ROOT
117 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"), 119 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"),
118 BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"), 120 BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"),
119 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"), 121 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
120 STRG (Rs_shade, "shading", "sh", "number", "shade background by number %."), 122 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"), 123 STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "gaussian blur radii to apply to the root background"),
… …
192 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 194 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
193#endif /* NO_CURSORCOLOR */ 195#endif /* NO_CURSORCOLOR */
194 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), 196 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
195 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"),
196 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), 198 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
197#ifdef BG_IMAGE_FROM_FILE 199#if BG_IMAGE_FROM_FILE
198 RSTRG (Rs_path, "path", "search path"), 200 RSTRG (Rs_path, "path", "search path"),
199 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), 201 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
202#endif
200# if ENABLE_EWMH 203#if ENABLE_EWMH
201 STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"), 204 STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"),
202# endif 205#endif
206#ifdef HAVE_XMU
207 RSTRG (Rs_pointerShape, "pointerShape", "string"),
203#endif 208#endif
204 /* fonts: command-line option = resource name */ 209 /* fonts: command-line option = resource name */
205 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 210 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
206#if ENABLE_STYLES 211#if ENABLE_STYLES
207 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), 212 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
208 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"), 213 STRG (Rs_italicFont, "italicFont", "fi", "fontname", "italic font"),
209 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"), 214 STRG (Rs_boldItalicFont, "boldItalicFont", "fbi", "fontname", "bold italic font"),
210 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"),
211#endif 216#endif
212#ifdef USE_XIM 217#if USE_XIM
213 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"), 218 STRG (Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
214 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"),
215 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"),
216 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"),
217#endif /* USE_XIM */ 222#endif /* USE_XIM */
… …
222 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"),
223#if ENABLE_XEMBED 228#if ENABLE_XEMBED
224 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"),
225#endif 230#endif
226#if XFT 231#if XFT
232 BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL),
233#endif
234#if ENABLE_FRILLS
227 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"), 235 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
228 BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL), 236 STRG (Rs_visual, "visual", "visual", "number", "visual id to request"),
229#endif
230#if ENABLE_FRILLS
231 RSTRG (Rs_transient_for, "transient-for", "windowid"), 237 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"), 238 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"), 239 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"), 240 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"), 241 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
… …
384#if defined(XTERM_SCROLLBAR) 390#if defined(XTERM_SCROLLBAR)
385 "+xterm" 391 "+xterm"
386#endif 392#endif
387 "\nUsage: "; /* Usage */ 393 "\nUsage: "; /* Usage */
388 394
389#define INDENT 18 395#define INDENT 28
390 396
391const char rxvt_term::resval_undef [] = "<undef>"; 397const char rxvt_term::resval_undef [] = "<undef>";
392const char rxvt_term::resval_on [] = "on"; 398const char rxvt_term::resval_on [] = "on";
393const char rxvt_term::resval_off [] = "off"; 399const char rxvt_term::resval_off [] = "off";
394 400
395/*{{{ usage: */ 401/*{{{ usage: */
396/*----------------------------------------------------------------------*/ 402/*----------------------------------------------------------------------*/
397static void 403void
398rxvt_usage (int type) 404rxvt_term::rxvt_usage (int type)
399{ 405{
400 unsigned int i, col; 406 unsigned int i, col;
401 407
402 rxvt_log ("%s%s%s", releasestring, optionsstring, RESNAME); 408 rxvt_log ("%s%s%s", releasestring, optionsstring, RESNAME);
403 409
… …
411 { 417 {
412 int len = 0; 418 int len = 0;
413 419
414 if (optList[i].arg) 420 if (optList[i].arg)
415 len = strlen (optList[i].arg) + 1; 421 len = strlen (optList[i].arg) + 1;
422
416 assert (optList[i].opt != NULL); 423 assert (optList[i].opt != NULL);
417 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2 : 0); 424 len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2 : 0);
418 col += len; 425 col += len;
426
419 if (col > 79) 427 if (col > 79)
420 { 428 {
421 /* assume regular width */ 429 /* assume regular width */
422 rxvt_log ("\n"); 430 rxvt_log ("\n");
423 col = 1 + len; 431 col = 1 + len;
424 } 432 }
425 433
426 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); 434 rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
435
427 if (optList[i].arg) 436 if (optList[i].arg)
428 rxvt_log (" %s]", optList[i].arg); 437 rxvt_log (" %s]", optList[i].arg);
429 else 438 else
430 rxvt_log ("]"); 439 rxvt_log ("]");
431 } 440 }
… …
444 + (optList_isBool (i) ? 0 : 2)), 453 + (optList_isBool (i) ? 0 : 2)),
445 (optList[i].arg ? optList[i].arg : ""), 454 (optList[i].arg ? optList[i].arg : ""),
446 (optList_isBool (i) ? "turn on/off " : ""), 455 (optList_isBool (i) ? "turn on/off " : ""),
447 optList[i].desc); 456 optList[i].desc);
448 } 457 }
458
459#if ENABLE_PERL
460 rxvt_perl.init (this);
461 rxvt_perl.usage (this, 1);
462#endif
463
449 rxvt_log ("\n --help to list long-options"); 464 rxvt_log ("\n --help to list long-options");
450 break; 465 break;
451 466
452 case 2: /* full resource listing */ 467 case 2: /* full resource listing */
453 rxvt_log (" [options] [-e command args]\n\n" 468 rxvt_log (" [options] [-e command args]\n\n"
… …
455 470
456 for (i = 0; i < ecb_array_length (optList); i++) 471 for (i = 0; i < ecb_array_length (optList); i++)
457 if (optList[i].kw != NULL) 472 if (optList[i].kw != NULL)
458 rxvt_log (" %s: %*s%s\n", 473 rxvt_log (" %s: %*s%s\n",
459 optList[i].kw, 474 optList[i].kw,
460 (INDENT - strlen (optList[i].kw)), "", /* XXX */ 475 (INDENT + 2 - strlen (optList[i].kw)), "", /* XXX */
461 (optList_isBool (i) ? "boolean" : optList[i].arg)); 476 (optList_isBool (i) ? "boolean" : optList[i].arg));
477
478#if ENABLE_PERL
479 rxvt_perl.init (this);
480 rxvt_perl.usage (this, 2);
481#endif
482
462 rxvt_log ("\n -help to list options"); 483 rxvt_log ("\n -help to list options");
463 break; 484 break;
464 } 485 }
465 486
466 rxvt_log ("\n\n"); 487 rxvt_log ("\n\n");
… …
531 * default values 552 * default values
532 */ 553 */
533 554
534 if (optList[entry].doff != -1) 555 if (optList[entry].doff != -1)
535 { 556 {
536 if (flag && i+1 == argc) 557 if (flag && i + 1 == argc)
537 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]); 558 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]);
538 559
539 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef; 560 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef;
540 } 561 }
541 } 562 }
… …
549 } 570 }
550 } 571 }
551#ifndef NO_RESOURCES 572#ifndef NO_RESOURCES
552 else if (!strcmp (opt, "xrm")) 573 else if (!strcmp (opt, "xrm"))
553 { 574 {
554 if (i+1 < argc) 575 if (i + 1 < argc)
555 XrmPutLineResource (&option_db, argv[++i]); 576 XrmPutLineResource (&option_db, argv[++i]);
556 } 577 }
557#endif 578#endif
558#ifdef KEYSYM_RESOURCE 579#ifdef KEYSYM_RESOURCE
559 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) 580 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
560 { 581 {
561 if (i+1 < argc) 582 if (i + 1 < argc)
562 { 583 {
563 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);
564 sprintf (res, "*.%s: %s\n", opt, argv[i]); 585 sprintf (res, "*.%s: %s\n", opt, argv[i]);
565 XrmPutLineResource (&option_db, res); 586 XrmPutLineResource (&option_db, res);
566 } 587 }
567 } 588 }
568#endif 589#endif
569 else if (!strcmp (opt, "e")) 590 else if (!strcmp (opt, "e"))
570 { 591 {
571 if (i+1 == argc) 592 if (i + 1 < argc)
572 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
573
574 return (const char **)argv + i + 1; 593 return (const char **)argv + i + 1;
594
595 rxvt_warn ("option '-e' requires an argument, aborting.\n");
596 bad_option = 1;
575 } 597 }
576 else 598 else
577 { 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]);
578 bad_option = 1; 610 bad_option = 1;
611 }
612 else
613 ++i;
614 }
615 }
616 else
617#endif
618 {
579 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt); 619 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
620 bad_option = 1;
621 }
580 } 622 }
581 } 623 }
582 624
583 if (bad_option) 625 if (bad_option)
584 rxvt_usage (0); 626 rxvt_usage (0);
… …
586 return 0; 628 return 0;
587} 629}
588 630
589/*}}} */ 631/*}}} */
590 632
591#ifndef NO_RESOURCES
592/*----------------------------------------------------------------------*/ 633/*----------------------------------------------------------------------*/
593 634
594# 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
595/* 642/*
596 * Define key from XrmEnumerateDatabase. 643 * Define key from XrmEnumerateDatabase.
597 * quarks will be something like 644 * quarks will be something like
598 * "rxvt" "keysym" "0xFF01" 645 * "rxvt" "keysym" "0xFF01"
599 * value will be a string 646 * value will be a string
600 */ 647 */
601static int 648static int
649rxvt_keysym_enumerate_helper (
602rxvt_define_key (XrmDatabase *database ecb_unused, 650 XrmDatabase *database ecb_unused,
603 XrmBindingList bindings ecb_unused, 651 XrmBindingList bindings ecb_unused,
604 XrmQuarkList quarks, 652 XrmQuarkList quarks,
605 XrmRepresentation *type ecb_unused, 653 XrmRepresentation *type ecb_unused,
606 XrmValue *value, 654 XrmValue *value,
607 XPointer closure ecb_unused) 655 XPointer closure
656)
608{ 657{
609 int last; 658 int last;
610 659
611 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 */
612 ; 661 ;
613 662
614 last--; 663 rxvt_term *term = (rxvt_term *)(((void **)closure)[0]);
615 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
616 return False; 670 return False;
617} 671}
618 672
619/* 673/*
620 * look for something like this (XK_Delete) 674 * look for something like this (XK_Delete)
… …
655 { "4", 1, Mod4Mask }, 709 { "4", 1, Mod4Mask },
656 { "5", 1, Mod5Mask }, 710 { "5", 1, Mod5Mask },
657}; 711};
658 712
659int 713int
660rxvt_term::parse_keysym (const char *str, const char *arg) 714rxvt_term::parse_keysym (const char *str, unsigned int &state)
661{ 715{
662 int sym; 716 int sym;
663 unsigned int state = 0;
664 const char *key = strrchr (str, '-'); 717 const char *key = strrchr (str, '-');
718
719 state = 0;
665 720
666 if (!key) 721 if (!key)
667 key = str; 722 key = str;
668 else 723 else
669 key++; 724 key++;
670 725
671 // string or key is empty 726 // string or key is empty
672 if (*arg == '\0' || *key == '\0') 727 if (*key == '\0')
673 return -1; 728 return -1;
674 729
675 // parse modifiers 730 // parse modifiers
676 while (str < key) 731 while (str < key)
677 { 732 {
… …
702 sym = strtol (str, &end, 16); 757 sym = strtol (str, &end, 16);
703 if (*end) 758 if (*end)
704 return -1; 759 return -1;
705 } 760 }
706 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
707 wchar_t *ws = rxvt_mbstowcs (arg); 774 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))) 775 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); 776 keyboard->register_action (sym, state, ws);
777
710 free (ws); 778 free (ws);
711 return 1; 779 return 1;
712} 780}
713 781
714# endif /* KEYSYM_RESOURCE */ 782#endif /* KEYSYM_RESOURCE */
715#endif /* NO_RESOURCES */
716 783
717static char * 784static char *
718get_res (XrmDatabase database, const char *program, const char *option) 785get_res (XrmDatabase database, const char *program, const char *option)
719{ 786{
720 char resource[512]; 787 char resource[512];
… …
760 /* 827 /*
761 * Query resources for options that affect us 828 * Query resources for options that affect us
762 */ 829 */
763 for (int entry = 0; entry < ecb_array_length (optList); entry++) 830 for (int entry = 0; entry < ecb_array_length (optList); entry++)
764 { 831 {
832 int s;
765 const char *kw = optList[entry].kw; 833 const char *kw = optList[entry].kw;
766 834
767 if (kw == NULL || rs[optList[entry].doff] != NULL) 835 if (kw == NULL || rs[optList[entry].doff] != NULL)
768 continue; // previously set 836 continue; // previously set
769 837
… …
775 allocated.push_back ((void *)p); 843 allocated.push_back ((void *)p);
776 rs[optList[entry].doff] = p; 844 rs[optList[entry].doff] = p;
777 845
778 if (optList_isBool (entry)) 846 if (optList_isBool (entry))
779 { 847 {
780 bool s = parse_bool_resource (p); 848 s = strcasecmp (p, "TRUE") == 0
849 || strcasecmp (p, "YES") == 0
850 || strcasecmp (p, "ON") == 0
851 || strcasecmp (p, "1") == 0;
781 852
782 if (optList_isReverse (entry)) 853 if (optList_isReverse (entry))
783 s = !s; 854 s = !s;
784 855
785 set_option (optList[entry].index, s); 856 set_option (optList[entry].index, s);
… …
788 } 859 }
789#endif /* NO_RESOURCES */ 860#endif /* NO_RESOURCES */
790} 861}
791 862
792void 863void
793rxvt_term::extract_keysym_resources () 864rxvt_term::enumerate_keysym_resources (void (*cb)(rxvt_term *, const char *, const char *))
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{ 865{
805 /* 866 /*
806 * [R5 or later]: enumerate the resource database 867 * [R5 or later]: enumerate the resource database
807 */ 868 */
869#ifdef KEYSYM_RESOURCE
870 void *closure[2] = {
871 (void *)this,
872 (void *)cb,
873 };
874
808 XrmDatabase database = XrmGetDatabase (dpy); 875 XrmDatabase database = XrmGetDatabase (dpy);
809 XrmName name_prefix[3]; 876 XrmName name_prefix[3];
810 XrmClass class_prefix[3]; 877 XrmClass class_prefix[3];
811 878
812 name_prefix[0] = XrmStringToName (rs[Rs_name]);
813 name_prefix[1] = XrmStringToName (n_prefix); 879 name_prefix[1] = XrmStringToName ("keysym");
814 name_prefix[2] = NULLQUARK; 880 name_prefix[2] = NULLQUARK;
815 class_prefix[0] = XrmStringToName (RESCLASS);
816 class_prefix[1] = XrmStringToName (c_prefix); 881 class_prefix[1] = XrmStringToName ("Keysym");
817 class_prefix[2] = NULLQUARK; 882 class_prefix[2] = NULLQUARK;
818 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 883
819 XrmEnumerateDatabase (database, name_prefix, class_prefix,
820 mode, proc, NULL);
821# ifdef RESFALLBACK 884# ifdef RESFALLBACK
822 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK); 885 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK);
823 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 886 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
824 XrmEnumerateDatabase (database, name_prefix, class_prefix, 887 XrmEnumerateDatabase (database, name_prefix, class_prefix,
825 mode, proc, NULL); 888 XrmEnumOneLevel, rxvt_keysym_enumerate_helper, (XPointer)closure);
826# endif
827}
828#endif 889# endif
890
891 name_prefix[0] = class_prefix[0] = XrmStringToName (RESCLASS);
892 XrmEnumerateDatabase (database, name_prefix, class_prefix,
893 XrmEnumOneLevel, rxvt_keysym_enumerate_helper, (XPointer)closure);
894
895 name_prefix[0] = class_prefix[0] = XrmStringToName (rs[Rs_name]);
896 XrmEnumerateDatabase (database, name_prefix, class_prefix,
897 XrmEnumOneLevel, rxvt_keysym_enumerate_helper, (XPointer)closure);
898#endif
899}
900
901void
902rxvt_term::extract_keysym_resources ()
903{
904#ifdef KEYSYM_RESOURCE
905 enumerate_keysym_resources (rxvt_define_key);
906#endif
907}
829 908
830/*----------------------- end-of-file (C source) -----------------------*/ 909/*----------------------- end-of-file (C source) -----------------------*/
910

Diff Legend

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