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.301 by root, Tue Jan 31 21:23:13 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>
… …
55# include "keyboard.h" 55# include "keyboard.h"
56#endif 56#endif
57 57
58#include <csignal> 58#include <csignal>
59 59
60#if LINUX_YIELD_HACK
61# include <ctime>
62#endif
63
60/*----------------------------------------------------------------------*/ 64/*----------------------------------------------------------------------*/
61 65
62#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
63 67
64#if ENABLE_FRILLS || ISO_14755 68#if ENABLE_FRILLS || ISO_14755
… …
294 298
295 return -1; 299 return -1;
296} 300}
297#endif 301#endif
298 302
299/*{{{ Convert the keypress event into a string */
300void 303void
301rxvt_term::lookup_key (XKeyEvent &ev) 304rxvt_term::key_press (XKeyEvent &ev)
302{ 305{
303 int ctrl, meta, shft, len; 306 int ctrl, meta, shft, len;
304 unsigned int newlen; 307 unsigned int newlen;
305 KeySym keysym; 308 KeySym keysym;
306 int valid_keysym; 309 int valid_keysym;
307 char kbuf[KBUFSZ]; 310 char kbuf[KBUFSZ];
311
312#if ISO_14755
313 if (iso14755buf & ISO_14755_52)
314 return;
315#endif
308 316
309 /* 317 /*
310 * 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
311 * escape sequence to toggle the Keypad. 319 * escape sequence to toggle the Keypad.
312 * 320 *
… …
492# if ISO_14755 500# if ISO_14755
493 iso14755_51 (0); 501 iso14755_51 (0);
494# endif 502# endif
495 return; 503 return;
496 } 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 }
497 else if ((hv = hex_keyval (ev)) >= 0) 513 else if ((hv = hex_keyval (ev)) >= 0)
498 { 514 {
499 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK) 515 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
500 | hv | ISO_14755_51; 516 | hv | ISO_14755_51;
501# if ISO_14755 517# if ISO_14755
… …
520 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 536 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
521 scr_overlay_set (0, 0, "ISO 14755 mode"); 537 scr_overlay_set (0, 0, "ISO 14755 mode");
522# endif 538# endif
523 } 539 }
524#endif 540#endif
525 541
526#ifdef PRINTPIPE 542#ifdef PRINTPIPE
527 if (keysym == XK_Print) 543 if (keysym == XK_Print)
528 { 544 {
529 scr_printscreen (ctrl | shft); 545 scr_printscreen (ctrl | shft);
530 return; 546 return;
… …
869 return; 885 return;
870 886
871 if (len <= 0) 887 if (len <= 0)
872 return; /* not mapped */ 888 return; /* not mapped */
873 889
874 if (OPTION (Opt_scrollTtyKeypress)) 890 if (option (Opt_scrollTtyKeypress))
875 if (view_start) 891 if (view_start)
876 { 892 {
877 view_start = 0; 893 view_start = 0;
878 want_refresh = 1; 894 want_refresh = 1;
879 } 895 }
… …
903 tt_write (&ch, 1); 919 tt_write (&ch, 1);
904 } 920 }
905 921
906 tt_write (kbuf, (unsigned int)len); 922 tt_write (kbuf, (unsigned int)len);
907} 923}
908/*}}} */ 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}
909 1001
910#if defined (KEYSYM_RESOURCE) 1002#if defined (KEYSYM_RESOURCE)
911unsigned int 1003unsigned int
912rxvt_term::cmd_write (const char *str, unsigned int count) 1004rxvt_term::cmd_write (const char *str, unsigned int count)
913{ 1005{
… …
943void 1035void
944rxvt_term::flush () 1036rxvt_term::flush ()
945{ 1037{
946 flush_ev.stop (); 1038 flush_ev.stop ();
947 1039
948#ifdef TRANSPARENT 1040#ifdef ENABLE_TRANSPARENCY
949 if (want_full_refresh) 1041 if (want_full_refresh)
950 { 1042 {
951 want_full_refresh = 0; 1043 want_full_refresh = 0;
952 scr_clear (); 1044 scr_clear ();
953 scr_touch (false); 1045 scr_touch (false);
… …
1018void 1110void
1019rxvt_term::flush_cb (time_watcher &w) 1111rxvt_term::flush_cb (time_watcher &w)
1020{ 1112{
1021 make_current (); 1113 make_current ();
1022 1114
1023 refresh_limit = 1;
1024 refresh_count = 0; 1115 refresh_count = 0;
1025 flush (); 1116 flush ();
1026} 1117}
1027 1118
1028#ifdef CURSOR_BLINK 1119#ifdef CURSOR_BLINK
… …
1090 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1181 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1091 } 1182 }
1092} 1183}
1093#endif 1184#endif
1094 1185
1186#if LINUX_YIELD_HACK
1187static struct event_handler
1188{
1189 check_watcher yield_ev;
1190
1191 void yield_cb (check_watcher &w)
1192 {
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
1201 w.stop ();
1202 }
1203
1204 event_handler ()
1205 : yield_ev (this, &event_handler::yield_cb)
1206 {
1207 }
1208} event_handler;
1209#endif
1210
1095bool 1211bool
1096rxvt_term::pty_fill () 1212rxvt_term::pty_fill ()
1097{ 1213{
1098 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1214 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1099 1215
… …
1114 cmdbuf_endp += r; 1230 cmdbuf_endp += r;
1115 return true; 1231 return true;
1116 } 1232 }
1117 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1233 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1118 { 1234 {
1119#if HAVE_SCHED_YIELD 1235#if LINUX_YIELD_HACK
1120 if (display->is_local) 1236 if (display->is_local)
1121 event_handler.cw_yield.start (); 1237 event_handler.yield_ev.start ();
1122#endif 1238#endif
1123 } 1239 }
1124 else 1240 else
1125 { 1241 {
1126 pty_ev.stop (); 1242 pty_ev.stop ();
1127 1243
1128 if (!OPTION (Opt_hold)) 1244 if (!option (Opt_hold))
1129 destroy (); 1245 destroy ();
1130 } 1246 }
1131 1247
1132 return false; 1248 return false;
1133} 1249}
1134 1250
1135void 1251void
1136rxvt_term::pty_cb (io_watcher &w, short revents) 1252rxvt_term::pty_cb (io_watcher &w, short revents)
… …
1148} 1264}
1149 1265
1150void 1266void
1151rxvt_term::pointer_unblank () 1267rxvt_term::pointer_unblank ()
1152{ 1268{
1153 XDefineCursor (xdisp, vt, TermWin_cursor); 1269 XDefineCursor (dpy, vt, TermWin_cursor);
1154 recolour_cursor (); 1270 recolour_cursor ();
1155 1271
1156#ifdef POINTER_BLANK 1272#ifdef POINTER_BLANK
1157 hidden_pointer = 0; 1273 hidden_pointer = 0;
1158 1274
1159 if (OPTION (Opt_pointerBlank)) 1275 if (option (Opt_pointerBlank))
1160 pointer_ev.start (NOW + pointerBlankDelay); 1276 pointer_ev.start (NOW + pointerBlankDelay);
1161#endif 1277#endif
1162} 1278}
1163 1279
1164#ifdef POINTER_BLANK 1280#ifdef POINTER_BLANK
1165void 1281void
1166rxvt_term::pointer_blank () 1282rxvt_term::pointer_blank ()
1167{ 1283{
1168 if (!OPTION (Opt_pointerBlank)) 1284 if (!option (Opt_pointerBlank))
1169 return; 1285 return;
1170 1286
1171 XDefineCursor (xdisp, vt, display->blank_cursor); 1287 XDefineCursor (dpy, vt, display->blank_cursor);
1172 XFlush (xdisp); 1288 XFlush (dpy);
1173 1289
1174 hidden_pointer = 1; 1290 hidden_pointer = 1;
1175} 1291}
1176 1292
1177void 1293void
… …
1256void 1372void
1257rxvt_term::x_cb (XEvent &ev) 1373rxvt_term::x_cb (XEvent &ev)
1258{ 1374{
1259 make_current (); 1375 make_current ();
1260 1376
1261 dLocal (Display *, xdisp); 1377 dLocal (Display *, dpy);
1262 1378
1263 if (ev.xany.window == vt 1379 if (ev.xany.window == vt
1264 && SHOULD_INVOKE (HOOK_X_EVENT) 1380 && SHOULD_INVOKE (HOOK_X_EVENT)
1265 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1381 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1266 return; 1382 return;
… …
1271 unsigned int unused_mask; 1387 unsigned int unused_mask;
1272 1388
1273 switch (ev.type) 1389 switch (ev.type)
1274 { 1390 {
1275 case KeyPress: 1391 case KeyPress:
1276#if ISO_14755 1392 key_press (ev.xkey);
1277 if (!(iso14755buf & ISO_14755_52))
1278#endif
1279 lookup_key (ev.xkey);
1280
1281 break; 1393 break;
1282 1394
1283 case KeyRelease: 1395 case KeyRelease:
1284 { 1396 key_release (ev.xkey);
1285#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1286 KeySym keysym;
1287
1288 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1289#endif
1290
1291#if ENABLE_FRILLS || ISO_14755
1292 // ISO 14755 support
1293 if (iso14755buf)
1294 if (iso14755buf & ISO_14755_52)
1295 {
1296# if ENABLE_OVERLAY
1297 scr_overlay_off ();
1298# endif
1299# if ISO_14755
1300 // iso14755 part 5.2 handling: release time
1301 // first: controls
1302 if ((ev.xkey.state & ControlMask)
1303 && ((keysym >= 0x40 && keysym <= 0x5f)
1304 || (keysym >= 0x61 && keysym <= 0x7f)))
1305 {
1306 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1307 commit_iso14755 ();
1308 goto skip_switch;
1309 }
1310
1311 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1312 if (i[0] == keysym)
1313 {
1314 iso14755buf = ISO_14755_51 | i[1];
1315 commit_iso14755 ();
1316 goto skip_switch;
1317 }
1318
1319 scr_bell ();
1320# endif
1321 iso14755buf = 0;
1322 break;
1323 }
1324 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1325 {
1326# if ENABLE_OVERLAY
1327 scr_overlay_off ();
1328# endif
1329 if (iso14755buf & ISO_14755_51)
1330 commit_iso14755 ();
1331#if ISO_14755
1332 else if (iso14755buf & ISO_14755_STARTED)
1333 {
1334 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1335
1336 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1337 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1338 }
1339# endif
1340 else
1341 iso14755buf = 0;
1342 }
1343#endif
1344
1345 if (ev.xany.window == vt
1346 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1347 break;
1348
1349#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1350 if (!(ev.xkey.state & ControlMask))
1351 slip_wheel_ev.stop ();
1352 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1353 mouse_slip_wheel_speed = 0;
1354#endif
1355 break; 1397 break;
1356 }
1357 1398
1358 case ButtonPress: 1399 case ButtonPress:
1359 button_press (ev.xbutton); 1400 button_press (ev.xbutton);
1360 break; 1401 break;
1361 1402
… …
1376 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)))
1377 destroy (); 1418 destroy ();
1378 } 1419 }
1379#if ENABLE_EWMH 1420#if ENABLE_EWMH
1380 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])
1381 XSendEvent (xdisp, ev.xclient.window = display->root, 1422 XSendEvent (dpy, ev.xclient.window = display->root,
1382 False, SubstructureRedirectMask | SubstructureNotifyMask, 1423 False, SubstructureRedirectMask | SubstructureNotifyMask,
1383 &ev); 1424 &ev);
1384#endif 1425#endif
1385 } 1426 }
1386 } 1427 }
… …
1424 break; 1465 break;
1425 } 1466 }
1426 break; 1467 break;
1427 1468
1428 case FocusIn: 1469 case FocusIn:
1470 if (ev.xfocus.detail != NotifyInferior
1471 && ev.xfocus.detail != NotifyPointer
1472 && ev.xfocus.mode != NotifyGrab)
1429 focus_in (); 1473 focus_in ();
1430 break; 1474 break;
1431 1475
1432 case FocusOut: 1476 case FocusOut:
1477 if (ev.xfocus.detail != NotifyInferior
1478 && ev.xfocus.detail != NotifyPointer
1479 && ev.xfocus.mode != NotifyGrab)
1433 focus_out (); 1480 focus_out ();
1434 break; 1481 break;
1435 1482
1436 case ConfigureNotify: 1483 case ConfigureNotify:
1437 if (ev.xconfigure.window == parent[0]) 1484 if (ev.xconfigure.window == parent[0])
1438 { 1485 {
1439 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev)) 1486 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1440 ; 1487 ;
1441 1488
1442 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1489 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1443 { 1490 {
1444 seen_resize = 1; 1491 seen_resize = 1;
1445 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
1446 } 1500 }
1447 1501
1448 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1502 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1449 1503
1450#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1504#ifdef ENABLE_TRANSPARENCY
1451 if (OPTION (Opt_transparent)) 1505 if (option (Opt_transparent))
1452 check_our_parents (); 1506 check_our_parents ();
1453#endif 1507#endif
1454 } 1508 }
1455 break; 1509 break;
1456 1510
… …
1489 text_blink_ev.stop (); 1543 text_blink_ev.stop ();
1490#endif 1544#endif
1491 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1545 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1492 break; 1546 break;
1493 1547
1494#ifdef TRANSPARENT 1548#ifdef ENABLE_TRANSPARENCY
1495 case ReparentNotify: 1549 case ReparentNotify:
1496 rootwin_cb (ev); 1550 rootwin_cb (ev);
1497 break; 1551 break;
1498#endif /* TRANSPARENT */ 1552#endif /* ENABLE_TRANSPARENCY */
1499 1553
1500 case GraphicsExpose: 1554 case GraphicsExpose:
1501 case Expose: 1555 case Expose:
1502 if (ev.xany.window == vt) 1556 if (ev.xany.window == vt)
1503 { 1557 {
1504 do 1558 do
1505 scr_expose (ev.xexpose.x, ev.xexpose.y, 1559 scr_expose (ev.xexpose.x, ev.xexpose.y,
1506 ev.xexpose.width, ev.xexpose.height, False); 1560 ev.xexpose.width, ev.xexpose.height, False);
1507 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)); 1561 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1508 1562
1509 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1563 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1510 1564
1511 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)) 1565 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1512 scr_expose (ev.xexpose.x, ev.xexpose.y, 1566 scr_expose (ev.xexpose.x, ev.xexpose.y,
1513 ev.xexpose.width, ev.xexpose.height, False); 1567 ev.xexpose.width, ev.xexpose.height, False);
1514 1568
1515 want_refresh = 1; 1569 want_refresh = 1;
1516 } 1570 }
1517 else 1571 else
1518 { 1572 {
1519 XEvent unused_event; 1573 XEvent unused_event;
1520 1574
1521 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event)) 1575 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1522 ; 1576 ;
1523 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event)) 1577 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1524 ; 1578 ;
1525 1579
1526 if (isScrollbarWindow (ev.xany.window)) 1580 if (isScrollbarWindow (ev.xany.window))
1527 { 1581 {
1528 scrollBar.setIdle (); 1582 scrollBar.setIdle ();
1529 scrollbar_show (0); 1583 scrollbar_show (0);
1530 } 1584 }
1531 1585
1532#ifdef TRANSPARENT 1586#ifdef ENABLE_TRANSPARENCY
1533 if (am_transparent && ev.xany.window == parent[0]) 1587 if (am_transparent && ev.xany.window == parent[0])
1534 XClearWindow (xdisp, ev.xany.window); 1588 XClearWindow (dpy, ev.xany.window);
1535#endif 1589#endif
1536 } 1590 }
1537 break; 1591 break;
1538 1592
1539 case MotionNotify: 1593 case MotionNotify:
… …
1549 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1603 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1550 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1604 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1551 ; // nop 1605 ; // nop
1552 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1606 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1553 { 1607 {
1554 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev)) 1608 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1555 ; 1609 ;
1556 1610
1557 XQueryPointer (xdisp, vt, 1611 XQueryPointer (dpy, vt,
1558 &unused_root, &unused_child, 1612 &unused_root, &unused_child,
1559 &unused_root_x, &unused_root_y, 1613 &unused_root_x, &unused_root_y,
1560 &ev.xbutton.x, &ev.xbutton.y, 1614 &ev.xbutton.x, &ev.xbutton.y,
1561 &ev.xbutton.state); 1615 &ev.xbutton.state);
1562#ifdef MOUSE_THRESHOLD 1616#ifdef MOUSE_THRESHOLD
… …
1626#endif 1680#endif
1627 } 1681 }
1628 } 1682 }
1629 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1683 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1630 { 1684 {
1631 while (XCheckTypedWindowEvent (xdisp, scrollBar.win, 1685 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1632 MotionNotify, &ev)) 1686 MotionNotify, &ev))
1633 ; 1687 ;
1634 1688
1635 XQueryPointer (xdisp, scrollBar.win, 1689 XQueryPointer (dpy, scrollBar.win,
1636 &unused_root, &unused_child, 1690 &unused_root, &unused_child,
1637 &unused_root_x, &unused_root_y, 1691 &unused_root_x, &unused_root_y,
1638 &ev.xbutton.x, &ev.xbutton.y, 1692 &ev.xbutton.x, &ev.xbutton.y,
1639 &unused_mask); 1693 &unused_mask);
1640 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1694 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1641 scrollbar_size ()); 1695 scrollbar_size ());
1642 want_refresh = 1; 1696 want_refresh = 1;
1643 refresh_limit = 0;
1644 scrollbar_show (1); 1697 scrollbar_show (1);
1645 } 1698 }
1646 break; 1699 break;
1647 } 1700 }
1648 1701
1649skip_switch: ;
1650
1651#if defined(CURSOR_BLINK) 1702#if defined(CURSOR_BLINK)
1652 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1703 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1653 { 1704 {
1654 if (hidden_cursor) 1705 if (hidden_cursor)
1655 { 1706 {
1656 hidden_cursor = 0; 1707 hidden_cursor = 0;
1657 want_refresh = 1; 1708 want_refresh = 1;
… …
1660 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1711 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1661 } 1712 }
1662#endif 1713#endif
1663 1714
1664#if defined(POINTER_BLANK) 1715#if defined(POINTER_BLANK)
1665 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1716 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1666 { 1717 {
1667 if (ev.type == MotionNotify 1718 if (ev.type == MotionNotify
1668 || ev.type == ButtonPress 1719 || ev.type == ButtonPress
1669 || ev.type == ButtonRelease) 1720 || ev.type == ButtonRelease)
1670 if (hidden_pointer) 1721 if (hidden_pointer)
… …
1682 if (!focus) 1733 if (!focus)
1683 { 1734 {
1684 focus = 1; 1735 focus = 1;
1685 want_refresh = 1; 1736 want_refresh = 1;
1686 1737
1687 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1738 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1688 1739
1689#if USE_XIM 1740#if USE_XIM
1690 if (Input_Context != NULL) 1741 if (Input_Context != NULL)
1691 { 1742 {
1692 IMSetStatusPosition (); 1743 IMSetPosition ();
1693 XSetICFocus (Input_Context); 1744 XSetICFocus (Input_Context);
1694 } 1745 }
1695#endif 1746#endif
1696#if CURSOR_BLINK 1747#if CURSOR_BLINK
1697 if (OPTION (Opt_cursorBlink)) 1748 if (option (Opt_cursorBlink))
1698 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1749 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1699#endif 1750#endif
1700#if OFF_FOCUS_FADING 1751#if OFF_FOCUS_FADING
1701 if (rs[Rs_fade]) 1752 if (rs[Rs_fade])
1702 { 1753 {
1703 pix_colors = pix_colors_focused; 1754 pix_colors = pix_colors_focused;
1704 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 }
1705 } 1769 }
1706#endif 1770#endif
1707 } 1771 }
1708} 1772}
1709 1773
… …
1729#if USE_XIM 1793#if USE_XIM
1730 if (Input_Context != NULL) 1794 if (Input_Context != NULL)
1731 XUnsetICFocus (Input_Context); 1795 XUnsetICFocus (Input_Context);
1732#endif 1796#endif
1733#if CURSOR_BLINK 1797#if CURSOR_BLINK
1734 if (OPTION (Opt_cursorBlink)) 1798 if (option (Opt_cursorBlink))
1735 cursor_blink_ev.stop (); 1799 cursor_blink_ev.stop ();
1736 hidden_cursor = 0; 1800 hidden_cursor = 0;
1737#endif 1801#endif
1738#if OFF_FOCUS_FADING 1802#if OFF_FOCUS_FADING
1739 if (rs[Rs_fade]) 1803 if (rs[Rs_fade])
… …
1743 } 1807 }
1744#endif 1808#endif
1745 } 1809 }
1746} 1810}
1747 1811
1748#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
1749void 1826void
1750rxvt_term::rootwin_cb (XEvent &ev) 1827rxvt_term::rootwin_cb (XEvent &ev)
1751{ 1828{
1752 make_current (); 1829 make_current ();
1753 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
1754 switch (ev.type) 1836 switch (ev.type)
1755 { 1837 {
1756 case PropertyNotify: 1838 case PropertyNotify:
1757 /* 1839 /*
1758 * 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,
… …
1762 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1844 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1763 return; 1845 return;
1764 1846
1765 /* FALLTHROUGH */ 1847 /* FALLTHROUGH */
1766 case ReparentNotify: 1848 case ReparentNotify:
1767 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent) 1849 if (option (Opt_transparent))
1768 want_refresh = want_full_refresh = 1; 1850 check_our_parents ();
1769 break; 1851 break;
1770 } 1852 }
1853# endif
1771} 1854}
1772#endif 1855#endif
1773 1856
1774void 1857void
1775rxvt_term::button_press (XButtonEvent &ev) 1858rxvt_term::button_press (XButtonEvent &ev)
… …
2103 selection_make (ev.time); 2186 selection_make (ev.time);
2104 break; 2187 break;
2105 2188
2106 case Button2: 2189 case Button2:
2107 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?
2108 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary); 2191 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2109 break; 2192 break;
2110 2193
2111#ifdef MOUSE_WHEEL 2194#ifdef MOUSE_WHEEL
2112 case Button4: 2195 case Button4:
2113 case Button5: 2196 case Button5:
… …
2117 2200
2118 v = ev.button == Button4 ? UP : DN; 2201 v = ev.button == Button4 ? UP : DN;
2119 2202
2120 if (ev.state & ShiftMask) 2203 if (ev.state & ShiftMask)
2121 i = 1; 2204 i = 1;
2122 else if (OPTION (Opt_mouseWheelScrollPage)) 2205 else if (option (Opt_mouseWheelScrollPage))
2123 i = nrow - 1; 2206 i = nrow - 1;
2124 else 2207 else
2125 i = 5; 2208 i = 5;
2126 2209
2127# ifdef MOUSE_SLIP_WHEELING 2210# ifdef MOUSE_SLIP_WHEELING
… …
2148 break; 2231 break;
2149#endif 2232#endif
2150 } 2233 }
2151 } 2234 }
2152} 2235}
2153
2154#ifdef TRANSPARENT
2155#if TINTING
2156/* taken from aterm-0.4.2 */
2157
2158typedef uint32_t RUINT32T;
2159
2160void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2161{
2162 int sh_r, sh_g, sh_b;
2163 RUINT32T mask_r, mask_g, mask_b;
2164 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2165 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2166 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2167 int i;
2168
2169 Visual *visual = term->visual;
2170
2171 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2172
2173 /* for convenience */
2174 mask_r = visual->red_mask;
2175 mask_g = visual->green_mask;
2176 mask_b = visual->blue_mask;
2177
2178 /* boring lookup table pre-initialization */
2179 switch (srcImage->bits_per_pixel) {
2180 case 15:
2181 if ((mask_r != 0x7c00) ||
2182 (mask_g != 0x03e0) ||
2183 (mask_b != 0x001f))
2184 return;
2185 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2186 lookup_r = lookup;
2187 lookup_g = lookup+32;
2188 lookup_b = lookup+32+32;
2189 sh_r = 10;
2190 sh_g = 5;
2191 sh_b = 0;
2192 break;
2193 case 16:
2194 if ((mask_r != 0xf800) ||
2195 (mask_g != 0x07e0) ||
2196 (mask_b != 0x001f))
2197 return;
2198 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2199 lookup_r = lookup;
2200 lookup_g = lookup+32;
2201 lookup_b = lookup+32+64;
2202 sh_r = 11;
2203 sh_g = 5;
2204 sh_b = 0;
2205 break;
2206 case 24:
2207 if ((mask_r != 0xff0000) ||
2208 (mask_g != 0x00ff00) ||
2209 (mask_b != 0x0000ff))
2210 return;
2211 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2212 lookup_r = lookup;
2213 lookup_g = lookup+256;
2214 lookup_b = lookup+256+256;
2215 sh_r = 16;
2216 sh_g = 8;
2217 sh_b = 0;
2218 break;
2219 case 32:
2220 if ((mask_r != 0xff0000) ||
2221 (mask_g != 0x00ff00) ||
2222 (mask_b != 0x0000ff))
2223 return;
2224 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2225 lookup_r = lookup;
2226 lookup_g = lookup+256;
2227 lookup_b = lookup+256+256;
2228 sh_r = 16;
2229 sh_g = 8;
2230 sh_b = 0;
2231 break;
2232 default:
2233 return; /* we do not support this color depth */
2234 }
2235
2236 /* prepare limits for color transformation (each channel is handled separately) */
2237 if (shade < 0) {
2238 shade = -shade;
2239 if (shade < 0) shade = 0;
2240 if (shade > 100) shade = 100;
2241
2242 lower_lim_r = 65535-rm;
2243 lower_lim_g = 65535-gm;
2244 lower_lim_b = 65535-bm;
2245
2246 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2247 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2248 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2249
2250 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2251 } else {
2252 if (shade < 0) shade = 0;
2253 if (shade > 100) shade = 100;
2254
2255 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2256
2257 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2258 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2259 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2260 }
2261
2262 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2263 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2264 {
2265 unsigned int tmp;
2266
2267 tmp = lower_lim_r;
2268 lower_lim_r = lower_lim_b;
2269 lower_lim_b = tmp;
2270
2271 tmp = upper_lim_r;
2272 upper_lim_r = upper_lim_b;
2273 upper_lim_b = tmp;
2274 }
2275
2276 /* fill our lookup tables */
2277 for (i = 0; i <= mask_r>>sh_r; i++)
2278 {
2279 RUINT32T tmp;
2280 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2281 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2282 lookup_r[i] = (tmp/65535)<<sh_r;
2283 }
2284 for (i = 0; i <= mask_g>>sh_g; i++)
2285 {
2286 RUINT32T tmp;
2287 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2288 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2289 lookup_g[i] = (tmp/65535)<<sh_g;
2290 }
2291 for (i = 0; i <= mask_b>>sh_b; i++)
2292 {
2293 RUINT32T tmp;
2294 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2295 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2296 lookup_b[i] = (tmp/65535)<<sh_b;
2297 }
2298
2299 /* apply table to input image (replacing colors by newly calculated ones) */
2300 switch (srcImage->bits_per_pixel)
2301 {
2302 case 15:
2303 {
2304 unsigned short *p1, *pf, *p, *pl;
2305 p1 = (unsigned short *) srcImage->data;
2306 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2307 while (p1 < pf)
2308 {
2309 p = p1;
2310 pl = p1 + srcImage->width;
2311 for (; p < pl; p++)
2312 {
2313 *p = lookup_r[(*p & 0x7c00)>>10] |
2314 lookup_g[(*p & 0x03e0)>> 5] |
2315 lookup_b[(*p & 0x001f)];
2316 }
2317 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2318 }
2319 break;
2320 }
2321 case 16:
2322 {
2323 unsigned short *p1, *pf, *p, *pl;
2324 p1 = (unsigned short *) srcImage->data;
2325 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2326 while (p1 < pf)
2327 {
2328 p = p1;
2329 pl = p1 + srcImage->width;
2330 for (; p < pl; p++)
2331 {
2332 *p = lookup_r[(*p & 0xf800)>>11] |
2333 lookup_g[(*p & 0x07e0)>> 5] |
2334 lookup_b[(*p & 0x001f)];
2335 }
2336 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2337 }
2338 break;
2339 }
2340 case 24:
2341 {
2342 unsigned char *p1, *pf, *p, *pl;
2343 p1 = (unsigned char *) srcImage->data;
2344 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2345 while (p1 < pf)
2346 {
2347 p = p1;
2348 pl = p1 + srcImage->width * 3;
2349 for (; p < pl; p += 3)
2350 {
2351 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2352 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2353 p[2] = lookup_r[(p[2] & 0x0000ff)];
2354 }
2355 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2356 }
2357 break;
2358 }
2359 case 32:
2360 {
2361 RUINT32T *p1, *pf, *p, *pl;
2362 p1 = (RUINT32T *) srcImage->data;
2363 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2364
2365 while (p1 < pf)
2366 {
2367 p = p1;
2368 pl = p1 + srcImage->width;
2369 for (; p < pl; p++)
2370 {
2371 *p = lookup_r[(*p & 0xff0000)>>16] |
2372 lookup_g[(*p & 0x00ff00)>> 8] |
2373 lookup_b[(*p & 0x0000ff)] |
2374 (*p & ~0xffffff);
2375 }
2376 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2377 }
2378 break;
2379 }
2380 }
2381
2382 free (lookup);
2383}
2384#endif
2385
2386/*
2387 * Check our parents are still who we think they are.
2388 * Do transparency updates if required
2389 */
2390int
2391rxvt_term::check_our_parents ()
2392{
2393 int i, pchanged, aformat, have_pixmap, rootdepth;
2394 unsigned long nitems, bytes_after;
2395 Atom atype;
2396 unsigned char *prop = NULL;
2397 Window root, oldp, *list;
2398 Pixmap rootpixmap = None;
2399 XWindowAttributes wattr, wrootattr;
2400
2401 pchanged = 0;
2402
2403 if (!OPTION (Opt_transparent))
2404 return pchanged; /* Don't try any more */
2405
2406 XGetWindowAttributes (xdisp, display->root, &wrootattr);
2407 rootdepth = wrootattr.depth;
2408
2409 XGetWindowAttributes (xdisp, parent[0], &wattr);
2410
2411 if (rootdepth != wattr.depth)
2412 {
2413 if (am_transparent)
2414 {
2415 pchanged = 1;
2416 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2417 am_transparent = am_pixmap_trans = 0;
2418 }
2419
2420 return pchanged; /* Don't try any more */
2421 }
2422
2423 /* Get all X ops out of the queue so that our information is up-to-date. */
2424 XSync (xdisp, False);
2425
2426 /*
2427 * Make the frame window set by the window manager have
2428 * the root background. Some window managers put multiple nested frame
2429 * windows for each client, so we have to take care about that.
2430 */
2431 i = (xa[XA_XROOTPMAP_ID]
2432 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2433 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2434 &nitems, &bytes_after, &prop) == Success);
2435
2436 if (!i || prop == NULL)
2437 i = (xa[XA_ESETROOT_PMAP_ID]
2438 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2439 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2440 &nitems, &bytes_after, &prop) == Success);
2441
2442 if (!i || prop == NULL
2443#if TINTING
2444 || !ISSET_PIXCOLOR (Color_tint)
2445#endif
2446 )
2447 have_pixmap = 0;
2448 else
2449 {
2450 have_pixmap = 1;
2451 rootpixmap = *(Pixmap *)prop;
2452 XFree (prop);
2453 }
2454
2455 if (have_pixmap)
2456 {
2457 /*
2458 * Copy display->root pixmap transparency
2459 */
2460 int sx, sy, nx, ny;
2461 unsigned int nw, nh;
2462 Window cr;
2463 XImage *image;
2464 GC gc;
2465 XGCValues gcvalue;
2466
2467 XTranslateCoordinates (xdisp, parent[0], display->root,
2468 0, 0, &sx, &sy, &cr);
2469 nw = (unsigned int)szHint.width;
2470 nh = (unsigned int)szHint.height;
2471 nx = ny = 0;
2472
2473 if (sx < 0)
2474 {
2475 nw += sx;
2476 nx = -sx;
2477 sx = 0;
2478 }
2479
2480 if (sy < 0)
2481 {
2482 nh += sy;
2483 ny = -sy;
2484 sy = 0;
2485 }
2486
2487 min_it (nw, (unsigned int) (wrootattr.width - sx));
2488 min_it (nh, (unsigned int) (wrootattr.height - sy));
2489
2490 XSync (xdisp, False);
2491 allowedxerror = -1;
2492 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2493
2494 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2495 /* XXX: may need a delay here? */
2496 allowedxerror = 0;
2497
2498 if (image == NULL)
2499 {
2500 if (am_transparent && am_pixmap_trans)
2501 {
2502 pchanged = 1;
2503 if (pixmap != None)
2504 {
2505 XFreePixmap (xdisp, pixmap);
2506 pixmap = None;
2507 }
2508 }
2509
2510 am_pixmap_trans = 0;
2511 }
2512 else
2513 {
2514 if (pixmap != None)
2515 XFreePixmap (xdisp, pixmap);
2516
2517#if TINTING
2518 if (ISSET_PIXCOLOR (Color_tint))
2519 {
2520 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2521
2522 rgba c;
2523 pix_colors_focused [Color_tint].get (c);
2524
2525 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2526 }
2527#endif
2528
2529 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2530 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2531 XPutImage (xdisp, pixmap, gc, image, 0, 0,
2532 nx, ny, image->width, image->height);
2533 XFreeGC (xdisp, gc);
2534 XDestroyImage (image);
2535 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2536 XClearWindow (xdisp, parent[0]);
2537
2538 if (!am_transparent || !am_pixmap_trans)
2539 pchanged = 1;
2540
2541 am_transparent = am_pixmap_trans = 1;
2542 }
2543 }
2544
2545 if (am_pixmap_trans)
2546 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2547 else
2548 {
2549 unsigned int n;
2550 /*
2551 * InheritPixmap transparency
2552 */
2553 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2554 {
2555 oldp = parent[i];
2556 XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n);
2557 XFree (list);
2558
2559 if (parent[i] == display->root)
2560 {
2561 if (oldp != None)
2562 pchanged = 1;
2563
2564 break;
2565 }
2566
2567 if (oldp != parent[i])
2568 pchanged = 1;
2569 }
2570
2571 n = 0;
2572
2573 if (pchanged)
2574 for (; n < (unsigned int)i; n++)
2575 {
2576 XGetWindowAttributes (xdisp, parent[n], &wattr);
2577
2578 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2579 {
2580 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2581 break;
2582 }
2583 }
2584
2585 if (n > (sizeof (parent) / sizeof (parent[0])))
2586 {
2587 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2588 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2589 am_transparent = 0;
2590 /* XXX: also turn off Opt_transparent? */
2591 }
2592 else
2593 {
2594 for (n = 0; n < (unsigned int)i; n++)
2595 {
2596 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2597 XClearWindow (xdisp, parent[n]);
2598 }
2599
2600 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2601 am_transparent = 1;
2602 }
2603
2604 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2605 parent[i] = None;
2606 }
2607
2608 if (scrollBar.win)
2609 {
2610 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2611 scrollBar.setIdle ();
2612 scrollbar_show (0);
2613 }
2614
2615 if (am_transparent)
2616 {
2617 want_refresh = want_full_refresh = 1;
2618 if (am_pixmap_trans)
2619 flush ();
2620 }
2621
2622 return pchanged;
2623}
2624#endif
2625 2236
2626/*}}} */ 2237/*}}} */
2627 2238
2628bool 2239bool
2629rxvt_term::cmd_parse () 2240rxvt_term::cmd_parse ()
… …
2678 if (ch == C0_LF) 2289 if (ch == C0_LF)
2679 nlines++; 2290 nlines++;
2680 2291
2681 refresh_count++; 2292 refresh_count++;
2682 2293
2683 if (!OPTION (Opt_jumpScroll) 2294 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2684 || (refresh_count >= refresh_limit * (nrow - 1)))
2685 { 2295 {
2686 refreshnow = true;
2687 refresh_count = 0; 2296 refresh_count = 0;
2297
2298 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.)
2299 {
2300 refreshnow = true;
2688 ch = NOCHAR; 2301 ch = NOCHAR;
2689 break; 2302 break;
2303 }
2690 } 2304 }
2691 2305
2692 // scr_add_lines only works for nlines <= nrow - 1. 2306 // scr_add_lines only works for nlines <= nrow - 1.
2693 if (nlines >= nrow - 1) 2307 if (nlines >= nrow - 1)
2694 { 2308 {
… …
2722 && 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))))
2723 scr_add_lines (buf, str - buf, nlines); 2337 scr_add_lines (buf, str - buf, nlines);
2724 2338
2725 /* 2339 /*
2726 * 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
2727 * 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.
2728 * the number of pages between refreshes is refresh_limit, which 2342 * if skipScroll is enabled.
2729 * is incremented here because we must be doing flat-out scrolling.
2730 */ 2343 */
2731 if (refreshnow) 2344 if (refreshnow)
2732 { 2345 {
2733 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2734 refresh_limit++;
2735 else
2736 {
2737 flag = true; 2346 flag = true;
2738 scr_refresh (); 2347 scr_refresh ();
2739 want_refresh = 1; 2348 want_refresh = 1;
2740 }
2741 } 2349 }
2742 2350
2743 } 2351 }
2744 else 2352 else
2745 { 2353 {
… …
2894 { 2502 {
2895 if ((buf[len++] = cmd_getc ()) == 'i') 2503 if ((buf[len++] = cmd_getc ()) == 'i')
2896 break; /* done = 1 */ 2504 break; /* done = 1 */
2897 } 2505 }
2898 } 2506 }
2899 2507
2900 for (i = 0; i < len; i++) 2508 for (i = 0; i < len; i++)
2901 if (putc (buf[i], fd) == EOF) 2509 if (putc (buf[i], fd) == EOF)
2902 { 2510 {
2903 done = 1; 2511 done = 1;
2904 break; 2512 break;
… …
2966 process_dcs_seq (); 2574 process_dcs_seq ();
2967 break; 2575 break;
2968 case 0x9b: /* CSI */ 2576 case 0x9b: /* CSI */
2969 process_csi_seq (); 2577 process_csi_seq ();
2970 break; 2578 break;
2971 case 0x9d: /* CSI */ 2579 case 0x9d: /* OSC */
2972 process_osc_seq (); 2580 process_osc_seq ();
2973 break; 2581 break;
2974#endif 2582#endif
2975 } 2583 }
2976} 2584}
… …
3403 break; 3011 break;
3404 case 6: /* CPR requested */ 3012 case 6: /* CPR requested */
3405 scr_report_position (); 3013 scr_report_position ();
3406 break; 3014 break;
3407 case 7: /* unofficial extension */ 3015 case 7: /* unofficial extension */
3408 if (OPTION (Opt_insecure)) 3016 if (option (Opt_insecure))
3409 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3017 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3410 break; 3018 break;
3411 case 8: /* unofficial extension */ 3019 case 8: /* unofficial extension */
3412 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3020 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3413 break; 3021 break;
… …
3506{ 3114{
3507 int x, y; 3115 int x, y;
3508 XWindowAttributes wattr; 3116 XWindowAttributes wattr;
3509 Window wdummy; 3117 Window wdummy;
3510 3118
3511 dLocal (Display *, xdisp); 3119 dLocal (Display *, dpy);
3512 3120
3513 if (nargs == 0) 3121 if (nargs == 0)
3514 return; 3122 return;
3515 3123
3516 switch (args[0]) 3124 switch (args[0])
3517 { 3125 {
3518 /* 3126 /*
3519 * commands 3127 * commands
3520 */ 3128 */
3521 case 1: /* deiconify window */ 3129 case 1: /* deiconify window */
3522 XMapWindow (xdisp, parent[0]); 3130 XMapWindow (dpy, parent[0]);
3523 break; 3131 break;
3524 case 2: /* iconify window */ 3132 case 2: /* iconify window */
3525 XIconifyWindow (xdisp, parent[0], display->screen); 3133 XIconifyWindow (dpy, parent[0], display->screen);
3526 break; 3134 break;
3527 case 3: /* set position (pixels) */ 3135 case 3: /* set position (pixels) */
3528 XMoveWindow (xdisp, parent[0], args[1], args[2]); 3136 XMoveWindow (dpy, parent[0], args[1], args[2]);
3529 break; 3137 break;
3530 case 4: /* set size (pixels) */ 3138 case 4: /* set size (pixels) */
3531 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3139 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3532 break; 3140 break;
3533 case 5: /* raise window */ 3141 case 5: /* raise window */
3534 XRaiseWindow (xdisp, parent[0]); 3142 XRaiseWindow (dpy, parent[0]);
3535 break; 3143 break;
3536 case 6: /* lower window */ 3144 case 6: /* lower window */
3537 XLowerWindow (xdisp, parent[0]); 3145 XLowerWindow (dpy, parent[0]);
3538 break; 3146 break;
3539 case 7: /* refresh window */ 3147 case 7: /* refresh window */
3540 scr_touch (true); 3148 scr_touch (true);
3541 break; 3149 break;
3542 case 8: /* set size (chars) */ 3150 case 8: /* set size (chars) */
… …
3553 3161
3554 /* 3162 /*
3555 * reports - some output format copied from XTerm 3163 * reports - some output format copied from XTerm
3556 */ 3164 */
3557 case 11: /* report window state */ 3165 case 11: /* report window state */
3558 XGetWindowAttributes (xdisp, parent[0], &wattr); 3166 XGetWindowAttributes (dpy, parent[0], &wattr);
3559 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3167 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3560 break; 3168 break;
3561 case 13: /* report window position */ 3169 case 13: /* report window position */
3562 XGetWindowAttributes (xdisp, parent[0], &wattr); 3170 XGetWindowAttributes (dpy, parent[0], &wattr);
3563 XTranslateCoordinates (xdisp, parent[0], wattr.root, 3171 XTranslateCoordinates (dpy, parent[0], wattr.root,
3564 -wattr.border_width, -wattr.border_width, 3172 -wattr.border_width, -wattr.border_width,
3565 &x, &y, &wdummy); 3173 &x, &y, &wdummy);
3566 tt_printf ("\033[3;%d;%dt", x, y); 3174 tt_printf ("\033[3;%d;%dt", x, y);
3567 break; 3175 break;
3568 case 14: /* report window size (pixels) */ 3176 case 14: /* report window size (pixels) */
3569 XGetWindowAttributes (xdisp, parent[0], &wattr); 3177 XGetWindowAttributes (dpy, parent[0], &wattr);
3570 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3178 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3571 break; 3179 break;
3572 case 18: /* report text area size (chars) */ 3180 case 18: /* report text area size (chars) */
3573 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3181 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3574 break; 3182 break;
… …
3576 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3184 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3577 break; 3185 break;
3578 case 20: /* report icon label */ 3186 case 20: /* report icon label */
3579 { 3187 {
3580 char *s; 3188 char *s;
3581 XGetIconName (xdisp, parent[0], &s); 3189 XGetIconName (dpy, parent[0], &s);
3582 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 */
3583 XFree (s); 3191 XFree (s);
3584 } 3192 }
3585 break; 3193 break;
3586 case 21: /* report window title */ 3194 case 21: /* report window title */
3587 { 3195 {
3588 char *s; 3196 char *s;
3589 XFetchName (xdisp, parent[0], &s); 3197 XFetchName (dpy, parent[0], &s);
3590 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 */
3591 XFree (s); 3199 XFree (s);
3592 } 3200 }
3593 break; 3201 break;
3594 } 3202 }
3595} 3203}
… …
3622 seen_esc = true; 3230 seen_esc = true;
3623 continue; 3231 continue;
3624 } 3232 }
3625 else if (ch == C0_BEL || ch == CHAR_ST) 3233 else if (ch == C0_BEL || ch == CHAR_ST)
3626 break; 3234 break;
3235 else if (ch == C0_SYN)
3236 ch = cmd_get8 ();
3627 else if (ch < 0x20) 3237 else if (ch < 0x20)
3628 return NULL; /* other control character - exit */ 3238 return NULL; /* other control character - exit */
3629 3239
3630 seen_esc = false; 3240 seen_esc = false;
3631 3241
3632 if (n >= STRING_MAX - 1) 3242 if (n >= STRING_MAX - 1)
3633 // stop at some sane length 3243 // stop at some sane length
3634 return NULL; 3244 return NULL;
3635 3245
3636 if (ch == C0_SYN)
3637 string[n++] = cmd_get8 ();
3638 else
3639 string[n++] = ch; 3246 string[n++] = ch;
3640 } 3247 }
3641 3248
3642 string[n++] = '\0'; 3249 string[n++] = '\0';
3643 3250
3644 ends_how = (ch == 0x5c ? C0_ESC : ch); 3251 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3720 int color; 3327 int color;
3721 char *buf, *name; 3328 char *buf, *name;
3722 bool query = str[0] == '?' && !str[1]; 3329 bool query = str[0] == '?' && !str[1];
3723 int saveop = op; 3330 int saveop = op;
3724 3331
3725 dLocal (Display *, xdisp); 3332 dLocal (Display *, dpy);
3726 3333
3727 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
3728 switch (op) 3339 switch (op)
3729 { 3340 {
3730 case XTerm_name: 3341 case XTerm_name:
3731 set_title (str); 3342 set_title (str);
3732 /* FALLTHROUGH */ 3343 /* FALLTHROUGH */
… …
3746 unsigned long bytes_after; 3357 unsigned long bytes_after;
3747 unsigned char *value = 0; 3358 unsigned char *value = 0;
3748 const char *str = ""; 3359 const char *str = "";
3749 3360
3750 if (prop 3361 if (prop
3751 && XGetWindowProperty (xdisp, parent[0], 3362 && XGetWindowProperty (dpy, parent[0],
3752 prop, 0, 1<<16, 0, AnyPropertyType, 3363 prop, 0, 1<<16, 0, AnyPropertyType,
3753 &actual_type, &actual_format, 3364 &actual_type, &actual_format,
3754 &nitems, &bytes_after, &value) == Success 3365 &nitems, &bytes_after, &value) == Success
3755 && actual_type != None 3366 && actual_type != None
3756 && actual_format == 8) 3367 && actual_format == 8)
… …
3768 { 3379 {
3769 *eq = 0; 3380 *eq = 0;
3770 set_utf8_property (display->atom (str), eq + 1); 3381 set_utf8_property (display->atom (str), eq + 1);
3771 } 3382 }
3772 else 3383 else
3773 XDeleteProperty (xdisp, parent[0], 3384 XDeleteProperty (dpy, parent[0],
3774 display->atom (str)); 3385 display->atom (str));
3775 } 3386 }
3776 break; 3387 break;
3777 3388
3778 case XTerm_Color: 3389 case XTerm_Color:
… …
3824 break; 3435 break;
3825 case URxvt_Color_IT: 3436 case URxvt_Color_IT:
3826 process_color_seq (op, Color_IT, str, resp); 3437 process_color_seq (op, Color_IT, str, resp);
3827 break; 3438 break;
3828#endif 3439#endif
3829#if TRANSPARENT && TINTING 3440#if ENABLE_TRANSPARENCY && TINTING
3830 case URxvt_Color_tint: 3441 case URxvt_Color_tint:
3831 process_color_seq (op, Color_tint, str, resp); 3442 process_color_seq (op, Color_tint, str, resp);
3832 3443
3833 check_our_parents (); 3444 check_our_parents ();
3834 3445
… …
3864#ifdef XPM_BACKGROUND 3475#ifdef XPM_BACKGROUND
3865 resize_pixmap (); 3476 resize_pixmap ();
3866 scr_touch (true); 3477 scr_touch (true);
3867#endif 3478#endif
3868 } 3479 }
3480#if ENABLE_TRANSPARENCY && defined(HAVE_AFTERIMAGE)
3481 if (option (Opt_transparent))
3482 check_our_parents ();
3483#endif
3869 } 3484 }
3870 break; 3485 break;
3871 3486
3872 case Rxvt_restoreFG: 3487 case Rxvt_restoreFG:
3873 set_window_color (Color_fg, str); 3488 set_window_color (Color_fg, str);
… …
3900 case URxvt_italicFont: 3515 case URxvt_italicFont:
3901 case URxvt_boldItalicFont: 3516 case URxvt_boldItalicFont:
3902#endif 3517#endif
3903 if (query) 3518 if (query)
3904 tt_printf ("\33]%d;%-.250s%c", saveop, 3519 tt_printf ("\33]%d;%-.250s%c", saveop,
3905 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3520 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3906 ? fontset[op - URxvt_font]->fontdesc : "", 3521 ? fontset[op - URxvt_font]->fontdesc : "",
3907 resp); 3522 resp);
3908 else 3523 else
3909 { 3524 {
3910 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3525 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3924 break; 3539 break;
3925 3540
3926#if !ENABLE_MINIMAL 3541#if !ENABLE_MINIMAL
3927 case URxvt_locale: 3542 case URxvt_locale:
3928 if (query) 3543 if (query)
3929 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);
3930 else 3545 else
3931 { 3546 {
3932 set_locale (str); 3547 set_locale (str);
3933 pty->set_utf8_mode (enc_utf8); 3548 pty->set_utf8_mode (enc_utf8);
3934 init_xlocale (); 3549 init_xlocale ();
… …
3949 break; 3564 break;
3950#endif 3565#endif
3951 3566
3952#if ENABLE_PERL 3567#if ENABLE_PERL
3953 case URxvt_perl: 3568 case URxvt_perl:
3954 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)))
3955 ; // no responses yet 3570 ; // no responses yet
3956 break; 3571 break;
3957#endif 3572#endif
3958 } 3573 }
3959} 3574}
… …
4075 scr_touch (true); 3690 scr_touch (true);
4076 break; 3691 break;
4077#endif 3692#endif
4078 case 1048: /* alternative cursor save */ 3693 case 1048: /* alternative cursor save */
4079 case 1049: 3694 case 1049:
4080 if (OPTION (Opt_secondaryScreen)) 3695 if (option (Opt_secondaryScreen))
4081 if (mode == 0) 3696 if (mode == 0)
4082 scr_cursor (RESTORE); 3697 scr_cursor (RESTORE);
4083 else if (mode == 1) 3698 else if (mode == 1)
4084 scr_cursor (SAVE); 3699 scr_cursor (SAVE);
4085 break; 3700 break;
… …
4150 break; 3765 break;
4151 case 1011: /* scroll to bottom on key press */ 3766 case 1011: /* scroll to bottom on key press */
4152 set_option (Opt_scrollTtyKeypress, state); 3767 set_option (Opt_scrollTtyKeypress, state);
4153 break; 3768 break;
4154 case 1047: /* secondary screen w/ clearing last */ 3769 case 1047: /* secondary screen w/ clearing last */
4155 if (OPTION (Opt_secondaryScreen)) 3770 if (option (Opt_secondaryScreen))
4156 if (current_screen != PRIMARY) 3771 if (current_screen != PRIMARY)
4157 scr_erase_screen (2); 3772 scr_erase_screen (2);
4158 scr_change_screen (state); 3773 scr_change_screen (state);
4159 break; 3774 break;
4160 case 1049: /* secondary screen w/ clearing first */ 3775 case 1049: /* secondary screen w/ clearing first */
4161 scr_change_screen (state); 3776 scr_change_screen (state);
4162 if (OPTION (Opt_secondaryScreen)) 3777 if (option (Opt_secondaryScreen))
4163 if (current_screen != PRIMARY) 3778 if (current_screen != PRIMARY)
4164 scr_erase_screen (2); 3779 scr_erase_screen (2);
4165 break; 3780 break;
4166 default: 3781 default:
4167 break; 3782 break;

Diff Legend

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