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.173 by sf-exg, Sat Dec 29 13:14:44 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"),
… …
627 627
628#ifndef NO_RESOURCES 628#ifndef NO_RESOURCES
629/*----------------------------------------------------------------------*/ 629/*----------------------------------------------------------------------*/
630 630
631# 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
632/* 638/*
633 * Define key from XrmEnumerateDatabase. 639 * Define key from XrmEnumerateDatabase.
634 * quarks will be something like 640 * quarks will be something like
635 * "rxvt" "keysym" "0xFF01" 641 * "rxvt" "keysym" "0xFF01"
636 * value will be a string 642 * value will be a string
637 */ 643 */
638static int 644static int
645rxvt_keysym_enumerate_helper (
639rxvt_define_key (XrmDatabase *database ecb_unused, 646 XrmDatabase *database ecb_unused,
640 XrmBindingList bindings ecb_unused, 647 XrmBindingList bindings ecb_unused,
641 XrmQuarkList quarks, 648 XrmQuarkList quarks,
642 XrmRepresentation *type ecb_unused, 649 XrmRepresentation *type ecb_unused,
643 XrmValue *value, 650 XrmValue *value,
644 XPointer closure) 651 XPointer closure
652)
645{ 653{
646 rxvt_term *term = (rxvt_term *)closure;
647 int last; 654 int last;
648 655
649 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 */
650 ; 657 ;
651 658
652 last--; 659 rxvt_term *term = (rxvt_term *)(((void **)closure)[0]);
660 void (*cb)(rxvt_term *, const char *, const char *)
661 = (void (*)(rxvt_term *, const char *, const char *))
662 (((void **)closure)[1]);
663
653 term->parse_keysym (XrmQuarkToString (quarks[last]), (char *)value->addr); 664 cb (term, XrmQuarkToString (quarks[last - 1]), (char *)value->addr);
665
654 return False; 666 return False;
655} 667}
656 668
657/* 669/*
658 * look for something like this (XK_Delete) 670 * look for something like this (XK_Delete)
… …
693 { "4", 1, Mod4Mask }, 705 { "4", 1, Mod4Mask },
694 { "5", 1, Mod5Mask }, 706 { "5", 1, Mod5Mask },
695}; 707};
696 708
697int 709int
698rxvt_term::parse_keysym (const char *str, const char *arg) 710rxvt_term::bind_action (const char *str, const char *arg)
699{ 711{
700 int sym; 712 int sym;
701 unsigned int state = 0; 713 unsigned int state = 0;
702 const char *key = strrchr (str, '-'); 714 const char *key = strrchr (str, '-');
703 715
… …
742 return -1; 754 return -1;
743 } 755 }
744 756
745 wchar_t *ws = rxvt_mbstowcs (arg); 757 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))) 758 if (!HOOK_INVOKE ((this, HOOK_REGISTER_COMMAND, DT_INT, sym, DT_INT, state, DT_WCS_LEN, ws, wcslen (ws), DT_END)))
747 keyboard->register_user_translation (sym, state, ws); 759 keyboard->register_action (sym, state, ws);
748 760
749 free (ws); 761 free (ws);
750 return 1; 762 return 1;
751} 763}
752 764
… …
831 } 843 }
832#endif /* NO_RESOURCES */ 844#endif /* NO_RESOURCES */
833} 845}
834 846
835void 847void
836rxvt_term::extract_keysym_resources () 848rxvt_term::enumerate_keysym_resources (void (*cb)(rxvt_term *, const char *, const char *))
837{ 849{
838#ifndef NO_RESOURCES 850#ifndef NO_RESOURCES
839 /* 851 /*
840 * [R5 or later]: enumerate the resource database 852 * [R5 or later]: enumerate the resource database
841 */ 853 */
842# ifdef KEYSYM_RESOURCE 854# ifdef KEYSYM_RESOURCE
855 void *closure[2] = {
856 (void *)this,
857 (void *)cb,
858 };
859
843 XrmDatabase database = XrmGetDatabase (dpy); 860 XrmDatabase database = XrmGetDatabase (dpy);
844 XrmName name_prefix[3]; 861 XrmName name_prefix[3];
845 XrmClass class_prefix[3]; 862 XrmClass class_prefix[3];
846 863
847 name_prefix[0] = XrmStringToName (rs[Rs_name]); 864 name_prefix[0] = XrmStringToName (rs[Rs_name]);
… …
850 class_prefix[0] = XrmStringToName (RESCLASS); 867 class_prefix[0] = XrmStringToName (RESCLASS);
851 class_prefix[1] = XrmStringToName ("Keysym"); 868 class_prefix[1] = XrmStringToName ("Keysym");
852 class_prefix[2] = NULLQUARK; 869 class_prefix[2] = NULLQUARK;
853 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 870 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
854 XrmEnumerateDatabase (database, name_prefix, class_prefix, 871 XrmEnumerateDatabase (database, name_prefix, class_prefix,
855 XrmEnumOneLevel, rxvt_define_key, (XPointer)this); 872 XrmEnumOneLevel, rxvt_keysym_enumerate_helper, (XPointer)closure);
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_keysym_enumerate_helper, (XPointer)closure);
861# endif 878# endif
862# endif 879# endif
863 880
864#endif /* NO_RESOURCES */ 881#endif /* NO_RESOURCES */
865} 882}
866 883
884void
885rxvt_term::extract_keysym_resources ()
886{
887 enumerate_keysym_resources (rxvt_define_key);
888}
889
867/*----------------------- end-of-file (C source) -----------------------*/ 890/*----------------------- end-of-file (C source) -----------------------*/
891

Diff Legend

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