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.305 by root, Thu Feb 2 18:04:45 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 is a useful thing to do. It surely is is
1109 // allowed by the sus... as is returning ENOSYS.
1110
1111 struct timespec ts = { 0, 0 };
1112 nanosleep (&ts, 0);
1113
1101 w.stop (); 1114 w.stop ();
1102 } 1115 }
1103 1116
1104 event_handler () 1117 event_handler ()
1105 : cw_yield (this, &event_handler::yield) 1118 : yield_ev (this, &event_handler::yield_cb)
1106 { 1119 {
1107 } 1120 }
1108} event_handler; 1121} event_handler;
1109#endif 1122#endif
1110 1123
… …
1130 cmdbuf_endp += r; 1143 cmdbuf_endp += r;
1131 return true; 1144 return true;
1132 } 1145 }
1133 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1146 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1134 { 1147 {
1135#if HAVE_SCHED_YIELD 1148#if LINUX_YIELD_HACK
1136 if (display->is_local) 1149 if (display->is_local)
1137 event_handler.cw_yield.start (); 1150 event_handler.yield_ev.start ();
1138#endif 1151#endif
1139 } 1152 }
1140 else 1153 else
1141 { 1154 {
1142 pty_ev.stop (); 1155 pty_ev.stop ();
… …
1164} 1177}
1165 1178
1166void 1179void
1167rxvt_term::pointer_unblank () 1180rxvt_term::pointer_unblank ()
1168{ 1181{
1169 XDefineCursor (display->display, vt, TermWin_cursor); 1182 XDefineCursor (dpy, vt, TermWin_cursor);
1170 recolour_cursor (); 1183 recolour_cursor ();
1171 1184
1172#ifdef POINTER_BLANK 1185#ifdef POINTER_BLANK
1173 hidden_pointer = 0; 1186 hidden_pointer = 0;
1174 1187
… …
1182rxvt_term::pointer_blank () 1195rxvt_term::pointer_blank ()
1183{ 1196{
1184 if (!OPTION (Opt_pointerBlank)) 1197 if (!OPTION (Opt_pointerBlank))
1185 return; 1198 return;
1186 1199
1187 XDefineCursor (display->display, vt, display->blank_cursor); 1200 XDefineCursor (dpy, vt, display->blank_cursor);
1188 XFlush (display->display); 1201 XFlush (dpy);
1189 1202
1190 hidden_pointer = 1; 1203 hidden_pointer = 1;
1191} 1204}
1192 1205
1193void 1206void
… …
1266 (32 + button_number + key_state), 1279 (32 + button_number + key_state),
1267 (32 + x + 1), 1280 (32 + x + 1),
1268 (32 + y + 1)); 1281 (32 + y + 1));
1269} 1282}
1270 1283
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 */ 1284/*{{{ process an X event */
1282void 1285void
1283rxvt_term::x_cb (XEvent &ev) 1286rxvt_term::x_cb (XEvent &ev)
1284{ 1287{
1285 make_current (); 1288 make_current ();
1286 1289
1287 dDisp; 1290 dLocal (Display *, dpy);
1288 1291
1289 if (ev.xany.window == vt 1292 if (ev.xany.window == vt
1290 && SHOULD_INVOKE (HOOK_X_EVENT) 1293 && SHOULD_INVOKE (HOOK_X_EVENT)
1291 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1294 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1292 return; 1295 return;
… …
1402 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END))) 1405 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1403 destroy (); 1406 destroy ();
1404 } 1407 }
1405#if ENABLE_EWMH 1408#if ENABLE_EWMH
1406 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1409 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1407 XSendEvent (disp, ev.xclient.window = display->root, 1410 XSendEvent (dpy, ev.xclient.window = display->root,
1408 False, SubstructureRedirectMask | SubstructureNotifyMask, 1411 False, SubstructureRedirectMask | SubstructureNotifyMask,
1409 &ev); 1412 &ev);
1410#endif 1413#endif
1411 } 1414 }
1412 } 1415 }
… …
1460 break; 1463 break;
1461 1464
1462 case ConfigureNotify: 1465 case ConfigureNotify:
1463 if (ev.xconfigure.window == parent[0]) 1466 if (ev.xconfigure.window == parent[0])
1464 { 1467 {
1465 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1468 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1466 ; 1469 ;
1467 1470
1468 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1471 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1469 { 1472 {
1470 seen_resize = 1; 1473 seen_resize = 1;
… …
1528 if (ev.xany.window == vt) 1531 if (ev.xany.window == vt)
1529 { 1532 {
1530 do 1533 do
1531 scr_expose (ev.xexpose.x, ev.xexpose.y, 1534 scr_expose (ev.xexpose.x, ev.xexpose.y,
1532 ev.xexpose.width, ev.xexpose.height, False); 1535 ev.xexpose.width, ev.xexpose.height, False);
1533 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1536 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1534 1537
1535 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1538 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1536 1539
1537 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1540 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1538 scr_expose (ev.xexpose.x, ev.xexpose.y, 1541 scr_expose (ev.xexpose.x, ev.xexpose.y,
1539 ev.xexpose.width, ev.xexpose.height, False); 1542 ev.xexpose.width, ev.xexpose.height, False);
1540 1543
1541 want_refresh = 1; 1544 want_refresh = 1;
1542 } 1545 }
1543 else 1546 else
1544 { 1547 {
1545 XEvent unused_event; 1548 XEvent unused_event;
1546 1549
1547 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1550 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1548 ; 1551 ;
1549 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1552 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1550 ; 1553 ;
1551 1554
1552 if (isScrollbarWindow (ev.xany.window)) 1555 if (isScrollbarWindow (ev.xany.window))
1553 { 1556 {
1554 scrollBar.setIdle (); 1557 scrollBar.setIdle ();
1555 scrollbar_show (0); 1558 scrollbar_show (0);
1556 } 1559 }
1557 1560
1558#ifdef TRANSPARENT 1561#ifdef TRANSPARENT
1559 if (am_transparent && ev.xany.window == parent[0]) 1562 if (am_transparent && ev.xany.window == parent[0])
1560 XClearWindow (disp, ev.xany.window); 1563 XClearWindow (dpy, ev.xany.window);
1561#endif 1564#endif
1562 } 1565 }
1563 break; 1566 break;
1564 1567
1565 case MotionNotify: 1568 case MotionNotify:
… …
1575 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1578 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1576 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1579 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1577 ; // nop 1580 ; // nop
1578 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1581 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1579 { 1582 {
1580 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1583 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1581 ; 1584 ;
1582 1585
1583 XQueryPointer (disp, vt, 1586 XQueryPointer (dpy, vt,
1584 &unused_root, &unused_child, 1587 &unused_root, &unused_child,
1585 &unused_root_x, &unused_root_y, 1588 &unused_root_x, &unused_root_y,
1586 &ev.xbutton.x, &ev.xbutton.y, 1589 &ev.xbutton.x, &ev.xbutton.y,
1587 &ev.xbutton.state); 1590 &ev.xbutton.state);
1588#ifdef MOUSE_THRESHOLD 1591#ifdef MOUSE_THRESHOLD
… …
1652#endif 1655#endif
1653 } 1656 }
1654 } 1657 }
1655 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1658 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1656 { 1659 {
1657 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1660 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1658 MotionNotify, &ev)) 1661 MotionNotify, &ev))
1659 ; 1662 ;
1660 1663
1661 XQueryPointer (disp, scrollBar.win, 1664 XQueryPointer (dpy, scrollBar.win,
1662 &unused_root, &unused_child, 1665 &unused_root, &unused_child,
1663 &unused_root_x, &unused_root_y, 1666 &unused_root_x, &unused_root_y,
1664 &ev.xbutton.x, &ev.xbutton.y, 1667 &ev.xbutton.x, &ev.xbutton.y,
1665 &unused_mask); 1668 &unused_mask);
1666 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1669 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
… …
2181#if TINTING 2184#if TINTING
2182/* taken from aterm-0.4.2 */ 2185/* taken from aterm-0.4.2 */
2183 2186
2184typedef uint32_t RUINT32T; 2187typedef uint32_t RUINT32T;
2185 2188
2186void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm) 2189void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2187{ 2190{
2188 int sh_r, sh_g, sh_b; 2191 int sh_r, sh_g, sh_b;
2189 RUINT32T mask_r, mask_g, mask_b; 2192 RUINT32T mask_r, mask_g, mask_b;
2190 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2193 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2191 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2194 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2192 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2195 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2193 int i; 2196 int i;
2194 2197
2195 Visual *visual = display->visual; 2198 Visual *visual = term->visual;
2196 2199
2197 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2200 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2198 2201
2199 /* for convenience */ 2202 /* for convenience */
2200 mask_r = visual->red_mask; 2203 mask_r = visual->red_mask;
… …
2421 Atom atype; 2424 Atom atype;
2422 unsigned char *prop = NULL; 2425 unsigned char *prop = NULL;
2423 Window root, oldp, *list; 2426 Window root, oldp, *list;
2424 Pixmap rootpixmap = None; 2427 Pixmap rootpixmap = None;
2425 XWindowAttributes wattr, wrootattr; 2428 XWindowAttributes wattr, wrootattr;
2426 dDisp;
2427 2429
2428 pchanged = 0; 2430 pchanged = 0;
2429 2431
2430 if (!OPTION (Opt_transparent)) 2432 if (!OPTION (Opt_transparent))
2431 return pchanged; /* Don't try any more */ 2433 return pchanged; /* Don't try any more */
2432 2434
2433 XGetWindowAttributes (disp, display->root, &wrootattr); 2435 XGetWindowAttributes (dpy, display->root, &wrootattr);
2434 rootdepth = wrootattr.depth; 2436 rootdepth = wrootattr.depth;
2435 2437
2436 XGetWindowAttributes (disp, parent[0], &wattr); 2438 XGetWindowAttributes (dpy, parent[0], &wattr);
2437 2439
2438 if (rootdepth != wattr.depth) 2440 if (rootdepth != wattr.depth)
2439 { 2441 {
2440 if (am_transparent) 2442 if (am_transparent)
2441 { 2443 {
2442 pchanged = 1; 2444 pchanged = 1;
2443 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2445 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2444 am_transparent = am_pixmap_trans = 0; 2446 am_transparent = am_pixmap_trans = 0;
2445 } 2447 }
2446 2448
2447 return pchanged; /* Don't try any more */ 2449 return pchanged; /* Don't try any more */
2448 } 2450 }
2449 2451
2450 /* Get all X ops out of the queue so that our information is up-to-date. */ 2452 /* Get all X ops out of the queue so that our information is up-to-date. */
2451 XSync (disp, False); 2453 XSync (dpy, False);
2452 2454
2453 /* 2455 /*
2454 * Make the frame window set by the window manager have 2456 * Make the frame window set by the window manager have
2455 * the root background. Some window managers put multiple nested frame 2457 * the root background. Some window managers put multiple nested frame
2456 * windows for each client, so we have to take care about that. 2458 * windows for each client, so we have to take care about that.
2457 */ 2459 */
2458 i = (xa[XA_XROOTPMAP_ID] 2460 i = (xa[XA_XROOTPMAP_ID]
2459 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], 2461 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2460 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2462 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2461 &nitems, &bytes_after, &prop) == Success); 2463 &nitems, &bytes_after, &prop) == Success);
2462 2464
2463 if (!i || prop == NULL) 2465 if (!i || prop == NULL)
2464 i = (xa[XA_ESETROOT_PMAP_ID] 2466 i = (xa[XA_ESETROOT_PMAP_ID]
2465 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], 2467 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2466 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2468 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2467 &nitems, &bytes_after, &prop) == Success); 2469 &nitems, &bytes_after, &prop) == Success);
2468 2470
2469 if (!i || prop == NULL 2471 if (!i || prop == NULL
2470#if TINTING 2472#if TINTING
2471 || !rs[Rs_color + Color_tint] 2473 || !ISSET_PIXCOLOR (Color_tint)
2472#endif 2474#endif
2473 ) 2475 )
2474 have_pixmap = 0; 2476 have_pixmap = 0;
2475 else 2477 else
2476 { 2478 {
… …
2489 Window cr; 2491 Window cr;
2490 XImage *image; 2492 XImage *image;
2491 GC gc; 2493 GC gc;
2492 XGCValues gcvalue; 2494 XGCValues gcvalue;
2493 2495
2494 XTranslateCoordinates (disp, parent[0], display->root, 2496 XTranslateCoordinates (dpy, parent[0], display->root,
2495 0, 0, &sx, &sy, &cr); 2497 0, 0, &sx, &sy, &cr);
2496 nw = (unsigned int)szHint.width; 2498 nw = (unsigned int)szHint.width;
2497 nh = (unsigned int)szHint.height; 2499 nh = (unsigned int)szHint.height;
2498 nx = ny = 0; 2500 nx = ny = 0;
2499 2501
… …
2512 } 2514 }
2513 2515
2514 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2516 min_it (nw, (unsigned int) (wrootattr.width - sx));
2515 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2517 min_it (nh, (unsigned int) (wrootattr.height - sy));
2516 2518
2517 XSync (disp, False); 2519 XSync (dpy, False);
2518 allowedxerror = -1; 2520 allowedxerror = -1;
2519 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2521 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2520 2522
2521 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2523 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2522 /* XXX: may need a delay here? */ 2524 /* XXX: may need a delay here? */
2523 allowedxerror = 0; 2525 allowedxerror = 0;
2524 2526
… …
2527 if (am_transparent && am_pixmap_trans) 2529 if (am_transparent && am_pixmap_trans)
2528 { 2530 {
2529 pchanged = 1; 2531 pchanged = 1;
2530 if (pixmap != None) 2532 if (pixmap != None)
2531 { 2533 {
2532 XFreePixmap (disp, pixmap); 2534 XFreePixmap (dpy, pixmap);
2533 pixmap = None; 2535 pixmap = None;
2534 } 2536 }
2535 } 2537 }
2536 2538
2537 am_pixmap_trans = 0; 2539 am_pixmap_trans = 0;
2538 } 2540 }
2539 else 2541 else
2540 { 2542 {
2541 if (pixmap != None) 2543 if (pixmap != None)
2542 XFreePixmap (disp, pixmap); 2544 XFreePixmap (dpy, pixmap);
2543 2545
2544#if TINTING 2546#if TINTING
2545 if (ISSET_PIXCOLOR (Color_tint)) 2547 if (ISSET_PIXCOLOR (Color_tint))
2546 { 2548 {
2547 unsigned short rm, gm, bm;
2548 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2549 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2549 2550
2551 rgba c;
2550 pix_colors_focused[Color_tint].get (display, rm, gm, bm); 2552 pix_colors_focused [Color_tint].get (c);
2551 2553
2552 ShadeXImage (display, image, shade, rm, gm, bm); 2554 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2553 } 2555 }
2554#endif 2556#endif
2555 2557
2556 pixmap = XCreatePixmap (disp, vt, 2558 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2557 szHint.width, szHint.height, image->depth);
2558 gc = XCreateGC (disp, vt, 0UL, &gcvalue); 2559 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2559 XPutImage (disp, pixmap, gc, image, 0, 0, 2560 XPutImage (dpy, pixmap, gc, image, 0, 0,
2560 nx, ny, image->width, image->height); 2561 nx, ny, image->width, image->height);
2561 XFreeGC (disp, gc); 2562 XFreeGC (dpy, gc);
2562 XDestroyImage (image); 2563 XDestroyImage (image);
2563 XSetWindowBackgroundPixmap (disp, parent[0], pixmap); 2564 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2564 XClearWindow (disp, parent[0]); 2565 XClearWindow (dpy, parent[0]);
2565 2566
2566 if (!am_transparent || !am_pixmap_trans) 2567 if (!am_transparent || !am_pixmap_trans)
2567 pchanged = 1; 2568 pchanged = 1;
2568 2569
2569 am_transparent = am_pixmap_trans = 1; 2570 am_transparent = am_pixmap_trans = 1;
2570 } 2571 }
2571 } 2572 }
2572 2573
2573 if (am_pixmap_trans) 2574 if (am_pixmap_trans)
2574 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2575 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2575 else 2576 else
2576 { 2577 {
2577 unsigned int n; 2578 unsigned int n;
2578 /* 2579 /*
2579 * InheritPixmap transparency 2580 * InheritPixmap transparency
2580 */ 2581 */
2581 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2582 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2582 { 2583 {
2583 oldp = parent[i]; 2584 oldp = parent[i];
2584 XQueryTree (disp, parent[i - 1], &root, 2585 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2585 &parent[i], &list, &n);
2586 XFree (list); 2586 XFree (list);
2587 2587
2588 if (parent[i] == display->root) 2588 if (parent[i] == display->root)
2589 { 2589 {
2590 if (oldp != None) 2590 if (oldp != None)
… …
2598 } 2598 }
2599 2599
2600 n = 0; 2600 n = 0;
2601 2601
2602 if (pchanged) 2602 if (pchanged)
2603 {
2604 for (; n < (unsigned int)i; n++) 2603 for (; n < (unsigned int)i; n++)
2605 { 2604 {
2606 XGetWindowAttributes (disp, parent[n], &wattr); 2605 XGetWindowAttributes (dpy, parent[n], &wattr);
2606
2607 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2607 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2608 { 2608 {
2609 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2609 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2610 break; 2610 break;
2611 } 2611 }
2612 } 2612 }
2613 }
2614 2613
2615 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2614 if (n > (sizeof (parent) / sizeof (parent[0])))
2616 { 2615 {
2617 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]); 2616 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2618 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2617 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2619 am_transparent = 0; 2618 am_transparent = 0;
2620 /* XXX: also turn off Opt_transparent? */ 2619 /* XXX: also turn off Opt_transparent? */
2621 } 2620 }
2622 else 2621 else
2623 { 2622 {
2624 for (n = 0; n < (unsigned int)i; n++) 2623 for (n = 0; n < (unsigned int)i; n++)
2625 { 2624 {
2626 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); 2625 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2627 XClearWindow (disp, parent[n]); 2626 XClearWindow (dpy, parent[n]);
2628 } 2627 }
2629 2628
2630 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2629 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2631 am_transparent = 1; 2630 am_transparent = 1;
2632 } 2631 }
2633 2632
2634 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2633 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2635 parent[i] = None; 2634 parent[i] = None;
2636 } 2635 }
2637 2636
2638 if (scrollBar.win) 2637 if (scrollBar.win)
2639 { 2638 {
2640 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2639 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2641 scrollBar.setIdle (); 2640 scrollBar.setIdle ();
2642 scrollbar_show (0); 2641 scrollbar_show (0);
2643 } 2642 }
2644 2643
2645 if (am_transparent) 2644 if (am_transparent)
… …
3096 scr_charset_set (2, (unsigned int)cmd_getc ()); 3095 scr_charset_set (2, (unsigned int)cmd_getc ());
3097 break; 3096 break;
3098 case '+': 3097 case '+':
3099 scr_charset_set (3, (unsigned int)cmd_getc ()); 3098 scr_charset_set (3, (unsigned int)cmd_getc ());
3100 break; 3099 break;
3101#if ENABLE_FRILLS 3100#if !ENABLE_MINIMAL
3102 case '6': 3101 case '6':
3103 scr_backindex (); 3102 scr_backindex ();
3104 break; 3103 break;
3105#endif 3104#endif
3106 case '7': 3105 case '7':
3107 scr_cursor (SAVE); 3106 scr_cursor (SAVE);
3108 break; 3107 break;
3109 case '8': 3108 case '8':
3110 scr_cursor (RESTORE); 3109 scr_cursor (RESTORE);
3111 break; 3110 break;
3112#if ENABLE_FRILLS 3111#if !ENABLE_MINIMAL
3113 case '9': 3112 case '9':
3114 scr_forwardindex (); 3113 scr_forwardindex ();
3115 break; 3114 break;
3116#endif 3115#endif
3117 case '=': 3116 case '=':
… …
3290 { 3289 {
3291 case '>': 3290 case '>':
3292 if (ch == CSI_DA) /* secondary device attributes */ 3291 if (ch == CSI_DA) /* secondary device attributes */
3293 { 3292 {
3294 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 3293 // 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. 3294 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3296 // 3295 //
3297 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 3296 // 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 3297 // 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). 3298 // that we do not support xterm mouse reporting (should be 95 when we do).
3300 // 3299 //
3301 tt_printf ("\033[>%c%c85;94;0c", VERSION[0], VERSION[1]); 3300 tt_printf ("\033[>%d;94;0c", 'U');
3302 } 3301 }
3303 break; 3302 break;
3304 case '?': 3303 case '?':
3305 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3304 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3306 process_terminal_mode (ch, priv, nargs, arg); 3305 process_terminal_mode (ch, priv, nargs, arg);
… …
3510 break; 3509 break;
3511 case CSI_75: 3510 case CSI_75:
3512 scr_cursor (RESTORE); 3511 scr_cursor (RESTORE);
3513 break; 3512 break;
3514 3513
3515#if ENABLE_FRILLS 3514#if !ENABLE_MINIMAL
3516 case CSI_74: 3515 case CSI_74:
3517 process_window_ops (arg, nargs); 3516 process_window_ops (arg, nargs);
3518 break; 3517 break;
3519#endif 3518#endif
3520 3519
… …
3527 break; 3526 break;
3528 } 3527 }
3529} 3528}
3530/*}}} */ 3529/*}}} */
3531 3530
3532#if ENABLE_FRILLS 3531#if !ENABLE_MINIMAL
3533/* ARGSUSED */ 3532/* ARGSUSED */
3534void 3533void
3535rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3534rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3536{ 3535{
3537 int x, y; 3536 int x, y;
3538 XWindowAttributes wattr; 3537 XWindowAttributes wattr;
3539 Window wdummy; 3538 Window wdummy;
3540 dDisp; 3539
3540 dLocal (Display *, dpy);
3541 3541
3542 if (nargs == 0) 3542 if (nargs == 0)
3543 return; 3543 return;
3544 3544
3545 switch (args[0]) 3545 switch (args[0])
3546 { 3546 {
3547 /* 3547 /*
3548 * commands 3548 * commands
3549 */ 3549 */
3550 case 1: /* deiconify window */ 3550 case 1: /* deiconify window */
3551 XMapWindow (disp, parent[0]); 3551 XMapWindow (dpy, parent[0]);
3552 break; 3552 break;
3553 case 2: /* iconify window */ 3553 case 2: /* iconify window */
3554 XIconifyWindow (disp, parent[0], display->screen); 3554 XIconifyWindow (dpy, parent[0], display->screen);
3555 break; 3555 break;
3556 case 3: /* set position (pixels) */ 3556 case 3: /* set position (pixels) */
3557 XMoveWindow (disp, parent[0], args[1], args[2]); 3557 XMoveWindow (dpy, parent[0], args[1], args[2]);
3558 break; 3558 break;
3559 case 4: /* set size (pixels) */ 3559 case 4: /* set size (pixels) */
3560 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3560 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3561 break; 3561 break;
3562 case 5: /* raise window */ 3562 case 5: /* raise window */
3563 XRaiseWindow (disp, parent[0]); 3563 XRaiseWindow (dpy, parent[0]);
3564 break; 3564 break;
3565 case 6: /* lower window */ 3565 case 6: /* lower window */
3566 XLowerWindow (disp, parent[0]); 3566 XLowerWindow (dpy, parent[0]);
3567 break; 3567 break;
3568 case 7: /* refresh window */ 3568 case 7: /* refresh window */
3569 scr_touch (true); 3569 scr_touch (true);
3570 break; 3570 break;
3571 case 8: /* set size (chars) */ 3571 case 8: /* set size (chars) */
… …
3578 if (args[0] >= 24) /* set height (chars) */ 3578 if (args[0] >= 24) /* set height (chars) */
3579 set_widthheight ((unsigned int)width, 3579 set_widthheight ((unsigned int)width,
3580 (unsigned int) (args[1] * fheight)); 3580 (unsigned int) (args[1] * fheight));
3581 break; 3581 break;
3582 3582
3583
3584 /* 3583 /*
3585 * reports - some output format copied from XTerm 3584 * reports - some output format copied from XTerm
3586 */ 3585 */
3587 case 11: /* report window state */ 3586 case 11: /* report window state */
3588 XGetWindowAttributes (disp, parent[0], &wattr); 3587 XGetWindowAttributes (dpy, parent[0], &wattr);
3589 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3588 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3590 break; 3589 break;
3591 case 13: /* report window position */ 3590 case 13: /* report window position */
3592 XGetWindowAttributes (disp, parent[0], &wattr); 3591 XGetWindowAttributes (dpy, parent[0], &wattr);
3593 XTranslateCoordinates (disp, parent[0], wattr.root, 3592 XTranslateCoordinates (dpy, parent[0], wattr.root,
3594 -wattr.border_width, -wattr.border_width, 3593 -wattr.border_width, -wattr.border_width,
3595 &x, &y, &wdummy); 3594 &x, &y, &wdummy);
3596 tt_printf ("\033[3;%d;%dt", x, y); 3595 tt_printf ("\033[3;%d;%dt", x, y);
3597 break; 3596 break;
3598 case 14: /* report window size (pixels) */ 3597 case 14: /* report window size (pixels) */
3599 XGetWindowAttributes (disp, parent[0], &wattr); 3598 XGetWindowAttributes (dpy, parent[0], &wattr);
3600 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3599 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3601 break; 3600 break;
3602 case 18: /* report text area size (chars) */ 3601 case 18: /* report text area size (chars) */
3603 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3602 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3604 break; 3603 break;
… …
3606 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3605 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3607 break; 3606 break;
3608 case 20: /* report icon label */ 3607 case 20: /* report icon label */
3609 { 3608 {
3610 char *s; 3609 char *s;
3611 XGetIconName (disp, parent[0], &s); 3610 XGetIconName (dpy, parent[0], &s);
3612 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3611 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3613 XFree (s); 3612 XFree (s);
3614 } 3613 }
3615 break; 3614 break;
3616 case 21: /* report window title */ 3615 case 21: /* report window title */
3617 { 3616 {
3618 char *s; 3617 char *s;
3619 XFetchName (disp, parent[0], &s); 3618 XFetchName (dpy, parent[0], &s);
3620 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3619 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3621 XFree (s); 3620 XFree (s);
3622 } 3621 }
3623 break; 3622 break;
3624 } 3623 }
… …
3725void 3724void
3726rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3725rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3727{ 3726{
3728 if (str[0] == '?' && !str[1]) 3727 if (str[0] == '?' && !str[1])
3729 { 3728 {
3730 unsigned short r, g, b; 3729 rgba c;
3731 pix_colors_focused[color].get (display, r, g, b); 3730 pix_colors_focused[color].get (c);
3731
3732#if XFT
3733 if (c.a != rgba::MAX_CC)
3734 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3735 else
3736#endif
3732 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3737 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3733 } 3738 }
3734 else 3739 else
3735 set_window_color (color, str); 3740 set_window_color (color, str);
3736} 3741}
3737 3742
… …
3743{ 3748{
3744 int color; 3749 int color;
3745 char *buf, *name; 3750 char *buf, *name;
3746 bool query = str[0] == '?' && !str[1]; 3751 bool query = str[0] == '?' && !str[1];
3747 int saveop = op; 3752 int saveop = op;
3748 dDisp; 3753
3754 dLocal (Display *, dpy);
3749 3755
3750 assert (str != NULL); 3756 assert (str != NULL);
3751 switch (op) 3757 switch (op)
3752 { 3758 {
3753 case XTerm_name: 3759 case XTerm_name:
… …
3769 unsigned long bytes_after; 3775 unsigned long bytes_after;
3770 unsigned char *value = 0; 3776 unsigned char *value = 0;
3771 const char *str = ""; 3777 const char *str = "";
3772 3778
3773 if (prop 3779 if (prop
3774 && XGetWindowProperty (disp, parent[0], 3780 && XGetWindowProperty (dpy, parent[0],
3775 prop, 0, 1<<16, 0, AnyPropertyType, 3781 prop, 0, 1<<16, 0, AnyPropertyType,
3776 &actual_type, &actual_format, 3782 &actual_type, &actual_format,
3777 &nitems, &bytes_after, &value) == Success 3783 &nitems, &bytes_after, &value) == Success
3778 && actual_type != None 3784 && actual_type != None
3779 && actual_format == 8) 3785 && actual_format == 8)
3780 str = (const char *)(value); 3786 str = (const char *)(value);
3781 3787
3782 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3788 tt_printf ("\033]%d;%s%c", op, str, resp);
3783 3789
3784 XFree (value); 3790 XFree (value);
3785 } 3791 }
3786 else 3792 else
3787 { 3793 {
… …
3791 { 3797 {
3792 *eq = 0; 3798 *eq = 0;
3793 set_utf8_property (display->atom (str), eq + 1); 3799 set_utf8_property (display->atom (str), eq + 1);
3794 } 3800 }
3795 else 3801 else
3796 XDeleteProperty (disp, parent[0], 3802 XDeleteProperty (dpy, parent[0],
3797 display->atom (str)); 3803 display->atom (str));
3798 } 3804 }
3799 break; 3805 break;
3800 3806
3801 case XTerm_Color: 3807 case XTerm_Color:
… …
3811 break; 3817 break;
3812 3818
3813 if ((buf = strchr (name, ';')) != NULL) 3819 if ((buf = strchr (name, ';')) != NULL)
3814 *buf++ = '\0'; 3820 *buf++ = '\0';
3815 3821
3816 if (name[0] == '?' && !name[1]) 3822 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 } 3823 }
3825 break; 3824 break;
3826 case XTerm_Color00: 3825 case XTerm_Color00:
3827 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3826 process_color_seq (op, Color_fg, str, resp);
3828 break; 3827 break;
3829 case XTerm_Color01: 3828 case XTerm_Color01:
3830 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3829 process_color_seq (op, Color_bg, str, resp);
3831 break; 3830 break;
3832#ifndef NO_CURSORCOLOR 3831#ifndef NO_CURSORCOLOR
3833 case XTerm_Color_cursor: 3832 case XTerm_Color_cursor:
3834 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3833 process_color_seq (op, Color_cursor, str, resp);
3835 break; 3834 break;
3836#endif 3835#endif
3837 case XTerm_Color_pointer_fg: 3836 case XTerm_Color_pointer_fg:
3838 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3837 process_color_seq (op, Color_pointer_fg, str, resp);
3839 break; 3838 break;
3840 case XTerm_Color_pointer_bg: 3839 case XTerm_Color_pointer_bg:
3841 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3840 process_color_seq (op, Color_pointer_bg, str, resp);
3842 break; 3841 break;
3843#ifndef NO_BOLD_UNDERLINE_REVERSE 3842#ifndef NO_BOLD_UNDERLINE_REVERSE
3844 case XTerm_Color_RV: 3843 case XTerm_Color_RV:
3845 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3844 process_color_seq (op, Color_RV, str, resp);
3846 break; 3845 break;
3847 case Rxvt_Color_BD: 3846 case Rxvt_Color_BD:
3848 case URxvt_Color_BD: 3847 case URxvt_Color_BD:
3849 process_color_seq (op, Color_BD, str, resp); 3848 process_color_seq (op, Color_BD, str, resp);
3850 break; 3849 break;
3851 case Rxvt_Color_UL: 3850 case Rxvt_Color_UL:
3852 case URxvt_Color_UL: 3851 case URxvt_Color_UL:
3853 process_color_seq (op, Color_UL, str, resp); 3852 process_color_seq (op, Color_UL, str, resp);
3854 break; 3853 break;
3855 case URxvt_Color_IT: 3854 case URxvt_Color_IT:
3856 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3855 process_color_seq (op, Color_IT, str, resp);
3857 break; 3856 break;
3858#endif 3857#endif
3859#if TRANSPARENT && TINTING 3858#if TRANSPARENT && TINTING
3860 case URxvt_Color_tint: 3859 case URxvt_Color_tint:
3861 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3860 process_color_seq (op, Color_tint, str, resp);
3861
3862 check_our_parents (); 3862 check_our_parents ();
3863
3863 if (am_transparent) 3864 if (am_transparent)
3864 want_full_refresh = want_refresh = 1; 3865 want_full_refresh = want_refresh = 1;
3866
3865 break; 3867 break;
3866#endif 3868#endif
3867 3869
3868 case Rxvt_Pixmap: 3870 case Rxvt_Pixmap:
3869 { 3871 {
… …
3940 allocated.push_back ((void *)res); 3942 allocated.push_back ((void *)res);
3941 set_fonts (); 3943 set_fonts ();
3942 } 3944 }
3943 break; 3945 break;
3944 3946
3945#if ENABLE_FRILLS 3947 case URxvt_version:
3948 if (query)
3949 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3950 op,
3951 rs[Rs_name], VERSION[0], VERSION[2],
3952 resp);
3953 break;
3954
3955#if !ENABLE_MINIMAL
3946 case URxvt_locale: 3956 case URxvt_locale:
3947 if (query) 3957 if (query)
3948 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3958 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
3949 else 3959 else
3950 { 3960 {
3951 set_locale (str); 3961 set_locale (str);
3952 pty->set_utf8_mode (enc_utf8); 3962 pty->set_utf8_mode (enc_utf8);
3953 init_xlocale (); 3963 init_xlocale ();
… …
4314 scr_color (Color_bg, Color_bg); 4324 scr_color (Color_bg, Color_bg);
4315 break; 4325 break;
4316 4326
4317 //case 50: // not variable spacing 4327 //case 50: // not variable spacing
4318 4328
4319#if ENABLE_FRILLS 4329#if !ENABLE_MINIMAL
4320 case 90: 4330 case 90:
4321 case 91: /* set bright fg color */ 4331 case 91: /* set bright fg color */
4322 case 92: 4332 case 92:
4323 case 93: 4333 case 93:
4324 case 94: 4334 case 94:

Diff Legend

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