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.176 by sf-exg, Fri May 2 20:35:00 2014 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 BG_IMAGE_FROM_ROOT
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#if BG_IMAGE_FROM_FILE
198 RSTRG (Rs_path, "path", "search path"),
199 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
200#endif
201#if ENABLE_EWMH 192#if ENABLE_EWMH
202 STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"), 193 STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"),
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"),
… …
623 return 0; 617 return 0;
624} 618}
625 619
626/*}}} */ 620/*}}} */
627 621
628#ifndef NO_RESOURCES
629/*----------------------------------------------------------------------*/ 622/*----------------------------------------------------------------------*/
630 623
631# 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
632/* 631/*
633 * Define key from XrmEnumerateDatabase. 632 * Define key from XrmEnumerateDatabase.
634 * quarks will be something like 633 * quarks will be something like
635 * "rxvt" "keysym" "0xFF01" 634 * "rxvt" "keysym" "0xFF01"
636 * value will be a string 635 * value will be a string
637 */ 636 */
638static int 637static int
638rxvt_enumerate_helper (
639rxvt_define_key (XrmDatabase *database ecb_unused, 639 XrmDatabase *database ecb_unused,
640 XrmBindingList bindings ecb_unused, 640 XrmBindingList bindings ecb_unused,
641 XrmQuarkList quarks, 641 XrmQuarkList quarks,
642 XrmRepresentation *type ecb_unused, 642 XrmRepresentation *type ecb_unused,
643 XrmValue *value, 643 XrmValue *value,
644 XPointer closure) 644 XPointer closure
645)
645{ 646{
646 rxvt_term *term = (rxvt_term *)closure;
647 int last; 647 int last;
648 648
649 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 */
650 ; 650 ;
651 651
652 last--; 652 rxvt_term *term = (rxvt_term *)(((void **)closure)[0]);
653 void (*cb)(rxvt_term *, const char *, const char *)
654 = (void (*)(rxvt_term *, const char *, const char *))
655 (((void **)closure)[1]);
656
653 term->bind_action (XrmQuarkToString (quarks[last]), (char *)value->addr); 657 cb (term, XrmQuarkToString (quarks[last - 1]), (char *)value->addr);
658
654 return False; 659 return False;
655} 660}
656 661
657/* 662/*
658 * look for something like this (XK_Delete) 663 * look for something like this (XK_Delete)
… …
693 { "4", 1, Mod4Mask }, 698 { "4", 1, Mod4Mask },
694 { "5", 1, Mod5Mask }, 699 { "5", 1, Mod5Mask },
695}; 700};
696 701
697int 702int
698rxvt_term::bind_action (const char *str, const char *arg) 703rxvt_term::parse_keysym (const char *str, unsigned int &state)
699{ 704{
700 int sym; 705 int sym;
701 unsigned int state = 0;
702 const char *key = strrchr (str, '-'); 706 const char *key = strrchr (str, '-');
707
708 state = 0;
703 709
704 if (!key) 710 if (!key)
705 key = str; 711 key = str;
706 else 712 else
707 key++; 713 key++;
708 714
709 // string or key is empty 715 // string or key is empty
710 if (*arg == '\0' || *key == '\0') 716 if (*key == '\0')
711 return -1; 717 return -1;
712 718
713 // parse modifiers 719 // parse modifiers
714 while (str < key) 720 while (str < key)
715 { 721 {
… …
740 sym = strtol (str, &end, 16); 746 sym = strtol (str, &end, 16);
741 if (*end) 747 if (*end)
742 return -1; 748 return -1;
743 } 749 }
744 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
745 wchar_t *ws = rxvt_mbstowcs (arg); 763 wchar_t *ws = rxvt_mbstowcs (arg);
746 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)))
747 keyboard->register_action (sym, state, ws); 765 keyboard->register_action (sym, state, ws);
748 766
749 free (ws); 767 free (ws);
750 return 1; 768 return 1;
751} 769}
752 770
753# endif /* KEYSYM_RESOURCE */ 771#endif /* KEYSYM_RESOURCE */
754#endif /* NO_RESOURCES */
755 772
756static char * 773static char *
757get_res (XrmDatabase database, const char *program, const char *option) 774get_res (XrmDatabase database, const char *program, const char *option)
758{ 775{
759 char resource[512]; 776 char resource[512];
… …
831 } 848 }
832#endif /* NO_RESOURCES */ 849#endif /* NO_RESOURCES */
833} 850}
834 851
835void 852void
836rxvt_term::extract_keysym_resources () 853rxvt_term::enumerate_resources (void (*cb)(rxvt_term *, const char *, const char *), const char *name_p, const char *class_p)
837{ 854{
838#ifndef NO_RESOURCES
839 /* 855 /*
840 * [R5 or later]: enumerate the resource database 856 * [R5 or later]: enumerate the resource database
841 */ 857 */
842# ifdef KEYSYM_RESOURCE 858#ifdef KEYSYM_RESOURCE
859 void *closure[2] = {
860 (void *)this,
861 (void *)cb,
862 };
863
843 XrmDatabase database = XrmGetDatabase (dpy); 864 XrmDatabase database = XrmGetDatabase (dpy);
844 XrmName name_prefix[3]; 865 XrmName name_prefix[3];
845 XrmClass class_prefix[3]; 866 XrmClass class_prefix[3];
846 867
847 name_prefix[0] = XrmStringToName (rs[Rs_name]); 868 name_prefix[1] = name_p ? XrmStringToName (name_p) : NULLQUARK;
848 name_prefix[1] = XrmStringToName ("keysym");
849 name_prefix[2] = NULLQUARK; 869 name_prefix[2] = NULLQUARK;
850 class_prefix[0] = XrmStringToName (RESCLASS); 870 class_prefix[1] = class_p ? XrmStringToName (class_p) : NULLQUARK;
851 class_prefix[1] = XrmStringToName ("Keysym");
852 class_prefix[2] = NULLQUARK; 871 class_prefix[2] = NULLQUARK;
853 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 872
854 XrmEnumerateDatabase (database, name_prefix, class_prefix,
855 XrmEnumOneLevel, rxvt_define_key, (XPointer)this);
856# ifdef RESFALLBACK 873# ifdef RESFALLBACK
857 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK); 874 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK);
858 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 875 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
859 XrmEnumerateDatabase (database, name_prefix, class_prefix, 876 XrmEnumerateDatabase (database, name_prefix, class_prefix,
860 XrmEnumOneLevel, rxvt_define_key, (XPointer)this); 877 XrmEnumOneLevel, rxvt_enumerate_helper, (XPointer)closure);
861# endif
862# endif 878# endif
863 879
864#endif /* NO_RESOURCES */ 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
865} 896}
866 897
867/*----------------------- end-of-file (C source) -----------------------*/ 898/*----------------------- end-of-file (C source) -----------------------*/
899

Diff Legend

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