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

Diff Legend

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