ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.278 by root, Fri Jan 20 18:50:49 2006 UTC vs.
Revision 1.288 by root, Sat Jan 28 20:33:31 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;
… …
1415 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)))
1416 destroy (); 1393 destroy ();
1417 } 1394 }
1418#if ENABLE_EWMH 1395#if ENABLE_EWMH
1419 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1396 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1420 XSendEvent (disp, ev.xclient.window = display->root, 1397 XSendEvent (xdisp, ev.xclient.window = display->root,
1421 False, SubstructureRedirectMask | SubstructureNotifyMask, 1398 False, SubstructureRedirectMask | SubstructureNotifyMask,
1422 &ev); 1399 &ev);
1423#endif 1400#endif
1424 } 1401 }
1425 } 1402 }
… …
1473 break; 1450 break;
1474 1451
1475 case ConfigureNotify: 1452 case ConfigureNotify:
1476 if (ev.xconfigure.window == parent[0]) 1453 if (ev.xconfigure.window == parent[0])
1477 { 1454 {
1478 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1455 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev))
1479 ; 1456 ;
1480 1457
1481 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1458 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1482 { 1459 {
1483 seen_resize = 1; 1460 seen_resize = 1;
… …
1541 if (ev.xany.window == vt) 1518 if (ev.xany.window == vt)
1542 { 1519 {
1543 do 1520 do
1544 scr_expose (ev.xexpose.x, ev.xexpose.y, 1521 scr_expose (ev.xexpose.x, ev.xexpose.y,
1545 ev.xexpose.width, ev.xexpose.height, False); 1522 ev.xexpose.width, ev.xexpose.height, False);
1546 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1523 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev));
1547 1524
1548 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1525 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1549 1526
1550 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1527 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev))
1551 scr_expose (ev.xexpose.x, ev.xexpose.y, 1528 scr_expose (ev.xexpose.x, ev.xexpose.y,
1552 ev.xexpose.width, ev.xexpose.height, False); 1529 ev.xexpose.width, ev.xexpose.height, False);
1553 1530
1554 want_refresh = 1; 1531 want_refresh = 1;
1555 } 1532 }
1556 else 1533 else
1557 { 1534 {
1558 XEvent unused_event; 1535 XEvent unused_event;
1559 1536
1560 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1537 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event))
1561 ; 1538 ;
1562 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1539 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event))
1563 ; 1540 ;
1564 1541
1565 if (isScrollbarWindow (ev.xany.window)) 1542 if (isScrollbarWindow (ev.xany.window))
1566 { 1543 {
1567 scrollBar.setIdle (); 1544 scrollBar.setIdle ();
1568 scrollbar_show (0); 1545 scrollbar_show (0);
1569 } 1546 }
1570 1547
1571#ifdef TRANSPARENT 1548#ifdef TRANSPARENT
1572 if (am_transparent && ev.xany.window == parent[0]) 1549 if (am_transparent && ev.xany.window == parent[0])
1573 XClearWindow (disp, ev.xany.window); 1550 XClearWindow (xdisp, ev.xany.window);
1574#endif 1551#endif
1575 } 1552 }
1576 break; 1553 break;
1577 1554
1578 case MotionNotify: 1555 case MotionNotify:
… …
1588 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1565 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1589 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1566 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1590 ; // nop 1567 ; // nop
1591 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1568 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1592 { 1569 {
1593 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1570 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev))
1594 ; 1571 ;
1595 1572
1596 XQueryPointer (disp, vt, 1573 XQueryPointer (xdisp, vt,
1597 &unused_root, &unused_child, 1574 &unused_root, &unused_child,
1598 &unused_root_x, &unused_root_y, 1575 &unused_root_x, &unused_root_y,
1599 &ev.xbutton.x, &ev.xbutton.y, 1576 &ev.xbutton.x, &ev.xbutton.y,
1600 &ev.xbutton.state); 1577 &ev.xbutton.state);
1601#ifdef MOUSE_THRESHOLD 1578#ifdef MOUSE_THRESHOLD
… …
1665#endif 1642#endif
1666 } 1643 }
1667 } 1644 }
1668 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1645 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1669 { 1646 {
1670 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1647 while (XCheckTypedWindowEvent (xdisp, scrollBar.win,
1671 MotionNotify, &ev)) 1648 MotionNotify, &ev))
1672 ; 1649 ;
1673 1650
1674 XQueryPointer (disp, scrollBar.win, 1651 XQueryPointer (xdisp, scrollBar.win,
1675 &unused_root, &unused_child, 1652 &unused_root, &unused_child,
1676 &unused_root_x, &unused_root_y, 1653 &unused_root_x, &unused_root_y,
1677 &ev.xbutton.x, &ev.xbutton.y, 1654 &ev.xbutton.x, &ev.xbutton.y,
1678 &unused_mask); 1655 &unused_mask);
1679 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1656 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
… …
1823 /* 1800 /*
1824 * VT window processing of button press 1801 * VT window processing of button press
1825 */ 1802 */
1826 if (ev.window == vt) 1803 if (ev.window == vt)
1827 { 1804 {
1805 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1806 return;
1807
1828#if ISO_14755 1808#if ISO_14755
1829 // 5.4 1809 // 5.4
1830 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1810 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1831 { 1811 {
1832 iso14755_54 (ev.x, ev.y); 1812 iso14755_54 (ev.x, ev.y);
… …
1874 else 1854 else
1875 { 1855 {
1876 if (ev.button != MEvent.button) 1856 if (ev.button != MEvent.button)
1877 MEvent.clicks = 0; 1857 MEvent.clicks = 0;
1878 1858
1879 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1880 switch (ev.button) 1859 switch (ev.button)
1881 { 1860 {
1882 case Button1: 1861 case Button1:
1883 /* allow meta + click to select rectangular areas */ 1862 /* allow meta + click to select rectangular areas */
1884 /* should be done in screen.C */ 1863 /* should be done in screen.C */
1885#if ENABLE_FRILLS 1864#if ENABLE_FRILLS
1886 selection.rect = !!(ev.state & ModMetaMask); 1865 selection.rect = !!(ev.state & ModMetaMask);
1887#else 1866#else
1888 selection.rect = false; 1867 selection.rect = false;
1889#endif 1868#endif
1890 1869
1891 /* allow shift+left click to extend selection */ 1870 /* allow shift+left click to extend selection */
1892 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) 1871 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1893 { 1872 {
1894 if (MEvent.button == Button1 && clickintime) 1873 if (MEvent.button == Button1 && clickintime)
1895 selection_rotate (ev.x, ev.y); 1874 selection_rotate (ev.x, ev.y);
1896 else 1875 else
1897 selection_extend (ev.x, ev.y, 1); 1876 selection_extend (ev.x, ev.y, 1);
1898 } 1877 }
1899 else 1878 else
1900 { 1879 {
1901 if (MEvent.button == Button1 && clickintime) 1880 if (MEvent.button == Button1 && clickintime)
1902 MEvent.clicks++; 1881 MEvent.clicks++;
1903 else 1882 else
1904 MEvent.clicks = 1; 1883 MEvent.clicks = 1;
1905 1884
1906 selection_click (MEvent.clicks, ev.x, ev.y); 1885 selection_click (MEvent.clicks, ev.x, ev.y);
1907 } 1886 }
1908 1887
1909 MEvent.button = Button1; 1888 MEvent.button = Button1;
1910 break; 1889 break;
1911 1890
1912 case Button3: 1891 case Button3:
1913 if (MEvent.button == Button3 && clickintime) 1892 if (MEvent.button == Button3 && clickintime)
1914 selection_rotate (ev.x, ev.y); 1893 selection_rotate (ev.x, ev.y);
1915 else 1894 else
1916 selection_extend (ev.x, ev.y, 1); 1895 selection_extend (ev.x, ev.y, 1);
1917 1896
1918 MEvent.button = Button3; 1897 MEvent.button = Button3;
1919 break; 1898 break;
1920 } 1899 }
1921 } 1900 }
1922 1901
1923 MEvent.time = ev.time; 1902 MEvent.time = ev.time;
1924 return; 1903 return;
1925 } 1904 }
1926 1905
… …
2089 sel_scroll_ev.stop(); 2068 sel_scroll_ev.stop();
2090#endif 2069#endif
2091 2070
2092 if (ev.window == vt) 2071 if (ev.window == vt)
2093 { 2072 {
2073 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2074 return;
2075
2094#if ISO_14755 2076#if ISO_14755
2095 // 5.4 2077 // 5.4
2096 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2078 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2097 return; 2079 return;
2098#endif 2080#endif
2081
2099 if (reportmode) 2082 if (reportmode)
2100 { 2083 {
2101 /* mouse report from vt window */ 2084 /* mouse report from vt window */
2102 /* don't report release of wheel "buttons" */ 2085 /* don't report release of wheel "buttons" */
2103 if (ev.button >= 4) 2086 if (ev.button >= 4)
… …
2127 if (priv_modes & PrivMode_mouse_report 2110 if (priv_modes & PrivMode_mouse_report
2128 && bypass_keystate 2111 && bypass_keystate
2129 && ev.button == Button1 && MEvent.clicks <= 1) 2112 && ev.button == Button1 && MEvent.clicks <= 1)
2130 selection_extend (ev.x, ev.y, 0); 2113 selection_extend (ev.x, ev.y, 0);
2131 2114
2132 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2133 return;
2134
2135 switch (ev.button) 2115 switch (ev.button)
2136 { 2116 {
2137 case Button1: 2117 case Button1:
2138 case Button3: 2118 case Button3:
2139 selection_make (ev.time); 2119 selection_make (ev.time);
2140 break; 2120 break;
2141 2121
2142 case Button2: 2122 case Button2:
2143 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?
2144 selection_request (ev.time, ev.state & ShiftMask ? Sel_Clipboard : Sel_Primary); 2124 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2145 break; 2125 break;
2146 2126
2147#ifdef MOUSE_WHEEL 2127#ifdef MOUSE_WHEEL
2148 case Button4: 2128 case Button4:
2149 case Button5: 2129 case Button5:
… …
2191#if TINTING 2171#if TINTING
2192/* taken from aterm-0.4.2 */ 2172/* taken from aterm-0.4.2 */
2193 2173
2194typedef uint32_t RUINT32T; 2174typedef uint32_t RUINT32T;
2195 2175
2196void 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)
2197{ 2177{
2198 int sh_r, sh_g, sh_b; 2178 int sh_r, sh_g, sh_b;
2199 RUINT32T mask_r, mask_g, mask_b; 2179 RUINT32T mask_r, mask_g, mask_b;
2200 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2180 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2201 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2181 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2202 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2182 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2203 int i; 2183 int i;
2204 2184
2205 Visual *visual = display->visual; 2185 Visual *visual = term->visual;
2206 2186
2207 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2187 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2208 2188
2209 /* for convenience */ 2189 /* for convenience */
2210 mask_r = visual->red_mask; 2190 mask_r = visual->red_mask;
… …
2431 Atom atype; 2411 Atom atype;
2432 unsigned char *prop = NULL; 2412 unsigned char *prop = NULL;
2433 Window root, oldp, *list; 2413 Window root, oldp, *list;
2434 Pixmap rootpixmap = None; 2414 Pixmap rootpixmap = None;
2435 XWindowAttributes wattr, wrootattr; 2415 XWindowAttributes wattr, wrootattr;
2436 dDisp;
2437 2416
2438 pchanged = 0; 2417 pchanged = 0;
2439 2418
2440 if (!OPTION (Opt_transparent)) 2419 if (!OPTION (Opt_transparent))
2441 return pchanged; /* Don't try any more */ 2420 return pchanged; /* Don't try any more */
2442 2421
2443 XGetWindowAttributes (disp, display->root, &wrootattr); 2422 XGetWindowAttributes (xdisp, display->root, &wrootattr);
2444 rootdepth = wrootattr.depth; 2423 rootdepth = wrootattr.depth;
2445 2424
2446 XGetWindowAttributes (disp, parent[0], &wattr); 2425 XGetWindowAttributes (xdisp, parent[0], &wattr);
2447 2426
2448 if (rootdepth != wattr.depth) 2427 if (rootdepth != wattr.depth)
2449 { 2428 {
2450 if (am_transparent) 2429 if (am_transparent)
2451 { 2430 {
2452 pchanged = 1; 2431 pchanged = 1;
2453 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2432 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2454 am_transparent = am_pixmap_trans = 0; 2433 am_transparent = am_pixmap_trans = 0;
2455 } 2434 }
2456 2435
2457 return pchanged; /* Don't try any more */ 2436 return pchanged; /* Don't try any more */
2458 } 2437 }
2459 2438
2460 /* 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. */
2461 XSync (disp, False); 2440 XSync (xdisp, False);
2462 2441
2463 /* 2442 /*
2464 * Make the frame window set by the window manager have 2443 * Make the frame window set by the window manager have
2465 * the root background. Some window managers put multiple nested frame 2444 * the root background. Some window managers put multiple nested frame
2466 * 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.
2467 */ 2446 */
2468 i = (xa[XA_XROOTPMAP_ID] 2447 i = (xa[XA_XROOTPMAP_ID]
2469 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], 2448 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2470 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2449 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2471 &nitems, &bytes_after, &prop) == Success); 2450 &nitems, &bytes_after, &prop) == Success);
2472 2451
2473 if (!i || prop == NULL) 2452 if (!i || prop == NULL)
2474 i = (xa[XA_ESETROOT_PMAP_ID] 2453 i = (xa[XA_ESETROOT_PMAP_ID]
2475 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], 2454 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2476 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2455 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2477 &nitems, &bytes_after, &prop) == Success); 2456 &nitems, &bytes_after, &prop) == Success);
2478 2457
2479 if (!i || prop == NULL 2458 if (!i || prop == NULL
2480#if TINTING 2459#if TINTING
… …
2499 Window cr; 2478 Window cr;
2500 XImage *image; 2479 XImage *image;
2501 GC gc; 2480 GC gc;
2502 XGCValues gcvalue; 2481 XGCValues gcvalue;
2503 2482
2504 XTranslateCoordinates (disp, parent[0], display->root, 2483 XTranslateCoordinates (xdisp, parent[0], display->root,
2505 0, 0, &sx, &sy, &cr); 2484 0, 0, &sx, &sy, &cr);
2506 nw = (unsigned int)szHint.width; 2485 nw = (unsigned int)szHint.width;
2507 nh = (unsigned int)szHint.height; 2486 nh = (unsigned int)szHint.height;
2508 nx = ny = 0; 2487 nx = ny = 0;
2509 2488
… …
2522 } 2501 }
2523 2502
2524 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2503 min_it (nw, (unsigned int) (wrootattr.width - sx));
2525 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2504 min_it (nh, (unsigned int) (wrootattr.height - sy));
2526 2505
2527 XSync (disp, False); 2506 XSync (xdisp, False);
2528 allowedxerror = -1; 2507 allowedxerror = -1;
2529 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2508 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2530 2509
2531 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2510 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2532 /* XXX: may need a delay here? */ 2511 /* XXX: may need a delay here? */
2533 allowedxerror = 0; 2512 allowedxerror = 0;
2534 2513
… …
2537 if (am_transparent && am_pixmap_trans) 2516 if (am_transparent && am_pixmap_trans)
2538 { 2517 {
2539 pchanged = 1; 2518 pchanged = 1;
2540 if (pixmap != None) 2519 if (pixmap != None)
2541 { 2520 {
2542 XFreePixmap (disp, pixmap); 2521 XFreePixmap (xdisp, pixmap);
2543 pixmap = None; 2522 pixmap = None;
2544 } 2523 }
2545 } 2524 }
2546 2525
2547 am_pixmap_trans = 0; 2526 am_pixmap_trans = 0;
2548 } 2527 }
2549 else 2528 else
2550 { 2529 {
2551 if (pixmap != None) 2530 if (pixmap != None)
2552 XFreePixmap (disp, pixmap); 2531 XFreePixmap (xdisp, pixmap);
2553 2532
2554#if TINTING 2533#if TINTING
2555 if (ISSET_PIXCOLOR (Color_tint)) 2534 if (ISSET_PIXCOLOR (Color_tint))
2556 { 2535 {
2557 unsigned short rm, gm, bm; 2536 unsigned short rm, gm, bm;
2558 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2537 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2559 2538
2560 pix_colors_focused[Color_tint].get (display, rm, gm, bm); 2539 pix_colors_focused[Color_tint].get (this, rm, gm, bm);
2561 2540
2562 ShadeXImage (display, image, shade, rm, gm, bm); 2541 ShadeXImage (this, image, shade, rm, gm, bm);
2563 } 2542 }
2564#endif 2543#endif
2565 2544
2566 pixmap = XCreatePixmap (disp, vt, 2545 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2567 szHint.width, szHint.height, image->depth);
2568 gc = XCreateGC (disp, vt, 0UL, &gcvalue); 2546 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2569 XPutImage (disp, pixmap, gc, image, 0, 0, 2547 XPutImage (xdisp, pixmap, gc, image, 0, 0,
2570 nx, ny, image->width, image->height); 2548 nx, ny, image->width, image->height);
2571 XFreeGC (disp, gc); 2549 XFreeGC (xdisp, gc);
2572 XDestroyImage (image); 2550 XDestroyImage (image);
2573 XSetWindowBackgroundPixmap (disp, parent[0], pixmap); 2551 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2574 XClearWindow (disp, parent[0]); 2552 XClearWindow (xdisp, parent[0]);
2575 2553
2576 if (!am_transparent || !am_pixmap_trans) 2554 if (!am_transparent || !am_pixmap_trans)
2577 pchanged = 1; 2555 pchanged = 1;
2578 2556
2579 am_transparent = am_pixmap_trans = 1; 2557 am_transparent = am_pixmap_trans = 1;
2580 } 2558 }
2581 } 2559 }
2582 2560
2583 if (am_pixmap_trans) 2561 if (am_pixmap_trans)
2584 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2562 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2585 else 2563 else
2586 { 2564 {
2587 unsigned int n; 2565 unsigned int n;
2588 /* 2566 /*
2589 * InheritPixmap transparency 2567 * InheritPixmap transparency
2590 */ 2568 */
2591 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2569 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2592 { 2570 {
2593 oldp = parent[i]; 2571 oldp = parent[i];
2594 XQueryTree (disp, parent[i - 1], &root, 2572 XQueryTree (xdisp, parent[i - 1], &root,
2595 &parent[i], &list, &n); 2573 &parent[i], &list, &n);
2596 XFree (list); 2574 XFree (list);
2597 2575
2598 if (parent[i] == display->root) 2576 if (parent[i] == display->root)
2599 { 2577 {
… …
2611 2589
2612 if (pchanged) 2590 if (pchanged)
2613 { 2591 {
2614 for (; n < (unsigned int)i; n++) 2592 for (; n < (unsigned int)i; n++)
2615 { 2593 {
2616 XGetWindowAttributes (disp, parent[n], &wattr); 2594 XGetWindowAttributes (xdisp, parent[n], &wattr);
2617 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2595 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2618 { 2596 {
2619 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2597 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2620 break; 2598 break;
2621 } 2599 }
2622 } 2600 }
2623 } 2601 }
2624 2602
2625 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2603 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2626 { 2604 {
2627 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]); 2605 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2628 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2606 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2629 am_transparent = 0; 2607 am_transparent = 0;
2630 /* XXX: also turn off Opt_transparent? */ 2608 /* XXX: also turn off Opt_transparent? */
2631 } 2609 }
2632 else 2610 else
2633 { 2611 {
2634#if WAIT_FOR_WM
2635 /* wait (an arbitrary period) for the WM to do its thing
2636 * needed for fvwm2.2.2 (and before?) */
2637 sleep (1);
2638#endif
2639 for (n = 0; n < (unsigned int)i; n++) 2612 for (n = 0; n < (unsigned int)i; n++)
2640 { 2613 {
2641 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); 2614 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2642 XClearWindow (disp, parent[n]); 2615 XClearWindow (xdisp, parent[n]);
2643 } 2616 }
2644 2617
2645 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2618 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2646 am_transparent = 1; 2619 am_transparent = 1;
2647 } 2620 }
2648 2621
2649 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2622 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2650 parent[i] = None; 2623 parent[i] = None;
2651 } 2624 }
2652 2625
2653 if (scrollBar.win) 2626 if (scrollBar.win)
2654 { 2627 {
2655 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2628 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2656 scrollBar.setIdle (); 2629 scrollBar.setIdle ();
2657 scrollbar_show (0); 2630 scrollbar_show (0);
2658 } 2631 }
2659 2632
2660 if (am_transparent) 2633 if (am_transparent)
… …
3294 ndef = get_byte_array_bit (csi_defaults, i); 3267 ndef = get_byte_array_bit (csi_defaults, i);
3295 for (p = 0; p < nargs; p++) 3268 for (p = 0; p < nargs; p++)
3296 if (arg[p] == -1) 3269 if (arg[p] == -1)
3297 arg[p] = ndef; 3270 arg[p] = ndef;
3298 3271
3299#ifdef DEBUG_CMD
3300 fprintf (stderr, "CSI ");
3301 for (p = 0; p < nargs; p++)
3302 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3303 fprintf (stderr, "%c\n", ch);
3304#endif
3305
3306 /* 3272 /*
3307 * private mode handling 3273 * private mode handling
3308 */ 3274 */
3309 if (priv) 3275 if (priv)
3310 { 3276 {
3311 switch (priv) 3277 switch (priv)
3312 { 3278 {
3313 case '>': 3279 case '>':
3314 if (ch == CSI_DA) /* secondary device attributes */ 3280 if (ch == CSI_DA) /* secondary device attributes */
3315 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.2.
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[>0;94;0c");
3290 }
3316 break; 3291 break;
3317 case '?': 3292 case '?':
3318 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3293 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3319 process_terminal_mode (ch, priv, nargs, arg); 3294 process_terminal_mode (ch, priv, nargs, arg);
3320 break; 3295 break;
… …
3548rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3523rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3549{ 3524{
3550 int x, y; 3525 int x, y;
3551 XWindowAttributes wattr; 3526 XWindowAttributes wattr;
3552 Window wdummy; 3527 Window wdummy;
3553 dDisp; 3528
3529 dLocal (Display *, xdisp);
3554 3530
3555 if (nargs == 0) 3531 if (nargs == 0)
3556 return; 3532 return;
3557 3533
3558 switch (args[0]) 3534 switch (args[0])
3559 { 3535 {
3560 /* 3536 /*
3561 * commands 3537 * commands
3562 */ 3538 */
3563 case 1: /* deiconify window */ 3539 case 1: /* deiconify window */
3564 XMapWindow (disp, parent[0]); 3540 XMapWindow (xdisp, parent[0]);
3565 break; 3541 break;
3566 case 2: /* iconify window */ 3542 case 2: /* iconify window */
3567 XIconifyWindow (disp, parent[0], display->screen); 3543 XIconifyWindow (xdisp, parent[0], display->screen);
3568 break; 3544 break;
3569 case 3: /* set position (pixels) */ 3545 case 3: /* set position (pixels) */
3570 XMoveWindow (disp, parent[0], args[1], args[2]); 3546 XMoveWindow (xdisp, parent[0], args[1], args[2]);
3571 break; 3547 break;
3572 case 4: /* set size (pixels) */ 3548 case 4: /* set size (pixels) */
3573 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3549 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3574 break; 3550 break;
3575 case 5: /* raise window */ 3551 case 5: /* raise window */
3576 XRaiseWindow (disp, parent[0]); 3552 XRaiseWindow (xdisp, parent[0]);
3577 break; 3553 break;
3578 case 6: /* lower window */ 3554 case 6: /* lower window */
3579 XLowerWindow (disp, parent[0]); 3555 XLowerWindow (xdisp, parent[0]);
3580 break; 3556 break;
3581 case 7: /* refresh window */ 3557 case 7: /* refresh window */
3582 scr_touch (true); 3558 scr_touch (true);
3583 break; 3559 break;
3584 case 8: /* set size (chars) */ 3560 case 8: /* set size (chars) */
… …
3596 3572
3597 /* 3573 /*
3598 * reports - some output format copied from XTerm 3574 * reports - some output format copied from XTerm
3599 */ 3575 */
3600 case 11: /* report window state */ 3576 case 11: /* report window state */
3601 XGetWindowAttributes (disp, parent[0], &wattr); 3577 XGetWindowAttributes (xdisp, parent[0], &wattr);
3602 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3578 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3603 break; 3579 break;
3604 case 13: /* report window position */ 3580 case 13: /* report window position */
3605 XGetWindowAttributes (disp, parent[0], &wattr); 3581 XGetWindowAttributes (xdisp, parent[0], &wattr);
3606 XTranslateCoordinates (disp, parent[0], wattr.root, 3582 XTranslateCoordinates (xdisp, parent[0], wattr.root,
3607 -wattr.border_width, -wattr.border_width, 3583 -wattr.border_width, -wattr.border_width,
3608 &x, &y, &wdummy); 3584 &x, &y, &wdummy);
3609 tt_printf ("\033[3;%d;%dt", x, y); 3585 tt_printf ("\033[3;%d;%dt", x, y);
3610 break; 3586 break;
3611 case 14: /* report window size (pixels) */ 3587 case 14: /* report window size (pixels) */
3612 XGetWindowAttributes (disp, parent[0], &wattr); 3588 XGetWindowAttributes (xdisp, parent[0], &wattr);
3613 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3589 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3614 break; 3590 break;
3615 case 18: /* report text area size (chars) */ 3591 case 18: /* report text area size (chars) */
3616 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3592 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3617 break; 3593 break;
… …
3619 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3595 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3620 break; 3596 break;
3621 case 20: /* report icon label */ 3597 case 20: /* report icon label */
3622 { 3598 {
3623 char *s; 3599 char *s;
3624 XGetIconName (disp, parent[0], &s); 3600 XGetIconName (xdisp, parent[0], &s);
3625 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 */
3626 XFree (s); 3602 XFree (s);
3627 } 3603 }
3628 break; 3604 break;
3629 case 21: /* report window title */ 3605 case 21: /* report window title */
3630 { 3606 {
3631 char *s; 3607 char *s;
3632 XFetchName (disp, parent[0], &s); 3608 XFetchName (xdisp, parent[0], &s);
3633 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 */
3634 XFree (s); 3610 XFree (s);
3635 } 3611 }
3636 break; 3612 break;
3637 } 3613 }
… …
3739rxvt_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)
3740{ 3716{
3741 if (str[0] == '?' && !str[1]) 3717 if (str[0] == '?' && !str[1])
3742 { 3718 {
3743 unsigned short r, g, b; 3719 unsigned short r, g, b;
3744 pix_colors_focused[color].get (display, r, g, b); 3720 pix_colors_focused[color].get (this, r, g, b);
3745 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);
3746 } 3722 }
3747 else 3723 else
3748 set_window_color (color, str); 3724 set_window_color (color, str);
3749} 3725}
… …
3756{ 3732{
3757 int color; 3733 int color;
3758 char *buf, *name; 3734 char *buf, *name;
3759 bool query = str[0] == '?' && !str[1]; 3735 bool query = str[0] == '?' && !str[1];
3760 int saveop = op; 3736 int saveop = op;
3761 dDisp; 3737
3738 dLocal (Display *, xdisp);
3762 3739
3763 assert (str != NULL); 3740 assert (str != NULL);
3764 switch (op) 3741 switch (op)
3765 { 3742 {
3766 case XTerm_name: 3743 case XTerm_name:
… …
3782 unsigned long bytes_after; 3759 unsigned long bytes_after;
3783 unsigned char *value = 0; 3760 unsigned char *value = 0;
3784 const char *str = ""; 3761 const char *str = "";
3785 3762
3786 if (prop 3763 if (prop
3787 && XGetWindowProperty (disp, parent[0], 3764 && XGetWindowProperty (xdisp, parent[0],
3788 prop, 0, 1<<16, 0, AnyPropertyType, 3765 prop, 0, 1<<16, 0, AnyPropertyType,
3789 &actual_type, &actual_format, 3766 &actual_type, &actual_format,
3790 &nitems, &bytes_after, &value) == Success 3767 &nitems, &bytes_after, &value) == Success
3791 && actual_type != None 3768 && actual_type != None
3792 && actual_format == 8) 3769 && actual_format == 8)
… …
3804 { 3781 {
3805 *eq = 0; 3782 *eq = 0;
3806 set_utf8_property (display->atom (str), eq + 1); 3783 set_utf8_property (display->atom (str), eq + 1);
3807 } 3784 }
3808 else 3785 else
3809 XDeleteProperty (disp, parent[0], 3786 XDeleteProperty (xdisp, parent[0],
3810 display->atom (str)); 3787 display->atom (str));
3811 } 3788 }
3812 break; 3789 break;
3813 3790
3814 case XTerm_Color: 3791 case XTerm_Color:
… …
3827 *buf++ = '\0'; 3804 *buf++ = '\0';
3828 3805
3829 if (name[0] == '?' && !name[1]) 3806 if (name[0] == '?' && !name[1])
3830 { 3807 {
3831 unsigned short r, g, b; 3808 unsigned short r, g, b;
3832 pix_colors_focused[color].get (display, r, g, b); 3809 pix_colors_focused[color].get (this, r, g, b);
3833 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", XTerm_Color, color, r, g, b, resp);
3834 } 3811 }
3835 else 3812 else
3836 set_window_color (color, name); 3813 set_window_color (color, name);
3837 } 3814 }
… …
3951 3928
3952 res = strdup (str); 3929 res = strdup (str);
3953 allocated.push_back ((void *)res); 3930 allocated.push_back ((void *)res);
3954 set_fonts (); 3931 set_fonts ();
3955 } 3932 }
3933 break;
3934
3935 case URxvt_version:
3936 if (query)
3937 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3938 URxvt_version,
3939 rs[Rs_name],
3940 VERSION[0], VERSION[2],
3941 resp);
3956 break; 3942 break;
3957 3943
3958#if ENABLE_FRILLS 3944#if ENABLE_FRILLS
3959 case URxvt_locale: 3945 case URxvt_locale:
3960 if (query) 3946 if (query)

Diff Legend

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