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.294 by root, Mon Jan 30 20:12:37 2006 UTC vs.
Revision 1.333 by ayin, Tue Jun 26 09:55:22 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
49#include "rxvt.h" 49#include "rxvt.h"
50#include "rxvtperl.h" 50#include "rxvtperl.h"
51#include "version.h" 51#include "version.h"
52#include "command.h" 52#include "command.h"
53 53
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
56//# include <sched.h>
57#endif
58
59#ifdef KEYSYM_RESOURCE 54#ifdef KEYSYM_RESOURCE
60# include "keyboard.h" 55# include "keyboard.h"
61#endif 56#endif
62 57
63#include <csignal> 58#include <csignal>
59
60#if LINUX_YIELD_HACK
61# include <ctime>
62#endif
64 63
65/*----------------------------------------------------------------------*/ 64/*----------------------------------------------------------------------*/
66 65
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68 67
… …
299 298
300 return -1; 299 return -1;
301} 300}
302#endif 301#endif
303 302
304/*{{{ Convert the keypress event into a string */
305void 303void
306rxvt_term::lookup_key (XKeyEvent &ev) 304rxvt_term::key_press (XKeyEvent &ev)
307{ 305{
308 int ctrl, meta, shft, len; 306 int ctrl, meta, shft, len;
309 unsigned int newlen; 307 unsigned int newlen;
310 KeySym keysym; 308 KeySym keysym;
311 int valid_keysym; 309 int valid_keysym;
312 char kbuf[KBUFSZ]; 310 char kbuf[KBUFSZ];
311
312#if ISO_14755
313 if (iso14755buf & ISO_14755_52)
314 return;
315#endif
313 316
314 /* 317 /*
315 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 318 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
316 * escape sequence to toggle the Keypad. 319 * escape sequence to toggle the Keypad.
317 * 320 *
… …
497# if ISO_14755 500# if ISO_14755
498 iso14755_51 (0); 501 iso14755_51 (0);
499# endif 502# endif
500 return; 503 return;
501 } 504 }
505 else if (keysym == XK_BackSpace)
506 {
507 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
508# if ISO_14755
509 iso14755_51 (iso14755buf & ISO_14755_MASK);
510# endif
511 return;
512 }
502 else if ((hv = hex_keyval (ev)) >= 0) 513 else if ((hv = hex_keyval (ev)) >= 0)
503 { 514 {
504 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK) 515 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
505 | hv | ISO_14755_51; 516 | hv | ISO_14755_51;
506# if ISO_14755 517# if ISO_14755
… …
525 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 536 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
526 scr_overlay_set (0, 0, "ISO 14755 mode"); 537 scr_overlay_set (0, 0, "ISO 14755 mode");
527# endif 538# endif
528 } 539 }
529#endif 540#endif
530 541
531#ifdef PRINTPIPE 542#ifdef PRINTPIPE
532 if (keysym == XK_Print) 543 if (keysym == XK_Print)
533 { 544 {
534 scr_printscreen (ctrl | shft); 545 scr_printscreen (ctrl | shft);
535 return; 546 return;
… …
874 return; 885 return;
875 886
876 if (len <= 0) 887 if (len <= 0)
877 return; /* not mapped */ 888 return; /* not mapped */
878 889
879 if (OPTION (Opt_scrollTtyKeypress)) 890 if (option (Opt_scrollTtyKeypress))
880 if (view_start) 891 if (view_start)
881 { 892 {
882 view_start = 0; 893 view_start = 0;
883 want_refresh = 1; 894 want_refresh = 1;
884 } 895 }
… …
908 tt_write (&ch, 1); 919 tt_write (&ch, 1);
909 } 920 }
910 921
911 tt_write (kbuf, (unsigned int)len); 922 tt_write (kbuf, (unsigned int)len);
912} 923}
913/*}}} */ 924
925void
926rxvt_term::key_release (XKeyEvent &ev)
927{
928#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
929 KeySym keysym;
930
931 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
932#endif
933
934#if ENABLE_FRILLS || ISO_14755
935 // ISO 14755 support
936 if (iso14755buf)
937 if (iso14755buf & ISO_14755_52)
938 {
939# if ENABLE_OVERLAY
940 scr_overlay_off ();
941# endif
942# if ISO_14755
943 // iso14755 part 5.2 handling: release time
944 // first: controls
945 if ((ev.state & ControlMask)
946 && ((keysym >= 0x40 && keysym <= 0x5f)
947 || (keysym >= 0x61 && keysym <= 0x7f)))
948 {
949 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
950 commit_iso14755 ();
951
952 return;
953 }
954
955 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
956 if (i[0] == keysym)
957 {
958 iso14755buf = ISO_14755_51 | i[1];
959 commit_iso14755 ();
960
961 return;
962 }
963
964 scr_bell ();
965# endif
966 iso14755buf = 0;
967
968 return;
969 }
970 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
971 {
972# if ENABLE_OVERLAY
973 scr_overlay_off ();
974# endif
975 if (iso14755buf & ISO_14755_51)
976 commit_iso14755 ();
977#if ISO_14755
978 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
979 {
980 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
981
982 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
983 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
984 }
985# endif
986 else
987 iso14755buf = 0;
988 }
989#endif
990
991 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
992 return;
993
994#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
995 if (!(ev.state & ControlMask))
996 slip_wheel_ev.stop ();
997 else if (keysym == XK_Control_L || keysym == XK_Control_R)
998 mouse_slip_wheel_speed = 0;
999#endif
1000}
914 1001
915#if defined (KEYSYM_RESOURCE) 1002#if defined (KEYSYM_RESOURCE)
916unsigned int 1003unsigned int
917rxvt_term::cmd_write (const char *str, unsigned int count) 1004rxvt_term::cmd_write (const char *str, unsigned int count)
918{ 1005{
… …
948void 1035void
949rxvt_term::flush () 1036rxvt_term::flush ()
950{ 1037{
951 flush_ev.stop (); 1038 flush_ev.stop ();
952 1039
953#ifdef TRANSPARENT 1040#ifdef ENABLE_TRANSPARENCY
954 if (want_full_refresh) 1041 if (want_full_refresh)
955 { 1042 {
956 want_full_refresh = 0; 1043 want_full_refresh = 0;
957 scr_clear (); 1044 scr_clear ();
958 scr_touch (false); 1045 scr_touch (false);
… …
1023void 1110void
1024rxvt_term::flush_cb (time_watcher &w) 1111rxvt_term::flush_cb (time_watcher &w)
1025{ 1112{
1026 make_current (); 1113 make_current ();
1027 1114
1028 refresh_limit = 1;
1029 refresh_count = 0; 1115 refresh_count = 0;
1030 flush (); 1116 flush ();
1031} 1117}
1032 1118
1033#ifdef CURSOR_BLINK 1119#ifdef CURSOR_BLINK
… …
1095 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1181 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1096 } 1182 }
1097} 1183}
1098#endif 1184#endif
1099 1185
1100#if HAVE_SCHED_YIELD 1186#if LINUX_YIELD_HACK
1101static struct event_handler 1187static struct event_handler
1102{ 1188{
1103 check_watcher cw_yield; 1189 check_watcher yield_ev;
1104 1190
1105 void yield (check_watcher &w) 1191 void yield_cb (check_watcher &w)
1106 { 1192 {
1107 sched_yield (); 1193 // this should really be sched_yield(), but the linux guys thought
1194 // that giving a process calling sched_yield () less cpu time than
1195 // ones with high nice levels is a useful thing to do. It surely is is
1196 // allowed by the sus... as is returning ENOSYS.
1197
1198 struct timespec ts = { 0, 0 };
1199 nanosleep (&ts, 0);
1200
1108 w.stop (); 1201 w.stop ();
1109 } 1202 }
1110 1203
1111 event_handler () 1204 event_handler ()
1112 : cw_yield (this, &event_handler::yield) 1205 : yield_ev (this, &event_handler::yield_cb)
1113 { 1206 {
1114 } 1207 }
1115} event_handler; 1208} event_handler;
1116#endif 1209#endif
1117 1210
… …
1137 cmdbuf_endp += r; 1230 cmdbuf_endp += r;
1138 return true; 1231 return true;
1139 } 1232 }
1140 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1233 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1141 { 1234 {
1142#if HAVE_SCHED_YIELD 1235#if LINUX_YIELD_HACK
1143 if (display->is_local) 1236 if (display->is_local)
1144 event_handler.cw_yield.start (); 1237 event_handler.yield_ev.start ();
1145#endif 1238#endif
1146 } 1239 }
1147 else 1240 else
1148 { 1241 {
1149 pty_ev.stop (); 1242 pty_ev.stop ();
1150 1243
1151 if (!OPTION (Opt_hold)) 1244 if (!option (Opt_hold))
1152 destroy (); 1245 destroy ();
1153 } 1246 }
1154 1247
1155 return false; 1248 return false;
1156} 1249}
1157 1250
1158void 1251void
1159rxvt_term::pty_cb (io_watcher &w, short revents) 1252rxvt_term::pty_cb (io_watcher &w, short revents)
… …
1171} 1264}
1172 1265
1173void 1266void
1174rxvt_term::pointer_unblank () 1267rxvt_term::pointer_unblank ()
1175{ 1268{
1176 XDefineCursor (xdisp, vt, TermWin_cursor); 1269 XDefineCursor (dpy, vt, TermWin_cursor);
1177 recolour_cursor (); 1270 recolour_cursor ();
1178 1271
1179#ifdef POINTER_BLANK 1272#ifdef POINTER_BLANK
1180 hidden_pointer = 0; 1273 hidden_pointer = 0;
1181 1274
1182 if (OPTION (Opt_pointerBlank)) 1275 if (option (Opt_pointerBlank))
1183 pointer_ev.start (NOW + pointerBlankDelay); 1276 pointer_ev.start (NOW + pointerBlankDelay);
1184#endif 1277#endif
1185} 1278}
1186 1279
1187#ifdef POINTER_BLANK 1280#ifdef POINTER_BLANK
1188void 1281void
1189rxvt_term::pointer_blank () 1282rxvt_term::pointer_blank ()
1190{ 1283{
1191 if (!OPTION (Opt_pointerBlank)) 1284 if (!option (Opt_pointerBlank))
1192 return; 1285 return;
1193 1286
1194 XDefineCursor (xdisp, vt, display->blank_cursor); 1287 XDefineCursor (dpy, vt, display->blank_cursor);
1195 XFlush (xdisp); 1288 XFlush (dpy);
1196 1289
1197 hidden_pointer = 1; 1290 hidden_pointer = 1;
1198} 1291}
1199 1292
1200void 1293void
… …
1279void 1372void
1280rxvt_term::x_cb (XEvent &ev) 1373rxvt_term::x_cb (XEvent &ev)
1281{ 1374{
1282 make_current (); 1375 make_current ();
1283 1376
1284 dLocal (Display *, xdisp); 1377 dLocal (Display *, dpy);
1285 1378
1286 if (ev.xany.window == vt 1379 if (ev.xany.window == vt
1287 && SHOULD_INVOKE (HOOK_X_EVENT) 1380 && SHOULD_INVOKE (HOOK_X_EVENT)
1288 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1381 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1289 return; 1382 return;
… …
1294 unsigned int unused_mask; 1387 unsigned int unused_mask;
1295 1388
1296 switch (ev.type) 1389 switch (ev.type)
1297 { 1390 {
1298 case KeyPress: 1391 case KeyPress:
1299#if ISO_14755 1392 key_press (ev.xkey);
1300 if (!(iso14755buf & ISO_14755_52))
1301#endif
1302 lookup_key (ev.xkey);
1303
1304 break; 1393 break;
1305 1394
1306 case KeyRelease: 1395 case KeyRelease:
1307 { 1396 key_release (ev.xkey);
1308#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1309 KeySym keysym;
1310
1311 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1312#endif
1313
1314#if ENABLE_FRILLS || ISO_14755
1315 // ISO 14755 support
1316 if (iso14755buf)
1317 if (iso14755buf & ISO_14755_52)
1318 {
1319# if ENABLE_OVERLAY
1320 scr_overlay_off ();
1321# endif
1322# if ISO_14755
1323 // iso14755 part 5.2 handling: release time
1324 // first: controls
1325 if ((ev.xkey.state & ControlMask)
1326 && ((keysym >= 0x40 && keysym <= 0x5f)
1327 || (keysym >= 0x61 && keysym <= 0x7f)))
1328 {
1329 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1330 commit_iso14755 ();
1331 goto skip_switch;
1332 }
1333
1334 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1335 if (i[0] == keysym)
1336 {
1337 iso14755buf = ISO_14755_51 | i[1];
1338 commit_iso14755 ();
1339 goto skip_switch;
1340 }
1341
1342 scr_bell ();
1343# endif
1344 iso14755buf = 0;
1345 break;
1346 }
1347 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1348 {
1349# if ENABLE_OVERLAY
1350 scr_overlay_off ();
1351# endif
1352 if (iso14755buf & ISO_14755_51)
1353 commit_iso14755 ();
1354#if ISO_14755
1355 else if (iso14755buf & ISO_14755_STARTED)
1356 {
1357 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1358
1359 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1360 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1361 }
1362# endif
1363 else
1364 iso14755buf = 0;
1365 }
1366#endif
1367
1368 if (ev.xany.window == vt
1369 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1370 break;
1371
1372#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1373 if (!(ev.xkey.state & ControlMask))
1374 slip_wheel_ev.stop ();
1375 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1376 mouse_slip_wheel_speed = 0;
1377#endif
1378 break; 1397 break;
1379 }
1380 1398
1381 case ButtonPress: 1399 case ButtonPress:
1382 button_press (ev.xbutton); 1400 button_press (ev.xbutton);
1383 break; 1401 break;
1384 1402
… …
1399 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END))) 1417 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1400 destroy (); 1418 destroy ();
1401 } 1419 }
1402#if ENABLE_EWMH 1420#if ENABLE_EWMH
1403 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1421 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1404 XSendEvent (xdisp, ev.xclient.window = display->root, 1422 XSendEvent (dpy, ev.xclient.window = display->root,
1405 False, SubstructureRedirectMask | SubstructureNotifyMask, 1423 False, SubstructureRedirectMask | SubstructureNotifyMask,
1406 &ev); 1424 &ev);
1407#endif 1425#endif
1408 } 1426 }
1409 } 1427 }
… …
1447 break; 1465 break;
1448 } 1466 }
1449 break; 1467 break;
1450 1468
1451 case FocusIn: 1469 case FocusIn:
1470 if (ev.xfocus.detail != NotifyInferior
1471 && ev.xfocus.detail != NotifyPointer
1472 && ev.xfocus.mode != NotifyGrab)
1452 focus_in (); 1473 focus_in ();
1453 break; 1474 break;
1454 1475
1455 case FocusOut: 1476 case FocusOut:
1477 if (ev.xfocus.detail != NotifyInferior
1478 && ev.xfocus.detail != NotifyPointer
1479 && ev.xfocus.mode != NotifyGrab)
1456 focus_out (); 1480 focus_out ();
1457 break; 1481 break;
1458 1482
1459 case ConfigureNotify: 1483 case ConfigureNotify:
1460 if (ev.xconfigure.window == parent[0]) 1484 if (ev.xconfigure.window == parent[0])
1461 { 1485 {
1462 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev)) 1486 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1463 ; 1487 ;
1464 1488
1465 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1489 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1466 { 1490 {
1467 seen_resize = 1; 1491 seen_resize = 1;
1468 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1492 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1493#ifdef XPM_BACKGROUND
1494 if (!option (Opt_transparent) && bgPixmap.auto_resize)
1495 {
1496 resize_pixmap ();
1497 scr_touch (true);
1498 }
1499#endif
1469 } 1500 }
1470 1501
1471 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1502 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1472 1503
1473#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1504#ifdef ENABLE_TRANSPARENCY
1474 if (OPTION (Opt_transparent)) 1505 if (option (Opt_transparent))
1475 check_our_parents (); 1506 check_our_parents ();
1476#endif 1507#endif
1477 } 1508 }
1478 break; 1509 break;
1479 1510
… …
1512 text_blink_ev.stop (); 1543 text_blink_ev.stop ();
1513#endif 1544#endif
1514 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1545 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1515 break; 1546 break;
1516 1547
1517#ifdef TRANSPARENT 1548#ifdef ENABLE_TRANSPARENCY
1518 case ReparentNotify: 1549 case ReparentNotify:
1519 rootwin_cb (ev); 1550 rootwin_cb (ev);
1520 break; 1551 break;
1521#endif /* TRANSPARENT */ 1552#endif /* ENABLE_TRANSPARENCY */
1522 1553
1523 case GraphicsExpose: 1554 case GraphicsExpose:
1524 case Expose: 1555 case Expose:
1525 if (ev.xany.window == vt) 1556 if (ev.xany.window == vt)
1526 { 1557 {
1527 do 1558 do
1528 scr_expose (ev.xexpose.x, ev.xexpose.y, 1559 scr_expose (ev.xexpose.x, ev.xexpose.y,
1529 ev.xexpose.width, ev.xexpose.height, False); 1560 ev.xexpose.width, ev.xexpose.height, False);
1530 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)); 1561 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1531 1562
1532 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1563 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1533 1564
1534 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)) 1565 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1535 scr_expose (ev.xexpose.x, ev.xexpose.y, 1566 scr_expose (ev.xexpose.x, ev.xexpose.y,
1536 ev.xexpose.width, ev.xexpose.height, False); 1567 ev.xexpose.width, ev.xexpose.height, False);
1537 1568
1538 want_refresh = 1; 1569 want_refresh = 1;
1539 } 1570 }
1540 else 1571 else
1541 { 1572 {
1542 XEvent unused_event; 1573 XEvent unused_event;
1543 1574
1544 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event)) 1575 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1545 ; 1576 ;
1546 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event)) 1577 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1547 ; 1578 ;
1548 1579
1549 if (isScrollbarWindow (ev.xany.window)) 1580 if (isScrollbarWindow (ev.xany.window))
1550 { 1581 {
1551 scrollBar.setIdle (); 1582 scrollBar.setIdle ();
1552 scrollbar_show (0); 1583 scrollbar_show (0);
1553 } 1584 }
1554 1585
1555#ifdef TRANSPARENT 1586#ifdef ENABLE_TRANSPARENCY
1556 if (am_transparent && ev.xany.window == parent[0]) 1587 if (am_transparent && ev.xany.window == parent[0])
1557 XClearWindow (xdisp, ev.xany.window); 1588 XClearWindow (dpy, ev.xany.window);
1558#endif 1589#endif
1559 } 1590 }
1560 break; 1591 break;
1561 1592
1562 case MotionNotify: 1593 case MotionNotify:
… …
1572 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1603 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1573 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1604 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1574 ; // nop 1605 ; // nop
1575 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1606 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1576 { 1607 {
1577 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev)) 1608 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1578 ; 1609 ;
1579 1610
1580 XQueryPointer (xdisp, vt, 1611 XQueryPointer (dpy, vt,
1581 &unused_root, &unused_child, 1612 &unused_root, &unused_child,
1582 &unused_root_x, &unused_root_y, 1613 &unused_root_x, &unused_root_y,
1583 &ev.xbutton.x, &ev.xbutton.y, 1614 &ev.xbutton.x, &ev.xbutton.y,
1584 &ev.xbutton.state); 1615 &ev.xbutton.state);
1585#ifdef MOUSE_THRESHOLD 1616#ifdef MOUSE_THRESHOLD
… …
1649#endif 1680#endif
1650 } 1681 }
1651 } 1682 }
1652 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1683 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1653 { 1684 {
1654 while (XCheckTypedWindowEvent (xdisp, scrollBar.win, 1685 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1655 MotionNotify, &ev)) 1686 MotionNotify, &ev))
1656 ; 1687 ;
1657 1688
1658 XQueryPointer (xdisp, scrollBar.win, 1689 XQueryPointer (dpy, scrollBar.win,
1659 &unused_root, &unused_child, 1690 &unused_root, &unused_child,
1660 &unused_root_x, &unused_root_y, 1691 &unused_root_x, &unused_root_y,
1661 &ev.xbutton.x, &ev.xbutton.y, 1692 &ev.xbutton.x, &ev.xbutton.y,
1662 &unused_mask); 1693 &unused_mask);
1663 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1694 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1664 scrollbar_size ()); 1695 scrollbar_size ());
1665 want_refresh = 1; 1696 want_refresh = 1;
1666 refresh_limit = 0;
1667 scrollbar_show (1); 1697 scrollbar_show (1);
1668 } 1698 }
1669 break; 1699 break;
1670 } 1700 }
1671 1701
1672skip_switch: ;
1673
1674#if defined(CURSOR_BLINK) 1702#if defined(CURSOR_BLINK)
1675 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1703 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1676 { 1704 {
1677 if (hidden_cursor) 1705 if (hidden_cursor)
1678 { 1706 {
1679 hidden_cursor = 0; 1707 hidden_cursor = 0;
1680 want_refresh = 1; 1708 want_refresh = 1;
… …
1683 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1711 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1684 } 1712 }
1685#endif 1713#endif
1686 1714
1687#if defined(POINTER_BLANK) 1715#if defined(POINTER_BLANK)
1688 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1716 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1689 { 1717 {
1690 if (ev.type == MotionNotify 1718 if (ev.type == MotionNotify
1691 || ev.type == ButtonPress 1719 || ev.type == ButtonPress
1692 || ev.type == ButtonRelease) 1720 || ev.type == ButtonRelease)
1693 if (hidden_pointer) 1721 if (hidden_pointer)
… …
1705 if (!focus) 1733 if (!focus)
1706 { 1734 {
1707 focus = 1; 1735 focus = 1;
1708 want_refresh = 1; 1736 want_refresh = 1;
1709 1737
1710 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1738 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1711 1739
1712#if USE_XIM 1740#if USE_XIM
1713 if (Input_Context != NULL) 1741 if (Input_Context != NULL)
1714 { 1742 {
1715 IMSetStatusPosition (); 1743 IMSetPosition ();
1716 XSetICFocus (Input_Context); 1744 XSetICFocus (Input_Context);
1717 } 1745 }
1718#endif 1746#endif
1719#if CURSOR_BLINK 1747#if CURSOR_BLINK
1720 if (OPTION (Opt_cursorBlink)) 1748 if (option (Opt_cursorBlink))
1721 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1749 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1722#endif 1750#endif
1723#if OFF_FOCUS_FADING 1751#if OFF_FOCUS_FADING
1724 if (rs[Rs_fade]) 1752 if (rs[Rs_fade])
1725 { 1753 {
1726 pix_colors = pix_colors_focused; 1754 pix_colors = pix_colors_focused;
1727 scr_recolour (); 1755 scr_recolour ();
1756 }
1757#endif
1758#if ENABLE_FRILLS
1759 if (option (Opt_urgentOnBell))
1760 {
1761 XWMHints *h;
1762
1763 h = XGetWMHints(dpy, parent[0]);
1764 if (h != NULL)
1765 {
1766 h->flags &= ~XUrgencyHint;
1767 XSetWMHints(dpy, parent[0], h);
1768 }
1728 } 1769 }
1729#endif 1770#endif
1730 } 1771 }
1731} 1772}
1732 1773
… …
1752#if USE_XIM 1793#if USE_XIM
1753 if (Input_Context != NULL) 1794 if (Input_Context != NULL)
1754 XUnsetICFocus (Input_Context); 1795 XUnsetICFocus (Input_Context);
1755#endif 1796#endif
1756#if CURSOR_BLINK 1797#if CURSOR_BLINK
1757 if (OPTION (Opt_cursorBlink)) 1798 if (option (Opt_cursorBlink))
1758 cursor_blink_ev.stop (); 1799 cursor_blink_ev.stop ();
1759 hidden_cursor = 0; 1800 hidden_cursor = 0;
1760#endif 1801#endif
1761#if OFF_FOCUS_FADING 1802#if OFF_FOCUS_FADING
1762 if (rs[Rs_fade]) 1803 if (rs[Rs_fade])
… …
1766 } 1807 }
1767#endif 1808#endif
1768 } 1809 }
1769} 1810}
1770 1811
1771#if TRANSPARENT 1812void
1813rxvt_term::update_fade_color (unsigned int idx)
1814{
1815#if OFF_FOCUS_FADING
1816 if (rs[Rs_fade])
1817 {
1818 rgba c;
1819 pix_colors [Color_fade].get (c);
1820 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1821 }
1822#endif
1823}
1824
1825#if ENABLE_TRANSPARENCY || ENABLE_PERL
1772void 1826void
1773rxvt_term::rootwin_cb (XEvent &ev) 1827rxvt_term::rootwin_cb (XEvent &ev)
1774{ 1828{
1775 make_current (); 1829 make_current ();
1776 1830
1831 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1832 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1833 return;
1834
1835# if ENABLE_TRANSPARENCY
1777 switch (ev.type) 1836 switch (ev.type)
1778 { 1837 {
1779 case PropertyNotify: 1838 case PropertyNotify:
1780 /* 1839 /*
1781 * if user used some Esetroot compatible prog to set the root bg, 1840 * if user used some Esetroot compatible prog to set the root bg,
… …
1785 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1844 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1786 return; 1845 return;
1787 1846
1788 /* FALLTHROUGH */ 1847 /* FALLTHROUGH */
1789 case ReparentNotify: 1848 case ReparentNotify:
1790 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent) 1849 if (option (Opt_transparent))
1791 want_refresh = want_full_refresh = 1; 1850 check_our_parents ();
1792 break; 1851 break;
1793 } 1852 }
1853# endif
1794} 1854}
1795#endif 1855#endif
1796 1856
1797void 1857void
1798rxvt_term::button_press (XButtonEvent &ev) 1858rxvt_term::button_press (XButtonEvent &ev)
… …
2126 selection_make (ev.time); 2186 selection_make (ev.time);
2127 break; 2187 break;
2128 2188
2129 case Button2: 2189 case Button2:
2130 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2190 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2131 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary); 2191 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2132 break; 2192 break;
2133 2193
2134#ifdef MOUSE_WHEEL 2194#ifdef MOUSE_WHEEL
2135 case Button4: 2195 case Button4:
2136 case Button5: 2196 case Button5:
… …
2140 2200
2141 v = ev.button == Button4 ? UP : DN; 2201 v = ev.button == Button4 ? UP : DN;
2142 2202
2143 if (ev.state & ShiftMask) 2203 if (ev.state & ShiftMask)
2144 i = 1; 2204 i = 1;
2145 else if (OPTION (Opt_mouseWheelScrollPage)) 2205 else if (option (Opt_mouseWheelScrollPage))
2146 i = nrow - 1; 2206 i = nrow - 1;
2147 else 2207 else
2148 i = 5; 2208 i = 5;
2149 2209
2150# ifdef MOUSE_SLIP_WHEELING 2210# ifdef MOUSE_SLIP_WHEELING
… …
2171 break; 2231 break;
2172#endif 2232#endif
2173 } 2233 }
2174 } 2234 }
2175} 2235}
2176
2177#ifdef TRANSPARENT
2178#if TINTING
2179/* taken from aterm-0.4.2 */
2180
2181typedef uint32_t RUINT32T;
2182
2183void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2184{
2185 int sh_r, sh_g, sh_b;
2186 RUINT32T mask_r, mask_g, mask_b;
2187 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2188 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2189 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2190 int i;
2191
2192 Visual *visual = term->visual;
2193
2194 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2195
2196 /* for convenience */
2197 mask_r = visual->red_mask;
2198 mask_g = visual->green_mask;
2199 mask_b = visual->blue_mask;
2200
2201 /* boring lookup table pre-initialization */
2202 switch (srcImage->bits_per_pixel) {
2203 case 15:
2204 if ((mask_r != 0x7c00) ||
2205 (mask_g != 0x03e0) ||
2206 (mask_b != 0x001f))
2207 return;
2208 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2209 lookup_r = lookup;
2210 lookup_g = lookup+32;
2211 lookup_b = lookup+32+32;
2212 sh_r = 10;
2213 sh_g = 5;
2214 sh_b = 0;
2215 break;
2216 case 16:
2217 if ((mask_r != 0xf800) ||
2218 (mask_g != 0x07e0) ||
2219 (mask_b != 0x001f))
2220 return;
2221 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2222 lookup_r = lookup;
2223 lookup_g = lookup+32;
2224 lookup_b = lookup+32+64;
2225 sh_r = 11;
2226 sh_g = 5;
2227 sh_b = 0;
2228 break;
2229 case 24:
2230 if ((mask_r != 0xff0000) ||
2231 (mask_g != 0x00ff00) ||
2232 (mask_b != 0x0000ff))
2233 return;
2234 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2235 lookup_r = lookup;
2236 lookup_g = lookup+256;
2237 lookup_b = lookup+256+256;
2238 sh_r = 16;
2239 sh_g = 8;
2240 sh_b = 0;
2241 break;
2242 case 32:
2243 if ((mask_r != 0xff0000) ||
2244 (mask_g != 0x00ff00) ||
2245 (mask_b != 0x0000ff))
2246 return;
2247 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2248 lookup_r = lookup;
2249 lookup_g = lookup+256;
2250 lookup_b = lookup+256+256;
2251 sh_r = 16;
2252 sh_g = 8;
2253 sh_b = 0;
2254 break;
2255 default:
2256 return; /* we do not support this color depth */
2257 }
2258
2259 /* prepare limits for color transformation (each channel is handled separately) */
2260 if (shade < 0) {
2261 shade = -shade;
2262 if (shade < 0) shade = 0;
2263 if (shade > 100) shade = 100;
2264
2265 lower_lim_r = 65535-rm;
2266 lower_lim_g = 65535-gm;
2267 lower_lim_b = 65535-bm;
2268
2269 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2270 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2271 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2272
2273 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2274 } else {
2275 if (shade < 0) shade = 0;
2276 if (shade > 100) shade = 100;
2277
2278 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2279
2280 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2281 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2282 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2283 }
2284
2285 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2286 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2287 {
2288 unsigned int tmp;
2289
2290 tmp = lower_lim_r;
2291 lower_lim_r = lower_lim_b;
2292 lower_lim_b = tmp;
2293
2294 tmp = upper_lim_r;
2295 upper_lim_r = upper_lim_b;
2296 upper_lim_b = tmp;
2297 }
2298
2299 /* fill our lookup tables */
2300 for (i = 0; i <= mask_r>>sh_r; i++)
2301 {
2302 RUINT32T tmp;
2303 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2304 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2305 lookup_r[i] = (tmp/65535)<<sh_r;
2306 }
2307 for (i = 0; i <= mask_g>>sh_g; i++)
2308 {
2309 RUINT32T tmp;
2310 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2311 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2312 lookup_g[i] = (tmp/65535)<<sh_g;
2313 }
2314 for (i = 0; i <= mask_b>>sh_b; i++)
2315 {
2316 RUINT32T tmp;
2317 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2318 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2319 lookup_b[i] = (tmp/65535)<<sh_b;
2320 }
2321
2322 /* apply table to input image (replacing colors by newly calculated ones) */
2323 switch (srcImage->bits_per_pixel)
2324 {
2325 case 15:
2326 {
2327 unsigned short *p1, *pf, *p, *pl;
2328 p1 = (unsigned short *) srcImage->data;
2329 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2330 while (p1 < pf)
2331 {
2332 p = p1;
2333 pl = p1 + srcImage->width;
2334 for (; p < pl; p++)
2335 {
2336 *p = lookup_r[(*p & 0x7c00)>>10] |
2337 lookup_g[(*p & 0x03e0)>> 5] |
2338 lookup_b[(*p & 0x001f)];
2339 }
2340 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2341 }
2342 break;
2343 }
2344 case 16:
2345 {
2346 unsigned short *p1, *pf, *p, *pl;
2347 p1 = (unsigned short *) srcImage->data;
2348 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2349 while (p1 < pf)
2350 {
2351 p = p1;
2352 pl = p1 + srcImage->width;
2353 for (; p < pl; p++)
2354 {
2355 *p = lookup_r[(*p & 0xf800)>>11] |
2356 lookup_g[(*p & 0x07e0)>> 5] |
2357 lookup_b[(*p & 0x001f)];
2358 }
2359 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2360 }
2361 break;
2362 }
2363 case 24:
2364 {
2365 unsigned char *p1, *pf, *p, *pl;
2366 p1 = (unsigned char *) srcImage->data;
2367 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2368 while (p1 < pf)
2369 {
2370 p = p1;
2371 pl = p1 + srcImage->width * 3;
2372 for (; p < pl; p += 3)
2373 {
2374 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2375 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2376 p[2] = lookup_r[(p[2] & 0x0000ff)];
2377 }
2378 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2379 }
2380 break;
2381 }
2382 case 32:
2383 {
2384 RUINT32T *p1, *pf, *p, *pl;
2385 p1 = (RUINT32T *) srcImage->data;
2386 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2387
2388 while (p1 < pf)
2389 {
2390 p = p1;
2391 pl = p1 + srcImage->width;
2392 for (; p < pl; p++)
2393 {
2394 *p = lookup_r[(*p & 0xff0000)>>16] |
2395 lookup_g[(*p & 0x00ff00)>> 8] |
2396 lookup_b[(*p & 0x0000ff)] |
2397 (*p & ~0xffffff);
2398 }
2399 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2400 }
2401 break;
2402 }
2403 }
2404
2405 free (lookup);
2406}
2407#endif
2408
2409/*
2410 * Check our parents are still who we think they are.
2411 * Do transparency updates if required
2412 */
2413int
2414rxvt_term::check_our_parents ()
2415{
2416 int i, pchanged, aformat, have_pixmap, rootdepth;
2417 unsigned long nitems, bytes_after;
2418 Atom atype;
2419 unsigned char *prop = NULL;
2420 Window root, oldp, *list;
2421 Pixmap rootpixmap = None;
2422 XWindowAttributes wattr, wrootattr;
2423
2424 pchanged = 0;
2425
2426 if (!OPTION (Opt_transparent))
2427 return pchanged; /* Don't try any more */
2428
2429 XGetWindowAttributes (xdisp, display->root, &wrootattr);
2430 rootdepth = wrootattr.depth;
2431
2432 XGetWindowAttributes (xdisp, parent[0], &wattr);
2433
2434 if (rootdepth != wattr.depth)
2435 {
2436 if (am_transparent)
2437 {
2438 pchanged = 1;
2439 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2440 am_transparent = am_pixmap_trans = 0;
2441 }
2442
2443 return pchanged; /* Don't try any more */
2444 }
2445
2446 /* Get all X ops out of the queue so that our information is up-to-date. */
2447 XSync (xdisp, False);
2448
2449 /*
2450 * Make the frame window set by the window manager have
2451 * the root background. Some window managers put multiple nested frame
2452 * windows for each client, so we have to take care about that.
2453 */
2454 i = (xa[XA_XROOTPMAP_ID]
2455 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2456 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2457 &nitems, &bytes_after, &prop) == Success);
2458
2459 if (!i || prop == NULL)
2460 i = (xa[XA_ESETROOT_PMAP_ID]
2461 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2462 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2463 &nitems, &bytes_after, &prop) == Success);
2464
2465 if (!i || prop == NULL
2466#if TINTING
2467 || !rs[Rs_color + Color_tint]
2468#endif
2469 )
2470 have_pixmap = 0;
2471 else
2472 {
2473 have_pixmap = 1;
2474 rootpixmap = *(Pixmap *)prop;
2475 XFree (prop);
2476 }
2477
2478 if (have_pixmap)
2479 {
2480 /*
2481 * Copy display->root pixmap transparency
2482 */
2483 int sx, sy, nx, ny;
2484 unsigned int nw, nh;
2485 Window cr;
2486 XImage *image;
2487 GC gc;
2488 XGCValues gcvalue;
2489
2490 XTranslateCoordinates (xdisp, parent[0], display->root,
2491 0, 0, &sx, &sy, &cr);
2492 nw = (unsigned int)szHint.width;
2493 nh = (unsigned int)szHint.height;
2494 nx = ny = 0;
2495
2496 if (sx < 0)
2497 {
2498 nw += sx;
2499 nx = -sx;
2500 sx = 0;
2501 }
2502
2503 if (sy < 0)
2504 {
2505 nh += sy;
2506 ny = -sy;
2507 sy = 0;
2508 }
2509
2510 min_it (nw, (unsigned int) (wrootattr.width - sx));
2511 min_it (nh, (unsigned int) (wrootattr.height - sy));
2512
2513 XSync (xdisp, False);
2514 allowedxerror = -1;
2515 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2516
2517 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2518 /* XXX: may need a delay here? */
2519 allowedxerror = 0;
2520
2521 if (image == NULL)
2522 {
2523 if (am_transparent && am_pixmap_trans)
2524 {
2525 pchanged = 1;
2526 if (pixmap != None)
2527 {
2528 XFreePixmap (xdisp, pixmap);
2529 pixmap = None;
2530 }
2531 }
2532
2533 am_pixmap_trans = 0;
2534 }
2535 else
2536 {
2537 if (pixmap != None)
2538 XFreePixmap (xdisp, pixmap);
2539
2540#if TINTING
2541 if (ISSET_PIXCOLOR (Color_tint))
2542 {
2543 rxvt_rgba c;
2544 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2545
2546 pix_colors_focused[Color_tint].get (this, c);
2547
2548 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2549 }
2550#endif
2551
2552 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2553 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2554 XPutImage (xdisp, pixmap, gc, image, 0, 0,
2555 nx, ny, image->width, image->height);
2556 XFreeGC (xdisp, gc);
2557 XDestroyImage (image);
2558 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2559 XClearWindow (xdisp, parent[0]);
2560
2561 if (!am_transparent || !am_pixmap_trans)
2562 pchanged = 1;
2563
2564 am_transparent = am_pixmap_trans = 1;
2565 }
2566 }
2567
2568 if (am_pixmap_trans)
2569 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2570 else
2571 {
2572 unsigned int n;
2573 /*
2574 * InheritPixmap transparency
2575 */
2576 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2577 {
2578 oldp = parent[i];
2579 XQueryTree (xdisp, parent[i - 1], &root,
2580 &parent[i], &list, &n);
2581 XFree (list);
2582
2583 if (parent[i] == display->root)
2584 {
2585 if (oldp != None)
2586 pchanged = 1;
2587
2588 break;
2589 }
2590
2591 if (oldp != parent[i])
2592 pchanged = 1;
2593 }
2594
2595 n = 0;
2596
2597 if (pchanged)
2598 {
2599 for (; n < (unsigned int)i; n++)
2600 {
2601 XGetWindowAttributes (xdisp, parent[n], &wattr);
2602 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2603 {
2604 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2605 break;
2606 }
2607 }
2608 }
2609
2610 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2611 {
2612 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2613 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2614 am_transparent = 0;
2615 /* XXX: also turn off Opt_transparent? */
2616 }
2617 else
2618 {
2619 for (n = 0; n < (unsigned int)i; n++)
2620 {
2621 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2622 XClearWindow (xdisp, parent[n]);
2623 }
2624
2625 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2626 am_transparent = 1;
2627 }
2628
2629 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2630 parent[i] = None;
2631 }
2632
2633 if (scrollBar.win)
2634 {
2635 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2636 scrollBar.setIdle ();
2637 scrollbar_show (0);
2638 }
2639
2640 if (am_transparent)
2641 {
2642 want_refresh = want_full_refresh = 1;
2643 if (am_pixmap_trans)
2644 flush ();
2645 }
2646
2647 return pchanged;
2648}
2649#endif
2650 2236
2651/*}}} */ 2237/*}}} */
2652 2238
2653bool 2239bool
2654rxvt_term::cmd_parse () 2240rxvt_term::cmd_parse ()
… …
2703 if (ch == C0_LF) 2289 if (ch == C0_LF)
2704 nlines++; 2290 nlines++;
2705 2291
2706 refresh_count++; 2292 refresh_count++;
2707 2293
2708 if (!OPTION (Opt_jumpScroll) 2294 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2709 || (refresh_count >= refresh_limit * (nrow - 1)))
2710 { 2295 {
2711 refreshnow = true;
2712 refresh_count = 0; 2296 refresh_count = 0;
2297
2298 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.)
2299 {
2300 refreshnow = true;
2713 ch = NOCHAR; 2301 ch = NOCHAR;
2714 break; 2302 break;
2303 }
2715 } 2304 }
2716 2305
2717 // scr_add_lines only works for nlines <= nrow - 1. 2306 // scr_add_lines only works for nlines <= nrow - 1.
2718 if (nlines >= nrow - 1) 2307 if (nlines >= nrow - 1)
2719 { 2308 {
… …
2747 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2336 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2748 scr_add_lines (buf, str - buf, nlines); 2337 scr_add_lines (buf, str - buf, nlines);
2749 2338
2750 /* 2339 /*
2751 * If there have been a lot of new lines, then update the screen 2340 * If there have been a lot of new lines, then update the screen
2752 * What the heck I'll cheat and only refresh less than every page-full. 2341 * What the heck we'll cheat and only refresh less than every page-full.
2753 * the number of pages between refreshes is refresh_limit, which 2342 * if skipScroll is enabled.
2754 * is incremented here because we must be doing flat-out scrolling.
2755 */ 2343 */
2756 if (refreshnow) 2344 if (refreshnow)
2757 { 2345 {
2758 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2759 refresh_limit++;
2760 else
2761 {
2762 flag = true; 2346 flag = true;
2763 scr_refresh (); 2347 scr_refresh ();
2764 want_refresh = 1; 2348 want_refresh = 1;
2765 }
2766 } 2349 }
2767 2350
2768 } 2351 }
2769 else 2352 else
2770 { 2353 {
… …
2919 { 2502 {
2920 if ((buf[len++] = cmd_getc ()) == 'i') 2503 if ((buf[len++] = cmd_getc ()) == 'i')
2921 break; /* done = 1 */ 2504 break; /* done = 1 */
2922 } 2505 }
2923 } 2506 }
2924 2507
2925 for (i = 0; i < len; i++) 2508 for (i = 0; i < len; i++)
2926 if (putc (buf[i], fd) == EOF) 2509 if (putc (buf[i], fd) == EOF)
2927 { 2510 {
2928 done = 1; 2511 done = 1;
2929 break; 2512 break;
… …
2991 process_dcs_seq (); 2574 process_dcs_seq ();
2992 break; 2575 break;
2993 case 0x9b: /* CSI */ 2576 case 0x9b: /* CSI */
2994 process_csi_seq (); 2577 process_csi_seq ();
2995 break; 2578 break;
2996 case 0x9d: /* CSI */ 2579 case 0x9d: /* OSC */
2997 process_osc_seq (); 2580 process_osc_seq ();
2998 break; 2581 break;
2999#endif 2582#endif
3000 } 2583 }
3001} 2584}
… …
3428 break; 3011 break;
3429 case 6: /* CPR requested */ 3012 case 6: /* CPR requested */
3430 scr_report_position (); 3013 scr_report_position ();
3431 break; 3014 break;
3432 case 7: /* unofficial extension */ 3015 case 7: /* unofficial extension */
3433 if (OPTION (Opt_insecure)) 3016 if (option (Opt_insecure))
3434 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3017 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3435 break; 3018 break;
3436 case 8: /* unofficial extension */ 3019 case 8: /* unofficial extension */
3437 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3020 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3438 break; 3021 break;
… …
3531{ 3114{
3532 int x, y; 3115 int x, y;
3533 XWindowAttributes wattr; 3116 XWindowAttributes wattr;
3534 Window wdummy; 3117 Window wdummy;
3535 3118
3536 dLocal (Display *, xdisp); 3119 dLocal (Display *, dpy);
3537 3120
3538 if (nargs == 0) 3121 if (nargs == 0)
3539 return; 3122 return;
3540 3123
3541 switch (args[0]) 3124 switch (args[0])
3542 { 3125 {
3543 /* 3126 /*
3544 * commands 3127 * commands
3545 */ 3128 */
3546 case 1: /* deiconify window */ 3129 case 1: /* deiconify window */
3547 XMapWindow (xdisp, parent[0]); 3130 XMapWindow (dpy, parent[0]);
3548 break; 3131 break;
3549 case 2: /* iconify window */ 3132 case 2: /* iconify window */
3550 XIconifyWindow (xdisp, parent[0], display->screen); 3133 XIconifyWindow (dpy, parent[0], display->screen);
3551 break; 3134 break;
3552 case 3: /* set position (pixels) */ 3135 case 3: /* set position (pixels) */
3553 XMoveWindow (xdisp, parent[0], args[1], args[2]); 3136 XMoveWindow (dpy, parent[0], args[1], args[2]);
3554 break; 3137 break;
3555 case 4: /* set size (pixels) */ 3138 case 4: /* set size (pixels) */
3556 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3139 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3557 break; 3140 break;
3558 case 5: /* raise window */ 3141 case 5: /* raise window */
3559 XRaiseWindow (xdisp, parent[0]); 3142 XRaiseWindow (dpy, parent[0]);
3560 break; 3143 break;
3561 case 6: /* lower window */ 3144 case 6: /* lower window */
3562 XLowerWindow (xdisp, parent[0]); 3145 XLowerWindow (dpy, parent[0]);
3563 break; 3146 break;
3564 case 7: /* refresh window */ 3147 case 7: /* refresh window */
3565 scr_touch (true); 3148 scr_touch (true);
3566 break; 3149 break;
3567 case 8: /* set size (chars) */ 3150 case 8: /* set size (chars) */
… …
3574 if (args[0] >= 24) /* set height (chars) */ 3157 if (args[0] >= 24) /* set height (chars) */
3575 set_widthheight ((unsigned int)width, 3158 set_widthheight ((unsigned int)width,
3576 (unsigned int) (args[1] * fheight)); 3159 (unsigned int) (args[1] * fheight));
3577 break; 3160 break;
3578 3161
3579
3580 /* 3162 /*
3581 * reports - some output format copied from XTerm 3163 * reports - some output format copied from XTerm
3582 */ 3164 */
3583 case 11: /* report window state */ 3165 case 11: /* report window state */
3584 XGetWindowAttributes (xdisp, parent[0], &wattr); 3166 XGetWindowAttributes (dpy, parent[0], &wattr);
3585 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3167 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3586 break; 3168 break;
3587 case 13: /* report window position */ 3169 case 13: /* report window position */
3588 XGetWindowAttributes (xdisp, parent[0], &wattr); 3170 XGetWindowAttributes (dpy, parent[0], &wattr);
3589 XTranslateCoordinates (xdisp, parent[0], wattr.root, 3171 XTranslateCoordinates (dpy, parent[0], wattr.root,
3590 -wattr.border_width, -wattr.border_width, 3172 -wattr.border_width, -wattr.border_width,
3591 &x, &y, &wdummy); 3173 &x, &y, &wdummy);
3592 tt_printf ("\033[3;%d;%dt", x, y); 3174 tt_printf ("\033[3;%d;%dt", x, y);
3593 break; 3175 break;
3594 case 14: /* report window size (pixels) */ 3176 case 14: /* report window size (pixels) */
3595 XGetWindowAttributes (xdisp, parent[0], &wattr); 3177 XGetWindowAttributes (dpy, parent[0], &wattr);
3596 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3178 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3597 break; 3179 break;
3598 case 18: /* report text area size (chars) */ 3180 case 18: /* report text area size (chars) */
3599 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3181 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3600 break; 3182 break;
… …
3602 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3184 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3603 break; 3185 break;
3604 case 20: /* report icon label */ 3186 case 20: /* report icon label */
3605 { 3187 {
3606 char *s; 3188 char *s;
3607 XGetIconName (xdisp, parent[0], &s); 3189 XGetIconName (dpy, parent[0], &s);
3608 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3190 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3609 XFree (s); 3191 XFree (s);
3610 } 3192 }
3611 break; 3193 break;
3612 case 21: /* report window title */ 3194 case 21: /* report window title */
3613 { 3195 {
3614 char *s; 3196 char *s;
3615 XFetchName (xdisp, parent[0], &s); 3197 XFetchName (dpy, parent[0], &s);
3616 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3198 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3617 XFree (s); 3199 XFree (s);
3618 } 3200 }
3619 break; 3201 break;
3620 } 3202 }
3621} 3203}
… …
3648 seen_esc = true; 3230 seen_esc = true;
3649 continue; 3231 continue;
3650 } 3232 }
3651 else if (ch == C0_BEL || ch == CHAR_ST) 3233 else if (ch == C0_BEL || ch == CHAR_ST)
3652 break; 3234 break;
3235 else if (ch == C0_SYN)
3236 ch = cmd_get8 ();
3653 else if (ch < 0x20) 3237 else if (ch < 0x20)
3654 return NULL; /* other control character - exit */ 3238 return NULL; /* other control character - exit */
3655 3239
3656 seen_esc = false; 3240 seen_esc = false;
3657 3241
3658 if (n >= STRING_MAX - 1) 3242 if (n >= STRING_MAX - 1)
3659 // stop at some sane length 3243 // stop at some sane length
3660 return NULL; 3244 return NULL;
3661 3245
3662 if (ch == C0_SYN)
3663 string[n++] = cmd_get8 ();
3664 else
3665 string[n++] = ch; 3246 string[n++] = ch;
3666 } 3247 }
3667 3248
3668 string[n++] = '\0'; 3249 string[n++] = '\0';
3669 3250
3670 ends_how = (ch == 0x5c ? C0_ESC : ch); 3251 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3721void 3302void
3722rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3303rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3723{ 3304{
3724 if (str[0] == '?' && !str[1]) 3305 if (str[0] == '?' && !str[1])
3725 { 3306 {
3726 rxvt_rgba c; 3307 rgba c;
3727 pix_colors_focused[color].get (this, c); 3308 pix_colors_focused[color].get (c);
3728 3309
3729#if XFT 3310#if XFT
3730 if (c.a != rxvt_rgba::MAX_CC) 3311 if (c.a != rgba::MAX_CC)
3731 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp); 3312 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3732 else 3313 else
3733#endif 3314#endif
3734 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp); 3315 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3735 } 3316 }
… …
3746 int color; 3327 int color;
3747 char *buf, *name; 3328 char *buf, *name;
3748 bool query = str[0] == '?' && !str[1]; 3329 bool query = str[0] == '?' && !str[1];
3749 int saveop = op; 3330 int saveop = op;
3750 3331
3751 dLocal (Display *, xdisp); 3332 dLocal (Display *, dpy);
3752 3333
3753 assert (str != NULL); 3334 assert (str != NULL);
3335
3336 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3337 return;
3338
3754 switch (op) 3339 switch (op)
3755 { 3340 {
3756 case XTerm_name: 3341 case XTerm_name:
3757 set_title (str); 3342 set_title (str);
3758 /* FALLTHROUGH */ 3343 /* FALLTHROUGH */
… …
3772 unsigned long bytes_after; 3357 unsigned long bytes_after;
3773 unsigned char *value = 0; 3358 unsigned char *value = 0;
3774 const char *str = ""; 3359 const char *str = "";
3775 3360
3776 if (prop 3361 if (prop
3777 && XGetWindowProperty (xdisp, parent[0], 3362 && XGetWindowProperty (dpy, parent[0],
3778 prop, 0, 1<<16, 0, AnyPropertyType, 3363 prop, 0, 1<<16, 0, AnyPropertyType,
3779 &actual_type, &actual_format, 3364 &actual_type, &actual_format,
3780 &nitems, &bytes_after, &value) == Success 3365 &nitems, &bytes_after, &value) == Success
3781 && actual_type != None 3366 && actual_type != None
3782 && actual_format == 8) 3367 && actual_format == 8)
… …
3794 { 3379 {
3795 *eq = 0; 3380 *eq = 0;
3796 set_utf8_property (display->atom (str), eq + 1); 3381 set_utf8_property (display->atom (str), eq + 1);
3797 } 3382 }
3798 else 3383 else
3799 XDeleteProperty (xdisp, parent[0], 3384 XDeleteProperty (dpy, parent[0],
3800 display->atom (str)); 3385 display->atom (str));
3801 } 3386 }
3802 break; 3387 break;
3803 3388
3804 case XTerm_Color: 3389 case XTerm_Color:
… …
3850 break; 3435 break;
3851 case URxvt_Color_IT: 3436 case URxvt_Color_IT:
3852 process_color_seq (op, Color_IT, str, resp); 3437 process_color_seq (op, Color_IT, str, resp);
3853 break; 3438 break;
3854#endif 3439#endif
3855#if TRANSPARENT && TINTING 3440#if ENABLE_TRANSPARENCY && TINTING
3856 case URxvt_Color_tint: 3441 case URxvt_Color_tint:
3857 process_color_seq (op, Color_tint, str, resp); 3442 process_color_seq (op, Color_tint, str, resp);
3443
3858 check_our_parents (); 3444 check_our_parents ();
3445
3859 if (am_transparent) 3446 if (am_transparent)
3860 want_full_refresh = want_refresh = 1; 3447 want_full_refresh = want_refresh = 1;
3448
3861 break; 3449 break;
3862#endif 3450#endif
3863 3451
3864 case Rxvt_Pixmap: 3452 case Rxvt_Pixmap:
3865 { 3453 {
… …
3887#ifdef XPM_BACKGROUND 3475#ifdef XPM_BACKGROUND
3888 resize_pixmap (); 3476 resize_pixmap ();
3889 scr_touch (true); 3477 scr_touch (true);
3890#endif 3478#endif
3891 } 3479 }
3480#if ENABLE_TRANSPARENCY && defined(HAVE_AFTERIMAGE)
3481 if (option (Opt_transparent))
3482 check_our_parents ();
3483#endif
3892 } 3484 }
3893 break; 3485 break;
3894 3486
3895 case Rxvt_restoreFG: 3487 case Rxvt_restoreFG:
3896 set_window_color (Color_fg, str); 3488 set_window_color (Color_fg, str);
… …
3923 case URxvt_italicFont: 3515 case URxvt_italicFont:
3924 case URxvt_boldItalicFont: 3516 case URxvt_boldItalicFont:
3925#endif 3517#endif
3926 if (query) 3518 if (query)
3927 tt_printf ("\33]%d;%-.250s%c", saveop, 3519 tt_printf ("\33]%d;%-.250s%c", saveop,
3928 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3520 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3929 ? fontset[op - URxvt_font]->fontdesc : "", 3521 ? fontset[op - URxvt_font]->fontdesc : "",
3930 resp); 3522 resp);
3931 else 3523 else
3932 { 3524 {
3933 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3525 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3947 break; 3539 break;
3948 3540
3949#if !ENABLE_MINIMAL 3541#if !ENABLE_MINIMAL
3950 case URxvt_locale: 3542 case URxvt_locale:
3951 if (query) 3543 if (query)
3952 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp); 3544 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3953 else 3545 else
3954 { 3546 {
3955 set_locale (str); 3547 set_locale (str);
3956 pty->set_utf8_mode (enc_utf8); 3548 pty->set_utf8_mode (enc_utf8);
3957 init_xlocale (); 3549 init_xlocale ();
… …
3972 break; 3564 break;
3973#endif 3565#endif
3974 3566
3975#if ENABLE_PERL 3567#if ENABLE_PERL
3976 case URxvt_perl: 3568 case URxvt_perl:
3977 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3569 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3978 ; // no responses yet 3570 ; // no responses yet
3979 break; 3571 break;
3980#endif 3572#endif
3981 } 3573 }
3982} 3574}
… …
4098 scr_touch (true); 3690 scr_touch (true);
4099 break; 3691 break;
4100#endif 3692#endif
4101 case 1048: /* alternative cursor save */ 3693 case 1048: /* alternative cursor save */
4102 case 1049: 3694 case 1049:
4103 if (OPTION (Opt_secondaryScreen)) 3695 if (option (Opt_secondaryScreen))
4104 if (mode == 0) 3696 if (mode == 0)
4105 scr_cursor (RESTORE); 3697 scr_cursor (RESTORE);
4106 else if (mode == 1) 3698 else if (mode == 1)
4107 scr_cursor (SAVE); 3699 scr_cursor (SAVE);
4108 break; 3700 break;
… …
4173 break; 3765 break;
4174 case 1011: /* scroll to bottom on key press */ 3766 case 1011: /* scroll to bottom on key press */
4175 set_option (Opt_scrollTtyKeypress, state); 3767 set_option (Opt_scrollTtyKeypress, state);
4176 break; 3768 break;
4177 case 1047: /* secondary screen w/ clearing last */ 3769 case 1047: /* secondary screen w/ clearing last */
4178 if (OPTION (Opt_secondaryScreen)) 3770 if (option (Opt_secondaryScreen))
4179 if (current_screen != PRIMARY) 3771 if (current_screen != PRIMARY)
4180 scr_erase_screen (2); 3772 scr_erase_screen (2);
4181 scr_change_screen (state); 3773 scr_change_screen (state);
4182 break; 3774 break;
4183 case 1049: /* secondary screen w/ clearing first */ 3775 case 1049: /* secondary screen w/ clearing first */
4184 scr_change_screen (state); 3776 scr_change_screen (state);
4185 if (OPTION (Opt_secondaryScreen)) 3777 if (option (Opt_secondaryScreen))
4186 if (current_screen != PRIMARY) 3778 if (current_screen != PRIMARY)
4187 scr_erase_screen (2); 3779 scr_erase_screen (2);
4188 break; 3780 break;
4189 default: 3781 default:
4190 break; 3782 break;

Diff Legend

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