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.198 by root, Sat Feb 19 01:07:58 2005 UTC vs.
Revision 1.227 by root, Mon Jan 2 15:35:43 2006 UTC

… …
43 * along with this program; if not, write to the Free Software 43 * along with this program; if not, write to the Free Software
44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
45 *----------------------------------------------------------------------*/ 45 *----------------------------------------------------------------------*/
46 46
47/*{{{ includes: */ 47/*{{{ includes: */
48#include "../config.h" /* NECESSARY */ 48#include "../config.h"
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h"
50#include "rxvtperl.h"
50#include "version.h" 51#include "version.h"
51#include "command.h" 52#include "command.h"
53
54#if HAVE_SCHED_YIELD
55# include <sched.h>
56#endif
52 57
53#ifdef KEYSYM_RESOURCE 58#ifdef KEYSYM_RESOURCE
54# include "keyboard.h" 59# include "keyboard.h"
55#endif 60#endif
56 61
… …
135rxvt_term::iso14755_54 (int x, int y) 140rxvt_term::iso14755_54 (int x, int y)
136{ 141{
137 x = Pixel2Col (x); 142 x = Pixel2Col (x);
138 y = Pixel2Row (y); 143 y = Pixel2Row (y);
139 144
140 if (x < 0 || x >= TermWin.ncol 145 if (!IN_RANGE_EXC (x, 0, ncol)
141 || y < 0 || y >= TermWin.nrow) 146 || !IN_RANGE_EXC (y, 0, nrow))
142 return; 147 return;
143 148
144 for (;;) 149 for (;;)
145 { 150 {
146 text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x]; 151 const line_t &l = ROW(y - view_start);
152
153 text_t t = l.t[x];
147 154
148 if (t != NOCHAR || !x) 155 if (t != NOCHAR || !x)
149 { 156 {
150 iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x], 157 iso14755_51 (l.t[x], l.r[x], x, y);
151 screen.rend[y + TermWin.saveLines - TermWin.view_start][x]);
152 iso14755buf = ISO_14755_54; 158 iso14755buf = ISO_14755_54;
153 break; 159 break;
154 } 160 }
155 161
156 x--; 162 x--;
157 } 163 }
158
159} 164}
160#endif
161 165
162#if ENABLE_OVERLAY
163void 166void
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r) 167rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
165{ 168{
166 rxvt_fontset *fs = FONTSET (r); 169 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)]; 170 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2; 171 wchar_t *chr, *alloc, ch2, *fname;
169 int len; 172 int len;
170 173
174 fname = rxvt_utf8towcs (f->name);
175
171#if ENABLE_COMBINING 176# if ENABLE_COMBINING
172 if (IS_COMPOSE (ch)) 177 if (IS_COMPOSE (ch))
173 { 178 {
174 len = rxvt_composite.expand (ch, 0); 179 len = rxvt_composite.expand (ch, 0);
175 alloc = chr = new wchar_t[len]; 180 alloc = chr = new wchar_t[len];
176 rxvt_composite.expand (ch, chr); 181 rxvt_composite.expand (ch, chr);
177 } 182 }
178 else 183 else
179#endif 184# endif
180 { 185 {
181 ch2 = ch; 186 ch2 = ch;
182 187
183 alloc = 0; 188 alloc = 0;
184 chr = &ch2; 189 chr = &ch2;
185 len = 1; 190 len = 1;
186 } 191 }
187 192
188 int width = strlen (f->name); 193 char attr[80]; // plenty
189 194
190 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); 195 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
196 (int)r,
197 fgcolor_of (r), bgcolor_of (r),
198 r & RS_Bold ? " bold" : "",
199 r & RS_Italic ? " italic" : "",
200 r & RS_Blink ? " blink" : "",
201 r & RS_RVid ? " rvid" : "",
202 r & RS_Uline ? " uline" : "",
203 r & RS_Careful ? " careful" : "");
204
205 int width = wcswidth (fname, wcslen (fname));
206
207 max_it (width, 8+5); // for char + hey
208 max_it (width, strlen (attr));
209
210 if (y >= 0)
211 {
212 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
213 x = 0;
214 }
215
216 scr_overlay_new (x, y, width, len + 2);
191 217
192 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 218 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
193 219
194 for (int y = 0; y < len; y++) 220 for (int y = 0; y < len; y++)
195 { 221 {
… …
198 ch = *chr++; 224 ch = *chr++;
199 225
200 sprintf (buf, "%8x", ch); 226 sprintf (buf, "%8x", ch);
201 scr_overlay_set (0, y, buf); 227 scr_overlay_set (0, y, buf);
202 scr_overlay_set (9, y, '='); 228 scr_overlay_set (9, y, '=');
203#if !UNICODE3 229# if !UNICODE3
204 if (ch >= 0x10000) 230 if (ch >= 0x10000)
205 ch = 0xfffd; 231 ch = 0xfffd;
206#endif 232# endif
207 scr_overlay_set (11, y, ch, r); 233 scr_overlay_set (11, y, ch, r);
208 scr_overlay_set (12, y, NOCHAR, r); 234 scr_overlay_set (12, y, NOCHAR, r);
209 } 235 }
210 236
237 scr_overlay_set (0, len , attr);
211 scr_overlay_set (0, len, f->name); 238 scr_overlay_set (0, len + 1, fname);
212 239
240 free (fname);
241
213#if ENABLE_COMBINING 242# if ENABLE_COMBINING
214 if (alloc) 243 if (alloc)
215 delete [] alloc; 244 delete [] alloc;
216#endif 245# endif
217} 246}
218#endif 247#endif
219 248
220void 249void
221rxvt_term::commit_iso14755 () 250rxvt_term::commit_iso14755 ()
… …
316 345
317 // the XOpenIM manpage lies about hardcoding the locale 346 // the XOpenIM manpage lies about hardcoding the locale
318 // at the point of XOpenIM, so temporarily switch locales 347 // at the point of XOpenIM, so temporarily switch locales
319 if (rs[Rs_imLocale]) 348 if (rs[Rs_imLocale])
320 SET_LOCALE (rs[Rs_imLocale]); 349 SET_LOCALE (rs[Rs_imLocale]);
350
321 // assume wchar_t == unicode or better 351 // assume wchar_t == unicode or better
322 len = XwcLookupString (Input_Context, &ev, wkbuf, 352 len = XwcLookupString (Input_Context, &ev, wkbuf,
323 KBUFSZ, &keysym, &status_return); 353 KBUFSZ, &keysym, &status_return);
354
324 if (rs[Rs_imLocale]) 355 if (rs[Rs_imLocale])
325 SET_LOCALE (locale); 356 SET_LOCALE (locale);
326 357
327 if (status_return == XLookupChars 358 if (status_return == XLookupChars
328 || status_return == XLookupBoth) 359 || status_return == XLookupBoth)
… …
360#ifdef KEYSYM_RESOURCE 391#ifdef KEYSYM_RESOURCE
361 if (keyboard->dispatch (this, keysym, ev.state)) 392 if (keyboard->dispatch (this, keysym, ev.state))
362 return; 393 return;
363#endif 394#endif
364 395
365 if (TermWin.saveLines) 396 if (saveLines)
366 { 397 {
367#ifdef UNSHIFTED_SCROLLKEYS 398#ifdef UNSHIFTED_SCROLLKEYS
368 if (!ctrl && !meta) 399 if (!ctrl && !meta)
369#else 400#else
370 if (IS_SCROLL_MOD) 401 if (IS_SCROLL_MOD)
371#endif 402#endif
372 { 403 {
373 int lnsppg; 404 int lnsppg;
374 405
375#ifdef PAGING_CONTEXT_LINES 406#ifdef PAGING_CONTEXT_LINES
376 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 407 lnsppg = nrow - PAGING_CONTEXT_LINES;
377#else 408#else
378 lnsppg = TermWin.nrow * 4 / 5; 409 lnsppg = nrow * 4 / 5;
379#endif 410#endif
380 if (keysym == XK_Prior) 411 if (keysym == XK_Prior)
381 { 412 {
382 scr_page (UP, lnsppg); 413 scr_page (UP, lnsppg);
383 return; 414 return;
… …
838 } 869 }
839 870
840 if (len <= 0) 871 if (len <= 0)
841 return; /* not mapped */ 872 return; /* not mapped */
842 873
843 if (options & Opt_scrollTtyKeypress) 874 if (OPTION (Opt_scrollTtyKeypress))
844 if (TermWin.view_start) 875 if (view_start)
845 { 876 {
846 TermWin.view_start = 0; 877 view_start = 0;
847 want_refresh = 1; 878 want_refresh = 1;
848 } 879 }
849 880
850 /* 881 /*
851 * these modifications only affect the static keybuffer 882 * these modifications only affect the static keybuffer
… …
954 SET_LOCALE (locale); 985 SET_LOCALE (locale);
955 986
956 display->flush (); 987 display->flush ();
957 988
958 if (want_refresh && !flush_ev.active) 989 if (want_refresh && !flush_ev.active)
959 flush_ev.start (NOW + 0.01); 990 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
960} 991}
961 992
962void 993void
963rxvt_term::flush_cb (time_watcher &w) 994rxvt_term::flush_cb (time_watcher &w)
964{ 995{
… …
1028{ 1059{
1029 if (mouse_slip_wheel_speed == 0 1060 if (mouse_slip_wheel_speed == 0
1030 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1061 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1031 : scr_page (UP, mouse_slip_wheel_speed)) 1062 : scr_page (UP, mouse_slip_wheel_speed))
1032 { 1063 {
1033 if (TermWin.view_start == TermWin.nscrolled || 1064 if (view_start == nsaved ||
1034 TermWin.view_start == 0) 1065 view_start == 0)
1035 mouse_slip_wheel_speed = 0; 1066 mouse_slip_wheel_speed = 0;
1036 1067
1037 refresh_type |= SMOOTH_REFRESH; 1068 refresh_type |= SMOOTH_REFRESH;
1038 want_refresh = 1; 1069 want_refresh = 1;
1039 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1070 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1040 } 1071 }
1041} 1072}
1042#endif 1073#endif
1043 1074
1075#if HAVE_SCHED_YIELD
1076static struct event_handler
1077{
1078 check_watcher cw_yield;
1079
1080 void yield (check_watcher &w)
1081 {
1082 sched_yield ();
1083 w.stop ();
1084 }
1085
1086 event_handler ()
1087 : cw_yield (this, &event_handler::yield)
1088 {
1089 }
1090} event_handler;
1091#endif
1092
1044bool 1093bool
1045rxvt_term::pty_fill () 1094rxvt_term::pty_fill ()
1046{ 1095{
1047 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1096 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1048 1097
… …
1054 1103
1055 memmove (cmdbuf_base, cmdbuf_ptr, n); 1104 memmove (cmdbuf_base, cmdbuf_ptr, n);
1056 cmdbuf_ptr = cmdbuf_base; 1105 cmdbuf_ptr = cmdbuf_base;
1057 cmdbuf_endp = cmdbuf_ptr + n; 1106 cmdbuf_endp = cmdbuf_ptr + n;
1058 1107
1059 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1108 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
1060 1109
1061 if (n > 0) 1110 if (r > 0)
1062 { 1111 {
1063 cmdbuf_endp += n; 1112 cmdbuf_endp += r;
1064 return true; 1113 return true;
1065 } 1114 }
1066 else if (n < 0 && errno != EAGAIN) 1115 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1116 {
1117#if HAVE_SCHED_YIELD
1118 event_handler.cw_yield.start ();
1119#endif
1120 }
1121 else
1122 {
1123 pty_ev.stop ();
1124
1125 if (!OPTION (Opt_hold))
1067 destroy (); 1126 destroy ();
1127 }
1068 1128
1069 return false; 1129 return false;
1070} 1130}
1071 1131
1072void 1132void
… …
1086} 1146}
1087 1147
1088void 1148void
1089rxvt_term::pointer_unblank () 1149rxvt_term::pointer_unblank ()
1090{ 1150{
1091 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1151 XDefineCursor (display->display, vt, TermWin_cursor);
1092 recolour_cursor (); 1152 recolour_cursor ();
1093 1153
1094#ifdef POINTER_BLANK 1154#ifdef POINTER_BLANK
1095 hidden_pointer = 0; 1155 hidden_pointer = 0;
1096 1156
1097 if (options & Opt_pointerBlank) 1157 if (OPTION (Opt_pointerBlank))
1098 pointer_ev.start (NOW + pointerBlankDelay); 1158 pointer_ev.start (NOW + pointerBlankDelay);
1099#endif 1159#endif
1100} 1160}
1101 1161
1102#ifdef POINTER_BLANK 1162#ifdef POINTER_BLANK
1103void 1163void
1104rxvt_term::pointer_blank () 1164rxvt_term::pointer_blank ()
1105{ 1165{
1106 if (! (options & Opt_pointerBlank)) 1166 if (! OPTION (Opt_pointerBlank))
1107 return; 1167 return;
1108 1168
1109 XDefineCursor (display->display, TermWin.vt, display->blank_cursor); 1169 XDefineCursor (display->display, vt, display->blank_cursor);
1110 XFlush (display->display); 1170 XFlush (display->display);
1111 1171
1112 hidden_pointer = 1; 1172 hidden_pointer = 1;
1113} 1173}
1114 1174
… …
1209 1269
1210 SET_R (this); 1270 SET_R (this);
1211 SET_LOCALE (locale); 1271 SET_LOCALE (locale);
1212 1272
1213#if defined(CURSOR_BLINK) 1273#if defined(CURSOR_BLINK)
1214 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1274 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1215 { 1275 {
1216 if (hidden_cursor) 1276 if (hidden_cursor)
1217 { 1277 {
1218 hidden_cursor = 0; 1278 hidden_cursor = 0;
1219 want_refresh = 1; 1279 want_refresh = 1;
… …
1222 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1282 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1223 } 1283 }
1224#endif 1284#endif
1225 1285
1226#if defined(POINTER_BLANK) 1286#if defined(POINTER_BLANK)
1227 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0) 1287 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1228 { 1288 {
1229 if (ev.type == MotionNotify 1289 if (ev.type == MotionNotify
1230 || ev.type == ButtonPress 1290 || ev.type == ButtonPress
1231 || ev.type == ButtonRelease) 1291 || ev.type == ButtonRelease)
1232 if (hidden_pointer) 1292 if (hidden_pointer)
… …
1330 button_release (ev.xbutton); 1390 button_release (ev.xbutton);
1331 break; 1391 break;
1332 1392
1333 case ClientMessage: 1393 case ClientMessage:
1334 if (ev.xclient.format == 32 1394 if (ev.xclient.format == 32
1335 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS] 1395 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1396 {
1336 && ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1397 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1337 destroy (); 1398 destroy ();
1399#if ENABLE_EWMH
1400 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1401 XSendEvent (disp, ev.xclient.window = display->root,
1402 False, SubstructureRedirectMask | SubstructureNotifyMask,
1403 &ev);
1404#endif
1405 }
1338#if ENABLE_XEMBED 1406#if ENABLE_XEMBED
1339 else if (ev.xclient.format == 32 1407 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1340 && ev.xclient.message_type == xa[XA_XEMBED])
1341 { 1408 {
1342 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN) 1409 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1343 focus_in (); 1410 focus_in ();
1344 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1411 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1345 focus_out (); 1412 focus_out ();
… …
1409 case FocusOut: 1476 case FocusOut:
1410 focus_out (); 1477 focus_out ();
1411 break; 1478 break;
1412 1479
1413 case ConfigureNotify: 1480 case ConfigureNotify:
1414 if (ev.xconfigure.window == TermWin.parent[0]) 1481 if (ev.xconfigure.window == parent[0])
1415 { 1482 {
1416 int height, width;
1417
1418 do
1419 { /* Wrap lots of configures into one */
1420 width = ev.xconfigure.width;
1421 height = ev.xconfigure.height;
1422 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1423 }
1424 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)); 1483 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1484 ;
1425 1485
1426 if (szHint.width != width || szHint.height != height) 1486 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1427 { 1487 {
1428 seen_resize = 1; 1488 seen_resize = 1;
1429 resize_all_windows (width, height, 1); 1489 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1430 } 1490 }
1431 1491
1432#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1492#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1433 if (options & Opt_transparent) 1493 if (OPTION (Opt_transparent))
1434 check_our_parents (); 1494 check_our_parents ();
1435#endif 1495#endif
1436 } 1496 }
1437 break; 1497 break;
1438 1498
… …
1455 case SelectionRequest: 1515 case SelectionRequest:
1456 selection_send (ev.xselectionrequest); 1516 selection_send (ev.xselectionrequest);
1457 break; 1517 break;
1458 1518
1459 case UnmapNotify: 1519 case UnmapNotify:
1460 TermWin.mapped = 0; 1520 mapped = 0;
1461#ifdef TEXT_BLINK 1521#ifdef TEXT_BLINK
1462 text_blink_ev.stop (); 1522 text_blink_ev.stop ();
1463#endif 1523#endif
1464 break; 1524 break;
1465 1525
1466 case MapNotify: 1526 case MapNotify:
1467 TermWin.mapped = 1; 1527 mapped = 1;
1468#ifdef TEXT_BLINK 1528#ifdef TEXT_BLINK
1469 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1529 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1470#endif 1530#endif
1471 break; 1531 break;
1472 1532
… …
1476 break; 1536 break;
1477#endif /* TRANSPARENT */ 1537#endif /* TRANSPARENT */
1478 1538
1479 case GraphicsExpose: 1539 case GraphicsExpose:
1480 case Expose: 1540 case Expose:
1481 if (ev.xany.window == TermWin.vt) 1541 if (ev.xany.window == vt)
1482 { 1542 {
1483 do 1543 do
1484 scr_expose (ev.xexpose.x, ev.xexpose.y, 1544 scr_expose (ev.xexpose.x, ev.xexpose.y,
1485 ev.xexpose.width, ev.xexpose.height, False); 1545 ev.xexpose.width, ev.xexpose.height, False);
1486 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)); 1546 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1487 1547
1488 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1548 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1489 1549
1490 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)) 1550 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1491 scr_expose (ev.xexpose.x, ev.xexpose.y, 1551 scr_expose (ev.xexpose.x, ev.xexpose.y,
1492 ev.xexpose.width, ev.xexpose.height, False); 1552 ev.xexpose.width, ev.xexpose.height, False);
1493 1553
1494 scr_refresh (refresh_type); 1554 scr_refresh (refresh_type);
1495 } 1555 }
… …
1511 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1571 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1512 menubar_expose (); 1572 menubar_expose ();
1513#endif 1573#endif
1514 1574
1515#ifdef TRANSPARENT 1575#ifdef TRANSPARENT
1516 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1576 if (am_transparent && ev.xany.window == parent[0])
1517 XClearWindow (disp, ev.xany.window); 1577 XClearWindow (disp, ev.xany.window);
1518#endif 1578#endif
1519 } 1579 }
1520 break; 1580 break;
1521 1581
… …
1532 } 1592 }
1533#endif 1593#endif
1534 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1594 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1535 break; 1595 break;
1536 1596
1537 if (ev.xany.window == TermWin.vt) 1597 if (ev.xany.window == vt)
1538 { 1598 {
1539 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1599 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1540 { 1600 {
1541 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev)) 1601 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1542 ; 1602 ;
1543 1603
1544 XQueryPointer (disp, TermWin.vt, 1604 XQueryPointer (disp, vt,
1545 &unused_root, &unused_child, 1605 &unused_root, &unused_child,
1546 &unused_root_x, &unused_root_y, 1606 &unused_root_x, &unused_root_y,
1547 &ev.xbutton.x, &ev.xbutton.y, 1607 &ev.xbutton.x, &ev.xbutton.y,
1548 &ev.xbutton.state); 1608 &ev.xbutton.state);
1549#ifdef MOUSE_THRESHOLD 1609#ifdef MOUSE_THRESHOLD
… …
1561#endif 1621#endif
1562 selection_extend (ev.xbutton.x, ev.xbutton.y, 1622 selection_extend (ev.xbutton.x, ev.xbutton.y,
1563 ev.xbutton.state & Button3Mask ? 2 : 0); 1623 ev.xbutton.state & Button3Mask ? 2 : 0);
1564 1624
1565#ifdef SELECTION_SCROLLING 1625#ifdef SELECTION_SCROLLING
1566 if (ev.xbutton.y < TermWin.int_bwidth 1626 if (ev.xbutton.y < int_bwidth
1567 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1627 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1568 { 1628 {
1569 int dist; 1629 int dist;
1570 1630
1571 /* don't clobber the current delay if we are 1631 /* don't clobber the current delay if we are
1572 * already in the middle of scrolling. 1632 * already in the middle of scrolling.
… …
1580 selection_save_x = ev.xbutton.x; 1640 selection_save_x = ev.xbutton.x;
1581 selection_save_y = ev.xbutton.y; 1641 selection_save_y = ev.xbutton.y;
1582 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1642 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1583 1643
1584 /* calc number of lines to scroll */ 1644 /* calc number of lines to scroll */
1585 if (ev.xbutton.y < TermWin.int_bwidth) 1645 if (ev.xbutton.y < int_bwidth)
1586 { 1646 {
1587 scroll_selection_dir = UP; 1647 scroll_selection_dir = UP;
1588 dist = TermWin.int_bwidth - ev.xbutton.y; 1648 dist = int_bwidth - ev.xbutton.y;
1589 } 1649 }
1590 else 1650 else
1591 { 1651 {
1592 scroll_selection_dir = DN; 1652 scroll_selection_dir = DN;
1593 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1653 dist = ev.xbutton.y - (int_bwidth + height);
1594 } 1654 }
1595 1655
1596 scroll_selection_lines = Pixel2Height (dist) 1656 scroll_selection_lines = Pixel2Height (dist)
1597 / SELECTION_SCROLL_LINE_SPEEDUP 1657 / SELECTION_SCROLL_LINE_SPEEDUP
1598 + 1; 1658 + 1;
1599 MIN_IT (scroll_selection_lines, 1659 min_it (scroll_selection_lines,
1600 SELECTION_SCROLL_MAX_LINES); 1660 SELECTION_SCROLL_MAX_LINES);
1601 } 1661 }
1602 else 1662 else
1603 { 1663 {
1604 /* we are within the text window, so we 1664 /* we are within the text window, so we
… …
1635} 1695}
1636 1696
1637void 1697void
1638rxvt_term::focus_in () 1698rxvt_term::focus_in ()
1639{ 1699{
1640 if (!TermWin.focus) 1700 if (!focus)
1641 { 1701 {
1642 TermWin.focus = 1; 1702 focus = 1;
1643 want_refresh = 1; 1703 want_refresh = 1;
1704
1705 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1706
1644#ifdef USE_XIM 1707#if USE_XIM
1645 if (Input_Context != NULL) 1708 if (Input_Context != NULL)
1646 { 1709 {
1647 IMSetStatusPosition (); 1710 IMSetStatusPosition ();
1648 XSetICFocus (Input_Context); 1711 XSetICFocus (Input_Context);
1649 } 1712 }
1650#endif 1713#endif
1651#ifdef CURSOR_BLINK 1714#if CURSOR_BLINK
1652 if (options & Opt_cursorBlink) 1715 if (OPTION (Opt_cursorBlink))
1653 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1716 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1654#endif 1717#endif
1655#ifdef OFF_FOCUS_FADING 1718#if OFF_FOCUS_FADING
1656 if (rs[Rs_fade]) 1719 if (rs[Rs_fade])
1657 { 1720 {
1658 pix_colors = pix_colors_focused; 1721 pix_colors = pix_colors_focused;
1659 scr_recolour (); 1722 scr_recolour ();
1660 } 1723 }
… …
1663} 1726}
1664 1727
1665void 1728void
1666rxvt_term::focus_out () 1729rxvt_term::focus_out ()
1667{ 1730{
1668 if (TermWin.focus) 1731 if (focus)
1669 { 1732 {
1670 TermWin.focus = 0; 1733 focus = 0;
1671 want_refresh = 1; 1734 want_refresh = 1;
1672 1735
1736 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1737
1673#if ENABLE_FRILLS || ISO_14755 1738#if ENABLE_FRILLS || ISO_14755
1739 if (iso14755buf)
1740 {
1674 iso14755buf = 0; 1741 iso14755buf = 0;
1675#endif
1676#if ENABLE_OVERLAY 1742# if ENABLE_OVERLAY
1677 scr_overlay_off (); 1743 scr_overlay_off ();
1678#endif 1744# endif
1745 }
1746#endif
1679#ifdef USE_XIM 1747#if USE_XIM
1680 if (Input_Context != NULL) 1748 if (Input_Context != NULL)
1681 XUnsetICFocus (Input_Context); 1749 XUnsetICFocus (Input_Context);
1682#endif 1750#endif
1683#ifdef CURSOR_BLINK 1751#if CURSOR_BLINK
1684 if (options & Opt_cursorBlink) 1752 if (OPTION (Opt_cursorBlink))
1685 cursor_blink_ev.stop (); 1753 cursor_blink_ev.stop ();
1686 hidden_cursor = 0; 1754 hidden_cursor = 0;
1687#endif 1755#endif
1688#ifdef OFF_FOCUS_FADING 1756#if OFF_FOCUS_FADING
1689 if (rs[Rs_fade]) 1757 if (rs[Rs_fade])
1690 { 1758 {
1691 pix_colors = pix_colors_unfocused; 1759 pix_colors = pix_colors_unfocused;
1692 scr_recolour (); 1760 scr_recolour ();
1693 } 1761 }
… …
1713 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1781 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1714 return; 1782 return;
1715 1783
1716 /* FALLTHROUGH */ 1784 /* FALLTHROUGH */
1717 case ReparentNotify: 1785 case ReparentNotify:
1718 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1786 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1719 want_refresh = want_full_refresh = 1; 1787 want_refresh = want_full_refresh = 1;
1720 break; 1788 break;
1721 } 1789 }
1722} 1790}
1723#endif 1791#endif
… …
1732 reportmode = !! (priv_modes & PrivMode_mouse_report); 1800 reportmode = !! (priv_modes & PrivMode_mouse_report);
1733 1801
1734 /* 1802 /*
1735 * VT window processing of button press 1803 * VT window processing of button press
1736 */ 1804 */
1737 if (ev.window == TermWin.vt) 1805 if (ev.window == vt)
1738 { 1806 {
1739#if ISO_14755 1807#if ISO_14755
1740 // 5.4 1808 // 5.4
1741 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1809 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1742 { 1810 {
… …
1947 case Button3: 2015 case Button3:
1948 if (scrollBar.style != R_SB_XTERM) 2016 if (scrollBar.style != R_SB_XTERM)
1949 { 2017 {
1950 if (scrollbar_above_slider (ev.y)) 2018 if (scrollbar_above_slider (ev.y))
1951# ifdef RXVT_SCROLL_FULL 2019# ifdef RXVT_SCROLL_FULL
1952 scr_page (UP, TermWin.nrow - 1); 2020 scr_page (UP, nrow - 1);
1953# else 2021# else
1954 scr_page (UP, TermWin.nrow / 4); 2022 scr_page (UP, nrow / 4);
1955# endif 2023# endif
1956 else if (scrollbar_below_slider (ev.y)) 2024 else if (scrollbar_below_slider (ev.y))
1957# ifdef RXVT_SCROLL_FULL 2025# ifdef RXVT_SCROLL_FULL
1958 scr_page (DN, TermWin.nrow - 1); 2026 scr_page (DN, nrow - 1);
1959# else 2027# else
1960 scr_page (DN, TermWin.nrow / 4); 2028 scr_page (DN, nrow / 4);
1961# endif 2029# endif
1962 else 2030 else
1963 scrollBar.setMotion (); 2031 scrollBar.setMotion ();
1964 } 2032 }
1965 else 2033 else
1966 { 2034 {
1967 scr_page ((ev.button == Button1 ? DN : UP), 2035 scr_page ((ev.button == Button1 ? DN : UP),
1968 (TermWin.nrow 2036 (nrow
1969 * scrollbar_position (ev.y) 2037 * scrollbar_position (ev.y)
1970 / scrollbar_size ())); 2038 / scrollbar_size ()));
1971 } 2039 }
1972 2040
1973 break; 2041 break;
… …
2005#ifdef SELECTION_SCROLLING 2073#ifdef SELECTION_SCROLLING
2006 if (sel_scroll_ev.active) 2074 if (sel_scroll_ev.active)
2007 sel_scroll_ev.stop(); 2075 sel_scroll_ev.stop();
2008#endif 2076#endif
2009 2077
2010 if (ev.window == TermWin.vt) 2078 if (ev.window == vt)
2011 { 2079 {
2012#if ISO_14755 2080#if ISO_14755
2013 // 5.4 2081 // 5.4
2014 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2082 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2015 return; 2083 return;
… …
2065 2133
2066 v = ev.button == Button4 ? UP : DN; 2134 v = ev.button == Button4 ? UP : DN;
2067 2135
2068 if (ev.state & ShiftMask) 2136 if (ev.state & ShiftMask)
2069 i = 1; 2137 i = 1;
2070 else if (options & Opt_mouseWheelScrollPage) 2138 else if (OPTION (Opt_mouseWheelScrollPage))
2071 i = TermWin.nrow - 1; 2139 i = nrow - 1;
2072 else 2140 else
2073 i = 5; 2141 i = 5;
2074 2142
2075# ifdef MOUSE_SLIP_WHEELING 2143# ifdef MOUSE_SLIP_WHEELING
2076 if (ev.state & ControlMask) 2144 if (ev.state & ControlMask)
2077 { 2145 {
2078 mouse_slip_wheel_speed += v ? -1 : 1; 2146 mouse_slip_wheel_speed += v ? -1 : 1;
2079 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2147 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2080 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2148 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2081 2149
2082 if (slip_wheel_ev.at < NOW) 2150 if (slip_wheel_ev.at < NOW)
2083 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2151 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2084 2152
2085 slip_wheel_ev.start (); 2153 slip_wheel_ev.start ();
… …
2361 XWindowAttributes wattr, wrootattr; 2429 XWindowAttributes wattr, wrootattr;
2362 dDisp; 2430 dDisp;
2363 2431
2364 pchanged = 0; 2432 pchanged = 0;
2365 2433
2366 if (!(options & Opt_transparent)) 2434 if (!OPTION (Opt_transparent))
2367 return pchanged; /* Don't try any more */ 2435 return pchanged; /* Don't try any more */
2368 2436
2369 XGetWindowAttributes (disp, display->root, &wrootattr); 2437 XGetWindowAttributes (disp, display->root, &wrootattr);
2370 rootdepth = wrootattr.depth; 2438 rootdepth = wrootattr.depth;
2371 2439
2372 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 2440 XGetWindowAttributes (disp, parent[0], &wattr);
2373 2441
2374 if (rootdepth != wattr.depth) 2442 if (rootdepth != wattr.depth)
2375 { 2443 {
2376 if (am_transparent) 2444 if (am_transparent)
2377 { 2445 {
2378 pchanged = 1; 2446 pchanged = 1;
2379 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2447 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2380 am_transparent = am_pixmap_trans = 0; 2448 am_transparent = am_pixmap_trans = 0;
2381 } 2449 }
2382 2450
2383 return pchanged; /* Don't try any more */ 2451 return pchanged; /* Don't try any more */
2384 } 2452 }
… …
2425 Window cr; 2493 Window cr;
2426 XImage *image; 2494 XImage *image;
2427 GC gc; 2495 GC gc;
2428 XGCValues gcvalue; 2496 XGCValues gcvalue;
2429 2497
2430 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 2498 XTranslateCoordinates (disp, parent[0], display->root,
2431 0, 0, &sx, &sy, &cr); 2499 0, 0, &sx, &sy, &cr);
2432 nw = (unsigned int)szHint.width; 2500 nw = (unsigned int)szHint.width;
2433 nh = (unsigned int)szHint.height; 2501 nh = (unsigned int)szHint.height;
2434 nx = ny = 0; 2502 nx = ny = 0;
2435 2503
… …
2445 nh += sy; 2513 nh += sy;
2446 ny = -sy; 2514 ny = -sy;
2447 sy = 0; 2515 sy = 0;
2448 } 2516 }
2449 2517
2450 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2518 min_it (nw, (unsigned int) (wrootattr.width - sx));
2451 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2519 min_it (nh, (unsigned int) (wrootattr.height - sy));
2452 2520
2453 XSync (disp, False); 2521 XSync (disp, False);
2454 allowedxerror = -1; 2522 allowedxerror = -1;
2455 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2523 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2456 2524
… …
2461 if (image == NULL) 2529 if (image == NULL)
2462 { 2530 {
2463 if (am_transparent && am_pixmap_trans) 2531 if (am_transparent && am_pixmap_trans)
2464 { 2532 {
2465 pchanged = 1; 2533 pchanged = 1;
2466 if (TermWin.pixmap != None) 2534 if (pixmap != None)
2467 { 2535 {
2468 XFreePixmap (disp, TermWin.pixmap); 2536 XFreePixmap (disp, pixmap);
2469 TermWin.pixmap = None; 2537 pixmap = None;
2470 } 2538 }
2471 } 2539 }
2472 2540
2473 am_pixmap_trans = 0; 2541 am_pixmap_trans = 0;
2474 } 2542 }
2475 else 2543 else
2476 { 2544 {
2477 if (TermWin.pixmap != None) 2545 if (pixmap != None)
2478 XFreePixmap (disp, TermWin.pixmap); 2546 XFreePixmap (disp, pixmap);
2479 2547
2480#if TINTING 2548#if TINTING
2481 if (ISSET_PIXCOLOR (Color_tint)) 2549 if (ISSET_PIXCOLOR (Color_tint))
2482 { 2550 {
2483 unsigned short rm, gm, bm; 2551 unsigned short rm, gm, bm;
… …
2487 2555
2488 ShadeXImage (display, image, shade, rm, gm, bm); 2556 ShadeXImage (display, image, shade, rm, gm, bm);
2489 } 2557 }
2490#endif 2558#endif
2491 2559
2492 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt, 2560 pixmap = XCreatePixmap (disp, vt,
2493 szHint.width, szHint.height, image->depth); 2561 szHint.width, szHint.height, image->depth);
2494 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue); 2562 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2495 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0, 2563 XPutImage (disp, pixmap, gc, image, 0, 0,
2496 nx, ny, image->width, image->height); 2564 nx, ny, image->width, image->height);
2497 XFreeGC (disp, gc); 2565 XFreeGC (disp, gc);
2498 XDestroyImage (image); 2566 XDestroyImage (image);
2499 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap); 2567 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2500 XClearWindow (disp, TermWin.parent[0]); 2568 XClearWindow (disp, parent[0]);
2501 2569
2502 if (!am_transparent || !am_pixmap_trans) 2570 if (!am_transparent || !am_pixmap_trans)
2503 pchanged = 1; 2571 pchanged = 1;
2504 2572
2505 am_transparent = am_pixmap_trans = 1; 2573 am_transparent = am_pixmap_trans = 1;
2506 } 2574 }
2507 } 2575 }
2508 2576
2509 if (am_pixmap_trans) 2577 if (am_pixmap_trans)
2510 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2578 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2511 else 2579 else
2512 { 2580 {
2513 unsigned int n; 2581 unsigned int n;
2514 /* 2582 /*
2515 * InheritPixmap transparency 2583 * InheritPixmap transparency
2516 */ 2584 */
2517 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2585 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2518 { 2586 {
2519 oldp = TermWin.parent[i]; 2587 oldp = parent[i];
2520 XQueryTree (disp, TermWin.parent[i - 1], &root, 2588 XQueryTree (disp, parent[i - 1], &root,
2521 &TermWin.parent[i], &list, &n); 2589 &parent[i], &list, &n);
2522 XFree (list); 2590 XFree (list);
2523 2591
2524 if (TermWin.parent[i] == display->root) 2592 if (parent[i] == display->root)
2525 { 2593 {
2526 if (oldp != None) 2594 if (oldp != None)
2527 pchanged = 1; 2595 pchanged = 1;
2528 2596
2529 break; 2597 break;
2530 } 2598 }
2531 2599
2532 if (oldp != TermWin.parent[i]) 2600 if (oldp != parent[i])
2533 pchanged = 1; 2601 pchanged = 1;
2534 } 2602 }
2535 2603
2536 n = 0; 2604 n = 0;
2537 2605
2538 if (pchanged) 2606 if (pchanged)
2539 { 2607 {
2540 for (; n < (unsigned int)i; n++) 2608 for (; n < (unsigned int)i; n++)
2541 { 2609 {
2542 XGetWindowAttributes (disp, TermWin.parent[n], &wattr); 2610 XGetWindowAttributes (disp, parent[n], &wattr);
2543 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2611 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2544 { 2612 {
2545 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2613 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2546 break; 2614 break;
2547 } 2615 }
2548 } 2616 }
2549 } 2617 }
2550 2618
2551 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2619 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2552 { 2620 {
2553 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]); 2621 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2554 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2622 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2555 am_transparent = 0; 2623 am_transparent = 0;
2556 /* XXX: also turn off Opt_transparent? */ 2624 /* XXX: also turn off Opt_transparent? */
2557 } 2625 }
2558 else 2626 else
2559 { 2627 {
… …
2562 * needed for fvwm2.2.2 (and before?) */ 2630 * needed for fvwm2.2.2 (and before?) */
2563 sleep (1); 2631 sleep (1);
2564#endif 2632#endif
2565 for (n = 0; n < (unsigned int)i; n++) 2633 for (n = 0; n < (unsigned int)i; n++)
2566 { 2634 {
2567 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative); 2635 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2568 XClearWindow (disp, TermWin.parent[n]); 2636 XClearWindow (disp, parent[n]);
2569 } 2637 }
2570 2638
2571 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2639 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2572 am_transparent = 1; 2640 am_transparent = 1;
2573 } 2641 }
2574 2642
2575 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2643 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2576 TermWin.parent[i] = None; 2644 parent[i] = None;
2577 } 2645 }
2578 2646
2579 if (scrollBar.win) 2647 if (scrollBar.win)
2580 { 2648 {
2581 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2649 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
… …
2633 /* Read a text string from the input buffer */ 2701 /* Read a text string from the input buffer */
2634 unicode_t buf[UBUFSIZ]; 2702 unicode_t buf[UBUFSIZ];
2635 bool refreshnow = false; 2703 bool refreshnow = false;
2636 int nlines = 0; 2704 int nlines = 0;
2637 unicode_t *str = buf; 2705 unicode_t *str = buf;
2706 unicode_t *eol = str + min (ncol, UBUFSIZ);
2638 2707
2639 for (;;) 2708 for (;;)
2640 { 2709 {
2641 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2710 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2642 break; 2711 break;
2643 2712
2644 *str++ = ch; 2713 *str++ = ch;
2645 2714
2646 if (ch == C0_LF) 2715 if (ch == C0_LF || str >= eol)
2647 { 2716 {
2717 if (ch == C0_LF)
2648 nlines++; 2718 nlines++;
2719
2649 refresh_count++; 2720 refresh_count++;
2650 2721
2651 if (!(options & Opt_jumpScroll) 2722 if (!OPTION (Opt_jumpScroll)
2652 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2723 || (refresh_count >= refresh_limit * (nrow - 1)))
2653 { 2724 {
2654 refreshnow = true; 2725 refreshnow = true;
2726 refresh_count = 0;
2655 ch = NOCHAR; 2727 ch = NOCHAR;
2656 break; 2728 break;
2657 } 2729 }
2658 2730
2659 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2731 // scr_add_lines only works for nlines <= nrow - 1.
2660 if (nlines >= TermWin.nrow - 1) 2732 if (nlines >= nrow - 1)
2661 { 2733 {
2662 scr_add_lines (buf, nlines, str - buf); 2734 scr_add_lines (buf, nlines, str - buf);
2663 nlines = 0; 2735 nlines = 0;
2664 str = buf; 2736 str = buf;
2737 eol = str + min (ncol, UBUFSIZ);
2665 } 2738 }
2666 }
2667 2739
2668 if (str >= buf + UBUFSIZ) 2740 if (str >= eol)
2669 { 2741 {
2742 if (eol >= buf + UBUFSIZ)
2743 {
2670 ch = NOCHAR; 2744 ch = NOCHAR;
2671 break; 2745 break;
2746 }
2747 else
2748 eol = min (eol + ncol, buf + UBUFSIZ);
2749 }
2750
2672 } 2751 }
2673 2752
2674 seq_begin = cmdbuf_ptr; 2753 seq_begin = cmdbuf_ptr;
2675 ch = next_char (); 2754 ch = next_char ();
2676 } 2755 }
… …
2683 * the number of pages between refreshes is refresh_limit, which 2762 * the number of pages between refreshes is refresh_limit, which
2684 * is incremented here because we must be doing flat-out scrolling. 2763 * is incremented here because we must be doing flat-out scrolling.
2685 */ 2764 */
2686 if (refreshnow) 2765 if (refreshnow)
2687 { 2766 {
2688 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2767 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2689 refresh_limit++; 2768 refresh_limit++;
2690 else 2769 else
2691 { 2770 {
2692 flag = true; 2771 flag = true;
2693 scr_refresh (refresh_type); 2772 scr_refresh (refresh_type);
2773 flush_ev.stop ();
2694 } 2774 }
2695 } 2775 }
2696 2776
2697 } 2777 }
2698 else 2778 else
… …
3335 3415
3336 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3416 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3337 arg[0] = -arg[0]; 3417 arg[0] = -arg[0];
3338 /* FALLTHROUGH */ 3418 /* FALLTHROUGH */
3339 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3419 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3340 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3420 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3341 break; 3421 break;
3342 3422
3343 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3423 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3344 tt_write ((const unsigned char *)VT100_ANS, 3424 tt_write ((const unsigned char *)VT100_ANS,
3345 (unsigned int) (sizeof (VT100_ANS) - 1)); 3425 (unsigned int) (sizeof (VT100_ANS) - 1));
… …
3357 break; 3437 break;
3358 case 6: /* CPR requested */ 3438 case 6: /* CPR requested */
3359 scr_report_position (); 3439 scr_report_position ();
3360 break; 3440 break;
3361 case 7: /* unofficial extension */ 3441 case 7: /* unofficial extension */
3362 if (options & Opt_insecure) 3442 if (OPTION (Opt_insecure))
3363 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3443 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3364 break; 3444 break;
3365 case 8: /* unofficial extension */ 3445 case 8: /* unofficial extension */
3366 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3446 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3367 break; 3447 break;
… …
3470 { 3550 {
3471 /* 3551 /*
3472 * commands 3552 * commands
3473 */ 3553 */
3474 case 1: /* deiconify window */ 3554 case 1: /* deiconify window */
3475 XMapWindow (disp, TermWin.parent[0]); 3555 XMapWindow (disp, parent[0]);
3476 break; 3556 break;
3477 case 2: /* iconify window */ 3557 case 2: /* iconify window */
3478 XIconifyWindow (disp, TermWin.parent[0], display->screen); 3558 XIconifyWindow (disp, parent[0], display->screen);
3479 break; 3559 break;
3480 case 3: /* set position (pixels) */ 3560 case 3: /* set position (pixels) */
3481 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]); 3561 XMoveWindow (disp, parent[0], args[1], args[2]);
3482 break; 3562 break;
3483 case 4: /* set size (pixels) */ 3563 case 4: /* set size (pixels) */
3484 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3564 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3485 break; 3565 break;
3486 case 5: /* raise window */ 3566 case 5: /* raise window */
3487 XRaiseWindow (disp, TermWin.parent[0]); 3567 XRaiseWindow (disp, parent[0]);
3488 break; 3568 break;
3489 case 6: /* lower window */ 3569 case 6: /* lower window */
3490 XLowerWindow (disp, TermWin.parent[0]); 3570 XLowerWindow (disp, parent[0]);
3491 break; 3571 break;
3492 case 7: /* refresh window */ 3572 case 7: /* refresh window */
3493 scr_touch (true); 3573 scr_touch (true);
3494 break; 3574 break;
3495 case 8: /* set size (chars) */ 3575 case 8: /* set size (chars) */
3496 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3576 set_widthheight ((unsigned int) (args[2] * fwidth),
3497 (unsigned int) (args[1] * TermWin.fheight)); 3577 (unsigned int) (args[1] * fheight));
3498 break; 3578 break;
3499 3579
3500 //case 9: NYI, TODO, restore maximized window or maximize window 3580 //case 9: NYI, TODO, restore maximized window or maximize window
3501 default: 3581 default:
3502 if (args[0] >= 24) /* set height (chars) */ 3582 if (args[0] >= 24) /* set height (chars) */
3503 set_widthheight ((unsigned int)TermWin.width, 3583 set_widthheight ((unsigned int)width,
3504 (unsigned int) (args[1] * TermWin.fheight)); 3584 (unsigned int) (args[1] * fheight));
3505 break; 3585 break;
3506 3586
3507 3587
3508 /* 3588 /*
3509 * reports - some output format copied from XTerm 3589 * reports - some output format copied from XTerm
3510 */ 3590 */
3511 case 11: /* report window state */ 3591 case 11: /* report window state */
3512 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3592 XGetWindowAttributes (disp, parent[0], &wattr);
3513 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3593 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3514 break; 3594 break;
3515 case 13: /* report window position */ 3595 case 13: /* report window position */
3516 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3596 XGetWindowAttributes (disp, parent[0], &wattr);
3517 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root, 3597 XTranslateCoordinates (disp, parent[0], wattr.root,
3518 -wattr.border_width, -wattr.border_width, 3598 -wattr.border_width, -wattr.border_width,
3519 &x, &y, &wdummy); 3599 &x, &y, &wdummy);
3520 tt_printf ("\033[3;%d;%dt", x, y); 3600 tt_printf ("\033[3;%d;%dt", x, y);
3521 break; 3601 break;
3522 case 14: /* report window size (pixels) */ 3602 case 14: /* report window size (pixels) */
3523 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3603 XGetWindowAttributes (disp, parent[0], &wattr);
3524 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3604 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3525 break; 3605 break;
3526 case 18: /* report text area size (chars) */ 3606 case 18: /* report text area size (chars) */
3527 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3607 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3528 break; 3608 break;
3529 case 19: /* report window size (chars) */ 3609 case 19: /* report window size (chars) */
3530 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3610 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3531 break; 3611 break;
3532 case 20: /* report icon label */ 3612 case 20: /* report icon label */
3533 { 3613 {
3534 char *s; 3614 char *s;
3535 XGetIconName (disp, TermWin.parent[0], &s); 3615 XGetIconName (disp, parent[0], &s);
3536 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3616 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3537 XFree (s); 3617 XFree (s);
3538 } 3618 }
3539 break; 3619 break;
3540 case 21: /* report window title */ 3620 case 21: /* report window title */
3541 { 3621 {
3542 char *s; 3622 char *s;
3543 XFetchName (disp, TermWin.parent[0], &s); 3623 XFetchName (disp, parent[0], &s);
3544 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3624 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3545 XFree (s); 3625 XFree (s);
3546 } 3626 }
3547 break; 3627 break;
3548 } 3628 }
3549} 3629}
… …
3581 else if (ch < 0x20) 3661 else if (ch < 0x20)
3582 return NULL; /* other control character - exit */ 3662 return NULL; /* other control character - exit */
3583 3663
3584 seen_esc = false; 3664 seen_esc = false;
3585 3665
3586 if (n >= sizeof (string) - 1) 3666 if (n >= STRING_MAX - 1)
3587 // stop at some sane length 3667 // stop at some sane length
3588 return NULL; 3668 return NULL;
3589 3669
3590 if (ch == C0_SYN) 3670 if (ch == C0_SYN)
3591 string[n++] = cmd_get8 (); 3671 string[n++] = cmd_get8 ();
… …
3659 set_window_color (color, str); 3739 set_window_color (color, str);
3660} 3740}
3661 3741
3662/* 3742/*
3663 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3743 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3664 * 0 = change iconName/title
3665 * 1 = change iconName
3666 * 2 = change title
3667 * 4 = change color
3668 * 10 = change fg color
3669 * 11 = change bg color
3670 * 12 = change text color
3671 * 13 = change mouse foreground color
3672 * 17 = change highlight character colour
3673 * 18 = change bold character color
3674 * 19 = change underlined character color
3675 * 46 = change logfile (not implemented)
3676 * 50 = change font
3677 *
3678 * rxvt extensions:
3679 * 20 = bg pixmap
3680 * 39 = change default fg color
3681 * 49 = change default bg color
3682 * 55 = dump scrollback buffer and all of screen
3683 * 701 = change locale
3684 * 702 = find font
3685 * 703 = menu
3686 */ 3744 */
3687void 3745void
3688rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3746rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
3689{ 3747{
3690 int changed = 0; 3748 int changed = 0;
… …
3716 unsigned long bytes_after; 3774 unsigned long bytes_after;
3717 unsigned char *value = 0; 3775 unsigned char *value = 0;
3718 const char *str = ""; 3776 const char *str = "";
3719 3777
3720 if (prop 3778 if (prop
3721 && XGetWindowProperty (disp, TermWin.parent[0], 3779 && XGetWindowProperty (disp, parent[0],
3722 prop, 0, 1<<16, 0, AnyPropertyType, 3780 prop, 0, 1<<16, 0, AnyPropertyType,
3723 &actual_type, &actual_format, 3781 &actual_type, &actual_format,
3724 &nitems, &bytes_after, &value) == Success 3782 &nitems, &bytes_after, &value) == Success
3725 && actual_type != None 3783 && actual_type != None
3726 && actual_format == 8) 3784 && actual_format == 8)
… …
3738 { 3796 {
3739 *eq = 0; 3797 *eq = 0;
3740 set_utf8_property (display->atom (str), eq + 1); 3798 set_utf8_property (display->atom (str), eq + 1);
3741 } 3799 }
3742 else 3800 else
3743 XDeleteProperty (disp, TermWin.parent[0], 3801 XDeleteProperty (disp, parent[0],
3744 display->atom (str)); 3802 display->atom (str));
3745 } 3803 }
3746 break; 3804 break;
3747 3805
3748 case XTerm_Color: 3806 case XTerm_Color:
… …
3789 break; 3847 break;
3790#ifndef NO_BOLD_UNDERLINE_REVERSE 3848#ifndef NO_BOLD_UNDERLINE_REVERSE
3791 case XTerm_Color_BD: 3849 case XTerm_Color_BD:
3792 process_color_seq (XTerm_Color_BD, Color_BD, str, resp); 3850 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3793 break; 3851 break;
3794 case XTerm_Color_IT:
3795 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3796 break;
3797 case XTerm_Color_UL: 3852 case XTerm_Color_UL:
3798 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3853 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3799 break; 3854 break;
3800 case XTerm_Color_RV: 3855 case XTerm_Color_RV:
3801 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3856 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3802 break; 3857 break;
3858 case URxvt_Color_IT:
3859 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3860 break;
3803#endif 3861#endif
3804#if TRANSPARENT && TINTING 3862#if TRANSPARENT && TINTING
3805 case XTerm_Color_tint: 3863 case URxvt_Color_tint:
3806 process_color_seq (XTerm_Color_tint, Color_tint, str, resp); 3864 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3807 check_our_parents (); 3865 check_our_parents ();
3808 if (am_transparent) 3866 if (am_transparent)
3809 want_full_refresh = want_refresh = 1; 3867 want_full_refresh = want_refresh = 1;
3810 break; 3868 break;
3811#endif 3869#endif
… …
3845 3903
3846 case XTerm_logfile: 3904 case XTerm_logfile:
3847 // TODO, when secure mode? 3905 // TODO, when secure mode?
3848 break; 3906 break;
3849 3907
3908#ifdef MENUBAR
3909 case URxvt_Menu:
3910 if (OPTION (Opt_insecure))
3911 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3912 break;
3913#endif
3914#if 0
3915 case XTerm_dumpscreen: /* no error notices */
3916 {
3917 int fd;
3918 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3919 {
3920 scr_dump (fd);
3921 close (fd);
3922 }
3923 }
3924 break;
3925#endif
3850 case XTerm_font: 3926 case XTerm_font:
3851 op = URxvt_font; 3927 op = URxvt_font;
3852 case URxvt_font: 3928 case URxvt_font:
3853#if ENABLE_STYLES 3929#if ENABLE_STYLES
3854 case URxvt_boldFont: 3930 case URxvt_boldFont:
3855 case URxvt_italicFont: 3931 case URxvt_italicFont:
3856 case URxvt_boldItalicFont: 3932 case URxvt_boldItalicFont:
3857#endif 3933#endif
3858 if (query) 3934 if (query)
3859 tt_printf ("\33]%d;%-.250s%c", saveop, 3935 tt_printf ("\33]%d;%-.250s%c", saveop,
3860 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3936 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3861 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3937 ? fontset[op - URxvt_font]->fontdesc : "",
3862 resp); 3938 resp);
3863 else 3939 else
3864 { 3940 {
3865 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3941 const char *&res = rs[Rs_font + (op - URxvt_font)];
3866 3942
… …
3869 set_fonts (); 3945 set_fonts ();
3870 } 3946 }
3871 break; 3947 break;
3872 3948
3873#if ENABLE_FRILLS 3949#if ENABLE_FRILLS
3874 case XTerm_locale: 3950 case URxvt_locale:
3875 if (query) 3951 if (query)
3876 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); 3952 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3877 else 3953 else
3878 { 3954 {
3879 set_locale (str); 3955 set_locale (str);
3880 pty.set_utf8_mode (enc_utf8); 3956 pty.set_utf8_mode (enc_utf8);
3881# ifdef USE_XIM
3882 im_cb (); 3957 init_xlocale ();
3883# endif
3884 } 3958 }
3885 break; 3959 break;
3886#endif
3887 3960
3888#ifdef MENUBAR 3961 case URxvt_view_up:
3889 case XTerm_Menu: 3962 case URxvt_view_down:
3890 if (options & Opt_insecure) 3963 int lines = atoi (str);
3891 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3964
3892 break; 3965 if (lines)
3893#endif 3966 scr_page (op == URxvt_view_up ? UP : DN, lines);
3894#if 0
3895 case XTerm_dumpscreen: /* no error notices */
3896 { 3967 else
3897 int fd;
3898 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3899 { 3968 {
3900 scr_dump (fd); 3969 scr_erase_savelines ();
3901 close (fd);
3902 } 3970 }
3903 } 3971
3904 break; 3972 break;
3905#endif 3973#endif
3906 } 3974 }
3907} 3975}
3908/*----------------------------------------------------------------------*/ 3976/*----------------------------------------------------------------------*/
… …
4017 } 4085 }
4018 4086
4019 /* extra handling for values with state unkept */ 4087 /* extra handling for values with state unkept */
4020 switch (arg[i]) 4088 switch (arg[i])
4021 { 4089 {
4090#if ENABLE_STYLES
4091 case 1021:
4092 if (mode)
4093 SET_OPTION (Opt_intensityStyles);
4094 else
4095 CLR_OPTION (Opt_intensityStyles);
4096
4097 scr_touch (true);
4098 break;
4099#endif
4022 case 1048: /* alternative cursor save */ 4100 case 1048: /* alternative cursor save */
4023 case 1049: 4101 case 1049:
4024 if (options & Opt_secondaryScreen) 4102 if (OPTION (Opt_secondaryScreen))
4025 if (mode == 0) 4103 if (mode == 0)
4026 scr_cursor (RESTORE); 4104 scr_cursor (RESTORE);
4027 else if (mode == 1) 4105 else if (mode == 1)
4028 scr_cursor (SAVE); 4106 scr_cursor (SAVE);
4029 break; 4107 break;
… …
4041 */ 4119 */
4042 PrivMode (1, PrivMode_vt52); 4120 PrivMode (1, PrivMode_vt52);
4043 break; 4121 break;
4044 case 3: /* 80/132 */ 4122 case 3: /* 80/132 */
4045 if (priv_modes & PrivMode_132OK) 4123 if (priv_modes & PrivMode_132OK)
4046 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4124 set_widthheight (((state ? 132 : 80) * fwidth), height);
4047 break; 4125 break;
4048 case 4: /* smooth scrolling */ 4126 case 4: /* smooth scrolling */
4049 if (state) 4127 if (!state)
4050 options &= ~Opt_jumpScroll; 4128 SET_OPTION (Opt_jumpScroll);
4051 else 4129 else
4052 options |= Opt_jumpScroll; 4130 CLR_OPTION (Opt_jumpScroll);
4053 break; 4131 break;
4054 case 5: /* reverse video */ 4132 case 5: /* reverse video */
4055 scr_rvideo_mode (state); 4133 scr_rvideo_mode (state);
4056 break; 4134 break;
4057 case 6: /* relative/absolute origins */ 4135 case 6: /* relative/absolute origins */
… …
4098#if 0 4176#if 0
4099 case 1001: 4177 case 1001:
4100 break; /* X11 mouse highlighting */ 4178 break; /* X11 mouse highlighting */
4101#endif 4179#endif
4102 case 1010: /* scroll to bottom on TTY output inhibit */ 4180 case 1010: /* scroll to bottom on TTY output inhibit */
4103 if (state) 4181 if (!state)
4104 options &= ~Opt_scrollTtyOutput; 4182 SET_OPTION (Opt_scrollTtyOutput);
4105 else 4183 else
4106 options |= Opt_scrollTtyOutput; 4184 CLR_OPTION (Opt_scrollTtyOutput);
4107 break; 4185 break;
4108 case 1011: /* scroll to bottom on key press */ 4186 case 1011: /* scroll to bottom on key press */
4109 if (state) 4187 if (state)
4110 options |= Opt_scrollTtyKeypress; 4188 SET_OPTION (Opt_scrollTtyKeypress);
4111 else 4189 else
4112 options &= ~Opt_scrollTtyKeypress; 4190 CLR_OPTION (Opt_scrollTtyKeypress);
4113 break; 4191 break;
4114 case 1047: /* secondary screen w/ clearing last */ 4192 case 1047: /* secondary screen w/ clearing last */
4115 if (options & Opt_secondaryScreen) 4193 if (OPTION (Opt_secondaryScreen))
4116 if (current_screen != PRIMARY) 4194 if (current_screen != PRIMARY)
4117 scr_erase_screen (2); 4195 scr_erase_screen (2);
4118 scr_change_screen (state); 4196 scr_change_screen (state);
4119 break; 4197 break;
4120 case 1049: /* secondary screen w/ clearing first */ 4198 case 1049: /* secondary screen w/ clearing first */
4121 scr_change_screen (state); 4199 scr_change_screen (state);
4122 if (options & Opt_secondaryScreen) 4200 if (OPTION (Opt_secondaryScreen))
4123 if (current_screen != PRIMARY) 4201 if (current_screen != PRIMARY)
4124 scr_erase_screen (2); 4202 scr_erase_screen (2);
4125 break; 4203 break;
4126 default: 4204 default:
4127 break; 4205 break;
… …
4277 case 106: 4355 case 106:
4278 case 107: 4356 case 107:
4279 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4357 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4280 break; 4358 break;
4281#endif 4359#endif
4282
4283 } 4360 }
4284 } 4361 }
4285} 4362}
4286/*}}} */ 4363/*}}} */
4287 4364
… …
4368 } 4445 }
4369 4446
4370 memmove (v_buffer, v_buffer + written, v_buflen); 4447 memmove (v_buffer, v_buffer + written, v_buflen);
4371 } 4448 }
4372 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4449 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4373 // original code just ignores this... 4450 pty_ev.set (EVENT_READ);
4374 destroy ();
4375} 4451}
4376 4452
4377/*----------------------- end-of-file (C source) -----------------------*/ 4453/*----------------------- end-of-file (C source) -----------------------*/
4378 4454

Diff Legend

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