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.167 by root, Tue Jun 5 22:23:07 2012 UTC vs.
Revision 1.200 by root, Fri Dec 23 21:46:46 2022 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"),
… …
139#endif 134#endif
140#ifdef MOUSE_WHEEL 135#ifdef MOUSE_WHEEL
141 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, 0, NULL), 136 BOOL (Rs_mouseWheelScrollPage, "mouseWheelScrollPage", NULL, Opt_mouseWheelScrollPage, 0, NULL),
142#endif 137#endif
143#if ENABLE_FRILLS 138#if ENABLE_FRILLS
139 BOOL (Rs_disablePasteBrackets, "disablePasteBrackets", "dpb", Opt_disablePasteBrackets, 0, "paste bracket suppression"),
144 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, 0, "triple click word selection"), 140 BOOL (Rs_tripleclickwords, "tripleclickwords", "tcw", Opt_tripleclickwords, 0, "triple click word selection"),
145 BOOL (Rs_insecure, "insecure", "insecure", Opt_insecure, 0, "enable possibly insecure escape sequences"), 141 BOOL (Rs_insecure, "insecure", "insecure", Opt_insecure, 0, "enable possibly insecure escape sequences"),
146 BOOL (Rs_cursorUnderline, "cursorUnderline", "uc", Opt_cursorUnderline, 0, "underline cursor"), 142 BOOL (Rs_cursorUnderline, "cursorUnderline", "uc", Opt_cursorUnderline, 0, "underline cursor"),
147#endif 143#endif
148#if CURSOR_BLINK 144#if CURSOR_BLINK
… …
192 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), 188 RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
193#endif /* NO_CURSORCOLOR */ 189#endif /* NO_CURSORCOLOR */
194 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"), 190 STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
195 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"), 191 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
196 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), 192 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
197#if 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 193#if ENABLE_EWMH
201 STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"), 194 STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"),
202# endif 195#endif
196#ifdef HAVE_XMU
197 RSTRG (Rs_pointerShape, "pointerShape", "string"),
203#endif 198#endif
204 /* fonts: command-line option = resource name */ 199 /* fonts: command-line option = resource name */
205 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 200 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
206#if ENABLE_STYLES 201#if ENABLE_STYLES
207 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), 202 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
… …
222 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"), 217 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),
223#if ENABLE_XEMBED 218#if ENABLE_XEMBED
224 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"), 219 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"),
225#endif 220#endif
226#if XFT 221#if XFT
222 BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL),
223#endif
224#if ENABLE_FRILLS
225 STRG (Rs_refreshRate, "refreshRate", "fps", "number", "refresh rate / frames per second"),
227 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"), 226 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
228 BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL), 227 STRG (Rs_visual, "visual", "visual", "number", "visual id to request"),
229#endif
230#if ENABLE_FRILLS
231 RSTRG (Rs_transient_for, "transient-for", "windowid"), 228 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"), 229 BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, 0, "override-redirect on the terminal window"),
233 STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"), 230 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"), 231 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"), 232 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
236 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), 233 STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
237 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), 234 STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
… …
239 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"), 236 BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"),
240 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"), 237 STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
241 STRG (Rs_letterSpace, "letterSpace", "letsp", "number", "letter spacing adjustment"), 238 STRG (Rs_letterSpace, "letterSpace", "letsp", "number", "letter spacing adjustment"),
242#endif 239#endif
243#ifdef BUILTIN_GLYPHS 240#ifdef BUILTIN_GLYPHS
244 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"), 241 BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "use of font glyphs instead of internal glyphs"),
245#endif 242#endif
246#ifdef POINTER_BLANK 243#ifdef POINTER_BLANK
247 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"), 244 RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
248#endif 245#endif
249#ifndef NO_BACKSPACE_KEY 246#ifndef NO_BACKSPACE_KEY
… …
257#endif 254#endif
258 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"), 255 STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"),
259 RSTRG (Rs_cutchars, "cutchars", "string"), 256 RSTRG (Rs_cutchars, "cutchars", "string"),
260 RSTRG (Rs_answerbackstring, "answerbackString", "string"), 257 RSTRG (Rs_answerbackstring, "answerbackString", "string"),
261#ifndef NO_SECONDARY_SCREEN 258#ifndef NO_SECONDARY_SCREEN
262 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"), 259 BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "secondary screen"),
263 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"), 260 BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "secondary screen scroll"),
261#endif
262#if ENABLE_FRILLS
263 STRG (Rs_rewrapMode, "rewrapMode", "rm", "string", "rewrap mode (auto, always, never)"),
264#endif 264#endif
265#if ENABLE_PERL 265#if ENABLE_PERL
266 RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO 266 RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO
267 RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO 267 RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO
268 RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO 268 RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO
… …
384#if defined(XTERM_SCROLLBAR) 384#if defined(XTERM_SCROLLBAR)
385 "+xterm" 385 "+xterm"
386#endif 386#endif
387 "\nUsage: "; /* Usage */ 387 "\nUsage: "; /* Usage */
388 388
389#define INDENT 18 389#define INDENT 28
390 390
391const char rxvt_term::resval_undef [] = "<undef>"; 391const char rxvt_term::resval_undef [] = "<undef>";
392const char rxvt_term::resval_on [] = "on"; 392const char rxvt_term::resval_on [] = "on";
393const char rxvt_term::resval_off [] = "off"; 393const char rxvt_term::resval_off [] = "off";
394 394
… …
464 464
465 for (i = 0; i < ecb_array_length (optList); i++) 465 for (i = 0; i < ecb_array_length (optList); i++)
466 if (optList[i].kw != NULL) 466 if (optList[i].kw != NULL)
467 rxvt_log (" %s: %*s%s\n", 467 rxvt_log (" %s: %*s%s\n",
468 optList[i].kw, 468 optList[i].kw,
469 (INDENT - strlen (optList[i].kw)), "", /* XXX */ 469 (INDENT + 2 - strlen (optList[i].kw)), "", /* XXX */
470 (optList_isBool (i) ? "boolean" : optList[i].arg)); 470 (optList_isBool (i) ? "boolean" : optList[i].arg));
471 471
472#if ENABLE_PERL 472#if ENABLE_PERL
473 rxvt_perl.init (this); 473 rxvt_perl.init (this);
474 rxvt_perl.usage (this, 2); 474 rxvt_perl.usage (this, 2);
… …
546 * default values 546 * default values
547 */ 547 */
548 548
549 if (optList[entry].doff != -1) 549 if (optList[entry].doff != -1)
550 { 550 {
551 if (flag && i+1 == argc) 551 if (flag && i + 1 == argc)
552 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]); 552 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]);
553 553
554 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef; 554 rs[optList[entry].doff] = flag ? argv[++i] : resval_undef;
555 } 555 }
556 } 556 }
… …
564 } 564 }
565 } 565 }
566#ifndef NO_RESOURCES 566#ifndef NO_RESOURCES
567 else if (!strcmp (opt, "xrm")) 567 else if (!strcmp (opt, "xrm"))
568 { 568 {
569 if (i+1 < argc) 569 if (i + 1 < argc)
570 XrmPutLineResource (&option_db, argv[++i]); 570 XrmPutLineResource (&option_db, argv[++i]);
571 } 571 }
572#endif 572#endif
573#ifdef KEYSYM_RESOURCE 573#ifdef KEYSYM_RESOURCE
574 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) 574 else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
575 { 575 {
576 if (i+1 < argc) 576 if (i + 1 < argc)
577 { 577 {
578 char *res = rxvt_temp_buf<char> (strlen (opt) + strlen (argv[++i]) + 6); 578 char *res = rxvt_temp_buf<char> (strlen (opt) + strlen (argv[++i]) + 6);
579 sprintf (res, "*.%s: %s\n", opt, argv[i]); 579 sprintf (res, "*.%s: %s\n", opt, argv[i]);
580 XrmPutLineResource (&option_db, res); 580 XrmPutLineResource (&option_db, res);
581 } 581 }
582 } 582 }
583#endif 583#endif
584 else if (!strcmp (opt, "e")) 584 else if (!strcmp (opt, "e"))
585 { 585 {
586 if (i+1 == argc) 586 if (i + 1 < argc)
587 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
588
589 return (const char **)argv + i + 1; 587 return (const char **)argv + i + 1;
588
589 rxvt_warn ("option '-e' requires an argument, aborting.\n");
590 bad_option = 1;
590 } 591 }
591 else 592 else
592 { 593 {
593#if ENABLE_PERL 594#if ENABLE_PERL
594 rxvt_perl.init (this); 595 rxvt_perl.init (this);
595 596
596 if (int flags = rxvt_perl.resource (this, opt, true, longopt, flag, argv [i + 1])) 597 if (int flags = rxvt_perl.parse_resource (this, opt, true, longopt, flag, argv [i + 1]))
597 { 598 {
598 if ((!flags & rxvt_perl.RESOURCE_BOOLEAN)) 599 if (flags & rxvt_perl.RESOURCE_ARG)
599 { 600 {
600 if (flag && i + 1 == argc) 601 if (i + 1 == argc)
602 {
601 rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]); 603 rxvt_warn ("option '%s' requires an argument.\n", argv [i]);
602 604 bad_option = 1;
605 }
606 else
603 ++i; 607 ++i;
604 } 608 }
605 } 609 }
606 else 610 else
607#endif 611#endif
608 { 612 {
613 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
609 bad_option = 1; 614 bad_option = 1;
610 rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
611 } 615 }
612 } 616 }
613 } 617 }
614 618
615 if (bad_option) 619 if (bad_option)
… …
618 return 0; 622 return 0;
619} 623}
620 624
621/*}}} */ 625/*}}} */
622 626
623#ifndef NO_RESOURCES
624/*----------------------------------------------------------------------*/ 627/*----------------------------------------------------------------------*/
625 628
626# ifdef KEYSYM_RESOURCE 629#ifdef KEYSYM_RESOURCE
627/*
628 * Define key from XrmEnumerateDatabase.
629 * quarks will be something like
630 * "rxvt" "keysym" "0xFF01"
631 * value will be a string
632 */
633static int 630static void
634rxvt_define_key (XrmDatabase *database ecb_unused, 631rxvt_define_key (rxvt_term *term, const char *k, const char *v)
635 XrmBindingList bindings ecb_unused,
636 XrmQuarkList quarks,
637 XrmRepresentation *type ecb_unused,
638 XrmValue *value,
639 XPointer closure ecb_unused)
640{ 632{
641 int last; 633 term->bind_action (k, v);
642
643 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
644 ;
645
646 last--;
647 GET_R->parse_keysym (XrmQuarkToString (quarks[last]), (char *)value->addr);//D//TODO
648 return False;
649} 634}
650 635
651/* 636/*
652 * look for something like this (XK_Delete) 637 * look for something like this (XK_Delete)
653 * rxvt*keysym.0xFFFF: "\177" 638 * rxvt*keysym.0xFFFF: "\177"
… …
687 { "4", 1, Mod4Mask }, 672 { "4", 1, Mod4Mask },
688 { "5", 1, Mod5Mask }, 673 { "5", 1, Mod5Mask },
689}; 674};
690 675
691int 676int
692rxvt_term::parse_keysym (const char *str, const char *arg) 677rxvt_term::parse_keysym (const char *str, unsigned int &state)
693{ 678{
694 int sym; 679 int sym;
695 unsigned int state = 0;
696 const char *key = strrchr (str, '-'); 680 const char *key = strrchr (str, '-');
681
682 state = 0;
697 683
698 if (!key) 684 if (!key)
699 key = str; 685 key = str;
700 else 686 else
701 key++; 687 key++;
702 688
703 // string or key is empty 689 // string or key is empty
704 if (*arg == '\0' || *key == '\0') 690 if (*key == '\0')
705 return -1; 691 return -1;
706 692
707 // parse modifiers 693 // parse modifiers
708 while (str < key) 694 while (str < key)
709 { 695 {
… …
734 sym = strtol (str, &end, 16); 720 sym = strtol (str, &end, 16);
735 if (*end) 721 if (*end)
736 return -1; 722 return -1;
737 } 723 }
738 724
725 return sym;
726}
727
728int
729rxvt_term::bind_action (const char *str, const char *arg)
730{
731 int sym;
732 unsigned int state;
733
734 if (*arg == '\0' || (sym = parse_keysym (str, state)) == -1)
735 return -1;
736
739 wchar_t *ws = rxvt_mbstowcs (arg); 737 wchar_t *ws = rxvt_mbstowcs (arg);
740 if (!HOOK_INVOKE ((this, HOOK_REGISTER_COMMAND, DT_INT, sym, DT_INT, state, DT_WCS_LEN, ws, wcslen (ws), DT_END))) 738 if (!HOOK_INVOKE ((this, HOOK_REGISTER_COMMAND, DT_INT, sym, DT_INT, state, DT_WCS_LEN, ws, wcslen (ws), DT_END)))
741 keyboard->register_user_translation (sym, state, ws); 739 keyboard->register_action (sym, state, ws);
740
742 free (ws); 741 free (ws);
743 return 1; 742 return 1;
744} 743}
745 744
746# endif /* KEYSYM_RESOURCE */ 745#endif /* KEYSYM_RESOURCE */
747#endif /* NO_RESOURCES */
748 746
749static char * 747static char *
750get_res (XrmDatabase database, const char *program, const char *option) 748get_res (XrmDatabase database, const char *program, const char *option)
751{ 749{
752 char resource[512]; 750 char resource[512];
… …
792 /* 790 /*
793 * Query resources for options that affect us 791 * Query resources for options that affect us
794 */ 792 */
795 for (int entry = 0; entry < ecb_array_length (optList); entry++) 793 for (int entry = 0; entry < ecb_array_length (optList); entry++)
796 { 794 {
795 int s;
797 const char *kw = optList[entry].kw; 796 const char *kw = optList[entry].kw;
798 797
799 if (kw == NULL || rs[optList[entry].doff] != NULL) 798 if (kw == NULL || rs[optList[entry].doff] != NULL)
800 continue; // previously set 799 continue; // previously set
801 800
… …
807 allocated.push_back ((void *)p); 806 allocated.push_back ((void *)p);
808 rs[optList[entry].doff] = p; 807 rs[optList[entry].doff] = p;
809 808
810 if (optList_isBool (entry)) 809 if (optList_isBool (entry))
811 { 810 {
812 bool s = parse_bool_resource (p); 811 s = strcasecmp (p, "TRUE") == 0
812 || strcasecmp (p, "YES") == 0
813 || strcasecmp (p, "ON") == 0
814 || strcasecmp (p, "1") == 0;
813 815
814 if (optList_isReverse (entry)) 816 if (optList_isReverse (entry))
815 s = !s; 817 s = !s;
816 818
817 set_option (optList[entry].index, s); 819 set_option (optList[entry].index, s);
… …
819 } 821 }
820 } 822 }
821#endif /* NO_RESOURCES */ 823#endif /* NO_RESOURCES */
822} 824}
823 825
826struct rxvt_enumerate_closure
827{
828 rxvt_term *term;
829 void (*cb)(rxvt_term *, const char *, const char *);
830 int specific; // iterate over only a specific subhierarchy
831};
832
833/*
834 * Define key from XrmEnumerateDatabase.
835 * quarks will be something like
836 * "rxvt" "keysym" "0xFF01"
837 * value will be a string
838 */
839static int
840rxvt_enumerate_helper (
841 XrmDatabase *database ecb_unused,
842 XrmBindingList bindings ecb_unused,
843 XrmQuarkList quarks,
844 XrmRepresentation *type ecb_unused,
845 XrmValue *value,
846 XPointer closure
847)
848{
849 const rxvt_enumerate_closure *data = (const rxvt_enumerate_closure *)closure;
850
851 if (*quarks == NULLQUARK) return False;
852
853 // if the quark list starts with a tightly bound quark, we skip it,
854 // as it exactly matched the prefix. Otherwise, it matched because
855 // it started with "*", in which case we assume the prefix is part
856 // of the "*".
857 if (*bindings == XrmBindTightly)
858 {
859 ++quarks, ++bindings; // skip if this is a fixed prefix, rather than a *-match
860 if (*quarks == NULLQUARK) return False;
861 }
862
863 // specific, a bit misleadingly named, is used when a specific "subclass"
864 // is iterated over, e.g. "keysym", and is used to skip one more
865 // component, as well as all generic prefixes
866 // this is a bit of a hack, ideally, keysym (the only user) should use its
867 // own iteration function, but this ought to be less bloated
868 if (data->specific)
869 {
870 ++quarks, ++bindings;
871 if (*quarks == NULLQUARK) return False;
872 }
873
874 char *pattern;
875 if (quarks[1] == NULLQUARK)
876 pattern = XrmQuarkToString (quarks[0]); // single component, fast path
877 else
878 {
879 // multiple components, slow path - should be rare, don't optimize for speed
880 int size = 0;
881
882 for (int i = 0; quarks[i] != NULLQUARK; ++i)
883 size += strlen (XrmQuarkToString (quarks[i])) + 1;
884
885 pattern = rxvt_temp_buf<char> (size + 1);
886
887 // now print all components
888 {
889 char *cur = pattern;
890
891 for (int i = 0; quarks[i] != NULLQUARK; ++i)
892 cur += sprintf (cur, ".%s", XrmQuarkToString (quarks[i]));
893 }
894
895 ++pattern; // skip initial dot
896 }
897
898 data->cb (data->term, pattern, (char *)value->addr);
899
900 return False;
901}
902
824void 903void
825rxvt_term::extract_keysym_resources () 904rxvt_term::enumerate_resources (void (*cb)(rxvt_term *, const char *, const char *), const char *name_p, const char *class_p)
826{
827#if !defined NO_RESOURCES && defined KEYSYM_RESOURCE
828 find_resources ("keysym", "Keysym", XrmEnumOneLevel, rxvt_define_key);
829#endif
830}
831
832#if !defined NO_RESOURCES && (defined KEYSYM_RESOURCE || defined BG_IMAGE_FROM_FILE)
833void
834rxvt_term::find_resources (const char *n_prefix, const char *c_prefix, int mode,
835 Bool (*proc)(XrmDatabase *, XrmBindingList, XrmQuarkList, XrmRepresentation *, XrmValue *, XPointer))
836{ 905{
837 /* 906 /*
838 * [R5 or later]: enumerate the resource database 907 * [R5 or later]: enumerate the resource database
839 */ 908 */
909 assert (!name_p == !class_p); // both must be specified, or missing
910
911#ifdef KEYSYM_RESOURCE
912 rxvt_enumerate_closure closure = { this, cb, name_p ? 1 : 0 };
913
840 XrmDatabase database = XrmGetDatabase (dpy); 914 XrmDatabase database = XrmGetDatabase (dpy);
841 XrmName name_prefix[3]; 915 XrmName name_prefix[3];
842 XrmClass class_prefix[3]; 916 XrmClass class_prefix[3];
843 917
844 name_prefix[0] = XrmStringToName (rs[Rs_name]); 918 name_prefix[1] = name_p ? XrmStringToName (name_p) : NULLQUARK;
845 name_prefix[1] = XrmStringToName (n_prefix);
846 name_prefix[2] = NULLQUARK; 919 name_prefix[2] = NULLQUARK;
847 class_prefix[0] = XrmStringToName (RESCLASS); 920 class_prefix[1] = class_p ? XrmStringToName (class_p) : NULLQUARK;
848 class_prefix[1] = XrmStringToName (c_prefix);
849 class_prefix[2] = NULLQUARK; 921 class_prefix[2] = NULLQUARK;
850 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 922
923# ifdef RESFALLBACK
924 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK);
851 XrmEnumerateDatabase (database, name_prefix, class_prefix, 925 XrmEnumerateDatabase (database, name_prefix, class_prefix,
852 mode, proc, NULL); 926 XrmEnumAllLevels, rxvt_enumerate_helper, (XPointer)&closure);
853# ifdef RESFALLBACK 927# endif
928
854 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK); 929 name_prefix[0] = class_prefix[0] = XrmStringToName (RESCLASS);
855 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
856 XrmEnumerateDatabase (database, name_prefix, class_prefix, 930 XrmEnumerateDatabase (database, name_prefix, class_prefix,
857 mode, proc, NULL); 931 XrmEnumAllLevels, rxvt_enumerate_helper, (XPointer)&closure);
932
933 name_prefix[0] = class_prefix[0] = XrmStringToName (rs[Rs_name]);
934 XrmEnumerateDatabase (database, name_prefix, class_prefix,
935 XrmEnumAllLevels, rxvt_enumerate_helper, (XPointer)&closure);
858# endif 936#endif
859} 937}
938
939void
940rxvt_term::extract_keysym_resources ()
941{
942#ifdef KEYSYM_RESOURCE
943 enumerate_keysym_resources (rxvt_define_key);
860#endif 944#endif
945}
861 946
862/*----------------------- end-of-file (C source) -----------------------*/ 947/*----------------------- end-of-file (C source) -----------------------*/
948

Diff Legend

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