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.269 by root, Tue Jan 17 12:22:59 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);
… …
1502 { 1502 {
1503 seen_resize = 1; 1503 seen_resize = 1;
1504 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1504 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1505 } 1505 }
1506 1506
1507 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1508
1507#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1509#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1508 if (OPTION (Opt_transparent)) 1510 if (OPTION (Opt_transparent))
1509 check_our_parents (); 1511 check_our_parents ();
1510#endif 1512#endif
1511 } 1513 }
… …
2153 { 2155 {
2154 case Button1: 2156 case Button1:
2155 case Button3: 2157 case Button3:
2156 selection_make (ev.time); 2158 selection_make (ev.time);
2157 break; 2159 break;
2160
2158 case Button2: 2161 case Button2:
2159 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 }
2160 break; 2170 break;
2171
2161#ifdef MOUSE_WHEEL 2172#ifdef MOUSE_WHEEL
2162 case Button4: 2173 case Button4:
2163 case Button5: 2174 case Button5:
2164 { 2175 {
2165 int i; 2176 int i;
… …
3764 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3775 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3765 */ 3776 */
3766void 3777void
3767rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3778rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3768{ 3779{
3769 int changed = 0;
3770 int color; 3780 int color;
3771 char *buf, *name; 3781 char *buf, *name;
3772 bool query = str[0] == '?' && !str[1]; 3782 bool query = str[0] == '?' && !str[1];
3773 int saveop = op; 3783 int saveop = op;
3774 dDisp; 3784 dDisp;
… …
3890 want_full_refresh = want_refresh = 1; 3900 want_full_refresh = want_refresh = 1;
3891 break; 3901 break;
3892#endif 3902#endif
3893 3903
3894 case Rxvt_Pixmap: 3904 case Rxvt_Pixmap:
3905 {
3895 if (*str != ';') 3906 if (*str != ';')
3896 { 3907 {
3897#if XPM_BACKGROUND 3908#if XPM_BACKGROUND
3898 scale_pixmap (""); /* reset to default scaling */ 3909 scale_pixmap (""); /* reset to default scaling */
3899 set_bgPixmap (str); /* change pixmap */ 3910 set_bgPixmap (str); /* change pixmap */
3900 scr_touch (true); 3911 scr_touch (true);
3901#endif 3912#endif
3902 } 3913 }
3903 3914
3915 int changed = 0;
3916
3904 while ((str = strchr (str, ';')) != NULL) 3917 while ((str = strchr (str, ';')) != NULL)
3905 { 3918 {
3906 str++; 3919 str++;
3907#if XPM_BACKGROUND 3920#if XPM_BACKGROUND
3908 changed += scale_pixmap (str); 3921 changed += scale_pixmap (str);
3909#endif 3922#endif
3910 } 3923 }
3911 3924
3912 if (changed) 3925 if (changed)
3913 { 3926 {
3914#ifdef XPM_BACKGROUND 3927#ifdef XPM_BACKGROUND
3915 resize_pixmap (); 3928 resize_pixmap ();
3916 scr_touch (true); 3929 scr_touch (true);
3917#endif 3930#endif
3918 } 3931 }
3932 }
3919 break; 3933 break;
3920 3934
3921 case Rxvt_restoreFG: 3935 case Rxvt_restoreFG:
3922 set_window_color (Color_fg, str); 3936 set_window_color (Color_fg, str);
3923 break; 3937 break;

Diff Legend

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