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.277 by root, Fri Jan 20 12:16:28 2006 UTC vs.
Revision 1.300 by root, Tue Jan 31 19:53:30 2006 UTC

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

Diff Legend

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