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.176 by sf-exg, Fri May 2 20:35:00 2014 UTC

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"),
648 648
649 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */ 649 for (last = 0; quarks[last] != NULLQUARK; last++) /* look for last quark in list */
650 ; 650 ;
651 651
652 last--; 652 last--;
653 term->parse_keysym (XrmQuarkToString (quarks[last]), (char *)value->addr); 653 term->bind_action (XrmQuarkToString (quarks[last]), (char *)value->addr);
654 return False; 654 return False;
655} 655}
656 656
657/* 657/*
658 * look for something like this (XK_Delete) 658 * look for something like this (XK_Delete)
693 { "4", 1, Mod4Mask }, 693 { "4", 1, Mod4Mask },
694 { "5", 1, Mod5Mask }, 694 { "5", 1, Mod5Mask },
695}; 695};
696 696
697int 697int
698rxvt_term::parse_keysym (const char *str, const char *arg) 698rxvt_term::bind_action (const char *str, const char *arg)
699{ 699{
700 int sym; 700 int sym;
701 unsigned int state = 0; 701 unsigned int state = 0;
702 const char *key = strrchr (str, '-'); 702 const char *key = strrchr (str, '-');
703 703
742 return -1; 742 return -1;
743 } 743 }
744 744
745 wchar_t *ws = rxvt_mbstowcs (arg); 745 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))) 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); 747 keyboard->register_action (sym, state, ws);
748 748
749 free (ws); 749 free (ws);
750 return 1; 750 return 1;
751} 751}
752 752

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines