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.174 by sf-exg, Sat Dec 29 14:23:35 2012 UTC vs.
Revision 1.183 by root, Mon Sep 8 10:40:31 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"),
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"),
… …
627 629
628#ifndef NO_RESOURCES 630#ifndef NO_RESOURCES
629/*----------------------------------------------------------------------*/ 631/*----------------------------------------------------------------------*/
630 632
631# ifdef KEYSYM_RESOURCE 633# ifdef KEYSYM_RESOURCE
634static void
635rxvt_define_key (rxvt_term *term, const char *k, const char *v)
636{
637 term->bind_action (k, v);
638}
639
632/* 640/*
633 * Define key from XrmEnumerateDatabase. 641 * Define key from XrmEnumerateDatabase.
634 * quarks will be something like 642 * quarks will be something like
635 * "rxvt" "keysym" "0xFF01" 643 * "rxvt" "keysym" "0xFF01"
636 * value will be a string 644 * value will be a string
637 */ 645 */
638static int 646static int
647rxvt_keysym_enumerate_helper (
639rxvt_define_key (XrmDatabase *database ecb_unused, 648 XrmDatabase *database ecb_unused,
640 XrmBindingList bindings ecb_unused, 649 XrmBindingList bindings ecb_unused,
641 XrmQuarkList quarks, 650 XrmQuarkList quarks,
642 XrmRepresentation *type ecb_unused, 651 XrmRepresentation *type ecb_unused,
643 XrmValue *value, 652 XrmValue *value,
644 XPointer closure) 653 XPointer closure
654)
645{ 655{
646 rxvt_term *term = (rxvt_term *)closure;
647 int last; 656 int last;
648 657
649 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ 658 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
650 ; 659 ;
651 660
652 last--; 661 rxvt_term *term = (rxvt_term *)(((void **)closure)[0]);
662 void (*cb)(rxvt_term *, const char *, const char *)
663 = (void (*)(rxvt_term *, const char *, const char *))
664 (((void **)closure)[1]);
665
653 term->parse_keysym (XrmQuarkToString (quarks[last]), (char *)value->addr); 666 cb (term, XrmQuarkToString (quarks[last - 1]), (char *)value->addr);
667
654 return False; 668 return False;
655} 669}
656 670
657/* 671/*
658 * look for something like this (XK_Delete) 672 * look for something like this (XK_Delete)
… …
693 { "4", 1, Mod4Mask }, 707 { "4", 1, Mod4Mask },
694 { "5", 1, Mod5Mask }, 708 { "5", 1, Mod5Mask },
695}; 709};
696 710
697int 711int
698rxvt_term::parse_keysym (const char *str, const char *arg) 712rxvt_term::parse_keysym (const char *str, unsigned int &state)
699{ 713{
700 int sym; 714 int sym;
701 unsigned int state = 0;
702 const char *key = strrchr (str, '-'); 715 const char *key = strrchr (str, '-');
716
717 state = 0;
703 718
704 if (!key) 719 if (!key)
705 key = str; 720 key = str;
706 else 721 else
707 key++; 722 key++;
708 723
709 // string or key is empty 724 // string or key is empty
710 if (*arg == '\0' || *key == '\0') 725 if (*key == '\0')
711 return -1; 726 return -1;
712 727
713 // parse modifiers 728 // parse modifiers
714 while (str < key) 729 while (str < key)
715 { 730 {
… …
740 sym = strtol (str, &end, 16); 755 sym = strtol (str, &end, 16);
741 if (*end) 756 if (*end)
742 return -1; 757 return -1;
743 } 758 }
744 759
760 return sym;
761}
762
763int
764rxvt_term::bind_action (const char *str, const char *arg)
765{
766 int sym;
767 unsigned int state;
768
769 if (*arg == '\0' || (sym = parse_keysym (str, state)) == -1)
770 return -1;
771
745 wchar_t *ws = rxvt_mbstowcs (arg); 772 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)))
747 keyboard->register_user_translation (sym, state, ws); 773 keyboard->register_action (sym, state, ws);
748 774
749 free (ws); 775 free (ws);
750 return 1; 776 return 1;
751} 777}
752 778
… …
831 } 857 }
832#endif /* NO_RESOURCES */ 858#endif /* NO_RESOURCES */
833} 859}
834 860
835void 861void
836rxvt_term::extract_keysym_resources () 862rxvt_term::enumerate_keysym_resources (void (*cb)(rxvt_term *, const char *, const char *))
837{ 863{
838#ifndef NO_RESOURCES 864#ifndef NO_RESOURCES
839 /* 865 /*
840 * [R5 or later]: enumerate the resource database 866 * [R5 or later]: enumerate the resource database
841 */ 867 */
842# ifdef KEYSYM_RESOURCE 868# ifdef KEYSYM_RESOURCE
869 void *closure[2] = {
870 (void *)this,
871 (void *)cb,
872 };
873
843 XrmDatabase database = XrmGetDatabase (dpy); 874 XrmDatabase database = XrmGetDatabase (dpy);
844 XrmName name_prefix[3]; 875 XrmName name_prefix[3];
845 XrmClass class_prefix[3]; 876 XrmClass class_prefix[3];
846 877
847 name_prefix[0] = XrmStringToName (rs[Rs_name]); 878 name_prefix[0] = XrmStringToName (rs[Rs_name]);
… …
850 class_prefix[0] = XrmStringToName (RESCLASS); 881 class_prefix[0] = XrmStringToName (RESCLASS);
851 class_prefix[1] = XrmStringToName ("Keysym"); 882 class_prefix[1] = XrmStringToName ("Keysym");
852 class_prefix[2] = NULLQUARK; 883 class_prefix[2] = NULLQUARK;
853 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 884 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
854 XrmEnumerateDatabase (database, name_prefix, class_prefix, 885 XrmEnumerateDatabase (database, name_prefix, class_prefix,
855 XrmEnumOneLevel, rxvt_define_key, (XPointer)this); 886 XrmEnumOneLevel, rxvt_keysym_enumerate_helper, (XPointer)closure);
856# ifdef RESFALLBACK 887# ifdef RESFALLBACK
857 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK); 888 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK);
858 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 889 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
859 XrmEnumerateDatabase (database, name_prefix, class_prefix, 890 XrmEnumerateDatabase (database, name_prefix, class_prefix,
860 XrmEnumOneLevel, rxvt_define_key, (XPointer)this); 891 XrmEnumOneLevel, rxvt_keysym_enumerate_helper, (XPointer)closure);
861# endif 892# endif
862# endif 893# endif
863 894
864#endif /* NO_RESOURCES */ 895#endif /* NO_RESOURCES */
865} 896}
866 897
898void
899rxvt_term::extract_keysym_resources ()
900{
901 enumerate_keysym_resources (rxvt_define_key);
902}
903
867/*----------------------- end-of-file (C source) -----------------------*/ 904/*----------------------- end-of-file (C source) -----------------------*/
905

Diff Legend

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