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.168 by root, Wed Jun 6 11:46:11 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"),
… …
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#if 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"),
… …
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"),
… …
622 return 0; 628 return 0;
623} 629}
624 630
625/*}}} */ 631/*}}} */
626 632
627#ifndef NO_RESOURCES
628/*----------------------------------------------------------------------*/ 633/*----------------------------------------------------------------------*/
629 634
630# 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
631/* 642/*
632 * Define key from XrmEnumerateDatabase. 643 * Define key from XrmEnumerateDatabase.
633 * quarks will be something like 644 * quarks will be something like
634 * "rxvt" "keysym" "0xFF01" 645 * "rxvt" "keysym" "0xFF01"
635 * value will be a string 646 * value will be a string
636 */ 647 */
637static int 648static int
649rxvt_keysym_enumerate_helper (
638rxvt_define_key (XrmDatabase *database ecb_unused, 650 XrmDatabase *database ecb_unused,
639 XrmBindingList bindings ecb_unused, 651 XrmBindingList bindings ecb_unused,
640 XrmQuarkList quarks, 652 XrmQuarkList quarks,
641 XrmRepresentation *type ecb_unused, 653 XrmRepresentation *type ecb_unused,
642 XrmValue *value, 654 XrmValue *value,
643 XPointer closure ecb_unused) 655 XPointer closure
656)
644{ 657{
645 int last; 658 int last;
646 659
647 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 */
648 ; 661 ;
649 662
650 last--; 663 rxvt_term *term = (rxvt_term *)(((void **)closure)[0]);
651 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
652 return False; 670 return False;
653} 671}
654 672
655/* 673/*
656 * look for something like this (XK_Delete) 674 * look for something like this (XK_Delete)
… …
691 { "4", 1, Mod4Mask }, 709 { "4", 1, Mod4Mask },
692 { "5", 1, Mod5Mask }, 710 { "5", 1, Mod5Mask },
693}; 711};
694 712
695int 713int
696rxvt_term::parse_keysym (const char *str, const char *arg) 714rxvt_term::parse_keysym (const char *str, unsigned int &state)
697{ 715{
698 int sym; 716 int sym;
699 unsigned int state = 0;
700 const char *key = strrchr (str, '-'); 717 const char *key = strrchr (str, '-');
718
719 state = 0;
701 720
702 if (!key) 721 if (!key)
703 key = str; 722 key = str;
704 else 723 else
705 key++; 724 key++;
706 725
707 // string or key is empty 726 // string or key is empty
708 if (*arg == '\0' || *key == '\0') 727 if (*key == '\0')
709 return -1; 728 return -1;
710 729
711 // parse modifiers 730 // parse modifiers
712 while (str < key) 731 while (str < key)
713 { 732 {
… …
738 sym = strtol (str, &end, 16); 757 sym = strtol (str, &end, 16);
739 if (*end) 758 if (*end)
740 return -1; 759 return -1;
741 } 760 }
742 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
743 wchar_t *ws = rxvt_mbstowcs (arg); 774 wchar_t *ws = rxvt_mbstowcs (arg);
744 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)))
745 keyboard->register_user_translation (sym, state, ws); 776 keyboard->register_action (sym, state, ws);
777
746 free (ws); 778 free (ws);
747 return 1; 779 return 1;
748} 780}
749 781
750# endif /* KEYSYM_RESOURCE */ 782#endif /* KEYSYM_RESOURCE */
751#endif /* NO_RESOURCES */
752 783
753static char * 784static char *
754get_res (XrmDatabase database, const char *program, const char *option) 785get_res (XrmDatabase database, const char *program, const char *option)
755{ 786{
756 char resource[512]; 787 char resource[512];
… …
796 /* 827 /*
797 * Query resources for options that affect us 828 * Query resources for options that affect us
798 */ 829 */
799 for (int entry = 0; entry < ecb_array_length (optList); entry++) 830 for (int entry = 0; entry < ecb_array_length (optList); entry++)
800 { 831 {
832 int s;
801 const char *kw = optList[entry].kw; 833 const char *kw = optList[entry].kw;
802 834
803 if (kw == NULL || rs[optList[entry].doff] != NULL) 835 if (kw == NULL || rs[optList[entry].doff] != NULL)
804 continue; // previously set 836 continue; // previously set
805 837
… …
811 allocated.push_back ((void *)p); 843 allocated.push_back ((void *)p);
812 rs[optList[entry].doff] = p; 844 rs[optList[entry].doff] = p;
813 845
814 if (optList_isBool (entry)) 846 if (optList_isBool (entry))
815 { 847 {
816 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;
817 852
818 if (optList_isReverse (entry)) 853 if (optList_isReverse (entry))
819 s = !s; 854 s = !s;
820 855
821 set_option (optList[entry].index, s); 856 set_option (optList[entry].index, s);
… …
824 } 859 }
825#endif /* NO_RESOURCES */ 860#endif /* NO_RESOURCES */
826} 861}
827 862
828void 863void
829rxvt_term::extract_keysym_resources () 864rxvt_term::enumerate_keysym_resources (void (*cb)(rxvt_term *, const char *, const char *))
830{
831#if !defined NO_RESOURCES && defined KEYSYM_RESOURCE
832 find_resources ("keysym", "Keysym", XrmEnumOneLevel, rxvt_define_key);
833#endif
834}
835
836#if !defined NO_RESOURCES && (defined KEYSYM_RESOURCE || defined BG_IMAGE_FROM_FILE)
837void
838rxvt_term::find_resources (const char *n_prefix, const char *c_prefix, int mode,
839 Bool (*proc)(XrmDatabase *, XrmBindingList, XrmQuarkList, XrmRepresentation *, XrmValue *, XPointer))
840{ 865{
841 /* 866 /*
842 * [R5 or later]: enumerate the resource database 867 * [R5 or later]: enumerate the resource database
843 */ 868 */
869#ifdef KEYSYM_RESOURCE
870 void *closure[2] = {
871 (void *)this,
872 (void *)cb,
873 };
874
844 XrmDatabase database = XrmGetDatabase (dpy); 875 XrmDatabase database = XrmGetDatabase (dpy);
845 XrmName name_prefix[3]; 876 XrmName name_prefix[3];
846 XrmClass class_prefix[3]; 877 XrmClass class_prefix[3];
847 878
848 name_prefix[0] = XrmStringToName (rs[Rs_name]);
849 name_prefix[1] = XrmStringToName (n_prefix); 879 name_prefix[1] = XrmStringToName ("keysym");
850 name_prefix[2] = NULLQUARK; 880 name_prefix[2] = NULLQUARK;
851 class_prefix[0] = XrmStringToName (RESCLASS);
852 class_prefix[1] = XrmStringToName (c_prefix); 881 class_prefix[1] = XrmStringToName ("Keysym");
853 class_prefix[2] = NULLQUARK; 882 class_prefix[2] = NULLQUARK;
854 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 883
855 XrmEnumerateDatabase (database, name_prefix, class_prefix,
856 mode, proc, NULL);
857# ifdef RESFALLBACK 884# ifdef RESFALLBACK
858 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK); 885 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK);
859 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 886 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
860 XrmEnumerateDatabase (database, name_prefix, class_prefix, 887 XrmEnumerateDatabase (database, name_prefix, class_prefix,
861 mode, proc, NULL); 888 XrmEnumOneLevel, rxvt_keysym_enumerate_helper, (XPointer)closure);
862# endif
863}
864#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}
865 908
866/*----------------------- end-of-file (C source) -----------------------*/ 909/*----------------------- end-of-file (C source) -----------------------*/
910

Diff Legend

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