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.259 by root, Fri Jan 13 04:59:04 2006 UTC vs.
Revision 1.273 by ayin, Thu Jan 19 23:13:19 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 }
… …
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);
… …
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
1310 // for XQueryPointer
1320 Window unused_root, unused_child; 1311 Window unused_root, unused_child;
1321 int unused_root_x, unused_root_y; 1312 int unused_root_x, unused_root_y;
1322 unsigned int unused_mask; 1313 unsigned int unused_mask;
1323 1314
1324 switch (ev.type) 1315 switch (ev.type)
… …
1511 { 1502 {
1512 seen_resize = 1; 1503 seen_resize = 1;
1513 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1504 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1514 } 1505 }
1515 1506
1507 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1508
1516#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1509#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1517 if (OPTION (Opt_transparent)) 1510 if (OPTION (Opt_transparent))
1518 check_our_parents (); 1511 check_our_parents ();
1519#endif 1512#endif
1520 } 1513 }
… …
1591 if (isScrollbarWindow (ev.xany.window)) 1584 if (isScrollbarWindow (ev.xany.window))
1592 { 1585 {
1593 scrollBar.setIdle (); 1586 scrollBar.setIdle ();
1594 scrollbar_show (0); 1587 scrollbar_show (0);
1595 } 1588 }
1596#ifdef MENUBAR
1597 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1598 menubar_expose ();
1599#endif
1600 1589
1601#ifdef TRANSPARENT 1590#ifdef TRANSPARENT
1602 if (am_transparent && ev.xany.window == parent[0]) 1591 if (am_transparent && ev.xany.window == parent[0])
1603 XClearWindow (disp, ev.xany.window); 1592 XClearWindow (disp, ev.xany.window);
1604#endif 1593#endif
1605 } 1594 }
1606 break; 1595 break;
1607 1596
1608 case MotionNotify: 1597 case MotionNotify:
1609 printf ("motion notify\n");//D
1610#ifdef POINTER_BLANK 1598#ifdef POINTER_BLANK
1611 if (hidden_pointer) 1599 if (hidden_pointer)
1612 pointer_unblank (); 1600 pointer_unblank ();
1613#endif 1601#endif
1614#if MENUBAR
1615 if (isMenuBarWindow (ev.xany.window))
1616 {
1617 menubar_control (ev.xbutton);
1618 break;
1619 }
1620#endif
1621 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1602 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1622 break; 1603 break;
1623 1604
1624 if (ev.xany.window == vt) 1605 if (ev.xany.window == vt)
1625 { 1606 {
1607 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1626 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1608 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1627 ; // nop 1609 ; // nop
1628 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1610 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1629 { 1611 {
1630 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1612 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1631 ; 1613 ;
… …
1823 1805
1824#if TRANSPARENT 1806#if TRANSPARENT
1825void 1807void
1826rxvt_term::rootwin_cb (XEvent &ev) 1808rxvt_term::rootwin_cb (XEvent &ev)
1827{ 1809{
1828 SET_R (this); 1810 make_current ();
1829 SET_LOCALE (locale);
1830 1811
1831 switch (ev.type) 1812 switch (ev.type)
1832 { 1813 {
1833 case PropertyNotify: 1814 case PropertyNotify:
1834 /* 1815 /*
… …
2103 } 2084 }
2104 } 2085 }
2105 2086
2106 return; 2087 return;
2107 } 2088 }
2108
2109#if MENUBAR
2110 /*
2111 * Menubar window processing of button press
2112 */
2113 if (isMenuBarWindow (ev.window))
2114 menubar_control (ev);
2115#endif
2116} 2089}
2117 2090
2118void 2091void
2119rxvt_term::button_release (XButtonEvent &ev) 2092rxvt_term::button_release (XButtonEvent &ev)
2120{ 2093{
… …
2126 2099
2127 if (scrollbar_isUpDn ()) 2100 if (scrollbar_isUpDn ())
2128 { 2101 {
2129 scrollBar.setIdle (); 2102 scrollBar.setIdle ();
2130 scrollbar_show (0); 2103 scrollbar_show (0);
2131#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2132 refresh_type &= ~SMOOTH_REFRESH;
2133#endif
2134 } 2104 }
2135 2105
2136#ifdef SELECTION_SCROLLING 2106#ifdef SELECTION_SCROLLING
2137 if (sel_scroll_ev.active) 2107 if (sel_scroll_ev.active)
2138 sel_scroll_ev.stop(); 2108 sel_scroll_ev.stop();
… …
2185 { 2155 {
2186 case Button1: 2156 case Button1:
2187 case Button3: 2157 case Button3:
2188 selection_make (ev.time); 2158 selection_make (ev.time);
2189 break; 2159 break;
2160
2190 case Button2: 2161 case Button2:
2191 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 }
2192 break; 2170 break;
2171
2193#ifdef MOUSE_WHEEL 2172#ifdef MOUSE_WHEEL
2194 case Button4: 2173 case Button4:
2195 case Button5: 2174 case Button5:
2196 { 2175 {
2197 int i; 2176 int i;
… …
2229 } 2208 }
2230 break; 2209 break;
2231#endif 2210#endif
2232 } 2211 }
2233 } 2212 }
2234#ifdef MENUBAR
2235 else if (isMenuBarWindow (ev.window))
2236 menubar_control (ev);
2237#endif
2238} 2213}
2239 2214
2240#ifdef TRANSPARENT 2215#ifdef TRANSPARENT
2241#if TINTING 2216#if TINTING
2242/* taken from aterm-0.4.2 */ 2217/* taken from aterm-0.4.2 */
… …
2785 } 2760 }
2786 2761
2787 // scr_add_lines only works for nlines <= nrow - 1. 2762 // scr_add_lines only works for nlines <= nrow - 1.
2788 if (nlines >= nrow - 1) 2763 if (nlines >= nrow - 1)
2789 { 2764 {
2765 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2790 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2766 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2791 scr_add_lines (buf, str - buf, nlines); 2767 scr_add_lines (buf, str - buf, nlines);
2792 2768
2793 nlines = 0; 2769 nlines = 0;
2794 str = buf; 2770 str = buf;
2795 eol = str + min (ncol, UBUFSIZ); 2771 eol = str + min (ncol, UBUFSIZ);
… …
2810 2786
2811 seq_begin = cmdbuf_ptr; 2787 seq_begin = cmdbuf_ptr;
2812 ch = next_char (); 2788 ch = next_char ();
2813 } 2789 }
2814 2790
2791 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2815 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2792 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2816 scr_add_lines (buf, str - buf, nlines); 2793 scr_add_lines (buf, str - buf, nlines);
2817 2794
2818 /* 2795 /*
2819 * If there have been a lot of new lines, then update the screen 2796 * If there have been a lot of new lines, then update the screen
2820 * What the heck I'll cheat and only refresh less than every page-full. 2797 * What the heck I'll cheat and only refresh less than every page-full.
… …
2826 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2803 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2827 refresh_limit++; 2804 refresh_limit++;
2828 else 2805 else
2829 { 2806 {
2830 flag = true; 2807 flag = true;
2831 scr_refresh (refresh_type); 2808 scr_refresh ();
2832 want_refresh = 1; 2809 want_refresh = 1;
2833 } 2810 }
2834 } 2811 }
2835 2812
2836 } 2813 }
… …
3798 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3775 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3799 */ 3776 */
3800void 3777void
3801rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3778rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3802{ 3779{
3803 int changed = 0;
3804 int color; 3780 int color;
3805 char *buf, *name; 3781 char *buf, *name;
3806 bool query = str[0] == '?' && !str[1]; 3782 bool query = str[0] == '?' && !str[1];
3807 int saveop = op; 3783 int saveop = op;
3808 dDisp; 3784 dDisp;
… …
3924 want_full_refresh = want_refresh = 1; 3900 want_full_refresh = want_refresh = 1;
3925 break; 3901 break;
3926#endif 3902#endif
3927 3903
3928 case Rxvt_Pixmap: 3904 case Rxvt_Pixmap:
3905 {
3929 if (*str != ';') 3906 if (*str != ';')
3930 { 3907 {
3931#if XPM_BACKGROUND 3908#if XPM_BACKGROUND
3932 scale_pixmap (""); /* reset to default scaling */ 3909 scale_pixmap (""); /* reset to default scaling */
3933 set_bgPixmap (str); /* change pixmap */ 3910 set_bgPixmap (str); /* change pixmap */
3934 scr_touch (true); 3911 scr_touch (true);
3935#endif 3912#endif
3936 } 3913 }
3937 3914
3915 int changed = 0;
3916
3938 while ((str = strchr (str, ';')) != NULL) 3917 while ((str = strchr (str, ';')) != NULL)
3939 { 3918 {
3940 str++; 3919 str++;
3941#if XPM_BACKGROUND 3920#if XPM_BACKGROUND
3942 changed += scale_pixmap (str); 3921 changed += scale_pixmap (str);
3943#endif 3922#endif
3944 } 3923 }
3945 3924
3946 if (changed) 3925 if (changed)
3947 { 3926 {
3948#ifdef XPM_BACKGROUND 3927#ifdef XPM_BACKGROUND
3949 resize_pixmap (); 3928 resize_pixmap ();
3950 scr_touch (true); 3929 scr_touch (true);
3951#endif 3930#endif
3952 } 3931 }
3932 }
3953 break; 3933 break;
3954 3934
3955 case Rxvt_restoreFG: 3935 case Rxvt_restoreFG:
3956 set_window_color (Color_fg, str); 3936 set_window_color (Color_fg, str);
3957 break; 3937 break;
… …
3961 3941
3962 case XTerm_logfile: 3942 case XTerm_logfile:
3963 // TODO, when secure mode? 3943 // TODO, when secure mode?
3964 break; 3944 break;
3965 3945
3966#ifdef MENUBAR
3967 case URxvt_Menu:
3968 if (OPTION (Opt_insecure))
3969 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3970 break;
3971#endif
3972#if 0 3946#if 0
3973 case Rxvt_dumpscreen: /* no error notices */ 3947 case Rxvt_dumpscreen: /* no error notices */
3974 { 3948 {
3975 int fd; 3949 int fd;
3976 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3950 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
… …
4009 if (query) 3983 if (query)
4010 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3984 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
4011 else 3985 else
4012 { 3986 {
4013 set_locale (str); 3987 set_locale (str);
4014 pty.set_utf8_mode (enc_utf8); 3988 pty->set_utf8_mode (enc_utf8);
4015 init_xlocale (); 3989 init_xlocale ();
4016 } 3990 }
4017 break; 3991 break;
4018 3992
4019 case URxvt_view_up: 3993 case URxvt_view_up:
… …
4093 { 5, PrivMode_rVideo }, 4067 { 5, PrivMode_rVideo },
4094 { 6, PrivMode_relOrigin }, 4068 { 6, PrivMode_relOrigin },
4095 { 7, PrivMode_Autowrap }, 4069 { 7, PrivMode_Autowrap },
4096 // 8, bi-directional support mode 4070 // 8, bi-directional support mode
4097 { 9, PrivMode_MouseX10 }, 4071 { 9, PrivMode_MouseX10 },
4098#ifdef menuBar_esc
4099 { menuBar_esc, PrivMode_menuBar },
4100#endif
4101 // 18, 19 printing-related 4072 // 18, 19 printing-related
4102 { 25, PrivMode_VisibleCursor }, 4073 { 25, PrivMode_VisibleCursor },
4103#ifdef scrollBar_esc 4074#ifdef scrollBar_esc
4104 { scrollBar_esc, PrivMode_scrollBar }, 4075 { scrollBar_esc, PrivMode_scrollBar },
4105#endif 4076#endif
… …
4200 /* case 8: - auto repeat, can't do on a per window basis */ 4171 /* case 8: - auto repeat, can't do on a per window basis */
4201 case 9: /* X10 mouse reporting */ 4172 case 9: /* X10 mouse reporting */
4202 if (state) /* orthogonal */ 4173 if (state) /* orthogonal */
4203 priv_modes &= ~PrivMode_MouseX11; 4174 priv_modes &= ~PrivMode_MouseX11;
4204 break; 4175 break;
4205#ifdef menuBar_esc
4206 case menuBar_esc:
4207#ifdef MENUBAR
4208 map_menuBar (state);
4209#endif
4210 break;
4211#endif
4212#ifdef scrollBar_esc 4176#ifdef scrollBar_esc
4213 case scrollBar_esc: 4177 case scrollBar_esc:
4214 if (scrollbar_mapping (state)) 4178 if (scrollbar_mapping (state))
4215 { 4179 {
4216 resize_all_windows (0, 0, 0); 4180 resize_all_windows (0, 0, 0);
… …
4461rxvt_term::tt_write (const char *data, unsigned int len) 4425rxvt_term::tt_write (const char *data, unsigned int len)
4462{ 4426{
4463 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4427 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4464 return; 4428 return;
4465 4429
4466 if (pty.pty < 0) 4430 if (pty->pty < 0)
4467 return; 4431 return;
4468 4432
4469 if (v_buflen == 0) 4433 if (v_buflen == 0)
4470 { 4434 {
4471 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4435 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4472 4436
4473 if ((unsigned int)written == len) 4437 if ((unsigned int)written == len)
4474 return; 4438 return;
4475 4439
4476 data += written; 4440 data += written;
… …
4485 pty_ev.set (EVENT_READ | EVENT_WRITE); 4449 pty_ev.set (EVENT_READ | EVENT_WRITE);
4486} 4450}
4487 4451
4488void rxvt_term::pty_write () 4452void rxvt_term::pty_write ()
4489{ 4453{
4490 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4454 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4491 4455
4492 if (written > 0) 4456 if (written > 0)
4493 { 4457 {
4494 v_buflen -= written; 4458 v_buflen -= written;
4495 4459

Diff Legend

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