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.196 by root, Thu Feb 17 12:23:39 2005 UTC vs.
Revision 1.226 by root, Sun Jan 1 15:03:49 2006 UTC

… …
48#include "../config.h" /* NECESSARY */ 48#include "../config.h" /* NECESSARY */
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h" /* NECESSARY */
50#include "version.h" 50#include "version.h"
51#include "command.h" 51#include "command.h"
52 52
53#if HAVE_SCHED_YIELD
54# include <sched.h>
55#endif
56
53#ifdef KEYSYM_RESOURCE 57#ifdef KEYSYM_RESOURCE
54# include "keyboard.h" 58# include "keyboard.h"
55#endif 59#endif
56 60
57#include <csignal> 61#include <csignal>
… …
135rxvt_term::iso14755_54 (int x, int y) 139rxvt_term::iso14755_54 (int x, int y)
136{ 140{
137 x = Pixel2Col (x); 141 x = Pixel2Col (x);
138 y = Pixel2Row (y); 142 y = Pixel2Row (y);
139 143
140 if (x < 0 || x >= TermWin.ncol 144 if (!IN_RANGE_EXC (x, 0, ncol)
141 || y < 0 || y >= TermWin.nrow) 145 || !IN_RANGE_EXC (y, 0, nrow))
142 return; 146 return;
143 147
144 for (;;) 148 for (;;)
145 { 149 {
146 text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x]; 150 const line_t &l = ROW(y - view_start);
151
152 text_t t = l.t[x];
147 153
148 if (t != NOCHAR || !x) 154 if (t != NOCHAR || !x)
149 { 155 {
150 iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x], 156 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; 157 iso14755buf = ISO_14755_54;
153 break; 158 break;
154 } 159 }
155 160
156 x--; 161 x--;
157 } 162 }
158
159} 163}
160#endif
161 164
162#if ENABLE_OVERLAY
163void 165void
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r) 166rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
165{ 167{
166 rxvt_fontset *fs = FONTSET (r); 168 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)]; 169 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2; 170 wchar_t *chr, *alloc, ch2, *fname;
169 int len; 171 int len;
170 172
173 fname = rxvt_utf8towcs (f->name);
174
171#if ENABLE_COMBINING 175# if ENABLE_COMBINING
172 if (IS_COMPOSE (ch)) 176 if (IS_COMPOSE (ch))
173 { 177 {
174 len = rxvt_composite.expand (ch, 0); 178 len = rxvt_composite.expand (ch, 0);
175 alloc = chr = new wchar_t[len]; 179 alloc = chr = new wchar_t[len];
176 rxvt_composite.expand (ch, chr); 180 rxvt_composite.expand (ch, chr);
177 } 181 }
178 else 182 else
179#endif 183# endif
180 { 184 {
181 ch2 = ch; 185 ch2 = ch;
182 186
183 alloc = 0; 187 alloc = 0;
184 chr = &ch2; 188 chr = &ch2;
185 len = 1; 189 len = 1;
186 } 190 }
187 191
188 int width = strlen (f->name); 192 char attr[80]; // plenty
189 193
190 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); 194 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
195 (int)r,
196 fgcolor_of (r), bgcolor_of (r),
197 r & RS_Bold ? " bold" : "",
198 r & RS_Italic ? " italic" : "",
199 r & RS_Blink ? " blink" : "",
200 r & RS_RVid ? " rvid" : "",
201 r & RS_Uline ? " uline" : "",
202 r & RS_Careful ? " careful" : "");
203
204 int width = wcswidth (fname, wcslen (fname));
205
206 max_it (width, 8+5); // for char + hey
207 max_it (width, strlen (attr));
208
209 if (y >= 0)
210 {
211 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
212 x = 0;
213 }
214
215 scr_overlay_new (x, y, width, len + 2);
191 216
192 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 217 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
193 218
194 for (int y = 0; y < len; y++) 219 for (int y = 0; y < len; y++)
195 { 220 {
… …
198 ch = *chr++; 223 ch = *chr++;
199 224
200 sprintf (buf, "%8x", ch); 225 sprintf (buf, "%8x", ch);
201 scr_overlay_set (0, y, buf); 226 scr_overlay_set (0, y, buf);
202 scr_overlay_set (9, y, '='); 227 scr_overlay_set (9, y, '=');
203#if !UNICODE3 228# if !UNICODE3
204 if (ch >= 0x10000) 229 if (ch >= 0x10000)
205 ch = 0xfffd; 230 ch = 0xfffd;
206#endif 231# endif
207 scr_overlay_set (11, y, ch, r); 232 scr_overlay_set (11, y, ch, r);
208 scr_overlay_set (12, y, NOCHAR, r); 233 scr_overlay_set (12, y, NOCHAR, r);
209 } 234 }
210 235
236 scr_overlay_set (0, len , attr);
211 scr_overlay_set (0, len, f->name); 237 scr_overlay_set (0, len + 1, fname);
212 238
239 free (fname);
240
213#if ENABLE_COMBINING 241# if ENABLE_COMBINING
214 if (alloc) 242 if (alloc)
215 delete [] alloc; 243 delete [] alloc;
216#endif 244# endif
217} 245}
218#endif 246#endif
219 247
220void 248void
221rxvt_term::commit_iso14755 () 249rxvt_term::commit_iso14755 ()
… …
316 344
317 // the XOpenIM manpage lies about hardcoding the locale 345 // the XOpenIM manpage lies about hardcoding the locale
318 // at the point of XOpenIM, so temporarily switch locales 346 // at the point of XOpenIM, so temporarily switch locales
319 if (rs[Rs_imLocale]) 347 if (rs[Rs_imLocale])
320 SET_LOCALE (rs[Rs_imLocale]); 348 SET_LOCALE (rs[Rs_imLocale]);
349
321 // assume wchar_t == unicode or better 350 // assume wchar_t == unicode or better
322 len = XwcLookupString (Input_Context, &ev, wkbuf, 351 len = XwcLookupString (Input_Context, &ev, wkbuf,
323 KBUFSZ, &keysym, &status_return); 352 KBUFSZ, &keysym, &status_return);
353
324 if (rs[Rs_imLocale]) 354 if (rs[Rs_imLocale])
325 SET_LOCALE (locale); 355 SET_LOCALE (locale);
326 356
327 if (status_return == XLookupChars 357 if (status_return == XLookupChars
328 || status_return == XLookupBoth) 358 || status_return == XLookupBoth)
… …
360#ifdef KEYSYM_RESOURCE 390#ifdef KEYSYM_RESOURCE
361 if (keyboard->dispatch (this, keysym, ev.state)) 391 if (keyboard->dispatch (this, keysym, ev.state))
362 return; 392 return;
363#endif 393#endif
364 394
365 if (TermWin.saveLines) 395 if (saveLines)
366 { 396 {
367#ifdef UNSHIFTED_SCROLLKEYS 397#ifdef UNSHIFTED_SCROLLKEYS
368 if (!ctrl && !meta) 398 if (!ctrl && !meta)
369#else 399#else
370 if (IS_SCROLL_MOD) 400 if (IS_SCROLL_MOD)
371#endif 401#endif
372 { 402 {
373 int lnsppg; 403 int lnsppg;
374 404
375#ifdef PAGING_CONTEXT_LINES 405#ifdef PAGING_CONTEXT_LINES
376 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 406 lnsppg = nrow - PAGING_CONTEXT_LINES;
377#else 407#else
378 lnsppg = TermWin.nrow * 4 / 5; 408 lnsppg = nrow * 4 / 5;
379#endif 409#endif
380 if (keysym == XK_Prior) 410 if (keysym == XK_Prior)
381 { 411 {
382 scr_page (UP, lnsppg); 412 scr_page (UP, lnsppg);
383 return; 413 return;
… …
838 } 868 }
839 869
840 if (len <= 0) 870 if (len <= 0)
841 return; /* not mapped */ 871 return; /* not mapped */
842 872
843 if (options & Opt_scrollTtyKeypress) 873 if (OPTION (Opt_scrollTtyKeypress))
844 if (TermWin.view_start) 874 if (view_start)
845 { 875 {
846 TermWin.view_start = 0; 876 view_start = 0;
847 want_refresh = 1; 877 want_refresh = 1;
848 } 878 }
849 879
850 /* 880 /*
851 * these modifications only affect the static keybuffer 881 * these modifications only affect the static keybuffer
… …
954 SET_LOCALE (locale); 984 SET_LOCALE (locale);
955 985
956 display->flush (); 986 display->flush ();
957 987
958 if (want_refresh && !flush_ev.active) 988 if (want_refresh && !flush_ev.active)
959 flush_ev.start (NOW + 0.01); 989 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
960} 990}
961 991
962void 992void
963rxvt_term::flush_cb (time_watcher &w) 993rxvt_term::flush_cb (time_watcher &w)
964{ 994{
… …
1028{ 1058{
1029 if (mouse_slip_wheel_speed == 0 1059 if (mouse_slip_wheel_speed == 0
1030 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1060 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1031 : scr_page (UP, mouse_slip_wheel_speed)) 1061 : scr_page (UP, mouse_slip_wheel_speed))
1032 { 1062 {
1033 if (TermWin.view_start == TermWin.nscrolled || 1063 if (view_start == nsaved ||
1034 TermWin.view_start == 0) 1064 view_start == 0)
1035 mouse_slip_wheel_speed = 0; 1065 mouse_slip_wheel_speed = 0;
1036 1066
1037 refresh_type |= SMOOTH_REFRESH; 1067 refresh_type |= SMOOTH_REFRESH;
1038 want_refresh = 1; 1068 want_refresh = 1;
1039 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1069 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
… …
1054 1084
1055 memmove (cmdbuf_base, cmdbuf_ptr, n); 1085 memmove (cmdbuf_base, cmdbuf_ptr, n);
1056 cmdbuf_ptr = cmdbuf_base; 1086 cmdbuf_ptr = cmdbuf_base;
1057 cmdbuf_endp = cmdbuf_ptr + n; 1087 cmdbuf_endp = cmdbuf_ptr + n;
1058 1088
1059 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1089 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
1060 1090
1061 if (n > 0) 1091 if (r > 0)
1062 { 1092 {
1063 cmdbuf_endp += n; 1093 cmdbuf_endp += r;
1064 return true; 1094 return true;
1065 } 1095 }
1066 else if (n < 0 && errno != EAGAIN) 1096 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1097 {
1098#if HAVE_SCHED_YIELD
1099 sched_yield ();
1100#endif
1101 }
1102 else
1103 {
1104 pty_ev.stop ();
1105
1106 if (!OPTION (Opt_hold))
1067 destroy (); 1107 destroy ();
1108 }
1068 1109
1069 return false; 1110 return false;
1070} 1111}
1071 1112
1072void 1113void
… …
1086} 1127}
1087 1128
1088void 1129void
1089rxvt_term::pointer_unblank () 1130rxvt_term::pointer_unblank ()
1090{ 1131{
1091 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1132 XDefineCursor (display->display, vt, TermWin_cursor);
1092 recolour_cursor (); 1133 recolour_cursor ();
1093 1134
1094#ifdef POINTER_BLANK 1135#ifdef POINTER_BLANK
1095 hidden_pointer = 0; 1136 hidden_pointer = 0;
1096 1137
1097 if (options & Opt_pointerBlank) 1138 if (OPTION (Opt_pointerBlank))
1098 pointer_ev.start (NOW + pointerBlankDelay); 1139 pointer_ev.start (NOW + pointerBlankDelay);
1099#endif 1140#endif
1100} 1141}
1101 1142
1102#ifdef POINTER_BLANK 1143#ifdef POINTER_BLANK
1103void 1144void
1104rxvt_term::pointer_blank () 1145rxvt_term::pointer_blank ()
1105{ 1146{
1106 if (! (options & Opt_pointerBlank)) 1147 if (! OPTION (Opt_pointerBlank))
1107 return; 1148 return;
1108 1149
1109 XDefineCursor (display->display, TermWin.vt, display->blank_cursor); 1150 XDefineCursor (display->display, vt, display->blank_cursor);
1110 XFlush (display->display); 1151 XFlush (display->display);
1111 1152
1112 hidden_pointer = 1; 1153 hidden_pointer = 1;
1113} 1154}
1114 1155
… …
1209 1250
1210 SET_R (this); 1251 SET_R (this);
1211 SET_LOCALE (locale); 1252 SET_LOCALE (locale);
1212 1253
1213#if defined(CURSOR_BLINK) 1254#if defined(CURSOR_BLINK)
1214 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1255 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1215 { 1256 {
1216 if (hidden_cursor) 1257 if (hidden_cursor)
1217 { 1258 {
1218 hidden_cursor = 0; 1259 hidden_cursor = 0;
1219 want_refresh = 1; 1260 want_refresh = 1;
… …
1222 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1263 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1223 } 1264 }
1224#endif 1265#endif
1225 1266
1226#if defined(POINTER_BLANK) 1267#if defined(POINTER_BLANK)
1227 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0) 1268 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1228 { 1269 {
1229 if (ev.type == MotionNotify 1270 if (ev.type == MotionNotify
1230 || ev.type == ButtonPress 1271 || ev.type == ButtonPress
1231 || ev.type == ButtonRelease) 1272 || ev.type == ButtonRelease)
1232 if (hidden_pointer) 1273 if (hidden_pointer)
… …
1330 button_release (ev.xbutton); 1371 button_release (ev.xbutton);
1331 break; 1372 break;
1332 1373
1333 case ClientMessage: 1374 case ClientMessage:
1334 if (ev.xclient.format == 32 1375 if (ev.xclient.format == 32
1376 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1377 {
1335 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1378 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1336 destroy (); 1379 destroy ();
1380#if ENABLE_EWMH
1381 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1382 XSendEvent (disp, ev.xclient.window = display->root,
1383 False, SubstructureRedirectMask | SubstructureNotifyMask,
1384 &ev);
1385#endif
1386 }
1387#if ENABLE_XEMBED
1388 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1389 {
1390 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1391 focus_in ();
1392 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1393 focus_out ();
1394 }
1395#endif
1337#ifdef OFFIX_DND 1396#ifdef OFFIX_DND
1338 /* OffiX Dnd (drag 'n' drop) protocol */ 1397 /* OffiX Dnd (drag 'n' drop) protocol */
1339 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1398 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1340 && (ev.xclient.data.l[0] == DndFile 1399 && (ev.xclient.data.l[0] == DndFile
1341 || ev.xclient.data.l[0] == DndDir 1400 || ev.xclient.data.l[0] == DndDir
1342 || ev.xclient.data.l[0] == DndLink)) 1401 || ev.xclient.data.l[0] == DndLink))
1343 { 1402 {
1344 /* Get Dnd data */ 1403 /* Get Dnd data */
1345 Atom ActualType; 1404 Atom ActualType;
1346 int ActualFormat; 1405 int ActualFormat;
1347 unsigned char *data; 1406 unsigned char *data;
… …
1390 break; 1449 break;
1391 } 1450 }
1392 break; 1451 break;
1393 1452
1394 case FocusIn: 1453 case FocusIn:
1395 if (!TermWin.focus) 1454 focus_in ();
1455 break;
1456
1457 case FocusOut:
1458 focus_out ();
1459 break;
1460
1461 case ConfigureNotify:
1462 if (ev.xconfigure.window == parent[0])
1396 { 1463 {
1397 TermWin.focus = 1;
1398 want_refresh = 1;
1399#ifdef USE_XIM
1400 if (Input_Context != NULL)
1401 {
1402 IMSetStatusPosition ();
1403 XSetICFocus (Input_Context);
1404 }
1405#endif
1406#ifdef CURSOR_BLINK
1407 if (options & Opt_cursorBlink)
1408 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1409#endif
1410#ifdef OFF_FOCUS_FADING
1411 if (rs[Rs_fade])
1412 {
1413 pix_colors = pix_colors_focused;
1414 scr_recolour ();
1415 }
1416#endif
1417
1418 }
1419 break;
1420
1421 case FocusOut:
1422 if (TermWin.focus)
1423 {
1424 TermWin.focus = 0;
1425 want_refresh = 1;
1426
1427#if ENABLE_FRILLS || ISO_14755
1428 iso14755buf = 0;
1429#endif
1430#if ENABLE_OVERLAY
1431 scr_overlay_off ();
1432#endif
1433#ifdef USE_XIM
1434 if (Input_Context != NULL)
1435 XUnsetICFocus (Input_Context);
1436#endif
1437#ifdef CURSOR_BLINK
1438 if (options & Opt_cursorBlink)
1439 cursor_blink_ev.stop ();
1440 hidden_cursor = 0;
1441#endif
1442#ifdef OFF_FOCUS_FADING
1443 if (rs[Rs_fade])
1444 {
1445 pix_colors = pix_colors_unfocused;
1446 scr_recolour ();
1447 }
1448#endif
1449 }
1450 break;
1451
1452 case ConfigureNotify:
1453 if (ev.xconfigure.window == TermWin.parent[0])
1454 {
1455 int height, width;
1456
1457 do
1458 { /* Wrap lots of configures into one */
1459 width = ev.xconfigure.width;
1460 height = ev.xconfigure.height;
1461 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1462 }
1463 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)); 1464 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1465 ;
1464 1466
1465 if (szHint.width != width || szHint.height != height) 1467 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1466 { 1468 {
1467 seen_resize = 1; 1469 seen_resize = 1;
1468 resize_all_windows (width, height, 1); 1470 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1469 } 1471 }
1470 1472
1471#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1473#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1472 if (options & Opt_transparent) 1474 if (OPTION (Opt_transparent))
1473 check_our_parents (); 1475 check_our_parents ();
1474#endif 1476#endif
1475 } 1477 }
1476 break; 1478 break;
1477 1479
… …
1494 case SelectionRequest: 1496 case SelectionRequest:
1495 selection_send (ev.xselectionrequest); 1497 selection_send (ev.xselectionrequest);
1496 break; 1498 break;
1497 1499
1498 case UnmapNotify: 1500 case UnmapNotify:
1499 TermWin.mapped = 0; 1501 mapped = 0;
1500#ifdef TEXT_BLINK 1502#ifdef TEXT_BLINK
1501 text_blink_ev.stop (); 1503 text_blink_ev.stop ();
1502#endif 1504#endif
1503 break; 1505 break;
1504 1506
1505 case MapNotify: 1507 case MapNotify:
1506 TermWin.mapped = 1; 1508 mapped = 1;
1507#ifdef TEXT_BLINK 1509#ifdef TEXT_BLINK
1508 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1510 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1509#endif 1511#endif
1510 break; 1512 break;
1511 1513
… …
1515 break; 1517 break;
1516#endif /* TRANSPARENT */ 1518#endif /* TRANSPARENT */
1517 1519
1518 case GraphicsExpose: 1520 case GraphicsExpose:
1519 case Expose: 1521 case Expose:
1520 if (ev.xany.window == TermWin.vt) 1522 if (ev.xany.window == vt)
1521 { 1523 {
1522 do 1524 do
1523 scr_expose (ev.xexpose.x, ev.xexpose.y, 1525 scr_expose (ev.xexpose.x, ev.xexpose.y,
1524 ev.xexpose.width, ev.xexpose.height, False); 1526 ev.xexpose.width, ev.xexpose.height, False);
1525 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)); 1527 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1526 1528
1527 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1529 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1528 1530
1529 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)) 1531 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1530 scr_expose (ev.xexpose.x, ev.xexpose.y, 1532 scr_expose (ev.xexpose.x, ev.xexpose.y,
1531 ev.xexpose.width, ev.xexpose.height, False); 1533 ev.xexpose.width, ev.xexpose.height, False);
1532 1534
1533 scr_refresh (refresh_type); 1535 scr_refresh (refresh_type);
1534 } 1536 }
… …
1550 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1552 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1551 menubar_expose (); 1553 menubar_expose ();
1552#endif 1554#endif
1553 1555
1554#ifdef TRANSPARENT 1556#ifdef TRANSPARENT
1555 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1557 if (am_transparent && ev.xany.window == parent[0])
1556 XClearWindow (disp, ev.xany.window); 1558 XClearWindow (disp, ev.xany.window);
1557#endif 1559#endif
1558 } 1560 }
1559 break; 1561 break;
1560 1562
… …
1571 } 1573 }
1572#endif 1574#endif
1573 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1575 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1574 break; 1576 break;
1575 1577
1576 if (ev.xany.window == TermWin.vt) 1578 if (ev.xany.window == vt)
1577 { 1579 {
1578 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1580 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1579 { 1581 {
1580 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev)) 1582 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1581 ; 1583 ;
1582 1584
1583 XQueryPointer (disp, TermWin.vt, 1585 XQueryPointer (disp, vt,
1584 &unused_root, &unused_child, 1586 &unused_root, &unused_child,
1585 &unused_root_x, &unused_root_y, 1587 &unused_root_x, &unused_root_y,
1586 &ev.xbutton.x, &ev.xbutton.y, 1588 &ev.xbutton.x, &ev.xbutton.y,
1587 &ev.xbutton.state); 1589 &ev.xbutton.state);
1588#ifdef MOUSE_THRESHOLD 1590#ifdef MOUSE_THRESHOLD
… …
1600#endif 1602#endif
1601 selection_extend (ev.xbutton.x, ev.xbutton.y, 1603 selection_extend (ev.xbutton.x, ev.xbutton.y,
1602 ev.xbutton.state & Button3Mask ? 2 : 0); 1604 ev.xbutton.state & Button3Mask ? 2 : 0);
1603 1605
1604#ifdef SELECTION_SCROLLING 1606#ifdef SELECTION_SCROLLING
1605 if (ev.xbutton.y < TermWin.int_bwidth 1607 if (ev.xbutton.y < int_bwidth
1606 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1608 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1607 { 1609 {
1608 int dist; 1610 int dist;
1609 1611
1610 /* don't clobber the current delay if we are 1612 /* don't clobber the current delay if we are
1611 * already in the middle of scrolling. 1613 * already in the middle of scrolling.
… …
1619 selection_save_x = ev.xbutton.x; 1621 selection_save_x = ev.xbutton.x;
1620 selection_save_y = ev.xbutton.y; 1622 selection_save_y = ev.xbutton.y;
1621 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1623 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1622 1624
1623 /* calc number of lines to scroll */ 1625 /* calc number of lines to scroll */
1624 if (ev.xbutton.y < TermWin.int_bwidth) 1626 if (ev.xbutton.y < int_bwidth)
1625 { 1627 {
1626 scroll_selection_dir = UP; 1628 scroll_selection_dir = UP;
1627 dist = TermWin.int_bwidth - ev.xbutton.y; 1629 dist = int_bwidth - ev.xbutton.y;
1628 } 1630 }
1629 else 1631 else
1630 { 1632 {
1631 scroll_selection_dir = DN; 1633 scroll_selection_dir = DN;
1632 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1634 dist = ev.xbutton.y - (int_bwidth + height);
1633 } 1635 }
1634 1636
1635 scroll_selection_lines = Pixel2Height (dist) 1637 scroll_selection_lines = Pixel2Height (dist)
1636 / SELECTION_SCROLL_LINE_SPEEDUP 1638 / SELECTION_SCROLL_LINE_SPEEDUP
1637 + 1; 1639 + 1;
1638 MIN_IT (scroll_selection_lines, 1640 min_it (scroll_selection_lines,
1639 SELECTION_SCROLL_MAX_LINES); 1641 SELECTION_SCROLL_MAX_LINES);
1640 } 1642 }
1641 else 1643 else
1642 { 1644 {
1643 /* we are within the text window, so we 1645 /* we are within the text window, so we
… …
1671 } 1673 }
1672 break; 1674 break;
1673 } 1675 }
1674} 1676}
1675 1677
1678void
1679rxvt_term::focus_in ()
1680{
1681 if (!focus)
1682 {
1683 focus = 1;
1684 want_refresh = 1;
1685#if USE_XIM
1686 if (Input_Context != NULL)
1687 {
1688 IMSetStatusPosition ();
1689 XSetICFocus (Input_Context);
1690 }
1691#endif
1692#if CURSOR_BLINK
1693 if (OPTION (Opt_cursorBlink))
1694 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1695#endif
1696#if OFF_FOCUS_FADING
1697 if (rs[Rs_fade])
1698 {
1699 pix_colors = pix_colors_focused;
1700 scr_recolour ();
1701 }
1702#endif
1703 }
1704}
1705
1706void
1707rxvt_term::focus_out ()
1708{
1709 if (focus)
1710 {
1711 focus = 0;
1712 want_refresh = 1;
1713
1714#if ENABLE_FRILLS || ISO_14755
1715 iso14755buf = 0;
1716#endif
1717#if ENABLE_OVERLAY
1718 scr_overlay_off ();
1719#endif
1720#if USE_XIM
1721 if (Input_Context != NULL)
1722 XUnsetICFocus (Input_Context);
1723#endif
1724#if CURSOR_BLINK
1725 if (OPTION (Opt_cursorBlink))
1726 cursor_blink_ev.stop ();
1727 hidden_cursor = 0;
1728#endif
1729#if OFF_FOCUS_FADING
1730 if (rs[Rs_fade])
1731 {
1732 pix_colors = pix_colors_unfocused;
1733 scr_recolour ();
1734 }
1735#endif
1736 }
1737}
1738
1676#if TRANSPARENT 1739#if TRANSPARENT
1677void 1740void
1678rxvt_term::rootwin_cb (XEvent &ev) 1741rxvt_term::rootwin_cb (XEvent &ev)
1679{ 1742{
1680 SET_R (this); 1743 SET_R (this);
… …
1691 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1754 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1692 return; 1755 return;
1693 1756
1694 /* FALLTHROUGH */ 1757 /* FALLTHROUGH */
1695 case ReparentNotify: 1758 case ReparentNotify:
1696 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1759 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1697 want_refresh = want_full_refresh = 1; 1760 want_refresh = want_full_refresh = 1;
1698 break; 1761 break;
1699 } 1762 }
1700} 1763}
1701#endif 1764#endif
… …
1710 reportmode = !! (priv_modes & PrivMode_mouse_report); 1773 reportmode = !! (priv_modes & PrivMode_mouse_report);
1711 1774
1712 /* 1775 /*
1713 * VT window processing of button press 1776 * VT window processing of button press
1714 */ 1777 */
1715 if (ev.window == TermWin.vt) 1778 if (ev.window == vt)
1716 { 1779 {
1717#if ISO_14755 1780#if ISO_14755
1718 // 5.4 1781 // 5.4
1719 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1782 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1720 { 1783 {
… …
1925 case Button3: 1988 case Button3:
1926 if (scrollBar.style != R_SB_XTERM) 1989 if (scrollBar.style != R_SB_XTERM)
1927 { 1990 {
1928 if (scrollbar_above_slider (ev.y)) 1991 if (scrollbar_above_slider (ev.y))
1929# ifdef RXVT_SCROLL_FULL 1992# ifdef RXVT_SCROLL_FULL
1930 scr_page (UP, TermWin.nrow - 1); 1993 scr_page (UP, nrow - 1);
1931# else 1994# else
1932 scr_page (UP, TermWin.nrow / 4); 1995 scr_page (UP, nrow / 4);
1933# endif 1996# endif
1934 else if (scrollbar_below_slider (ev.y)) 1997 else if (scrollbar_below_slider (ev.y))
1935# ifdef RXVT_SCROLL_FULL 1998# ifdef RXVT_SCROLL_FULL
1936 scr_page (DN, TermWin.nrow - 1); 1999 scr_page (DN, nrow - 1);
1937# else 2000# else
1938 scr_page (DN, TermWin.nrow / 4); 2001 scr_page (DN, nrow / 4);
1939# endif 2002# endif
1940 else 2003 else
1941 scrollBar.setMotion (); 2004 scrollBar.setMotion ();
1942 } 2005 }
1943 else 2006 else
1944 { 2007 {
1945 scr_page ((ev.button == Button1 ? DN : UP), 2008 scr_page ((ev.button == Button1 ? DN : UP),
1946 (TermWin.nrow 2009 (nrow
1947 * scrollbar_position (ev.y) 2010 * scrollbar_position (ev.y)
1948 / scrollbar_size ())); 2011 / scrollbar_size ()));
1949 } 2012 }
1950 2013
1951 break; 2014 break;
… …
1983#ifdef SELECTION_SCROLLING 2046#ifdef SELECTION_SCROLLING
1984 if (sel_scroll_ev.active) 2047 if (sel_scroll_ev.active)
1985 sel_scroll_ev.stop(); 2048 sel_scroll_ev.stop();
1986#endif 2049#endif
1987 2050
1988 if (ev.window == TermWin.vt) 2051 if (ev.window == vt)
1989 { 2052 {
1990#if ISO_14755 2053#if ISO_14755
1991 // 5.4 2054 // 5.4
1992 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2055 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1993 return; 2056 return;
… …
2043 2106
2044 v = ev.button == Button4 ? UP : DN; 2107 v = ev.button == Button4 ? UP : DN;
2045 2108
2046 if (ev.state & ShiftMask) 2109 if (ev.state & ShiftMask)
2047 i = 1; 2110 i = 1;
2048 else if (options & Opt_mouseWheelScrollPage) 2111 else if (OPTION (Opt_mouseWheelScrollPage))
2049 i = TermWin.nrow - 1; 2112 i = nrow - 1;
2050 else 2113 else
2051 i = 5; 2114 i = 5;
2052 2115
2053# ifdef MOUSE_SLIP_WHEELING 2116# ifdef MOUSE_SLIP_WHEELING
2054 if (ev.state & ControlMask) 2117 if (ev.state & ControlMask)
2055 { 2118 {
2056 mouse_slip_wheel_speed += v ? -1 : 1; 2119 mouse_slip_wheel_speed += v ? -1 : 1;
2057 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2120 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2058 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2121 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2059 2122
2060 if (slip_wheel_ev.at < NOW) 2123 if (slip_wheel_ev.at < NOW)
2061 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2124 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2062 2125
2063 slip_wheel_ev.start (); 2126 slip_wheel_ev.start ();
… …
2339 XWindowAttributes wattr, wrootattr; 2402 XWindowAttributes wattr, wrootattr;
2340 dDisp; 2403 dDisp;
2341 2404
2342 pchanged = 0; 2405 pchanged = 0;
2343 2406
2344 if (!(options & Opt_transparent)) 2407 if (!OPTION (Opt_transparent))
2345 return pchanged; /* Don't try any more */ 2408 return pchanged; /* Don't try any more */
2346 2409
2347 XGetWindowAttributes (disp, display->root, &wrootattr); 2410 XGetWindowAttributes (disp, display->root, &wrootattr);
2348 rootdepth = wrootattr.depth; 2411 rootdepth = wrootattr.depth;
2349 2412
2350 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 2413 XGetWindowAttributes (disp, parent[0], &wattr);
2351 2414
2352 if (rootdepth != wattr.depth) 2415 if (rootdepth != wattr.depth)
2353 { 2416 {
2354 if (am_transparent) 2417 if (am_transparent)
2355 { 2418 {
2356 pchanged = 1; 2419 pchanged = 1;
2357 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2420 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2358 am_transparent = am_pixmap_trans = 0; 2421 am_transparent = am_pixmap_trans = 0;
2359 } 2422 }
2360 2423
2361 return pchanged; /* Don't try any more */ 2424 return pchanged; /* Don't try any more */
2362 } 2425 }
… …
2403 Window cr; 2466 Window cr;
2404 XImage *image; 2467 XImage *image;
2405 GC gc; 2468 GC gc;
2406 XGCValues gcvalue; 2469 XGCValues gcvalue;
2407 2470
2408 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 2471 XTranslateCoordinates (disp, parent[0], display->root,
2409 0, 0, &sx, &sy, &cr); 2472 0, 0, &sx, &sy, &cr);
2410 nw = (unsigned int)szHint.width; 2473 nw = (unsigned int)szHint.width;
2411 nh = (unsigned int)szHint.height; 2474 nh = (unsigned int)szHint.height;
2412 nx = ny = 0; 2475 nx = ny = 0;
2413 2476
… …
2423 nh += sy; 2486 nh += sy;
2424 ny = -sy; 2487 ny = -sy;
2425 sy = 0; 2488 sy = 0;
2426 } 2489 }
2427 2490
2428 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2491 min_it (nw, (unsigned int) (wrootattr.width - sx));
2429 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2492 min_it (nh, (unsigned int) (wrootattr.height - sy));
2430 2493
2431 XSync (disp, False); 2494 XSync (disp, False);
2432 allowedxerror = -1; 2495 allowedxerror = -1;
2433 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2496 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2434 2497
… …
2439 if (image == NULL) 2502 if (image == NULL)
2440 { 2503 {
2441 if (am_transparent && am_pixmap_trans) 2504 if (am_transparent && am_pixmap_trans)
2442 { 2505 {
2443 pchanged = 1; 2506 pchanged = 1;
2444 if (TermWin.pixmap != None) 2507 if (pixmap != None)
2445 { 2508 {
2446 XFreePixmap (disp, TermWin.pixmap); 2509 XFreePixmap (disp, pixmap);
2447 TermWin.pixmap = None; 2510 pixmap = None;
2448 } 2511 }
2449 } 2512 }
2450 2513
2451 am_pixmap_trans = 0; 2514 am_pixmap_trans = 0;
2452 } 2515 }
2453 else 2516 else
2454 { 2517 {
2455 if (TermWin.pixmap != None) 2518 if (pixmap != None)
2456 XFreePixmap (disp, TermWin.pixmap); 2519 XFreePixmap (disp, pixmap);
2457 2520
2458#if TINTING 2521#if TINTING
2459 if (ISSET_PIXCOLOR (Color_tint)) 2522 if (ISSET_PIXCOLOR (Color_tint))
2460 { 2523 {
2461 unsigned short rm, gm, bm; 2524 unsigned short rm, gm, bm;
… …
2465 2528
2466 ShadeXImage (display, image, shade, rm, gm, bm); 2529 ShadeXImage (display, image, shade, rm, gm, bm);
2467 } 2530 }
2468#endif 2531#endif
2469 2532
2470 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt, 2533 pixmap = XCreatePixmap (disp, vt,
2471 szHint.width, szHint.height, image->depth); 2534 szHint.width, szHint.height, image->depth);
2472 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue); 2535 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2473 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0, 2536 XPutImage (disp, pixmap, gc, image, 0, 0,
2474 nx, ny, image->width, image->height); 2537 nx, ny, image->width, image->height);
2475 XFreeGC (disp, gc); 2538 XFreeGC (disp, gc);
2476 XDestroyImage (image); 2539 XDestroyImage (image);
2477 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap); 2540 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2478 XClearWindow (disp, TermWin.parent[0]); 2541 XClearWindow (disp, parent[0]);
2479 2542
2480 if (!am_transparent || !am_pixmap_trans) 2543 if (!am_transparent || !am_pixmap_trans)
2481 pchanged = 1; 2544 pchanged = 1;
2482 2545
2483 am_transparent = am_pixmap_trans = 1; 2546 am_transparent = am_pixmap_trans = 1;
2484 } 2547 }
2485 } 2548 }
2486 2549
2487 if (am_pixmap_trans) 2550 if (am_pixmap_trans)
2488 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2551 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2489 else 2552 else
2490 { 2553 {
2491 unsigned int n; 2554 unsigned int n;
2492 /* 2555 /*
2493 * InheritPixmap transparency 2556 * InheritPixmap transparency
2494 */ 2557 */
2495 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2558 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2496 { 2559 {
2497 oldp = TermWin.parent[i]; 2560 oldp = parent[i];
2498 XQueryTree (disp, TermWin.parent[i - 1], &root, 2561 XQueryTree (disp, parent[i - 1], &root,
2499 &TermWin.parent[i], &list, &n); 2562 &parent[i], &list, &n);
2500 XFree (list); 2563 XFree (list);
2501 2564
2502 if (TermWin.parent[i] == display->root) 2565 if (parent[i] == display->root)
2503 { 2566 {
2504 if (oldp != None) 2567 if (oldp != None)
2505 pchanged = 1; 2568 pchanged = 1;
2506 2569
2507 break; 2570 break;
2508 } 2571 }
2509 2572
2510 if (oldp != TermWin.parent[i]) 2573 if (oldp != parent[i])
2511 pchanged = 1; 2574 pchanged = 1;
2512 } 2575 }
2513 2576
2514 n = 0; 2577 n = 0;
2515 2578
2516 if (pchanged) 2579 if (pchanged)
2517 { 2580 {
2518 for (; n < (unsigned int)i; n++) 2581 for (; n < (unsigned int)i; n++)
2519 { 2582 {
2520 XGetWindowAttributes (disp, TermWin.parent[n], &wattr); 2583 XGetWindowAttributes (disp, parent[n], &wattr);
2521 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2584 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2522 { 2585 {
2523 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2586 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2524 break; 2587 break;
2525 } 2588 }
2526 } 2589 }
2527 } 2590 }
2528 2591
2529 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2592 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2530 { 2593 {
2531 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]); 2594 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2532 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2595 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2533 am_transparent = 0; 2596 am_transparent = 0;
2534 /* XXX: also turn off Opt_transparent? */ 2597 /* XXX: also turn off Opt_transparent? */
2535 } 2598 }
2536 else 2599 else
2537 { 2600 {
… …
2540 * needed for fvwm2.2.2 (and before?) */ 2603 * needed for fvwm2.2.2 (and before?) */
2541 sleep (1); 2604 sleep (1);
2542#endif 2605#endif
2543 for (n = 0; n < (unsigned int)i; n++) 2606 for (n = 0; n < (unsigned int)i; n++)
2544 { 2607 {
2545 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative); 2608 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2546 XClearWindow (disp, TermWin.parent[n]); 2609 XClearWindow (disp, parent[n]);
2547 } 2610 }
2548 2611
2549 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2612 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2550 am_transparent = 1; 2613 am_transparent = 1;
2551 } 2614 }
2552 2615
2553 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2616 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2554 TermWin.parent[i] = None; 2617 parent[i] = None;
2555 } 2618 }
2556 2619
2557 if (scrollBar.win) 2620 if (scrollBar.win)
2558 { 2621 {
2559 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2622 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
… …
2602 // some window managers resize the window early, and these programs 2665 // some window managers resize the window early, and these programs
2603 // then sometimes get the size wrong. 2666 // then sometimes get the size wrong.
2604 // unfortunately other programs are even more buggy and dislike 2667 // unfortunately other programs are even more buggy and dislike
2605 // being sent SIGWINCH, so only do it when we were in fact being 2668 // being sent SIGWINCH, so only do it when we were in fact being
2606 // resized. 2669 // resized.
2607 if (seen_resize) 2670 if (seen_resize && cmd_pid)
2608 kill (-cmd_pid, SIGWINCH); 2671 kill (-cmd_pid, SIGWINCH);
2609 } 2672 }
2610 2673
2611 /* Read a text string from the input buffer */ 2674 /* Read a text string from the input buffer */
2612 unicode_t buf[UBUFSIZ]; 2675 unicode_t buf[UBUFSIZ];
2613 bool refreshnow = false; 2676 bool refreshnow = false;
2614 int nlines = 0; 2677 int nlines = 0;
2615 unicode_t *str = buf; 2678 unicode_t *str = buf;
2679 unicode_t *eol = str + min (ncol, UBUFSIZ);
2616 2680
2617 for (;;) 2681 for (;;)
2618 { 2682 {
2619 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2683 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2620 break; 2684 break;
2621 2685
2622 *str++ = ch; 2686 *str++ = ch;
2623 2687
2624 if (ch == C0_LF) 2688 if (ch == C0_LF || str >= eol)
2625 { 2689 {
2690 if (ch == C0_LF)
2626 nlines++; 2691 nlines++;
2692
2627 refresh_count++; 2693 refresh_count++;
2628 2694
2629 if (!(options & Opt_jumpScroll) 2695 if (!OPTION (Opt_jumpScroll)
2630 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2696 || (refresh_count >= refresh_limit * (nrow - 1)))
2631 { 2697 {
2632 refreshnow = true; 2698 refreshnow = true;
2699 refresh_count = 0;
2633 ch = NOCHAR; 2700 ch = NOCHAR;
2634 break; 2701 break;
2635 } 2702 }
2636 2703
2637 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2704 // scr_add_lines only works for nlines <= nrow - 1.
2638 if (nlines >= TermWin.nrow - 1) 2705 if (nlines >= nrow - 1)
2639 { 2706 {
2640 scr_add_lines (buf, nlines, str - buf); 2707 scr_add_lines (buf, nlines, str - buf);
2641 nlines = 0; 2708 nlines = 0;
2642 str = buf; 2709 str = buf;
2710 eol = str + min (ncol, UBUFSIZ);
2643 } 2711 }
2644 }
2645 2712
2646 if (str >= buf + UBUFSIZ) 2713 if (str >= eol)
2647 { 2714 {
2715 if (eol >= buf + UBUFSIZ)
2716 {
2648 ch = NOCHAR; 2717 ch = NOCHAR;
2649 break; 2718 break;
2719 }
2720 else
2721 eol = min (eol + ncol, buf + UBUFSIZ);
2722 }
2723
2650 } 2724 }
2651 2725
2652 seq_begin = cmdbuf_ptr; 2726 seq_begin = cmdbuf_ptr;
2653 ch = next_char (); 2727 ch = next_char ();
2654 } 2728 }
… …
2661 * the number of pages between refreshes is refresh_limit, which 2735 * the number of pages between refreshes is refresh_limit, which
2662 * is incremented here because we must be doing flat-out scrolling. 2736 * is incremented here because we must be doing flat-out scrolling.
2663 */ 2737 */
2664 if (refreshnow) 2738 if (refreshnow)
2665 { 2739 {
2666 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2740 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2667 refresh_limit++; 2741 refresh_limit++;
2668 else 2742 else
2669 { 2743 {
2670 flag = true; 2744 flag = true;
2671 scr_refresh (refresh_type); 2745 scr_refresh (refresh_type);
2746 flush_ev.stop ();
2672 } 2747 }
2673 } 2748 }
2674 2749
2675 } 2750 }
2676 else 2751 else
… …
3313 3388
3314 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3389 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3315 arg[0] = -arg[0]; 3390 arg[0] = -arg[0];
3316 /* FALLTHROUGH */ 3391 /* FALLTHROUGH */
3317 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3392 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3318 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3393 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3319 break; 3394 break;
3320 3395
3321 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3396 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3322 tt_write ((const unsigned char *)VT100_ANS, 3397 tt_write ((const unsigned char *)VT100_ANS,
3323 (unsigned int) (sizeof (VT100_ANS) - 1)); 3398 (unsigned int) (sizeof (VT100_ANS) - 1));
… …
3335 break; 3410 break;
3336 case 6: /* CPR requested */ 3411 case 6: /* CPR requested */
3337 scr_report_position (); 3412 scr_report_position ();
3338 break; 3413 break;
3339 case 7: /* unofficial extension */ 3414 case 7: /* unofficial extension */
3340 if (options & Opt_insecure) 3415 if (OPTION (Opt_insecure))
3341 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3416 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3342 break; 3417 break;
3343 case 8: /* unofficial extension */ 3418 case 8: /* unofficial extension */
3344 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3419 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3345 break; 3420 break;
… …
3448 { 3523 {
3449 /* 3524 /*
3450 * commands 3525 * commands
3451 */ 3526 */
3452 case 1: /* deiconify window */ 3527 case 1: /* deiconify window */
3453 XMapWindow (disp, TermWin.parent[0]); 3528 XMapWindow (disp, parent[0]);
3454 break; 3529 break;
3455 case 2: /* iconify window */ 3530 case 2: /* iconify window */
3456 XIconifyWindow (disp, TermWin.parent[0], display->screen); 3531 XIconifyWindow (disp, parent[0], display->screen);
3457 break; 3532 break;
3458 case 3: /* set position (pixels) */ 3533 case 3: /* set position (pixels) */
3459 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]); 3534 XMoveWindow (disp, parent[0], args[1], args[2]);
3460 break; 3535 break;
3461 case 4: /* set size (pixels) */ 3536 case 4: /* set size (pixels) */
3462 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3537 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3463 break; 3538 break;
3464 case 5: /* raise window */ 3539 case 5: /* raise window */
3465 XRaiseWindow (disp, TermWin.parent[0]); 3540 XRaiseWindow (disp, parent[0]);
3466 break; 3541 break;
3467 case 6: /* lower window */ 3542 case 6: /* lower window */
3468 XLowerWindow (disp, TermWin.parent[0]); 3543 XLowerWindow (disp, parent[0]);
3469 break; 3544 break;
3470 case 7: /* refresh window */ 3545 case 7: /* refresh window */
3471 scr_touch (true); 3546 scr_touch (true);
3472 break; 3547 break;
3473 case 8: /* set size (chars) */ 3548 case 8: /* set size (chars) */
3474 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3549 set_widthheight ((unsigned int) (args[2] * fwidth),
3475 (unsigned int) (args[1] * TermWin.fheight)); 3550 (unsigned int) (args[1] * fheight));
3476 break; 3551 break;
3477 3552
3478 //case 9: NYI, TODO, restore maximized window or maximize window 3553 //case 9: NYI, TODO, restore maximized window or maximize window
3479 default: 3554 default:
3480 if (args[0] >= 24) /* set height (chars) */ 3555 if (args[0] >= 24) /* set height (chars) */
3481 set_widthheight ((unsigned int)TermWin.width, 3556 set_widthheight ((unsigned int)width,
3482 (unsigned int) (args[1] * TermWin.fheight)); 3557 (unsigned int) (args[1] * fheight));
3483 break; 3558 break;
3484 3559
3485 3560
3486 /* 3561 /*
3487 * reports - some output format copied from XTerm 3562 * reports - some output format copied from XTerm
3488 */ 3563 */
3489 case 11: /* report window state */ 3564 case 11: /* report window state */
3490 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3565 XGetWindowAttributes (disp, parent[0], &wattr);
3491 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3566 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3492 break; 3567 break;
3493 case 13: /* report window position */ 3568 case 13: /* report window position */
3494 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3569 XGetWindowAttributes (disp, parent[0], &wattr);
3495 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root, 3570 XTranslateCoordinates (disp, parent[0], wattr.root,
3496 -wattr.border_width, -wattr.border_width, 3571 -wattr.border_width, -wattr.border_width,
3497 &x, &y, &wdummy); 3572 &x, &y, &wdummy);
3498 tt_printf ("\033[3;%d;%dt", x, y); 3573 tt_printf ("\033[3;%d;%dt", x, y);
3499 break; 3574 break;
3500 case 14: /* report window size (pixels) */ 3575 case 14: /* report window size (pixels) */
3501 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3576 XGetWindowAttributes (disp, parent[0], &wattr);
3502 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3577 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3503 break; 3578 break;
3504 case 18: /* report text area size (chars) */ 3579 case 18: /* report text area size (chars) */
3505 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3580 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3506 break; 3581 break;
3507 case 19: /* report window size (chars) */ 3582 case 19: /* report window size (chars) */
3508 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3583 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3509 break; 3584 break;
3510 case 20: /* report icon label */ 3585 case 20: /* report icon label */
3511 { 3586 {
3512 char *s; 3587 char *s;
3513 XGetIconName (disp, TermWin.parent[0], &s); 3588 XGetIconName (disp, parent[0], &s);
3514 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3589 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3515 XFree (s); 3590 XFree (s);
3516 } 3591 }
3517 break; 3592 break;
3518 case 21: /* report window title */ 3593 case 21: /* report window title */
3519 { 3594 {
3520 char *s; 3595 char *s;
3521 XFetchName (disp, TermWin.parent[0], &s); 3596 XFetchName (disp, parent[0], &s);
3522 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3597 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3523 XFree (s); 3598 XFree (s);
3524 } 3599 }
3525 break; 3600 break;
3526 } 3601 }
3527} 3602}
… …
3559 else if (ch < 0x20) 3634 else if (ch < 0x20)
3560 return NULL; /* other control character - exit */ 3635 return NULL; /* other control character - exit */
3561 3636
3562 seen_esc = false; 3637 seen_esc = false;
3563 3638
3564 if (n >= sizeof (string) - 1) 3639 if (n >= STRING_MAX - 1)
3565 // stop at some sane length 3640 // stop at some sane length
3566 return NULL; 3641 return NULL;
3567 3642
3568 if (ch == C0_SYN) 3643 if (ch == C0_SYN)
3569 string[n++] = cmd_get8 (); 3644 string[n++] = cmd_get8 ();
… …
3637 set_window_color (color, str); 3712 set_window_color (color, str);
3638} 3713}
3639 3714
3640/* 3715/*
3641 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3716 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3642 * 0 = change iconName/title
3643 * 1 = change iconName
3644 * 2 = change title
3645 * 4 = change color
3646 * 10 = change fg color
3647 * 11 = change bg color
3648 * 12 = change text color
3649 * 13 = change mouse foreground color
3650 * 17 = change highlight character colour
3651 * 18 = change bold character color
3652 * 19 = change underlined character color
3653 * 46 = change logfile (not implemented)
3654 * 50 = change font
3655 *
3656 * rxvt extensions:
3657 * 20 = bg pixmap
3658 * 39 = change default fg color
3659 * 49 = change default bg color
3660 * 55 = dump scrollback buffer and all of screen
3661 * 701 = change locale
3662 * 702 = find font
3663 * 703 = menu
3664 */ 3717 */
3665void 3718void
3666rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3719rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
3667{ 3720{
3668 int changed = 0; 3721 int changed = 0;
… …
3694 unsigned long bytes_after; 3747 unsigned long bytes_after;
3695 unsigned char *value = 0; 3748 unsigned char *value = 0;
3696 const char *str = ""; 3749 const char *str = "";
3697 3750
3698 if (prop 3751 if (prop
3699 && XGetWindowProperty (disp, TermWin.parent[0], 3752 && XGetWindowProperty (disp, parent[0],
3700 prop, 0, 1<<16, 0, AnyPropertyType, 3753 prop, 0, 1<<16, 0, AnyPropertyType,
3701 &actual_type, &actual_format, 3754 &actual_type, &actual_format,
3702 &nitems, &bytes_after, &value) == Success 3755 &nitems, &bytes_after, &value) == Success
3703 && actual_type != None 3756 && actual_type != None
3704 && actual_format == 8) 3757 && actual_format == 8)
… …
3716 { 3769 {
3717 *eq = 0; 3770 *eq = 0;
3718 set_utf8_property (display->atom (str), eq + 1); 3771 set_utf8_property (display->atom (str), eq + 1);
3719 } 3772 }
3720 else 3773 else
3721 XDeleteProperty (disp, TermWin.parent[0], 3774 XDeleteProperty (disp, parent[0],
3722 display->atom (str)); 3775 display->atom (str));
3723 } 3776 }
3724 break; 3777 break;
3725 3778
3726 case XTerm_Color: 3779 case XTerm_Color:
… …
3767 break; 3820 break;
3768#ifndef NO_BOLD_UNDERLINE_REVERSE 3821#ifndef NO_BOLD_UNDERLINE_REVERSE
3769 case XTerm_Color_BD: 3822 case XTerm_Color_BD:
3770 process_color_seq (XTerm_Color_BD, Color_BD, str, resp); 3823 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3771 break; 3824 break;
3772 case XTerm_Color_IT:
3773 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3774 break;
3775 case XTerm_Color_UL: 3825 case XTerm_Color_UL:
3776 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3826 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3777 break; 3827 break;
3778 case XTerm_Color_RV: 3828 case XTerm_Color_RV:
3779 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3829 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3780 break; 3830 break;
3831 case URxvt_Color_IT:
3832 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3833 break;
3781#endif 3834#endif
3782#if TRANSPARENT && TINTING 3835#if TRANSPARENT && TINTING
3783 case XTerm_Color_tint: 3836 case URxvt_Color_tint:
3784 process_color_seq (XTerm_Color_tint, Color_tint, str, resp); 3837 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3785 check_our_parents (); 3838 check_our_parents ();
3786 if (am_transparent) 3839 if (am_transparent)
3787 want_full_refresh = want_refresh = 1; 3840 want_full_refresh = want_refresh = 1;
3788 break; 3841 break;
3789#endif 3842#endif
… …
3823 3876
3824 case XTerm_logfile: 3877 case XTerm_logfile:
3825 // TODO, when secure mode? 3878 // TODO, when secure mode?
3826 break; 3879 break;
3827 3880
3881#ifdef MENUBAR
3882 case URxvt_Menu:
3883 if (OPTION (Opt_insecure))
3884 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3885 break;
3886#endif
3887#if 0
3888 case XTerm_dumpscreen: /* no error notices */
3889 {
3890 int fd;
3891 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3892 {
3893 scr_dump (fd);
3894 close (fd);
3895 }
3896 }
3897 break;
3898#endif
3828 case XTerm_font: 3899 case XTerm_font:
3829 op = URxvt_font; 3900 op = URxvt_font;
3830 case URxvt_font: 3901 case URxvt_font:
3831#if ENABLE_STYLES 3902#if ENABLE_STYLES
3832 case URxvt_boldFont: 3903 case URxvt_boldFont:
3833 case URxvt_italicFont: 3904 case URxvt_italicFont:
3834 case URxvt_boldItalicFont: 3905 case URxvt_boldItalicFont:
3835#endif 3906#endif
3836 if (query) 3907 if (query)
3837 tt_printf ("\33]%d;%-.250s%c", saveop, 3908 tt_printf ("\33]%d;%-.250s%c", saveop,
3838 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3909 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3839 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3910 ? fontset[op - URxvt_font]->fontdesc : "",
3840 resp); 3911 resp);
3841 else 3912 else
3842 { 3913 {
3843 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3914 const char *&res = rs[Rs_font + (op - URxvt_font)];
3844 3915
… …
3847 set_fonts (); 3918 set_fonts ();
3848 } 3919 }
3849 break; 3920 break;
3850 3921
3851#if ENABLE_FRILLS 3922#if ENABLE_FRILLS
3852 case XTerm_locale: 3923 case URxvt_locale:
3853 if (query) 3924 if (query)
3854 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); 3925 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3855 else 3926 else
3856 { 3927 {
3857 set_locale (str); 3928 set_locale (str);
3858 pty.set_utf8_mode (enc_utf8); 3929 pty.set_utf8_mode (enc_utf8);
3859# ifdef USE_XIM
3860 im_cb (); 3930 init_xlocale ();
3861# endif
3862 } 3931 }
3863 break; 3932 break;
3864#endif
3865 3933
3866#ifdef MENUBAR 3934 case URxvt_view_up:
3867 case XTerm_Menu: 3935 case URxvt_view_down:
3868 if (options & Opt_insecure) 3936 int lines = atoi (str);
3869 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3937
3870 break; 3938 if (lines)
3871#endif 3939 scr_page (op == URxvt_view_up ? UP : DN, lines);
3872#if 0
3873 case XTerm_dumpscreen: /* no error notices */
3874 { 3940 else
3875 int fd;
3876 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3877 { 3941 {
3878 scr_dump (fd); 3942 scr_erase_savelines ();
3879 close (fd);
3880 } 3943 }
3881 } 3944
3882 break; 3945 break;
3883#endif 3946#endif
3884 } 3947 }
3885} 3948}
3886/*----------------------------------------------------------------------*/ 3949/*----------------------------------------------------------------------*/
… …
3995 } 4058 }
3996 4059
3997 /* extra handling for values with state unkept */ 4060 /* extra handling for values with state unkept */
3998 switch (arg[i]) 4061 switch (arg[i])
3999 { 4062 {
4063#if ENABLE_STYLES
4064 case 1021:
4065 if (mode)
4066 SET_OPTION (Opt_intensityStyles);
4067 else
4068 CLR_OPTION (Opt_intensityStyles);
4069
4070 scr_touch (true);
4071 break;
4072#endif
4000 case 1048: /* alternative cursor save */ 4073 case 1048: /* alternative cursor save */
4001 case 1049: 4074 case 1049:
4002 if (options & Opt_secondaryScreen) 4075 if (OPTION (Opt_secondaryScreen))
4003 if (mode == 0) 4076 if (mode == 0)
4004 scr_cursor (RESTORE); 4077 scr_cursor (RESTORE);
4005 else if (mode == 1) 4078 else if (mode == 1)
4006 scr_cursor (SAVE); 4079 scr_cursor (SAVE);
4007 break; 4080 break;
… …
4019 */ 4092 */
4020 PrivMode (1, PrivMode_vt52); 4093 PrivMode (1, PrivMode_vt52);
4021 break; 4094 break;
4022 case 3: /* 80/132 */ 4095 case 3: /* 80/132 */
4023 if (priv_modes & PrivMode_132OK) 4096 if (priv_modes & PrivMode_132OK)
4024 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4097 set_widthheight (((state ? 132 : 80) * fwidth), height);
4025 break; 4098 break;
4026 case 4: /* smooth scrolling */ 4099 case 4: /* smooth scrolling */
4027 if (state) 4100 if (!state)
4028 options &= ~Opt_jumpScroll; 4101 SET_OPTION (Opt_jumpScroll);
4029 else 4102 else
4030 options |= Opt_jumpScroll; 4103 CLR_OPTION (Opt_jumpScroll);
4031 break; 4104 break;
4032 case 5: /* reverse video */ 4105 case 5: /* reverse video */
4033 scr_rvideo_mode (state); 4106 scr_rvideo_mode (state);
4034 break; 4107 break;
4035 case 6: /* relative/absolute origins */ 4108 case 6: /* relative/absolute origins */
… …
4076#if 0 4149#if 0
4077 case 1001: 4150 case 1001:
4078 break; /* X11 mouse highlighting */ 4151 break; /* X11 mouse highlighting */
4079#endif 4152#endif
4080 case 1010: /* scroll to bottom on TTY output inhibit */ 4153 case 1010: /* scroll to bottom on TTY output inhibit */
4081 if (state) 4154 if (!state)
4082 options &= ~Opt_scrollTtyOutput; 4155 SET_OPTION (Opt_scrollTtyOutput);
4083 else 4156 else
4084 options |= Opt_scrollTtyOutput; 4157 CLR_OPTION (Opt_scrollTtyOutput);
4085 break; 4158 break;
4086 case 1011: /* scroll to bottom on key press */ 4159 case 1011: /* scroll to bottom on key press */
4087 if (state) 4160 if (state)
4088 options |= Opt_scrollTtyKeypress; 4161 SET_OPTION (Opt_scrollTtyKeypress);
4089 else 4162 else
4090 options &= ~Opt_scrollTtyKeypress; 4163 CLR_OPTION (Opt_scrollTtyKeypress);
4091 break; 4164 break;
4092 case 1047: /* secondary screen w/ clearing last */ 4165 case 1047: /* secondary screen w/ clearing last */
4093 if (options & Opt_secondaryScreen) 4166 if (OPTION (Opt_secondaryScreen))
4094 if (current_screen != PRIMARY) 4167 if (current_screen != PRIMARY)
4095 scr_erase_screen (2); 4168 scr_erase_screen (2);
4096 scr_change_screen (state); 4169 scr_change_screen (state);
4097 break; 4170 break;
4098 case 1049: /* secondary screen w/ clearing first */ 4171 case 1049: /* secondary screen w/ clearing first */
4099 scr_change_screen (state); 4172 scr_change_screen (state);
4100 if (options & Opt_secondaryScreen) 4173 if (OPTION (Opt_secondaryScreen))
4101 if (current_screen != PRIMARY) 4174 if (current_screen != PRIMARY)
4102 scr_erase_screen (2); 4175 scr_erase_screen (2);
4103 break; 4176 break;
4104 default: 4177 default:
4105 break; 4178 break;
… …
4255 case 106: 4328 case 106:
4256 case 107: 4329 case 107:
4257 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4330 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4258 break; 4331 break;
4259#endif 4332#endif
4260
4261 } 4333 }
4262 } 4334 }
4263} 4335}
4264/*}}} */ 4336/*}}} */
4265 4337
… …
4346 } 4418 }
4347 4419
4348 memmove (v_buffer, v_buffer + written, v_buflen); 4420 memmove (v_buffer, v_buffer + written, v_buflen);
4349 } 4421 }
4350 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4422 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4351 // original code just ignores this... 4423 pty_ev.set (EVENT_READ);
4352 destroy ();
4353} 4424}
4354 4425
4355/*----------------------- end-of-file (C source) -----------------------*/ 4426/*----------------------- end-of-file (C source) -----------------------*/
4356 4427

Diff Legend

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