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.278 by root, Fri Jan 20 18:50:49 2006 UTC vs.
Revision 1.305 by root, Thu Feb 2 18:04:45 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>
59
60#if LINUX_YIELD_HACK
61# include <ctime>
62#endif
64 63
65/*----------------------------------------------------------------------*/ 64/*----------------------------------------------------------------------*/
66 65
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68 67
… …
227# if !UNICODE3 226# if !UNICODE3
228 if (ch >= 0x10000) 227 if (ch >= 0x10000)
229 ch = 0xfffd; 228 ch = 0xfffd;
230# endif 229# endif
231 scr_overlay_set (11, y, ch, r); 230 scr_overlay_set (11, y, ch, r);
231
232 if (WCWIDTH (ch) >= 2)
232 scr_overlay_set (12, y, NOCHAR, r); 233 scr_overlay_set (12, y, NOCHAR, r);
233 } 234 }
234 235
236// {
237// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf);
240// }
235 scr_overlay_set (0, len , attr); 241 scr_overlay_set (0, len , attr);
236 scr_overlay_set (0, len + 1, fname); 242 scr_overlay_set (0, len + 1, fname);
237 243
238 free (fname); 244 free (fname);
239 245
… …
299rxvt_term::lookup_key (XKeyEvent &ev) 305rxvt_term::lookup_key (XKeyEvent &ev)
300{ 306{
301 int ctrl, meta, shft, len; 307 int ctrl, meta, shft, len;
302 unsigned int newlen; 308 unsigned int newlen;
303 KeySym keysym; 309 KeySym keysym;
304#ifdef DEBUG_CMD
305 static int debug_key = 1; /* accessible by a debugger only */
306#endif
307 int valid_keysym; 310 int valid_keysym;
308 char kbuf[KBUFSZ]; 311 char kbuf[KBUFSZ];
309 312
310 /* 313 /*
311 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 314 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
… …
902 { 905 {
903 const char ch = C0_ESC; 906 const char ch = C0_ESC;
904 tt_write (&ch, 1); 907 tt_write (&ch, 1);
905 } 908 }
906 909
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); 910 tt_write (kbuf, (unsigned int)len);
918} 911}
919/*}}} */ 912/*}}} */
920 913
921#if defined (KEYSYM_RESOURCE) 914#if defined (KEYSYM_RESOURCE)
… …
1101 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1094 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1102 } 1095 }
1103} 1096}
1104#endif 1097#endif
1105 1098
1106#if HAVE_SCHED_YIELD 1099#if LINUX_YIELD_HACK
1107static struct event_handler 1100static struct event_handler
1108{ 1101{
1109 check_watcher cw_yield; 1102 check_watcher yield_ev;
1110 1103
1111 void yield (check_watcher &w) 1104 void yield_cb (check_watcher &w)
1112 { 1105 {
1113 sched_yield (); 1106 // this should really be sched_yield(), but the linux guys thought
1107 // that giving a process calling sched_yield () less cpu time than
1108 // ones with high nice levels is a useful thing to do. It surely is is
1109 // allowed by the sus... as is returning ENOSYS.
1110
1111 struct timespec ts = { 0, 0 };
1112 nanosleep (&ts, 0);
1113
1114 w.stop (); 1114 w.stop ();
1115 } 1115 }
1116 1116
1117 event_handler () 1117 event_handler ()
1118 : cw_yield (this, &event_handler::yield) 1118 : yield_ev (this, &event_handler::yield_cb)
1119 { 1119 {
1120 } 1120 }
1121} event_handler; 1121} event_handler;
1122#endif 1122#endif
1123 1123
… …
1143 cmdbuf_endp += r; 1143 cmdbuf_endp += r;
1144 return true; 1144 return true;
1145 } 1145 }
1146 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1146 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1147 { 1147 {
1148#if HAVE_SCHED_YIELD 1148#if LINUX_YIELD_HACK
1149 if (display->is_local) 1149 if (display->is_local)
1150 event_handler.cw_yield.start (); 1150 event_handler.yield_ev.start ();
1151#endif 1151#endif
1152 } 1152 }
1153 else 1153 else
1154 { 1154 {
1155 pty_ev.stop (); 1155 pty_ev.stop ();
… …
1177} 1177}
1178 1178
1179void 1179void
1180rxvt_term::pointer_unblank () 1180rxvt_term::pointer_unblank ()
1181{ 1181{
1182 XDefineCursor (display->display, vt, TermWin_cursor); 1182 XDefineCursor (dpy, vt, TermWin_cursor);
1183 recolour_cursor (); 1183 recolour_cursor ();
1184 1184
1185#ifdef POINTER_BLANK 1185#ifdef POINTER_BLANK
1186 hidden_pointer = 0; 1186 hidden_pointer = 0;
1187 1187
… …
1195rxvt_term::pointer_blank () 1195rxvt_term::pointer_blank ()
1196{ 1196{
1197 if (!OPTION (Opt_pointerBlank)) 1197 if (!OPTION (Opt_pointerBlank))
1198 return; 1198 return;
1199 1199
1200 XDefineCursor (display->display, vt, display->blank_cursor); 1200 XDefineCursor (dpy, vt, display->blank_cursor);
1201 XFlush (display->display); 1201 XFlush (dpy);
1202 1202
1203 hidden_pointer = 1; 1203 hidden_pointer = 1;
1204} 1204}
1205 1205
1206void 1206void
… …
1279 (32 + button_number + key_state), 1279 (32 + button_number + key_state),
1280 (32 + x + 1), 1280 (32 + x + 1),
1281 (32 + y + 1)); 1281 (32 + y + 1));
1282} 1282}
1283 1283
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 */ 1284/*{{{ process an X event */
1295void 1285void
1296rxvt_term::x_cb (XEvent &ev) 1286rxvt_term::x_cb (XEvent &ev)
1297{ 1287{
1298 make_current (); 1288 make_current ();
1299 1289
1300 dDisp; 1290 dLocal (Display *, dpy);
1301 1291
1302 if (ev.xany.window == vt 1292 if (ev.xany.window == vt
1303 && SHOULD_INVOKE (HOOK_X_EVENT) 1293 && SHOULD_INVOKE (HOOK_X_EVENT)
1304 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1294 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1305 return; 1295 return;
… …
1415 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END))) 1405 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1416 destroy (); 1406 destroy ();
1417 } 1407 }
1418#if ENABLE_EWMH 1408#if ENABLE_EWMH
1419 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1409 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1420 XSendEvent (disp, ev.xclient.window = display->root, 1410 XSendEvent (dpy, ev.xclient.window = display->root,
1421 False, SubstructureRedirectMask | SubstructureNotifyMask, 1411 False, SubstructureRedirectMask | SubstructureNotifyMask,
1422 &ev); 1412 &ev);
1423#endif 1413#endif
1424 } 1414 }
1425 } 1415 }
… …
1473 break; 1463 break;
1474 1464
1475 case ConfigureNotify: 1465 case ConfigureNotify:
1476 if (ev.xconfigure.window == parent[0]) 1466 if (ev.xconfigure.window == parent[0])
1477 { 1467 {
1478 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1468 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1479 ; 1469 ;
1480 1470
1481 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1471 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1482 { 1472 {
1483 seen_resize = 1; 1473 seen_resize = 1;
… …
1541 if (ev.xany.window == vt) 1531 if (ev.xany.window == vt)
1542 { 1532 {
1543 do 1533 do
1544 scr_expose (ev.xexpose.x, ev.xexpose.y, 1534 scr_expose (ev.xexpose.x, ev.xexpose.y,
1545 ev.xexpose.width, ev.xexpose.height, False); 1535 ev.xexpose.width, ev.xexpose.height, False);
1546 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1536 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1547 1537
1548 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1538 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1549 1539
1550 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1540 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1551 scr_expose (ev.xexpose.x, ev.xexpose.y, 1541 scr_expose (ev.xexpose.x, ev.xexpose.y,
1552 ev.xexpose.width, ev.xexpose.height, False); 1542 ev.xexpose.width, ev.xexpose.height, False);
1553 1543
1554 want_refresh = 1; 1544 want_refresh = 1;
1555 } 1545 }
1556 else 1546 else
1557 { 1547 {
1558 XEvent unused_event; 1548 XEvent unused_event;
1559 1549
1560 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1550 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1561 ; 1551 ;
1562 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1552 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1563 ; 1553 ;
1564 1554
1565 if (isScrollbarWindow (ev.xany.window)) 1555 if (isScrollbarWindow (ev.xany.window))
1566 { 1556 {
1567 scrollBar.setIdle (); 1557 scrollBar.setIdle ();
1568 scrollbar_show (0); 1558 scrollbar_show (0);
1569 } 1559 }
1570 1560
1571#ifdef TRANSPARENT 1561#ifdef TRANSPARENT
1572 if (am_transparent && ev.xany.window == parent[0]) 1562 if (am_transparent && ev.xany.window == parent[0])
1573 XClearWindow (disp, ev.xany.window); 1563 XClearWindow (dpy, ev.xany.window);
1574#endif 1564#endif
1575 } 1565 }
1576 break; 1566 break;
1577 1567
1578 case MotionNotify: 1568 case MotionNotify:
… …
1588 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1578 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1589 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1579 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1590 ; // nop 1580 ; // nop
1591 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1581 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1592 { 1582 {
1593 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1583 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1594 ; 1584 ;
1595 1585
1596 XQueryPointer (disp, vt, 1586 XQueryPointer (dpy, vt,
1597 &unused_root, &unused_child, 1587 &unused_root, &unused_child,
1598 &unused_root_x, &unused_root_y, 1588 &unused_root_x, &unused_root_y,
1599 &ev.xbutton.x, &ev.xbutton.y, 1589 &ev.xbutton.x, &ev.xbutton.y,
1600 &ev.xbutton.state); 1590 &ev.xbutton.state);
1601#ifdef MOUSE_THRESHOLD 1591#ifdef MOUSE_THRESHOLD
… …
1665#endif 1655#endif
1666 } 1656 }
1667 } 1657 }
1668 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1658 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1669 { 1659 {
1670 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1660 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1671 MotionNotify, &ev)) 1661 MotionNotify, &ev))
1672 ; 1662 ;
1673 1663
1674 XQueryPointer (disp, scrollBar.win, 1664 XQueryPointer (dpy, scrollBar.win,
1675 &unused_root, &unused_child, 1665 &unused_root, &unused_child,
1676 &unused_root_x, &unused_root_y, 1666 &unused_root_x, &unused_root_y,
1677 &ev.xbutton.x, &ev.xbutton.y, 1667 &ev.xbutton.x, &ev.xbutton.y,
1678 &unused_mask); 1668 &unused_mask);
1679 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1669 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
… …
1823 /* 1813 /*
1824 * VT window processing of button press 1814 * VT window processing of button press
1825 */ 1815 */
1826 if (ev.window == vt) 1816 if (ev.window == vt)
1827 { 1817 {
1818 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1819 return;
1820
1828#if ISO_14755 1821#if ISO_14755
1829 // 5.4 1822 // 5.4
1830 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1823 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1831 { 1824 {
1832 iso14755_54 (ev.x, ev.y); 1825 iso14755_54 (ev.x, ev.y);
… …
1874 else 1867 else
1875 { 1868 {
1876 if (ev.button != MEvent.button) 1869 if (ev.button != MEvent.button)
1877 MEvent.clicks = 0; 1870 MEvent.clicks = 0;
1878 1871
1879 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1880 switch (ev.button) 1872 switch (ev.button)
1881 { 1873 {
1882 case Button1: 1874 case Button1:
1883 /* allow meta + click to select rectangular areas */ 1875 /* allow meta + click to select rectangular areas */
1884 /* should be done in screen.C */ 1876 /* should be done in screen.C */
1885#if ENABLE_FRILLS 1877#if ENABLE_FRILLS
1886 selection.rect = !!(ev.state & ModMetaMask); 1878 selection.rect = !!(ev.state & ModMetaMask);
1887#else 1879#else
1888 selection.rect = false; 1880 selection.rect = false;
1889#endif 1881#endif
1890 1882
1891 /* allow shift+left click to extend selection */ 1883 /* allow shift+left click to extend selection */
1892 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) 1884 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1893 { 1885 {
1894 if (MEvent.button == Button1 && clickintime) 1886 if (MEvent.button == Button1 && clickintime)
1895 selection_rotate (ev.x, ev.y); 1887 selection_rotate (ev.x, ev.y);
1896 else 1888 else
1897 selection_extend (ev.x, ev.y, 1); 1889 selection_extend (ev.x, ev.y, 1);
1898 } 1890 }
1899 else 1891 else
1900 { 1892 {
1901 if (MEvent.button == Button1 && clickintime) 1893 if (MEvent.button == Button1 && clickintime)
1902 MEvent.clicks++; 1894 MEvent.clicks++;
1903 else 1895 else
1904 MEvent.clicks = 1; 1896 MEvent.clicks = 1;
1905 1897
1906 selection_click (MEvent.clicks, ev.x, ev.y); 1898 selection_click (MEvent.clicks, ev.x, ev.y);
1907 } 1899 }
1908 1900
1909 MEvent.button = Button1; 1901 MEvent.button = Button1;
1910 break; 1902 break;
1911 1903
1912 case Button3: 1904 case Button3:
1913 if (MEvent.button == Button3 && clickintime) 1905 if (MEvent.button == Button3 && clickintime)
1914 selection_rotate (ev.x, ev.y); 1906 selection_rotate (ev.x, ev.y);
1915 else 1907 else
1916 selection_extend (ev.x, ev.y, 1); 1908 selection_extend (ev.x, ev.y, 1);
1917 1909
1918 MEvent.button = Button3; 1910 MEvent.button = Button3;
1919 break; 1911 break;
1920 } 1912 }
1921 } 1913 }
1922 1914
1923 MEvent.time = ev.time; 1915 MEvent.time = ev.time;
1924 return; 1916 return;
1925 } 1917 }
1926 1918
… …
2089 sel_scroll_ev.stop(); 2081 sel_scroll_ev.stop();
2090#endif 2082#endif
2091 2083
2092 if (ev.window == vt) 2084 if (ev.window == vt)
2093 { 2085 {
2086 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2087 return;
2088
2094#if ISO_14755 2089#if ISO_14755
2095 // 5.4 2090 // 5.4
2096 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2091 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2097 return; 2092 return;
2098#endif 2093#endif
2094
2099 if (reportmode) 2095 if (reportmode)
2100 { 2096 {
2101 /* mouse report from vt window */ 2097 /* mouse report from vt window */
2102 /* don't report release of wheel "buttons" */ 2098 /* don't report release of wheel "buttons" */
2103 if (ev.button >= 4) 2099 if (ev.button >= 4)
… …
2127 if (priv_modes & PrivMode_mouse_report 2123 if (priv_modes & PrivMode_mouse_report
2128 && bypass_keystate 2124 && bypass_keystate
2129 && ev.button == Button1 && MEvent.clicks <= 1) 2125 && ev.button == Button1 && MEvent.clicks <= 1)
2130 selection_extend (ev.x, ev.y, 0); 2126 selection_extend (ev.x, ev.y, 0);
2131 2127
2132 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2133 return;
2134
2135 switch (ev.button) 2128 switch (ev.button)
2136 { 2129 {
2137 case Button1: 2130 case Button1:
2138 case Button3: 2131 case Button3:
2139 selection_make (ev.time); 2132 selection_make (ev.time);
2140 break; 2133 break;
2141 2134
2142 case Button2: 2135 case Button2:
2143 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2136 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); 2137 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2145 break; 2138 break;
2146 2139
2147#ifdef MOUSE_WHEEL 2140#ifdef MOUSE_WHEEL
2148 case Button4: 2141 case Button4:
2149 case Button5: 2142 case Button5:
… …
2191#if TINTING 2184#if TINTING
2192/* taken from aterm-0.4.2 */ 2185/* taken from aterm-0.4.2 */
2193 2186
2194typedef uint32_t RUINT32T; 2187typedef uint32_t RUINT32T;
2195 2188
2196void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm) 2189void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2197{ 2190{
2198 int sh_r, sh_g, sh_b; 2191 int sh_r, sh_g, sh_b;
2199 RUINT32T mask_r, mask_g, mask_b; 2192 RUINT32T mask_r, mask_g, mask_b;
2200 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2193 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2201 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2194 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2202 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2195 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2203 int i; 2196 int i;
2204 2197
2205 Visual *visual = display->visual; 2198 Visual *visual = term->visual;
2206 2199
2207 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2200 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2208 2201
2209 /* for convenience */ 2202 /* for convenience */
2210 mask_r = visual->red_mask; 2203 mask_r = visual->red_mask;
… …
2431 Atom atype; 2424 Atom atype;
2432 unsigned char *prop = NULL; 2425 unsigned char *prop = NULL;
2433 Window root, oldp, *list; 2426 Window root, oldp, *list;
2434 Pixmap rootpixmap = None; 2427 Pixmap rootpixmap = None;
2435 XWindowAttributes wattr, wrootattr; 2428 XWindowAttributes wattr, wrootattr;
2436 dDisp;
2437 2429
2438 pchanged = 0; 2430 pchanged = 0;
2439 2431
2440 if (!OPTION (Opt_transparent)) 2432 if (!OPTION (Opt_transparent))
2441 return pchanged; /* Don't try any more */ 2433 return pchanged; /* Don't try any more */
2442 2434
2443 XGetWindowAttributes (disp, display->root, &wrootattr); 2435 XGetWindowAttributes (dpy, display->root, &wrootattr);
2444 rootdepth = wrootattr.depth; 2436 rootdepth = wrootattr.depth;
2445 2437
2446 XGetWindowAttributes (disp, parent[0], &wattr); 2438 XGetWindowAttributes (dpy, parent[0], &wattr);
2447 2439
2448 if (rootdepth != wattr.depth) 2440 if (rootdepth != wattr.depth)
2449 { 2441 {
2450 if (am_transparent) 2442 if (am_transparent)
2451 { 2443 {
2452 pchanged = 1; 2444 pchanged = 1;
2453 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2445 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2454 am_transparent = am_pixmap_trans = 0; 2446 am_transparent = am_pixmap_trans = 0;
2455 } 2447 }
2456 2448
2457 return pchanged; /* Don't try any more */ 2449 return pchanged; /* Don't try any more */
2458 } 2450 }
2459 2451
2460 /* Get all X ops out of the queue so that our information is up-to-date. */ 2452 /* Get all X ops out of the queue so that our information is up-to-date. */
2461 XSync (disp, False); 2453 XSync (dpy, False);
2462 2454
2463 /* 2455 /*
2464 * Make the frame window set by the window manager have 2456 * Make the frame window set by the window manager have
2465 * the root background. Some window managers put multiple nested frame 2457 * the root background. Some window managers put multiple nested frame
2466 * windows for each client, so we have to take care about that. 2458 * windows for each client, so we have to take care about that.
2467 */ 2459 */
2468 i = (xa[XA_XROOTPMAP_ID] 2460 i = (xa[XA_XROOTPMAP_ID]
2469 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], 2461 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2470 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2462 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2471 &nitems, &bytes_after, &prop) == Success); 2463 &nitems, &bytes_after, &prop) == Success);
2472 2464
2473 if (!i || prop == NULL) 2465 if (!i || prop == NULL)
2474 i = (xa[XA_ESETROOT_PMAP_ID] 2466 i = (xa[XA_ESETROOT_PMAP_ID]
2475 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], 2467 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2476 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2468 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2477 &nitems, &bytes_after, &prop) == Success); 2469 &nitems, &bytes_after, &prop) == Success);
2478 2470
2479 if (!i || prop == NULL 2471 if (!i || prop == NULL
2480#if TINTING 2472#if TINTING
2481 || !rs[Rs_color + Color_tint] 2473 || !ISSET_PIXCOLOR (Color_tint)
2482#endif 2474#endif
2483 ) 2475 )
2484 have_pixmap = 0; 2476 have_pixmap = 0;
2485 else 2477 else
2486 { 2478 {
… …
2499 Window cr; 2491 Window cr;
2500 XImage *image; 2492 XImage *image;
2501 GC gc; 2493 GC gc;
2502 XGCValues gcvalue; 2494 XGCValues gcvalue;
2503 2495
2504 XTranslateCoordinates (disp, parent[0], display->root, 2496 XTranslateCoordinates (dpy, parent[0], display->root,
2505 0, 0, &sx, &sy, &cr); 2497 0, 0, &sx, &sy, &cr);
2506 nw = (unsigned int)szHint.width; 2498 nw = (unsigned int)szHint.width;
2507 nh = (unsigned int)szHint.height; 2499 nh = (unsigned int)szHint.height;
2508 nx = ny = 0; 2500 nx = ny = 0;
2509 2501
… …
2522 } 2514 }
2523 2515
2524 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2516 min_it (nw, (unsigned int) (wrootattr.width - sx));
2525 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2517 min_it (nh, (unsigned int) (wrootattr.height - sy));
2526 2518
2527 XSync (disp, False); 2519 XSync (dpy, False);
2528 allowedxerror = -1; 2520 allowedxerror = -1;
2529 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2521 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2530 2522
2531 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2523 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2532 /* XXX: may need a delay here? */ 2524 /* XXX: may need a delay here? */
2533 allowedxerror = 0; 2525 allowedxerror = 0;
2534 2526
… …
2537 if (am_transparent && am_pixmap_trans) 2529 if (am_transparent && am_pixmap_trans)
2538 { 2530 {
2539 pchanged = 1; 2531 pchanged = 1;
2540 if (pixmap != None) 2532 if (pixmap != None)
2541 { 2533 {
2542 XFreePixmap (disp, pixmap); 2534 XFreePixmap (dpy, pixmap);
2543 pixmap = None; 2535 pixmap = None;
2544 } 2536 }
2545 } 2537 }
2546 2538
2547 am_pixmap_trans = 0; 2539 am_pixmap_trans = 0;
2548 } 2540 }
2549 else 2541 else
2550 { 2542 {
2551 if (pixmap != None) 2543 if (pixmap != None)
2552 XFreePixmap (disp, pixmap); 2544 XFreePixmap (dpy, pixmap);
2553 2545
2554#if TINTING 2546#if TINTING
2555 if (ISSET_PIXCOLOR (Color_tint)) 2547 if (ISSET_PIXCOLOR (Color_tint))
2556 { 2548 {
2557 unsigned short rm, gm, bm;
2558 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2549 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2559 2550
2551 rgba c;
2560 pix_colors_focused[Color_tint].get (display, rm, gm, bm); 2552 pix_colors_focused [Color_tint].get (c);
2561 2553
2562 ShadeXImage (display, image, shade, rm, gm, bm); 2554 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2563 } 2555 }
2564#endif 2556#endif
2565 2557
2566 pixmap = XCreatePixmap (disp, vt, 2558 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2567 szHint.width, szHint.height, image->depth);
2568 gc = XCreateGC (disp, vt, 0UL, &gcvalue); 2559 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2569 XPutImage (disp, pixmap, gc, image, 0, 0, 2560 XPutImage (dpy, pixmap, gc, image, 0, 0,
2570 nx, ny, image->width, image->height); 2561 nx, ny, image->width, image->height);
2571 XFreeGC (disp, gc); 2562 XFreeGC (dpy, gc);
2572 XDestroyImage (image); 2563 XDestroyImage (image);
2573 XSetWindowBackgroundPixmap (disp, parent[0], pixmap); 2564 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2574 XClearWindow (disp, parent[0]); 2565 XClearWindow (dpy, parent[0]);
2575 2566
2576 if (!am_transparent || !am_pixmap_trans) 2567 if (!am_transparent || !am_pixmap_trans)
2577 pchanged = 1; 2568 pchanged = 1;
2578 2569
2579 am_transparent = am_pixmap_trans = 1; 2570 am_transparent = am_pixmap_trans = 1;
2580 } 2571 }
2581 } 2572 }
2582 2573
2583 if (am_pixmap_trans) 2574 if (am_pixmap_trans)
2584 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2575 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2585 else 2576 else
2586 { 2577 {
2587 unsigned int n; 2578 unsigned int n;
2588 /* 2579 /*
2589 * InheritPixmap transparency 2580 * InheritPixmap transparency
2590 */ 2581 */
2591 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2582 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2592 { 2583 {
2593 oldp = parent[i]; 2584 oldp = parent[i];
2594 XQueryTree (disp, parent[i - 1], &root, 2585 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2595 &parent[i], &list, &n);
2596 XFree (list); 2586 XFree (list);
2597 2587
2598 if (parent[i] == display->root) 2588 if (parent[i] == display->root)
2599 { 2589 {
2600 if (oldp != None) 2590 if (oldp != None)
… …
2608 } 2598 }
2609 2599
2610 n = 0; 2600 n = 0;
2611 2601
2612 if (pchanged) 2602 if (pchanged)
2613 {
2614 for (; n < (unsigned int)i; n++) 2603 for (; n < (unsigned int)i; n++)
2615 { 2604 {
2616 XGetWindowAttributes (disp, parent[n], &wattr); 2605 XGetWindowAttributes (dpy, parent[n], &wattr);
2606
2617 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2607 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2618 { 2608 {
2619 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2609 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2620 break; 2610 break;
2621 } 2611 }
2622 } 2612 }
2623 }
2624 2613
2625 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2614 if (n > (sizeof (parent) / sizeof (parent[0])))
2626 { 2615 {
2627 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]); 2616 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2628 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2617 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2629 am_transparent = 0; 2618 am_transparent = 0;
2630 /* XXX: also turn off Opt_transparent? */ 2619 /* XXX: also turn off Opt_transparent? */
2631 } 2620 }
2632 else 2621 else
2633 { 2622 {
2634#if WAIT_FOR_WM
2635 /* wait (an arbitrary period) for the WM to do its thing
2636 * needed for fvwm2.2.2 (and before?) */
2637 sleep (1);
2638#endif
2639 for (n = 0; n < (unsigned int)i; n++) 2623 for (n = 0; n < (unsigned int)i; n++)
2640 { 2624 {
2641 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); 2625 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2642 XClearWindow (disp, parent[n]); 2626 XClearWindow (dpy, parent[n]);
2643 } 2627 }
2644 2628
2645 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2629 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2646 am_transparent = 1; 2630 am_transparent = 1;
2647 } 2631 }
2648 2632
2649 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2633 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2650 parent[i] = None; 2634 parent[i] = None;
2651 } 2635 }
2652 2636
2653 if (scrollBar.win) 2637 if (scrollBar.win)
2654 { 2638 {
2655 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2639 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2656 scrollBar.setIdle (); 2640 scrollBar.setIdle ();
2657 scrollbar_show (0); 2641 scrollbar_show (0);
2658 } 2642 }
2659 2643
2660 if (am_transparent) 2644 if (am_transparent)
… …
3111 scr_charset_set (2, (unsigned int)cmd_getc ()); 3095 scr_charset_set (2, (unsigned int)cmd_getc ());
3112 break; 3096 break;
3113 case '+': 3097 case '+':
3114 scr_charset_set (3, (unsigned int)cmd_getc ()); 3098 scr_charset_set (3, (unsigned int)cmd_getc ());
3115 break; 3099 break;
3116#if ENABLE_FRILLS 3100#if !ENABLE_MINIMAL
3117 case '6': 3101 case '6':
3118 scr_backindex (); 3102 scr_backindex ();
3119 break; 3103 break;
3120#endif 3104#endif
3121 case '7': 3105 case '7':
3122 scr_cursor (SAVE); 3106 scr_cursor (SAVE);
3123 break; 3107 break;
3124 case '8': 3108 case '8':
3125 scr_cursor (RESTORE); 3109 scr_cursor (RESTORE);
3126 break; 3110 break;
3127#if ENABLE_FRILLS 3111#if !ENABLE_MINIMAL
3128 case '9': 3112 case '9':
3129 scr_forwardindex (); 3113 scr_forwardindex ();
3130 break; 3114 break;
3131#endif 3115#endif
3132 case '=': 3116 case '=':
… …
3294 ndef = get_byte_array_bit (csi_defaults, i); 3278 ndef = get_byte_array_bit (csi_defaults, i);
3295 for (p = 0; p < nargs; p++) 3279 for (p = 0; p < nargs; p++)
3296 if (arg[p] == -1) 3280 if (arg[p] == -1)
3297 arg[p] = ndef; 3281 arg[p] = ndef;
3298 3282
3299#ifdef DEBUG_CMD
3300 fprintf (stderr, "CSI ");
3301 for (p = 0; p < nargs; p++)
3302 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3303 fprintf (stderr, "%c\n", ch);
3304#endif
3305
3306 /* 3283 /*
3307 * private mode handling 3284 * private mode handling
3308 */ 3285 */
3309 if (priv) 3286 if (priv)
3310 { 3287 {
3311 switch (priv) 3288 switch (priv)
3312 { 3289 {
3313 case '>': 3290 case '>':
3314 if (ch == CSI_DA) /* secondary device attributes */ 3291 if (ch == CSI_DA) /* secondary device attributes */
3315 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 3292 {
3293 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3294 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3295 //
3296 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3297 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3298 // that we do not support xterm mouse reporting (should be 95 when we do).
3299 //
3300 tt_printf ("\033[>%d;94;0c", 'U');
3301 }
3316 break; 3302 break;
3317 case '?': 3303 case '?':
3318 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3304 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3319 process_terminal_mode (ch, priv, nargs, arg); 3305 process_terminal_mode (ch, priv, nargs, arg);
3320 break; 3306 break;
… …
3523 break; 3509 break;
3524 case CSI_75: 3510 case CSI_75:
3525 scr_cursor (RESTORE); 3511 scr_cursor (RESTORE);
3526 break; 3512 break;
3527 3513
3528#if ENABLE_FRILLS 3514#if !ENABLE_MINIMAL
3529 case CSI_74: 3515 case CSI_74:
3530 process_window_ops (arg, nargs); 3516 process_window_ops (arg, nargs);
3531 break; 3517 break;
3532#endif 3518#endif
3533 3519
… …
3540 break; 3526 break;
3541 } 3527 }
3542} 3528}
3543/*}}} */ 3529/*}}} */
3544 3530
3545#if ENABLE_FRILLS 3531#if !ENABLE_MINIMAL
3546/* ARGSUSED */ 3532/* ARGSUSED */
3547void 3533void
3548rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3534rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3549{ 3535{
3550 int x, y; 3536 int x, y;
3551 XWindowAttributes wattr; 3537 XWindowAttributes wattr;
3552 Window wdummy; 3538 Window wdummy;
3553 dDisp; 3539
3540 dLocal (Display *, dpy);
3554 3541
3555 if (nargs == 0) 3542 if (nargs == 0)
3556 return; 3543 return;
3557 3544
3558 switch (args[0]) 3545 switch (args[0])
3559 { 3546 {
3560 /* 3547 /*
3561 * commands 3548 * commands
3562 */ 3549 */
3563 case 1: /* deiconify window */ 3550 case 1: /* deiconify window */
3564 XMapWindow (disp, parent[0]); 3551 XMapWindow (dpy, parent[0]);
3565 break; 3552 break;
3566 case 2: /* iconify window */ 3553 case 2: /* iconify window */
3567 XIconifyWindow (disp, parent[0], display->screen); 3554 XIconifyWindow (dpy, parent[0], display->screen);
3568 break; 3555 break;
3569 case 3: /* set position (pixels) */ 3556 case 3: /* set position (pixels) */
3570 XMoveWindow (disp, parent[0], args[1], args[2]); 3557 XMoveWindow (dpy, parent[0], args[1], args[2]);
3571 break; 3558 break;
3572 case 4: /* set size (pixels) */ 3559 case 4: /* set size (pixels) */
3573 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3560 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3574 break; 3561 break;
3575 case 5: /* raise window */ 3562 case 5: /* raise window */
3576 XRaiseWindow (disp, parent[0]); 3563 XRaiseWindow (dpy, parent[0]);
3577 break; 3564 break;
3578 case 6: /* lower window */ 3565 case 6: /* lower window */
3579 XLowerWindow (disp, parent[0]); 3566 XLowerWindow (dpy, parent[0]);
3580 break; 3567 break;
3581 case 7: /* refresh window */ 3568 case 7: /* refresh window */
3582 scr_touch (true); 3569 scr_touch (true);
3583 break; 3570 break;
3584 case 8: /* set size (chars) */ 3571 case 8: /* set size (chars) */
… …
3591 if (args[0] >= 24) /* set height (chars) */ 3578 if (args[0] >= 24) /* set height (chars) */
3592 set_widthheight ((unsigned int)width, 3579 set_widthheight ((unsigned int)width,
3593 (unsigned int) (args[1] * fheight)); 3580 (unsigned int) (args[1] * fheight));
3594 break; 3581 break;
3595 3582
3596
3597 /* 3583 /*
3598 * reports - some output format copied from XTerm 3584 * reports - some output format copied from XTerm
3599 */ 3585 */
3600 case 11: /* report window state */ 3586 case 11: /* report window state */
3601 XGetWindowAttributes (disp, parent[0], &wattr); 3587 XGetWindowAttributes (dpy, parent[0], &wattr);
3602 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3588 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3603 break; 3589 break;
3604 case 13: /* report window position */ 3590 case 13: /* report window position */
3605 XGetWindowAttributes (disp, parent[0], &wattr); 3591 XGetWindowAttributes (dpy, parent[0], &wattr);
3606 XTranslateCoordinates (disp, parent[0], wattr.root, 3592 XTranslateCoordinates (dpy, parent[0], wattr.root,
3607 -wattr.border_width, -wattr.border_width, 3593 -wattr.border_width, -wattr.border_width,
3608 &x, &y, &wdummy); 3594 &x, &y, &wdummy);
3609 tt_printf ("\033[3;%d;%dt", x, y); 3595 tt_printf ("\033[3;%d;%dt", x, y);
3610 break; 3596 break;
3611 case 14: /* report window size (pixels) */ 3597 case 14: /* report window size (pixels) */
3612 XGetWindowAttributes (disp, parent[0], &wattr); 3598 XGetWindowAttributes (dpy, parent[0], &wattr);
3613 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3599 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3614 break; 3600 break;
3615 case 18: /* report text area size (chars) */ 3601 case 18: /* report text area size (chars) */
3616 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3602 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3617 break; 3603 break;
… …
3619 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3605 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3620 break; 3606 break;
3621 case 20: /* report icon label */ 3607 case 20: /* report icon label */
3622 { 3608 {
3623 char *s; 3609 char *s;
3624 XGetIconName (disp, parent[0], &s); 3610 XGetIconName (dpy, parent[0], &s);
3625 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3611 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3626 XFree (s); 3612 XFree (s);
3627 } 3613 }
3628 break; 3614 break;
3629 case 21: /* report window title */ 3615 case 21: /* report window title */
3630 { 3616 {
3631 char *s; 3617 char *s;
3632 XFetchName (disp, parent[0], &s); 3618 XFetchName (dpy, parent[0], &s);
3633 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3619 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3634 XFree (s); 3620 XFree (s);
3635 } 3621 }
3636 break; 3622 break;
3637 } 3623 }
… …
3738void 3724void
3739rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3725rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3740{ 3726{
3741 if (str[0] == '?' && !str[1]) 3727 if (str[0] == '?' && !str[1])
3742 { 3728 {
3743 unsigned short r, g, b; 3729 rgba c;
3744 pix_colors_focused[color].get (display, r, g, b); 3730 pix_colors_focused[color].get (c);
3731
3732#if XFT
3733 if (c.a != rgba::MAX_CC)
3734 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3735 else
3736#endif
3745 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3737 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3746 } 3738 }
3747 else 3739 else
3748 set_window_color (color, str); 3740 set_window_color (color, str);
3749} 3741}
3750 3742
… …
3756{ 3748{
3757 int color; 3749 int color;
3758 char *buf, *name; 3750 char *buf, *name;
3759 bool query = str[0] == '?' && !str[1]; 3751 bool query = str[0] == '?' && !str[1];
3760 int saveop = op; 3752 int saveop = op;
3761 dDisp; 3753
3754 dLocal (Display *, dpy);
3762 3755
3763 assert (str != NULL); 3756 assert (str != NULL);
3764 switch (op) 3757 switch (op)
3765 { 3758 {
3766 case XTerm_name: 3759 case XTerm_name:
… …
3782 unsigned long bytes_after; 3775 unsigned long bytes_after;
3783 unsigned char *value = 0; 3776 unsigned char *value = 0;
3784 const char *str = ""; 3777 const char *str = "";
3785 3778
3786 if (prop 3779 if (prop
3787 && XGetWindowProperty (disp, parent[0], 3780 && XGetWindowProperty (dpy, parent[0],
3788 prop, 0, 1<<16, 0, AnyPropertyType, 3781 prop, 0, 1<<16, 0, AnyPropertyType,
3789 &actual_type, &actual_format, 3782 &actual_type, &actual_format,
3790 &nitems, &bytes_after, &value) == Success 3783 &nitems, &bytes_after, &value) == Success
3791 && actual_type != None 3784 && actual_type != None
3792 && actual_format == 8) 3785 && actual_format == 8)
3793 str = (const char *)(value); 3786 str = (const char *)(value);
3794 3787
3795 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3788 tt_printf ("\033]%d;%s%c", op, str, resp);
3796 3789
3797 XFree (value); 3790 XFree (value);
3798 } 3791 }
3799 else 3792 else
3800 { 3793 {
… …
3804 { 3797 {
3805 *eq = 0; 3798 *eq = 0;
3806 set_utf8_property (display->atom (str), eq + 1); 3799 set_utf8_property (display->atom (str), eq + 1);
3807 } 3800 }
3808 else 3801 else
3809 XDeleteProperty (disp, parent[0], 3802 XDeleteProperty (dpy, parent[0],
3810 display->atom (str)); 3803 display->atom (str));
3811 } 3804 }
3812 break; 3805 break;
3813 3806
3814 case XTerm_Color: 3807 case XTerm_Color:
… …
3824 break; 3817 break;
3825 3818
3826 if ((buf = strchr (name, ';')) != NULL) 3819 if ((buf = strchr (name, ';')) != NULL)
3827 *buf++ = '\0'; 3820 *buf++ = '\0';
3828 3821
3829 if (name[0] == '?' && !name[1]) 3822 process_color_seq (op, color, name, resp);
3830 {
3831 unsigned short r, g, b;
3832 pix_colors_focused[color].get (display, r, g, b);
3833 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3834 }
3835 else
3836 set_window_color (color, name);
3837 } 3823 }
3838 break; 3824 break;
3839 case XTerm_Color00: 3825 case XTerm_Color00:
3840 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3826 process_color_seq (op, Color_fg, str, resp);
3841 break; 3827 break;
3842 case XTerm_Color01: 3828 case XTerm_Color01:
3843 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3829 process_color_seq (op, Color_bg, str, resp);
3844 break; 3830 break;
3845#ifndef NO_CURSORCOLOR 3831#ifndef NO_CURSORCOLOR
3846 case XTerm_Color_cursor: 3832 case XTerm_Color_cursor:
3847 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3833 process_color_seq (op, Color_cursor, str, resp);
3848 break; 3834 break;
3849#endif 3835#endif
3850 case XTerm_Color_pointer_fg: 3836 case XTerm_Color_pointer_fg:
3851 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3837 process_color_seq (op, Color_pointer_fg, str, resp);
3852 break; 3838 break;
3853 case XTerm_Color_pointer_bg: 3839 case XTerm_Color_pointer_bg:
3854 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3840 process_color_seq (op, Color_pointer_bg, str, resp);
3855 break; 3841 break;
3856#ifndef NO_BOLD_UNDERLINE_REVERSE 3842#ifndef NO_BOLD_UNDERLINE_REVERSE
3857 case XTerm_Color_RV: 3843 case XTerm_Color_RV:
3858 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3844 process_color_seq (op, Color_RV, str, resp);
3859 break; 3845 break;
3860 case Rxvt_Color_BD: 3846 case Rxvt_Color_BD:
3861 case URxvt_Color_BD: 3847 case URxvt_Color_BD:
3862 process_color_seq (op, Color_BD, str, resp); 3848 process_color_seq (op, Color_BD, str, resp);
3863 break; 3849 break;
3864 case Rxvt_Color_UL: 3850 case Rxvt_Color_UL:
3865 case URxvt_Color_UL: 3851 case URxvt_Color_UL:
3866 process_color_seq (op, Color_UL, str, resp); 3852 process_color_seq (op, Color_UL, str, resp);
3867 break; 3853 break;
3868 case URxvt_Color_IT: 3854 case URxvt_Color_IT:
3869 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3855 process_color_seq (op, Color_IT, str, resp);
3870 break; 3856 break;
3871#endif 3857#endif
3872#if TRANSPARENT && TINTING 3858#if TRANSPARENT && TINTING
3873 case URxvt_Color_tint: 3859 case URxvt_Color_tint:
3874 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3860 process_color_seq (op, Color_tint, str, resp);
3861
3875 check_our_parents (); 3862 check_our_parents ();
3863
3876 if (am_transparent) 3864 if (am_transparent)
3877 want_full_refresh = want_refresh = 1; 3865 want_full_refresh = want_refresh = 1;
3866
3878 break; 3867 break;
3879#endif 3868#endif
3880 3869
3881 case Rxvt_Pixmap: 3870 case Rxvt_Pixmap:
3882 { 3871 {
… …
3953 allocated.push_back ((void *)res); 3942 allocated.push_back ((void *)res);
3954 set_fonts (); 3943 set_fonts ();
3955 } 3944 }
3956 break; 3945 break;
3957 3946
3958#if ENABLE_FRILLS 3947 case URxvt_version:
3948 if (query)
3949 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3950 op,
3951 rs[Rs_name], VERSION[0], VERSION[2],
3952 resp);
3953 break;
3954
3955#if !ENABLE_MINIMAL
3959 case URxvt_locale: 3956 case URxvt_locale:
3960 if (query) 3957 if (query)
3961 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3958 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
3962 else 3959 else
3963 { 3960 {
3964 set_locale (str); 3961 set_locale (str);
3965 pty->set_utf8_mode (enc_utf8); 3962 pty->set_utf8_mode (enc_utf8);
3966 init_xlocale (); 3963 init_xlocale ();
… …
4327 scr_color (Color_bg, Color_bg); 4324 scr_color (Color_bg, Color_bg);
4328 break; 4325 break;
4329 4326
4330 //case 50: // not variable spacing 4327 //case 50: // not variable spacing
4331 4328
4332#if ENABLE_FRILLS 4329#if !ENABLE_MINIMAL
4333 case 90: 4330 case 90:
4334 case 91: /* set bright fg color */ 4331 case 91: /* set bright fg color */
4335 case 92: 4332 case 92:
4336 case 93: 4333 case 93:
4337 case 94: 4334 case 94:

Diff Legend

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