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.171 by sf-exg, Fri Jun 15 14:34:34 2012 UTC vs.
Revision 1.179 by mikachu, Tue Jul 29 13:50:05 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
… …
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"),
103 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"), 104 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"),
104 BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"), 105 BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"),
105 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, 0, "tab characters are pastable"), 106 BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, 0, "tab characters are pastable"),
… …
111 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"), 112 STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"),
112 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL), 113 BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL),
113 BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_scrollTtyOutput, Optflag_Reverse, "scroll-on-tty-output inhibit"), 114 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"), 115 BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"),
115 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"), 116 BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"),
116#if ENABLE_TRANSPARENCY 117#if BG_IMAGE_FROM_ROOT
117 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"), 118 BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"),
118 BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"), 119 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_color + Color_tint, "tintColor", "tint", "color", "tint color"),
120 STRG (Rs_shade, "shading", "sh", "number", "shade background by number %."), 121 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 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"), 196 STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
196 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), 197 STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
197#if BG_IMAGE_FROM_FILE 198#if BG_IMAGE_FROM_FILE
198 RSTRG (Rs_path, "path", "search path"), 199 RSTRG (Rs_path, "path", "search path"),
199 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), 200 STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
201#endif
200# if ENABLE_EWMH 202#if ENABLE_EWMH
201 STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"), 203 STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"),
202# endif
203#endif 204#endif
204 /* fonts: command-line option = resource name */ 205 /* fonts: command-line option = resource name */
205 STRG (Rs_font, "font", "fn", "fontname", "normal text font"), 206 STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
206#if ENABLE_STYLES 207#if ENABLE_STYLES
207 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), 208 STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
… …
627 628
628#ifndef NO_RESOURCES 629#ifndef NO_RESOURCES
629/*----------------------------------------------------------------------*/ 630/*----------------------------------------------------------------------*/
630 631
631# 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
632/* 639/*
633 * Define key from XrmEnumerateDatabase. 640 * Define key from XrmEnumerateDatabase.
634 * quarks will be something like 641 * quarks will be something like
635 * "rxvt" "keysym" "0xFF01" 642 * "rxvt" "keysym" "0xFF01"
636 * value will be a string 643 * value will be a string
637 */ 644 */
638static int 645static int
646rxvt_keysym_enumerate_helper (
639rxvt_define_key (XrmDatabase *database ecb_unused, 647 XrmDatabase *database ecb_unused,
640 XrmBindingList bindings ecb_unused, 648 XrmBindingList bindings ecb_unused,
641 XrmQuarkList quarks, 649 XrmQuarkList quarks,
642 XrmRepresentation *type ecb_unused, 650 XrmRepresentation *type ecb_unused,
643 XrmValue *value, 651 XrmValue *value,
644 XPointer closure ecb_unused) 652 XPointer closure
653)
645{ 654{
646 int last; 655 int last;
647 656
648 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 */
649 ; 658 ;
650 659
651 last--; 660 rxvt_term *term = (rxvt_term *)(((void **)closure)[0]);
652 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
653 return False; 667 return False;
654} 668}
655 669
656/* 670/*
657 * look for something like this (XK_Delete) 671 * look for something like this (XK_Delete)
… …
692 { "4", 1, Mod4Mask }, 706 { "4", 1, Mod4Mask },
693 { "5", 1, Mod5Mask }, 707 { "5", 1, Mod5Mask },
694}; 708};
695 709
696int 710int
697rxvt_term::parse_keysym (const char *str, const char *arg) 711rxvt_term::bind_action (const char *str, const char *arg)
698{ 712{
699 int sym; 713 int sym;
700 unsigned int state = 0; 714 unsigned int state = 0;
701 const char *key = strrchr (str, '-'); 715 const char *key = strrchr (str, '-');
702 716
… …
741 return -1; 755 return -1;
742 } 756 }
743 757
744 wchar_t *ws = rxvt_mbstowcs (arg); 758 wchar_t *ws = rxvt_mbstowcs (arg);
745 if (!HOOK_INVOKE ((this, HOOK_REGISTER_COMMAND, DT_INT, sym, DT_INT, state, DT_WCS_LEN, ws, wcslen (ws), DT_END))) 759 if (!HOOK_INVOKE ((this, HOOK_REGISTER_COMMAND, DT_INT, sym, DT_INT, state, DT_WCS_LEN, ws, wcslen (ws), DT_END)))
746 keyboard->register_user_translation (sym, state, ws); 760 keyboard->register_action (sym, state, ws);
761
747 free (ws); 762 free (ws);
748 return 1; 763 return 1;
749} 764}
750 765
751# endif /* KEYSYM_RESOURCE */ 766# endif /* KEYSYM_RESOURCE */
… …
829 } 844 }
830#endif /* NO_RESOURCES */ 845#endif /* NO_RESOURCES */
831} 846}
832 847
833void 848void
834rxvt_term::extract_keysym_resources () 849rxvt_term::enumerate_keysym_resources (void (*cb)(rxvt_term *, const char *, const char *))
835{ 850{
836#ifndef NO_RESOURCES 851#ifndef NO_RESOURCES
837 /* 852 /*
838 * [R5 or later]: enumerate the resource database 853 * [R5 or later]: enumerate the resource database
839 */ 854 */
840# ifdef KEYSYM_RESOURCE 855# ifdef KEYSYM_RESOURCE
856 void *closure[2] = {
857 (void *)this,
858 (void *)cb,
859 };
860
841 XrmDatabase database = XrmGetDatabase (dpy); 861 XrmDatabase database = XrmGetDatabase (dpy);
842 XrmName name_prefix[3]; 862 XrmName name_prefix[3];
843 XrmClass class_prefix[3]; 863 XrmClass class_prefix[3];
844 864
845 name_prefix[0] = XrmStringToName (rs[Rs_name]); 865 name_prefix[0] = XrmStringToName (rs[Rs_name]);
… …
848 class_prefix[0] = XrmStringToName (RESCLASS); 868 class_prefix[0] = XrmStringToName (RESCLASS);
849 class_prefix[1] = XrmStringToName ("Keysym"); 869 class_prefix[1] = XrmStringToName ("Keysym");
850 class_prefix[2] = NULLQUARK; 870 class_prefix[2] = NULLQUARK;
851 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 871 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
852 XrmEnumerateDatabase (database, name_prefix, class_prefix, 872 XrmEnumerateDatabase (database, name_prefix, class_prefix,
853 XrmEnumOneLevel, rxvt_define_key, NULL); 873 XrmEnumOneLevel, rxvt_keysym_enumerate_helper, (XPointer)closure);
854# ifdef RESFALLBACK 874# ifdef RESFALLBACK
855 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK); 875 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK);
856 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 876 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
857 XrmEnumerateDatabase (database, name_prefix, class_prefix, 877 XrmEnumerateDatabase (database, name_prefix, class_prefix,
858 XrmEnumOneLevel, rxvt_define_key, NULL); 878 XrmEnumOneLevel, rxvt_keysym_enumerate_helper, (XPointer)closure);
859# endif 879# endif
860# endif 880# endif
861 881
862#endif /* NO_RESOURCES */ 882#endif /* NO_RESOURCES */
863} 883}
864 884
885void
886rxvt_term::extract_keysym_resources ()
887{
888 enumerate_keysym_resources (rxvt_define_key);
889}
890
865/*----------------------- end-of-file (C source) -----------------------*/ 891/*----------------------- end-of-file (C source) -----------------------*/
892

Diff Legend

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