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.178 by root, Thu May 22 18:54:33 2014 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
… …
111 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"), 111 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"),
112 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL), 112 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL),
113 BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_scrollTtyOutput, Optflag_Reverse, "scroll-on-tty-output inhibit"), 113 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"), 114 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"),
115 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"), 115 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"),
116#if ENABLE_TRANSPARENCY 116#if BG_IMAGE_FROM_ROOT
117 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"), 117 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"),
118 BOOL (Rs_transparent, "transparent", "tr", 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"), 119 STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
120 STRG (Rs_shade, "shading", "sh", "number", "shade background by number %."), 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"), 121 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"), 195 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
196 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), 196 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
197#if BG_IMAGE_FROM_FILE 197#if BG_IMAGE_FROM_FILE
198 RSTRG (Rs_path, "path", "search path"), 198 RSTRG (Rs_path, "path", "search path"),
199 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), 199 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
200#endif
200# if ENABLE_EWMH 201#if ENABLE_EWMH
201 STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"), 202 STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"),
202# endif
203#endif 203#endif
204 /* fonts: command-line option = resource name */ 204 /* fonts: command-line option = resource name */
205 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 205 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
206#if ENABLE_STYLES 206#if ENABLE_STYLES
207 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), 207 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
… …
222 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"), 222 STRG (Rs_saveLines, "saveLines", "sl", "number", "number of scrolled lines to save"),
223#if ENABLE_XEMBED 223#if ENABLE_XEMBED
224 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"), 224 STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"),
225#endif 225#endif
226#if XFT 226#if XFT
227 BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL),
228#endif
229#if ENABLE_FRILLS
227 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"), 230 STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
228 BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL), 231 STRG (Rs_visual, "visual", "visual", "number", "visual id to request"),
229#endif
230#if ENABLE_FRILLS
231 RSTRG (Rs_transient_for, "transient-for", "windowid"), 232 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"), 233 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"), 234 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"), 235 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"), 236 STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
… …
626 627
627#ifndef NO_RESOURCES 628#ifndef NO_RESOURCES
628/*----------------------------------------------------------------------*/ 629/*----------------------------------------------------------------------*/
629 630
630# ifdef KEYSYM_RESOURCE 631# ifdef KEYSYM_RESOURCE
632static void
633rxvt_define_key (rxvt_term *term, const char *k, const char *v)
634{
635 term->bind_action (k, v);
636}
637
631/* 638/*
632 * Define key from XrmEnumerateDatabase. 639 * Define key from XrmEnumerateDatabase.
633 * quarks will be something like 640 * quarks will be something like
634 * "rxvt" "keysym" "0xFF01" 641 * "rxvt" "keysym" "0xFF01"
635 * value will be a string 642 * value will be a string
636 */ 643 */
637static int 644static int
645rxvt_keysym_enumerate_helper (
638rxvt_define_key (XrmDatabase *database ecb_unused, 646 XrmDatabase *database ecb_unused,
639 XrmBindingList bindings ecb_unused, 647 XrmBindingList bindings ecb_unused,
640 XrmQuarkList quarks, 648 XrmQuarkList quarks,
641 XrmRepresentation *type ecb_unused, 649 XrmRepresentation *type ecb_unused,
642 XrmValue *value, 650 XrmValue *value,
643 XPointer closure ecb_unused) 651 XPointer closure
652)
644{ 653{
645 int last; 654 int last;
646 655
647 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ 656 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
648 ; 657 ;
649 658
650 last--; 659 rxvt_term *term = (rxvt_term *)(((void **)closure)[0]);
651 GET_R->parse_keysym (XrmQuarkToString (quarks[last]), (char *)value->addr);//D//TODO 660 void (*cb)(rxvt_term *, const char *, const char *)
661 = (void (*)(rxvt_term *, const char *, const char *))
662 (((void **)closure)[1]);
663
664 cb (term, XrmQuarkToString (quarks[last - 1]), (char *)value->addr);
665
652 return False; 666 return False;
653} 667}
654 668
655/* 669/*
656 * look for something like this (XK_Delete) 670 * look for something like this (XK_Delete)
… …
691 { "4", 1, Mod4Mask }, 705 { "4", 1, Mod4Mask },
692 { "5", 1, Mod5Mask }, 706 { "5", 1, Mod5Mask },
693}; 707};
694 708
695int 709int
696rxvt_term::parse_keysym (const char *str, const char *arg) 710rxvt_term::bind_action (const char *str, const char *arg)
697{ 711{
698 int sym; 712 int sym;
699 unsigned int state = 0; 713 unsigned int state = 0;
700 const char *key = strrchr (str, '-'); 714 const char *key = strrchr (str, '-');
701 715
… …
740 return -1; 754 return -1;
741 } 755 }
742 756
743 wchar_t *ws = rxvt_mbstowcs (arg); 757 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))) 758 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); 759 keyboard->register_action (sym, state, ws);
760
746 free (ws); 761 free (ws);
747 return 1; 762 return 1;
748} 763}
749 764
750# endif /* KEYSYM_RESOURCE */ 765# endif /* KEYSYM_RESOURCE */
… …
796 /* 811 /*
797 * Query resources for options that affect us 812 * Query resources for options that affect us
798 */ 813 */
799 for (int entry = 0; entry < ecb_array_length (optList); entry++) 814 for (int entry = 0; entry < ecb_array_length (optList); entry++)
800 { 815 {
816 int s;
801 const char *kw = optList[entry].kw; 817 const char *kw = optList[entry].kw;
802 818
803 if (kw == NULL || rs[optList[entry].doff] != NULL) 819 if (kw == NULL || rs[optList[entry].doff] != NULL)
804 continue; // previously set 820 continue; // previously set
805 821
… …
811 allocated.push_back ((void *)p); 827 allocated.push_back ((void *)p);
812 rs[optList[entry].doff] = p; 828 rs[optList[entry].doff] = p;
813 829
814 if (optList_isBool (entry)) 830 if (optList_isBool (entry))
815 { 831 {
816 bool s = parse_bool_resource (p); 832 s = strcasecmp (p, "TRUE") == 0
833 || strcasecmp (p, "YES") == 0
834 || strcasecmp (p, "ON") == 0
835 || strcasecmp (p, "1") == 0;
817 836
818 if (optList_isReverse (entry)) 837 if (optList_isReverse (entry))
819 s = !s; 838 s = !s;
820 839
821 set_option (optList[entry].index, s); 840 set_option (optList[entry].index, s);
… …
824 } 843 }
825#endif /* NO_RESOURCES */ 844#endif /* NO_RESOURCES */
826} 845}
827 846
828void 847void
829rxvt_term::extract_keysym_resources () 848rxvt_term::enumerate_keysym_resources (void (*cb)(rxvt_term *, const char *, const char *))
830{ 849{
831#if !defined NO_RESOURCES && defined KEYSYM_RESOURCE 850#ifndef NO_RESOURCES
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{
841 /* 851 /*
842 * [R5 or later]: enumerate the resource database 852 * [R5 or later]: enumerate the resource database
843 */ 853 */
854# ifdef KEYSYM_RESOURCE
855 void *closure[2] = {
856 (void *)this,
857 (void *)cb,
858 };
859
844 XrmDatabase database = XrmGetDatabase (dpy); 860 XrmDatabase database = XrmGetDatabase (dpy);
845 XrmName name_prefix[3]; 861 XrmName name_prefix[3];
846 XrmClass class_prefix[3]; 862 XrmClass class_prefix[3];
847 863
848 name_prefix[0] = XrmStringToName (rs[Rs_name]); 864 name_prefix[0] = XrmStringToName (rs[Rs_name]);
849 name_prefix[1] = XrmStringToName (n_prefix); 865 name_prefix[1] = XrmStringToName ("keysym");
850 name_prefix[2] = NULLQUARK; 866 name_prefix[2] = NULLQUARK;
851 class_prefix[0] = XrmStringToName (RESCLASS); 867 class_prefix[0] = XrmStringToName (RESCLASS);
852 class_prefix[1] = XrmStringToName (c_prefix); 868 class_prefix[1] = XrmStringToName ("Keysym");
853 class_prefix[2] = NULLQUARK; 869 class_prefix[2] = NULLQUARK;
854 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 870 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
855 XrmEnumerateDatabase (database, name_prefix, class_prefix, 871 XrmEnumerateDatabase (database, name_prefix, class_prefix,
856 mode, proc, NULL); 872 XrmEnumOneLevel, rxvt_keysym_enumerate_helper, (XPointer)closure);
857# ifdef RESFALLBACK 873# ifdef RESFALLBACK
858 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK); 874 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK);
859 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 875 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
860 XrmEnumerateDatabase (database, name_prefix, class_prefix, 876 XrmEnumerateDatabase (database, name_prefix, class_prefix,
861 mode, proc, NULL); 877 XrmEnumOneLevel, rxvt_keysym_enumerate_helper, (XPointer)closure);
862# endif 878# endif
863}
864#endif 879# endif
880
881#endif /* NO_RESOURCES */
882}
883
884void
885rxvt_term::extract_keysym_resources ()
886{
887 enumerate_keysym_resources (rxvt_define_key);
888}
865 889
866/*----------------------- end-of-file (C source) -----------------------*/ 890/*----------------------- end-of-file (C source) -----------------------*/
891

Diff Legend

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