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.272 by root, Thu Jan 19 16:22:12 2006 UTC vs.
Revision 1.301 by root, Tue Jan 31 21:23:13 2006 UTC

… …
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>
64 59
65/*----------------------------------------------------------------------*/ 60/*----------------------------------------------------------------------*/
66 61
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 62#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68
69// exception thrown when the command parser runs out of input data
70class out_of_input { } out_of_input;
71 63
72#if ENABLE_FRILLS || ISO_14755 64#if ENABLE_FRILLS || ISO_14755
73 65
74#define ISO_14755_STARTED 0x80000000UL 66#define ISO_14755_STARTED 0x80000000UL
75#define ISO_14755_51 0x40000000UL // basic (section 5.1) 67#define ISO_14755_51 0x40000000UL // basic (section 5.1)
… …
230# if !UNICODE3 222# if !UNICODE3
231 if (ch >= 0x10000) 223 if (ch >= 0x10000)
232 ch = 0xfffd; 224 ch = 0xfffd;
233# endif 225# endif
234 scr_overlay_set (11, y, ch, r); 226 scr_overlay_set (11, y, ch, r);
227
228 if (WCWIDTH (ch) >= 2)
235 scr_overlay_set (12, y, NOCHAR, r); 229 scr_overlay_set (12, y, NOCHAR, r);
236 } 230 }
237 231
232// {
233// char buf[4+4+3+1];
234// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
235// scr_overlay_set (0, 0, buf);
236// }
238 scr_overlay_set (0, len , attr); 237 scr_overlay_set (0, len , attr);
239 scr_overlay_set (0, len + 1, fname); 238 scr_overlay_set (0, len + 1, fname);
240 239
241 free (fname); 240 free (fname);
242 241
… …
302rxvt_term::lookup_key (XKeyEvent &ev) 301rxvt_term::lookup_key (XKeyEvent &ev)
303{ 302{
304 int ctrl, meta, shft, len; 303 int ctrl, meta, shft, len;
305 unsigned int newlen; 304 unsigned int newlen;
306 KeySym keysym; 305 KeySym keysym;
307#ifdef DEBUG_CMD
308 static int debug_key = 1; /* accessible by a debugger only */
309#endif
310 int valid_keysym; 306 int valid_keysym;
311 char kbuf[KBUFSZ]; 307 char kbuf[KBUFSZ];
312 308
313 /* 309 /*
314 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 310 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
… …
905 { 901 {
906 const char ch = C0_ESC; 902 const char ch = C0_ESC;
907 tt_write (&ch, 1); 903 tt_write (&ch, 1);
908 } 904 }
909 905
910#if defined(DEBUG_CMD)
911 /* Display keyboard buffer contents */
912 unsigned char *p;
913 int i;
914
915 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
916 for (i = 0, p = kbuf; i < len; i++, p++)
917 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
918 fprintf (stderr, "'\n");
919#endif /* DEBUG_CMD */
920 tt_write (kbuf, (unsigned int)len); 906 tt_write (kbuf, (unsigned int)len);
921} 907}
922/*}}} */ 908/*}}} */
923 909
924#if defined (KEYSYM_RESOURCE) 910#if defined (KEYSYM_RESOURCE)
… …
1044rxvt_term::cursor_blink_cb (time_watcher &w) 1030rxvt_term::cursor_blink_cb (time_watcher &w)
1045{ 1031{
1046 hidden_cursor = !hidden_cursor; 1032 hidden_cursor = !hidden_cursor;
1047 want_refresh = 1; 1033 want_refresh = 1;
1048 1034
1049 w.start (w.at + BLINK_INTERVAL); 1035 w.start (w.at + CURSOR_BLINK_INTERVAL);
1050} 1036}
1051#endif 1037#endif
1052 1038
1053#ifdef TEXT_BLINK 1039#ifdef TEXT_BLINK
1054void 1040void
… …
1102 1088
1103 want_refresh = 1; 1089 want_refresh = 1;
1104 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1090 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1105 } 1091 }
1106} 1092}
1107#endif
1108
1109#if HAVE_SCHED_YIELD
1110static struct event_handler
1111{
1112 check_watcher cw_yield;
1113
1114 void yield (check_watcher &w)
1115 {
1116 sched_yield ();
1117 w.stop ();
1118 }
1119
1120 event_handler ()
1121 : cw_yield (this, &event_handler::yield)
1122 {
1123 }
1124} event_handler;
1125#endif 1093#endif
1126 1094
1127bool 1095bool
1128rxvt_term::pty_fill () 1096rxvt_term::pty_fill ()
1129{ 1097{
… …
1180} 1148}
1181 1149
1182void 1150void
1183rxvt_term::pointer_unblank () 1151rxvt_term::pointer_unblank ()
1184{ 1152{
1185 XDefineCursor (display->display, vt, TermWin_cursor); 1153 XDefineCursor (xdisp, vt, TermWin_cursor);
1186 recolour_cursor (); 1154 recolour_cursor ();
1187 1155
1188#ifdef POINTER_BLANK 1156#ifdef POINTER_BLANK
1189 hidden_pointer = 0; 1157 hidden_pointer = 0;
1190 1158
… …
1198rxvt_term::pointer_blank () 1166rxvt_term::pointer_blank ()
1199{ 1167{
1200 if (!OPTION (Opt_pointerBlank)) 1168 if (!OPTION (Opt_pointerBlank))
1201 return; 1169 return;
1202 1170
1203 XDefineCursor (display->display, vt, display->blank_cursor); 1171 XDefineCursor (xdisp, vt, display->blank_cursor);
1204 XFlush (display->display); 1172 XFlush (xdisp);
1205 1173
1206 hidden_pointer = 1; 1174 hidden_pointer = 1;
1207} 1175}
1208 1176
1209void 1177void
… …
1282 (32 + button_number + key_state), 1250 (32 + button_number + key_state),
1283 (32 + x + 1), 1251 (32 + x + 1),
1284 (32 + y + 1)); 1252 (32 + y + 1));
1285} 1253}
1286 1254
1287#ifdef USING_W11LIB
1288void
1289rxvt_W11_process_x_event (XEvent *ev)
1290{
1291 rxvt_t *r = rxvt_get_r ();
1292
1293 x_cb (*ev);
1294}
1295#endif
1296
1297/*{{{ process an X event */ 1255/*{{{ process an X event */
1298void 1256void
1299rxvt_term::x_cb (XEvent &ev) 1257rxvt_term::x_cb (XEvent &ev)
1300{ 1258{
1301 make_current (); 1259 make_current ();
1302 1260
1303 dDisp; 1261 dLocal (Display *, xdisp);
1304 1262
1305 if (ev.xany.window == vt 1263 if (ev.xany.window == vt
1306 && SHOULD_INVOKE (HOOK_X_EVENT) 1264 && SHOULD_INVOKE (HOOK_X_EVENT)
1307 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1265 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1308 return; 1266 return;
… …
1405 button_release (ev.xbutton); 1363 button_release (ev.xbutton);
1406 break; 1364 break;
1407 1365
1408 case ClientMessage: 1366 case ClientMessage:
1409 if (ev.xclient.format == 32 1367 if (ev.xclient.format == 32
1410 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1368 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1411 { 1369 {
1370 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1371 {
1372 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1373 {
1412 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1374 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1375 {
1376 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1413 destroy (); 1377 destroy ();
1378 }
1414#if ENABLE_EWMH 1379#if ENABLE_EWMH
1415 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1380 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1416 XSendEvent (disp, ev.xclient.window = display->root, 1381 XSendEvent (xdisp, ev.xclient.window = display->root,
1417 False, SubstructureRedirectMask | SubstructureNotifyMask, 1382 False, SubstructureRedirectMask | SubstructureNotifyMask,
1418 &ev); 1383 &ev);
1384#endif
1385 }
1386 }
1387#if ENABLE_XEMBED
1388 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1389 {
1390 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1391 focus_in ();
1392 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1393 focus_out ();
1394 }
1419#endif 1395#endif
1420 } 1396 }
1421#if ENABLE_XEMBED
1422 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1423 {
1424 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1425 focus_in ();
1426 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1427 focus_out ();
1428 }
1429#endif
1430#ifdef OFFIX_DND
1431 /* OffiX Dnd (drag 'n' drop) protocol */
1432 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1433 && (ev.xclient.data.l[0] == DndFile
1434 || ev.xclient.data.l[0] == DndDir
1435 || ev.xclient.data.l[0] == DndLink))
1436 {
1437 /* Get Dnd data */
1438 Atom ActualType;
1439 int ActualFormat;
1440 unsigned char *data;
1441 unsigned long Size, RemainingBytes;
1442
1443 XGetWindowProperty (disp, display->root,
1444 xa[XA_DNDSELECTION],
1445 0L, 1000000L,
1446 False, AnyPropertyType,
1447 &ActualType, &ActualFormat,
1448 &Size, &RemainingBytes,
1449 &data);
1450 set_string_property (XA_CUT_BUFFER0, data);
1451 XFree (data);
1452 selection_paste (display->root, XA_CUT_BUFFER0, true);
1453 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1454 }
1455#endif /* OFFIX_DND */
1456 break; 1397 break;
1457 1398
1458 case MappingNotify: 1399 case MappingNotify:
1459 XRefreshKeyboardMapping (&ev.xmapping); 1400 XRefreshKeyboardMapping (&ev.xmapping);
1460 break; 1401 break;
… …
1493 break; 1434 break;
1494 1435
1495 case ConfigureNotify: 1436 case ConfigureNotify:
1496 if (ev.xconfigure.window == parent[0]) 1437 if (ev.xconfigure.window == parent[0])
1497 { 1438 {
1498 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1439 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev))
1499 ; 1440 ;
1500 1441
1501 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1442 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1502 { 1443 {
1503 seen_resize = 1; 1444 seen_resize = 1;
… …
1512#endif 1453#endif
1513 } 1454 }
1514 break; 1455 break;
1515 1456
1516 case PropertyNotify: 1457 case PropertyNotify:
1458 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1517 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1459 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1518 && ev.xproperty.state == PropertyNewValue) 1460 && ev.xproperty.state == PropertyNewValue)
1519 selection_property (ev.xproperty.window, ev.xproperty.atom); 1461 selection_property (ev.xproperty.window, ev.xproperty.atom);
1520 1462
1521 break; 1463 break;
1522 1464
1523 case SelectionClear: 1465 case SelectionClear:
1524 selection_clear (); 1466 selection_clear ();
… …
1560 if (ev.xany.window == vt) 1502 if (ev.xany.window == vt)
1561 { 1503 {
1562 do 1504 do
1563 scr_expose (ev.xexpose.x, ev.xexpose.y, 1505 scr_expose (ev.xexpose.x, ev.xexpose.y,
1564 ev.xexpose.width, ev.xexpose.height, False); 1506 ev.xexpose.width, ev.xexpose.height, False);
1565 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1507 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev));
1566 1508
1567 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1509 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1568 1510
1569 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1511 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev))
1570 scr_expose (ev.xexpose.x, ev.xexpose.y, 1512 scr_expose (ev.xexpose.x, ev.xexpose.y,
1571 ev.xexpose.width, ev.xexpose.height, False); 1513 ev.xexpose.width, ev.xexpose.height, False);
1572 1514
1573 want_refresh = 1; 1515 want_refresh = 1;
1574 } 1516 }
1575 else 1517 else
1576 { 1518 {
1577 XEvent unused_event; 1519 XEvent unused_event;
1578 1520
1579 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1521 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event))
1580 ; 1522 ;
1581 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1523 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event))
1582 ; 1524 ;
1583 1525
1584 if (isScrollbarWindow (ev.xany.window)) 1526 if (isScrollbarWindow (ev.xany.window))
1585 { 1527 {
1586 scrollBar.setIdle (); 1528 scrollBar.setIdle ();
1587 scrollbar_show (0); 1529 scrollbar_show (0);
1588 } 1530 }
1589 1531
1590#ifdef TRANSPARENT 1532#ifdef TRANSPARENT
1591 if (am_transparent && ev.xany.window == parent[0]) 1533 if (am_transparent && ev.xany.window == parent[0])
1592 XClearWindow (disp, ev.xany.window); 1534 XClearWindow (xdisp, ev.xany.window);
1593#endif 1535#endif
1594 } 1536 }
1595 break; 1537 break;
1596 1538
1597 case MotionNotify: 1539 case MotionNotify:
… …
1607 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1549 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1608 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1550 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1609 ; // nop 1551 ; // nop
1610 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1552 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1611 { 1553 {
1612 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1554 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev))
1613 ; 1555 ;
1614 1556
1615 XQueryPointer (disp, vt, 1557 XQueryPointer (xdisp, vt,
1616 &unused_root, &unused_child, 1558 &unused_root, &unused_child,
1617 &unused_root_x, &unused_root_y, 1559 &unused_root_x, &unused_root_y,
1618 &ev.xbutton.x, &ev.xbutton.y, 1560 &ev.xbutton.x, &ev.xbutton.y,
1619 &ev.xbutton.state); 1561 &ev.xbutton.state);
1620#ifdef MOUSE_THRESHOLD 1562#ifdef MOUSE_THRESHOLD
… …
1684#endif 1626#endif
1685 } 1627 }
1686 } 1628 }
1687 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1629 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1688 { 1630 {
1689 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1631 while (XCheckTypedWindowEvent (xdisp, scrollBar.win,
1690 MotionNotify, &ev)) 1632 MotionNotify, &ev))
1691 ; 1633 ;
1692 1634
1693 XQueryPointer (disp, scrollBar.win, 1635 XQueryPointer (xdisp, scrollBar.win,
1694 &unused_root, &unused_child, 1636 &unused_root, &unused_child,
1695 &unused_root_x, &unused_root_y, 1637 &unused_root_x, &unused_root_y,
1696 &ev.xbutton.x, &ev.xbutton.y, 1638 &ev.xbutton.x, &ev.xbutton.y,
1697 &unused_mask); 1639 &unused_mask);
1698 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1640 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
… …
1713 { 1655 {
1714 hidden_cursor = 0; 1656 hidden_cursor = 0;
1715 want_refresh = 1; 1657 want_refresh = 1;
1716 } 1658 }
1717 1659
1718 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1660 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1719 } 1661 }
1720#endif 1662#endif
1721 1663
1722#if defined(POINTER_BLANK) 1664#if defined(POINTER_BLANK)
1723 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1665 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
… …
1751 XSetICFocus (Input_Context); 1693 XSetICFocus (Input_Context);
1752 } 1694 }
1753#endif 1695#endif
1754#if CURSOR_BLINK 1696#if CURSOR_BLINK
1755 if (OPTION (Opt_cursorBlink)) 1697 if (OPTION (Opt_cursorBlink))
1756 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1698 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1757#endif 1699#endif
1758#if OFF_FOCUS_FADING 1700#if OFF_FOCUS_FADING
1759 if (rs[Rs_fade]) 1701 if (rs[Rs_fade])
1760 { 1702 {
1761 pix_colors = pix_colors_focused; 1703 pix_colors = pix_colors_focused;
… …
1842 /* 1784 /*
1843 * VT window processing of button press 1785 * VT window processing of button press
1844 */ 1786 */
1845 if (ev.window == vt) 1787 if (ev.window == vt)
1846 { 1788 {
1789 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1790 return;
1791
1847#if ISO_14755 1792#if ISO_14755
1848 // 5.4 1793 // 5.4
1849 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1794 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1850 { 1795 {
1851 iso14755_54 (ev.x, ev.y); 1796 iso14755_54 (ev.x, ev.y);
… …
1893 else 1838 else
1894 { 1839 {
1895 if (ev.button != MEvent.button) 1840 if (ev.button != MEvent.button)
1896 MEvent.clicks = 0; 1841 MEvent.clicks = 0;
1897 1842
1898 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1899 switch (ev.button) 1843 switch (ev.button)
1900 { 1844 {
1901 case Button1: 1845 case Button1:
1902 /* allow meta + click to select rectangular areas */ 1846 /* allow meta + click to select rectangular areas */
1903 /* should be done in screen.C */ 1847 /* should be done in screen.C */
1904#if ENABLE_FRILLS 1848#if ENABLE_FRILLS
1905 selection.rect = !!(ev.state & ModMetaMask); 1849 selection.rect = !!(ev.state & ModMetaMask);
1906#else 1850#else
1907 selection.rect = false; 1851 selection.rect = false;
1908#endif 1852#endif
1909 1853
1910 /* allow shift+left click to extend selection */ 1854 /* allow shift+left click to extend selection */
1911 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) 1855 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1912 { 1856 {
1913 if (MEvent.button == Button1 && clickintime) 1857 if (MEvent.button == Button1 && clickintime)
1914 selection_rotate (ev.x, ev.y); 1858 selection_rotate (ev.x, ev.y);
1915 else 1859 else
1916 selection_extend (ev.x, ev.y, 1); 1860 selection_extend (ev.x, ev.y, 1);
1917 } 1861 }
1918 else 1862 else
1919 { 1863 {
1920 if (MEvent.button == Button1 && clickintime) 1864 if (MEvent.button == Button1 && clickintime)
1921 MEvent.clicks++; 1865 MEvent.clicks++;
1922 else 1866 else
1923 MEvent.clicks = 1; 1867 MEvent.clicks = 1;
1924 1868
1925 selection_click (MEvent.clicks, ev.x, ev.y); 1869 selection_click (MEvent.clicks, ev.x, ev.y);
1926 } 1870 }
1927 1871
1928 MEvent.button = Button1; 1872 MEvent.button = Button1;
1929 break; 1873 break;
1930 1874
1931 case Button3: 1875 case Button3:
1932 if (MEvent.button == Button3 && clickintime) 1876 if (MEvent.button == Button3 && clickintime)
1933 selection_rotate (ev.x, ev.y); 1877 selection_rotate (ev.x, ev.y);
1934 else 1878 else
1935 selection_extend (ev.x, ev.y, 1); 1879 selection_extend (ev.x, ev.y, 1);
1936 1880
1937 MEvent.button = Button3; 1881 MEvent.button = Button3;
1938 break; 1882 break;
1939 } 1883 }
1940 } 1884 }
1941 1885
1942 MEvent.time = ev.time; 1886 MEvent.time = ev.time;
1943 return; 1887 return;
1944 } 1888 }
1945 1889
… …
2108 sel_scroll_ev.stop(); 2052 sel_scroll_ev.stop();
2109#endif 2053#endif
2110 2054
2111 if (ev.window == vt) 2055 if (ev.window == vt)
2112 { 2056 {
2057 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2058 return;
2059
2113#if ISO_14755 2060#if ISO_14755
2114 // 5.4 2061 // 5.4
2115 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2062 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2116 return; 2063 return;
2117#endif 2064#endif
2065
2118 if (reportmode) 2066 if (reportmode)
2119 { 2067 {
2120 /* mouse report from vt window */ 2068 /* mouse report from vt window */
2121 /* don't report release of wheel "buttons" */ 2069 /* don't report release of wheel "buttons" */
2122 if (ev.button >= 4) 2070 if (ev.button >= 4)
… …
2146 if (priv_modes & PrivMode_mouse_report 2094 if (priv_modes & PrivMode_mouse_report
2147 && bypass_keystate 2095 && bypass_keystate
2148 && ev.button == Button1 && MEvent.clicks <= 1) 2096 && ev.button == Button1 && MEvent.clicks <= 1)
2149 selection_extend (ev.x, ev.y, 0); 2097 selection_extend (ev.x, ev.y, 0);
2150 2098
2151 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2152 return;
2153
2154 switch (ev.button) 2099 switch (ev.button)
2155 { 2100 {
2156 case Button1: 2101 case Button1:
2157 case Button3: 2102 case Button3:
2158 selection_make (ev.time); 2103 selection_make (ev.time);
2159 break; 2104 break;
2160 2105
2161 case Button2: 2106 case Button2:
2162 if (IN_RANGE_EXC (ev.x, 0, width) 2107 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2163 && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2108 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2164 selection_request (ev.time);
2165
2166 break; 2109 break;
2167 2110
2168#ifdef MOUSE_WHEEL 2111#ifdef MOUSE_WHEEL
2169 case Button4: 2112 case Button4:
2170 case Button5: 2113 case Button5:
… …
2212#if TINTING 2155#if TINTING
2213/* taken from aterm-0.4.2 */ 2156/* taken from aterm-0.4.2 */
2214 2157
2215typedef uint32_t RUINT32T; 2158typedef uint32_t RUINT32T;
2216 2159
2217void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm) 2160void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2218{ 2161{
2219 int sh_r, sh_g, sh_b; 2162 int sh_r, sh_g, sh_b;
2220 RUINT32T mask_r, mask_g, mask_b; 2163 RUINT32T mask_r, mask_g, mask_b;
2221 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2164 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2222 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2165 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2223 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2166 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2224 int i; 2167 int i;
2225 2168
2226 Visual *visual = display->visual; 2169 Visual *visual = term->visual;
2227 2170
2228 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2171 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2229 2172
2230 /* for convenience */ 2173 /* for convenience */
2231 mask_r = visual->red_mask; 2174 mask_r = visual->red_mask;
… …
2452 Atom atype; 2395 Atom atype;
2453 unsigned char *prop = NULL; 2396 unsigned char *prop = NULL;
2454 Window root, oldp, *list; 2397 Window root, oldp, *list;
2455 Pixmap rootpixmap = None; 2398 Pixmap rootpixmap = None;
2456 XWindowAttributes wattr, wrootattr; 2399 XWindowAttributes wattr, wrootattr;
2457 dDisp;
2458 2400
2459 pchanged = 0; 2401 pchanged = 0;
2460 2402
2461 if (!OPTION (Opt_transparent)) 2403 if (!OPTION (Opt_transparent))
2462 return pchanged; /* Don't try any more */ 2404 return pchanged; /* Don't try any more */
2463 2405
2464 XGetWindowAttributes (disp, display->root, &wrootattr); 2406 XGetWindowAttributes (xdisp, display->root, &wrootattr);
2465 rootdepth = wrootattr.depth; 2407 rootdepth = wrootattr.depth;
2466 2408
2467 XGetWindowAttributes (disp, parent[0], &wattr); 2409 XGetWindowAttributes (xdisp, parent[0], &wattr);
2468 2410
2469 if (rootdepth != wattr.depth) 2411 if (rootdepth != wattr.depth)
2470 { 2412 {
2471 if (am_transparent) 2413 if (am_transparent)
2472 { 2414 {
2473 pchanged = 1; 2415 pchanged = 1;
2474 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2416 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2475 am_transparent = am_pixmap_trans = 0; 2417 am_transparent = am_pixmap_trans = 0;
2476 } 2418 }
2477 2419
2478 return pchanged; /* Don't try any more */ 2420 return pchanged; /* Don't try any more */
2479 } 2421 }
2480 2422
2481 /* Get all X ops out of the queue so that our information is up-to-date. */ 2423 /* Get all X ops out of the queue so that our information is up-to-date. */
2482 XSync (disp, False); 2424 XSync (xdisp, False);
2483 2425
2484 /* 2426 /*
2485 * Make the frame window set by the window manager have 2427 * Make the frame window set by the window manager have
2486 * the root background. Some window managers put multiple nested frame 2428 * the root background. Some window managers put multiple nested frame
2487 * windows for each client, so we have to take care about that. 2429 * windows for each client, so we have to take care about that.
2488 */ 2430 */
2489 i = (xa[XA_XROOTPMAP_ID] 2431 i = (xa[XA_XROOTPMAP_ID]
2490 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], 2432 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2491 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2433 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2492 &nitems, &bytes_after, &prop) == Success); 2434 &nitems, &bytes_after, &prop) == Success);
2493 2435
2494 if (!i || prop == NULL) 2436 if (!i || prop == NULL)
2495 i = (xa[XA_ESETROOT_PMAP_ID] 2437 i = (xa[XA_ESETROOT_PMAP_ID]
2496 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], 2438 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2497 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2439 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2498 &nitems, &bytes_after, &prop) == Success); 2440 &nitems, &bytes_after, &prop) == Success);
2499 2441
2500 if (!i || prop == NULL 2442 if (!i || prop == NULL
2501#if TINTING 2443#if TINTING
2502 || !rs[Rs_color + Color_tint] 2444 || !ISSET_PIXCOLOR (Color_tint)
2503#endif 2445#endif
2504 ) 2446 )
2505 have_pixmap = 0; 2447 have_pixmap = 0;
2506 else 2448 else
2507 { 2449 {
… …
2520 Window cr; 2462 Window cr;
2521 XImage *image; 2463 XImage *image;
2522 GC gc; 2464 GC gc;
2523 XGCValues gcvalue; 2465 XGCValues gcvalue;
2524 2466
2525 XTranslateCoordinates (disp, parent[0], display->root, 2467 XTranslateCoordinates (xdisp, parent[0], display->root,
2526 0, 0, &sx, &sy, &cr); 2468 0, 0, &sx, &sy, &cr);
2527 nw = (unsigned int)szHint.width; 2469 nw = (unsigned int)szHint.width;
2528 nh = (unsigned int)szHint.height; 2470 nh = (unsigned int)szHint.height;
2529 nx = ny = 0; 2471 nx = ny = 0;
2530 2472
… …
2543 } 2485 }
2544 2486
2545 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2487 min_it (nw, (unsigned int) (wrootattr.width - sx));
2546 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2488 min_it (nh, (unsigned int) (wrootattr.height - sy));
2547 2489
2548 XSync (disp, False); 2490 XSync (xdisp, False);
2549 allowedxerror = -1; 2491 allowedxerror = -1;
2550 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2492 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2551 2493
2552 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2494 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2553 /* XXX: may need a delay here? */ 2495 /* XXX: may need a delay here? */
2554 allowedxerror = 0; 2496 allowedxerror = 0;
2555 2497
… …
2558 if (am_transparent && am_pixmap_trans) 2500 if (am_transparent && am_pixmap_trans)
2559 { 2501 {
2560 pchanged = 1; 2502 pchanged = 1;
2561 if (pixmap != None) 2503 if (pixmap != None)
2562 { 2504 {
2563 XFreePixmap (disp, pixmap); 2505 XFreePixmap (xdisp, pixmap);
2564 pixmap = None; 2506 pixmap = None;
2565 } 2507 }
2566 } 2508 }
2567 2509
2568 am_pixmap_trans = 0; 2510 am_pixmap_trans = 0;
2569 } 2511 }
2570 else 2512 else
2571 { 2513 {
2572 if (pixmap != None) 2514 if (pixmap != None)
2573 XFreePixmap (disp, pixmap); 2515 XFreePixmap (xdisp, pixmap);
2574 2516
2575#if TINTING 2517#if TINTING
2576 if (ISSET_PIXCOLOR (Color_tint)) 2518 if (ISSET_PIXCOLOR (Color_tint))
2577 { 2519 {
2578 unsigned short rm, gm, bm;
2579 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2520 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2580 2521
2522 rgba c;
2581 pix_colors_focused[Color_tint].get (display, rm, gm, bm); 2523 pix_colors_focused [Color_tint].get (c);
2582 2524
2583 ShadeXImage (display, image, shade, rm, gm, bm); 2525 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2584 } 2526 }
2585#endif 2527#endif
2586 2528
2587 pixmap = XCreatePixmap (disp, vt, 2529 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2588 szHint.width, szHint.height, image->depth);
2589 gc = XCreateGC (disp, vt, 0UL, &gcvalue); 2530 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2590 XPutImage (disp, pixmap, gc, image, 0, 0, 2531 XPutImage (xdisp, pixmap, gc, image, 0, 0,
2591 nx, ny, image->width, image->height); 2532 nx, ny, image->width, image->height);
2592 XFreeGC (disp, gc); 2533 XFreeGC (xdisp, gc);
2593 XDestroyImage (image); 2534 XDestroyImage (image);
2594 XSetWindowBackgroundPixmap (disp, parent[0], pixmap); 2535 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2595 XClearWindow (disp, parent[0]); 2536 XClearWindow (xdisp, parent[0]);
2596 2537
2597 if (!am_transparent || !am_pixmap_trans) 2538 if (!am_transparent || !am_pixmap_trans)
2598 pchanged = 1; 2539 pchanged = 1;
2599 2540
2600 am_transparent = am_pixmap_trans = 1; 2541 am_transparent = am_pixmap_trans = 1;
2601 } 2542 }
2602 } 2543 }
2603 2544
2604 if (am_pixmap_trans) 2545 if (am_pixmap_trans)
2605 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2546 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2606 else 2547 else
2607 { 2548 {
2608 unsigned int n; 2549 unsigned int n;
2609 /* 2550 /*
2610 * InheritPixmap transparency 2551 * InheritPixmap transparency
2611 */ 2552 */
2612 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2553 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2613 { 2554 {
2614 oldp = parent[i]; 2555 oldp = parent[i];
2615 XQueryTree (disp, parent[i - 1], &root, 2556 XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n);
2616 &parent[i], &list, &n);
2617 XFree (list); 2557 XFree (list);
2618 2558
2619 if (parent[i] == display->root) 2559 if (parent[i] == display->root)
2620 { 2560 {
2621 if (oldp != None) 2561 if (oldp != None)
… …
2629 } 2569 }
2630 2570
2631 n = 0; 2571 n = 0;
2632 2572
2633 if (pchanged) 2573 if (pchanged)
2634 {
2635 for (; n < (unsigned int)i; n++) 2574 for (; n < (unsigned int)i; n++)
2636 { 2575 {
2637 XGetWindowAttributes (disp, parent[n], &wattr); 2576 XGetWindowAttributes (xdisp, parent[n], &wattr);
2577
2638 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2578 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2639 { 2579 {
2640 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2580 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2641 break; 2581 break;
2642 } 2582 }
2643 } 2583 }
2644 }
2645 2584
2646 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2585 if (n > (sizeof (parent) / sizeof (parent[0])))
2647 { 2586 {
2648 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]); 2587 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2649 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2588 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2650 am_transparent = 0; 2589 am_transparent = 0;
2651 /* XXX: also turn off Opt_transparent? */ 2590 /* XXX: also turn off Opt_transparent? */
2652 } 2591 }
2653 else 2592 else
2654 { 2593 {
2655#if WAIT_FOR_WM
2656 /* wait (an arbitrary period) for the WM to do its thing
2657 * needed for fvwm2.2.2 (and before?) */
2658 sleep (1);
2659#endif
2660 for (n = 0; n < (unsigned int)i; n++) 2594 for (n = 0; n < (unsigned int)i; n++)
2661 { 2595 {
2662 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); 2596 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2663 XClearWindow (disp, parent[n]); 2597 XClearWindow (xdisp, parent[n]);
2664 } 2598 }
2665 2599
2666 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2600 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2667 am_transparent = 1; 2601 am_transparent = 1;
2668 } 2602 }
2669 2603
2670 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2604 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2671 parent[i] = None; 2605 parent[i] = None;
2672 } 2606 }
2673 2607
2674 if (scrollBar.win) 2608 if (scrollBar.win)
2675 { 2609 {
2676 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2610 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2677 scrollBar.setIdle (); 2611 scrollBar.setIdle ();
2678 scrollbar_show (0); 2612 scrollbar_show (0);
2679 } 2613 }
2680 2614
2681 if (am_transparent) 2615 if (am_transparent)
… …
2827 return flag; 2761 return flag;
2828} 2762}
2829 2763
2830// read the next character 2764// read the next character
2831wchar_t 2765wchar_t
2832rxvt_term::next_char () 2766rxvt_term::next_char () NOTHROW
2833{ 2767{
2834 while (cmdbuf_ptr < cmdbuf_endp) 2768 while (cmdbuf_ptr < cmdbuf_endp)
2835 { 2769 {
2836 // assume 7-bit to be ascii ALWAYS 2770 // assume 7-bit to be ascii ALWAYS
2837 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2771 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
… …
2858 return NOCHAR; 2792 return NOCHAR;
2859} 2793}
2860 2794
2861// read the next octet 2795// read the next octet
2862uint32_t 2796uint32_t
2863rxvt_term::next_octet () 2797rxvt_term::next_octet () NOTHROW
2864{ 2798{
2865 return cmdbuf_ptr < cmdbuf_endp 2799 return cmdbuf_ptr < cmdbuf_endp
2866 ? (unsigned char)*cmdbuf_ptr++ 2800 ? (unsigned char)*cmdbuf_ptr++
2867 : NOCHAR; 2801 : NOCHAR;
2868} 2802}
2803
2804static class out_of_input out_of_input;
2869 2805
2870/* rxvt_cmd_getc () - Return next input character */ 2806/* rxvt_cmd_getc () - Return next input character */
2871/* 2807/*
2872 * Return the next input character after first passing any keyboard input 2808 * Return the next input character after first passing any keyboard input
2873 * to the command. 2809 * to the command.
2874 */ 2810 */
2875wchar_t 2811wchar_t
2876rxvt_term::cmd_getc () 2812rxvt_term::cmd_getc () THROW ((class out_of_input))
2877{ 2813{
2878 wchar_t c = next_char (); 2814 wchar_t c = next_char ();
2879 2815
2880 if (c == NOCHAR) 2816 if (c == NOCHAR)
2881 throw out_of_input; 2817 throw out_of_input;
2882 2818
2883 return c; 2819 return c;
2884} 2820}
2885 2821
2886uint32_t 2822uint32_t
2887rxvt_term::cmd_get8 () 2823rxvt_term::cmd_get8 () THROW ((class out_of_input))
2888{ 2824{
2889 uint32_t c = next_octet (); 2825 uint32_t c = next_octet ();
2890 2826
2891 if (c == NOCHAR) 2827 if (c == NOCHAR)
2892 throw out_of_input; 2828 throw out_of_input;
… …
3130 scr_charset_set (2, (unsigned int)cmd_getc ()); 3066 scr_charset_set (2, (unsigned int)cmd_getc ());
3131 break; 3067 break;
3132 case '+': 3068 case '+':
3133 scr_charset_set (3, (unsigned int)cmd_getc ()); 3069 scr_charset_set (3, (unsigned int)cmd_getc ());
3134 break; 3070 break;
3135#if ENABLE_FRILLS 3071#if !ENABLE_MINIMAL
3136 case '6': 3072 case '6':
3137 scr_backindex (); 3073 scr_backindex ();
3138 break; 3074 break;
3139#endif 3075#endif
3140 case '7': 3076 case '7':
3141 scr_cursor (SAVE); 3077 scr_cursor (SAVE);
3142 break; 3078 break;
3143 case '8': 3079 case '8':
3144 scr_cursor (RESTORE); 3080 scr_cursor (RESTORE);
3145 break; 3081 break;
3146#if ENABLE_FRILLS 3082#if !ENABLE_MINIMAL
3147 case '9': 3083 case '9':
3148 scr_forwardindex (); 3084 scr_forwardindex ();
3149 break; 3085 break;
3150#endif 3086#endif
3151 case '=': 3087 case '=':
… …
3313 ndef = get_byte_array_bit (csi_defaults, i); 3249 ndef = get_byte_array_bit (csi_defaults, i);
3314 for (p = 0; p < nargs; p++) 3250 for (p = 0; p < nargs; p++)
3315 if (arg[p] == -1) 3251 if (arg[p] == -1)
3316 arg[p] = ndef; 3252 arg[p] = ndef;
3317 3253
3318#ifdef DEBUG_CMD
3319 fprintf (stderr, "CSI ");
3320 for (p = 0; p < nargs; p++)
3321 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3322 fprintf (stderr, "%c\n", ch);
3323#endif
3324
3325 /* 3254 /*
3326 * private mode handling 3255 * private mode handling
3327 */ 3256 */
3328 if (priv) 3257 if (priv)
3329 { 3258 {
3330 switch (priv) 3259 switch (priv)
3331 { 3260 {
3332 case '>': 3261 case '>':
3333 if (ch == CSI_DA) /* secondary device attributes */ 3262 if (ch == CSI_DA) /* secondary device attributes */
3334 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 3263 {
3264 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3265 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3266 //
3267 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3268 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3269 // that we do not support xterm mouse reporting (should be 95 when we do).
3270 //
3271 tt_printf ("\033[>%d;94;0c", 'U');
3272 }
3335 break; 3273 break;
3336 case '?': 3274 case '?':
3337 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3275 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3338 process_terminal_mode (ch, priv, nargs, arg); 3276 process_terminal_mode (ch, priv, nargs, arg);
3339 break; 3277 break;
… …
3542 break; 3480 break;
3543 case CSI_75: 3481 case CSI_75:
3544 scr_cursor (RESTORE); 3482 scr_cursor (RESTORE);
3545 break; 3483 break;
3546 3484
3547#if ENABLE_FRILLS 3485#if !ENABLE_MINIMAL
3548 case CSI_74: 3486 case CSI_74:
3549 process_window_ops (arg, nargs); 3487 process_window_ops (arg, nargs);
3550 break; 3488 break;
3551#endif 3489#endif
3552 3490
… …
3559 break; 3497 break;
3560 } 3498 }
3561} 3499}
3562/*}}} */ 3500/*}}} */
3563 3501
3564#if ENABLE_FRILLS 3502#if !ENABLE_MINIMAL
3565/* ARGSUSED */ 3503/* ARGSUSED */
3566void 3504void
3567rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3505rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3568{ 3506{
3569 int x, y; 3507 int x, y;
3570 XWindowAttributes wattr; 3508 XWindowAttributes wattr;
3571 Window wdummy; 3509 Window wdummy;
3572 dDisp; 3510
3511 dLocal (Display *, xdisp);
3573 3512
3574 if (nargs == 0) 3513 if (nargs == 0)
3575 return; 3514 return;
3576 3515
3577 switch (args[0]) 3516 switch (args[0])
3578 { 3517 {
3579 /* 3518 /*
3580 * commands 3519 * commands
3581 */ 3520 */
3582 case 1: /* deiconify window */ 3521 case 1: /* deiconify window */
3583 XMapWindow (disp, parent[0]); 3522 XMapWindow (xdisp, parent[0]);
3584 break; 3523 break;
3585 case 2: /* iconify window */ 3524 case 2: /* iconify window */
3586 XIconifyWindow (disp, parent[0], display->screen); 3525 XIconifyWindow (xdisp, parent[0], display->screen);
3587 break; 3526 break;
3588 case 3: /* set position (pixels) */ 3527 case 3: /* set position (pixels) */
3589 XMoveWindow (disp, parent[0], args[1], args[2]); 3528 XMoveWindow (xdisp, parent[0], args[1], args[2]);
3590 break; 3529 break;
3591 case 4: /* set size (pixels) */ 3530 case 4: /* set size (pixels) */
3592 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3531 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3593 break; 3532 break;
3594 case 5: /* raise window */ 3533 case 5: /* raise window */
3595 XRaiseWindow (disp, parent[0]); 3534 XRaiseWindow (xdisp, parent[0]);
3596 break; 3535 break;
3597 case 6: /* lower window */ 3536 case 6: /* lower window */
3598 XLowerWindow (disp, parent[0]); 3537 XLowerWindow (xdisp, parent[0]);
3599 break; 3538 break;
3600 case 7: /* refresh window */ 3539 case 7: /* refresh window */
3601 scr_touch (true); 3540 scr_touch (true);
3602 break; 3541 break;
3603 case 8: /* set size (chars) */ 3542 case 8: /* set size (chars) */
… …
3610 if (args[0] >= 24) /* set height (chars) */ 3549 if (args[0] >= 24) /* set height (chars) */
3611 set_widthheight ((unsigned int)width, 3550 set_widthheight ((unsigned int)width,
3612 (unsigned int) (args[1] * fheight)); 3551 (unsigned int) (args[1] * fheight));
3613 break; 3552 break;
3614 3553
3615
3616 /* 3554 /*
3617 * reports - some output format copied from XTerm 3555 * reports - some output format copied from XTerm
3618 */ 3556 */
3619 case 11: /* report window state */ 3557 case 11: /* report window state */
3620 XGetWindowAttributes (disp, parent[0], &wattr); 3558 XGetWindowAttributes (xdisp, parent[0], &wattr);
3621 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3559 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3622 break; 3560 break;
3623 case 13: /* report window position */ 3561 case 13: /* report window position */
3624 XGetWindowAttributes (disp, parent[0], &wattr); 3562 XGetWindowAttributes (xdisp, parent[0], &wattr);
3625 XTranslateCoordinates (disp, parent[0], wattr.root, 3563 XTranslateCoordinates (xdisp, parent[0], wattr.root,
3626 -wattr.border_width, -wattr.border_width, 3564 -wattr.border_width, -wattr.border_width,
3627 &x, &y, &wdummy); 3565 &x, &y, &wdummy);
3628 tt_printf ("\033[3;%d;%dt", x, y); 3566 tt_printf ("\033[3;%d;%dt", x, y);
3629 break; 3567 break;
3630 case 14: /* report window size (pixels) */ 3568 case 14: /* report window size (pixels) */
3631 XGetWindowAttributes (disp, parent[0], &wattr); 3569 XGetWindowAttributes (xdisp, parent[0], &wattr);
3632 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3570 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3633 break; 3571 break;
3634 case 18: /* report text area size (chars) */ 3572 case 18: /* report text area size (chars) */
3635 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3573 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3636 break; 3574 break;
… …
3638 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3576 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3639 break; 3577 break;
3640 case 20: /* report icon label */ 3578 case 20: /* report icon label */
3641 { 3579 {
3642 char *s; 3580 char *s;
3643 XGetIconName (disp, parent[0], &s); 3581 XGetIconName (xdisp, parent[0], &s);
3644 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3582 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3645 XFree (s); 3583 XFree (s);
3646 } 3584 }
3647 break; 3585 break;
3648 case 21: /* report window title */ 3586 case 21: /* report window title */
3649 { 3587 {
3650 char *s; 3588 char *s;
3651 XFetchName (disp, parent[0], &s); 3589 XFetchName (xdisp, parent[0], &s);
3652 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3590 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3653 XFree (s); 3591 XFree (s);
3654 } 3592 }
3655 break; 3593 break;
3656 } 3594 }
… …
3757void 3695void
3758rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3696rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3759{ 3697{
3760 if (str[0] == '?' && !str[1]) 3698 if (str[0] == '?' && !str[1])
3761 { 3699 {
3762 unsigned short r, g, b; 3700 rgba c;
3763 pix_colors_focused[color].get (display, r, g, b); 3701 pix_colors_focused[color].get (c);
3702
3703#if XFT
3704 if (c.a != rgba::MAX_CC)
3705 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3706 else
3707#endif
3764 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3708 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3765 } 3709 }
3766 else 3710 else
3767 set_window_color (color, str); 3711 set_window_color (color, str);
3768} 3712}
3769 3713
… …
3775{ 3719{
3776 int color; 3720 int color;
3777 char *buf, *name; 3721 char *buf, *name;
3778 bool query = str[0] == '?' && !str[1]; 3722 bool query = str[0] == '?' && !str[1];
3779 int saveop = op; 3723 int saveop = op;
3780 dDisp; 3724
3725 dLocal (Display *, xdisp);
3781 3726
3782 assert (str != NULL); 3727 assert (str != NULL);
3783 switch (op) 3728 switch (op)
3784 { 3729 {
3785 case XTerm_name: 3730 case XTerm_name:
… …
3801 unsigned long bytes_after; 3746 unsigned long bytes_after;
3802 unsigned char *value = 0; 3747 unsigned char *value = 0;
3803 const char *str = ""; 3748 const char *str = "";
3804 3749
3805 if (prop 3750 if (prop
3806 && XGetWindowProperty (disp, parent[0], 3751 && XGetWindowProperty (xdisp, parent[0],
3807 prop, 0, 1<<16, 0, AnyPropertyType, 3752 prop, 0, 1<<16, 0, AnyPropertyType,
3808 &actual_type, &actual_format, 3753 &actual_type, &actual_format,
3809 &nitems, &bytes_after, &value) == Success 3754 &nitems, &bytes_after, &value) == Success
3810 && actual_type != None 3755 && actual_type != None
3811 && actual_format == 8) 3756 && actual_format == 8)
3812 str = (const char *)(value); 3757 str = (const char *)(value);
3813 3758
3814 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3759 tt_printf ("\033]%d;%s%c", op, str, resp);
3815 3760
3816 XFree (value); 3761 XFree (value);
3817 } 3762 }
3818 else 3763 else
3819 { 3764 {
… …
3823 { 3768 {
3824 *eq = 0; 3769 *eq = 0;
3825 set_utf8_property (display->atom (str), eq + 1); 3770 set_utf8_property (display->atom (str), eq + 1);
3826 } 3771 }
3827 else 3772 else
3828 XDeleteProperty (disp, parent[0], 3773 XDeleteProperty (xdisp, parent[0],
3829 display->atom (str)); 3774 display->atom (str));
3830 } 3775 }
3831 break; 3776 break;
3832 3777
3833 case XTerm_Color: 3778 case XTerm_Color:
… …
3843 break; 3788 break;
3844 3789
3845 if ((buf = strchr (name, ';')) != NULL) 3790 if ((buf = strchr (name, ';')) != NULL)
3846 *buf++ = '\0'; 3791 *buf++ = '\0';
3847 3792
3848 if (name[0] == '?' && !name[1]) 3793 process_color_seq (op, color, name, resp);
3849 {
3850 unsigned short r, g, b;
3851 pix_colors_focused[color].get (display, r, g, b);
3852 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3853 }
3854 else
3855 set_window_color (color, name);
3856 } 3794 }
3857 break; 3795 break;
3858 case XTerm_Color00: 3796 case XTerm_Color00:
3859 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3797 process_color_seq (op, Color_fg, str, resp);
3860 break; 3798 break;
3861 case XTerm_Color01: 3799 case XTerm_Color01:
3862 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3800 process_color_seq (op, Color_bg, str, resp);
3863 break; 3801 break;
3864#ifndef NO_CURSORCOLOR 3802#ifndef NO_CURSORCOLOR
3865 case XTerm_Color_cursor: 3803 case XTerm_Color_cursor:
3866 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3804 process_color_seq (op, Color_cursor, str, resp);
3867 break; 3805 break;
3868#endif 3806#endif
3869 case XTerm_Color_pointer_fg: 3807 case XTerm_Color_pointer_fg:
3870 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3808 process_color_seq (op, Color_pointer_fg, str, resp);
3871 break; 3809 break;
3872 case XTerm_Color_pointer_bg: 3810 case XTerm_Color_pointer_bg:
3873 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3811 process_color_seq (op, Color_pointer_bg, str, resp);
3874 break; 3812 break;
3875#ifndef NO_BOLD_UNDERLINE_REVERSE 3813#ifndef NO_BOLD_UNDERLINE_REVERSE
3876 case XTerm_Color_RV: 3814 case XTerm_Color_RV:
3877 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3815 process_color_seq (op, Color_RV, str, resp);
3878 break; 3816 break;
3879 case Rxvt_Color_BD: 3817 case Rxvt_Color_BD:
3880 case URxvt_Color_BD: 3818 case URxvt_Color_BD:
3881 process_color_seq (op, Color_BD, str, resp); 3819 process_color_seq (op, Color_BD, str, resp);
3882 break; 3820 break;
3883 case Rxvt_Color_UL: 3821 case Rxvt_Color_UL:
3884 case URxvt_Color_UL: 3822 case URxvt_Color_UL:
3885 process_color_seq (op, Color_UL, str, resp); 3823 process_color_seq (op, Color_UL, str, resp);
3886 break; 3824 break;
3887 case URxvt_Color_IT: 3825 case URxvt_Color_IT:
3888 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3826 process_color_seq (op, Color_IT, str, resp);
3889 break; 3827 break;
3890#endif 3828#endif
3891#if TRANSPARENT && TINTING 3829#if TRANSPARENT && TINTING
3892 case URxvt_Color_tint: 3830 case URxvt_Color_tint:
3893 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3831 process_color_seq (op, Color_tint, str, resp);
3832
3894 check_our_parents (); 3833 check_our_parents ();
3834
3895 if (am_transparent) 3835 if (am_transparent)
3896 want_full_refresh = want_refresh = 1; 3836 want_full_refresh = want_refresh = 1;
3837
3897 break; 3838 break;
3898#endif 3839#endif
3899 3840
3900 case Rxvt_Pixmap: 3841 case Rxvt_Pixmap:
3901 { 3842 {
… …
3972 allocated.push_back ((void *)res); 3913 allocated.push_back ((void *)res);
3973 set_fonts (); 3914 set_fonts ();
3974 } 3915 }
3975 break; 3916 break;
3976 3917
3977#if ENABLE_FRILLS 3918 case URxvt_version:
3919 if (query)
3920 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3921 op,
3922 rs[Rs_name], VERSION[0], VERSION[2],
3923 resp);
3924 break;
3925
3926#if !ENABLE_MINIMAL
3978 case URxvt_locale: 3927 case URxvt_locale:
3979 if (query) 3928 if (query)
3980 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3929 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
3981 else 3930 else
3982 { 3931 {
3983 set_locale (str); 3932 set_locale (str);
3984 pty->set_utf8_mode (enc_utf8); 3933 pty->set_utf8_mode (enc_utf8);
3985 init_xlocale (); 3934 init_xlocale ();
… …
4042 return state; 3991 return state;
4043} 3992}
4044 3993
4045/* we're not using priv _yet_ */ 3994/* we're not using priv _yet_ */
4046void 3995void
4047rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3996rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4048{ 3997{
4049 unsigned int i, j; 3998 unsigned int i, j;
4050 int state; 3999 int state;
4051 4000
4052 static const struct 4001 static const struct
… …
4346 scr_color (Color_bg, Color_bg); 4295 scr_color (Color_bg, Color_bg);
4347 break; 4296 break;
4348 4297
4349 //case 50: // not variable spacing 4298 //case 50: // not variable spacing
4350 4299
4351#if ENABLE_FRILLS 4300#if !ENABLE_MINIMAL
4352 case 90: 4301 case 90:
4353 case 91: /* set bright fg color */ 4302 case 91: /* set bright fg color */
4354 case 92: 4303 case 92:
4355 case 93: 4304 case 93:
4356 case 94: 4305 case 94:

Diff Legend

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