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.279 by root, Sat Jan 21 14:25:05 2006 UTC vs.
Revision 1.302 by root, Tue Jan 31 21:35:39 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
… …
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 1095#if LINUX_YIELD_HACK
1107static struct event_handler 1096static struct event_handler
1108{ 1097{
1109 check_watcher cw_yield; 1098 check_watcher yield_ev;
1110 1099
1111 void yield (check_watcher &w) 1100 void yield_cb (check_watcher &w)
1112 { 1101 {
1113 sched_yield (); 1102 usleep (0);
1114 w.stop (); 1103 w.stop ();
1115 } 1104 }
1116 1105
1117 event_handler () 1106 event_handler ()
1118 : cw_yield (this, &event_handler::yield) 1107 : yield_ev (this, &event_handler::yield_cb)
1119 { 1108 {
1120 } 1109 }
1121} event_handler; 1110} event_handler;
1122#endif 1111#endif
1123 1112
… …
1143 cmdbuf_endp += r; 1132 cmdbuf_endp += r;
1144 return true; 1133 return true;
1145 } 1134 }
1146 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1135 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1147 { 1136 {
1148#if HAVE_SCHED_YIELD 1137#if LINUX_YIELD_HACK
1149 if (display->is_local) 1138 if (display->is_local)
1150 event_handler.cw_yield.start (); 1139 event_handler.yield_ev.start ();
1151#endif 1140#endif
1152 } 1141 }
1153 else 1142 else
1154 { 1143 {
1155 pty_ev.stop (); 1144 pty_ev.stop ();
… …
1177} 1166}
1178 1167
1179void 1168void
1180rxvt_term::pointer_unblank () 1169rxvt_term::pointer_unblank ()
1181{ 1170{
1182 XDefineCursor (display->display, vt, TermWin_cursor); 1171 XDefineCursor (xdisp, vt, TermWin_cursor);
1183 recolour_cursor (); 1172 recolour_cursor ();
1184 1173
1185#ifdef POINTER_BLANK 1174#ifdef POINTER_BLANK
1186 hidden_pointer = 0; 1175 hidden_pointer = 0;
1187 1176
… …
1195rxvt_term::pointer_blank () 1184rxvt_term::pointer_blank ()
1196{ 1185{
1197 if (!OPTION (Opt_pointerBlank)) 1186 if (!OPTION (Opt_pointerBlank))
1198 return; 1187 return;
1199 1188
1200 XDefineCursor (display->display, vt, display->blank_cursor); 1189 XDefineCursor (xdisp, vt, display->blank_cursor);
1201 XFlush (display->display); 1190 XFlush (xdisp);
1202 1191
1203 hidden_pointer = 1; 1192 hidden_pointer = 1;
1204} 1193}
1205 1194
1206void 1195void
… …
1279 (32 + button_number + key_state), 1268 (32 + button_number + key_state),
1280 (32 + x + 1), 1269 (32 + x + 1),
1281 (32 + y + 1)); 1270 (32 + y + 1));
1282} 1271}
1283 1272
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 */ 1273/*{{{ process an X event */
1295void 1274void
1296rxvt_term::x_cb (XEvent &ev) 1275rxvt_term::x_cb (XEvent &ev)
1297{ 1276{
1298 make_current (); 1277 make_current ();
1299 1278
1300 dDisp; 1279 dLocal (Display *, xdisp);
1301 1280
1302 if (ev.xany.window == vt 1281 if (ev.xany.window == vt
1303 && SHOULD_INVOKE (HOOK_X_EVENT) 1282 && SHOULD_INVOKE (HOOK_X_EVENT)
1304 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1283 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1305 return; 1284 return;
… …
1415 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END))) 1394 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1416 destroy (); 1395 destroy ();
1417 } 1396 }
1418#if ENABLE_EWMH 1397#if ENABLE_EWMH
1419 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1398 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1420 XSendEvent (disp, ev.xclient.window = display->root, 1399 XSendEvent (xdisp, ev.xclient.window = display->root,
1421 False, SubstructureRedirectMask | SubstructureNotifyMask, 1400 False, SubstructureRedirectMask | SubstructureNotifyMask,
1422 &ev); 1401 &ev);
1423#endif 1402#endif
1424 } 1403 }
1425 } 1404 }
… …
1473 break; 1452 break;
1474 1453
1475 case ConfigureNotify: 1454 case ConfigureNotify:
1476 if (ev.xconfigure.window == parent[0]) 1455 if (ev.xconfigure.window == parent[0])
1477 { 1456 {
1478 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1457 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev))
1479 ; 1458 ;
1480 1459
1481 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1460 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1482 { 1461 {
1483 seen_resize = 1; 1462 seen_resize = 1;
… …
1541 if (ev.xany.window == vt) 1520 if (ev.xany.window == vt)
1542 { 1521 {
1543 do 1522 do
1544 scr_expose (ev.xexpose.x, ev.xexpose.y, 1523 scr_expose (ev.xexpose.x, ev.xexpose.y,
1545 ev.xexpose.width, ev.xexpose.height, False); 1524 ev.xexpose.width, ev.xexpose.height, False);
1546 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1525 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev));
1547 1526
1548 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1527 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1549 1528
1550 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1529 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev))
1551 scr_expose (ev.xexpose.x, ev.xexpose.y, 1530 scr_expose (ev.xexpose.x, ev.xexpose.y,
1552 ev.xexpose.width, ev.xexpose.height, False); 1531 ev.xexpose.width, ev.xexpose.height, False);
1553 1532
1554 want_refresh = 1; 1533 want_refresh = 1;
1555 } 1534 }
1556 else 1535 else
1557 { 1536 {
1558 XEvent unused_event; 1537 XEvent unused_event;
1559 1538
1560 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1539 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event))
1561 ; 1540 ;
1562 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1541 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event))
1563 ; 1542 ;
1564 1543
1565 if (isScrollbarWindow (ev.xany.window)) 1544 if (isScrollbarWindow (ev.xany.window))
1566 { 1545 {
1567 scrollBar.setIdle (); 1546 scrollBar.setIdle ();
1568 scrollbar_show (0); 1547 scrollbar_show (0);
1569 } 1548 }
1570 1549
1571#ifdef TRANSPARENT 1550#ifdef TRANSPARENT
1572 if (am_transparent && ev.xany.window == parent[0]) 1551 if (am_transparent && ev.xany.window == parent[0])
1573 XClearWindow (disp, ev.xany.window); 1552 XClearWindow (xdisp, ev.xany.window);
1574#endif 1553#endif
1575 } 1554 }
1576 break; 1555 break;
1577 1556
1578 case MotionNotify: 1557 case MotionNotify:
… …
1588 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1567 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1589 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1568 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1590 ; // nop 1569 ; // nop
1591 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1570 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1592 { 1571 {
1593 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1572 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev))
1594 ; 1573 ;
1595 1574
1596 XQueryPointer (disp, vt, 1575 XQueryPointer (xdisp, vt,
1597 &unused_root, &unused_child, 1576 &unused_root, &unused_child,
1598 &unused_root_x, &unused_root_y, 1577 &unused_root_x, &unused_root_y,
1599 &ev.xbutton.x, &ev.xbutton.y, 1578 &ev.xbutton.x, &ev.xbutton.y,
1600 &ev.xbutton.state); 1579 &ev.xbutton.state);
1601#ifdef MOUSE_THRESHOLD 1580#ifdef MOUSE_THRESHOLD
… …
1665#endif 1644#endif
1666 } 1645 }
1667 } 1646 }
1668 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1647 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1669 { 1648 {
1670 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1649 while (XCheckTypedWindowEvent (xdisp, scrollBar.win,
1671 MotionNotify, &ev)) 1650 MotionNotify, &ev))
1672 ; 1651 ;
1673 1652
1674 XQueryPointer (disp, scrollBar.win, 1653 XQueryPointer (xdisp, scrollBar.win,
1675 &unused_root, &unused_child, 1654 &unused_root, &unused_child,
1676 &unused_root_x, &unused_root_y, 1655 &unused_root_x, &unused_root_y,
1677 &ev.xbutton.x, &ev.xbutton.y, 1656 &ev.xbutton.x, &ev.xbutton.y,
1678 &unused_mask); 1657 &unused_mask);
1679 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1658 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
… …
1823 /* 1802 /*
1824 * VT window processing of button press 1803 * VT window processing of button press
1825 */ 1804 */
1826 if (ev.window == vt) 1805 if (ev.window == vt)
1827 { 1806 {
1807 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1808 return;
1809
1828#if ISO_14755 1810#if ISO_14755
1829 // 5.4 1811 // 5.4
1830 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1812 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1831 { 1813 {
1832 iso14755_54 (ev.x, ev.y); 1814 iso14755_54 (ev.x, ev.y);
… …
1874 else 1856 else
1875 { 1857 {
1876 if (ev.button != MEvent.button) 1858 if (ev.button != MEvent.button)
1877 MEvent.clicks = 0; 1859 MEvent.clicks = 0;
1878 1860
1879 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1880 switch (ev.button) 1861 switch (ev.button)
1881 { 1862 {
1882 case Button1: 1863 case Button1:
1883 /* allow meta + click to select rectangular areas */ 1864 /* allow meta + click to select rectangular areas */
1884 /* should be done in screen.C */ 1865 /* should be done in screen.C */
1885#if ENABLE_FRILLS 1866#if ENABLE_FRILLS
1886 selection.rect = !!(ev.state & ModMetaMask); 1867 selection.rect = !!(ev.state & ModMetaMask);
1887#else 1868#else
1888 selection.rect = false; 1869 selection.rect = false;
1889#endif 1870#endif
1890 1871
1891 /* allow shift+left click to extend selection */ 1872 /* allow shift+left click to extend selection */
1892 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) 1873 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1893 { 1874 {
1894 if (MEvent.button == Button1 && clickintime) 1875 if (MEvent.button == Button1 && clickintime)
1895 selection_rotate (ev.x, ev.y); 1876 selection_rotate (ev.x, ev.y);
1896 else 1877 else
1897 selection_extend (ev.x, ev.y, 1); 1878 selection_extend (ev.x, ev.y, 1);
1898 } 1879 }
1899 else 1880 else
1900 { 1881 {
1901 if (MEvent.button == Button1 && clickintime) 1882 if (MEvent.button == Button1 && clickintime)
1902 MEvent.clicks++; 1883 MEvent.clicks++;
1903 else 1884 else
1904 MEvent.clicks = 1; 1885 MEvent.clicks = 1;
1905 1886
1906 selection_click (MEvent.clicks, ev.x, ev.y); 1887 selection_click (MEvent.clicks, ev.x, ev.y);
1907 } 1888 }
1908 1889
1909 MEvent.button = Button1; 1890 MEvent.button = Button1;
1910 break; 1891 break;
1911 1892
1912 case Button3: 1893 case Button3:
1913 if (MEvent.button == Button3 && clickintime) 1894 if (MEvent.button == Button3 && clickintime)
1914 selection_rotate (ev.x, ev.y); 1895 selection_rotate (ev.x, ev.y);
1915 else 1896 else
1916 selection_extend (ev.x, ev.y, 1); 1897 selection_extend (ev.x, ev.y, 1);
1917 1898
1918 MEvent.button = Button3; 1899 MEvent.button = Button3;
1919 break; 1900 break;
1920 } 1901 }
1921 } 1902 }
1922 1903
1923 MEvent.time = ev.time; 1904 MEvent.time = ev.time;
1924 return; 1905 return;
1925 } 1906 }
1926 1907
… …
2089 sel_scroll_ev.stop(); 2070 sel_scroll_ev.stop();
2090#endif 2071#endif
2091 2072
2092 if (ev.window == vt) 2073 if (ev.window == vt)
2093 { 2074 {
2075 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2076 return;
2077
2094#if ISO_14755 2078#if ISO_14755
2095 // 5.4 2079 // 5.4
2096 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2080 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2097 return; 2081 return;
2098#endif 2082#endif
2083
2099 if (reportmode) 2084 if (reportmode)
2100 { 2085 {
2101 /* mouse report from vt window */ 2086 /* mouse report from vt window */
2102 /* don't report release of wheel "buttons" */ 2087 /* don't report release of wheel "buttons" */
2103 if (ev.button >= 4) 2088 if (ev.button >= 4)
… …
2127 if (priv_modes & PrivMode_mouse_report 2112 if (priv_modes & PrivMode_mouse_report
2128 && bypass_keystate 2113 && bypass_keystate
2129 && ev.button == Button1 && MEvent.clicks <= 1) 2114 && ev.button == Button1 && MEvent.clicks <= 1)
2130 selection_extend (ev.x, ev.y, 0); 2115 selection_extend (ev.x, ev.y, 0);
2131 2116
2132 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2133 return;
2134
2135 switch (ev.button) 2117 switch (ev.button)
2136 { 2118 {
2137 case Button1: 2119 case Button1:
2138 case Button3: 2120 case Button3:
2139 selection_make (ev.time); 2121 selection_make (ev.time);
2140 break; 2122 break;
2141 2123
2142 case Button2: 2124 case Button2:
2143 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2125 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2144 selection_request (ev.time, ev.state & ShiftMask ? Sel_Clipboard : Sel_Primary); 2126 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2145 break; 2127 break;
2146 2128
2147#ifdef MOUSE_WHEEL 2129#ifdef MOUSE_WHEEL
2148 case Button4: 2130 case Button4:
2149 case Button5: 2131 case Button5:
… …
2191#if TINTING 2173#if TINTING
2192/* taken from aterm-0.4.2 */ 2174/* taken from aterm-0.4.2 */
2193 2175
2194typedef uint32_t RUINT32T; 2176typedef uint32_t RUINT32T;
2195 2177
2196void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm) 2178void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2197{ 2179{
2198 int sh_r, sh_g, sh_b; 2180 int sh_r, sh_g, sh_b;
2199 RUINT32T mask_r, mask_g, mask_b; 2181 RUINT32T mask_r, mask_g, mask_b;
2200 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2182 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2201 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2183 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2202 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2184 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2203 int i; 2185 int i;
2204 2186
2205 Visual *visual = display->visual; 2187 Visual *visual = term->visual;
2206 2188
2207 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2189 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2208 2190
2209 /* for convenience */ 2191 /* for convenience */
2210 mask_r = visual->red_mask; 2192 mask_r = visual->red_mask;
… …
2431 Atom atype; 2413 Atom atype;
2432 unsigned char *prop = NULL; 2414 unsigned char *prop = NULL;
2433 Window root, oldp, *list; 2415 Window root, oldp, *list;
2434 Pixmap rootpixmap = None; 2416 Pixmap rootpixmap = None;
2435 XWindowAttributes wattr, wrootattr; 2417 XWindowAttributes wattr, wrootattr;
2436 dDisp;
2437 2418
2438 pchanged = 0; 2419 pchanged = 0;
2439 2420
2440 if (!OPTION (Opt_transparent)) 2421 if (!OPTION (Opt_transparent))
2441 return pchanged; /* Don't try any more */ 2422 return pchanged; /* Don't try any more */
2442 2423
2443 XGetWindowAttributes (disp, display->root, &wrootattr); 2424 XGetWindowAttributes (xdisp, display->root, &wrootattr);
2444 rootdepth = wrootattr.depth; 2425 rootdepth = wrootattr.depth;
2445 2426
2446 XGetWindowAttributes (disp, parent[0], &wattr); 2427 XGetWindowAttributes (xdisp, parent[0], &wattr);
2447 2428
2448 if (rootdepth != wattr.depth) 2429 if (rootdepth != wattr.depth)
2449 { 2430 {
2450 if (am_transparent) 2431 if (am_transparent)
2451 { 2432 {
2452 pchanged = 1; 2433 pchanged = 1;
2453 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2434 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2454 am_transparent = am_pixmap_trans = 0; 2435 am_transparent = am_pixmap_trans = 0;
2455 } 2436 }
2456 2437
2457 return pchanged; /* Don't try any more */ 2438 return pchanged; /* Don't try any more */
2458 } 2439 }
2459 2440
2460 /* Get all X ops out of the queue so that our information is up-to-date. */ 2441 /* Get all X ops out of the queue so that our information is up-to-date. */
2461 XSync (disp, False); 2442 XSync (xdisp, False);
2462 2443
2463 /* 2444 /*
2464 * Make the frame window set by the window manager have 2445 * Make the frame window set by the window manager have
2465 * the root background. Some window managers put multiple nested frame 2446 * the root background. Some window managers put multiple nested frame
2466 * windows for each client, so we have to take care about that. 2447 * windows for each client, so we have to take care about that.
2467 */ 2448 */
2468 i = (xa[XA_XROOTPMAP_ID] 2449 i = (xa[XA_XROOTPMAP_ID]
2469 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], 2450 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2470 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2451 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2471 &nitems, &bytes_after, &prop) == Success); 2452 &nitems, &bytes_after, &prop) == Success);
2472 2453
2473 if (!i || prop == NULL) 2454 if (!i || prop == NULL)
2474 i = (xa[XA_ESETROOT_PMAP_ID] 2455 i = (xa[XA_ESETROOT_PMAP_ID]
2475 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], 2456 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2476 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2457 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2477 &nitems, &bytes_after, &prop) == Success); 2458 &nitems, &bytes_after, &prop) == Success);
2478 2459
2479 if (!i || prop == NULL 2460 if (!i || prop == NULL
2480#if TINTING 2461#if TINTING
2481 || !rs[Rs_color + Color_tint] 2462 || !ISSET_PIXCOLOR (Color_tint)
2482#endif 2463#endif
2483 ) 2464 )
2484 have_pixmap = 0; 2465 have_pixmap = 0;
2485 else 2466 else
2486 { 2467 {
… …
2499 Window cr; 2480 Window cr;
2500 XImage *image; 2481 XImage *image;
2501 GC gc; 2482 GC gc;
2502 XGCValues gcvalue; 2483 XGCValues gcvalue;
2503 2484
2504 XTranslateCoordinates (disp, parent[0], display->root, 2485 XTranslateCoordinates (xdisp, parent[0], display->root,
2505 0, 0, &sx, &sy, &cr); 2486 0, 0, &sx, &sy, &cr);
2506 nw = (unsigned int)szHint.width; 2487 nw = (unsigned int)szHint.width;
2507 nh = (unsigned int)szHint.height; 2488 nh = (unsigned int)szHint.height;
2508 nx = ny = 0; 2489 nx = ny = 0;
2509 2490
… …
2522 } 2503 }
2523 2504
2524 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2505 min_it (nw, (unsigned int) (wrootattr.width - sx));
2525 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2506 min_it (nh, (unsigned int) (wrootattr.height - sy));
2526 2507
2527 XSync (disp, False); 2508 XSync (xdisp, False);
2528 allowedxerror = -1; 2509 allowedxerror = -1;
2529 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2510 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2530 2511
2531 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2512 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2532 /* XXX: may need a delay here? */ 2513 /* XXX: may need a delay here? */
2533 allowedxerror = 0; 2514 allowedxerror = 0;
2534 2515
… …
2537 if (am_transparent && am_pixmap_trans) 2518 if (am_transparent && am_pixmap_trans)
2538 { 2519 {
2539 pchanged = 1; 2520 pchanged = 1;
2540 if (pixmap != None) 2521 if (pixmap != None)
2541 { 2522 {
2542 XFreePixmap (disp, pixmap); 2523 XFreePixmap (xdisp, pixmap);
2543 pixmap = None; 2524 pixmap = None;
2544 } 2525 }
2545 } 2526 }
2546 2527
2547 am_pixmap_trans = 0; 2528 am_pixmap_trans = 0;
2548 } 2529 }
2549 else 2530 else
2550 { 2531 {
2551 if (pixmap != None) 2532 if (pixmap != None)
2552 XFreePixmap (disp, pixmap); 2533 XFreePixmap (xdisp, pixmap);
2553 2534
2554#if TINTING 2535#if TINTING
2555 if (ISSET_PIXCOLOR (Color_tint)) 2536 if (ISSET_PIXCOLOR (Color_tint))
2556 { 2537 {
2557 unsigned short rm, gm, bm;
2558 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2538 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2559 2539
2540 rgba c;
2560 pix_colors_focused[Color_tint].get (display, rm, gm, bm); 2541 pix_colors_focused [Color_tint].get (c);
2561 2542
2562 ShadeXImage (display, image, shade, rm, gm, bm); 2543 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2563 } 2544 }
2564#endif 2545#endif
2565 2546
2566 pixmap = XCreatePixmap (disp, vt, 2547 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2567 szHint.width, szHint.height, image->depth);
2568 gc = XCreateGC (disp, vt, 0UL, &gcvalue); 2548 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2569 XPutImage (disp, pixmap, gc, image, 0, 0, 2549 XPutImage (xdisp, pixmap, gc, image, 0, 0,
2570 nx, ny, image->width, image->height); 2550 nx, ny, image->width, image->height);
2571 XFreeGC (disp, gc); 2551 XFreeGC (xdisp, gc);
2572 XDestroyImage (image); 2552 XDestroyImage (image);
2573 XSetWindowBackgroundPixmap (disp, parent[0], pixmap); 2553 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2574 XClearWindow (disp, parent[0]); 2554 XClearWindow (xdisp, parent[0]);
2575 2555
2576 if (!am_transparent || !am_pixmap_trans) 2556 if (!am_transparent || !am_pixmap_trans)
2577 pchanged = 1; 2557 pchanged = 1;
2578 2558
2579 am_transparent = am_pixmap_trans = 1; 2559 am_transparent = am_pixmap_trans = 1;
2580 } 2560 }
2581 } 2561 }
2582 2562
2583 if (am_pixmap_trans) 2563 if (am_pixmap_trans)
2584 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2564 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2585 else 2565 else
2586 { 2566 {
2587 unsigned int n; 2567 unsigned int n;
2588 /* 2568 /*
2589 * InheritPixmap transparency 2569 * InheritPixmap transparency
2590 */ 2570 */
2591 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2571 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2592 { 2572 {
2593 oldp = parent[i]; 2573 oldp = parent[i];
2594 XQueryTree (disp, parent[i - 1], &root, 2574 XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n);
2595 &parent[i], &list, &n);
2596 XFree (list); 2575 XFree (list);
2597 2576
2598 if (parent[i] == display->root) 2577 if (parent[i] == display->root)
2599 { 2578 {
2600 if (oldp != None) 2579 if (oldp != None)
… …
2608 } 2587 }
2609 2588
2610 n = 0; 2589 n = 0;
2611 2590
2612 if (pchanged) 2591 if (pchanged)
2613 {
2614 for (; n < (unsigned int)i; n++) 2592 for (; n < (unsigned int)i; n++)
2615 { 2593 {
2616 XGetWindowAttributes (disp, parent[n], &wattr); 2594 XGetWindowAttributes (xdisp, parent[n], &wattr);
2595
2617 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2596 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2618 { 2597 {
2619 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2598 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2620 break; 2599 break;
2621 } 2600 }
2622 } 2601 }
2623 }
2624 2602
2625 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2603 if (n > (sizeof (parent) / sizeof (parent[0])))
2626 { 2604 {
2627 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]); 2605 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2628 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2606 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2629 am_transparent = 0; 2607 am_transparent = 0;
2630 /* XXX: also turn off Opt_transparent? */ 2608 /* XXX: also turn off Opt_transparent? */
2631 } 2609 }
2632 else 2610 else
2633 { 2611 {
2634 for (n = 0; n < (unsigned int)i; n++) 2612 for (n = 0; n < (unsigned int)i; n++)
2635 { 2613 {
2636 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); 2614 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2637 XClearWindow (disp, parent[n]); 2615 XClearWindow (xdisp, parent[n]);
2638 } 2616 }
2639 2617
2640 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2618 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2641 am_transparent = 1; 2619 am_transparent = 1;
2642 } 2620 }
2643 2621
2644 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2622 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2645 parent[i] = None; 2623 parent[i] = None;
2646 } 2624 }
2647 2625
2648 if (scrollBar.win) 2626 if (scrollBar.win)
2649 { 2627 {
2650 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2628 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2651 scrollBar.setIdle (); 2629 scrollBar.setIdle ();
2652 scrollbar_show (0); 2630 scrollbar_show (0);
2653 } 2631 }
2654 2632
2655 if (am_transparent) 2633 if (am_transparent)
… …
3106 scr_charset_set (2, (unsigned int)cmd_getc ()); 3084 scr_charset_set (2, (unsigned int)cmd_getc ());
3107 break; 3085 break;
3108 case '+': 3086 case '+':
3109 scr_charset_set (3, (unsigned int)cmd_getc ()); 3087 scr_charset_set (3, (unsigned int)cmd_getc ());
3110 break; 3088 break;
3111#if ENABLE_FRILLS 3089#if !ENABLE_MINIMAL
3112 case '6': 3090 case '6':
3113 scr_backindex (); 3091 scr_backindex ();
3114 break; 3092 break;
3115#endif 3093#endif
3116 case '7': 3094 case '7':
3117 scr_cursor (SAVE); 3095 scr_cursor (SAVE);
3118 break; 3096 break;
3119 case '8': 3097 case '8':
3120 scr_cursor (RESTORE); 3098 scr_cursor (RESTORE);
3121 break; 3099 break;
3122#if ENABLE_FRILLS 3100#if !ENABLE_MINIMAL
3123 case '9': 3101 case '9':
3124 scr_forwardindex (); 3102 scr_forwardindex ();
3125 break; 3103 break;
3126#endif 3104#endif
3127 case '=': 3105 case '=':
… …
3289 ndef = get_byte_array_bit (csi_defaults, i); 3267 ndef = get_byte_array_bit (csi_defaults, i);
3290 for (p = 0; p < nargs; p++) 3268 for (p = 0; p < nargs; p++)
3291 if (arg[p] == -1) 3269 if (arg[p] == -1)
3292 arg[p] = ndef; 3270 arg[p] = ndef;
3293 3271
3294#ifdef DEBUG_CMD
3295 fprintf (stderr, "CSI ");
3296 for (p = 0; p < nargs; p++)
3297 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3298 fprintf (stderr, "%c\n", ch);
3299#endif
3300
3301 /* 3272 /*
3302 * private mode handling 3273 * private mode handling
3303 */ 3274 */
3304 if (priv) 3275 if (priv)
3305 { 3276 {
3306 switch (priv) 3277 switch (priv)
3307 { 3278 {
3308 case '>': 3279 case '>':
3309 if (ch == CSI_DA) /* secondary device attributes */ 3280 if (ch == CSI_DA) /* secondary device attributes */
3310 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 3281 {
3282 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3283 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3284 //
3285 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3286 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3287 // that we do not support xterm mouse reporting (should be 95 when we do).
3288 //
3289 tt_printf ("\033[>%d;94;0c", 'U');
3290 }
3311 break; 3291 break;
3312 case '?': 3292 case '?':
3313 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3293 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3314 process_terminal_mode (ch, priv, nargs, arg); 3294 process_terminal_mode (ch, priv, nargs, arg);
3315 break; 3295 break;
… …
3518 break; 3498 break;
3519 case CSI_75: 3499 case CSI_75:
3520 scr_cursor (RESTORE); 3500 scr_cursor (RESTORE);
3521 break; 3501 break;
3522 3502
3523#if ENABLE_FRILLS 3503#if !ENABLE_MINIMAL
3524 case CSI_74: 3504 case CSI_74:
3525 process_window_ops (arg, nargs); 3505 process_window_ops (arg, nargs);
3526 break; 3506 break;
3527#endif 3507#endif
3528 3508
… …
3535 break; 3515 break;
3536 } 3516 }
3537} 3517}
3538/*}}} */ 3518/*}}} */
3539 3519
3540#if ENABLE_FRILLS 3520#if !ENABLE_MINIMAL
3541/* ARGSUSED */ 3521/* ARGSUSED */
3542void 3522void
3543rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3523rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3544{ 3524{
3545 int x, y; 3525 int x, y;
3546 XWindowAttributes wattr; 3526 XWindowAttributes wattr;
3547 Window wdummy; 3527 Window wdummy;
3548 dDisp; 3528
3529 dLocal (Display *, xdisp);
3549 3530
3550 if (nargs == 0) 3531 if (nargs == 0)
3551 return; 3532 return;
3552 3533
3553 switch (args[0]) 3534 switch (args[0])
3554 { 3535 {
3555 /* 3536 /*
3556 * commands 3537 * commands
3557 */ 3538 */
3558 case 1: /* deiconify window */ 3539 case 1: /* deiconify window */
3559 XMapWindow (disp, parent[0]); 3540 XMapWindow (xdisp, parent[0]);
3560 break; 3541 break;
3561 case 2: /* iconify window */ 3542 case 2: /* iconify window */
3562 XIconifyWindow (disp, parent[0], display->screen); 3543 XIconifyWindow (xdisp, parent[0], display->screen);
3563 break; 3544 break;
3564 case 3: /* set position (pixels) */ 3545 case 3: /* set position (pixels) */
3565 XMoveWindow (disp, parent[0], args[1], args[2]); 3546 XMoveWindow (xdisp, parent[0], args[1], args[2]);
3566 break; 3547 break;
3567 case 4: /* set size (pixels) */ 3548 case 4: /* set size (pixels) */
3568 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3549 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3569 break; 3550 break;
3570 case 5: /* raise window */ 3551 case 5: /* raise window */
3571 XRaiseWindow (disp, parent[0]); 3552 XRaiseWindow (xdisp, parent[0]);
3572 break; 3553 break;
3573 case 6: /* lower window */ 3554 case 6: /* lower window */
3574 XLowerWindow (disp, parent[0]); 3555 XLowerWindow (xdisp, parent[0]);
3575 break; 3556 break;
3576 case 7: /* refresh window */ 3557 case 7: /* refresh window */
3577 scr_touch (true); 3558 scr_touch (true);
3578 break; 3559 break;
3579 case 8: /* set size (chars) */ 3560 case 8: /* set size (chars) */
… …
3586 if (args[0] >= 24) /* set height (chars) */ 3567 if (args[0] >= 24) /* set height (chars) */
3587 set_widthheight ((unsigned int)width, 3568 set_widthheight ((unsigned int)width,
3588 (unsigned int) (args[1] * fheight)); 3569 (unsigned int) (args[1] * fheight));
3589 break; 3570 break;
3590 3571
3591
3592 /* 3572 /*
3593 * reports - some output format copied from XTerm 3573 * reports - some output format copied from XTerm
3594 */ 3574 */
3595 case 11: /* report window state */ 3575 case 11: /* report window state */
3596 XGetWindowAttributes (disp, parent[0], &wattr); 3576 XGetWindowAttributes (xdisp, parent[0], &wattr);
3597 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3577 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3598 break; 3578 break;
3599 case 13: /* report window position */ 3579 case 13: /* report window position */
3600 XGetWindowAttributes (disp, parent[0], &wattr); 3580 XGetWindowAttributes (xdisp, parent[0], &wattr);
3601 XTranslateCoordinates (disp, parent[0], wattr.root, 3581 XTranslateCoordinates (xdisp, parent[0], wattr.root,
3602 -wattr.border_width, -wattr.border_width, 3582 -wattr.border_width, -wattr.border_width,
3603 &x, &y, &wdummy); 3583 &x, &y, &wdummy);
3604 tt_printf ("\033[3;%d;%dt", x, y); 3584 tt_printf ("\033[3;%d;%dt", x, y);
3605 break; 3585 break;
3606 case 14: /* report window size (pixels) */ 3586 case 14: /* report window size (pixels) */
3607 XGetWindowAttributes (disp, parent[0], &wattr); 3587 XGetWindowAttributes (xdisp, parent[0], &wattr);
3608 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3588 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3609 break; 3589 break;
3610 case 18: /* report text area size (chars) */ 3590 case 18: /* report text area size (chars) */
3611 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3591 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3612 break; 3592 break;
… …
3614 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3594 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3615 break; 3595 break;
3616 case 20: /* report icon label */ 3596 case 20: /* report icon label */
3617 { 3597 {
3618 char *s; 3598 char *s;
3619 XGetIconName (disp, parent[0], &s); 3599 XGetIconName (xdisp, parent[0], &s);
3620 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3600 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3621 XFree (s); 3601 XFree (s);
3622 } 3602 }
3623 break; 3603 break;
3624 case 21: /* report window title */ 3604 case 21: /* report window title */
3625 { 3605 {
3626 char *s; 3606 char *s;
3627 XFetchName (disp, parent[0], &s); 3607 XFetchName (xdisp, parent[0], &s);
3628 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3608 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3629 XFree (s); 3609 XFree (s);
3630 } 3610 }
3631 break; 3611 break;
3632 } 3612 }
… …
3733void 3713void
3734rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3714rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3735{ 3715{
3736 if (str[0] == '?' && !str[1]) 3716 if (str[0] == '?' && !str[1])
3737 { 3717 {
3738 unsigned short r, g, b; 3718 rgba c;
3739 pix_colors_focused[color].get (display, r, g, b); 3719 pix_colors_focused[color].get (c);
3720
3721#if XFT
3722 if (c.a != rgba::MAX_CC)
3723 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3724 else
3725#endif
3740 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3726 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3741 } 3727 }
3742 else 3728 else
3743 set_window_color (color, str); 3729 set_window_color (color, str);
3744} 3730}
3745 3731
… …
3751{ 3737{
3752 int color; 3738 int color;
3753 char *buf, *name; 3739 char *buf, *name;
3754 bool query = str[0] == '?' && !str[1]; 3740 bool query = str[0] == '?' && !str[1];
3755 int saveop = op; 3741 int saveop = op;
3756 dDisp; 3742
3743 dLocal (Display *, xdisp);
3757 3744
3758 assert (str != NULL); 3745 assert (str != NULL);
3759 switch (op) 3746 switch (op)
3760 { 3747 {
3761 case XTerm_name: 3748 case XTerm_name:
… …
3777 unsigned long bytes_after; 3764 unsigned long bytes_after;
3778 unsigned char *value = 0; 3765 unsigned char *value = 0;
3779 const char *str = ""; 3766 const char *str = "";
3780 3767
3781 if (prop 3768 if (prop
3782 && XGetWindowProperty (disp, parent[0], 3769 && XGetWindowProperty (xdisp, parent[0],
3783 prop, 0, 1<<16, 0, AnyPropertyType, 3770 prop, 0, 1<<16, 0, AnyPropertyType,
3784 &actual_type, &actual_format, 3771 &actual_type, &actual_format,
3785 &nitems, &bytes_after, &value) == Success 3772 &nitems, &bytes_after, &value) == Success
3786 && actual_type != None 3773 && actual_type != None
3787 && actual_format == 8) 3774 && actual_format == 8)
3788 str = (const char *)(value); 3775 str = (const char *)(value);
3789 3776
3790 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3777 tt_printf ("\033]%d;%s%c", op, str, resp);
3791 3778
3792 XFree (value); 3779 XFree (value);
3793 } 3780 }
3794 else 3781 else
3795 { 3782 {
… …
3799 { 3786 {
3800 *eq = 0; 3787 *eq = 0;
3801 set_utf8_property (display->atom (str), eq + 1); 3788 set_utf8_property (display->atom (str), eq + 1);
3802 } 3789 }
3803 else 3790 else
3804 XDeleteProperty (disp, parent[0], 3791 XDeleteProperty (xdisp, parent[0],
3805 display->atom (str)); 3792 display->atom (str));
3806 } 3793 }
3807 break; 3794 break;
3808 3795
3809 case XTerm_Color: 3796 case XTerm_Color:
… …
3819 break; 3806 break;
3820 3807
3821 if ((buf = strchr (name, ';')) != NULL) 3808 if ((buf = strchr (name, ';')) != NULL)
3822 *buf++ = '\0'; 3809 *buf++ = '\0';
3823 3810
3824 if (name[0] == '?' && !name[1]) 3811 process_color_seq (op, color, name, resp);
3825 {
3826 unsigned short r, g, b;
3827 pix_colors_focused[color].get (display, r, g, b);
3828 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3829 }
3830 else
3831 set_window_color (color, name);
3832 } 3812 }
3833 break; 3813 break;
3834 case XTerm_Color00: 3814 case XTerm_Color00:
3835 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3815 process_color_seq (op, Color_fg, str, resp);
3836 break; 3816 break;
3837 case XTerm_Color01: 3817 case XTerm_Color01:
3838 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3818 process_color_seq (op, Color_bg, str, resp);
3839 break; 3819 break;
3840#ifndef NO_CURSORCOLOR 3820#ifndef NO_CURSORCOLOR
3841 case XTerm_Color_cursor: 3821 case XTerm_Color_cursor:
3842 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3822 process_color_seq (op, Color_cursor, str, resp);
3843 break; 3823 break;
3844#endif 3824#endif
3845 case XTerm_Color_pointer_fg: 3825 case XTerm_Color_pointer_fg:
3846 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3826 process_color_seq (op, Color_pointer_fg, str, resp);
3847 break; 3827 break;
3848 case XTerm_Color_pointer_bg: 3828 case XTerm_Color_pointer_bg:
3849 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3829 process_color_seq (op, Color_pointer_bg, str, resp);
3850 break; 3830 break;
3851#ifndef NO_BOLD_UNDERLINE_REVERSE 3831#ifndef NO_BOLD_UNDERLINE_REVERSE
3852 case XTerm_Color_RV: 3832 case XTerm_Color_RV:
3853 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3833 process_color_seq (op, Color_RV, str, resp);
3854 break; 3834 break;
3855 case Rxvt_Color_BD: 3835 case Rxvt_Color_BD:
3856 case URxvt_Color_BD: 3836 case URxvt_Color_BD:
3857 process_color_seq (op, Color_BD, str, resp); 3837 process_color_seq (op, Color_BD, str, resp);
3858 break; 3838 break;
3859 case Rxvt_Color_UL: 3839 case Rxvt_Color_UL:
3860 case URxvt_Color_UL: 3840 case URxvt_Color_UL:
3861 process_color_seq (op, Color_UL, str, resp); 3841 process_color_seq (op, Color_UL, str, resp);
3862 break; 3842 break;
3863 case URxvt_Color_IT: 3843 case URxvt_Color_IT:
3864 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3844 process_color_seq (op, Color_IT, str, resp);
3865 break; 3845 break;
3866#endif 3846#endif
3867#if TRANSPARENT && TINTING 3847#if TRANSPARENT && TINTING
3868 case URxvt_Color_tint: 3848 case URxvt_Color_tint:
3869 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3849 process_color_seq (op, Color_tint, str, resp);
3850
3870 check_our_parents (); 3851 check_our_parents ();
3852
3871 if (am_transparent) 3853 if (am_transparent)
3872 want_full_refresh = want_refresh = 1; 3854 want_full_refresh = want_refresh = 1;
3855
3873 break; 3856 break;
3874#endif 3857#endif
3875 3858
3876 case Rxvt_Pixmap: 3859 case Rxvt_Pixmap:
3877 { 3860 {
… …
3948 allocated.push_back ((void *)res); 3931 allocated.push_back ((void *)res);
3949 set_fonts (); 3932 set_fonts ();
3950 } 3933 }
3951 break; 3934 break;
3952 3935
3953#if ENABLE_FRILLS 3936 case URxvt_version:
3937 if (query)
3938 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3939 op,
3940 rs[Rs_name], VERSION[0], VERSION[2],
3941 resp);
3942 break;
3943
3944#if !ENABLE_MINIMAL
3954 case URxvt_locale: 3945 case URxvt_locale:
3955 if (query) 3946 if (query)
3956 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3947 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
3957 else 3948 else
3958 { 3949 {
3959 set_locale (str); 3950 set_locale (str);
3960 pty->set_utf8_mode (enc_utf8); 3951 pty->set_utf8_mode (enc_utf8);
3961 init_xlocale (); 3952 init_xlocale ();
… …
4322 scr_color (Color_bg, Color_bg); 4313 scr_color (Color_bg, Color_bg);
4323 break; 4314 break;
4324 4315
4325 //case 50: // not variable spacing 4316 //case 50: // not variable spacing
4326 4317
4327#if ENABLE_FRILLS 4318#if !ENABLE_MINIMAL
4328 case 90: 4319 case 90:
4329 case 91: /* set bright fg color */ 4320 case 91: /* set bright fg color */
4330 case 92: 4321 case 92:
4331 case 93: 4322 case 93:
4332 case 94: 4323 case 94:

Diff Legend

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