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.260 by root, Fri Jan 13 05:04:33 2006 UTC vs.
Revision 1.271 by root, Wed Jan 18 17:49:46 2006 UTC

… …
147 || !IN_RANGE_EXC (y, 0, nrow)) 147 || !IN_RANGE_EXC (y, 0, nrow))
148 return; 148 return;
149 149
150 for (;;) 150 for (;;)
151 { 151 {
152 const line_t &l = ROW(y - view_start); 152 const line_t &l = ROW(y + view_start);
153 153
154 text_t t = l.t[x]; 154 text_t t = l.t[x];
155 155
156 if (t != NOCHAR || !x) 156 if (t != NOCHAR || !x)
157 { 157 {
… …
443 scr_move_to (0, 1); 443 scr_move_to (0, 1);
444 return; 444 return;
445 } 445 }
446 else if (keysym == XK_End) 446 else if (keysym == XK_End)
447 { 447 {
448 scr_move_to (1, 0); 448 scr_move_to (1, 1);
449 return; 449 return;
450 } 450 }
451 } 451 }
452#endif 452#endif
453 } 453 }
… …
919#endif /* DEBUG_CMD */ 919#endif /* DEBUG_CMD */
920 tt_write (kbuf, (unsigned int)len); 920 tt_write (kbuf, (unsigned int)len);
921} 921}
922/*}}} */ 922/*}}} */
923 923
924#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 924#if defined (KEYSYM_RESOURCE)
925/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
926/* attempt to `write' count to the input buffer */
927unsigned int 925unsigned int
928rxvt_term::cmd_write (const char *str, unsigned int count) 926rxvt_term::cmd_write (const char *str, unsigned int count)
929{ 927{
930 unsigned int n, s; 928 unsigned int n, s;
931 929
… …
972 970
973 if (want_refresh) 971 if (want_refresh)
974 { 972 {
975 if (SHOULD_INVOKE (HOOK_LINE_UPDATE)) 973 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
976 { 974 {
977 int row = -view_start; 975 int row = view_start;
978 int end_row = row + nrow; 976 int end_row = row + nrow;
979 977
980 while (row > -nsaved && ROW (row - 1).is_longer ()) 978 while (row > top_row && ROW (row - 1).is_longer ())
981 --row; 979 --row;
982 980
983 do 981 do
984 { 982 {
985 int start_row = row; 983 int start_row = row;
… …
1008 while (l->is_longer () && row < end_row); 1006 while (l->is_longer () && row < end_row);
1009 } 1007 }
1010 while (row < end_row); 1008 while (row < end_row);
1011 } 1009 }
1012 1010
1013 scr_refresh (refresh_type); 1011 scr_refresh ();
1014 scrollbar_show (1); 1012 scrollbar_show (1);
1015#ifdef USE_XIM 1013#ifdef USE_XIM
1016 IMSendSpot (); 1014 IMSendSpot ();
1017#endif 1015#endif
1018 } 1016 }
… …
1021} 1019}
1022 1020
1023void 1021void
1024rxvt_term::check_cb (check_watcher &w) 1022rxvt_term::check_cb (check_watcher &w)
1025{ 1023{
1026 SET_R (this); 1024 make_current ();
1027 SET_LOCALE (locale);
1028 1025
1029 display->flush (); 1026 display->flush ();
1030 1027
1031 if (want_refresh && !flush_ev.active) 1028 if (want_refresh && !flush_ev.active)
1032 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally 1029 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1033} 1030}
1034 1031
1035void 1032void
1036rxvt_term::flush_cb (time_watcher &w) 1033rxvt_term::flush_cb (time_watcher &w)
1037{ 1034{
1038 SET_R (this); 1035 make_current ();
1039 SET_LOCALE (locale);
1040 1036
1041 refresh_limit = 1; 1037 refresh_limit = 1;
1042 refresh_count = 0; 1038 refresh_count = 0;
1043 flush (); 1039 flush ();
1044} 1040}
… …
1072rxvt_term::cont_scroll_cb (time_watcher &w) 1068rxvt_term::cont_scroll_cb (time_watcher &w)
1073{ 1069{
1074 if ((scrollbar_isUp() || scrollbar_isDn()) && 1070 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1075 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1071 scr_page (scrollbar_isUp() ? UP : DN, 1))
1076 { 1072 {
1077 refresh_type |= SMOOTH_REFRESH;
1078 want_refresh = 1; 1073 want_refresh = 1;
1079 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1074 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1080 } 1075 }
1081} 1076}
1082#endif 1077#endif
… …
1086rxvt_term::sel_scroll_cb (time_watcher &w) 1081rxvt_term::sel_scroll_cb (time_watcher &w)
1087{ 1082{
1088 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1083 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1089 { 1084 {
1090 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1085 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1091 refresh_type |= SMOOTH_REFRESH;
1092 want_refresh = 1; 1086 want_refresh = 1;
1093 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1087 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1094 } 1088 }
1095} 1089}
1096#endif 1090#endif
… …
1101{ 1095{
1102 if (mouse_slip_wheel_speed == 0 1096 if (mouse_slip_wheel_speed == 0
1103 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1097 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1104 : scr_page (UP, mouse_slip_wheel_speed)) 1098 : scr_page (UP, mouse_slip_wheel_speed))
1105 { 1099 {
1106 if (view_start == nsaved || 1100 if (view_start == top_row || view_start == 0)
1107 view_start == 0)
1108 mouse_slip_wheel_speed = 0; 1101 mouse_slip_wheel_speed = 0;
1109 1102
1110 refresh_type |= SMOOTH_REFRESH;
1111 want_refresh = 1; 1103 want_refresh = 1;
1112 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1104 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1113 } 1105 }
1114} 1106}
1115#endif 1107#endif
… …
1145 1137
1146 memmove (cmdbuf_base, cmdbuf_ptr, n); 1138 memmove (cmdbuf_base, cmdbuf_ptr, n);
1147 cmdbuf_ptr = cmdbuf_base; 1139 cmdbuf_ptr = cmdbuf_base;
1148 cmdbuf_endp = cmdbuf_ptr + n; 1140 cmdbuf_endp = cmdbuf_ptr + n;
1149 1141
1150 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1142 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1151 1143
1152 if (r > 0) 1144 if (r > 0)
1153 { 1145 {
1154 cmdbuf_endp += r; 1146 cmdbuf_endp += r;
1155 return true; 1147 return true;
… …
1173} 1165}
1174 1166
1175void 1167void
1176rxvt_term::pty_cb (io_watcher &w, short revents) 1168rxvt_term::pty_cb (io_watcher &w, short revents)
1177{ 1169{
1178 SET_R (this); 1170 make_current ();
1179 SET_LOCALE (locale);
1180 1171
1181 if (revents & EVENT_READ) 1172 if (revents & EVENT_READ)
1182 // loop, but don't allow a single term to monopolize us 1173 // loop, but don't allow a single term to monopolize us
1183 while (pty_fill ()) 1174 while (pty_fill ())
1184 if (cmd_parse ()) 1175 if (cmd_parse ())
… …
1216} 1207}
1217 1208
1218void 1209void
1219rxvt_term::pointer_cb (time_watcher &w) 1210rxvt_term::pointer_cb (time_watcher &w)
1220{ 1211{
1221 SET_R (this); 1212 make_current ();
1222 SET_LOCALE (locale);
1223 1213
1224 pointer_blank (); 1214 pointer_blank ();
1225} 1215}
1226#endif 1216#endif
1227 1217
… …
1306 1296
1307/*{{{ process an X event */ 1297/*{{{ process an X event */
1308void 1298void
1309rxvt_term::x_cb (XEvent &ev) 1299rxvt_term::x_cb (XEvent &ev)
1310{ 1300{
1301 make_current ();
1302
1311 dDisp; 1303 dDisp;
1312 1304
1313 SET_R (this);
1314 SET_LOCALE (locale);
1315
1316 if (ev.xany.window == vt 1305 if (ev.xany.window == vt
1306 && SHOULD_INVOKE (HOOK_X_EVENT)
1317 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1307 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1318 return; 1308 return;
1319 1309
1320 // for XQueryPointer 1310 // for XQueryPointer
1321 Window unused_root, unused_child; 1311 Window unused_root, unused_child;
… …
1512 { 1502 {
1513 seen_resize = 1; 1503 seen_resize = 1;
1514 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1504 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1515 } 1505 }
1516 1506
1507 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1508
1517#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1509#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1518 if (OPTION (Opt_transparent)) 1510 if (OPTION (Opt_transparent))
1519 check_our_parents (); 1511 check_our_parents ();
1520#endif 1512#endif
1521 } 1513 }
… …
1592 if (isScrollbarWindow (ev.xany.window)) 1584 if (isScrollbarWindow (ev.xany.window))
1593 { 1585 {
1594 scrollBar.setIdle (); 1586 scrollBar.setIdle ();
1595 scrollbar_show (0); 1587 scrollbar_show (0);
1596 } 1588 }
1597#ifdef MENUBAR
1598 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1599 menubar_expose ();
1600#endif
1601 1589
1602#ifdef TRANSPARENT 1590#ifdef TRANSPARENT
1603 if (am_transparent && ev.xany.window == parent[0]) 1591 if (am_transparent && ev.xany.window == parent[0])
1604 XClearWindow (disp, ev.xany.window); 1592 XClearWindow (disp, ev.xany.window);
1605#endif 1593#endif
1606 } 1594 }
1607 break; 1595 break;
1608 1596
1609 case MotionNotify: 1597 case MotionNotify:
1610 printf ("motion notify\n");//D
1611#ifdef POINTER_BLANK 1598#ifdef POINTER_BLANK
1612 if (hidden_pointer) 1599 if (hidden_pointer)
1613 pointer_unblank (); 1600 pointer_unblank ();
1614#endif 1601#endif
1615#if MENUBAR
1616 if (isMenuBarWindow (ev.xany.window))
1617 {
1618 menubar_control (ev.xbutton);
1619 break;
1620 }
1621#endif
1622 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1602 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1623 break; 1603 break;
1624 1604
1625 if (ev.xany.window == vt) 1605 if (ev.xany.window == vt)
1626 { 1606 {
1607 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1627 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1608 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1628 ; // nop 1609 ; // nop
1629 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1610 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1630 { 1611 {
1631 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1612 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1632 ; 1613 ;
… …
1824 1805
1825#if TRANSPARENT 1806#if TRANSPARENT
1826void 1807void
1827rxvt_term::rootwin_cb (XEvent &ev) 1808rxvt_term::rootwin_cb (XEvent &ev)
1828{ 1809{
1829 SET_R (this); 1810 make_current ();
1830 SET_LOCALE (locale);
1831 1811
1832 switch (ev.type) 1812 switch (ev.type)
1833 { 1813 {
1834 case PropertyNotify: 1814 case PropertyNotify:
1835 /* 1815 /*
… …
2104 } 2084 }
2105 } 2085 }
2106 2086
2107 return; 2087 return;
2108 } 2088 }
2109
2110#if MENUBAR
2111 /*
2112 * Menubar window processing of button press
2113 */
2114 if (isMenuBarWindow (ev.window))
2115 menubar_control (ev);
2116#endif
2117} 2089}
2118 2090
2119void 2091void
2120rxvt_term::button_release (XButtonEvent &ev) 2092rxvt_term::button_release (XButtonEvent &ev)
2121{ 2093{
… …
2127 2099
2128 if (scrollbar_isUpDn ()) 2100 if (scrollbar_isUpDn ())
2129 { 2101 {
2130 scrollBar.setIdle (); 2102 scrollBar.setIdle ();
2131 scrollbar_show (0); 2103 scrollbar_show (0);
2132#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2133 refresh_type &= ~SMOOTH_REFRESH;
2134#endif
2135 } 2104 }
2136 2105
2137#ifdef SELECTION_SCROLLING 2106#ifdef SELECTION_SCROLLING
2138 if (sel_scroll_ev.active) 2107 if (sel_scroll_ev.active)
2139 sel_scroll_ev.stop(); 2108 sel_scroll_ev.stop();
… …
2230 } 2199 }
2231 break; 2200 break;
2232#endif 2201#endif
2233 } 2202 }
2234 } 2203 }
2235#ifdef MENUBAR
2236 else if (isMenuBarWindow (ev.window))
2237 menubar_control (ev);
2238#endif
2239} 2204}
2240 2205
2241#ifdef TRANSPARENT 2206#ifdef TRANSPARENT
2242#if TINTING 2207#if TINTING
2243/* taken from aterm-0.4.2 */ 2208/* taken from aterm-0.4.2 */
… …
2786 } 2751 }
2787 2752
2788 // scr_add_lines only works for nlines <= nrow - 1. 2753 // scr_add_lines only works for nlines <= nrow - 1.
2789 if (nlines >= nrow - 1) 2754 if (nlines >= nrow - 1)
2790 { 2755 {
2756 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2791 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2757 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2792 scr_add_lines (buf, str - buf, nlines); 2758 scr_add_lines (buf, str - buf, nlines);
2793 2759
2794 nlines = 0; 2760 nlines = 0;
2795 str = buf; 2761 str = buf;
2796 eol = str + min (ncol, UBUFSIZ); 2762 eol = str + min (ncol, UBUFSIZ);
… …
2811 2777
2812 seq_begin = cmdbuf_ptr; 2778 seq_begin = cmdbuf_ptr;
2813 ch = next_char (); 2779 ch = next_char ();
2814 } 2780 }
2815 2781
2782 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2816 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2783 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2817 scr_add_lines (buf, str - buf, nlines); 2784 scr_add_lines (buf, str - buf, nlines);
2818 2785
2819 /* 2786 /*
2820 * If there have been a lot of new lines, then update the screen 2787 * If there have been a lot of new lines, then update the screen
2821 * What the heck I'll cheat and only refresh less than every page-full. 2788 * What the heck I'll cheat and only refresh less than every page-full.
… …
2827 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2794 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2828 refresh_limit++; 2795 refresh_limit++;
2829 else 2796 else
2830 { 2797 {
2831 flag = true; 2798 flag = true;
2832 scr_refresh (refresh_type); 2799 scr_refresh ();
2833 want_refresh = 1; 2800 want_refresh = 1;
2834 } 2801 }
2835 } 2802 }
2836 2803
2837 } 2804 }
… …
3799 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3766 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3800 */ 3767 */
3801void 3768void
3802rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3769rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3803{ 3770{
3804 int changed = 0;
3805 int color; 3771 int color;
3806 char *buf, *name; 3772 char *buf, *name;
3807 bool query = str[0] == '?' && !str[1]; 3773 bool query = str[0] == '?' && !str[1];
3808 int saveop = op; 3774 int saveop = op;
3809 dDisp; 3775 dDisp;
… …
3925 want_full_refresh = want_refresh = 1; 3891 want_full_refresh = want_refresh = 1;
3926 break; 3892 break;
3927#endif 3893#endif
3928 3894
3929 case Rxvt_Pixmap: 3895 case Rxvt_Pixmap:
3896 {
3930 if (*str != ';') 3897 if (*str != ';')
3931 { 3898 {
3932#if XPM_BACKGROUND 3899#if XPM_BACKGROUND
3933 scale_pixmap (""); /* reset to default scaling */ 3900 scale_pixmap (""); /* reset to default scaling */
3934 set_bgPixmap (str); /* change pixmap */ 3901 set_bgPixmap (str); /* change pixmap */
3935 scr_touch (true); 3902 scr_touch (true);
3936#endif 3903#endif
3937 } 3904 }
3938 3905
3906 int changed = 0;
3907
3939 while ((str = strchr (str, ';')) != NULL) 3908 while ((str = strchr (str, ';')) != NULL)
3940 { 3909 {
3941 str++; 3910 str++;
3942#if XPM_BACKGROUND 3911#if XPM_BACKGROUND
3943 changed += scale_pixmap (str); 3912 changed += scale_pixmap (str);
3944#endif 3913#endif
3945 } 3914 }
3946 3915
3947 if (changed) 3916 if (changed)
3948 { 3917 {
3949#ifdef XPM_BACKGROUND 3918#ifdef XPM_BACKGROUND
3950 resize_pixmap (); 3919 resize_pixmap ();
3951 scr_touch (true); 3920 scr_touch (true);
3952#endif 3921#endif
3953 } 3922 }
3923 }
3954 break; 3924 break;
3955 3925
3956 case Rxvt_restoreFG: 3926 case Rxvt_restoreFG:
3957 set_window_color (Color_fg, str); 3927 set_window_color (Color_fg, str);
3958 break; 3928 break;
… …
3962 3932
3963 case XTerm_logfile: 3933 case XTerm_logfile:
3964 // TODO, when secure mode? 3934 // TODO, when secure mode?
3965 break; 3935 break;
3966 3936
3967#ifdef MENUBAR
3968 case URxvt_Menu:
3969 if (OPTION (Opt_insecure))
3970 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3971 break;
3972#endif
3973#if 0 3937#if 0
3974 case Rxvt_dumpscreen: /* no error notices */ 3938 case Rxvt_dumpscreen: /* no error notices */
3975 { 3939 {
3976 int fd; 3940 int fd;
3977 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3941 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
… …
4010 if (query) 3974 if (query)
4011 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);
4012 else 3976 else
4013 { 3977 {
4014 set_locale (str); 3978 set_locale (str);
4015 pty.set_utf8_mode (enc_utf8); 3979 pty->set_utf8_mode (enc_utf8);
4016 init_xlocale (); 3980 init_xlocale ();
4017 } 3981 }
4018 break; 3982 break;
4019 3983
4020 case URxvt_view_up: 3984 case URxvt_view_up:
… …
4094 { 5, PrivMode_rVideo }, 4058 { 5, PrivMode_rVideo },
4095 { 6, PrivMode_relOrigin }, 4059 { 6, PrivMode_relOrigin },
4096 { 7, PrivMode_Autowrap }, 4060 { 7, PrivMode_Autowrap },
4097 // 8, bi-directional support mode 4061 // 8, bi-directional support mode
4098 { 9, PrivMode_MouseX10 }, 4062 { 9, PrivMode_MouseX10 },
4099#ifdef menuBar_esc
4100 { menuBar_esc, PrivMode_menuBar },
4101#endif
4102 // 18, 19 printing-related 4063 // 18, 19 printing-related
4103 { 25, PrivMode_VisibleCursor }, 4064 { 25, PrivMode_VisibleCursor },
4104#ifdef scrollBar_esc 4065#ifdef scrollBar_esc
4105 { scrollBar_esc, PrivMode_scrollBar }, 4066 { scrollBar_esc, PrivMode_scrollBar },
4106#endif 4067#endif
… …
4201 /* case 8: - auto repeat, can't do on a per window basis */ 4162 /* case 8: - auto repeat, can't do on a per window basis */
4202 case 9: /* X10 mouse reporting */ 4163 case 9: /* X10 mouse reporting */
4203 if (state) /* orthogonal */ 4164 if (state) /* orthogonal */
4204 priv_modes &= ~PrivMode_MouseX11; 4165 priv_modes &= ~PrivMode_MouseX11;
4205 break; 4166 break;
4206#ifdef menuBar_esc
4207 case menuBar_esc:
4208#ifdef MENUBAR
4209 map_menuBar (state);
4210#endif
4211 break;
4212#endif
4213#ifdef scrollBar_esc 4167#ifdef scrollBar_esc
4214 case scrollBar_esc: 4168 case scrollBar_esc:
4215 if (scrollbar_mapping (state)) 4169 if (scrollbar_mapping (state))
4216 { 4170 {
4217 resize_all_windows (0, 0, 0); 4171 resize_all_windows (0, 0, 0);
… …
4462rxvt_term::tt_write (const char *data, unsigned int len) 4416rxvt_term::tt_write (const char *data, unsigned int len)
4463{ 4417{
4464 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)))
4465 return; 4419 return;
4466 4420
4467 if (pty.pty < 0) 4421 if (pty->pty < 0)
4468 return; 4422 return;
4469 4423
4470 if (v_buflen == 0) 4424 if (v_buflen == 0)
4471 { 4425 {
4472 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));
4473 4427
4474 if ((unsigned int)written == len) 4428 if ((unsigned int)written == len)
4475 return; 4429 return;
4476 4430
4477 data += written; 4431 data += written;
… …
4486 pty_ev.set (EVENT_READ | EVENT_WRITE); 4440 pty_ev.set (EVENT_READ | EVENT_WRITE);
4487} 4441}
4488 4442
4489void rxvt_term::pty_write () 4443void rxvt_term::pty_write ()
4490{ 4444{
4491 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));
4492 4446
4493 if (written > 0) 4447 if (written > 0)
4494 { 4448 {
4495 v_buflen -= written; 4449 v_buflen -= written;
4496 4450

Diff Legend

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