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.293 by root, Mon Jan 30 04:27:17 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;
… …
1401 case ButtonRelease: 1385 case ButtonRelease:
1402 button_release (ev.xbutton); 1386 button_release (ev.xbutton);
1403 break; 1387 break;
1404 1388
1405 case ClientMessage: 1389 case ClientMessage:
1406 if (ev.xclient.format == 32) 1390 if (ev.xclient.format == 32
1391 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1407 { 1392 {
1408 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1393 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1409 { 1394 {
1410 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1395 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1411 { 1396 {
1397 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1398 {
1412 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)))
1413 destroy (); 1400 destroy ();
1401 }
1402#if ENABLE_EWMH
1403 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1404 XSendEvent (xdisp, ev.xclient.window = display->root,
1405 False, SubstructureRedirectMask | SubstructureNotifyMask,
1406 &ev);
1407#endif
1414 } 1408 }
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 } 1409 }
1422#if ENABLE_XEMBED 1410#if ENABLE_XEMBED
1423 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED]) 1411 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1424 { 1412 {
1425 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN) 1413 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
… …
1469 break; 1457 break;
1470 1458
1471 case ConfigureNotify: 1459 case ConfigureNotify:
1472 if (ev.xconfigure.window == parent[0]) 1460 if (ev.xconfigure.window == parent[0])
1473 { 1461 {
1474 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1462 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev))
1475 ; 1463 ;
1476 1464
1477 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1465 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1478 { 1466 {
1479 seen_resize = 1; 1467 seen_resize = 1;
… …
1488#endif 1476#endif
1489 } 1477 }
1490 break; 1478 break;
1491 1479
1492 case PropertyNotify: 1480 case PropertyNotify:
1481 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1493 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1482 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1494 && ev.xproperty.state == PropertyNewValue) 1483 && ev.xproperty.state == PropertyNewValue)
1495 selection_property (ev.xproperty.window, ev.xproperty.atom); 1484 selection_property (ev.xproperty.window, ev.xproperty.atom);
1496 1485
1497 break; 1486 break;
1498 1487
1499 case SelectionClear: 1488 case SelectionClear:
1500 selection_clear (); 1489 selection_clear ();
… …
1536 if (ev.xany.window == vt) 1525 if (ev.xany.window == vt)
1537 { 1526 {
1538 do 1527 do
1539 scr_expose (ev.xexpose.x, ev.xexpose.y, 1528 scr_expose (ev.xexpose.x, ev.xexpose.y,
1540 ev.xexpose.width, ev.xexpose.height, False); 1529 ev.xexpose.width, ev.xexpose.height, False);
1541 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1530 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev));
1542 1531
1543 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1532 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1544 1533
1545 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1534 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev))
1546 scr_expose (ev.xexpose.x, ev.xexpose.y, 1535 scr_expose (ev.xexpose.x, ev.xexpose.y,
1547 ev.xexpose.width, ev.xexpose.height, False); 1536 ev.xexpose.width, ev.xexpose.height, False);
1548 1537
1549 want_refresh = 1; 1538 want_refresh = 1;
1550 } 1539 }
1551 else 1540 else
1552 { 1541 {
1553 XEvent unused_event; 1542 XEvent unused_event;
1554 1543
1555 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1544 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event))
1556 ; 1545 ;
1557 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1546 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event))
1558 ; 1547 ;
1559 1548
1560 if (isScrollbarWindow (ev.xany.window)) 1549 if (isScrollbarWindow (ev.xany.window))
1561 { 1550 {
1562 scrollBar.setIdle (); 1551 scrollBar.setIdle ();
1563 scrollbar_show (0); 1552 scrollbar_show (0);
1564 } 1553 }
1565 1554
1566#ifdef TRANSPARENT 1555#ifdef TRANSPARENT
1567 if (am_transparent && ev.xany.window == parent[0]) 1556 if (am_transparent && ev.xany.window == parent[0])
1568 XClearWindow (disp, ev.xany.window); 1557 XClearWindow (xdisp, ev.xany.window);
1569#endif 1558#endif
1570 } 1559 }
1571 break; 1560 break;
1572 1561
1573 case MotionNotify: 1562 case MotionNotify:
… …
1583 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1572 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1584 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1573 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1585 ; // nop 1574 ; // nop
1586 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1575 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1587 { 1576 {
1588 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1577 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev))
1589 ; 1578 ;
1590 1579
1591 XQueryPointer (disp, vt, 1580 XQueryPointer (xdisp, vt,
1592 &unused_root, &unused_child, 1581 &unused_root, &unused_child,
1593 &unused_root_x, &unused_root_y, 1582 &unused_root_x, &unused_root_y,
1594 &ev.xbutton.x, &ev.xbutton.y, 1583 &ev.xbutton.x, &ev.xbutton.y,
1595 &ev.xbutton.state); 1584 &ev.xbutton.state);
1596#ifdef MOUSE_THRESHOLD 1585#ifdef MOUSE_THRESHOLD
… …
1660#endif 1649#endif
1661 } 1650 }
1662 } 1651 }
1663 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1652 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1664 { 1653 {
1665 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1654 while (XCheckTypedWindowEvent (xdisp, scrollBar.win,
1666 MotionNotify, &ev)) 1655 MotionNotify, &ev))
1667 ; 1656 ;
1668 1657
1669 XQueryPointer (disp, scrollBar.win, 1658 XQueryPointer (xdisp, scrollBar.win,
1670 &unused_root, &unused_child, 1659 &unused_root, &unused_child,
1671 &unused_root_x, &unused_root_y, 1660 &unused_root_x, &unused_root_y,
1672 &ev.xbutton.x, &ev.xbutton.y, 1661 &ev.xbutton.x, &ev.xbutton.y,
1673 &unused_mask); 1662 &unused_mask);
1674 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1663 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
… …
1818 /* 1807 /*
1819 * VT window processing of button press 1808 * VT window processing of button press
1820 */ 1809 */
1821 if (ev.window == vt) 1810 if (ev.window == vt)
1822 { 1811 {
1812 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1813 return;
1814
1823#if ISO_14755 1815#if ISO_14755
1824 // 5.4 1816 // 5.4
1825 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1817 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1826 { 1818 {
1827 iso14755_54 (ev.x, ev.y); 1819 iso14755_54 (ev.x, ev.y);
… …
1869 else 1861 else
1870 { 1862 {
1871 if (ev.button != MEvent.button) 1863 if (ev.button != MEvent.button)
1872 MEvent.clicks = 0; 1864 MEvent.clicks = 0;
1873 1865
1874 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1875 switch (ev.button) 1866 switch (ev.button)
1876 { 1867 {
1877 case Button1: 1868 case Button1:
1878 /* allow meta + click to select rectangular areas */ 1869 /* allow meta + click to select rectangular areas */
1879 /* should be done in screen.C */ 1870 /* should be done in screen.C */
1880#if ENABLE_FRILLS 1871#if ENABLE_FRILLS
1881 selection.rect = !!(ev.state & ModMetaMask); 1872 selection.rect = !!(ev.state & ModMetaMask);
1882#else 1873#else
1883 selection.rect = false; 1874 selection.rect = false;
1884#endif 1875#endif
1885 1876
1886 /* allow shift+left click to extend selection */ 1877 /* allow shift+left click to extend selection */
1887 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) 1878 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1888 { 1879 {
1889 if (MEvent.button == Button1 && clickintime) 1880 if (MEvent.button == Button1 && clickintime)
1890 selection_rotate (ev.x, ev.y); 1881 selection_rotate (ev.x, ev.y);
1891 else 1882 else
1892 selection_extend (ev.x, ev.y, 1); 1883 selection_extend (ev.x, ev.y, 1);
1893 } 1884 }
1894 else 1885 else
1895 { 1886 {
1896 if (MEvent.button == Button1 && clickintime) 1887 if (MEvent.button == Button1 && clickintime)
1897 MEvent.clicks++; 1888 MEvent.clicks++;
1898 else 1889 else
1899 MEvent.clicks = 1; 1890 MEvent.clicks = 1;
1900 1891
1901 selection_click (MEvent.clicks, ev.x, ev.y); 1892 selection_click (MEvent.clicks, ev.x, ev.y);
1902 } 1893 }
1903 1894
1904 MEvent.button = Button1; 1895 MEvent.button = Button1;
1905 break; 1896 break;
1906 1897
1907 case Button3: 1898 case Button3:
1908 if (MEvent.button == Button3 && clickintime) 1899 if (MEvent.button == Button3 && clickintime)
1909 selection_rotate (ev.x, ev.y); 1900 selection_rotate (ev.x, ev.y);
1910 else 1901 else
1911 selection_extend (ev.x, ev.y, 1); 1902 selection_extend (ev.x, ev.y, 1);
1912 1903
1913 MEvent.button = Button3; 1904 MEvent.button = Button3;
1914 break; 1905 break;
1915 } 1906 }
1916 } 1907 }
1917 1908
1918 MEvent.time = ev.time; 1909 MEvent.time = ev.time;
1919 return; 1910 return;
1920 } 1911 }
1921 1912
… …
2084 sel_scroll_ev.stop(); 2075 sel_scroll_ev.stop();
2085#endif 2076#endif
2086 2077
2087 if (ev.window == vt) 2078 if (ev.window == vt)
2088 { 2079 {
2080 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2081 return;
2082
2089#if ISO_14755 2083#if ISO_14755
2090 // 5.4 2084 // 5.4
2091 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2085 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2092 return; 2086 return;
2093#endif 2087#endif
2088
2094 if (reportmode) 2089 if (reportmode)
2095 { 2090 {
2096 /* mouse report from vt window */ 2091 /* mouse report from vt window */
2097 /* don't report release of wheel "buttons" */ 2092 /* don't report release of wheel "buttons" */
2098 if (ev.button >= 4) 2093 if (ev.button >= 4)
… …
2122 if (priv_modes & PrivMode_mouse_report 2117 if (priv_modes & PrivMode_mouse_report
2123 && bypass_keystate 2118 && bypass_keystate
2124 && ev.button == Button1 && MEvent.clicks <= 1) 2119 && ev.button == Button1 && MEvent.clicks <= 1)
2125 selection_extend (ev.x, ev.y, 0); 2120 selection_extend (ev.x, ev.y, 0);
2126 2121
2127 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2128 return;
2129
2130 switch (ev.button) 2122 switch (ev.button)
2131 { 2123 {
2132 case Button1: 2124 case Button1:
2133 case Button3: 2125 case Button3:
2134 selection_make (ev.time); 2126 selection_make (ev.time);
2135 break; 2127 break;
2136 2128
2137 case Button2: 2129 case Button2:
2138 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?
2139 selection_request (ev.time, ev.state & ShiftMask ? Sel_Clipboard : Sel_Primary); 2131 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2140 break; 2132 break;
2141 2133
2142#ifdef MOUSE_WHEEL 2134#ifdef MOUSE_WHEEL
2143 case Button4: 2135 case Button4:
2144 case Button5: 2136 case Button5:
… …
2186#if TINTING 2178#if TINTING
2187/* taken from aterm-0.4.2 */ 2179/* taken from aterm-0.4.2 */
2188 2180
2189typedef uint32_t RUINT32T; 2181typedef uint32_t RUINT32T;
2190 2182
2191void 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)
2192{ 2184{
2193 int sh_r, sh_g, sh_b; 2185 int sh_r, sh_g, sh_b;
2194 RUINT32T mask_r, mask_g, mask_b; 2186 RUINT32T mask_r, mask_g, mask_b;
2195 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2187 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2196 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2188 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2197 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2189 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2198 int i; 2190 int i;
2199 2191
2200 Visual *visual = display->visual; 2192 Visual *visual = term->visual;
2201 2193
2202 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2194 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2203 2195
2204 /* for convenience */ 2196 /* for convenience */
2205 mask_r = visual->red_mask; 2197 mask_r = visual->red_mask;
… …
2426 Atom atype; 2418 Atom atype;
2427 unsigned char *prop = NULL; 2419 unsigned char *prop = NULL;
2428 Window root, oldp, *list; 2420 Window root, oldp, *list;
2429 Pixmap rootpixmap = None; 2421 Pixmap rootpixmap = None;
2430 XWindowAttributes wattr, wrootattr; 2422 XWindowAttributes wattr, wrootattr;
2431 dDisp;
2432 2423
2433 pchanged = 0; 2424 pchanged = 0;
2434 2425
2435 if (!OPTION (Opt_transparent)) 2426 if (!OPTION (Opt_transparent))
2436 return pchanged; /* Don't try any more */ 2427 return pchanged; /* Don't try any more */
2437 2428
2438 XGetWindowAttributes (disp, display->root, &wrootattr); 2429 XGetWindowAttributes (xdisp, display->root, &wrootattr);
2439 rootdepth = wrootattr.depth; 2430 rootdepth = wrootattr.depth;
2440 2431
2441 XGetWindowAttributes (disp, parent[0], &wattr); 2432 XGetWindowAttributes (xdisp, parent[0], &wattr);
2442 2433
2443 if (rootdepth != wattr.depth) 2434 if (rootdepth != wattr.depth)
2444 { 2435 {
2445 if (am_transparent) 2436 if (am_transparent)
2446 { 2437 {
2447 pchanged = 1; 2438 pchanged = 1;
2448 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2439 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2449 am_transparent = am_pixmap_trans = 0; 2440 am_transparent = am_pixmap_trans = 0;
2450 } 2441 }
2451 2442
2452 return pchanged; /* Don't try any more */ 2443 return pchanged; /* Don't try any more */
2453 } 2444 }
2454 2445
2455 /* 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. */
2456 XSync (disp, False); 2447 XSync (xdisp, False);
2457 2448
2458 /* 2449 /*
2459 * Make the frame window set by the window manager have 2450 * Make the frame window set by the window manager have
2460 * the root background. Some window managers put multiple nested frame 2451 * the root background. Some window managers put multiple nested frame
2461 * 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.
2462 */ 2453 */
2463 i = (xa[XA_XROOTPMAP_ID] 2454 i = (xa[XA_XROOTPMAP_ID]
2464 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], 2455 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2465 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2456 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2466 &nitems, &bytes_after, &prop) == Success); 2457 &nitems, &bytes_after, &prop) == Success);
2467 2458
2468 if (!i || prop == NULL) 2459 if (!i || prop == NULL)
2469 i = (xa[XA_ESETROOT_PMAP_ID] 2460 i = (xa[XA_ESETROOT_PMAP_ID]
2470 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], 2461 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2471 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2462 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2472 &nitems, &bytes_after, &prop) == Success); 2463 &nitems, &bytes_after, &prop) == Success);
2473 2464
2474 if (!i || prop == NULL 2465 if (!i || prop == NULL
2475#if TINTING 2466#if TINTING
… …
2494 Window cr; 2485 Window cr;
2495 XImage *image; 2486 XImage *image;
2496 GC gc; 2487 GC gc;
2497 XGCValues gcvalue; 2488 XGCValues gcvalue;
2498 2489
2499 XTranslateCoordinates (disp, parent[0], display->root, 2490 XTranslateCoordinates (xdisp, parent[0], display->root,
2500 0, 0, &sx, &sy, &cr); 2491 0, 0, &sx, &sy, &cr);
2501 nw = (unsigned int)szHint.width; 2492 nw = (unsigned int)szHint.width;
2502 nh = (unsigned int)szHint.height; 2493 nh = (unsigned int)szHint.height;
2503 nx = ny = 0; 2494 nx = ny = 0;
2504 2495
… …
2517 } 2508 }
2518 2509
2519 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2510 min_it (nw, (unsigned int) (wrootattr.width - sx));
2520 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2511 min_it (nh, (unsigned int) (wrootattr.height - sy));
2521 2512
2522 XSync (disp, False); 2513 XSync (xdisp, False);
2523 allowedxerror = -1; 2514 allowedxerror = -1;
2524 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2515 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2525 2516
2526 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2517 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2527 /* XXX: may need a delay here? */ 2518 /* XXX: may need a delay here? */
2528 allowedxerror = 0; 2519 allowedxerror = 0;
2529 2520
… …
2532 if (am_transparent && am_pixmap_trans) 2523 if (am_transparent && am_pixmap_trans)
2533 { 2524 {
2534 pchanged = 1; 2525 pchanged = 1;
2535 if (pixmap != None) 2526 if (pixmap != None)
2536 { 2527 {
2537 XFreePixmap (disp, pixmap); 2528 XFreePixmap (xdisp, pixmap);
2538 pixmap = None; 2529 pixmap = None;
2539 } 2530 }
2540 } 2531 }
2541 2532
2542 am_pixmap_trans = 0; 2533 am_pixmap_trans = 0;
2543 } 2534 }
2544 else 2535 else
2545 { 2536 {
2546 if (pixmap != None) 2537 if (pixmap != None)
2547 XFreePixmap (disp, pixmap); 2538 XFreePixmap (xdisp, pixmap);
2548 2539
2549#if TINTING 2540#if TINTING
2550 if (ISSET_PIXCOLOR (Color_tint)) 2541 if (ISSET_PIXCOLOR (Color_tint))
2551 { 2542 {
2552 unsigned short rm, gm, bm; 2543 rxvt_rgba c;
2553 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2544 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2554 2545
2555 pix_colors_focused[Color_tint].get (display, rm, gm, bm); 2546 pix_colors_focused[Color_tint].get (this, c);
2556 2547
2557 ShadeXImage (display, image, shade, rm, gm, bm); 2548 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2558 } 2549 }
2559#endif 2550#endif
2560 2551
2561 pixmap = XCreatePixmap (disp, vt, 2552 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2562 szHint.width, szHint.height, image->depth);
2563 gc = XCreateGC (disp, vt, 0UL, &gcvalue); 2553 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2564 XPutImage (disp, pixmap, gc, image, 0, 0, 2554 XPutImage (xdisp, pixmap, gc, image, 0, 0,
2565 nx, ny, image->width, image->height); 2555 nx, ny, image->width, image->height);
2566 XFreeGC (disp, gc); 2556 XFreeGC (xdisp, gc);
2567 XDestroyImage (image); 2557 XDestroyImage (image);
2568 XSetWindowBackgroundPixmap (disp, parent[0], pixmap); 2558 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2569 XClearWindow (disp, parent[0]); 2559 XClearWindow (xdisp, parent[0]);
2570 2560
2571 if (!am_transparent || !am_pixmap_trans) 2561 if (!am_transparent || !am_pixmap_trans)
2572 pchanged = 1; 2562 pchanged = 1;
2573 2563
2574 am_transparent = am_pixmap_trans = 1; 2564 am_transparent = am_pixmap_trans = 1;
2575 } 2565 }
2576 } 2566 }
2577 2567
2578 if (am_pixmap_trans) 2568 if (am_pixmap_trans)
2579 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2569 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2580 else 2570 else
2581 { 2571 {
2582 unsigned int n; 2572 unsigned int n;
2583 /* 2573 /*
2584 * InheritPixmap transparency 2574 * InheritPixmap transparency
2585 */ 2575 */
2586 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2576 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2587 { 2577 {
2588 oldp = parent[i]; 2578 oldp = parent[i];
2589 XQueryTree (disp, parent[i - 1], &root, 2579 XQueryTree (xdisp, parent[i - 1], &root,
2590 &parent[i], &list, &n); 2580 &parent[i], &list, &n);
2591 XFree (list); 2581 XFree (list);
2592 2582
2593 if (parent[i] == display->root) 2583 if (parent[i] == display->root)
2594 { 2584 {
… …
2606 2596
2607 if (pchanged) 2597 if (pchanged)
2608 { 2598 {
2609 for (; n < (unsigned int)i; n++) 2599 for (; n < (unsigned int)i; n++)
2610 { 2600 {
2611 XGetWindowAttributes (disp, parent[n], &wattr); 2601 XGetWindowAttributes (xdisp, parent[n], &wattr);
2612 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2602 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2613 { 2603 {
2614 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2604 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2615 break; 2605 break;
2616 } 2606 }
2617 } 2607 }
2618 } 2608 }
2619 2609
2620 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2610 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2621 { 2611 {
2622 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]); 2612 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2623 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2613 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2624 am_transparent = 0; 2614 am_transparent = 0;
2625 /* XXX: also turn off Opt_transparent? */ 2615 /* XXX: also turn off Opt_transparent? */
2626 } 2616 }
2627 else 2617 else
2628 { 2618 {
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++) 2619 for (n = 0; n < (unsigned int)i; n++)
2635 { 2620 {
2636 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); 2621 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2637 XClearWindow (disp, parent[n]); 2622 XClearWindow (xdisp, parent[n]);
2638 } 2623 }
2639 2624
2640 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2625 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2641 am_transparent = 1; 2626 am_transparent = 1;
2642 } 2627 }
2643 2628
2644 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2629 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2645 parent[i] = None; 2630 parent[i] = None;
2646 } 2631 }
2647 2632
2648 if (scrollBar.win) 2633 if (scrollBar.win)
2649 { 2634 {
2650 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2635 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2651 scrollBar.setIdle (); 2636 scrollBar.setIdle ();
2652 scrollbar_show (0); 2637 scrollbar_show (0);
2653 } 2638 }
2654 2639
2655 if (am_transparent) 2640 if (am_transparent)
… …
3289 ndef = get_byte_array_bit (csi_defaults, i); 3274 ndef = get_byte_array_bit (csi_defaults, i);
3290 for (p = 0; p < nargs; p++) 3275 for (p = 0; p < nargs; p++)
3291 if (arg[p] == -1) 3276 if (arg[p] == -1)
3292 arg[p] = ndef; 3277 arg[p] = ndef;
3293 3278
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 /* 3279 /*
3302 * private mode handling 3280 * private mode handling
3303 */ 3281 */
3304 if (priv) 3282 if (priv)
3305 { 3283 {
3306 switch (priv) 3284 switch (priv)
3307 { 3285 {
3308 case '>': 3286 case '>':
3309 if (ch == CSI_DA) /* secondary device attributes */ 3287 if (ch == CSI_DA) /* secondary device attributes */
3310 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 3288 {
3289 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3290 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3291 //
3292 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3293 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3294 // that we do not support xterm mouse reporting (should be 95 when we do).
3295 //
3296 tt_printf ("\033[>%d;94;0c", 'U');
3297 }
3311 break; 3298 break;
3312 case '?': 3299 case '?':
3313 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3300 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3314 process_terminal_mode (ch, priv, nargs, arg); 3301 process_terminal_mode (ch, priv, nargs, arg);
3315 break; 3302 break;
… …
3543rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3530rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3544{ 3531{
3545 int x, y; 3532 int x, y;
3546 XWindowAttributes wattr; 3533 XWindowAttributes wattr;
3547 Window wdummy; 3534 Window wdummy;
3548 dDisp; 3535
3536 dLocal (Display *, xdisp);
3549 3537
3550 if (nargs == 0) 3538 if (nargs == 0)
3551 return; 3539 return;
3552 3540
3553 switch (args[0]) 3541 switch (args[0])
3554 { 3542 {
3555 /* 3543 /*
3556 * commands 3544 * commands
3557 */ 3545 */
3558 case 1: /* deiconify window */ 3546 case 1: /* deiconify window */
3559 XMapWindow (disp, parent[0]); 3547 XMapWindow (xdisp, parent[0]);
3560 break; 3548 break;
3561 case 2: /* iconify window */ 3549 case 2: /* iconify window */
3562 XIconifyWindow (disp, parent[0], display->screen); 3550 XIconifyWindow (xdisp, parent[0], display->screen);
3563 break; 3551 break;
3564 case 3: /* set position (pixels) */ 3552 case 3: /* set position (pixels) */
3565 XMoveWindow (disp, parent[0], args[1], args[2]); 3553 XMoveWindow (xdisp, parent[0], args[1], args[2]);
3566 break; 3554 break;
3567 case 4: /* set size (pixels) */ 3555 case 4: /* set size (pixels) */
3568 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3556 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3569 break; 3557 break;
3570 case 5: /* raise window */ 3558 case 5: /* raise window */
3571 XRaiseWindow (disp, parent[0]); 3559 XRaiseWindow (xdisp, parent[0]);
3572 break; 3560 break;
3573 case 6: /* lower window */ 3561 case 6: /* lower window */
3574 XLowerWindow (disp, parent[0]); 3562 XLowerWindow (xdisp, parent[0]);
3575 break; 3563 break;
3576 case 7: /* refresh window */ 3564 case 7: /* refresh window */
3577 scr_touch (true); 3565 scr_touch (true);
3578 break; 3566 break;
3579 case 8: /* set size (chars) */ 3567 case 8: /* set size (chars) */
… …
3591 3579
3592 /* 3580 /*
3593 * reports - some output format copied from XTerm 3581 * reports - some output format copied from XTerm
3594 */ 3582 */
3595 case 11: /* report window state */ 3583 case 11: /* report window state */
3596 XGetWindowAttributes (disp, parent[0], &wattr); 3584 XGetWindowAttributes (xdisp, parent[0], &wattr);
3597 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3585 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3598 break; 3586 break;
3599 case 13: /* report window position */ 3587 case 13: /* report window position */
3600 XGetWindowAttributes (disp, parent[0], &wattr); 3588 XGetWindowAttributes (xdisp, parent[0], &wattr);
3601 XTranslateCoordinates (disp, parent[0], wattr.root, 3589 XTranslateCoordinates (xdisp, parent[0], wattr.root,
3602 -wattr.border_width, -wattr.border_width, 3590 -wattr.border_width, -wattr.border_width,
3603 &x, &y, &wdummy); 3591 &x, &y, &wdummy);
3604 tt_printf ("\033[3;%d;%dt", x, y); 3592 tt_printf ("\033[3;%d;%dt", x, y);
3605 break; 3593 break;
3606 case 14: /* report window size (pixels) */ 3594 case 14: /* report window size (pixels) */
3607 XGetWindowAttributes (disp, parent[0], &wattr); 3595 XGetWindowAttributes (xdisp, parent[0], &wattr);
3608 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3596 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3609 break; 3597 break;
3610 case 18: /* report text area size (chars) */ 3598 case 18: /* report text area size (chars) */
3611 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3599 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3612 break; 3600 break;
… …
3614 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3602 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3615 break; 3603 break;
3616 case 20: /* report icon label */ 3604 case 20: /* report icon label */
3617 { 3605 {
3618 char *s; 3606 char *s;
3619 XGetIconName (disp, parent[0], &s); 3607 XGetIconName (xdisp, parent[0], &s);
3620 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3608 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3621 XFree (s); 3609 XFree (s);
3622 } 3610 }
3623 break; 3611 break;
3624 case 21: /* report window title */ 3612 case 21: /* report window title */
3625 { 3613 {
3626 char *s; 3614 char *s;
3627 XFetchName (disp, parent[0], &s); 3615 XFetchName (xdisp, parent[0], &s);
3628 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3616 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3629 XFree (s); 3617 XFree (s);
3630 } 3618 }
3631 break; 3619 break;
3632 } 3620 }
… …
3733void 3721void
3734rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3722rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3735{ 3723{
3736 if (str[0] == '?' && !str[1]) 3724 if (str[0] == '?' && !str[1])
3737 { 3725 {
3738 unsigned short r, g, b; 3726 rxvt_rgba c;
3739 pix_colors_focused[color].get (display, r, g, b); 3727 pix_colors_focused[color].get (this, c);
3728
3729#if XFT
3730 if (c.a != rxvt_rgba::MAX_CC)
3731 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3732 else
3733#endif
3740 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3734 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3741 } 3735 }
3742 else 3736 else
3743 set_window_color (color, str); 3737 set_window_color (color, str);
3744} 3738}
3745 3739
… …
3751{ 3745{
3752 int color; 3746 int color;
3753 char *buf, *name; 3747 char *buf, *name;
3754 bool query = str[0] == '?' && !str[1]; 3748 bool query = str[0] == '?' && !str[1];
3755 int saveop = op; 3749 int saveop = op;
3756 dDisp; 3750
3751 dLocal (Display *, xdisp);
3757 3752
3758 assert (str != NULL); 3753 assert (str != NULL);
3759 switch (op) 3754 switch (op)
3760 { 3755 {
3761 case XTerm_name: 3756 case XTerm_name:
… …
3777 unsigned long bytes_after; 3772 unsigned long bytes_after;
3778 unsigned char *value = 0; 3773 unsigned char *value = 0;
3779 const char *str = ""; 3774 const char *str = "";
3780 3775
3781 if (prop 3776 if (prop
3782 && XGetWindowProperty (disp, parent[0], 3777 && XGetWindowProperty (xdisp, parent[0],
3783 prop, 0, 1<<16, 0, AnyPropertyType, 3778 prop, 0, 1<<16, 0, AnyPropertyType,
3784 &actual_type, &actual_format, 3779 &actual_type, &actual_format,
3785 &nitems, &bytes_after, &value) == Success 3780 &nitems, &bytes_after, &value) == Success
3786 && actual_type != None 3781 && actual_type != None
3787 && actual_format == 8) 3782 && actual_format == 8)
3788 str = (const char *)(value); 3783 str = (const char *)(value);
3789 3784
3790 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3785 tt_printf ("\033]%d;%s%c", op, str, resp);
3791 3786
3792 XFree (value); 3787 XFree (value);
3793 } 3788 }
3794 else 3789 else
3795 { 3790 {
… …
3799 { 3794 {
3800 *eq = 0; 3795 *eq = 0;
3801 set_utf8_property (display->atom (str), eq + 1); 3796 set_utf8_property (display->atom (str), eq + 1);
3802 } 3797 }
3803 else 3798 else
3804 XDeleteProperty (disp, parent[0], 3799 XDeleteProperty (xdisp, parent[0],
3805 display->atom (str)); 3800 display->atom (str));
3806 } 3801 }
3807 break; 3802 break;
3808 3803
3809 case XTerm_Color: 3804 case XTerm_Color:
… …
3819 break; 3814 break;
3820 3815
3821 if ((buf = strchr (name, ';')) != NULL) 3816 if ((buf = strchr (name, ';')) != NULL)
3822 *buf++ = '\0'; 3817 *buf++ = '\0';
3823 3818
3824 if (name[0] == '?' && !name[1]) 3819 process_color_seq (op, color, name, resp);
3825 {
3826 unsigned short r, g, b;
3827 pix_colors_focused[color].get (display, r, g, b);
3828 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3829 }
3830 else
3831 set_window_color (color, name);
3832 } 3820 }
3833 break; 3821 break;
3834 case XTerm_Color00: 3822 case XTerm_Color00:
3835 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3823 process_color_seq (op, Color_fg, str, resp);
3836 break; 3824 break;
3837 case XTerm_Color01: 3825 case XTerm_Color01:
3838 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3826 process_color_seq (op, Color_bg, str, resp);
3839 break; 3827 break;
3840#ifndef NO_CURSORCOLOR 3828#ifndef NO_CURSORCOLOR
3841 case XTerm_Color_cursor: 3829 case XTerm_Color_cursor:
3842 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3830 process_color_seq (op, Color_cursor, str, resp);
3843 break; 3831 break;
3844#endif 3832#endif
3845 case XTerm_Color_pointer_fg: 3833 case XTerm_Color_pointer_fg:
3846 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3834 process_color_seq (op, Color_pointer_fg, str, resp);
3847 break; 3835 break;
3848 case XTerm_Color_pointer_bg: 3836 case XTerm_Color_pointer_bg:
3849 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3837 process_color_seq (op, Color_pointer_bg, str, resp);
3850 break; 3838 break;
3851#ifndef NO_BOLD_UNDERLINE_REVERSE 3839#ifndef NO_BOLD_UNDERLINE_REVERSE
3852 case XTerm_Color_RV: 3840 case XTerm_Color_RV:
3853 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3841 process_color_seq (op, Color_RV, str, resp);
3854 break; 3842 break;
3855 case Rxvt_Color_BD: 3843 case Rxvt_Color_BD:
3856 case URxvt_Color_BD: 3844 case URxvt_Color_BD:
3857 process_color_seq (op, Color_BD, str, resp); 3845 process_color_seq (op, Color_BD, str, resp);
3858 break; 3846 break;
3859 case Rxvt_Color_UL: 3847 case Rxvt_Color_UL:
3860 case URxvt_Color_UL: 3848 case URxvt_Color_UL:
3861 process_color_seq (op, Color_UL, str, resp); 3849 process_color_seq (op, Color_UL, str, resp);
3862 break; 3850 break;
3863 case URxvt_Color_IT: 3851 case URxvt_Color_IT:
3864 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3852 process_color_seq (op, Color_IT, str, resp);
3865 break; 3853 break;
3866#endif 3854#endif
3867#if TRANSPARENT && TINTING 3855#if TRANSPARENT && TINTING
3868 case URxvt_Color_tint: 3856 case URxvt_Color_tint:
3869 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3857 process_color_seq (op, Color_tint, str, resp);
3870 check_our_parents (); 3858 check_our_parents ();
3871 if (am_transparent) 3859 if (am_transparent)
3872 want_full_refresh = want_refresh = 1; 3860 want_full_refresh = want_refresh = 1;
3873 break; 3861 break;
3874#endif 3862#endif
… …
3948 allocated.push_back ((void *)res); 3936 allocated.push_back ((void *)res);
3949 set_fonts (); 3937 set_fonts ();
3950 } 3938 }
3951 break; 3939 break;
3952 3940
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
3953#if ENABLE_FRILLS 3949#if ENABLE_FRILLS
3954 case URxvt_locale: 3950 case URxvt_locale:
3955 if (query) 3951 if (query)
3956 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);
3957 else 3953 else
3958 { 3954 {
3959 set_locale (str); 3955 set_locale (str);
3960 pty->set_utf8_mode (enc_utf8); 3956 pty->set_utf8_mode (enc_utf8);
3961 init_xlocale (); 3957 init_xlocale ();

Diff Legend

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