ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.270 by root, Wed Jan 18 10:31:37 2006 UTC vs.
Revision 1.273 by ayin, Thu Jan 19 23:13:19 2006 UTC

… …
464 { 464 {
465 switch (keysym) 465 switch (keysym)
466 { 466 {
467 /* normal XTerm key bindings */ 467 /* normal XTerm key bindings */
468 case XK_Insert: /* Shift+Insert = paste mouse selection */ 468 case XK_Insert: /* Shift+Insert = paste mouse selection */
469 selection_request (ev.time, 0, 0); 469 selection_request (ev.time, Sel_Primary);
470 return; 470 return;
471#if TODO 471#if TODO
472 /* rxvt extras */ 472 /* rxvt extras */
473 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 473 case XK_KP_Add: /* Shift+KP_Add = bigger font */
474 change_font (FONT_UP); 474 change_font (FONT_UP);
… …
2155 { 2155 {
2156 case Button1: 2156 case Button1:
2157 case Button3: 2157 case Button3:
2158 selection_make (ev.time); 2158 selection_make (ev.time);
2159 break; 2159 break;
2160
2160 case Button2: 2161 case Button2:
2161 selection_request (ev.time, ev.x, ev.y); 2162 if (IN_RANGE_EXC (ev.x, 0, width)
2163 && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2164 {
2165 if (ev.state & ShiftMask)
2166 selection_request (ev.time, Sel_Clipboard);
2167 else
2168 selection_request (ev.time, Sel_Primary);
2169 }
2162 break; 2170 break;
2171
2163#ifdef MOUSE_WHEEL 2172#ifdef MOUSE_WHEEL
2164 case Button4: 2173 case Button4:
2165 case Button5: 2174 case Button5:
2166 { 2175 {
2167 int i; 2176 int i;
… …
3766 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3775 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3767 */ 3776 */
3768void 3777void
3769rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3778rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3770{ 3779{
3771 int changed = 0;
3772 int color; 3780 int color;
3773 char *buf, *name; 3781 char *buf, *name;
3774 bool query = str[0] == '?' && !str[1]; 3782 bool query = str[0] == '?' && !str[1];
3775 int saveop = op; 3783 int saveop = op;
3776 dDisp; 3784 dDisp;
… …
3892 want_full_refresh = want_refresh = 1; 3900 want_full_refresh = want_refresh = 1;
3893 break; 3901 break;
3894#endif 3902#endif
3895 3903
3896 case Rxvt_Pixmap: 3904 case Rxvt_Pixmap:
3905 {
3897 if (*str != ';') 3906 if (*str != ';')
3898 { 3907 {
3899#if XPM_BACKGROUND 3908#if XPM_BACKGROUND
3900 scale_pixmap (""); /* reset to default scaling */ 3909 scale_pixmap (""); /* reset to default scaling */
3901 set_bgPixmap (str); /* change pixmap */ 3910 set_bgPixmap (str); /* change pixmap */
3902 scr_touch (true); 3911 scr_touch (true);
3903#endif 3912#endif
3904 } 3913 }
3905 3914
3915 int changed = 0;
3916
3906 while ((str = strchr (str, ';')) != NULL) 3917 while ((str = strchr (str, ';')) != NULL)
3907 { 3918 {
3908 str++; 3919 str++;
3909#if XPM_BACKGROUND 3920#if XPM_BACKGROUND
3910 changed += scale_pixmap (str); 3921 changed += scale_pixmap (str);
3911#endif 3922#endif
3912 } 3923 }
3913 3924
3914 if (changed) 3925 if (changed)
3915 { 3926 {
3916#ifdef XPM_BACKGROUND 3927#ifdef XPM_BACKGROUND
3917 resize_pixmap (); 3928 resize_pixmap ();
3918 scr_touch (true); 3929 scr_touch (true);
3919#endif 3930#endif
3920 } 3931 }
3932 }
3921 break; 3933 break;
3922 3934
3923 case Rxvt_restoreFG: 3935 case Rxvt_restoreFG:
3924 set_window_color (Color_fg, str); 3936 set_window_color (Color_fg, str);
3925 break; 3937 break;

Diff Legend

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