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.169 by sf-exg, Wed Jun 6 22:00:20 2012 UTC vs.
Revision 1.186 by sf-exg, Mon May 11 22:05:48 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
203#endif 205#endif
204 /* fonts: command-line option = resource name */ 206 /* fonts: command-line option = resource name */
205 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 207 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
206#if ENABLE_STYLES 208#if ENABLE_STYLES
207 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), 209 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
… …
222 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"), 224 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),
223#if ENABLE_XEMBED 225#if ENABLE_XEMBED
224 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"), 226 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"),
225#endif 227#endif
226#if XFT 228#if XFT
229 BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL),
230#endif
231#if ENABLE_FRILLS
227 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"), 232 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
228 BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL), 233 STRG (Rs_visual, "visual", "visual", "number", "visual id to request"),
229#endif
230#if ENABLE_FRILLS
231 RSTRG (Rs_transient_for, "transient-for", "windowid"), 234 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"), 235 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"), 236 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"), 237 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"), 238 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
… …
622 return 0; 625 return 0;
623} 626}
624 627
625/*}}} */ 628/*}}} */
626 629
627#ifndef NO_RESOURCES
628/*----------------------------------------------------------------------*/ 630/*----------------------------------------------------------------------*/
629 631
630# ifdef KEYSYM_RESOURCE 632# ifdef KEYSYM_RESOURCE
633static void
634rxvt_define_key (rxvt_term *term, const char *k, const char *v)
635{
636 term->bind_action (k, v);
637}
638
631/* 639/*
632 * Define key from XrmEnumerateDatabase. 640 * Define key from XrmEnumerateDatabase.
633 * quarks will be something like 641 * quarks will be something like
634 * "rxvt" "keysym" "0xFF01" 642 * "rxvt" "keysym" "0xFF01"
635 * value will be a string 643 * value will be a string
636 */ 644 */
637static int 645static int
646rxvt_keysym_enumerate_helper (
638rxvt_define_key (XrmDatabase *database ecb_unused, 647 XrmDatabase *database ecb_unused,
639 XrmBindingList bindings ecb_unused, 648 XrmBindingList bindings ecb_unused,
640 XrmQuarkList quarks, 649 XrmQuarkList quarks,
641 XrmRepresentation *type ecb_unused, 650 XrmRepresentation *type ecb_unused,
642 XrmValue *value, 651 XrmValue *value,
643 XPointer closure ecb_unused) 652 XPointer closure
653)
644{ 654{
645 int last; 655 int last;
646 656
647 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ 657 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
648 ; 658 ;
649 659
650 last--; 660 rxvt_term *term = (rxvt_term *)(((void **)closure)[0]);
651 GET_R->parse_keysym (XrmQuarkToString (quarks[last]), (char *)value->addr);//D//TODO 661 void (*cb)(rxvt_term *, const char *, const char *)
662 = (void (*)(rxvt_term *, const char *, const char *))
663 (((void **)closure)[1]);
664
665 cb (term, XrmQuarkToString (quarks[last - 1]), (char *)value->addr);
666
652 return False; 667 return False;
653} 668}
654 669
655/* 670/*
656 * look for something like this (XK_Delete) 671 * look for something like this (XK_Delete)
… …
691 { "4", 1, Mod4Mask }, 706 { "4", 1, Mod4Mask },
692 { "5", 1, Mod5Mask }, 707 { "5", 1, Mod5Mask },
693}; 708};
694 709
695int 710int
696rxvt_term::parse_keysym (const char *str, const char *arg) 711rxvt_term::parse_keysym (const char *str, unsigned int &state)
697{ 712{
698 int sym; 713 int sym;
699 unsigned int state = 0;
700 const char *key = strrchr (str, '-'); 714 const char *key = strrchr (str, '-');
715
716 state = 0;
701 717
702 if (!key) 718 if (!key)
703 key = str; 719 key = str;
704 else 720 else
705 key++; 721 key++;
706 722
707 // string or key is empty 723 // string or key is empty
708 if (*arg == '\0' || *key == '\0') 724 if (*key == '\0')
709 return -1; 725 return -1;
710 726
711 // parse modifiers 727 // parse modifiers
712 while (str < key) 728 while (str < key)
713 { 729 {
… …
738 sym = strtol (str, &end, 16); 754 sym = strtol (str, &end, 16);
739 if (*end) 755 if (*end)
740 return -1; 756 return -1;
741 } 757 }
742 758
759 return sym;
760}
761
762int
763rxvt_term::bind_action (const char *str, const char *arg)
764{
765 int sym;
766 unsigned int state;
767
768 if (*arg == '\0' || (sym = parse_keysym (str, state)) == -1)
769 return -1;
770
743 wchar_t *ws = rxvt_mbstowcs (arg); 771 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))) 772 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); 773 keyboard->register_action (sym, state, ws);
774
746 free (ws); 775 free (ws);
747 return 1; 776 return 1;
748} 777}
749 778
750# endif /* KEYSYM_RESOURCE */ 779# endif /* KEYSYM_RESOURCE */
751#endif /* NO_RESOURCES */
752 780
753static char * 781static char *
754get_res (XrmDatabase database, const char *program, const char *option) 782get_res (XrmDatabase database, const char *program, const char *option)
755{ 783{
756 char resource[512]; 784 char resource[512];
… …
796 /* 824 /*
797 * Query resources for options that affect us 825 * Query resources for options that affect us
798 */ 826 */
799 for (int entry = 0; entry < ecb_array_length (optList); entry++) 827 for (int entry = 0; entry < ecb_array_length (optList); entry++)
800 { 828 {
829 int s;
801 const char *kw = optList[entry].kw; 830 const char *kw = optList[entry].kw;
802 831
803 if (kw == NULL || rs[optList[entry].doff] != NULL) 832 if (kw == NULL || rs[optList[entry].doff] != NULL)
804 continue; // previously set 833 continue; // previously set
805 834
… …
811 allocated.push_back ((void *)p); 840 allocated.push_back ((void *)p);
812 rs[optList[entry].doff] = p; 841 rs[optList[entry].doff] = p;
813 842
814 if (optList_isBool (entry)) 843 if (optList_isBool (entry))
815 { 844 {
816 bool s = parse_bool_resource (p); 845 s = strcasecmp (p, "TRUE") == 0
846 || strcasecmp (p, "YES") == 0
847 || strcasecmp (p, "ON") == 0
848 || strcasecmp (p, "1") == 0;
817 849
818 if (optList_isReverse (entry)) 850 if (optList_isReverse (entry))
819 s = !s; 851 s = !s;
820 852
821 set_option (optList[entry].index, s); 853 set_option (optList[entry].index, s);
… …
824 } 856 }
825#endif /* NO_RESOURCES */ 857#endif /* NO_RESOURCES */
826} 858}
827 859
828void 860void
829rxvt_term::extract_keysym_resources () 861rxvt_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
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{ 862{
841 /* 863 /*
842 * [R5 or later]: enumerate the resource database 864 * [R5 or later]: enumerate the resource database
843 */ 865 */
866# ifdef KEYSYM_RESOURCE
867 void *closure[2] = {
868 (void *)this,
869 (void *)cb,
870 };
871
844 XrmDatabase database = XrmGetDatabase (dpy); 872 XrmDatabase database = XrmGetDatabase (dpy);
845 XrmName name_prefix[3]; 873 XrmName name_prefix[3];
846 XrmClass class_prefix[3]; 874 XrmClass class_prefix[3];
847 875
848 name_prefix[0] = XrmStringToName (rs[Rs_name]);
849 name_prefix[1] = XrmStringToName (n_prefix); 876 name_prefix[1] = XrmStringToName ("keysym");
850 name_prefix[2] = NULLQUARK; 877 name_prefix[2] = NULLQUARK;
851 class_prefix[0] = XrmStringToName (RESCLASS);
852 class_prefix[1] = XrmStringToName (c_prefix); 878 class_prefix[1] = XrmStringToName ("Keysym");
853 class_prefix[2] = NULLQUARK; 879 class_prefix[2] = NULLQUARK;
854 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 880
855 XrmEnumerateDatabase (database, name_prefix, class_prefix,
856 mode, proc, NULL);
857# ifdef RESFALLBACK 881# ifdef RESFALLBACK
858 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK); 882 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK);
859 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 883 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
860 XrmEnumerateDatabase (database, name_prefix, class_prefix, 884 XrmEnumerateDatabase (database, name_prefix, class_prefix,
861 mode, proc, NULL); 885 XrmEnumOneLevel, rxvt_keysym_enumerate_helper, (XPointer)closure);
862# endif 886# endif
863} 887
888 name_prefix[0] = class_prefix[0] = XrmStringToName (RESCLASS);
889 XrmEnumerateDatabase (database, name_prefix, class_prefix,
890 XrmEnumOneLevel, rxvt_keysym_enumerate_helper, (XPointer)closure);
891
892 name_prefix[0] = class_prefix[0] = XrmStringToName (rs[Rs_name]);
893 XrmEnumerateDatabase (database, name_prefix, class_prefix,
894 XrmEnumOneLevel, rxvt_keysym_enumerate_helper, (XPointer)closure);
864#endif 895# endif
896}
897
898void
899rxvt_term::extract_keysym_resources ()
900{
901 enumerate_keysym_resources (rxvt_define_key);
902}
865 903
866/*----------------------- end-of-file (C source) -----------------------*/ 904/*----------------------- end-of-file (C source) -----------------------*/
905

Diff Legend

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