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.276 by root, Fri Jan 20 11:02:46 2006 UTC vs.
Revision 1.290 by root, Sat Jan 28 20:41:38 2006 UTC

… …
299rxvt_term::lookup_key (XKeyEvent &ev) 299rxvt_term::lookup_key (XKeyEvent &ev)
300{ 300{
301 int ctrl, meta, shft, len; 301 int ctrl, meta, shft, len;
302 unsigned int newlen; 302 unsigned int newlen;
303 KeySym keysym; 303 KeySym keysym;
304#ifdef DEBUG_CMD
305 static int debug_key = 1; /* accessible by a debugger only */
306#endif
307 int valid_keysym; 304 int valid_keysym;
308 char kbuf[KBUFSZ]; 305 char kbuf[KBUFSZ];
309 306
310 /* 307 /*
311 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 308 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
… …
902 { 899 {
903 const char ch = C0_ESC; 900 const char ch = C0_ESC;
904 tt_write (&ch, 1); 901 tt_write (&ch, 1);
905 } 902 }
906 903
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); 904 tt_write (kbuf, (unsigned int)len);
918} 905}
919/*}}} */ 906/*}}} */
920 907
921#if defined (KEYSYM_RESOURCE) 908#if defined (KEYSYM_RESOURCE)
… …
1177} 1164}
1178 1165
1179void 1166void
1180rxvt_term::pointer_unblank () 1167rxvt_term::pointer_unblank ()
1181{ 1168{
1182 XDefineCursor (display->display, vt, TermWin_cursor); 1169 XDefineCursor (xdisp, vt, TermWin_cursor);
1183 recolour_cursor (); 1170 recolour_cursor ();
1184 1171
1185#ifdef POINTER_BLANK 1172#ifdef POINTER_BLANK
1186 hidden_pointer = 0; 1173 hidden_pointer = 0;
1187 1174
… …
1195rxvt_term::pointer_blank () 1182rxvt_term::pointer_blank ()
1196{ 1183{
1197 if (!OPTION (Opt_pointerBlank)) 1184 if (!OPTION (Opt_pointerBlank))
1198 return; 1185 return;
1199 1186
1200 XDefineCursor (display->display, vt, display->blank_cursor); 1187 XDefineCursor (xdisp, vt, display->blank_cursor);
1201 XFlush (display->display); 1188 XFlush (xdisp);
1202 1189
1203 hidden_pointer = 1; 1190 hidden_pointer = 1;
1204} 1191}
1205 1192
1206void 1193void
… …
1279 (32 + button_number + key_state), 1266 (32 + button_number + key_state),
1280 (32 + x + 1), 1267 (32 + x + 1),
1281 (32 + y + 1)); 1268 (32 + y + 1));
1282} 1269}
1283 1270
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 */ 1271/*{{{ process an X event */
1295void 1272void
1296rxvt_term::x_cb (XEvent &ev) 1273rxvt_term::x_cb (XEvent &ev)
1297{ 1274{
1298 make_current (); 1275 make_current ();
1299 1276
1300 dDisp; 1277 dLocal (Display *, xdisp);
1301 1278
1302 if (ev.xany.window == vt 1279 if (ev.xany.window == vt
1303 && SHOULD_INVOKE (HOOK_X_EVENT) 1280 && SHOULD_INVOKE (HOOK_X_EVENT)
1304 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1281 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1305 return; 1282 return;
… …
1401 case ButtonRelease: 1378 case ButtonRelease:
1402 button_release (ev.xbutton); 1379 button_release (ev.xbutton);
1403 break; 1380 break;
1404 1381
1405 case ClientMessage: 1382 case ClientMessage:
1406 if (ev.xclient.format == 32) 1383 if (ev.xclient.format == 32
1384 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1407 { 1385 {
1408 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1386 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1409 { 1387 {
1410 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1388 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1411 { 1389 {
1390 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1391 {
1412 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, ev, DT_END))) 1392 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1413 destroy (); 1393 destroy ();
1394 }
1395#if ENABLE_EWMH
1396 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1397 XSendEvent (xdisp, ev.xclient.window = display->root,
1398 False, SubstructureRedirectMask | SubstructureNotifyMask,
1399 &ev);
1400#endif
1414 } 1401 }
1415#if ENABLE_EWMH
1416 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1417 XSendEvent (disp, ev.xclient.window = display->root,
1418 False, SubstructureRedirectMask | SubstructureNotifyMask,
1419 &ev);
1420#endif
1421 } 1402 }
1422#if ENABLE_XEMBED 1403#if ENABLE_XEMBED
1423 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED]) 1404 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1424 { 1405 {
1425 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN) 1406 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
… …
1469 break; 1450 break;
1470 1451
1471 case ConfigureNotify: 1452 case ConfigureNotify:
1472 if (ev.xconfigure.window == parent[0]) 1453 if (ev.xconfigure.window == parent[0])
1473 { 1454 {
1474 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1455 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev))
1475 ; 1456 ;
1476 1457
1477 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1458 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1478 { 1459 {
1479 seen_resize = 1; 1460 seen_resize = 1;
… …
1488#endif 1469#endif
1489 } 1470 }
1490 break; 1471 break;
1491 1472
1492 case PropertyNotify: 1473 case PropertyNotify:
1474 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1493 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1475 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1494 && ev.xproperty.state == PropertyNewValue) 1476 && ev.xproperty.state == PropertyNewValue)
1495 selection_property (ev.xproperty.window, ev.xproperty.atom); 1477 selection_property (ev.xproperty.window, ev.xproperty.atom);
1496 1478
1497 break; 1479 break;
1498 1480
1499 case SelectionClear: 1481 case SelectionClear:
1500 selection_clear (); 1482 selection_clear ();
… …
1536 if (ev.xany.window == vt) 1518 if (ev.xany.window == vt)
1537 { 1519 {
1538 do 1520 do
1539 scr_expose (ev.xexpose.x, ev.xexpose.y, 1521 scr_expose (ev.xexpose.x, ev.xexpose.y,
1540 ev.xexpose.width, ev.xexpose.height, False); 1522 ev.xexpose.width, ev.xexpose.height, False);
1541 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1523 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev));
1542 1524
1543 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1525 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1544 1526
1545 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1527 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev))
1546 scr_expose (ev.xexpose.x, ev.xexpose.y, 1528 scr_expose (ev.xexpose.x, ev.xexpose.y,
1547 ev.xexpose.width, ev.xexpose.height, False); 1529 ev.xexpose.width, ev.xexpose.height, False);
1548 1530
1549 want_refresh = 1; 1531 want_refresh = 1;
1550 } 1532 }
1551 else 1533 else
1552 { 1534 {
1553 XEvent unused_event; 1535 XEvent unused_event;
1554 1536
1555 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1537 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event))
1556 ; 1538 ;
1557 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1539 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event))
1558 ; 1540 ;
1559 1541
1560 if (isScrollbarWindow (ev.xany.window)) 1542 if (isScrollbarWindow (ev.xany.window))
1561 { 1543 {
1562 scrollBar.setIdle (); 1544 scrollBar.setIdle ();
1563 scrollbar_show (0); 1545 scrollbar_show (0);
1564 } 1546 }
1565 1547
1566#ifdef TRANSPARENT 1548#ifdef TRANSPARENT
1567 if (am_transparent && ev.xany.window == parent[0]) 1549 if (am_transparent && ev.xany.window == parent[0])
1568 XClearWindow (disp, ev.xany.window); 1550 XClearWindow (xdisp, ev.xany.window);
1569#endif 1551#endif
1570 } 1552 }
1571 break; 1553 break;
1572 1554
1573 case MotionNotify: 1555 case MotionNotify:
… …
1583 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1565 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1584 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1566 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1585 ; // nop 1567 ; // nop
1586 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1568 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1587 { 1569 {
1588 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1570 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev))
1589 ; 1571 ;
1590 1572
1591 XQueryPointer (disp, vt, 1573 XQueryPointer (xdisp, vt,
1592 &unused_root, &unused_child, 1574 &unused_root, &unused_child,
1593 &unused_root_x, &unused_root_y, 1575 &unused_root_x, &unused_root_y,
1594 &ev.xbutton.x, &ev.xbutton.y, 1576 &ev.xbutton.x, &ev.xbutton.y,
1595 &ev.xbutton.state); 1577 &ev.xbutton.state);
1596#ifdef MOUSE_THRESHOLD 1578#ifdef MOUSE_THRESHOLD
… …
1660#endif 1642#endif
1661 } 1643 }
1662 } 1644 }
1663 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1645 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1664 { 1646 {
1665 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1647 while (XCheckTypedWindowEvent (xdisp, scrollBar.win,
1666 MotionNotify, &ev)) 1648 MotionNotify, &ev))
1667 ; 1649 ;
1668 1650
1669 XQueryPointer (disp, scrollBar.win, 1651 XQueryPointer (xdisp, scrollBar.win,
1670 &unused_root, &unused_child, 1652 &unused_root, &unused_child,
1671 &unused_root_x, &unused_root_y, 1653 &unused_root_x, &unused_root_y,
1672 &ev.xbutton.x, &ev.xbutton.y, 1654 &ev.xbutton.x, &ev.xbutton.y,
1673 &unused_mask); 1655 &unused_mask);
1674 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1656 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
… …
1818 /* 1800 /*
1819 * VT window processing of button press 1801 * VT window processing of button press
1820 */ 1802 */
1821 if (ev.window == vt) 1803 if (ev.window == vt)
1822 { 1804 {
1805 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1806 return;
1807
1823#if ISO_14755 1808#if ISO_14755
1824 // 5.4 1809 // 5.4
1825 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1810 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1826 { 1811 {
1827 iso14755_54 (ev.x, ev.y); 1812 iso14755_54 (ev.x, ev.y);
… …
1869 else 1854 else
1870 { 1855 {
1871 if (ev.button != MEvent.button) 1856 if (ev.button != MEvent.button)
1872 MEvent.clicks = 0; 1857 MEvent.clicks = 0;
1873 1858
1874 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1875 switch (ev.button) 1859 switch (ev.button)
1876 { 1860 {
1877 case Button1: 1861 case Button1:
1878 /* allow meta + click to select rectangular areas */ 1862 /* allow meta + click to select rectangular areas */
1879 /* should be done in screen.C */ 1863 /* should be done in screen.C */
1880#if ENABLE_FRILLS 1864#if ENABLE_FRILLS
1881 selection.rect = !!(ev.state & ModMetaMask); 1865 selection.rect = !!(ev.state & ModMetaMask);
1882#else 1866#else
1883 selection.rect = false; 1867 selection.rect = false;
1884#endif 1868#endif
1885 1869
1886 /* allow shift+left click to extend selection */ 1870 /* allow shift+left click to extend selection */
1887 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) 1871 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1888 { 1872 {
1889 if (MEvent.button == Button1 && clickintime) 1873 if (MEvent.button == Button1 && clickintime)
1890 selection_rotate (ev.x, ev.y); 1874 selection_rotate (ev.x, ev.y);
1891 else 1875 else
1892 selection_extend (ev.x, ev.y, 1); 1876 selection_extend (ev.x, ev.y, 1);
1893 } 1877 }
1894 else 1878 else
1895 { 1879 {
1896 if (MEvent.button == Button1 && clickintime) 1880 if (MEvent.button == Button1 && clickintime)
1897 MEvent.clicks++; 1881 MEvent.clicks++;
1898 else 1882 else
1899 MEvent.clicks = 1; 1883 MEvent.clicks = 1;
1900 1884
1901 selection_click (MEvent.clicks, ev.x, ev.y); 1885 selection_click (MEvent.clicks, ev.x, ev.y);
1902 } 1886 }
1903 1887
1904 MEvent.button = Button1; 1888 MEvent.button = Button1;
1905 break; 1889 break;
1906 1890
1907 case Button3: 1891 case Button3:
1908 if (MEvent.button == Button3 && clickintime) 1892 if (MEvent.button == Button3 && clickintime)
1909 selection_rotate (ev.x, ev.y); 1893 selection_rotate (ev.x, ev.y);
1910 else 1894 else
1911 selection_extend (ev.x, ev.y, 1); 1895 selection_extend (ev.x, ev.y, 1);
1912 1896
1913 MEvent.button = Button3; 1897 MEvent.button = Button3;
1914 break; 1898 break;
1915 } 1899 }
1916 } 1900 }
1917 1901
1918 MEvent.time = ev.time; 1902 MEvent.time = ev.time;
1919 return; 1903 return;
1920 } 1904 }
1921 1905
… …
2084 sel_scroll_ev.stop(); 2068 sel_scroll_ev.stop();
2085#endif 2069#endif
2086 2070
2087 if (ev.window == vt) 2071 if (ev.window == vt)
2088 { 2072 {
2073 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2074 return;
2075
2089#if ISO_14755 2076#if ISO_14755
2090 // 5.4 2077 // 5.4
2091 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2078 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2092 return; 2079 return;
2093#endif 2080#endif
2081
2094 if (reportmode) 2082 if (reportmode)
2095 { 2083 {
2096 /* mouse report from vt window */ 2084 /* mouse report from vt window */
2097 /* don't report release of wheel "buttons" */ 2085 /* don't report release of wheel "buttons" */
2098 if (ev.button >= 4) 2086 if (ev.button >= 4)
… …
2122 if (priv_modes & PrivMode_mouse_report 2110 if (priv_modes & PrivMode_mouse_report
2123 && bypass_keystate 2111 && bypass_keystate
2124 && ev.button == Button1 && MEvent.clicks <= 1) 2112 && ev.button == Button1 && MEvent.clicks <= 1)
2125 selection_extend (ev.x, ev.y, 0); 2113 selection_extend (ev.x, ev.y, 0);
2126 2114
2127 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2128 return;
2129
2130 switch (ev.button) 2115 switch (ev.button)
2131 { 2116 {
2132 case Button1: 2117 case Button1:
2133 case Button3: 2118 case Button3:
2134 selection_make (ev.time); 2119 selection_make (ev.time);
2135 break; 2120 break;
2136 2121
2137 case Button2: 2122 case Button2:
2138 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2123 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2139 selection_request (ev.time, ev.state & ShiftMask ? Sel_Clipboard : Sel_Primary); 2124 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2140 break; 2125 break;
2141 2126
2142#ifdef MOUSE_WHEEL 2127#ifdef MOUSE_WHEEL
2143 case Button4: 2128 case Button4:
2144 case Button5: 2129 case Button5:
… …
2186#if TINTING 2171#if TINTING
2187/* taken from aterm-0.4.2 */ 2172/* taken from aterm-0.4.2 */
2188 2173
2189typedef uint32_t RUINT32T; 2174typedef uint32_t RUINT32T;
2190 2175
2191void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm) 2176void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2192{ 2177{
2193 int sh_r, sh_g, sh_b; 2178 int sh_r, sh_g, sh_b;
2194 RUINT32T mask_r, mask_g, mask_b; 2179 RUINT32T mask_r, mask_g, mask_b;
2195 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2180 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2196 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2181 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2197 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2182 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2198 int i; 2183 int i;
2199 2184
2200 Visual *visual = display->visual; 2185 Visual *visual = term->visual;
2201 2186
2202 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2187 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2203 2188
2204 /* for convenience */ 2189 /* for convenience */
2205 mask_r = visual->red_mask; 2190 mask_r = visual->red_mask;
… …
2426 Atom atype; 2411 Atom atype;
2427 unsigned char *prop = NULL; 2412 unsigned char *prop = NULL;
2428 Window root, oldp, *list; 2413 Window root, oldp, *list;
2429 Pixmap rootpixmap = None; 2414 Pixmap rootpixmap = None;
2430 XWindowAttributes wattr, wrootattr; 2415 XWindowAttributes wattr, wrootattr;
2431 dDisp;
2432 2416
2433 pchanged = 0; 2417 pchanged = 0;
2434 2418
2435 if (!OPTION (Opt_transparent)) 2419 if (!OPTION (Opt_transparent))
2436 return pchanged; /* Don't try any more */ 2420 return pchanged; /* Don't try any more */
2437 2421
2438 XGetWindowAttributes (disp, display->root, &wrootattr); 2422 XGetWindowAttributes (xdisp, display->root, &wrootattr);
2439 rootdepth = wrootattr.depth; 2423 rootdepth = wrootattr.depth;
2440 2424
2441 XGetWindowAttributes (disp, parent[0], &wattr); 2425 XGetWindowAttributes (xdisp, parent[0], &wattr);
2442 2426
2443 if (rootdepth != wattr.depth) 2427 if (rootdepth != wattr.depth)
2444 { 2428 {
2445 if (am_transparent) 2429 if (am_transparent)
2446 { 2430 {
2447 pchanged = 1; 2431 pchanged = 1;
2448 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2432 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2449 am_transparent = am_pixmap_trans = 0; 2433 am_transparent = am_pixmap_trans = 0;
2450 } 2434 }
2451 2435
2452 return pchanged; /* Don't try any more */ 2436 return pchanged; /* Don't try any more */
2453 } 2437 }
2454 2438
2455 /* Get all X ops out of the queue so that our information is up-to-date. */ 2439 /* Get all X ops out of the queue so that our information is up-to-date. */
2456 XSync (disp, False); 2440 XSync (xdisp, False);
2457 2441
2458 /* 2442 /*
2459 * Make the frame window set by the window manager have 2443 * Make the frame window set by the window manager have
2460 * the root background. Some window managers put multiple nested frame 2444 * the root background. Some window managers put multiple nested frame
2461 * windows for each client, so we have to take care about that. 2445 * windows for each client, so we have to take care about that.
2462 */ 2446 */
2463 i = (xa[XA_XROOTPMAP_ID] 2447 i = (xa[XA_XROOTPMAP_ID]
2464 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], 2448 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2465 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2449 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2466 &nitems, &bytes_after, &prop) == Success); 2450 &nitems, &bytes_after, &prop) == Success);
2467 2451
2468 if (!i || prop == NULL) 2452 if (!i || prop == NULL)
2469 i = (xa[XA_ESETROOT_PMAP_ID] 2453 i = (xa[XA_ESETROOT_PMAP_ID]
2470 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], 2454 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2471 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2455 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2472 &nitems, &bytes_after, &prop) == Success); 2456 &nitems, &bytes_after, &prop) == Success);
2473 2457
2474 if (!i || prop == NULL 2458 if (!i || prop == NULL
2475#if TINTING 2459#if TINTING
… …
2494 Window cr; 2478 Window cr;
2495 XImage *image; 2479 XImage *image;
2496 GC gc; 2480 GC gc;
2497 XGCValues gcvalue; 2481 XGCValues gcvalue;
2498 2482
2499 XTranslateCoordinates (disp, parent[0], display->root, 2483 XTranslateCoordinates (xdisp, parent[0], display->root,
2500 0, 0, &sx, &sy, &cr); 2484 0, 0, &sx, &sy, &cr);
2501 nw = (unsigned int)szHint.width; 2485 nw = (unsigned int)szHint.width;
2502 nh = (unsigned int)szHint.height; 2486 nh = (unsigned int)szHint.height;
2503 nx = ny = 0; 2487 nx = ny = 0;
2504 2488
… …
2517 } 2501 }
2518 2502
2519 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2503 min_it (nw, (unsigned int) (wrootattr.width - sx));
2520 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2504 min_it (nh, (unsigned int) (wrootattr.height - sy));
2521 2505
2522 XSync (disp, False); 2506 XSync (xdisp, False);
2523 allowedxerror = -1; 2507 allowedxerror = -1;
2524 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2508 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2525 2509
2526 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2510 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2527 /* XXX: may need a delay here? */ 2511 /* XXX: may need a delay here? */
2528 allowedxerror = 0; 2512 allowedxerror = 0;
2529 2513
… …
2532 if (am_transparent && am_pixmap_trans) 2516 if (am_transparent && am_pixmap_trans)
2533 { 2517 {
2534 pchanged = 1; 2518 pchanged = 1;
2535 if (pixmap != None) 2519 if (pixmap != None)
2536 { 2520 {
2537 XFreePixmap (disp, pixmap); 2521 XFreePixmap (xdisp, pixmap);
2538 pixmap = None; 2522 pixmap = None;
2539 } 2523 }
2540 } 2524 }
2541 2525
2542 am_pixmap_trans = 0; 2526 am_pixmap_trans = 0;
2543 } 2527 }
2544 else 2528 else
2545 { 2529 {
2546 if (pixmap != None) 2530 if (pixmap != None)
2547 XFreePixmap (disp, pixmap); 2531 XFreePixmap (xdisp, pixmap);
2548 2532
2549#if TINTING 2533#if TINTING
2550 if (ISSET_PIXCOLOR (Color_tint)) 2534 if (ISSET_PIXCOLOR (Color_tint))
2551 { 2535 {
2552 unsigned short rm, gm, bm; 2536 unsigned short rm, gm, bm;
2553 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2537 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2554 2538
2555 pix_colors_focused[Color_tint].get (display, rm, gm, bm); 2539 pix_colors_focused[Color_tint].get (this, rm, gm, bm);
2556 2540
2557 ShadeXImage (display, image, shade, rm, gm, bm); 2541 ShadeXImage (this, image, shade, rm, gm, bm);
2558 } 2542 }
2559#endif 2543#endif
2560 2544
2561 pixmap = XCreatePixmap (disp, vt, 2545 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2562 szHint.width, szHint.height, image->depth);
2563 gc = XCreateGC (disp, vt, 0UL, &gcvalue); 2546 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2564 XPutImage (disp, pixmap, gc, image, 0, 0, 2547 XPutImage (xdisp, pixmap, gc, image, 0, 0,
2565 nx, ny, image->width, image->height); 2548 nx, ny, image->width, image->height);
2566 XFreeGC (disp, gc); 2549 XFreeGC (xdisp, gc);
2567 XDestroyImage (image); 2550 XDestroyImage (image);
2568 XSetWindowBackgroundPixmap (disp, parent[0], pixmap); 2551 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2569 XClearWindow (disp, parent[0]); 2552 XClearWindow (xdisp, parent[0]);
2570 2553
2571 if (!am_transparent || !am_pixmap_trans) 2554 if (!am_transparent || !am_pixmap_trans)
2572 pchanged = 1; 2555 pchanged = 1;
2573 2556
2574 am_transparent = am_pixmap_trans = 1; 2557 am_transparent = am_pixmap_trans = 1;
2575 } 2558 }
2576 } 2559 }
2577 2560
2578 if (am_pixmap_trans) 2561 if (am_pixmap_trans)
2579 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2562 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2580 else 2563 else
2581 { 2564 {
2582 unsigned int n; 2565 unsigned int n;
2583 /* 2566 /*
2584 * InheritPixmap transparency 2567 * InheritPixmap transparency
2585 */ 2568 */
2586 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2569 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2587 { 2570 {
2588 oldp = parent[i]; 2571 oldp = parent[i];
2589 XQueryTree (disp, parent[i - 1], &root, 2572 XQueryTree (xdisp, parent[i - 1], &root,
2590 &parent[i], &list, &n); 2573 &parent[i], &list, &n);
2591 XFree (list); 2574 XFree (list);
2592 2575
2593 if (parent[i] == display->root) 2576 if (parent[i] == display->root)
2594 { 2577 {
… …
2606 2589
2607 if (pchanged) 2590 if (pchanged)
2608 { 2591 {
2609 for (; n < (unsigned int)i; n++) 2592 for (; n < (unsigned int)i; n++)
2610 { 2593 {
2611 XGetWindowAttributes (disp, parent[n], &wattr); 2594 XGetWindowAttributes (xdisp, parent[n], &wattr);
2612 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2595 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2613 { 2596 {
2614 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2597 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2615 break; 2598 break;
2616 } 2599 }
2617 } 2600 }
2618 } 2601 }
2619 2602
2620 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2603 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2621 { 2604 {
2622 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]); 2605 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2623 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2606 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2624 am_transparent = 0; 2607 am_transparent = 0;
2625 /* XXX: also turn off Opt_transparent? */ 2608 /* XXX: also turn off Opt_transparent? */
2626 } 2609 }
2627 else 2610 else
2628 { 2611 {
2629#if WAIT_FOR_WM
2630 /* wait (an arbitrary period) for the WM to do its thing
2631 * needed for fvwm2.2.2 (and before?) */
2632 sleep (1);
2633#endif
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)
… …
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;
… …
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) */
… …
3591 3572
3592 /* 3573 /*
3593 * reports - some output format copied from XTerm 3574 * reports - some output format copied from XTerm
3594 */ 3575 */
3595 case 11: /* report window state */ 3576 case 11: /* report window state */
3596 XGetWindowAttributes (disp, parent[0], &wattr); 3577 XGetWindowAttributes (xdisp, parent[0], &wattr);
3597 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3578 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3598 break; 3579 break;
3599 case 13: /* report window position */ 3580 case 13: /* report window position */
3600 XGetWindowAttributes (disp, parent[0], &wattr); 3581 XGetWindowAttributes (xdisp, parent[0], &wattr);
3601 XTranslateCoordinates (disp, parent[0], wattr.root, 3582 XTranslateCoordinates (xdisp, parent[0], wattr.root,
3602 -wattr.border_width, -wattr.border_width, 3583 -wattr.border_width, -wattr.border_width,
3603 &x, &y, &wdummy); 3584 &x, &y, &wdummy);
3604 tt_printf ("\033[3;%d;%dt", x, y); 3585 tt_printf ("\033[3;%d;%dt", x, y);
3605 break; 3586 break;
3606 case 14: /* report window size (pixels) */ 3587 case 14: /* report window size (pixels) */
3607 XGetWindowAttributes (disp, parent[0], &wattr); 3588 XGetWindowAttributes (xdisp, parent[0], &wattr);
3608 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3589 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3609 break; 3590 break;
3610 case 18: /* report text area size (chars) */ 3591 case 18: /* report text area size (chars) */
3611 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3592 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3612 break; 3593 break;
… …
3614 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3595 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3615 break; 3596 break;
3616 case 20: /* report icon label */ 3597 case 20: /* report icon label */
3617 { 3598 {
3618 char *s; 3599 char *s;
3619 XGetIconName (disp, parent[0], &s); 3600 XGetIconName (xdisp, parent[0], &s);
3620 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3601 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3621 XFree (s); 3602 XFree (s);
3622 } 3603 }
3623 break; 3604 break;
3624 case 21: /* report window title */ 3605 case 21: /* report window title */
3625 { 3606 {
3626 char *s; 3607 char *s;
3627 XFetchName (disp, parent[0], &s); 3608 XFetchName (xdisp, parent[0], &s);
3628 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3609 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3629 XFree (s); 3610 XFree (s);
3630 } 3611 }
3631 break; 3612 break;
3632 } 3613 }
… …
3734rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3715rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3735{ 3716{
3736 if (str[0] == '?' && !str[1]) 3717 if (str[0] == '?' && !str[1])
3737 { 3718 {
3738 unsigned short r, g, b; 3719 unsigned short r, g, b;
3739 pix_colors_focused[color].get (display, r, g, b); 3720 pix_colors_focused[color].get (this, r, g, b);
3740 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3721 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3741 } 3722 }
3742 else 3723 else
3743 set_window_color (color, str); 3724 set_window_color (color, str);
3744} 3725}
… …
3751{ 3732{
3752 int color; 3733 int color;
3753 char *buf, *name; 3734 char *buf, *name;
3754 bool query = str[0] == '?' && !str[1]; 3735 bool query = str[0] == '?' && !str[1];
3755 int saveop = op; 3736 int saveop = op;
3756 dDisp; 3737
3738 dLocal (Display *, xdisp);
3757 3739
3758 assert (str != NULL); 3740 assert (str != NULL);
3759 switch (op) 3741 switch (op)
3760 { 3742 {
3761 case XTerm_name: 3743 case XTerm_name:
… …
3777 unsigned long bytes_after; 3759 unsigned long bytes_after;
3778 unsigned char *value = 0; 3760 unsigned char *value = 0;
3779 const char *str = ""; 3761 const char *str = "";
3780 3762
3781 if (prop 3763 if (prop
3782 && XGetWindowProperty (disp, parent[0], 3764 && XGetWindowProperty (xdisp, parent[0],
3783 prop, 0, 1<<16, 0, AnyPropertyType, 3765 prop, 0, 1<<16, 0, AnyPropertyType,
3784 &actual_type, &actual_format, 3766 &actual_type, &actual_format,
3785 &nitems, &bytes_after, &value) == Success 3767 &nitems, &bytes_after, &value) == Success
3786 && actual_type != None 3768 && actual_type != None
3787 && actual_format == 8) 3769 && actual_format == 8)
3788 str = (const char *)(value); 3770 str = (const char *)(value);
3789 3771
3790 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3772 tt_printf ("\033]%d;%s%c", op, str, resp);
3791 3773
3792 XFree (value); 3774 XFree (value);
3793 } 3775 }
3794 else 3776 else
3795 { 3777 {
… …
3799 { 3781 {
3800 *eq = 0; 3782 *eq = 0;
3801 set_utf8_property (display->atom (str), eq + 1); 3783 set_utf8_property (display->atom (str), eq + 1);
3802 } 3784 }
3803 else 3785 else
3804 XDeleteProperty (disp, parent[0], 3786 XDeleteProperty (xdisp, parent[0],
3805 display->atom (str)); 3787 display->atom (str));
3806 } 3788 }
3807 break; 3789 break;
3808 3790
3809 case XTerm_Color: 3791 case XTerm_Color:
… …
3822 *buf++ = '\0'; 3804 *buf++ = '\0';
3823 3805
3824 if (name[0] == '?' && !name[1]) 3806 if (name[0] == '?' && !name[1])
3825 { 3807 {
3826 unsigned short r, g, b; 3808 unsigned short r, g, b;
3827 pix_colors_focused[color].get (display, r, g, b); 3809 pix_colors_focused[color].get (this, r, g, b);
3828 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3810 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", op, color, r, g, b, resp);
3829 } 3811 }
3830 else 3812 else
3831 set_window_color (color, name); 3813 set_window_color (color, name);
3832 } 3814 }
3833 break; 3815 break;
3834 case XTerm_Color00: 3816 case XTerm_Color00:
3835 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3817 process_color_seq (op, Color_fg, str, resp);
3836 break; 3818 break;
3837 case XTerm_Color01: 3819 case XTerm_Color01:
3838 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3820 process_color_seq (op, Color_bg, str, resp);
3839 break; 3821 break;
3840#ifndef NO_CURSORCOLOR 3822#ifndef NO_CURSORCOLOR
3841 case XTerm_Color_cursor: 3823 case XTerm_Color_cursor:
3842 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3824 process_color_seq (op, Color_cursor, str, resp);
3843 break; 3825 break;
3844#endif 3826#endif
3845 case XTerm_Color_pointer_fg: 3827 case XTerm_Color_pointer_fg:
3846 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3828 process_color_seq (op, Color_pointer_fg, str, resp);
3847 break; 3829 break;
3848 case XTerm_Color_pointer_bg: 3830 case XTerm_Color_pointer_bg:
3849 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3831 process_color_seq (op, Color_pointer_bg, str, resp);
3850 break; 3832 break;
3851#ifndef NO_BOLD_UNDERLINE_REVERSE 3833#ifndef NO_BOLD_UNDERLINE_REVERSE
3852 case XTerm_Color_RV: 3834 case XTerm_Color_RV:
3853 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3835 process_color_seq (op, Color_RV, str, resp);
3854 break; 3836 break;
3855 case Rxvt_Color_BD: 3837 case Rxvt_Color_BD:
3856 case URxvt_Color_BD: 3838 case URxvt_Color_BD:
3857 process_color_seq (op, Color_BD, str, resp); 3839 process_color_seq (op, Color_BD, str, resp);
3858 break; 3840 break;
3859 case Rxvt_Color_UL: 3841 case Rxvt_Color_UL:
3860 case URxvt_Color_UL: 3842 case URxvt_Color_UL:
3861 process_color_seq (op, Color_UL, str, resp); 3843 process_color_seq (op, Color_UL, str, resp);
3862 break; 3844 break;
3863 case URxvt_Color_IT: 3845 case URxvt_Color_IT:
3864 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3846 process_color_seq (op, Color_IT, str, resp);
3865 break; 3847 break;
3866#endif 3848#endif
3867#if TRANSPARENT && TINTING 3849#if TRANSPARENT && TINTING
3868 case URxvt_Color_tint: 3850 case URxvt_Color_tint:
3869 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3851 process_color_seq (op, Color_tint, str, resp);
3870 check_our_parents (); 3852 check_our_parents ();
3871 if (am_transparent) 3853 if (am_transparent)
3872 want_full_refresh = want_refresh = 1; 3854 want_full_refresh = want_refresh = 1;
3873 break; 3855 break;
3874#endif 3856#endif
… …
3948 allocated.push_back ((void *)res); 3930 allocated.push_back ((void *)res);
3949 set_fonts (); 3931 set_fonts ();
3950 } 3932 }
3951 break; 3933 break;
3952 3934
3935 case URxvt_version:
3936 if (query)
3937 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3938 op,
3939 rs[Rs_name], VERSION[0], VERSION[2],
3940 resp);
3941 break;
3942
3953#if ENABLE_FRILLS 3943#if ENABLE_FRILLS
3954 case URxvt_locale: 3944 case URxvt_locale:
3955 if (query) 3945 if (query)
3956 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3946 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
3957 else 3947 else
3958 { 3948 {
3959 set_locale (str); 3949 set_locale (str);
3960 pty->set_utf8_mode (enc_utf8); 3950 pty->set_utf8_mode (enc_utf8);
3961 init_xlocale (); 3951 init_xlocale ();

Diff Legend

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