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.300 by root, Tue Jan 31 19:53:30 2006 UTC vs.
Revision 1.316 by root, Thu Dec 7 20:59:59 2006 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 *
… …
908 tt_write (&ch, 1); 911 tt_write (&ch, 1);
909 } 912 }
910 913
911 tt_write (kbuf, (unsigned int)len); 914 tt_write (kbuf, (unsigned int)len);
912} 915}
913/*}}} */ 916
917void
918rxvt_term::key_release (XKeyEvent &ev)
919{
920#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
921 KeySym keysym;
922
923 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
924#endif
925
926#if ENABLE_FRILLS || ISO_14755
927 // ISO 14755 support
928 if (iso14755buf)
929 if (iso14755buf & ISO_14755_52)
930 {
931# if ENABLE_OVERLAY
932 scr_overlay_off ();
933# endif
934# if ISO_14755
935 // iso14755 part 5.2 handling: release time
936 // first: controls
937 if ((ev.state & ControlMask)
938 && ((keysym >= 0x40 && keysym <= 0x5f)
939 || (keysym >= 0x61 && keysym <= 0x7f)))
940 {
941 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
942 commit_iso14755 ();
943
944 return;
945 }
946
947 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
948 if (i[0] == keysym)
949 {
950 iso14755buf = ISO_14755_51 | i[1];
951 commit_iso14755 ();
952
953 return;
954 }
955
956 scr_bell ();
957# endif
958 iso14755buf = 0;
959
960 return;
961 }
962 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
963 {
964# if ENABLE_OVERLAY
965 scr_overlay_off ();
966# endif
967 if (iso14755buf & ISO_14755_51)
968 commit_iso14755 ();
969#if ISO_14755
970 else if (iso14755buf & ISO_14755_STARTED)
971 {
972 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
973
974 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
975 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
976 }
977# endif
978 else
979 iso14755buf = 0;
980 }
981#endif
982
983 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
984 return;
985
986#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
987 if (!(ev.state & ControlMask))
988 slip_wheel_ev.stop ();
989 else if (keysym == XK_Control_L || keysym == XK_Control_R)
990 mouse_slip_wheel_speed = 0;
991#endif
992}
914 993
915#if defined (KEYSYM_RESOURCE) 994#if defined (KEYSYM_RESOURCE)
916unsigned int 995unsigned int
917rxvt_term::cmd_write (const char *str, unsigned int count) 996rxvt_term::cmd_write (const char *str, unsigned int count)
918{ 997{
… …
1095 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1174 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1096 } 1175 }
1097} 1176}
1098#endif 1177#endif
1099 1178
1100#if HAVE_SCHED_YIELD 1179#if LINUX_YIELD_HACK
1101static struct event_handler 1180static struct event_handler
1102{ 1181{
1103 check_watcher cw_yield; 1182 check_watcher yield_ev;
1104 1183
1105 void yield (check_watcher &w) 1184 void yield_cb (check_watcher &w)
1106 { 1185 {
1107 sched_yield (); 1186 // this should really be sched_yield(), but the linux guys thought
1187 // that giving a process calling sched_yield () less cpu time than
1188 // ones with high nice levels is a useful thing to do. It surely is is
1189 // allowed by the sus... as is returning ENOSYS.
1190
1191 struct timespec ts = { 0, 0 };
1192 nanosleep (&ts, 0);
1193
1108 w.stop (); 1194 w.stop ();
1109 } 1195 }
1110 1196
1111 event_handler () 1197 event_handler ()
1112 : cw_yield (this, &event_handler::yield) 1198 : yield_ev (this, &event_handler::yield_cb)
1113 { 1199 {
1114 } 1200 }
1115} event_handler; 1201} event_handler;
1116#endif 1202#endif
1117 1203
… …
1137 cmdbuf_endp += r; 1223 cmdbuf_endp += r;
1138 return true; 1224 return true;
1139 } 1225 }
1140 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1226 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1141 { 1227 {
1142#if HAVE_SCHED_YIELD 1228#if LINUX_YIELD_HACK
1143 if (display->is_local) 1229 if (display->is_local)
1144 event_handler.cw_yield.start (); 1230 event_handler.yield_ev.start ();
1145#endif 1231#endif
1146 } 1232 }
1147 else 1233 else
1148 { 1234 {
1149 pty_ev.stop (); 1235 pty_ev.stop ();
… …
1171} 1257}
1172 1258
1173void 1259void
1174rxvt_term::pointer_unblank () 1260rxvt_term::pointer_unblank ()
1175{ 1261{
1176 XDefineCursor (xdisp, vt, TermWin_cursor); 1262 XDefineCursor (dpy, vt, TermWin_cursor);
1177 recolour_cursor (); 1263 recolour_cursor ();
1178 1264
1179#ifdef POINTER_BLANK 1265#ifdef POINTER_BLANK
1180 hidden_pointer = 0; 1266 hidden_pointer = 0;
1181 1267
… …
1189rxvt_term::pointer_blank () 1275rxvt_term::pointer_blank ()
1190{ 1276{
1191 if (!OPTION (Opt_pointerBlank)) 1277 if (!OPTION (Opt_pointerBlank))
1192 return; 1278 return;
1193 1279
1194 XDefineCursor (xdisp, vt, display->blank_cursor); 1280 XDefineCursor (dpy, vt, display->blank_cursor);
1195 XFlush (xdisp); 1281 XFlush (dpy);
1196 1282
1197 hidden_pointer = 1; 1283 hidden_pointer = 1;
1198} 1284}
1199 1285
1200void 1286void
… …
1279void 1365void
1280rxvt_term::x_cb (XEvent &ev) 1366rxvt_term::x_cb (XEvent &ev)
1281{ 1367{
1282 make_current (); 1368 make_current ();
1283 1369
1284 dLocal (Display *, xdisp); 1370 dLocal (Display *, dpy);
1285 1371
1286 if (ev.xany.window == vt 1372 if (ev.xany.window == vt
1287 && SHOULD_INVOKE (HOOK_X_EVENT) 1373 && SHOULD_INVOKE (HOOK_X_EVENT)
1288 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1374 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1289 return; 1375 return;
… …
1294 unsigned int unused_mask; 1380 unsigned int unused_mask;
1295 1381
1296 switch (ev.type) 1382 switch (ev.type)
1297 { 1383 {
1298 case KeyPress: 1384 case KeyPress:
1299#if ISO_14755 1385 key_press (ev.xkey);
1300 if (!(iso14755buf & ISO_14755_52))
1301#endif
1302 lookup_key (ev.xkey);
1303
1304 break; 1386 break;
1305 1387
1306 case KeyRelease: 1388 case KeyRelease:
1307 { 1389 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; 1390 break;
1379 }
1380 1391
1381 case ButtonPress: 1392 case ButtonPress:
1382 button_press (ev.xbutton); 1393 button_press (ev.xbutton);
1383 break; 1394 break;
1384 1395
… …
1399 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END))) 1410 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1400 destroy (); 1411 destroy ();
1401 } 1412 }
1402#if ENABLE_EWMH 1413#if ENABLE_EWMH
1403 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1414 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1404 XSendEvent (xdisp, ev.xclient.window = display->root, 1415 XSendEvent (dpy, ev.xclient.window = display->root,
1405 False, SubstructureRedirectMask | SubstructureNotifyMask, 1416 False, SubstructureRedirectMask | SubstructureNotifyMask,
1406 &ev); 1417 &ev);
1407#endif 1418#endif
1408 } 1419 }
1409 } 1420 }
… …
1447 break; 1458 break;
1448 } 1459 }
1449 break; 1460 break;
1450 1461
1451 case FocusIn: 1462 case FocusIn:
1463 if (ev.xfocus.detail != NotifyInferior && ev.xfocus.detail != NotifyPointer)
1452 focus_in (); 1464 focus_in ();
1453 break; 1465 break;
1454 1466
1455 case FocusOut: 1467 case FocusOut:
1468 if (ev.xfocus.detail != NotifyInferior && ev.xfocus.detail != NotifyPointer)
1456 focus_out (); 1469 focus_out ();
1457 break; 1470 break;
1458 1471
1459 case ConfigureNotify: 1472 case ConfigureNotify:
1460 if (ev.xconfigure.window == parent[0]) 1473 if (ev.xconfigure.window == parent[0])
1461 { 1474 {
1462 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev)) 1475 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1463 ; 1476 ;
1464 1477
1465 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1478 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1466 { 1479 {
1467 seen_resize = 1; 1480 seen_resize = 1;
… …
1525 if (ev.xany.window == vt) 1538 if (ev.xany.window == vt)
1526 { 1539 {
1527 do 1540 do
1528 scr_expose (ev.xexpose.x, ev.xexpose.y, 1541 scr_expose (ev.xexpose.x, ev.xexpose.y,
1529 ev.xexpose.width, ev.xexpose.height, False); 1542 ev.xexpose.width, ev.xexpose.height, False);
1530 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)); 1543 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1531 1544
1532 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1545 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1533 1546
1534 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)) 1547 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1535 scr_expose (ev.xexpose.x, ev.xexpose.y, 1548 scr_expose (ev.xexpose.x, ev.xexpose.y,
1536 ev.xexpose.width, ev.xexpose.height, False); 1549 ev.xexpose.width, ev.xexpose.height, False);
1537 1550
1538 want_refresh = 1; 1551 want_refresh = 1;
1539 } 1552 }
1540 else 1553 else
1541 { 1554 {
1542 XEvent unused_event; 1555 XEvent unused_event;
1543 1556
1544 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event)) 1557 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1545 ; 1558 ;
1546 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event)) 1559 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1547 ; 1560 ;
1548 1561
1549 if (isScrollbarWindow (ev.xany.window)) 1562 if (isScrollbarWindow (ev.xany.window))
1550 { 1563 {
1551 scrollBar.setIdle (); 1564 scrollBar.setIdle ();
1552 scrollbar_show (0); 1565 scrollbar_show (0);
1553 } 1566 }
1554 1567
1555#ifdef TRANSPARENT 1568#ifdef TRANSPARENT
1556 if (am_transparent && ev.xany.window == parent[0]) 1569 if (am_transparent && ev.xany.window == parent[0])
1557 XClearWindow (xdisp, ev.xany.window); 1570 XClearWindow (dpy, ev.xany.window);
1558#endif 1571#endif
1559 } 1572 }
1560 break; 1573 break;
1561 1574
1562 case MotionNotify: 1575 case MotionNotify:
… …
1572 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1585 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1573 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1586 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1574 ; // nop 1587 ; // nop
1575 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1588 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1576 { 1589 {
1577 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev)) 1590 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1578 ; 1591 ;
1579 1592
1580 XQueryPointer (xdisp, vt, 1593 XQueryPointer (dpy, vt,
1581 &unused_root, &unused_child, 1594 &unused_root, &unused_child,
1582 &unused_root_x, &unused_root_y, 1595 &unused_root_x, &unused_root_y,
1583 &ev.xbutton.x, &ev.xbutton.y, 1596 &ev.xbutton.x, &ev.xbutton.y,
1584 &ev.xbutton.state); 1597 &ev.xbutton.state);
1585#ifdef MOUSE_THRESHOLD 1598#ifdef MOUSE_THRESHOLD
… …
1649#endif 1662#endif
1650 } 1663 }
1651 } 1664 }
1652 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1665 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1653 { 1666 {
1654 while (XCheckTypedWindowEvent (xdisp, scrollBar.win, 1667 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1655 MotionNotify, &ev)) 1668 MotionNotify, &ev))
1656 ; 1669 ;
1657 1670
1658 XQueryPointer (xdisp, scrollBar.win, 1671 XQueryPointer (dpy, scrollBar.win,
1659 &unused_root, &unused_child, 1672 &unused_root, &unused_child,
1660 &unused_root_x, &unused_root_y, 1673 &unused_root_x, &unused_root_y,
1661 &ev.xbutton.x, &ev.xbutton.y, 1674 &ev.xbutton.x, &ev.xbutton.y,
1662 &unused_mask); 1675 &unused_mask);
1663 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1676 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
… …
1667 scrollbar_show (1); 1680 scrollbar_show (1);
1668 } 1681 }
1669 break; 1682 break;
1670 } 1683 }
1671 1684
1672skip_switch: ;
1673
1674#if defined(CURSOR_BLINK) 1685#if defined(CURSOR_BLINK)
1675 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1686 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1676 { 1687 {
1677 if (hidden_cursor) 1688 if (hidden_cursor)
1678 { 1689 {
… …
1705 if (!focus) 1716 if (!focus)
1706 { 1717 {
1707 focus = 1; 1718 focus = 1;
1708 want_refresh = 1; 1719 want_refresh = 1;
1709 1720
1710 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1721 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1711 1722
1712#if USE_XIM 1723#if USE_XIM
1713 if (Input_Context != NULL) 1724 if (Input_Context != NULL)
1714 { 1725 {
1715 IMSetStatusPosition (); 1726 IMSetPosition ();
1716 XSetICFocus (Input_Context); 1727 XSetICFocus (Input_Context);
1717 } 1728 }
1718#endif 1729#endif
1719#if CURSOR_BLINK 1730#if CURSOR_BLINK
1720 if (OPTION (Opt_cursorBlink)) 1731 if (OPTION (Opt_cursorBlink))
… …
1766 } 1777 }
1767#endif 1778#endif
1768 } 1779 }
1769} 1780}
1770 1781
1771#if TRANSPARENT 1782void
1783rxvt_term::update_fade_color (unsigned int idx)
1784{
1785#if OFF_FOCUS_FADING
1786 if (rs[Rs_fade])
1787 {
1788 rgba c;
1789 pix_colors [Color_fade].get (c);
1790 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1791 }
1792#endif
1793}
1794
1795#if TRANSPARENT || ENABLE_PERL
1772void 1796void
1773rxvt_term::rootwin_cb (XEvent &ev) 1797rxvt_term::rootwin_cb (XEvent &ev)
1774{ 1798{
1775 make_current (); 1799 make_current ();
1776 1800
1801 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1802 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1803 return;
1804
1805# if TRANSPARENT
1777 switch (ev.type) 1806 switch (ev.type)
1778 { 1807 {
1779 case PropertyNotify: 1808 case PropertyNotify:
1780 /* 1809 /*
1781 * if user used some Esetroot compatible prog to set the root bg, 1810 * if user used some Esetroot compatible prog to set the root bg,
… …
1789 case ReparentNotify: 1818 case ReparentNotify:
1790 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent) 1819 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1791 want_refresh = want_full_refresh = 1; 1820 want_refresh = want_full_refresh = 1;
1792 break; 1821 break;
1793 } 1822 }
1823# endif
1794} 1824}
1795#endif 1825#endif
1796 1826
1797void 1827void
1798rxvt_term::button_press (XButtonEvent &ev) 1828rxvt_term::button_press (XButtonEvent &ev)
… …
2424 pchanged = 0; 2454 pchanged = 0;
2425 2455
2426 if (!OPTION (Opt_transparent)) 2456 if (!OPTION (Opt_transparent))
2427 return pchanged; /* Don't try any more */ 2457 return pchanged; /* Don't try any more */
2428 2458
2429 XGetWindowAttributes (xdisp, display->root, &wrootattr); 2459 XGetWindowAttributes (dpy, display->root, &wrootattr);
2430 rootdepth = wrootattr.depth; 2460 rootdepth = wrootattr.depth;
2431 2461
2432 XGetWindowAttributes (xdisp, parent[0], &wattr); 2462 XGetWindowAttributes (dpy, parent[0], &wattr);
2433 2463
2434 if (rootdepth != wattr.depth) 2464 if (rootdepth != wattr.depth)
2435 { 2465 {
2436 if (am_transparent) 2466 if (am_transparent)
2437 { 2467 {
2438 pchanged = 1; 2468 pchanged = 1;
2439 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]); 2469 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2440 am_transparent = am_pixmap_trans = 0; 2470 am_transparent = am_pixmap_trans = 0;
2441 } 2471 }
2442 2472
2443 return pchanged; /* Don't try any more */ 2473 return pchanged; /* Don't try any more */
2444 } 2474 }
2445 2475
2446 /* Get all X ops out of the queue so that our information is up-to-date. */ 2476 /* Get all X ops out of the queue so that our information is up-to-date. */
2447 XSync (xdisp, False); 2477 XSync (dpy, False);
2448 2478
2449 /* 2479 /*
2450 * Make the frame window set by the window manager have 2480 * Make the frame window set by the window manager have
2451 * the root background. Some window managers put multiple nested frame 2481 * the root background. Some window managers put multiple nested frame
2452 * windows for each client, so we have to take care about that. 2482 * windows for each client, so we have to take care about that.
2453 */ 2483 */
2454 i = (xa[XA_XROOTPMAP_ID] 2484 i = (xa[XA_XROOTPMAP_ID]
2455 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID], 2485 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2456 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2486 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2457 &nitems, &bytes_after, &prop) == Success); 2487 &nitems, &bytes_after, &prop) == Success);
2458 2488
2459 if (!i || prop == NULL) 2489 if (!i || prop == NULL)
2460 i = (xa[XA_ESETROOT_PMAP_ID] 2490 i = (xa[XA_ESETROOT_PMAP_ID]
2461 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID], 2491 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2462 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2492 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2463 &nitems, &bytes_after, &prop) == Success); 2493 &nitems, &bytes_after, &prop) == Success);
2464 2494
2465 if (!i || prop == NULL 2495 if (!i || prop == NULL
2466#if TINTING 2496#if TINTING
… …
2485 Window cr; 2515 Window cr;
2486 XImage *image; 2516 XImage *image;
2487 GC gc; 2517 GC gc;
2488 XGCValues gcvalue; 2518 XGCValues gcvalue;
2489 2519
2490 XTranslateCoordinates (xdisp, parent[0], display->root, 2520 XTranslateCoordinates (dpy, parent[0], display->root,
2491 0, 0, &sx, &sy, &cr); 2521 0, 0, &sx, &sy, &cr);
2492 nw = (unsigned int)szHint.width; 2522 nw = (unsigned int)szHint.width;
2493 nh = (unsigned int)szHint.height; 2523 nh = (unsigned int)szHint.height;
2494 nx = ny = 0; 2524 nx = ny = 0;
2495 2525
… …
2508 } 2538 }
2509 2539
2510 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2540 min_it (nw, (unsigned int) (wrootattr.width - sx));
2511 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2541 min_it (nh, (unsigned int) (wrootattr.height - sy));
2512 2542
2513 XSync (xdisp, False); 2543 XSync (dpy, False);
2514 allowedxerror = -1; 2544 allowedxerror = -1;
2515 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2545 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2516 2546
2517 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2547 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2518 /* XXX: may need a delay here? */ 2548 /* XXX: may need a delay here? */
2519 allowedxerror = 0; 2549 allowedxerror = 0;
2520 2550
… …
2523 if (am_transparent && am_pixmap_trans) 2553 if (am_transparent && am_pixmap_trans)
2524 { 2554 {
2525 pchanged = 1; 2555 pchanged = 1;
2526 if (pixmap != None) 2556 if (pixmap != None)
2527 { 2557 {
2528 XFreePixmap (xdisp, pixmap); 2558 XFreePixmap (dpy, pixmap);
2529 pixmap = None; 2559 pixmap = None;
2530 } 2560 }
2531 } 2561 }
2532 2562
2533 am_pixmap_trans = 0; 2563 am_pixmap_trans = 0;
2534 } 2564 }
2535 else 2565 else
2536 { 2566 {
2537 if (pixmap != None) 2567 if (pixmap != None)
2538 XFreePixmap (xdisp, pixmap); 2568 XFreePixmap (dpy, pixmap);
2539 2569
2540#if TINTING 2570#if TINTING
2541 if (ISSET_PIXCOLOR (Color_tint)) 2571 if (ISSET_PIXCOLOR (Color_tint))
2542 { 2572 {
2543 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2573 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
… …
2547 2577
2548 ShadeXImage (this, image, shade, c.r, c.g, c.b); 2578 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2549 } 2579 }
2550#endif 2580#endif
2551 2581
2552 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth); 2582 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2553 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue); 2583 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2554 XPutImage (xdisp, pixmap, gc, image, 0, 0, 2584 XPutImage (dpy, pixmap, gc, image, 0, 0,
2555 nx, ny, image->width, image->height); 2585 nx, ny, image->width, image->height);
2556 XFreeGC (xdisp, gc); 2586 XFreeGC (dpy, gc);
2557 XDestroyImage (image); 2587 XDestroyImage (image);
2558 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap); 2588 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2559 XClearWindow (xdisp, parent[0]); 2589 XClearWindow (dpy, parent[0]);
2560 2590
2561 if (!am_transparent || !am_pixmap_trans) 2591 if (!am_transparent || !am_pixmap_trans)
2562 pchanged = 1; 2592 pchanged = 1;
2563 2593
2564 am_transparent = am_pixmap_trans = 1; 2594 am_transparent = am_pixmap_trans = 1;
2565 } 2595 }
2566 } 2596 }
2567 2597
2568 if (am_pixmap_trans) 2598 if (am_pixmap_trans)
2569 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative); 2599 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2570 else 2600 else
2571 { 2601 {
2572 unsigned int n; 2602 unsigned int n;
2573 /* 2603 /*
2574 * InheritPixmap transparency 2604 * InheritPixmap transparency
2575 */ 2605 */
2576 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2606 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2577 { 2607 {
2578 oldp = parent[i]; 2608 oldp = parent[i];
2579 XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n); 2609 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2580 XFree (list); 2610 XFree (list);
2581 2611
2582 if (parent[i] == display->root) 2612 if (parent[i] == display->root)
2583 { 2613 {
2584 if (oldp != None) 2614 if (oldp != None)
… …
2594 n = 0; 2624 n = 0;
2595 2625
2596 if (pchanged) 2626 if (pchanged)
2597 for (; n < (unsigned int)i; n++) 2627 for (; n < (unsigned int)i; n++)
2598 { 2628 {
2599 XGetWindowAttributes (xdisp, parent[n], &wattr); 2629 XGetWindowAttributes (dpy, parent[n], &wattr);
2600 2630
2601 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2631 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2602 { 2632 {
2603 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2633 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2604 break; 2634 break;
2605 } 2635 }
2606 } 2636 }
2607 2637
2608 if (n > (sizeof (parent) / sizeof (parent[0]))) 2638 if (n > (sizeof (parent) / sizeof (parent[0])))
2609 { 2639 {
2610 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]); 2640 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2611 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]); 2641 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2612 am_transparent = 0; 2642 am_transparent = 0;
2613 /* XXX: also turn off Opt_transparent? */ 2643 /* XXX: also turn off Opt_transparent? */
2614 } 2644 }
2615 else 2645 else
2616 { 2646 {
2617 for (n = 0; n < (unsigned int)i; n++) 2647 for (n = 0; n < (unsigned int)i; n++)
2618 { 2648 {
2619 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative); 2649 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2620 XClearWindow (xdisp, parent[n]); 2650 XClearWindow (dpy, parent[n]);
2621 } 2651 }
2622 2652
2623 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative); 2653 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2624 am_transparent = 1; 2654 am_transparent = 1;
2625 } 2655 }
2626 2656
2627 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2657 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2628 parent[i] = None; 2658 parent[i] = None;
2629 } 2659 }
2630 2660
2631 if (scrollBar.win) 2661 if (scrollBar.win)
2632 { 2662 {
2633 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative); 2663 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2634 scrollBar.setIdle (); 2664 scrollBar.setIdle ();
2635 scrollbar_show (0); 2665 scrollbar_show (0);
2636 } 2666 }
2637 2667
2638 if (am_transparent) 2668 if (am_transparent)
… …
2756 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2786 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2757 refresh_limit++; 2787 refresh_limit++;
2758 else 2788 else
2759 { 2789 {
2760 flag = true; 2790 flag = true;
2791 //TODO: due to popular request, implement "skipscroll" option here
2761 scr_refresh (); 2792 scr_refresh ();
2762 want_refresh = 1; 2793 want_refresh = 1;
2763 } 2794 }
2764 } 2795 }
2765 2796
… …
3529{ 3560{
3530 int x, y; 3561 int x, y;
3531 XWindowAttributes wattr; 3562 XWindowAttributes wattr;
3532 Window wdummy; 3563 Window wdummy;
3533 3564
3534 dLocal (Display *, xdisp); 3565 dLocal (Display *, dpy);
3535 3566
3536 if (nargs == 0) 3567 if (nargs == 0)
3537 return; 3568 return;
3538 3569
3539 switch (args[0]) 3570 switch (args[0])
3540 { 3571 {
3541 /* 3572 /*
3542 * commands 3573 * commands
3543 */ 3574 */
3544 case 1: /* deiconify window */ 3575 case 1: /* deiconify window */
3545 XMapWindow (xdisp, parent[0]); 3576 XMapWindow (dpy, parent[0]);
3546 break; 3577 break;
3547 case 2: /* iconify window */ 3578 case 2: /* iconify window */
3548 XIconifyWindow (xdisp, parent[0], display->screen); 3579 XIconifyWindow (dpy, parent[0], display->screen);
3549 break; 3580 break;
3550 case 3: /* set position (pixels) */ 3581 case 3: /* set position (pixels) */
3551 XMoveWindow (xdisp, parent[0], args[1], args[2]); 3582 XMoveWindow (dpy, parent[0], args[1], args[2]);
3552 break; 3583 break;
3553 case 4: /* set size (pixels) */ 3584 case 4: /* set size (pixels) */
3554 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3585 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3555 break; 3586 break;
3556 case 5: /* raise window */ 3587 case 5: /* raise window */
3557 XRaiseWindow (xdisp, parent[0]); 3588 XRaiseWindow (dpy, parent[0]);
3558 break; 3589 break;
3559 case 6: /* lower window */ 3590 case 6: /* lower window */
3560 XLowerWindow (xdisp, parent[0]); 3591 XLowerWindow (dpy, parent[0]);
3561 break; 3592 break;
3562 case 7: /* refresh window */ 3593 case 7: /* refresh window */
3563 scr_touch (true); 3594 scr_touch (true);
3564 break; 3595 break;
3565 case 8: /* set size (chars) */ 3596 case 8: /* set size (chars) */
… …
3576 3607
3577 /* 3608 /*
3578 * reports - some output format copied from XTerm 3609 * reports - some output format copied from XTerm
3579 */ 3610 */
3580 case 11: /* report window state */ 3611 case 11: /* report window state */
3581 XGetWindowAttributes (xdisp, parent[0], &wattr); 3612 XGetWindowAttributes (dpy, parent[0], &wattr);
3582 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3613 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3583 break; 3614 break;
3584 case 13: /* report window position */ 3615 case 13: /* report window position */
3585 XGetWindowAttributes (xdisp, parent[0], &wattr); 3616 XGetWindowAttributes (dpy, parent[0], &wattr);
3586 XTranslateCoordinates (xdisp, parent[0], wattr.root, 3617 XTranslateCoordinates (dpy, parent[0], wattr.root,
3587 -wattr.border_width, -wattr.border_width, 3618 -wattr.border_width, -wattr.border_width,
3588 &x, &y, &wdummy); 3619 &x, &y, &wdummy);
3589 tt_printf ("\033[3;%d;%dt", x, y); 3620 tt_printf ("\033[3;%d;%dt", x, y);
3590 break; 3621 break;
3591 case 14: /* report window size (pixels) */ 3622 case 14: /* report window size (pixels) */
3592 XGetWindowAttributes (xdisp, parent[0], &wattr); 3623 XGetWindowAttributes (dpy, parent[0], &wattr);
3593 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3624 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3594 break; 3625 break;
3595 case 18: /* report text area size (chars) */ 3626 case 18: /* report text area size (chars) */
3596 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3627 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3597 break; 3628 break;
… …
3599 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3630 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3600 break; 3631 break;
3601 case 20: /* report icon label */ 3632 case 20: /* report icon label */
3602 { 3633 {
3603 char *s; 3634 char *s;
3604 XGetIconName (xdisp, parent[0], &s); 3635 XGetIconName (dpy, parent[0], &s);
3605 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3636 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3606 XFree (s); 3637 XFree (s);
3607 } 3638 }
3608 break; 3639 break;
3609 case 21: /* report window title */ 3640 case 21: /* report window title */
3610 { 3641 {
3611 char *s; 3642 char *s;
3612 XFetchName (xdisp, parent[0], &s); 3643 XFetchName (dpy, parent[0], &s);
3613 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3644 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3614 XFree (s); 3645 XFree (s);
3615 } 3646 }
3616 break; 3647 break;
3617 } 3648 }
… …
3645 seen_esc = true; 3676 seen_esc = true;
3646 continue; 3677 continue;
3647 } 3678 }
3648 else if (ch == C0_BEL || ch == CHAR_ST) 3679 else if (ch == C0_BEL || ch == CHAR_ST)
3649 break; 3680 break;
3681 else if (ch == C0_SYN)
3682 ch = cmd_get8 ();
3650 else if (ch < 0x20) 3683 else if (ch < 0x20)
3651 return NULL; /* other control character - exit */ 3684 return NULL; /* other control character - exit */
3652 3685
3653 seen_esc = false; 3686 seen_esc = false;
3654 3687
3655 if (n >= STRING_MAX - 1) 3688 if (n >= STRING_MAX - 1)
3656 // stop at some sane length 3689 // stop at some sane length
3657 return NULL; 3690 return NULL;
3658 3691
3659 if (ch == C0_SYN)
3660 string[n++] = cmd_get8 ();
3661 else
3662 string[n++] = ch; 3692 string[n++] = ch;
3663 } 3693 }
3664 3694
3665 string[n++] = '\0'; 3695 string[n++] = '\0';
3666 3696
3667 ends_how = (ch == 0x5c ? C0_ESC : ch); 3697 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3743 int color; 3773 int color;
3744 char *buf, *name; 3774 char *buf, *name;
3745 bool query = str[0] == '?' && !str[1]; 3775 bool query = str[0] == '?' && !str[1];
3746 int saveop = op; 3776 int saveop = op;
3747 3777
3748 dLocal (Display *, xdisp); 3778 dLocal (Display *, dpy);
3749 3779
3750 assert (str != NULL); 3780 assert (str != NULL);
3781
3782 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3783 return;
3784
3751 switch (op) 3785 switch (op)
3752 { 3786 {
3753 case XTerm_name: 3787 case XTerm_name:
3754 set_title (str); 3788 set_title (str);
3755 /* FALLTHROUGH */ 3789 /* FALLTHROUGH */
… …
3769 unsigned long bytes_after; 3803 unsigned long bytes_after;
3770 unsigned char *value = 0; 3804 unsigned char *value = 0;
3771 const char *str = ""; 3805 const char *str = "";
3772 3806
3773 if (prop 3807 if (prop
3774 && XGetWindowProperty (xdisp, parent[0], 3808 && XGetWindowProperty (dpy, parent[0],
3775 prop, 0, 1<<16, 0, AnyPropertyType, 3809 prop, 0, 1<<16, 0, AnyPropertyType,
3776 &actual_type, &actual_format, 3810 &actual_type, &actual_format,
3777 &nitems, &bytes_after, &value) == Success 3811 &nitems, &bytes_after, &value) == Success
3778 && actual_type != None 3812 && actual_type != None
3779 && actual_format == 8) 3813 && actual_format == 8)
… …
3791 { 3825 {
3792 *eq = 0; 3826 *eq = 0;
3793 set_utf8_property (display->atom (str), eq + 1); 3827 set_utf8_property (display->atom (str), eq + 1);
3794 } 3828 }
3795 else 3829 else
3796 XDeleteProperty (xdisp, parent[0], 3830 XDeleteProperty (dpy, parent[0],
3797 display->atom (str)); 3831 display->atom (str));
3798 } 3832 }
3799 break; 3833 break;
3800 3834
3801 case XTerm_Color: 3835 case XTerm_Color:
… …
3972 break; 4006 break;
3973#endif 4007#endif
3974 4008
3975#if ENABLE_PERL 4009#if ENABLE_PERL
3976 case URxvt_perl: 4010 case URxvt_perl:
3977 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 4011 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3978 ; // no responses yet 4012 ; // no responses yet
3979 break; 4013 break;
3980#endif 4014#endif
3981 } 4015 }
3982} 4016}

Diff Legend

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