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.271 by root, Wed Jan 18 17:49:46 2006 UTC

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();
2798 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2794 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2799 refresh_limit++; 2795 refresh_limit++;
2800 else 2796 else
2801 { 2797 {
2802 flag = true; 2798 flag = true;
2803 scr_refresh (refresh_type); 2799 scr_refresh ();
2804 want_refresh = 1; 2800 want_refresh = 1;
2805 } 2801 }
2806 } 2802 }
2807 2803
2808 } 2804 }
3770 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3766 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3771 */ 3767 */
3772void 3768void
3773rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3769rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3774{ 3770{
3775 int changed = 0;
3776 int color; 3771 int color;
3777 char *buf, *name; 3772 char *buf, *name;
3778 bool query = str[0] == '?' && !str[1]; 3773 bool query = str[0] == '?' && !str[1];
3779 int saveop = op; 3774 int saveop = op;
3780 dDisp; 3775 dDisp;
3896 want_full_refresh = want_refresh = 1; 3891 want_full_refresh = want_refresh = 1;
3897 break; 3892 break;
3898#endif 3893#endif
3899 3894
3900 case Rxvt_Pixmap: 3895 case Rxvt_Pixmap:
3896 {
3901 if (*str != ';') 3897 if (*str != ';')
3902 { 3898 {
3903#if XPM_BACKGROUND 3899#if XPM_BACKGROUND
3904 scale_pixmap (""); /* reset to default scaling */ 3900 scale_pixmap (""); /* reset to default scaling */
3905 set_bgPixmap (str); /* change pixmap */ 3901 set_bgPixmap (str); /* change pixmap */
3906 scr_touch (true); 3902 scr_touch (true);
3907#endif 3903#endif
3908 } 3904 }
3909 3905
3906 int changed = 0;
3907
3910 while ((str = strchr (str, ';')) != NULL) 3908 while ((str = strchr (str, ';')) != NULL)
3911 { 3909 {
3912 str++; 3910 str++;
3913#if XPM_BACKGROUND 3911#if XPM_BACKGROUND
3914 changed += scale_pixmap (str); 3912 changed += scale_pixmap (str);
3915#endif 3913#endif
3916 } 3914 }
3917 3915
3918 if (changed) 3916 if (changed)
3919 { 3917 {
3920#ifdef XPM_BACKGROUND 3918#ifdef XPM_BACKGROUND
3921 resize_pixmap (); 3919 resize_pixmap ();
3922 scr_touch (true); 3920 scr_touch (true);
3923#endif 3921#endif
3924 } 3922 }
3923 }
3925 break; 3924 break;
3926 3925
3927 case Rxvt_restoreFG: 3926 case Rxvt_restoreFG:
3928 set_window_color (Color_fg, str); 3927 set_window_color (Color_fg, str);
3929 break; 3928 break;
3975 if (query) 3974 if (query)
3976 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3975 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3977 else 3976 else
3978 { 3977 {
3979 set_locale (str); 3978 set_locale (str);
3980 pty.set_utf8_mode (enc_utf8); 3979 pty->set_utf8_mode (enc_utf8);
3981 init_xlocale (); 3980 init_xlocale ();
3982 } 3981 }
3983 break; 3982 break;
3984 3983
3985 case URxvt_view_up: 3984 case URxvt_view_up:
4417rxvt_term::tt_write (const char *data, unsigned int len) 4416rxvt_term::tt_write (const char *data, unsigned int len)
4418{ 4417{
4419 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4418 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4420 return; 4419 return;
4421 4420
4422 if (pty.pty < 0) 4421 if (pty->pty < 0)
4423 return; 4422 return;
4424 4423
4425 if (v_buflen == 0) 4424 if (v_buflen == 0)
4426 { 4425 {
4427 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4426 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4428 4427
4429 if ((unsigned int)written == len) 4428 if ((unsigned int)written == len)
4430 return; 4429 return;
4431 4430
4432 data += written; 4431 data += written;
4441 pty_ev.set (EVENT_READ | EVENT_WRITE); 4440 pty_ev.set (EVENT_READ | EVENT_WRITE);
4442} 4441}
4443 4442
4444void rxvt_term::pty_write () 4443void rxvt_term::pty_write ()
4445{ 4444{
4446 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4445 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4447 4446
4448 if (written > 0) 4447 if (written > 0)
4449 { 4448 {
4450 v_buflen -= written; 4449 v_buflen -= written;
4451 4450

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines