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

Diff Legend

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