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.267 by root, Mon Jan 16 15:00:20 2006 UTC vs.
Revision 1.272 by root, Thu Jan 19 16:22:12 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);
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);
… …
1006 while (l->is_longer () && row < end_row); 1006 while (l->is_longer () && row < end_row);
1007 } 1007 }
1008 while (row < end_row); 1008 while (row < end_row);
1009 } 1009 }
1010 1010
1011 scr_refresh (refresh_type); 1011 scr_refresh ();
1012 scrollbar_show (1); 1012 scrollbar_show (1);
1013#ifdef USE_XIM 1013#ifdef USE_XIM
1014 IMSendSpot (); 1014 IMSendSpot ();
1015#endif 1015#endif
1016 } 1016 }
… …
1068rxvt_term::cont_scroll_cb (time_watcher &w) 1068rxvt_term::cont_scroll_cb (time_watcher &w)
1069{ 1069{
1070 if ((scrollbar_isUp() || scrollbar_isDn()) && 1070 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1071 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1071 scr_page (scrollbar_isUp() ? UP : DN, 1))
1072 { 1072 {
1073 refresh_type |= SMOOTH_REFRESH;
1074 want_refresh = 1; 1073 want_refresh = 1;
1075 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1074 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1076 } 1075 }
1077} 1076}
1078#endif 1077#endif
… …
1082rxvt_term::sel_scroll_cb (time_watcher &w) 1081rxvt_term::sel_scroll_cb (time_watcher &w)
1083{ 1082{
1084 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1083 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1085 { 1084 {
1086 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1085 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1087 refresh_type |= SMOOTH_REFRESH;
1088 want_refresh = 1; 1086 want_refresh = 1;
1089 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1087 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1090 } 1088 }
1091} 1089}
1092#endif 1090#endif
… …
1100 : scr_page (UP, mouse_slip_wheel_speed)) 1098 : scr_page (UP, mouse_slip_wheel_speed))
1101 { 1099 {
1102 if (view_start == top_row || view_start == 0) 1100 if (view_start == top_row || view_start == 0)
1103 mouse_slip_wheel_speed = 0; 1101 mouse_slip_wheel_speed = 0;
1104 1102
1105 refresh_type |= SMOOTH_REFRESH;
1106 want_refresh = 1; 1103 want_refresh = 1;
1107 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1104 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1108 } 1105 }
1109} 1106}
1110#endif 1107#endif
… …
1140 1137
1141 memmove (cmdbuf_base, cmdbuf_ptr, n); 1138 memmove (cmdbuf_base, cmdbuf_ptr, n);
1142 cmdbuf_ptr = cmdbuf_base; 1139 cmdbuf_ptr = cmdbuf_base;
1143 cmdbuf_endp = cmdbuf_ptr + n; 1140 cmdbuf_endp = cmdbuf_ptr + n;
1144 1141
1145 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1142 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1146 1143
1147 if (r > 0) 1144 if (r > 0)
1148 { 1145 {
1149 cmdbuf_endp += r; 1146 cmdbuf_endp += r;
1150 return true; 1147 return true;
… …
1504 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1501 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1505 { 1502 {
1506 seen_resize = 1; 1503 seen_resize = 1;
1507 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1504 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1508 } 1505 }
1506
1507 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1509 1508
1510#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1509#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1511 if (OPTION (Opt_transparent)) 1510 if (OPTION (Opt_transparent))
1512 check_our_parents (); 1511 check_our_parents ();
1513#endif 1512#endif
… …
2100 2099
2101 if (scrollbar_isUpDn ()) 2100 if (scrollbar_isUpDn ())
2102 { 2101 {
2103 scrollBar.setIdle (); 2102 scrollBar.setIdle ();
2104 scrollbar_show (0); 2103 scrollbar_show (0);
2105#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2106 refresh_type &= ~SMOOTH_REFRESH;
2107#endif
2108 } 2104 }
2109 2105
2110#ifdef SELECTION_SCROLLING 2106#ifdef SELECTION_SCROLLING
2111 if (sel_scroll_ev.active) 2107 if (sel_scroll_ev.active)
2112 sel_scroll_ev.stop(); 2108 sel_scroll_ev.stop();
… …
2159 { 2155 {
2160 case Button1: 2156 case Button1:
2161 case Button3: 2157 case Button3:
2162 selection_make (ev.time); 2158 selection_make (ev.time);
2163 break; 2159 break;
2160
2164 case Button2: 2161 case Button2:
2162 if (IN_RANGE_EXC (ev.x, 0, width)
2163 && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2165 selection_request (ev.time, ev.x, ev.y); 2164 selection_request (ev.time);
2165
2166 break; 2166 break;
2167
2167#ifdef MOUSE_WHEEL 2168#ifdef MOUSE_WHEEL
2168 case Button4: 2169 case Button4:
2169 case Button5: 2170 case Button5:
2170 { 2171 {
2171 int i; 2172 int i;
… …
2798 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2799 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2799 refresh_limit++; 2800 refresh_limit++;
2800 else 2801 else
2801 { 2802 {
2802 flag = true; 2803 flag = true;
2803 scr_refresh (refresh_type); 2804 scr_refresh ();
2804 want_refresh = 1; 2805 want_refresh = 1;
2805 } 2806 }
2806 } 2807 }
2807 2808
2808 } 2809 }
… …
3770 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3771 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3771 */ 3772 */
3772void 3773void
3773rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3774rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3774{ 3775{
3775 int changed = 0;
3776 int color; 3776 int color;
3777 char *buf, *name; 3777 char *buf, *name;
3778 bool query = str[0] == '?' && !str[1]; 3778 bool query = str[0] == '?' && !str[1];
3779 int saveop = op; 3779 int saveop = op;
3780 dDisp; 3780 dDisp;
… …
3896 want_full_refresh = want_refresh = 1; 3896 want_full_refresh = want_refresh = 1;
3897 break; 3897 break;
3898#endif 3898#endif
3899 3899
3900 case Rxvt_Pixmap: 3900 case Rxvt_Pixmap:
3901 {
3901 if (*str != ';') 3902 if (*str != ';')
3902 { 3903 {
3903#if XPM_BACKGROUND 3904#if XPM_BACKGROUND
3904 scale_pixmap (""); /* reset to default scaling */ 3905 scale_pixmap (""); /* reset to default scaling */
3905 set_bgPixmap (str); /* change pixmap */ 3906 set_bgPixmap (str); /* change pixmap */
3906 scr_touch (true); 3907 scr_touch (true);
3907#endif 3908#endif
3908 } 3909 }
3909 3910
3911 int changed = 0;
3912
3910 while ((str = strchr (str, ';')) != NULL) 3913 while ((str = strchr (str, ';')) != NULL)
3911 { 3914 {
3912 str++; 3915 str++;
3913#if XPM_BACKGROUND 3916#if XPM_BACKGROUND
3914 changed += scale_pixmap (str); 3917 changed += scale_pixmap (str);
3915#endif 3918#endif
3916 } 3919 }
3917 3920
3918 if (changed) 3921 if (changed)
3919 { 3922 {
3920#ifdef XPM_BACKGROUND 3923#ifdef XPM_BACKGROUND
3921 resize_pixmap (); 3924 resize_pixmap ();
3922 scr_touch (true); 3925 scr_touch (true);
3923#endif 3926#endif
3924 } 3927 }
3928 }
3925 break; 3929 break;
3926 3930
3927 case Rxvt_restoreFG: 3931 case Rxvt_restoreFG:
3928 set_window_color (Color_fg, str); 3932 set_window_color (Color_fg, str);
3929 break; 3933 break;
… …
3975 if (query) 3979 if (query)
3976 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3980 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3977 else 3981 else
3978 { 3982 {
3979 set_locale (str); 3983 set_locale (str);
3980 pty.set_utf8_mode (enc_utf8); 3984 pty->set_utf8_mode (enc_utf8);
3981 init_xlocale (); 3985 init_xlocale ();
3982 } 3986 }
3983 break; 3987 break;
3984 3988
3985 case URxvt_view_up: 3989 case URxvt_view_up:
… …
4417rxvt_term::tt_write (const char *data, unsigned int len) 4421rxvt_term::tt_write (const char *data, unsigned int len)
4418{ 4422{
4419 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4423 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4420 return; 4424 return;
4421 4425
4422 if (pty.pty < 0) 4426 if (pty->pty < 0)
4423 return; 4427 return;
4424 4428
4425 if (v_buflen == 0) 4429 if (v_buflen == 0)
4426 { 4430 {
4427 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4431 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4428 4432
4429 if ((unsigned int)written == len) 4433 if ((unsigned int)written == len)
4430 return; 4434 return;
4431 4435
4432 data += written; 4436 data += written;
… …
4441 pty_ev.set (EVENT_READ | EVENT_WRITE); 4445 pty_ev.set (EVENT_READ | EVENT_WRITE);
4442} 4446}
4443 4447
4444void rxvt_term::pty_write () 4448void rxvt_term::pty_write ()
4445{ 4449{
4446 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4450 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4447 4451
4448 if (written > 0) 4452 if (written > 0)
4449 { 4453 {
4450 v_buflen -= written; 4454 v_buflen -= written;
4451 4455

Diff Legend

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