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.274 by root, Fri Jan 20 10:27:08 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>
… …
227# if !UNICODE3 222# if !UNICODE3
228 if (ch >= 0x10000) 223 if (ch >= 0x10000)
229 ch = 0xfffd; 224 ch = 0xfffd;
230# endif 225# endif
231 scr_overlay_set (11, y, ch, r); 226 scr_overlay_set (11, y, ch, r);
227
228 if (WCWIDTH (ch) >= 2)
232 scr_overlay_set (12, y, NOCHAR, r); 229 scr_overlay_set (12, y, NOCHAR, r);
233 } 230 }
234 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// }
235 scr_overlay_set (0, len , attr); 237 scr_overlay_set (0, len , attr);
236 scr_overlay_set (0, len + 1, fname); 238 scr_overlay_set (0, len + 1, fname);
237 239
238 free (fname); 240 free (fname);
239 241
… …
299rxvt_term::lookup_key (XKeyEvent &ev) 301rxvt_term::lookup_key (XKeyEvent &ev)
300{ 302{
301 int ctrl, meta, shft, len; 303 int ctrl, meta, shft, len;
302 unsigned int newlen; 304 unsigned int newlen;
303 KeySym keysym; 305 KeySym keysym;
304#ifdef DEBUG_CMD
305 static int debug_key = 1; /* accessible by a debugger only */
306#endif
307 int valid_keysym; 306 int valid_keysym;
308 char kbuf[KBUFSZ]; 307 char kbuf[KBUFSZ];
309 308
310 /* 309 /*
311 * 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
… …
461 { 460 {
462 switch (keysym) 461 switch (keysym)
463 { 462 {
464 /* normal XTerm key bindings */ 463 /* normal XTerm key bindings */
465 case XK_Insert: /* Shift+Insert = paste mouse selection */ 464 case XK_Insert: /* Shift+Insert = paste mouse selection */
466 selection_request (ev.time, Sel_Primary); 465 selection_request (ev.time);
467 return; 466 return;
468#if TODO 467#if TODO
469 /* rxvt extras */ 468 /* rxvt extras */
470 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 469 case XK_KP_Add: /* Shift+KP_Add = bigger font */
471 change_font (FONT_UP); 470 change_font (FONT_UP);
… …
902 { 901 {
903 const char ch = C0_ESC; 902 const char ch = C0_ESC;
904 tt_write (&ch, 1); 903 tt_write (&ch, 1);
905 } 904 }
906 905
907#if defined(DEBUG_CMD)
908 /* Display keyboard buffer contents */
909 unsigned char *p;
910 int i;
911
912 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
913 for (i = 0, p = kbuf; i < len; i++, p++)
914 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
915 fprintf (stderr, "'\n");
916#endif /* DEBUG_CMD */
917 tt_write (kbuf, (unsigned int)len); 906 tt_write (kbuf, (unsigned int)len);
918} 907}
919/*}}} */ 908/*}}} */
920 909
921#if defined (KEYSYM_RESOURCE) 910#if defined (KEYSYM_RESOURCE)
… …
1101 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1090 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1102 } 1091 }
1103} 1092}
1104#endif 1093#endif
1105 1094
1106#if HAVE_SCHED_YIELD
1107static struct event_handler
1108{
1109 check_watcher cw_yield;
1110
1111 void yield (check_watcher &w)
1112 {
1113 sched_yield ();
1114 w.stop ();
1115 }
1116
1117 event_handler ()
1118 : cw_yield (this, &event_handler::yield)
1119 {
1120 }
1121} event_handler;
1122#endif
1123
1124bool 1095bool
1125rxvt_term::pty_fill () 1096rxvt_term::pty_fill ()
1126{ 1097{
1127 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1098 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1128 1099
… …
1177} 1148}
1178 1149
1179void 1150void
1180rxvt_term::pointer_unblank () 1151rxvt_term::pointer_unblank ()
1181{ 1152{
1182 XDefineCursor (display->display, vt, TermWin_cursor); 1153 XDefineCursor (xdisp, vt, TermWin_cursor);
1183 recolour_cursor (); 1154 recolour_cursor ();
1184 1155
1185#ifdef POINTER_BLANK 1156#ifdef POINTER_BLANK
1186 hidden_pointer = 0; 1157 hidden_pointer = 0;
1187 1158
… …
1195rxvt_term::pointer_blank () 1166rxvt_term::pointer_blank ()
1196{ 1167{
1197 if (!OPTION (Opt_pointerBlank)) 1168 if (!OPTION (Opt_pointerBlank))
1198 return; 1169 return;
1199 1170
1200 XDefineCursor (display->display, vt, display->blank_cursor); 1171 XDefineCursor (xdisp, vt, display->blank_cursor);
1201 XFlush (display->display); 1172 XFlush (xdisp);
1202 1173
1203 hidden_pointer = 1; 1174 hidden_pointer = 1;
1204} 1175}
1205 1176
1206void 1177void
… …
1279 (32 + button_number + key_state), 1250 (32 + button_number + key_state),
1280 (32 + x + 1), 1251 (32 + x + 1),
1281 (32 + y + 1)); 1252 (32 + y + 1));
1282} 1253}
1283 1254
1284#ifdef USING_W11LIB
1285void
1286rxvt_W11_process_x_event (XEvent *ev)
1287{
1288 rxvt_t *r = rxvt_get_r ();
1289
1290 x_cb (*ev);
1291}
1292#endif
1293
1294/*{{{ process an X event */ 1255/*{{{ process an X event */
1295void 1256void
1296rxvt_term::x_cb (XEvent &ev) 1257rxvt_term::x_cb (XEvent &ev)
1297{ 1258{
1298 make_current (); 1259 make_current ();
1299 1260
1300 dDisp; 1261 dLocal (Display *, xdisp);
1301 1262
1302 if (ev.xany.window == vt 1263 if (ev.xany.window == vt
1303 && SHOULD_INVOKE (HOOK_X_EVENT) 1264 && SHOULD_INVOKE (HOOK_X_EVENT)
1304 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1265 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1305 return; 1266 return;
… …
1402 button_release (ev.xbutton); 1363 button_release (ev.xbutton);
1403 break; 1364 break;
1404 1365
1405 case ClientMessage: 1366 case ClientMessage:
1406 if (ev.xclient.format == 32 1367 if (ev.xclient.format == 32
1407 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1368 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1408 { 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 {
1409 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)))
1410 destroy (); 1377 destroy ();
1378 }
1411#if ENABLE_EWMH 1379#if ENABLE_EWMH
1412 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])
1413 XSendEvent (disp, ev.xclient.window = display->root, 1381 XSendEvent (xdisp, ev.xclient.window = display->root,
1414 False, SubstructureRedirectMask | SubstructureNotifyMask, 1382 False, SubstructureRedirectMask | SubstructureNotifyMask,
1415 &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 }
1416#endif 1395#endif
1417 } 1396 }
1418#if ENABLE_XEMBED
1419 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1420 {
1421 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1422 focus_in ();
1423 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1424 focus_out ();
1425 }
1426#endif
1427#ifdef OFFIX_DND
1428 /* OffiX Dnd (drag 'n' drop) protocol */
1429 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1430 && (ev.xclient.data.l[0] == DndFile
1431 || ev.xclient.data.l[0] == DndDir
1432 || ev.xclient.data.l[0] == DndLink))
1433 {
1434 /* Get Dnd data */
1435 Atom ActualType;
1436 int ActualFormat;
1437 unsigned char *data;
1438 unsigned long Size, RemainingBytes;
1439
1440 XGetWindowProperty (disp, display->root,
1441 xa[XA_DNDSELECTION],
1442 0L, 1000000L,
1443 False, AnyPropertyType,
1444 &ActualType, &ActualFormat,
1445 &Size, &RemainingBytes,
1446 &data);
1447 set_string_property (XA_CUT_BUFFER0, data);
1448 XFree (data);
1449 selection_paste (display->root, XA_CUT_BUFFER0, true);
1450 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1451 }
1452#endif /* OFFIX_DND */
1453 break; 1397 break;
1454 1398
1455 case MappingNotify: 1399 case MappingNotify:
1456 XRefreshKeyboardMapping (&ev.xmapping); 1400 XRefreshKeyboardMapping (&ev.xmapping);
1457 break; 1401 break;
… …
1490 break; 1434 break;
1491 1435
1492 case ConfigureNotify: 1436 case ConfigureNotify:
1493 if (ev.xconfigure.window == parent[0]) 1437 if (ev.xconfigure.window == parent[0])
1494 { 1438 {
1495 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1439 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev))
1496 ; 1440 ;
1497 1441
1498 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1442 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1499 { 1443 {
1500 seen_resize = 1; 1444 seen_resize = 1;
… …
1509#endif 1453#endif
1510 } 1454 }
1511 break; 1455 break;
1512 1456
1513 case PropertyNotify: 1457 case PropertyNotify:
1458 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1514 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1459 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1515 && ev.xproperty.state == PropertyNewValue) 1460 && ev.xproperty.state == PropertyNewValue)
1516 selection_property (ev.xproperty.window, ev.xproperty.atom); 1461 selection_property (ev.xproperty.window, ev.xproperty.atom);
1517 1462
1518 break; 1463 break;
1519 1464
1520 case SelectionClear: 1465 case SelectionClear:
1521 selection_clear (); 1466 selection_clear ();
… …
1557 if (ev.xany.window == vt) 1502 if (ev.xany.window == vt)
1558 { 1503 {
1559 do 1504 do
1560 scr_expose (ev.xexpose.x, ev.xexpose.y, 1505 scr_expose (ev.xexpose.x, ev.xexpose.y,
1561 ev.xexpose.width, ev.xexpose.height, False); 1506 ev.xexpose.width, ev.xexpose.height, False);
1562 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1507 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev));
1563 1508
1564 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1509 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1565 1510
1566 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1511 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev))
1567 scr_expose (ev.xexpose.x, ev.xexpose.y, 1512 scr_expose (ev.xexpose.x, ev.xexpose.y,
1568 ev.xexpose.width, ev.xexpose.height, False); 1513 ev.xexpose.width, ev.xexpose.height, False);
1569 1514
1570 want_refresh = 1; 1515 want_refresh = 1;
1571 } 1516 }
1572 else 1517 else
1573 { 1518 {
1574 XEvent unused_event; 1519 XEvent unused_event;
1575 1520
1576 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1521 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event))
1577 ; 1522 ;
1578 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1523 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event))
1579 ; 1524 ;
1580 1525
1581 if (isScrollbarWindow (ev.xany.window)) 1526 if (isScrollbarWindow (ev.xany.window))
1582 { 1527 {
1583 scrollBar.setIdle (); 1528 scrollBar.setIdle ();
1584 scrollbar_show (0); 1529 scrollbar_show (0);
1585 } 1530 }
1586 1531
1587#ifdef TRANSPARENT 1532#ifdef TRANSPARENT
1588 if (am_transparent && ev.xany.window == parent[0]) 1533 if (am_transparent && ev.xany.window == parent[0])
1589 XClearWindow (disp, ev.xany.window); 1534 XClearWindow (xdisp, ev.xany.window);
1590#endif 1535#endif
1591 } 1536 }
1592 break; 1537 break;
1593 1538
1594 case MotionNotify: 1539 case MotionNotify:
… …
1604 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1549 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1605 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1550 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1606 ; // nop 1551 ; // nop
1607 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1552 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1608 { 1553 {
1609 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1554 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev))
1610 ; 1555 ;
1611 1556
1612 XQueryPointer (disp, vt, 1557 XQueryPointer (xdisp, vt,
1613 &unused_root, &unused_child, 1558 &unused_root, &unused_child,
1614 &unused_root_x, &unused_root_y, 1559 &unused_root_x, &unused_root_y,
1615 &ev.xbutton.x, &ev.xbutton.y, 1560 &ev.xbutton.x, &ev.xbutton.y,
1616 &ev.xbutton.state); 1561 &ev.xbutton.state);
1617#ifdef MOUSE_THRESHOLD 1562#ifdef MOUSE_THRESHOLD
… …
1681#endif 1626#endif
1682 } 1627 }
1683 } 1628 }
1684 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1629 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1685 { 1630 {
1686 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1631 while (XCheckTypedWindowEvent (xdisp, scrollBar.win,
1687 MotionNotify, &ev)) 1632 MotionNotify, &ev))
1688 ; 1633 ;
1689 1634
1690 XQueryPointer (disp, scrollBar.win, 1635 XQueryPointer (xdisp, scrollBar.win,
1691 &unused_root, &unused_child, 1636 &unused_root, &unused_child,
1692 &unused_root_x, &unused_root_y, 1637 &unused_root_x, &unused_root_y,
1693 &ev.xbutton.x, &ev.xbutton.y, 1638 &ev.xbutton.x, &ev.xbutton.y,
1694 &unused_mask); 1639 &unused_mask);
1695 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1640 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
… …
1839 /* 1784 /*
1840 * VT window processing of button press 1785 * VT window processing of button press
1841 */ 1786 */
1842 if (ev.window == vt) 1787 if (ev.window == vt)
1843 { 1788 {
1789 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1790 return;
1791
1844#if ISO_14755 1792#if ISO_14755
1845 // 5.4 1793 // 5.4
1846 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1794 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1847 { 1795 {
1848 iso14755_54 (ev.x, ev.y); 1796 iso14755_54 (ev.x, ev.y);
… …
1890 else 1838 else
1891 { 1839 {
1892 if (ev.button != MEvent.button) 1840 if (ev.button != MEvent.button)
1893 MEvent.clicks = 0; 1841 MEvent.clicks = 0;
1894 1842
1895 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1896 switch (ev.button) 1843 switch (ev.button)
1897 { 1844 {
1898 case Button1: 1845 case Button1:
1899 /* allow meta + click to select rectangular areas */ 1846 /* allow meta + click to select rectangular areas */
1900 /* should be done in screen.C */ 1847 /* should be done in screen.C */
1901#if ENABLE_FRILLS 1848#if ENABLE_FRILLS
1902 selection.rect = !!(ev.state & ModMetaMask); 1849 selection.rect = !!(ev.state & ModMetaMask);
1903#else 1850#else
1904 selection.rect = false; 1851 selection.rect = false;
1905#endif 1852#endif
1906 1853
1907 /* allow shift+left click to extend selection */ 1854 /* allow shift+left click to extend selection */
1908 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) 1855 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1909 { 1856 {
1910 if (MEvent.button == Button1 && clickintime) 1857 if (MEvent.button == Button1 && clickintime)
1911 selection_rotate (ev.x, ev.y); 1858 selection_rotate (ev.x, ev.y);
1912 else 1859 else
1913 selection_extend (ev.x, ev.y, 1); 1860 selection_extend (ev.x, ev.y, 1);
1914 } 1861 }
1915 else 1862 else
1916 { 1863 {
1917 if (MEvent.button == Button1 && clickintime) 1864 if (MEvent.button == Button1 && clickintime)
1918 MEvent.clicks++; 1865 MEvent.clicks++;
1919 else 1866 else
1920 MEvent.clicks = 1; 1867 MEvent.clicks = 1;
1921 1868
1922 selection_click (MEvent.clicks, ev.x, ev.y); 1869 selection_click (MEvent.clicks, ev.x, ev.y);
1923 } 1870 }
1924 1871
1925 MEvent.button = Button1; 1872 MEvent.button = Button1;
1926 break; 1873 break;
1927 1874
1928 case Button3: 1875 case Button3:
1929 if (MEvent.button == Button3 && clickintime) 1876 if (MEvent.button == Button3 && clickintime)
1930 selection_rotate (ev.x, ev.y); 1877 selection_rotate (ev.x, ev.y);
1931 else 1878 else
1932 selection_extend (ev.x, ev.y, 1); 1879 selection_extend (ev.x, ev.y, 1);
1933 1880
1934 MEvent.button = Button3; 1881 MEvent.button = Button3;
1935 break; 1882 break;
1936 } 1883 }
1937 } 1884 }
1938 1885
1939 MEvent.time = ev.time; 1886 MEvent.time = ev.time;
1940 return; 1887 return;
1941 } 1888 }
1942 1889
… …
2105 sel_scroll_ev.stop(); 2052 sel_scroll_ev.stop();
2106#endif 2053#endif
2107 2054
2108 if (ev.window == vt) 2055 if (ev.window == vt)
2109 { 2056 {
2057 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2058 return;
2059
2110#if ISO_14755 2060#if ISO_14755
2111 // 5.4 2061 // 5.4
2112 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2062 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2113 return; 2063 return;
2114#endif 2064#endif
2065
2115 if (reportmode) 2066 if (reportmode)
2116 { 2067 {
2117 /* mouse report from vt window */ 2068 /* mouse report from vt window */
2118 /* don't report release of wheel "buttons" */ 2069 /* don't report release of wheel "buttons" */
2119 if (ev.button >= 4) 2070 if (ev.button >= 4)
… …
2143 if (priv_modes & PrivMode_mouse_report 2094 if (priv_modes & PrivMode_mouse_report
2144 && bypass_keystate 2095 && bypass_keystate
2145 && ev.button == Button1 && MEvent.clicks <= 1) 2096 && ev.button == Button1 && MEvent.clicks <= 1)
2146 selection_extend (ev.x, ev.y, 0); 2097 selection_extend (ev.x, ev.y, 0);
2147 2098
2148 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2149 return;
2150
2151 switch (ev.button) 2099 switch (ev.button)
2152 { 2100 {
2153 case Button1: 2101 case Button1:
2154 case Button3: 2102 case Button3:
2155 selection_make (ev.time); 2103 selection_make (ev.time);
2156 break; 2104 break;
2157 2105
2158 case Button2: 2106 case Button2:
2159 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?
2160 && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2108 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2161 {
2162 if (ev.state & ShiftMask)
2163 selection_request (ev.time, Sel_Clipboard);
2164 else
2165 selection_request (ev.time, Sel_Primary);
2166 }
2167 break; 2109 break;
2168 2110
2169#ifdef MOUSE_WHEEL 2111#ifdef MOUSE_WHEEL
2170 case Button4: 2112 case Button4:
2171 case Button5: 2113 case Button5:
… …
2213#if TINTING 2155#if TINTING
2214/* taken from aterm-0.4.2 */ 2156/* taken from aterm-0.4.2 */
2215 2157
2216typedef uint32_t RUINT32T; 2158typedef uint32_t RUINT32T;
2217 2159
2218void 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)
2219{ 2161{
2220 int sh_r, sh_g, sh_b; 2162 int sh_r, sh_g, sh_b;
2221 RUINT32T mask_r, mask_g, mask_b; 2163 RUINT32T mask_r, mask_g, mask_b;
2222 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2164 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2223 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2165 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2224 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2166 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2225 int i; 2167 int i;
2226 2168
2227 Visual *visual = display->visual; 2169 Visual *visual = term->visual;
2228 2170
2229 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2171 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2230 2172
2231 /* for convenience */ 2173 /* for convenience */
2232 mask_r = visual->red_mask; 2174 mask_r = visual->red_mask;
… …
2453 Atom atype; 2395 Atom atype;
2454 unsigned char *prop = NULL; 2396 unsigned char *prop = NULL;
2455 Window root, oldp, *list; 2397 Window root, oldp, *list;
2456 Pixmap rootpixmap = None; 2398 Pixmap rootpixmap = None;
2457 XWindowAttributes wattr, wrootattr; 2399 XWindowAttributes wattr, wrootattr;
2458 dDisp;
2459 2400
2460 pchanged = 0; 2401 pchanged = 0;
2461 2402
2462 if (!OPTION (Opt_transparent)) 2403 if (!OPTION (Opt_transparent))
2463 return pchanged; /* Don't try any more */ 2404 return pchanged; /* Don't try any more */
2464 2405
2465 XGetWindowAttributes (disp, display->root, &wrootattr); 2406 XGetWindowAttributes (xdisp, display->root, &wrootattr);
2466 rootdepth = wrootattr.depth; 2407 rootdepth = wrootattr.depth;
2467 2408
2468 XGetWindowAttributes (disp, parent[0], &wattr); 2409 XGetWindowAttributes (xdisp, parent[0], &wattr);
2469 2410
2470 if (rootdepth != wattr.depth) 2411 if (rootdepth != wattr.depth)
2471 { 2412 {
2472 if (am_transparent) 2413 if (am_transparent)
2473 { 2414 {
2474 pchanged = 1; 2415 pchanged = 1;
2475 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2416 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2476 am_transparent = am_pixmap_trans = 0; 2417 am_transparent = am_pixmap_trans = 0;
2477 } 2418 }
2478 2419
2479 return pchanged; /* Don't try any more */ 2420 return pchanged; /* Don't try any more */
2480 } 2421 }
2481 2422
2482 /* 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. */
2483 XSync (disp, False); 2424 XSync (xdisp, False);
2484 2425
2485 /* 2426 /*
2486 * Make the frame window set by the window manager have 2427 * Make the frame window set by the window manager have
2487 * the root background. Some window managers put multiple nested frame 2428 * the root background. Some window managers put multiple nested frame
2488 * 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.
2489 */ 2430 */
2490 i = (xa[XA_XROOTPMAP_ID] 2431 i = (xa[XA_XROOTPMAP_ID]
2491 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], 2432 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2492 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2433 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2493 &nitems, &bytes_after, &prop) == Success); 2434 &nitems, &bytes_after, &prop) == Success);
2494 2435
2495 if (!i || prop == NULL) 2436 if (!i || prop == NULL)
2496 i = (xa[XA_ESETROOT_PMAP_ID] 2437 i = (xa[XA_ESETROOT_PMAP_ID]
2497 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], 2438 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2498 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2439 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2499 &nitems, &bytes_after, &prop) == Success); 2440 &nitems, &bytes_after, &prop) == Success);
2500 2441
2501 if (!i || prop == NULL 2442 if (!i || prop == NULL
2502#if TINTING 2443#if TINTING
2503 || !rs[Rs_color + Color_tint] 2444 || !ISSET_PIXCOLOR (Color_tint)
2504#endif 2445#endif
2505 ) 2446 )
2506 have_pixmap = 0; 2447 have_pixmap = 0;
2507 else 2448 else
2508 { 2449 {
… …
2521 Window cr; 2462 Window cr;
2522 XImage *image; 2463 XImage *image;
2523 GC gc; 2464 GC gc;
2524 XGCValues gcvalue; 2465 XGCValues gcvalue;
2525 2466
2526 XTranslateCoordinates (disp, parent[0], display->root, 2467 XTranslateCoordinates (xdisp, parent[0], display->root,
2527 0, 0, &sx, &sy, &cr); 2468 0, 0, &sx, &sy, &cr);
2528 nw = (unsigned int)szHint.width; 2469 nw = (unsigned int)szHint.width;
2529 nh = (unsigned int)szHint.height; 2470 nh = (unsigned int)szHint.height;
2530 nx = ny = 0; 2471 nx = ny = 0;
2531 2472
… …
2544 } 2485 }
2545 2486
2546 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2487 min_it (nw, (unsigned int) (wrootattr.width - sx));
2547 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2488 min_it (nh, (unsigned int) (wrootattr.height - sy));
2548 2489
2549 XSync (disp, False); 2490 XSync (xdisp, False);
2550 allowedxerror = -1; 2491 allowedxerror = -1;
2551 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2492 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2552 2493
2553 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2494 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2554 /* XXX: may need a delay here? */ 2495 /* XXX: may need a delay here? */
2555 allowedxerror = 0; 2496 allowedxerror = 0;
2556 2497
… …
2559 if (am_transparent && am_pixmap_trans) 2500 if (am_transparent && am_pixmap_trans)
2560 { 2501 {
2561 pchanged = 1; 2502 pchanged = 1;
2562 if (pixmap != None) 2503 if (pixmap != None)
2563 { 2504 {
2564 XFreePixmap (disp, pixmap); 2505 XFreePixmap (xdisp, pixmap);
2565 pixmap = None; 2506 pixmap = None;
2566 } 2507 }
2567 } 2508 }
2568 2509
2569 am_pixmap_trans = 0; 2510 am_pixmap_trans = 0;
2570 } 2511 }
2571 else 2512 else
2572 { 2513 {
2573 if (pixmap != None) 2514 if (pixmap != None)
2574 XFreePixmap (disp, pixmap); 2515 XFreePixmap (xdisp, pixmap);
2575 2516
2576#if TINTING 2517#if TINTING
2577 if (ISSET_PIXCOLOR (Color_tint)) 2518 if (ISSET_PIXCOLOR (Color_tint))
2578 { 2519 {
2579 unsigned short rm, gm, bm;
2580 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2520 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2581 2521
2522 rgba c;
2582 pix_colors_focused[Color_tint].get (display, rm, gm, bm); 2523 pix_colors_focused [Color_tint].get (c);
2583 2524
2584 ShadeXImage (display, image, shade, rm, gm, bm); 2525 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2585 } 2526 }
2586#endif 2527#endif
2587 2528
2588 pixmap = XCreatePixmap (disp, vt, 2529 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2589 szHint.width, szHint.height, image->depth);
2590 gc = XCreateGC (disp, vt, 0UL, &gcvalue); 2530 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2591 XPutImage (disp, pixmap, gc, image, 0, 0, 2531 XPutImage (xdisp, pixmap, gc, image, 0, 0,
2592 nx, ny, image->width, image->height); 2532 nx, ny, image->width, image->height);
2593 XFreeGC (disp, gc); 2533 XFreeGC (xdisp, gc);
2594 XDestroyImage (image); 2534 XDestroyImage (image);
2595 XSetWindowBackgroundPixmap (disp, parent[0], pixmap); 2535 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2596 XClearWindow (disp, parent[0]); 2536 XClearWindow (xdisp, parent[0]);
2597 2537
2598 if (!am_transparent || !am_pixmap_trans) 2538 if (!am_transparent || !am_pixmap_trans)
2599 pchanged = 1; 2539 pchanged = 1;
2600 2540
2601 am_transparent = am_pixmap_trans = 1; 2541 am_transparent = am_pixmap_trans = 1;
2602 } 2542 }
2603 } 2543 }
2604 2544
2605 if (am_pixmap_trans) 2545 if (am_pixmap_trans)
2606 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2546 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2607 else 2547 else
2608 { 2548 {
2609 unsigned int n; 2549 unsigned int n;
2610 /* 2550 /*
2611 * InheritPixmap transparency 2551 * InheritPixmap transparency
2612 */ 2552 */
2613 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2553 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2614 { 2554 {
2615 oldp = parent[i]; 2555 oldp = parent[i];
2616 XQueryTree (disp, parent[i - 1], &root, 2556 XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n);
2617 &parent[i], &list, &n);
2618 XFree (list); 2557 XFree (list);
2619 2558
2620 if (parent[i] == display->root) 2559 if (parent[i] == display->root)
2621 { 2560 {
2622 if (oldp != None) 2561 if (oldp != None)
… …
2630 } 2569 }
2631 2570
2632 n = 0; 2571 n = 0;
2633 2572
2634 if (pchanged) 2573 if (pchanged)
2635 {
2636 for (; n < (unsigned int)i; n++) 2574 for (; n < (unsigned int)i; n++)
2637 { 2575 {
2638 XGetWindowAttributes (disp, parent[n], &wattr); 2576 XGetWindowAttributes (xdisp, parent[n], &wattr);
2577
2639 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2578 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2640 { 2579 {
2641 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2580 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2642 break; 2581 break;
2643 } 2582 }
2644 } 2583 }
2645 }
2646 2584
2647 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2585 if (n > (sizeof (parent) / sizeof (parent[0])))
2648 { 2586 {
2649 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]); 2587 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2650 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2588 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2651 am_transparent = 0; 2589 am_transparent = 0;
2652 /* XXX: also turn off Opt_transparent? */ 2590 /* XXX: also turn off Opt_transparent? */
2653 } 2591 }
2654 else 2592 else
2655 { 2593 {
2656#if WAIT_FOR_WM
2657 /* wait (an arbitrary period) for the WM to do its thing
2658 * needed for fvwm2.2.2 (and before?) */
2659 sleep (1);
2660#endif
2661 for (n = 0; n < (unsigned int)i; n++) 2594 for (n = 0; n < (unsigned int)i; n++)
2662 { 2595 {
2663 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); 2596 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2664 XClearWindow (disp, parent[n]); 2597 XClearWindow (xdisp, parent[n]);
2665 } 2598 }
2666 2599
2667 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2600 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2668 am_transparent = 1; 2601 am_transparent = 1;
2669 } 2602 }
2670 2603
2671 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2604 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2672 parent[i] = None; 2605 parent[i] = None;
2673 } 2606 }
2674 2607
2675 if (scrollBar.win) 2608 if (scrollBar.win)
2676 { 2609 {
2677 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2610 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2678 scrollBar.setIdle (); 2611 scrollBar.setIdle ();
2679 scrollbar_show (0); 2612 scrollbar_show (0);
2680 } 2613 }
2681 2614
2682 if (am_transparent) 2615 if (am_transparent)
… …
3133 scr_charset_set (2, (unsigned int)cmd_getc ()); 3066 scr_charset_set (2, (unsigned int)cmd_getc ());
3134 break; 3067 break;
3135 case '+': 3068 case '+':
3136 scr_charset_set (3, (unsigned int)cmd_getc ()); 3069 scr_charset_set (3, (unsigned int)cmd_getc ());
3137 break; 3070 break;
3138#if ENABLE_FRILLS 3071#if !ENABLE_MINIMAL
3139 case '6': 3072 case '6':
3140 scr_backindex (); 3073 scr_backindex ();
3141 break; 3074 break;
3142#endif 3075#endif
3143 case '7': 3076 case '7':
3144 scr_cursor (SAVE); 3077 scr_cursor (SAVE);
3145 break; 3078 break;
3146 case '8': 3079 case '8':
3147 scr_cursor (RESTORE); 3080 scr_cursor (RESTORE);
3148 break; 3081 break;
3149#if ENABLE_FRILLS 3082#if !ENABLE_MINIMAL
3150 case '9': 3083 case '9':
3151 scr_forwardindex (); 3084 scr_forwardindex ();
3152 break; 3085 break;
3153#endif 3086#endif
3154 case '=': 3087 case '=':
… …
3316 ndef = get_byte_array_bit (csi_defaults, i); 3249 ndef = get_byte_array_bit (csi_defaults, i);
3317 for (p = 0; p < nargs; p++) 3250 for (p = 0; p < nargs; p++)
3318 if (arg[p] == -1) 3251 if (arg[p] == -1)
3319 arg[p] = ndef; 3252 arg[p] = ndef;
3320 3253
3321#ifdef DEBUG_CMD
3322 fprintf (stderr, "CSI ");
3323 for (p = 0; p < nargs; p++)
3324 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3325 fprintf (stderr, "%c\n", ch);
3326#endif
3327
3328 /* 3254 /*
3329 * private mode handling 3255 * private mode handling
3330 */ 3256 */
3331 if (priv) 3257 if (priv)
3332 { 3258 {
3333 switch (priv) 3259 switch (priv)
3334 { 3260 {
3335 case '>': 3261 case '>':
3336 if (ch == CSI_DA) /* secondary device attributes */ 3262 if (ch == CSI_DA) /* secondary device attributes */
3337 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 }
3338 break; 3273 break;
3339 case '?': 3274 case '?':
3340 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3275 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3341 process_terminal_mode (ch, priv, nargs, arg); 3276 process_terminal_mode (ch, priv, nargs, arg);
3342 break; 3277 break;
… …
3545 break; 3480 break;
3546 case CSI_75: 3481 case CSI_75:
3547 scr_cursor (RESTORE); 3482 scr_cursor (RESTORE);
3548 break; 3483 break;
3549 3484
3550#if ENABLE_FRILLS 3485#if !ENABLE_MINIMAL
3551 case CSI_74: 3486 case CSI_74:
3552 process_window_ops (arg, nargs); 3487 process_window_ops (arg, nargs);
3553 break; 3488 break;
3554#endif 3489#endif
3555 3490
… …
3562 break; 3497 break;
3563 } 3498 }
3564} 3499}
3565/*}}} */ 3500/*}}} */
3566 3501
3567#if ENABLE_FRILLS 3502#if !ENABLE_MINIMAL
3568/* ARGSUSED */ 3503/* ARGSUSED */
3569void 3504void
3570rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3505rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3571{ 3506{
3572 int x, y; 3507 int x, y;
3573 XWindowAttributes wattr; 3508 XWindowAttributes wattr;
3574 Window wdummy; 3509 Window wdummy;
3575 dDisp; 3510
3511 dLocal (Display *, xdisp);
3576 3512
3577 if (nargs == 0) 3513 if (nargs == 0)
3578 return; 3514 return;
3579 3515
3580 switch (args[0]) 3516 switch (args[0])
3581 { 3517 {
3582 /* 3518 /*
3583 * commands 3519 * commands
3584 */ 3520 */
3585 case 1: /* deiconify window */ 3521 case 1: /* deiconify window */
3586 XMapWindow (disp, parent[0]); 3522 XMapWindow (xdisp, parent[0]);
3587 break; 3523 break;
3588 case 2: /* iconify window */ 3524 case 2: /* iconify window */
3589 XIconifyWindow (disp, parent[0], display->screen); 3525 XIconifyWindow (xdisp, parent[0], display->screen);
3590 break; 3526 break;
3591 case 3: /* set position (pixels) */ 3527 case 3: /* set position (pixels) */
3592 XMoveWindow (disp, parent[0], args[1], args[2]); 3528 XMoveWindow (xdisp, parent[0], args[1], args[2]);
3593 break; 3529 break;
3594 case 4: /* set size (pixels) */ 3530 case 4: /* set size (pixels) */
3595 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3531 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3596 break; 3532 break;
3597 case 5: /* raise window */ 3533 case 5: /* raise window */
3598 XRaiseWindow (disp, parent[0]); 3534 XRaiseWindow (xdisp, parent[0]);
3599 break; 3535 break;
3600 case 6: /* lower window */ 3536 case 6: /* lower window */
3601 XLowerWindow (disp, parent[0]); 3537 XLowerWindow (xdisp, parent[0]);
3602 break; 3538 break;
3603 case 7: /* refresh window */ 3539 case 7: /* refresh window */
3604 scr_touch (true); 3540 scr_touch (true);
3605 break; 3541 break;
3606 case 8: /* set size (chars) */ 3542 case 8: /* set size (chars) */
… …
3613 if (args[0] >= 24) /* set height (chars) */ 3549 if (args[0] >= 24) /* set height (chars) */
3614 set_widthheight ((unsigned int)width, 3550 set_widthheight ((unsigned int)width,
3615 (unsigned int) (args[1] * fheight)); 3551 (unsigned int) (args[1] * fheight));
3616 break; 3552 break;
3617 3553
3618
3619 /* 3554 /*
3620 * reports - some output format copied from XTerm 3555 * reports - some output format copied from XTerm
3621 */ 3556 */
3622 case 11: /* report window state */ 3557 case 11: /* report window state */
3623 XGetWindowAttributes (disp, parent[0], &wattr); 3558 XGetWindowAttributes (xdisp, parent[0], &wattr);
3624 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3559 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3625 break; 3560 break;
3626 case 13: /* report window position */ 3561 case 13: /* report window position */
3627 XGetWindowAttributes (disp, parent[0], &wattr); 3562 XGetWindowAttributes (xdisp, parent[0], &wattr);
3628 XTranslateCoordinates (disp, parent[0], wattr.root, 3563 XTranslateCoordinates (xdisp, parent[0], wattr.root,
3629 -wattr.border_width, -wattr.border_width, 3564 -wattr.border_width, -wattr.border_width,
3630 &x, &y, &wdummy); 3565 &x, &y, &wdummy);
3631 tt_printf ("\033[3;%d;%dt", x, y); 3566 tt_printf ("\033[3;%d;%dt", x, y);
3632 break; 3567 break;
3633 case 14: /* report window size (pixels) */ 3568 case 14: /* report window size (pixels) */
3634 XGetWindowAttributes (disp, parent[0], &wattr); 3569 XGetWindowAttributes (xdisp, parent[0], &wattr);
3635 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3570 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3636 break; 3571 break;
3637 case 18: /* report text area size (chars) */ 3572 case 18: /* report text area size (chars) */
3638 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3573 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3639 break; 3574 break;
… …
3641 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3576 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3642 break; 3577 break;
3643 case 20: /* report icon label */ 3578 case 20: /* report icon label */
3644 { 3579 {
3645 char *s; 3580 char *s;
3646 XGetIconName (disp, parent[0], &s); 3581 XGetIconName (xdisp, parent[0], &s);
3647 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 */
3648 XFree (s); 3583 XFree (s);
3649 } 3584 }
3650 break; 3585 break;
3651 case 21: /* report window title */ 3586 case 21: /* report window title */
3652 { 3587 {
3653 char *s; 3588 char *s;
3654 XFetchName (disp, parent[0], &s); 3589 XFetchName (xdisp, parent[0], &s);
3655 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 */
3656 XFree (s); 3591 XFree (s);
3657 } 3592 }
3658 break; 3593 break;
3659 } 3594 }
… …
3760void 3695void
3761rxvt_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)
3762{ 3697{
3763 if (str[0] == '?' && !str[1]) 3698 if (str[0] == '?' && !str[1])
3764 { 3699 {
3765 unsigned short r, g, b; 3700 rgba c;
3766 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
3767 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);
3768 } 3709 }
3769 else 3710 else
3770 set_window_color (color, str); 3711 set_window_color (color, str);
3771} 3712}
3772 3713
… …
3778{ 3719{
3779 int color; 3720 int color;
3780 char *buf, *name; 3721 char *buf, *name;
3781 bool query = str[0] == '?' && !str[1]; 3722 bool query = str[0] == '?' && !str[1];
3782 int saveop = op; 3723 int saveop = op;
3783 dDisp; 3724
3725 dLocal (Display *, xdisp);
3784 3726
3785 assert (str != NULL); 3727 assert (str != NULL);
3786 switch (op) 3728 switch (op)
3787 { 3729 {
3788 case XTerm_name: 3730 case XTerm_name:
… …
3804 unsigned long bytes_after; 3746 unsigned long bytes_after;
3805 unsigned char *value = 0; 3747 unsigned char *value = 0;
3806 const char *str = ""; 3748 const char *str = "";
3807 3749
3808 if (prop 3750 if (prop
3809 && XGetWindowProperty (disp, parent[0], 3751 && XGetWindowProperty (xdisp, parent[0],
3810 prop, 0, 1<<16, 0, AnyPropertyType, 3752 prop, 0, 1<<16, 0, AnyPropertyType,
3811 &actual_type, &actual_format, 3753 &actual_type, &actual_format,
3812 &nitems, &bytes_after, &value) == Success 3754 &nitems, &bytes_after, &value) == Success
3813 && actual_type != None 3755 && actual_type != None
3814 && actual_format == 8) 3756 && actual_format == 8)
3815 str = (const char *)(value); 3757 str = (const char *)(value);
3816 3758
3817 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3759 tt_printf ("\033]%d;%s%c", op, str, resp);
3818 3760
3819 XFree (value); 3761 XFree (value);
3820 } 3762 }
3821 else 3763 else
3822 { 3764 {
… …
3826 { 3768 {
3827 *eq = 0; 3769 *eq = 0;
3828 set_utf8_property (display->atom (str), eq + 1); 3770 set_utf8_property (display->atom (str), eq + 1);
3829 } 3771 }
3830 else 3772 else
3831 XDeleteProperty (disp, parent[0], 3773 XDeleteProperty (xdisp, parent[0],
3832 display->atom (str)); 3774 display->atom (str));
3833 } 3775 }
3834 break; 3776 break;
3835 3777
3836 case XTerm_Color: 3778 case XTerm_Color:
… …
3846 break; 3788 break;
3847 3789
3848 if ((buf = strchr (name, ';')) != NULL) 3790 if ((buf = strchr (name, ';')) != NULL)
3849 *buf++ = '\0'; 3791 *buf++ = '\0';
3850 3792
3851 if (name[0] == '?' && !name[1]) 3793 process_color_seq (op, color, name, resp);
3852 {
3853 unsigned short r, g, b;
3854 pix_colors_focused[color].get (display, r, g, b);
3855 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3856 }
3857 else
3858 set_window_color (color, name);
3859 } 3794 }
3860 break; 3795 break;
3861 case XTerm_Color00: 3796 case XTerm_Color00:
3862 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3797 process_color_seq (op, Color_fg, str, resp);
3863 break; 3798 break;
3864 case XTerm_Color01: 3799 case XTerm_Color01:
3865 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3800 process_color_seq (op, Color_bg, str, resp);
3866 break; 3801 break;
3867#ifndef NO_CURSORCOLOR 3802#ifndef NO_CURSORCOLOR
3868 case XTerm_Color_cursor: 3803 case XTerm_Color_cursor:
3869 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3804 process_color_seq (op, Color_cursor, str, resp);
3870 break; 3805 break;
3871#endif 3806#endif
3872 case XTerm_Color_pointer_fg: 3807 case XTerm_Color_pointer_fg:
3873 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3808 process_color_seq (op, Color_pointer_fg, str, resp);
3874 break; 3809 break;
3875 case XTerm_Color_pointer_bg: 3810 case XTerm_Color_pointer_bg:
3876 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3811 process_color_seq (op, Color_pointer_bg, str, resp);
3877 break; 3812 break;
3878#ifndef NO_BOLD_UNDERLINE_REVERSE 3813#ifndef NO_BOLD_UNDERLINE_REVERSE
3879 case XTerm_Color_RV: 3814 case XTerm_Color_RV:
3880 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3815 process_color_seq (op, Color_RV, str, resp);
3881 break; 3816 break;
3882 case Rxvt_Color_BD: 3817 case Rxvt_Color_BD:
3883 case URxvt_Color_BD: 3818 case URxvt_Color_BD:
3884 process_color_seq (op, Color_BD, str, resp); 3819 process_color_seq (op, Color_BD, str, resp);
3885 break; 3820 break;
3886 case Rxvt_Color_UL: 3821 case Rxvt_Color_UL:
3887 case URxvt_Color_UL: 3822 case URxvt_Color_UL:
3888 process_color_seq (op, Color_UL, str, resp); 3823 process_color_seq (op, Color_UL, str, resp);
3889 break; 3824 break;
3890 case URxvt_Color_IT: 3825 case URxvt_Color_IT:
3891 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3826 process_color_seq (op, Color_IT, str, resp);
3892 break; 3827 break;
3893#endif 3828#endif
3894#if TRANSPARENT && TINTING 3829#if TRANSPARENT && TINTING
3895 case URxvt_Color_tint: 3830 case URxvt_Color_tint:
3896 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3831 process_color_seq (op, Color_tint, str, resp);
3832
3897 check_our_parents (); 3833 check_our_parents ();
3834
3898 if (am_transparent) 3835 if (am_transparent)
3899 want_full_refresh = want_refresh = 1; 3836 want_full_refresh = want_refresh = 1;
3837
3900 break; 3838 break;
3901#endif 3839#endif
3902 3840
3903 case Rxvt_Pixmap: 3841 case Rxvt_Pixmap:
3904 { 3842 {
… …
3975 allocated.push_back ((void *)res); 3913 allocated.push_back ((void *)res);
3976 set_fonts (); 3914 set_fonts ();
3977 } 3915 }
3978 break; 3916 break;
3979 3917
3980#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
3981 case URxvt_locale: 3927 case URxvt_locale:
3982 if (query) 3928 if (query)
3983 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);
3984 else 3930 else
3985 { 3931 {
3986 set_locale (str); 3932 set_locale (str);
3987 pty->set_utf8_mode (enc_utf8); 3933 pty->set_utf8_mode (enc_utf8);
3988 init_xlocale (); 3934 init_xlocale ();
… …
4349 scr_color (Color_bg, Color_bg); 4295 scr_color (Color_bg, Color_bg);
4350 break; 4296 break;
4351 4297
4352 //case 50: // not variable spacing 4298 //case 50: // not variable spacing
4353 4299
4354#if ENABLE_FRILLS 4300#if !ENABLE_MINIMAL
4355 case 90: 4301 case 90:
4356 case 91: /* set bright fg color */ 4302 case 91: /* set bright fg color */
4357 case 92: 4303 case 92:
4358 case 93: 4304 case 93:
4359 case 94: 4305 case 94:

Diff Legend

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