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.177 by root, Sun May 18 18:09:52 2014 UTC vs.
Revision 1.187 by sf-exg, Mon May 11 22:05:58 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"),
… …
623 return 0; 625 return 0;
624} 626}
625 627
626/*}}} */ 628/*}}} */
627 629
628#ifndef NO_RESOURCES
629/*----------------------------------------------------------------------*/ 630/*----------------------------------------------------------------------*/
630 631
631# ifdef KEYSYM_RESOURCE 632# ifdef KEYSYM_RESOURCE
632static void 633static void
633rxvt_define_key (rxvt_term *term, const char *k, const char *v) 634rxvt_define_key (rxvt_term *term, const char *k, const char *v)
… …
705 { "4", 1, Mod4Mask }, 706 { "4", 1, Mod4Mask },
706 { "5", 1, Mod5Mask }, 707 { "5", 1, Mod5Mask },
707}; 708};
708 709
709int 710int
710rxvt_term::bind_action (const char *str, const char *arg) 711rxvt_term::parse_keysym (const char *str, unsigned int &state)
711{ 712{
712 int sym; 713 int sym;
713 unsigned int state = 0;
714 const char *key = strrchr (str, '-'); 714 const char *key = strrchr (str, '-');
715
716 state = 0;
715 717
716 if (!key) 718 if (!key)
717 key = str; 719 key = str;
718 else 720 else
719 key++; 721 key++;
720 722
721 // string or key is empty 723 // string or key is empty
722 if (*arg == '\0' || *key == '\0') 724 if (*key == '\0')
723 return -1; 725 return -1;
724 726
725 // parse modifiers 727 // parse modifiers
726 while (str < key) 728 while (str < key)
727 { 729 {
… …
752 sym = strtol (str, &end, 16); 754 sym = strtol (str, &end, 16);
753 if (*end) 755 if (*end)
754 return -1; 756 return -1;
755 } 757 }
756 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
757 wchar_t *ws = rxvt_mbstowcs (arg); 771 wchar_t *ws = rxvt_mbstowcs (arg);
758 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)))
759 keyboard->register_action (sym, state, ws); 773 keyboard->register_action (sym, state, ws);
760 774
761 free (ws); 775 free (ws);
762 return 1; 776 return 1;
763} 777}
764 778
765# endif /* KEYSYM_RESOURCE */ 779# endif /* KEYSYM_RESOURCE */
766#endif /* NO_RESOURCES */
767 780
768static char * 781static char *
769get_res (XrmDatabase database, const char *program, const char *option) 782get_res (XrmDatabase database, const char *program, const char *option)
770{ 783{
771 char resource[512]; 784 char resource[512];
… …
845} 858}
846 859
847void 860void
848rxvt_term::enumerate_keysym_resources (void (*cb)(rxvt_term *, const char *, const char *)) 861rxvt_term::enumerate_keysym_resources (void (*cb)(rxvt_term *, const char *, const char *))
849{ 862{
850#ifndef NO_RESOURCES
851 /* 863 /*
852 * [R5 or later]: enumerate the resource database 864 * [R5 or later]: enumerate the resource database
853 */ 865 */
854# ifdef KEYSYM_RESOURCE 866# ifdef KEYSYM_RESOURCE
855 void *closure[2] = { 867 void *closure[2] = {
… …
859 871
860 XrmDatabase database = XrmGetDatabase (dpy); 872 XrmDatabase database = XrmGetDatabase (dpy);
861 XrmName name_prefix[3]; 873 XrmName name_prefix[3];
862 XrmClass class_prefix[3]; 874 XrmClass class_prefix[3];
863 875
864 name_prefix[0] = XrmStringToName (rs[Rs_name]);
865 name_prefix[1] = XrmStringToName ("keysym"); 876 name_prefix[1] = XrmStringToName ("keysym");
866 name_prefix[2] = NULLQUARK; 877 name_prefix[2] = NULLQUARK;
867 class_prefix[0] = XrmStringToName (RESCLASS);
868 class_prefix[1] = XrmStringToName ("Keysym"); 878 class_prefix[1] = XrmStringToName ("Keysym");
869 class_prefix[2] = NULLQUARK; 879 class_prefix[2] = NULLQUARK;
870 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 880
871 XrmEnumerateDatabase (database, name_prefix, class_prefix,
872 XrmEnumOneLevel, rxvt_keysym_enumerate_helper, (XPointer)closure);
873# ifdef RESFALLBACK 881# ifdef RESFALLBACK
874 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK); 882 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK);
875 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 883 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
876 XrmEnumerateDatabase (database, name_prefix, class_prefix, 884 XrmEnumerateDatabase (database, name_prefix, class_prefix,
877 XrmEnumOneLevel, rxvt_keysym_enumerate_helper, (XPointer)closure); 885 XrmEnumOneLevel, rxvt_keysym_enumerate_helper, (XPointer)closure);
878# endif 886# endif
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);
879# endif 895# endif
880
881#endif /* NO_RESOURCES */
882} 896}
883 897
884void 898void
885rxvt_term::extract_keysym_resources () 899rxvt_term::extract_keysym_resources ()
886{ 900{
901#ifdef KEYSYM_RESOURCE
887 enumerate_keysym_resources (rxvt_define_key); 902 enumerate_keysym_resources (rxvt_define_key);
903#endif
888} 904}
889 905
890/*----------------------- end-of-file (C source) -----------------------*/ 906/*----------------------- end-of-file (C source) -----------------------*/
891 907

Diff Legend

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