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

Diff Legend

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