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.302 by root, Tue Jan 31 21:35:39 2006 UTC

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

Diff Legend

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