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.180 by sf-exg, Sat Aug 16 10:51:23 2014 UTC vs.
Revision 1.186 by sf-exg, Mon May 11 22:05:48 2015 UTC

… …
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 SWCH ("dockapp", Opt_dockapp, 0, "start as dockapp"),
102 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"), 102 BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"),
103 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"), 104 STRG (Rs_multiClickTime, "multiClickTime", "mc", "number", "maximum time (in ms) between multi-click selections"),
105 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"), 105 BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"),
106 BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"), 106 BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"),
107 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"),
108 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"), 108 RSTRG (Rs_scrollstyle, "scrollstyle", "mode"),
109 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"), 109 BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"),
… …
625 return 0; 625 return 0;
626} 626}
627 627
628/*}}} */ 628/*}}} */
629 629
630#ifndef NO_RESOURCES
631/*----------------------------------------------------------------------*/ 630/*----------------------------------------------------------------------*/
632 631
633# ifdef KEYSYM_RESOURCE 632# ifdef KEYSYM_RESOURCE
634static void 633static void
635rxvt_define_key (rxvt_term *term, const char *k, const char *v) 634rxvt_define_key (rxvt_term *term, const char *k, const char *v)
… …
707 { "4", 1, Mod4Mask }, 706 { "4", 1, Mod4Mask },
708 { "5", 1, Mod5Mask }, 707 { "5", 1, Mod5Mask },
709}; 708};
710 709
711int 710int
712rxvt_term::bind_action (const char *str, const char *arg) 711rxvt_term::parse_keysym (const char *str, unsigned int &state)
713{ 712{
714 int sym; 713 int sym;
715 unsigned int state = 0;
716 const char *key = strrchr (str, '-'); 714 const char *key = strrchr (str, '-');
715
716 state = 0;
717 717
718 if (!key) 718 if (!key)
719 key = str; 719 key = str;
720 else 720 else
721 key++; 721 key++;
722 722
723 // string or key is empty 723 // string or key is empty
724 if (*arg == '\0' || *key == '\0') 724 if (*key == '\0')
725 return -1; 725 return -1;
726 726
727 // parse modifiers 727 // parse modifiers
728 while (str < key) 728 while (str < key)
729 { 729 {
… …
754 sym = strtol (str, &end, 16); 754 sym = strtol (str, &end, 16);
755 if (*end) 755 if (*end)
756 return -1; 756 return -1;
757 } 757 }
758 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
759 wchar_t *ws = rxvt_mbstowcs (arg); 771 wchar_t *ws = rxvt_mbstowcs (arg);
760 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)))
761 keyboard->register_action (sym, state, ws); 773 keyboard->register_action (sym, state, ws);
762 774
763 free (ws); 775 free (ws);
764 return 1; 776 return 1;
765} 777}
766 778
767# endif /* KEYSYM_RESOURCE */ 779# endif /* KEYSYM_RESOURCE */
768#endif /* NO_RESOURCES */
769 780
770static char * 781static char *
771get_res (XrmDatabase database, const char *program, const char *option) 782get_res (XrmDatabase database, const char *program, const char *option)
772{ 783{
773 char resource[512]; 784 char resource[512];
… …
847} 858}
848 859
849void 860void
850rxvt_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 *))
851{ 862{
852#ifndef NO_RESOURCES
853 /* 863 /*
854 * [R5 or later]: enumerate the resource database 864 * [R5 or later]: enumerate the resource database
855 */ 865 */
856# ifdef KEYSYM_RESOURCE 866# ifdef KEYSYM_RESOURCE
857 void *closure[2] = { 867 void *closure[2] = {
… …
861 871
862 XrmDatabase database = XrmGetDatabase (dpy); 872 XrmDatabase database = XrmGetDatabase (dpy);
863 XrmName name_prefix[3]; 873 XrmName name_prefix[3];
864 XrmClass class_prefix[3]; 874 XrmClass class_prefix[3];
865 875
866 name_prefix[0] = XrmStringToName (rs[Rs_name]);
867 name_prefix[1] = XrmStringToName ("keysym"); 876 name_prefix[1] = XrmStringToName ("keysym");
868 name_prefix[2] = NULLQUARK; 877 name_prefix[2] = NULLQUARK;
869 class_prefix[0] = XrmStringToName (RESCLASS);
870 class_prefix[1] = XrmStringToName ("Keysym"); 878 class_prefix[1] = XrmStringToName ("Keysym");
871 class_prefix[2] = NULLQUARK; 879 class_prefix[2] = NULLQUARK;
872 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 880
873 XrmEnumerateDatabase (database, name_prefix, class_prefix,
874 XrmEnumOneLevel, rxvt_keysym_enumerate_helper, (XPointer)closure);
875# ifdef RESFALLBACK 881# ifdef RESFALLBACK
876 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK); 882 name_prefix[0] = class_prefix[0] = XrmStringToName (RESFALLBACK);
877 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ 883 /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
878 XrmEnumerateDatabase (database, name_prefix, class_prefix, 884 XrmEnumerateDatabase (database, name_prefix, class_prefix,
879 XrmEnumOneLevel, rxvt_keysym_enumerate_helper, (XPointer)closure); 885 XrmEnumOneLevel, rxvt_keysym_enumerate_helper, (XPointer)closure);
880# 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);
881# endif 895# endif
882
883#endif /* NO_RESOURCES */
884} 896}
885 897
886void 898void
887rxvt_term::extract_keysym_resources () 899rxvt_term::extract_keysym_resources ()
888{ 900{

Diff Legend

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