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.285 by root, Wed Jan 25 21:03:04 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
… …
1272void 1285void
1273rxvt_term::x_cb (XEvent &ev) 1286rxvt_term::x_cb (XEvent &ev)
1274{ 1287{
1275 make_current (); 1288 make_current ();
1276 1289
1277 dLocal (Display *, xdisp); 1290 dLocal (Display *, dpy);
1278 1291
1279 if (ev.xany.window == vt 1292 if (ev.xany.window == vt
1280 && SHOULD_INVOKE (HOOK_X_EVENT) 1293 && SHOULD_INVOKE (HOOK_X_EVENT)
1281 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1294 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1282 return; 1295 return;
… …
1392 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)))
1393 destroy (); 1406 destroy ();
1394 } 1407 }
1395#if ENABLE_EWMH 1408#if ENABLE_EWMH
1396 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])
1397 XSendEvent (xdisp, ev.xclient.window = display->root, 1410 XSendEvent (dpy, ev.xclient.window = display->root,
1398 False, SubstructureRedirectMask | SubstructureNotifyMask, 1411 False, SubstructureRedirectMask | SubstructureNotifyMask,
1399 &ev); 1412 &ev);
1400#endif 1413#endif
1401 } 1414 }
1402 } 1415 }
… …
1450 break; 1463 break;
1451 1464
1452 case ConfigureNotify: 1465 case ConfigureNotify:
1453 if (ev.xconfigure.window == parent[0]) 1466 if (ev.xconfigure.window == parent[0])
1454 { 1467 {
1455 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev)) 1468 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1456 ; 1469 ;
1457 1470
1458 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1471 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1459 { 1472 {
1460 seen_resize = 1; 1473 seen_resize = 1;
… …
1518 if (ev.xany.window == vt) 1531 if (ev.xany.window == vt)
1519 { 1532 {
1520 do 1533 do
1521 scr_expose (ev.xexpose.x, ev.xexpose.y, 1534 scr_expose (ev.xexpose.x, ev.xexpose.y,
1522 ev.xexpose.width, ev.xexpose.height, False); 1535 ev.xexpose.width, ev.xexpose.height, False);
1523 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)); 1536 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1524 1537
1525 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1538 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1526 1539
1527 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)) 1540 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1528 scr_expose (ev.xexpose.x, ev.xexpose.y, 1541 scr_expose (ev.xexpose.x, ev.xexpose.y,
1529 ev.xexpose.width, ev.xexpose.height, False); 1542 ev.xexpose.width, ev.xexpose.height, False);
1530 1543
1531 want_refresh = 1; 1544 want_refresh = 1;
1532 } 1545 }
1533 else 1546 else
1534 { 1547 {
1535 XEvent unused_event; 1548 XEvent unused_event;
1536 1549
1537 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event)) 1550 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1538 ; 1551 ;
1539 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event)) 1552 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1540 ; 1553 ;
1541 1554
1542 if (isScrollbarWindow (ev.xany.window)) 1555 if (isScrollbarWindow (ev.xany.window))
1543 { 1556 {
1544 scrollBar.setIdle (); 1557 scrollBar.setIdle ();
1545 scrollbar_show (0); 1558 scrollbar_show (0);
1546 } 1559 }
1547 1560
1548#ifdef TRANSPARENT 1561#ifdef TRANSPARENT
1549 if (am_transparent && ev.xany.window == parent[0]) 1562 if (am_transparent && ev.xany.window == parent[0])
1550 XClearWindow (xdisp, ev.xany.window); 1563 XClearWindow (dpy, ev.xany.window);
1551#endif 1564#endif
1552 } 1565 }
1553 break; 1566 break;
1554 1567
1555 case MotionNotify: 1568 case MotionNotify:
… …
1565 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1578 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1566 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1579 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1567 ; // nop 1580 ; // nop
1568 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1581 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1569 { 1582 {
1570 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev)) 1583 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1571 ; 1584 ;
1572 1585
1573 XQueryPointer (xdisp, vt, 1586 XQueryPointer (dpy, vt,
1574 &unused_root, &unused_child, 1587 &unused_root, &unused_child,
1575 &unused_root_x, &unused_root_y, 1588 &unused_root_x, &unused_root_y,
1576 &ev.xbutton.x, &ev.xbutton.y, 1589 &ev.xbutton.x, &ev.xbutton.y,
1577 &ev.xbutton.state); 1590 &ev.xbutton.state);
1578#ifdef MOUSE_THRESHOLD 1591#ifdef MOUSE_THRESHOLD
… …
1642#endif 1655#endif
1643 } 1656 }
1644 } 1657 }
1645 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1658 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1646 { 1659 {
1647 while (XCheckTypedWindowEvent (xdisp, scrollBar.win, 1660 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1648 MotionNotify, &ev)) 1661 MotionNotify, &ev))
1649 ; 1662 ;
1650 1663
1651 XQueryPointer (xdisp, scrollBar.win, 1664 XQueryPointer (dpy, scrollBar.win,
1652 &unused_root, &unused_child, 1665 &unused_root, &unused_child,
1653 &unused_root_x, &unused_root_y, 1666 &unused_root_x, &unused_root_y,
1654 &ev.xbutton.x, &ev.xbutton.y, 1667 &ev.xbutton.x, &ev.xbutton.y,
1655 &unused_mask); 1668 &unused_mask);
1656 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1669 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
… …
2417 pchanged = 0; 2430 pchanged = 0;
2418 2431
2419 if (!OPTION (Opt_transparent)) 2432 if (!OPTION (Opt_transparent))
2420 return pchanged; /* Don't try any more */ 2433 return pchanged; /* Don't try any more */
2421 2434
2422 XGetWindowAttributes (xdisp, display->root, &wrootattr); 2435 XGetWindowAttributes (dpy, display->root, &wrootattr);
2423 rootdepth = wrootattr.depth; 2436 rootdepth = wrootattr.depth;
2424 2437
2425 XGetWindowAttributes (xdisp, parent[0], &wattr); 2438 XGetWindowAttributes (dpy, parent[0], &wattr);
2426 2439
2427 if (rootdepth != wattr.depth) 2440 if (rootdepth != wattr.depth)
2428 { 2441 {
2429 if (am_transparent) 2442 if (am_transparent)
2430 { 2443 {
2431 pchanged = 1; 2444 pchanged = 1;
2432 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]); 2445 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2433 am_transparent = am_pixmap_trans = 0; 2446 am_transparent = am_pixmap_trans = 0;
2434 } 2447 }
2435 2448
2436 return pchanged; /* Don't try any more */ 2449 return pchanged; /* Don't try any more */
2437 } 2450 }
2438 2451
2439 /* 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. */
2440 XSync (xdisp, False); 2453 XSync (dpy, False);
2441 2454
2442 /* 2455 /*
2443 * Make the frame window set by the window manager have 2456 * Make the frame window set by the window manager have
2444 * the root background. Some window managers put multiple nested frame 2457 * the root background. Some window managers put multiple nested frame
2445 * 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.
2446 */ 2459 */
2447 i = (xa[XA_XROOTPMAP_ID] 2460 i = (xa[XA_XROOTPMAP_ID]
2448 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID], 2461 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2449 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2462 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2450 &nitems, &bytes_after, &prop) == Success); 2463 &nitems, &bytes_after, &prop) == Success);
2451 2464
2452 if (!i || prop == NULL) 2465 if (!i || prop == NULL)
2453 i = (xa[XA_ESETROOT_PMAP_ID] 2466 i = (xa[XA_ESETROOT_PMAP_ID]
2454 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID], 2467 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2455 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2468 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2456 &nitems, &bytes_after, &prop) == Success); 2469 &nitems, &bytes_after, &prop) == Success);
2457 2470
2458 if (!i || prop == NULL 2471 if (!i || prop == NULL
2459#if TINTING 2472#if TINTING
2460 || !rs[Rs_color + Color_tint] 2473 || !ISSET_PIXCOLOR (Color_tint)
2461#endif 2474#endif
2462 ) 2475 )
2463 have_pixmap = 0; 2476 have_pixmap = 0;
2464 else 2477 else
2465 { 2478 {
… …
2478 Window cr; 2491 Window cr;
2479 XImage *image; 2492 XImage *image;
2480 GC gc; 2493 GC gc;
2481 XGCValues gcvalue; 2494 XGCValues gcvalue;
2482 2495
2483 XTranslateCoordinates (xdisp, parent[0], display->root, 2496 XTranslateCoordinates (dpy, parent[0], display->root,
2484 0, 0, &sx, &sy, &cr); 2497 0, 0, &sx, &sy, &cr);
2485 nw = (unsigned int)szHint.width; 2498 nw = (unsigned int)szHint.width;
2486 nh = (unsigned int)szHint.height; 2499 nh = (unsigned int)szHint.height;
2487 nx = ny = 0; 2500 nx = ny = 0;
2488 2501
… …
2501 } 2514 }
2502 2515
2503 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2516 min_it (nw, (unsigned int) (wrootattr.width - sx));
2504 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2517 min_it (nh, (unsigned int) (wrootattr.height - sy));
2505 2518
2506 XSync (xdisp, False); 2519 XSync (dpy, False);
2507 allowedxerror = -1; 2520 allowedxerror = -1;
2508 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2521 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2509 2522
2510 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2523 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2511 /* XXX: may need a delay here? */ 2524 /* XXX: may need a delay here? */
2512 allowedxerror = 0; 2525 allowedxerror = 0;
2513 2526
… …
2516 if (am_transparent && am_pixmap_trans) 2529 if (am_transparent && am_pixmap_trans)
2517 { 2530 {
2518 pchanged = 1; 2531 pchanged = 1;
2519 if (pixmap != None) 2532 if (pixmap != None)
2520 { 2533 {
2521 XFreePixmap (xdisp, pixmap); 2534 XFreePixmap (dpy, pixmap);
2522 pixmap = None; 2535 pixmap = None;
2523 } 2536 }
2524 } 2537 }
2525 2538
2526 am_pixmap_trans = 0; 2539 am_pixmap_trans = 0;
2527 } 2540 }
2528 else 2541 else
2529 { 2542 {
2530 if (pixmap != None) 2543 if (pixmap != None)
2531 XFreePixmap (xdisp, pixmap); 2544 XFreePixmap (dpy, pixmap);
2532 2545
2533#if TINTING 2546#if TINTING
2534 if (ISSET_PIXCOLOR (Color_tint)) 2547 if (ISSET_PIXCOLOR (Color_tint))
2535 { 2548 {
2536 unsigned short rm, gm, bm;
2537 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2549 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2538 2550
2551 rgba c;
2539 pix_colors_focused[Color_tint].get (this, rm, gm, bm); 2552 pix_colors_focused [Color_tint].get (c);
2540 2553
2541 ShadeXImage (this, image, shade, rm, gm, bm); 2554 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2542 } 2555 }
2543#endif 2556#endif
2544 2557
2545 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth); 2558 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2546 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue); 2559 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2547 XPutImage (xdisp, pixmap, gc, image, 0, 0, 2560 XPutImage (dpy, pixmap, gc, image, 0, 0,
2548 nx, ny, image->width, image->height); 2561 nx, ny, image->width, image->height);
2549 XFreeGC (xdisp, gc); 2562 XFreeGC (dpy, gc);
2550 XDestroyImage (image); 2563 XDestroyImage (image);
2551 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap); 2564 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2552 XClearWindow (xdisp, parent[0]); 2565 XClearWindow (dpy, parent[0]);
2553 2566
2554 if (!am_transparent || !am_pixmap_trans) 2567 if (!am_transparent || !am_pixmap_trans)
2555 pchanged = 1; 2568 pchanged = 1;
2556 2569
2557 am_transparent = am_pixmap_trans = 1; 2570 am_transparent = am_pixmap_trans = 1;
2558 } 2571 }
2559 } 2572 }
2560 2573
2561 if (am_pixmap_trans) 2574 if (am_pixmap_trans)
2562 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative); 2575 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2563 else 2576 else
2564 { 2577 {
2565 unsigned int n; 2578 unsigned int n;
2566 /* 2579 /*
2567 * InheritPixmap transparency 2580 * InheritPixmap transparency
2568 */ 2581 */
2569 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2582 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2570 { 2583 {
2571 oldp = parent[i]; 2584 oldp = parent[i];
2572 XQueryTree (xdisp, parent[i - 1], &root, 2585 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2573 &parent[i], &list, &n);
2574 XFree (list); 2586 XFree (list);
2575 2587
2576 if (parent[i] == display->root) 2588 if (parent[i] == display->root)
2577 { 2589 {
2578 if (oldp != None) 2590 if (oldp != None)
… …
2586 } 2598 }
2587 2599
2588 n = 0; 2600 n = 0;
2589 2601
2590 if (pchanged) 2602 if (pchanged)
2591 {
2592 for (; n < (unsigned int)i; n++) 2603 for (; n < (unsigned int)i; n++)
2593 { 2604 {
2594 XGetWindowAttributes (xdisp, parent[n], &wattr); 2605 XGetWindowAttributes (dpy, parent[n], &wattr);
2606
2595 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2607 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2596 { 2608 {
2597 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2609 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2598 break; 2610 break;
2599 } 2611 }
2600 } 2612 }
2601 }
2602 2613
2603 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2614 if (n > (sizeof (parent) / sizeof (parent[0])))
2604 { 2615 {
2605 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]); 2616 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2606 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]); 2617 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2607 am_transparent = 0; 2618 am_transparent = 0;
2608 /* XXX: also turn off Opt_transparent? */ 2619 /* XXX: also turn off Opt_transparent? */
2609 } 2620 }
2610 else 2621 else
2611 { 2622 {
2612 for (n = 0; n < (unsigned int)i; n++) 2623 for (n = 0; n < (unsigned int)i; n++)
2613 { 2624 {
2614 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative); 2625 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2615 XClearWindow (xdisp, parent[n]); 2626 XClearWindow (dpy, parent[n]);
2616 } 2627 }
2617 2628
2618 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative); 2629 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2619 am_transparent = 1; 2630 am_transparent = 1;
2620 } 2631 }
2621 2632
2622 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2633 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2623 parent[i] = None; 2634 parent[i] = None;
2624 } 2635 }
2625 2636
2626 if (scrollBar.win) 2637 if (scrollBar.win)
2627 { 2638 {
2628 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative); 2639 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2629 scrollBar.setIdle (); 2640 scrollBar.setIdle ();
2630 scrollbar_show (0); 2641 scrollbar_show (0);
2631 } 2642 }
2632 2643
2633 if (am_transparent) 2644 if (am_transparent)
… …
3084 scr_charset_set (2, (unsigned int)cmd_getc ()); 3095 scr_charset_set (2, (unsigned int)cmd_getc ());
3085 break; 3096 break;
3086 case '+': 3097 case '+':
3087 scr_charset_set (3, (unsigned int)cmd_getc ()); 3098 scr_charset_set (3, (unsigned int)cmd_getc ());
3088 break; 3099 break;
3089#if ENABLE_FRILLS 3100#if !ENABLE_MINIMAL
3090 case '6': 3101 case '6':
3091 scr_backindex (); 3102 scr_backindex ();
3092 break; 3103 break;
3093#endif 3104#endif
3094 case '7': 3105 case '7':
3095 scr_cursor (SAVE); 3106 scr_cursor (SAVE);
3096 break; 3107 break;
3097 case '8': 3108 case '8':
3098 scr_cursor (RESTORE); 3109 scr_cursor (RESTORE);
3099 break; 3110 break;
3100#if ENABLE_FRILLS 3111#if !ENABLE_MINIMAL
3101 case '9': 3112 case '9':
3102 scr_forwardindex (); 3113 scr_forwardindex ();
3103 break; 3114 break;
3104#endif 3115#endif
3105 case '=': 3116 case '=':
… …
3278 { 3289 {
3279 case '>': 3290 case '>':
3280 if (ch == CSI_DA) /* secondary device attributes */ 3291 if (ch == CSI_DA) /* secondary device attributes */
3281 { 3292 {
3282 // 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,
3283 // '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).
3284 // 3295 //
3285 // 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
3286 // 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
3287 // 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).
3288 // 3299 //
3289 tt_printf ("\033[>%c%c85;94;0c", VERSION[0], VERSION[1]); 3300 tt_printf ("\033[>%d;94;0c", 'U');
3290 } 3301 }
3291 break; 3302 break;
3292 case '?': 3303 case '?':
3293 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3304 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3294 process_terminal_mode (ch, priv, nargs, arg); 3305 process_terminal_mode (ch, priv, nargs, arg);
… …
3498 break; 3509 break;
3499 case CSI_75: 3510 case CSI_75:
3500 scr_cursor (RESTORE); 3511 scr_cursor (RESTORE);
3501 break; 3512 break;
3502 3513
3503#if ENABLE_FRILLS 3514#if !ENABLE_MINIMAL
3504 case CSI_74: 3515 case CSI_74:
3505 process_window_ops (arg, nargs); 3516 process_window_ops (arg, nargs);
3506 break; 3517 break;
3507#endif 3518#endif
3508 3519
… …
3515 break; 3526 break;
3516 } 3527 }
3517} 3528}
3518/*}}} */ 3529/*}}} */
3519 3530
3520#if ENABLE_FRILLS 3531#if !ENABLE_MINIMAL
3521/* ARGSUSED */ 3532/* ARGSUSED */
3522void 3533void
3523rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3534rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3524{ 3535{
3525 int x, y; 3536 int x, y;
3526 XWindowAttributes wattr; 3537 XWindowAttributes wattr;
3527 Window wdummy; 3538 Window wdummy;
3528 3539
3529 dLocal (Display *, xdisp); 3540 dLocal (Display *, dpy);
3530 3541
3531 if (nargs == 0) 3542 if (nargs == 0)
3532 return; 3543 return;
3533 3544
3534 switch (args[0]) 3545 switch (args[0])
3535 { 3546 {
3536 /* 3547 /*
3537 * commands 3548 * commands
3538 */ 3549 */
3539 case 1: /* deiconify window */ 3550 case 1: /* deiconify window */
3540 XMapWindow (xdisp, parent[0]); 3551 XMapWindow (dpy, parent[0]);
3541 break; 3552 break;
3542 case 2: /* iconify window */ 3553 case 2: /* iconify window */
3543 XIconifyWindow (xdisp, parent[0], display->screen); 3554 XIconifyWindow (dpy, parent[0], display->screen);
3544 break; 3555 break;
3545 case 3: /* set position (pixels) */ 3556 case 3: /* set position (pixels) */
3546 XMoveWindow (xdisp, parent[0], args[1], args[2]); 3557 XMoveWindow (dpy, parent[0], args[1], args[2]);
3547 break; 3558 break;
3548 case 4: /* set size (pixels) */ 3559 case 4: /* set size (pixels) */
3549 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3560 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3550 break; 3561 break;
3551 case 5: /* raise window */ 3562 case 5: /* raise window */
3552 XRaiseWindow (xdisp, parent[0]); 3563 XRaiseWindow (dpy, parent[0]);
3553 break; 3564 break;
3554 case 6: /* lower window */ 3565 case 6: /* lower window */
3555 XLowerWindow (xdisp, parent[0]); 3566 XLowerWindow (dpy, parent[0]);
3556 break; 3567 break;
3557 case 7: /* refresh window */ 3568 case 7: /* refresh window */
3558 scr_touch (true); 3569 scr_touch (true);
3559 break; 3570 break;
3560 case 8: /* set size (chars) */ 3571 case 8: /* set size (chars) */
… …
3567 if (args[0] >= 24) /* set height (chars) */ 3578 if (args[0] >= 24) /* set height (chars) */
3568 set_widthheight ((unsigned int)width, 3579 set_widthheight ((unsigned int)width,
3569 (unsigned int) (args[1] * fheight)); 3580 (unsigned int) (args[1] * fheight));
3570 break; 3581 break;
3571 3582
3572
3573 /* 3583 /*
3574 * reports - some output format copied from XTerm 3584 * reports - some output format copied from XTerm
3575 */ 3585 */
3576 case 11: /* report window state */ 3586 case 11: /* report window state */
3577 XGetWindowAttributes (xdisp, parent[0], &wattr); 3587 XGetWindowAttributes (dpy, parent[0], &wattr);
3578 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3588 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3579 break; 3589 break;
3580 case 13: /* report window position */ 3590 case 13: /* report window position */
3581 XGetWindowAttributes (xdisp, parent[0], &wattr); 3591 XGetWindowAttributes (dpy, parent[0], &wattr);
3582 XTranslateCoordinates (xdisp, parent[0], wattr.root, 3592 XTranslateCoordinates (dpy, parent[0], wattr.root,
3583 -wattr.border_width, -wattr.border_width, 3593 -wattr.border_width, -wattr.border_width,
3584 &x, &y, &wdummy); 3594 &x, &y, &wdummy);
3585 tt_printf ("\033[3;%d;%dt", x, y); 3595 tt_printf ("\033[3;%d;%dt", x, y);
3586 break; 3596 break;
3587 case 14: /* report window size (pixels) */ 3597 case 14: /* report window size (pixels) */
3588 XGetWindowAttributes (xdisp, parent[0], &wattr); 3598 XGetWindowAttributes (dpy, parent[0], &wattr);
3589 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3599 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3590 break; 3600 break;
3591 case 18: /* report text area size (chars) */ 3601 case 18: /* report text area size (chars) */
3592 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3602 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3593 break; 3603 break;
… …
3595 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3605 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3596 break; 3606 break;
3597 case 20: /* report icon label */ 3607 case 20: /* report icon label */
3598 { 3608 {
3599 char *s; 3609 char *s;
3600 XGetIconName (xdisp, parent[0], &s); 3610 XGetIconName (dpy, parent[0], &s);
3601 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 */
3602 XFree (s); 3612 XFree (s);
3603 } 3613 }
3604 break; 3614 break;
3605 case 21: /* report window title */ 3615 case 21: /* report window title */
3606 { 3616 {
3607 char *s; 3617 char *s;
3608 XFetchName (xdisp, parent[0], &s); 3618 XFetchName (dpy, parent[0], &s);
3609 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 */
3610 XFree (s); 3620 XFree (s);
3611 } 3621 }
3612 break; 3622 break;
3613 } 3623 }
… …
3714void 3724void
3715rxvt_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)
3716{ 3726{
3717 if (str[0] == '?' && !str[1]) 3727 if (str[0] == '?' && !str[1])
3718 { 3728 {
3719 unsigned short r, g, b; 3729 rgba c;
3720 pix_colors_focused[color].get (this, 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
3721 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);
3722 } 3738 }
3723 else 3739 else
3724 set_window_color (color, str); 3740 set_window_color (color, str);
3725} 3741}
3726 3742
… …
3733 int color; 3749 int color;
3734 char *buf, *name; 3750 char *buf, *name;
3735 bool query = str[0] == '?' && !str[1]; 3751 bool query = str[0] == '?' && !str[1];
3736 int saveop = op; 3752 int saveop = op;
3737 3753
3738 dLocal (Display *, xdisp); 3754 dLocal (Display *, dpy);
3739 3755
3740 assert (str != NULL); 3756 assert (str != NULL);
3741 switch (op) 3757 switch (op)
3742 { 3758 {
3743 case XTerm_name: 3759 case XTerm_name:
… …
3759 unsigned long bytes_after; 3775 unsigned long bytes_after;
3760 unsigned char *value = 0; 3776 unsigned char *value = 0;
3761 const char *str = ""; 3777 const char *str = "";
3762 3778
3763 if (prop 3779 if (prop
3764 && XGetWindowProperty (xdisp, parent[0], 3780 && XGetWindowProperty (dpy, parent[0],
3765 prop, 0, 1<<16, 0, AnyPropertyType, 3781 prop, 0, 1<<16, 0, AnyPropertyType,
3766 &actual_type, &actual_format, 3782 &actual_type, &actual_format,
3767 &nitems, &bytes_after, &value) == Success 3783 &nitems, &bytes_after, &value) == Success
3768 && actual_type != None 3784 && actual_type != None
3769 && actual_format == 8) 3785 && actual_format == 8)
3770 str = (const char *)(value); 3786 str = (const char *)(value);
3771 3787
3772 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3788 tt_printf ("\033]%d;%s%c", op, str, resp);
3773 3789
3774 XFree (value); 3790 XFree (value);
3775 } 3791 }
3776 else 3792 else
3777 { 3793 {
… …
3781 { 3797 {
3782 *eq = 0; 3798 *eq = 0;
3783 set_utf8_property (display->atom (str), eq + 1); 3799 set_utf8_property (display->atom (str), eq + 1);
3784 } 3800 }
3785 else 3801 else
3786 XDeleteProperty (xdisp, parent[0], 3802 XDeleteProperty (dpy, parent[0],
3787 display->atom (str)); 3803 display->atom (str));
3788 } 3804 }
3789 break; 3805 break;
3790 3806
3791 case XTerm_Color: 3807 case XTerm_Color:
… …
3801 break; 3817 break;
3802 3818
3803 if ((buf = strchr (name, ';')) != NULL) 3819 if ((buf = strchr (name, ';')) != NULL)
3804 *buf++ = '\0'; 3820 *buf++ = '\0';
3805 3821
3806 if (name[0] == '?' && !name[1]) 3822 process_color_seq (op, color, name, resp);
3807 {
3808 unsigned short r, g, b;
3809 pix_colors_focused[color].get (this, 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 } 3823 }
3815 break; 3824 break;
3816 case XTerm_Color00: 3825 case XTerm_Color00:
3817 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3826 process_color_seq (op, Color_fg, str, resp);
3818 break; 3827 break;
3819 case XTerm_Color01: 3828 case XTerm_Color01:
3820 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3829 process_color_seq (op, Color_bg, str, resp);
3821 break; 3830 break;
3822#ifndef NO_CURSORCOLOR 3831#ifndef NO_CURSORCOLOR
3823 case XTerm_Color_cursor: 3832 case XTerm_Color_cursor:
3824 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3833 process_color_seq (op, Color_cursor, str, resp);
3825 break; 3834 break;
3826#endif 3835#endif
3827 case XTerm_Color_pointer_fg: 3836 case XTerm_Color_pointer_fg:
3828 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3837 process_color_seq (op, Color_pointer_fg, str, resp);
3829 break; 3838 break;
3830 case XTerm_Color_pointer_bg: 3839 case XTerm_Color_pointer_bg:
3831 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3840 process_color_seq (op, Color_pointer_bg, str, resp);
3832 break; 3841 break;
3833#ifndef NO_BOLD_UNDERLINE_REVERSE 3842#ifndef NO_BOLD_UNDERLINE_REVERSE
3834 case XTerm_Color_RV: 3843 case XTerm_Color_RV:
3835 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3844 process_color_seq (op, Color_RV, str, resp);
3836 break; 3845 break;
3837 case Rxvt_Color_BD: 3846 case Rxvt_Color_BD:
3838 case URxvt_Color_BD: 3847 case URxvt_Color_BD:
3839 process_color_seq (op, Color_BD, str, resp); 3848 process_color_seq (op, Color_BD, str, resp);
3840 break; 3849 break;
3841 case Rxvt_Color_UL: 3850 case Rxvt_Color_UL:
3842 case URxvt_Color_UL: 3851 case URxvt_Color_UL:
3843 process_color_seq (op, Color_UL, str, resp); 3852 process_color_seq (op, Color_UL, str, resp);
3844 break; 3853 break;
3845 case URxvt_Color_IT: 3854 case URxvt_Color_IT:
3846 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3855 process_color_seq (op, Color_IT, str, resp);
3847 break; 3856 break;
3848#endif 3857#endif
3849#if TRANSPARENT && TINTING 3858#if TRANSPARENT && TINTING
3850 case URxvt_Color_tint: 3859 case URxvt_Color_tint:
3851 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3860 process_color_seq (op, Color_tint, str, resp);
3861
3852 check_our_parents (); 3862 check_our_parents ();
3863
3853 if (am_transparent) 3864 if (am_transparent)
3854 want_full_refresh = want_refresh = 1; 3865 want_full_refresh = want_refresh = 1;
3866
3855 break; 3867 break;
3856#endif 3868#endif
3857 3869
3858 case Rxvt_Pixmap: 3870 case Rxvt_Pixmap:
3859 { 3871 {
… …
3930 allocated.push_back ((void *)res); 3942 allocated.push_back ((void *)res);
3931 set_fonts (); 3943 set_fonts ();
3932 } 3944 }
3933 break; 3945 break;
3934 3946
3935#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
3936 case URxvt_locale: 3956 case URxvt_locale:
3937 if (query) 3957 if (query)
3938 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);
3939 else 3959 else
3940 { 3960 {
3941 set_locale (str); 3961 set_locale (str);
3942 pty->set_utf8_mode (enc_utf8); 3962 pty->set_utf8_mode (enc_utf8);
3943 init_xlocale (); 3963 init_xlocale ();
… …
4304 scr_color (Color_bg, Color_bg); 4324 scr_color (Color_bg, Color_bg);
4305 break; 4325 break;
4306 4326
4307 //case 50: // not variable spacing 4327 //case 50: // not variable spacing
4308 4328
4309#if ENABLE_FRILLS 4329#if !ENABLE_MINIMAL
4310 case 90: 4330 case 90:
4311 case 91: /* set bright fg color */ 4331 case 91: /* set bright fg color */
4312 case 92: 4332 case 92:
4313 case 93: 4333 case 93:
4314 case 94: 4334 case 94:

Diff Legend

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