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.283 by root, Tue Jan 24 19:40:12 2006 UTC vs.
Revision 1.302 by root, Tue Jan 31 21:35:39 2006 UTC

… …
49#include "rxvt.h" 49#include "rxvt.h"
50#include "rxvtperl.h" 50#include "rxvtperl.h"
51#include "version.h" 51#include "version.h"
52#include "command.h" 52#include "command.h"
53 53
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
56//# include <sched.h>
57#endif
58
59#ifdef KEYSYM_RESOURCE 54#ifdef KEYSYM_RESOURCE
60# include "keyboard.h" 55# include "keyboard.h"
61#endif 56#endif
62 57
63#include <csignal> 58#include <csignal>
… …
227# if !UNICODE3 222# if !UNICODE3
228 if (ch >= 0x10000) 223 if (ch >= 0x10000)
229 ch = 0xfffd; 224 ch = 0xfffd;
230# endif 225# endif
231 scr_overlay_set (11, y, ch, r); 226 scr_overlay_set (11, y, ch, r);
227
228 if (WCWIDTH (ch) >= 2)
232 scr_overlay_set (12, y, NOCHAR, r); 229 scr_overlay_set (12, y, NOCHAR, r);
233 } 230 }
234 231
232// {
233// char buf[4+4+3+1];
234// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
235// scr_overlay_set (0, 0, buf);
236// }
235 scr_overlay_set (0, len , attr); 237 scr_overlay_set (0, len , attr);
236 scr_overlay_set (0, len + 1, fname); 238 scr_overlay_set (0, len + 1, fname);
237 239
238 free (fname); 240 free (fname);
239 241
… …
1088 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1090 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1089 } 1091 }
1090} 1092}
1091#endif 1093#endif
1092 1094
1093#if HAVE_SCHED_YIELD 1095#if LINUX_YIELD_HACK
1094static struct event_handler 1096static struct event_handler
1095{ 1097{
1096 check_watcher cw_yield; 1098 check_watcher yield_ev;
1097 1099
1098 void yield (check_watcher &w) 1100 void yield_cb (check_watcher &w)
1099 { 1101 {
1100 sched_yield (); 1102 usleep (0);
1101 w.stop (); 1103 w.stop ();
1102 } 1104 }
1103 1105
1104 event_handler () 1106 event_handler ()
1105 : cw_yield (this, &event_handler::yield) 1107 : yield_ev (this, &event_handler::yield_cb)
1106 { 1108 {
1107 } 1109 }
1108} event_handler; 1110} event_handler;
1109#endif 1111#endif
1110 1112
… …
1130 cmdbuf_endp += r; 1132 cmdbuf_endp += r;
1131 return true; 1133 return true;
1132 } 1134 }
1133 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1135 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1134 { 1136 {
1135#if HAVE_SCHED_YIELD 1137#if LINUX_YIELD_HACK
1136 if (display->is_local) 1138 if (display->is_local)
1137 event_handler.cw_yield.start (); 1139 event_handler.yield_ev.start ();
1138#endif 1140#endif
1139 } 1141 }
1140 else 1142 else
1141 { 1143 {
1142 pty_ev.stop (); 1144 pty_ev.stop ();
… …
1164} 1166}
1165 1167
1166void 1168void
1167rxvt_term::pointer_unblank () 1169rxvt_term::pointer_unblank ()
1168{ 1170{
1169 XDefineCursor (display->display, vt, TermWin_cursor); 1171 XDefineCursor (xdisp, vt, TermWin_cursor);
1170 recolour_cursor (); 1172 recolour_cursor ();
1171 1173
1172#ifdef POINTER_BLANK 1174#ifdef POINTER_BLANK
1173 hidden_pointer = 0; 1175 hidden_pointer = 0;
1174 1176
… …
1182rxvt_term::pointer_blank () 1184rxvt_term::pointer_blank ()
1183{ 1185{
1184 if (!OPTION (Opt_pointerBlank)) 1186 if (!OPTION (Opt_pointerBlank))
1185 return; 1187 return;
1186 1188
1187 XDefineCursor (display->display, vt, display->blank_cursor); 1189 XDefineCursor (xdisp, vt, display->blank_cursor);
1188 XFlush (display->display); 1190 XFlush (xdisp);
1189 1191
1190 hidden_pointer = 1; 1192 hidden_pointer = 1;
1191} 1193}
1192 1194
1193void 1195void
… …
1266 (32 + button_number + key_state), 1268 (32 + button_number + key_state),
1267 (32 + x + 1), 1269 (32 + x + 1),
1268 (32 + y + 1)); 1270 (32 + y + 1));
1269} 1271}
1270 1272
1271#ifdef USING_W11LIB
1272void
1273rxvt_W11_process_x_event (XEvent *ev)
1274{
1275 rxvt_t *r = rxvt_get_r ();
1276
1277 x_cb (*ev);
1278}
1279#endif
1280
1281/*{{{ process an X event */ 1273/*{{{ process an X event */
1282void 1274void
1283rxvt_term::x_cb (XEvent &ev) 1275rxvt_term::x_cb (XEvent &ev)
1284{ 1276{
1285 make_current (); 1277 make_current ();
1286 1278
1287 dDisp; 1279 dLocal (Display *, xdisp);
1288 1280
1289 if (ev.xany.window == vt 1281 if (ev.xany.window == vt
1290 && SHOULD_INVOKE (HOOK_X_EVENT) 1282 && SHOULD_INVOKE (HOOK_X_EVENT)
1291 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1283 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1292 return; 1284 return;
… …
1402 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END))) 1394 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1403 destroy (); 1395 destroy ();
1404 } 1396 }
1405#if ENABLE_EWMH 1397#if ENABLE_EWMH
1406 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1398 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1407 XSendEvent (disp, ev.xclient.window = display->root, 1399 XSendEvent (xdisp, ev.xclient.window = display->root,
1408 False, SubstructureRedirectMask | SubstructureNotifyMask, 1400 False, SubstructureRedirectMask | SubstructureNotifyMask,
1409 &ev); 1401 &ev);
1410#endif 1402#endif
1411 } 1403 }
1412 } 1404 }
… …
1460 break; 1452 break;
1461 1453
1462 case ConfigureNotify: 1454 case ConfigureNotify:
1463 if (ev.xconfigure.window == parent[0]) 1455 if (ev.xconfigure.window == parent[0])
1464 { 1456 {
1465 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1457 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev))
1466 ; 1458 ;
1467 1459
1468 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1460 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1469 { 1461 {
1470 seen_resize = 1; 1462 seen_resize = 1;
… …
1528 if (ev.xany.window == vt) 1520 if (ev.xany.window == vt)
1529 { 1521 {
1530 do 1522 do
1531 scr_expose (ev.xexpose.x, ev.xexpose.y, 1523 scr_expose (ev.xexpose.x, ev.xexpose.y,
1532 ev.xexpose.width, ev.xexpose.height, False); 1524 ev.xexpose.width, ev.xexpose.height, False);
1533 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1525 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev));
1534 1526
1535 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1527 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1536 1528
1537 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1529 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev))
1538 scr_expose (ev.xexpose.x, ev.xexpose.y, 1530 scr_expose (ev.xexpose.x, ev.xexpose.y,
1539 ev.xexpose.width, ev.xexpose.height, False); 1531 ev.xexpose.width, ev.xexpose.height, False);
1540 1532
1541 want_refresh = 1; 1533 want_refresh = 1;
1542 } 1534 }
1543 else 1535 else
1544 { 1536 {
1545 XEvent unused_event; 1537 XEvent unused_event;
1546 1538
1547 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1539 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event))
1548 ; 1540 ;
1549 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1541 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event))
1550 ; 1542 ;
1551 1543
1552 if (isScrollbarWindow (ev.xany.window)) 1544 if (isScrollbarWindow (ev.xany.window))
1553 { 1545 {
1554 scrollBar.setIdle (); 1546 scrollBar.setIdle ();
1555 scrollbar_show (0); 1547 scrollbar_show (0);
1556 } 1548 }
1557 1549
1558#ifdef TRANSPARENT 1550#ifdef TRANSPARENT
1559 if (am_transparent && ev.xany.window == parent[0]) 1551 if (am_transparent && ev.xany.window == parent[0])
1560 XClearWindow (disp, ev.xany.window); 1552 XClearWindow (xdisp, ev.xany.window);
1561#endif 1553#endif
1562 } 1554 }
1563 break; 1555 break;
1564 1556
1565 case MotionNotify: 1557 case MotionNotify:
… …
1575 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1567 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1576 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1568 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1577 ; // nop 1569 ; // nop
1578 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1570 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1579 { 1571 {
1580 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1572 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev))
1581 ; 1573 ;
1582 1574
1583 XQueryPointer (disp, vt, 1575 XQueryPointer (xdisp, vt,
1584 &unused_root, &unused_child, 1576 &unused_root, &unused_child,
1585 &unused_root_x, &unused_root_y, 1577 &unused_root_x, &unused_root_y,
1586 &ev.xbutton.x, &ev.xbutton.y, 1578 &ev.xbutton.x, &ev.xbutton.y,
1587 &ev.xbutton.state); 1579 &ev.xbutton.state);
1588#ifdef MOUSE_THRESHOLD 1580#ifdef MOUSE_THRESHOLD
… …
1652#endif 1644#endif
1653 } 1645 }
1654 } 1646 }
1655 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1647 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1656 { 1648 {
1657 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1649 while (XCheckTypedWindowEvent (xdisp, scrollBar.win,
1658 MotionNotify, &ev)) 1650 MotionNotify, &ev))
1659 ; 1651 ;
1660 1652
1661 XQueryPointer (disp, scrollBar.win, 1653 XQueryPointer (xdisp, scrollBar.win,
1662 &unused_root, &unused_child, 1654 &unused_root, &unused_child,
1663 &unused_root_x, &unused_root_y, 1655 &unused_root_x, &unused_root_y,
1664 &ev.xbutton.x, &ev.xbutton.y, 1656 &ev.xbutton.x, &ev.xbutton.y,
1665 &unused_mask); 1657 &unused_mask);
1666 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1658 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
… …
2181#if TINTING 2173#if TINTING
2182/* taken from aterm-0.4.2 */ 2174/* taken from aterm-0.4.2 */
2183 2175
2184typedef uint32_t RUINT32T; 2176typedef uint32_t RUINT32T;
2185 2177
2186void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm) 2178void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2187{ 2179{
2188 int sh_r, sh_g, sh_b; 2180 int sh_r, sh_g, sh_b;
2189 RUINT32T mask_r, mask_g, mask_b; 2181 RUINT32T mask_r, mask_g, mask_b;
2190 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2182 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2191 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2183 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2192 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2184 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2193 int i; 2185 int i;
2194 2186
2195 Visual *visual = display->visual; 2187 Visual *visual = term->visual;
2196 2188
2197 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2189 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2198 2190
2199 /* for convenience */ 2191 /* for convenience */
2200 mask_r = visual->red_mask; 2192 mask_r = visual->red_mask;
… …
2421 Atom atype; 2413 Atom atype;
2422 unsigned char *prop = NULL; 2414 unsigned char *prop = NULL;
2423 Window root, oldp, *list; 2415 Window root, oldp, *list;
2424 Pixmap rootpixmap = None; 2416 Pixmap rootpixmap = None;
2425 XWindowAttributes wattr, wrootattr; 2417 XWindowAttributes wattr, wrootattr;
2426 dDisp;
2427 2418
2428 pchanged = 0; 2419 pchanged = 0;
2429 2420
2430 if (!OPTION (Opt_transparent)) 2421 if (!OPTION (Opt_transparent))
2431 return pchanged; /* Don't try any more */ 2422 return pchanged; /* Don't try any more */
2432 2423
2433 XGetWindowAttributes (disp, display->root, &wrootattr); 2424 XGetWindowAttributes (xdisp, display->root, &wrootattr);
2434 rootdepth = wrootattr.depth; 2425 rootdepth = wrootattr.depth;
2435 2426
2436 XGetWindowAttributes (disp, parent[0], &wattr); 2427 XGetWindowAttributes (xdisp, parent[0], &wattr);
2437 2428
2438 if (rootdepth != wattr.depth) 2429 if (rootdepth != wattr.depth)
2439 { 2430 {
2440 if (am_transparent) 2431 if (am_transparent)
2441 { 2432 {
2442 pchanged = 1; 2433 pchanged = 1;
2443 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2434 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2444 am_transparent = am_pixmap_trans = 0; 2435 am_transparent = am_pixmap_trans = 0;
2445 } 2436 }
2446 2437
2447 return pchanged; /* Don't try any more */ 2438 return pchanged; /* Don't try any more */
2448 } 2439 }
2449 2440
2450 /* Get all X ops out of the queue so that our information is up-to-date. */ 2441 /* Get all X ops out of the queue so that our information is up-to-date. */
2451 XSync (disp, False); 2442 XSync (xdisp, False);
2452 2443
2453 /* 2444 /*
2454 * Make the frame window set by the window manager have 2445 * Make the frame window set by the window manager have
2455 * the root background. Some window managers put multiple nested frame 2446 * the root background. Some window managers put multiple nested frame
2456 * windows for each client, so we have to take care about that. 2447 * windows for each client, so we have to take care about that.
2457 */ 2448 */
2458 i = (xa[XA_XROOTPMAP_ID] 2449 i = (xa[XA_XROOTPMAP_ID]
2459 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], 2450 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2460 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2451 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2461 &nitems, &bytes_after, &prop) == Success); 2452 &nitems, &bytes_after, &prop) == Success);
2462 2453
2463 if (!i || prop == NULL) 2454 if (!i || prop == NULL)
2464 i = (xa[XA_ESETROOT_PMAP_ID] 2455 i = (xa[XA_ESETROOT_PMAP_ID]
2465 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], 2456 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2466 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2457 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2467 &nitems, &bytes_after, &prop) == Success); 2458 &nitems, &bytes_after, &prop) == Success);
2468 2459
2469 if (!i || prop == NULL 2460 if (!i || prop == NULL
2470#if TINTING 2461#if TINTING
2471 || !rs[Rs_color + Color_tint] 2462 || !ISSET_PIXCOLOR (Color_tint)
2472#endif 2463#endif
2473 ) 2464 )
2474 have_pixmap = 0; 2465 have_pixmap = 0;
2475 else 2466 else
2476 { 2467 {
… …
2489 Window cr; 2480 Window cr;
2490 XImage *image; 2481 XImage *image;
2491 GC gc; 2482 GC gc;
2492 XGCValues gcvalue; 2483 XGCValues gcvalue;
2493 2484
2494 XTranslateCoordinates (disp, parent[0], display->root, 2485 XTranslateCoordinates (xdisp, parent[0], display->root,
2495 0, 0, &sx, &sy, &cr); 2486 0, 0, &sx, &sy, &cr);
2496 nw = (unsigned int)szHint.width; 2487 nw = (unsigned int)szHint.width;
2497 nh = (unsigned int)szHint.height; 2488 nh = (unsigned int)szHint.height;
2498 nx = ny = 0; 2489 nx = ny = 0;
2499 2490
… …
2512 } 2503 }
2513 2504
2514 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2505 min_it (nw, (unsigned int) (wrootattr.width - sx));
2515 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2506 min_it (nh, (unsigned int) (wrootattr.height - sy));
2516 2507
2517 XSync (disp, False); 2508 XSync (xdisp, False);
2518 allowedxerror = -1; 2509 allowedxerror = -1;
2519 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2510 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2520 2511
2521 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2512 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2522 /* XXX: may need a delay here? */ 2513 /* XXX: may need a delay here? */
2523 allowedxerror = 0; 2514 allowedxerror = 0;
2524 2515
… …
2527 if (am_transparent && am_pixmap_trans) 2518 if (am_transparent && am_pixmap_trans)
2528 { 2519 {
2529 pchanged = 1; 2520 pchanged = 1;
2530 if (pixmap != None) 2521 if (pixmap != None)
2531 { 2522 {
2532 XFreePixmap (disp, pixmap); 2523 XFreePixmap (xdisp, pixmap);
2533 pixmap = None; 2524 pixmap = None;
2534 } 2525 }
2535 } 2526 }
2536 2527
2537 am_pixmap_trans = 0; 2528 am_pixmap_trans = 0;
2538 } 2529 }
2539 else 2530 else
2540 { 2531 {
2541 if (pixmap != None) 2532 if (pixmap != None)
2542 XFreePixmap (disp, pixmap); 2533 XFreePixmap (xdisp, pixmap);
2543 2534
2544#if TINTING 2535#if TINTING
2545 if (ISSET_PIXCOLOR (Color_tint)) 2536 if (ISSET_PIXCOLOR (Color_tint))
2546 { 2537 {
2547 unsigned short rm, gm, bm;
2548 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2538 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2549 2539
2540 rgba c;
2550 pix_colors_focused[Color_tint].get (display, rm, gm, bm); 2541 pix_colors_focused [Color_tint].get (c);
2551 2542
2552 ShadeXImage (display, image, shade, rm, gm, bm); 2543 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2553 } 2544 }
2554#endif 2545#endif
2555 2546
2556 pixmap = XCreatePixmap (disp, vt, 2547 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2557 szHint.width, szHint.height, image->depth);
2558 gc = XCreateGC (disp, vt, 0UL, &gcvalue); 2548 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2559 XPutImage (disp, pixmap, gc, image, 0, 0, 2549 XPutImage (xdisp, pixmap, gc, image, 0, 0,
2560 nx, ny, image->width, image->height); 2550 nx, ny, image->width, image->height);
2561 XFreeGC (disp, gc); 2551 XFreeGC (xdisp, gc);
2562 XDestroyImage (image); 2552 XDestroyImage (image);
2563 XSetWindowBackgroundPixmap (disp, parent[0], pixmap); 2553 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2564 XClearWindow (disp, parent[0]); 2554 XClearWindow (xdisp, parent[0]);
2565 2555
2566 if (!am_transparent || !am_pixmap_trans) 2556 if (!am_transparent || !am_pixmap_trans)
2567 pchanged = 1; 2557 pchanged = 1;
2568 2558
2569 am_transparent = am_pixmap_trans = 1; 2559 am_transparent = am_pixmap_trans = 1;
2570 } 2560 }
2571 } 2561 }
2572 2562
2573 if (am_pixmap_trans) 2563 if (am_pixmap_trans)
2574 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2564 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2575 else 2565 else
2576 { 2566 {
2577 unsigned int n; 2567 unsigned int n;
2578 /* 2568 /*
2579 * InheritPixmap transparency 2569 * InheritPixmap transparency
2580 */ 2570 */
2581 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2571 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2582 { 2572 {
2583 oldp = parent[i]; 2573 oldp = parent[i];
2584 XQueryTree (disp, parent[i - 1], &root, 2574 XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n);
2585 &parent[i], &list, &n);
2586 XFree (list); 2575 XFree (list);
2587 2576
2588 if (parent[i] == display->root) 2577 if (parent[i] == display->root)
2589 { 2578 {
2590 if (oldp != None) 2579 if (oldp != None)
… …
2598 } 2587 }
2599 2588
2600 n = 0; 2589 n = 0;
2601 2590
2602 if (pchanged) 2591 if (pchanged)
2603 {
2604 for (; n < (unsigned int)i; n++) 2592 for (; n < (unsigned int)i; n++)
2605 { 2593 {
2606 XGetWindowAttributes (disp, parent[n], &wattr); 2594 XGetWindowAttributes (xdisp, parent[n], &wattr);
2595
2607 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2596 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2608 { 2597 {
2609 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2598 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2610 break; 2599 break;
2611 } 2600 }
2612 } 2601 }
2613 }
2614 2602
2615 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2603 if (n > (sizeof (parent) / sizeof (parent[0])))
2616 { 2604 {
2617 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]); 2605 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2618 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2606 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2619 am_transparent = 0; 2607 am_transparent = 0;
2620 /* XXX: also turn off Opt_transparent? */ 2608 /* XXX: also turn off Opt_transparent? */
2621 } 2609 }
2622 else 2610 else
2623 { 2611 {
2624 for (n = 0; n < (unsigned int)i; n++) 2612 for (n = 0; n < (unsigned int)i; n++)
2625 { 2613 {
2626 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); 2614 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2627 XClearWindow (disp, parent[n]); 2615 XClearWindow (xdisp, parent[n]);
2628 } 2616 }
2629 2617
2630 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2618 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2631 am_transparent = 1; 2619 am_transparent = 1;
2632 } 2620 }
2633 2621
2634 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2622 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2635 parent[i] = None; 2623 parent[i] = None;
2636 } 2624 }
2637 2625
2638 if (scrollBar.win) 2626 if (scrollBar.win)
2639 { 2627 {
2640 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2628 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2641 scrollBar.setIdle (); 2629 scrollBar.setIdle ();
2642 scrollbar_show (0); 2630 scrollbar_show (0);
2643 } 2631 }
2644 2632
2645 if (am_transparent) 2633 if (am_transparent)
… …
3096 scr_charset_set (2, (unsigned int)cmd_getc ()); 3084 scr_charset_set (2, (unsigned int)cmd_getc ());
3097 break; 3085 break;
3098 case '+': 3086 case '+':
3099 scr_charset_set (3, (unsigned int)cmd_getc ()); 3087 scr_charset_set (3, (unsigned int)cmd_getc ());
3100 break; 3088 break;
3101#if ENABLE_FRILLS 3089#if !ENABLE_MINIMAL
3102 case '6': 3090 case '6':
3103 scr_backindex (); 3091 scr_backindex ();
3104 break; 3092 break;
3105#endif 3093#endif
3106 case '7': 3094 case '7':
3107 scr_cursor (SAVE); 3095 scr_cursor (SAVE);
3108 break; 3096 break;
3109 case '8': 3097 case '8':
3110 scr_cursor (RESTORE); 3098 scr_cursor (RESTORE);
3111 break; 3099 break;
3112#if ENABLE_FRILLS 3100#if !ENABLE_MINIMAL
3113 case '9': 3101 case '9':
3114 scr_forwardindex (); 3102 scr_forwardindex ();
3115 break; 3103 break;
3116#endif 3104#endif
3117 case '=': 3105 case '=':
… …
3290 { 3278 {
3291 case '>': 3279 case '>':
3292 if (ch == CSI_DA) /* secondary device attributes */ 3280 if (ch == CSI_DA) /* secondary device attributes */
3293 { 3281 {
3294 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 3282 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3295 // 'U' for rxvt-unicode <= 7.2, and Mm85 (e.g. 7385 for 7.3) for later versions. 3283 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3296 // 3284 //
3297 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 3285 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3298 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 3286 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3299 // that we do not support xterm mouse reporting (should be 95 when we do). 3287 // that we do not support xterm mouse reporting (should be 95 when we do).
3300 // 3288 //
3301 tt_printf ("\033[>%c%c85;94;0c", VERSION[0], VERSION[1]); 3289 tt_printf ("\033[>%d;94;0c", 'U');
3302 } 3290 }
3303 break; 3291 break;
3304 case '?': 3292 case '?':
3305 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3293 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3306 process_terminal_mode (ch, priv, nargs, arg); 3294 process_terminal_mode (ch, priv, nargs, arg);
… …
3510 break; 3498 break;
3511 case CSI_75: 3499 case CSI_75:
3512 scr_cursor (RESTORE); 3500 scr_cursor (RESTORE);
3513 break; 3501 break;
3514 3502
3515#if ENABLE_FRILLS 3503#if !ENABLE_MINIMAL
3516 case CSI_74: 3504 case CSI_74:
3517 process_window_ops (arg, nargs); 3505 process_window_ops (arg, nargs);
3518 break; 3506 break;
3519#endif 3507#endif
3520 3508
… …
3527 break; 3515 break;
3528 } 3516 }
3529} 3517}
3530/*}}} */ 3518/*}}} */
3531 3519
3532#if ENABLE_FRILLS 3520#if !ENABLE_MINIMAL
3533/* ARGSUSED */ 3521/* ARGSUSED */
3534void 3522void
3535rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3523rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3536{ 3524{
3537 int x, y; 3525 int x, y;
3538 XWindowAttributes wattr; 3526 XWindowAttributes wattr;
3539 Window wdummy; 3527 Window wdummy;
3540 dDisp; 3528
3529 dLocal (Display *, xdisp);
3541 3530
3542 if (nargs == 0) 3531 if (nargs == 0)
3543 return; 3532 return;
3544 3533
3545 switch (args[0]) 3534 switch (args[0])
3546 { 3535 {
3547 /* 3536 /*
3548 * commands 3537 * commands
3549 */ 3538 */
3550 case 1: /* deiconify window */ 3539 case 1: /* deiconify window */
3551 XMapWindow (disp, parent[0]); 3540 XMapWindow (xdisp, parent[0]);
3552 break; 3541 break;
3553 case 2: /* iconify window */ 3542 case 2: /* iconify window */
3554 XIconifyWindow (disp, parent[0], display->screen); 3543 XIconifyWindow (xdisp, parent[0], display->screen);
3555 break; 3544 break;
3556 case 3: /* set position (pixels) */ 3545 case 3: /* set position (pixels) */
3557 XMoveWindow (disp, parent[0], args[1], args[2]); 3546 XMoveWindow (xdisp, parent[0], args[1], args[2]);
3558 break; 3547 break;
3559 case 4: /* set size (pixels) */ 3548 case 4: /* set size (pixels) */
3560 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3549 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3561 break; 3550 break;
3562 case 5: /* raise window */ 3551 case 5: /* raise window */
3563 XRaiseWindow (disp, parent[0]); 3552 XRaiseWindow (xdisp, parent[0]);
3564 break; 3553 break;
3565 case 6: /* lower window */ 3554 case 6: /* lower window */
3566 XLowerWindow (disp, parent[0]); 3555 XLowerWindow (xdisp, parent[0]);
3567 break; 3556 break;
3568 case 7: /* refresh window */ 3557 case 7: /* refresh window */
3569 scr_touch (true); 3558 scr_touch (true);
3570 break; 3559 break;
3571 case 8: /* set size (chars) */ 3560 case 8: /* set size (chars) */
… …
3578 if (args[0] >= 24) /* set height (chars) */ 3567 if (args[0] >= 24) /* set height (chars) */
3579 set_widthheight ((unsigned int)width, 3568 set_widthheight ((unsigned int)width,
3580 (unsigned int) (args[1] * fheight)); 3569 (unsigned int) (args[1] * fheight));
3581 break; 3570 break;
3582 3571
3583
3584 /* 3572 /*
3585 * reports - some output format copied from XTerm 3573 * reports - some output format copied from XTerm
3586 */ 3574 */
3587 case 11: /* report window state */ 3575 case 11: /* report window state */
3588 XGetWindowAttributes (disp, parent[0], &wattr); 3576 XGetWindowAttributes (xdisp, parent[0], &wattr);
3589 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3577 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3590 break; 3578 break;
3591 case 13: /* report window position */ 3579 case 13: /* report window position */
3592 XGetWindowAttributes (disp, parent[0], &wattr); 3580 XGetWindowAttributes (xdisp, parent[0], &wattr);
3593 XTranslateCoordinates (disp, parent[0], wattr.root, 3581 XTranslateCoordinates (xdisp, parent[0], wattr.root,
3594 -wattr.border_width, -wattr.border_width, 3582 -wattr.border_width, -wattr.border_width,
3595 &x, &y, &wdummy); 3583 &x, &y, &wdummy);
3596 tt_printf ("\033[3;%d;%dt", x, y); 3584 tt_printf ("\033[3;%d;%dt", x, y);
3597 break; 3585 break;
3598 case 14: /* report window size (pixels) */ 3586 case 14: /* report window size (pixels) */
3599 XGetWindowAttributes (disp, parent[0], &wattr); 3587 XGetWindowAttributes (xdisp, parent[0], &wattr);
3600 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3588 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3601 break; 3589 break;
3602 case 18: /* report text area size (chars) */ 3590 case 18: /* report text area size (chars) */
3603 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3591 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3604 break; 3592 break;
… …
3606 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3594 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3607 break; 3595 break;
3608 case 20: /* report icon label */ 3596 case 20: /* report icon label */
3609 { 3597 {
3610 char *s; 3598 char *s;
3611 XGetIconName (disp, parent[0], &s); 3599 XGetIconName (xdisp, parent[0], &s);
3612 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3600 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3613 XFree (s); 3601 XFree (s);
3614 } 3602 }
3615 break; 3603 break;
3616 case 21: /* report window title */ 3604 case 21: /* report window title */
3617 { 3605 {
3618 char *s; 3606 char *s;
3619 XFetchName (disp, parent[0], &s); 3607 XFetchName (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 } 3612 }
… …
3725void 3713void
3726rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3714rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3727{ 3715{
3728 if (str[0] == '?' && !str[1]) 3716 if (str[0] == '?' && !str[1])
3729 { 3717 {
3730 unsigned short r, g, b; 3718 rgba c;
3731 pix_colors_focused[color].get (display, r, g, b); 3719 pix_colors_focused[color].get (c);
3720
3721#if XFT
3722 if (c.a != rgba::MAX_CC)
3723 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3724 else
3725#endif
3732 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3726 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3733 } 3727 }
3734 else 3728 else
3735 set_window_color (color, str); 3729 set_window_color (color, str);
3736} 3730}
3737 3731
… …
3743{ 3737{
3744 int color; 3738 int color;
3745 char *buf, *name; 3739 char *buf, *name;
3746 bool query = str[0] == '?' && !str[1]; 3740 bool query = str[0] == '?' && !str[1];
3747 int saveop = op; 3741 int saveop = op;
3748 dDisp; 3742
3743 dLocal (Display *, xdisp);
3749 3744
3750 assert (str != NULL); 3745 assert (str != NULL);
3751 switch (op) 3746 switch (op)
3752 { 3747 {
3753 case XTerm_name: 3748 case XTerm_name:
… …
3769 unsigned long bytes_after; 3764 unsigned long bytes_after;
3770 unsigned char *value = 0; 3765 unsigned char *value = 0;
3771 const char *str = ""; 3766 const char *str = "";
3772 3767
3773 if (prop 3768 if (prop
3774 && XGetWindowProperty (disp, parent[0], 3769 && XGetWindowProperty (xdisp, parent[0],
3775 prop, 0, 1<<16, 0, AnyPropertyType, 3770 prop, 0, 1<<16, 0, AnyPropertyType,
3776 &actual_type, &actual_format, 3771 &actual_type, &actual_format,
3777 &nitems, &bytes_after, &value) == Success 3772 &nitems, &bytes_after, &value) == Success
3778 && actual_type != None 3773 && actual_type != None
3779 && actual_format == 8) 3774 && actual_format == 8)
3780 str = (const char *)(value); 3775 str = (const char *)(value);
3781 3776
3782 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3777 tt_printf ("\033]%d;%s%c", op, str, resp);
3783 3778
3784 XFree (value); 3779 XFree (value);
3785 } 3780 }
3786 else 3781 else
3787 { 3782 {
… …
3791 { 3786 {
3792 *eq = 0; 3787 *eq = 0;
3793 set_utf8_property (display->atom (str), eq + 1); 3788 set_utf8_property (display->atom (str), eq + 1);
3794 } 3789 }
3795 else 3790 else
3796 XDeleteProperty (disp, parent[0], 3791 XDeleteProperty (xdisp, parent[0],
3797 display->atom (str)); 3792 display->atom (str));
3798 } 3793 }
3799 break; 3794 break;
3800 3795
3801 case XTerm_Color: 3796 case XTerm_Color:
… …
3811 break; 3806 break;
3812 3807
3813 if ((buf = strchr (name, ';')) != NULL) 3808 if ((buf = strchr (name, ';')) != NULL)
3814 *buf++ = '\0'; 3809 *buf++ = '\0';
3815 3810
3816 if (name[0] == '?' && !name[1]) 3811 process_color_seq (op, color, name, resp);
3817 {
3818 unsigned short r, g, b;
3819 pix_colors_focused[color].get (display, r, g, b);
3820 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3821 }
3822 else
3823 set_window_color (color, name);
3824 } 3812 }
3825 break; 3813 break;
3826 case XTerm_Color00: 3814 case XTerm_Color00:
3827 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3815 process_color_seq (op, Color_fg, str, resp);
3828 break; 3816 break;
3829 case XTerm_Color01: 3817 case XTerm_Color01:
3830 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3818 process_color_seq (op, Color_bg, str, resp);
3831 break; 3819 break;
3832#ifndef NO_CURSORCOLOR 3820#ifndef NO_CURSORCOLOR
3833 case XTerm_Color_cursor: 3821 case XTerm_Color_cursor:
3834 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3822 process_color_seq (op, Color_cursor, str, resp);
3835 break; 3823 break;
3836#endif 3824#endif
3837 case XTerm_Color_pointer_fg: 3825 case XTerm_Color_pointer_fg:
3838 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3826 process_color_seq (op, Color_pointer_fg, str, resp);
3839 break; 3827 break;
3840 case XTerm_Color_pointer_bg: 3828 case XTerm_Color_pointer_bg:
3841 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3829 process_color_seq (op, Color_pointer_bg, str, resp);
3842 break; 3830 break;
3843#ifndef NO_BOLD_UNDERLINE_REVERSE 3831#ifndef NO_BOLD_UNDERLINE_REVERSE
3844 case XTerm_Color_RV: 3832 case XTerm_Color_RV:
3845 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3833 process_color_seq (op, Color_RV, str, resp);
3846 break; 3834 break;
3847 case Rxvt_Color_BD: 3835 case Rxvt_Color_BD:
3848 case URxvt_Color_BD: 3836 case URxvt_Color_BD:
3849 process_color_seq (op, Color_BD, str, resp); 3837 process_color_seq (op, Color_BD, str, resp);
3850 break; 3838 break;
3851 case Rxvt_Color_UL: 3839 case Rxvt_Color_UL:
3852 case URxvt_Color_UL: 3840 case URxvt_Color_UL:
3853 process_color_seq (op, Color_UL, str, resp); 3841 process_color_seq (op, Color_UL, str, resp);
3854 break; 3842 break;
3855 case URxvt_Color_IT: 3843 case URxvt_Color_IT:
3856 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3844 process_color_seq (op, Color_IT, str, resp);
3857 break; 3845 break;
3858#endif 3846#endif
3859#if TRANSPARENT && TINTING 3847#if TRANSPARENT && TINTING
3860 case URxvt_Color_tint: 3848 case URxvt_Color_tint:
3861 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3849 process_color_seq (op, Color_tint, str, resp);
3850
3862 check_our_parents (); 3851 check_our_parents ();
3852
3863 if (am_transparent) 3853 if (am_transparent)
3864 want_full_refresh = want_refresh = 1; 3854 want_full_refresh = want_refresh = 1;
3855
3865 break; 3856 break;
3866#endif 3857#endif
3867 3858
3868 case Rxvt_Pixmap: 3859 case Rxvt_Pixmap:
3869 { 3860 {
… …
3940 allocated.push_back ((void *)res); 3931 allocated.push_back ((void *)res);
3941 set_fonts (); 3932 set_fonts ();
3942 } 3933 }
3943 break; 3934 break;
3944 3935
3945#if ENABLE_FRILLS 3936 case URxvt_version:
3937 if (query)
3938 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3939 op,
3940 rs[Rs_name], VERSION[0], VERSION[2],
3941 resp);
3942 break;
3943
3944#if !ENABLE_MINIMAL
3946 case URxvt_locale: 3945 case URxvt_locale:
3947 if (query) 3946 if (query)
3948 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3947 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
3949 else 3948 else
3950 { 3949 {
3951 set_locale (str); 3950 set_locale (str);
3952 pty->set_utf8_mode (enc_utf8); 3951 pty->set_utf8_mode (enc_utf8);
3953 init_xlocale (); 3952 init_xlocale ();
… …
4314 scr_color (Color_bg, Color_bg); 4313 scr_color (Color_bg, Color_bg);
4315 break; 4314 break;
4316 4315
4317 //case 50: // not variable spacing 4316 //case 50: // not variable spacing
4318 4317
4319#if ENABLE_FRILLS 4318#if !ENABLE_MINIMAL
4320 case 90: 4319 case 90:
4321 case 91: /* set bright fg color */ 4320 case 91: /* set bright fg color */
4322 case 92: 4321 case 92:
4323 case 93: 4322 case 93:
4324 case 94: 4323 case 94:

Diff Legend

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