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.301 by root, Tue Jan 31 21:23:13 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
1094static struct event_handler
1095{
1096 check_watcher cw_yield;
1097
1098 void yield (check_watcher &w)
1099 {
1100 sched_yield ();
1101 w.stop ();
1102 }
1103
1104 event_handler ()
1105 : cw_yield (this, &event_handler::yield)
1106 {
1107 }
1108} event_handler;
1109#endif
1110
1111bool 1095bool
1112rxvt_term::pty_fill () 1096rxvt_term::pty_fill ()
1113{ 1097{
1114 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1098 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1115 1099
… …
1164} 1148}
1165 1149
1166void 1150void
1167rxvt_term::pointer_unblank () 1151rxvt_term::pointer_unblank ()
1168{ 1152{
1169 XDefineCursor (display->display, vt, TermWin_cursor); 1153 XDefineCursor (xdisp, vt, TermWin_cursor);
1170 recolour_cursor (); 1154 recolour_cursor ();
1171 1155
1172#ifdef POINTER_BLANK 1156#ifdef POINTER_BLANK
1173 hidden_pointer = 0; 1157 hidden_pointer = 0;
1174 1158
… …
1182rxvt_term::pointer_blank () 1166rxvt_term::pointer_blank ()
1183{ 1167{
1184 if (!OPTION (Opt_pointerBlank)) 1168 if (!OPTION (Opt_pointerBlank))
1185 return; 1169 return;
1186 1170
1187 XDefineCursor (display->display, vt, display->blank_cursor); 1171 XDefineCursor (xdisp, vt, display->blank_cursor);
1188 XFlush (display->display); 1172 XFlush (xdisp);
1189 1173
1190 hidden_pointer = 1; 1174 hidden_pointer = 1;
1191} 1175}
1192 1176
1193void 1177void
… …
1272void 1256void
1273rxvt_term::x_cb (XEvent &ev) 1257rxvt_term::x_cb (XEvent &ev)
1274{ 1258{
1275 make_current (); 1259 make_current ();
1276 1260
1277 dDisp; 1261 dLocal (Display *, xdisp);
1278 1262
1279 if (ev.xany.window == vt 1263 if (ev.xany.window == vt
1280 && SHOULD_INVOKE (HOOK_X_EVENT) 1264 && SHOULD_INVOKE (HOOK_X_EVENT)
1281 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1265 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1282 return; 1266 return;
… …
1392 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END))) 1376 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1393 destroy (); 1377 destroy ();
1394 } 1378 }
1395#if ENABLE_EWMH 1379#if ENABLE_EWMH
1396 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1380 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1397 XSendEvent (disp, ev.xclient.window = display->root, 1381 XSendEvent (xdisp, ev.xclient.window = display->root,
1398 False, SubstructureRedirectMask | SubstructureNotifyMask, 1382 False, SubstructureRedirectMask | SubstructureNotifyMask,
1399 &ev); 1383 &ev);
1400#endif 1384#endif
1401 } 1385 }
1402 } 1386 }
… …
1450 break; 1434 break;
1451 1435
1452 case ConfigureNotify: 1436 case ConfigureNotify:
1453 if (ev.xconfigure.window == parent[0]) 1437 if (ev.xconfigure.window == parent[0])
1454 { 1438 {
1455 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1439 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev))
1456 ; 1440 ;
1457 1441
1458 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1442 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1459 { 1443 {
1460 seen_resize = 1; 1444 seen_resize = 1;
… …
1518 if (ev.xany.window == vt) 1502 if (ev.xany.window == vt)
1519 { 1503 {
1520 do 1504 do
1521 scr_expose (ev.xexpose.x, ev.xexpose.y, 1505 scr_expose (ev.xexpose.x, ev.xexpose.y,
1522 ev.xexpose.width, ev.xexpose.height, False); 1506 ev.xexpose.width, ev.xexpose.height, False);
1523 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1507 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev));
1524 1508
1525 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1509 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1526 1510
1527 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1511 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev))
1528 scr_expose (ev.xexpose.x, ev.xexpose.y, 1512 scr_expose (ev.xexpose.x, ev.xexpose.y,
1529 ev.xexpose.width, ev.xexpose.height, False); 1513 ev.xexpose.width, ev.xexpose.height, False);
1530 1514
1531 want_refresh = 1; 1515 want_refresh = 1;
1532 } 1516 }
1533 else 1517 else
1534 { 1518 {
1535 XEvent unused_event; 1519 XEvent unused_event;
1536 1520
1537 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1521 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event))
1538 ; 1522 ;
1539 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1523 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event))
1540 ; 1524 ;
1541 1525
1542 if (isScrollbarWindow (ev.xany.window)) 1526 if (isScrollbarWindow (ev.xany.window))
1543 { 1527 {
1544 scrollBar.setIdle (); 1528 scrollBar.setIdle ();
1545 scrollbar_show (0); 1529 scrollbar_show (0);
1546 } 1530 }
1547 1531
1548#ifdef TRANSPARENT 1532#ifdef TRANSPARENT
1549 if (am_transparent && ev.xany.window == parent[0]) 1533 if (am_transparent && ev.xany.window == parent[0])
1550 XClearWindow (disp, ev.xany.window); 1534 XClearWindow (xdisp, ev.xany.window);
1551#endif 1535#endif
1552 } 1536 }
1553 break; 1537 break;
1554 1538
1555 case MotionNotify: 1539 case MotionNotify:
… …
1565 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1549 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1566 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1550 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1567 ; // nop 1551 ; // nop
1568 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1552 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1569 { 1553 {
1570 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1554 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev))
1571 ; 1555 ;
1572 1556
1573 XQueryPointer (disp, vt, 1557 XQueryPointer (xdisp, vt,
1574 &unused_root, &unused_child, 1558 &unused_root, &unused_child,
1575 &unused_root_x, &unused_root_y, 1559 &unused_root_x, &unused_root_y,
1576 &ev.xbutton.x, &ev.xbutton.y, 1560 &ev.xbutton.x, &ev.xbutton.y,
1577 &ev.xbutton.state); 1561 &ev.xbutton.state);
1578#ifdef MOUSE_THRESHOLD 1562#ifdef MOUSE_THRESHOLD
… …
1642#endif 1626#endif
1643 } 1627 }
1644 } 1628 }
1645 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1629 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1646 { 1630 {
1647 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1631 while (XCheckTypedWindowEvent (xdisp, scrollBar.win,
1648 MotionNotify, &ev)) 1632 MotionNotify, &ev))
1649 ; 1633 ;
1650 1634
1651 XQueryPointer (disp, scrollBar.win, 1635 XQueryPointer (xdisp, scrollBar.win,
1652 &unused_root, &unused_child, 1636 &unused_root, &unused_child,
1653 &unused_root_x, &unused_root_y, 1637 &unused_root_x, &unused_root_y,
1654 &ev.xbutton.x, &ev.xbutton.y, 1638 &ev.xbutton.x, &ev.xbutton.y,
1655 &unused_mask); 1639 &unused_mask);
1656 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1640 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
… …
2171#if TINTING 2155#if TINTING
2172/* taken from aterm-0.4.2 */ 2156/* taken from aterm-0.4.2 */
2173 2157
2174typedef uint32_t RUINT32T; 2158typedef uint32_t RUINT32T;
2175 2159
2176void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm) 2160void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2177{ 2161{
2178 int sh_r, sh_g, sh_b; 2162 int sh_r, sh_g, sh_b;
2179 RUINT32T mask_r, mask_g, mask_b; 2163 RUINT32T mask_r, mask_g, mask_b;
2180 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2164 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2181 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2165 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2182 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2166 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2183 int i; 2167 int i;
2184 2168
2185 Visual *visual = display->visual; 2169 Visual *visual = term->visual;
2186 2170
2187 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2171 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2188 2172
2189 /* for convenience */ 2173 /* for convenience */
2190 mask_r = visual->red_mask; 2174 mask_r = visual->red_mask;
… …
2411 Atom atype; 2395 Atom atype;
2412 unsigned char *prop = NULL; 2396 unsigned char *prop = NULL;
2413 Window root, oldp, *list; 2397 Window root, oldp, *list;
2414 Pixmap rootpixmap = None; 2398 Pixmap rootpixmap = None;
2415 XWindowAttributes wattr, wrootattr; 2399 XWindowAttributes wattr, wrootattr;
2416 dDisp;
2417 2400
2418 pchanged = 0; 2401 pchanged = 0;
2419 2402
2420 if (!OPTION (Opt_transparent)) 2403 if (!OPTION (Opt_transparent))
2421 return pchanged; /* Don't try any more */ 2404 return pchanged; /* Don't try any more */
2422 2405
2423 XGetWindowAttributes (disp, display->root, &wrootattr); 2406 XGetWindowAttributes (xdisp, display->root, &wrootattr);
2424 rootdepth = wrootattr.depth; 2407 rootdepth = wrootattr.depth;
2425 2408
2426 XGetWindowAttributes (disp, parent[0], &wattr); 2409 XGetWindowAttributes (xdisp, parent[0], &wattr);
2427 2410
2428 if (rootdepth != wattr.depth) 2411 if (rootdepth != wattr.depth)
2429 { 2412 {
2430 if (am_transparent) 2413 if (am_transparent)
2431 { 2414 {
2432 pchanged = 1; 2415 pchanged = 1;
2433 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2416 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2434 am_transparent = am_pixmap_trans = 0; 2417 am_transparent = am_pixmap_trans = 0;
2435 } 2418 }
2436 2419
2437 return pchanged; /* Don't try any more */ 2420 return pchanged; /* Don't try any more */
2438 } 2421 }
2439 2422
2440 /* Get all X ops out of the queue so that our information is up-to-date. */ 2423 /* Get all X ops out of the queue so that our information is up-to-date. */
2441 XSync (disp, False); 2424 XSync (xdisp, False);
2442 2425
2443 /* 2426 /*
2444 * Make the frame window set by the window manager have 2427 * Make the frame window set by the window manager have
2445 * the root background. Some window managers put multiple nested frame 2428 * the root background. Some window managers put multiple nested frame
2446 * windows for each client, so we have to take care about that. 2429 * windows for each client, so we have to take care about that.
2447 */ 2430 */
2448 i = (xa[XA_XROOTPMAP_ID] 2431 i = (xa[XA_XROOTPMAP_ID]
2449 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], 2432 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2450 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2433 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2451 &nitems, &bytes_after, &prop) == Success); 2434 &nitems, &bytes_after, &prop) == Success);
2452 2435
2453 if (!i || prop == NULL) 2436 if (!i || prop == NULL)
2454 i = (xa[XA_ESETROOT_PMAP_ID] 2437 i = (xa[XA_ESETROOT_PMAP_ID]
2455 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], 2438 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2456 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2439 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2457 &nitems, &bytes_after, &prop) == Success); 2440 &nitems, &bytes_after, &prop) == Success);
2458 2441
2459 if (!i || prop == NULL 2442 if (!i || prop == NULL
2460#if TINTING 2443#if TINTING
2461 || !rs[Rs_color + Color_tint] 2444 || !ISSET_PIXCOLOR (Color_tint)
2462#endif 2445#endif
2463 ) 2446 )
2464 have_pixmap = 0; 2447 have_pixmap = 0;
2465 else 2448 else
2466 { 2449 {
… …
2479 Window cr; 2462 Window cr;
2480 XImage *image; 2463 XImage *image;
2481 GC gc; 2464 GC gc;
2482 XGCValues gcvalue; 2465 XGCValues gcvalue;
2483 2466
2484 XTranslateCoordinates (disp, parent[0], display->root, 2467 XTranslateCoordinates (xdisp, parent[0], display->root,
2485 0, 0, &sx, &sy, &cr); 2468 0, 0, &sx, &sy, &cr);
2486 nw = (unsigned int)szHint.width; 2469 nw = (unsigned int)szHint.width;
2487 nh = (unsigned int)szHint.height; 2470 nh = (unsigned int)szHint.height;
2488 nx = ny = 0; 2471 nx = ny = 0;
2489 2472
… …
2502 } 2485 }
2503 2486
2504 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2487 min_it (nw, (unsigned int) (wrootattr.width - sx));
2505 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2488 min_it (nh, (unsigned int) (wrootattr.height - sy));
2506 2489
2507 XSync (disp, False); 2490 XSync (xdisp, False);
2508 allowedxerror = -1; 2491 allowedxerror = -1;
2509 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2492 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2510 2493
2511 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2494 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2512 /* XXX: may need a delay here? */ 2495 /* XXX: may need a delay here? */
2513 allowedxerror = 0; 2496 allowedxerror = 0;
2514 2497
… …
2517 if (am_transparent && am_pixmap_trans) 2500 if (am_transparent && am_pixmap_trans)
2518 { 2501 {
2519 pchanged = 1; 2502 pchanged = 1;
2520 if (pixmap != None) 2503 if (pixmap != None)
2521 { 2504 {
2522 XFreePixmap (disp, pixmap); 2505 XFreePixmap (xdisp, pixmap);
2523 pixmap = None; 2506 pixmap = None;
2524 } 2507 }
2525 } 2508 }
2526 2509
2527 am_pixmap_trans = 0; 2510 am_pixmap_trans = 0;
2528 } 2511 }
2529 else 2512 else
2530 { 2513 {
2531 if (pixmap != None) 2514 if (pixmap != None)
2532 XFreePixmap (disp, pixmap); 2515 XFreePixmap (xdisp, pixmap);
2533 2516
2534#if TINTING 2517#if TINTING
2535 if (ISSET_PIXCOLOR (Color_tint)) 2518 if (ISSET_PIXCOLOR (Color_tint))
2536 { 2519 {
2537 unsigned short rm, gm, bm;
2538 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2520 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2539 2521
2522 rgba c;
2540 pix_colors_focused[Color_tint].get (display, rm, gm, bm); 2523 pix_colors_focused [Color_tint].get (c);
2541 2524
2542 ShadeXImage (display, image, shade, rm, gm, bm); 2525 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2543 } 2526 }
2544#endif 2527#endif
2545 2528
2546 pixmap = XCreatePixmap (disp, vt, 2529 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2547 szHint.width, szHint.height, image->depth);
2548 gc = XCreateGC (disp, vt, 0UL, &gcvalue); 2530 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2549 XPutImage (disp, pixmap, gc, image, 0, 0, 2531 XPutImage (xdisp, pixmap, gc, image, 0, 0,
2550 nx, ny, image->width, image->height); 2532 nx, ny, image->width, image->height);
2551 XFreeGC (disp, gc); 2533 XFreeGC (xdisp, gc);
2552 XDestroyImage (image); 2534 XDestroyImage (image);
2553 XSetWindowBackgroundPixmap (disp, parent[0], pixmap); 2535 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2554 XClearWindow (disp, parent[0]); 2536 XClearWindow (xdisp, parent[0]);
2555 2537
2556 if (!am_transparent || !am_pixmap_trans) 2538 if (!am_transparent || !am_pixmap_trans)
2557 pchanged = 1; 2539 pchanged = 1;
2558 2540
2559 am_transparent = am_pixmap_trans = 1; 2541 am_transparent = am_pixmap_trans = 1;
2560 } 2542 }
2561 } 2543 }
2562 2544
2563 if (am_pixmap_trans) 2545 if (am_pixmap_trans)
2564 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2546 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2565 else 2547 else
2566 { 2548 {
2567 unsigned int n; 2549 unsigned int n;
2568 /* 2550 /*
2569 * InheritPixmap transparency 2551 * InheritPixmap transparency
2570 */ 2552 */
2571 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2553 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2572 { 2554 {
2573 oldp = parent[i]; 2555 oldp = parent[i];
2574 XQueryTree (disp, parent[i - 1], &root, 2556 XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n);
2575 &parent[i], &list, &n);
2576 XFree (list); 2557 XFree (list);
2577 2558
2578 if (parent[i] == display->root) 2559 if (parent[i] == display->root)
2579 { 2560 {
2580 if (oldp != None) 2561 if (oldp != None)
… …
2588 } 2569 }
2589 2570
2590 n = 0; 2571 n = 0;
2591 2572
2592 if (pchanged) 2573 if (pchanged)
2593 {
2594 for (; n < (unsigned int)i; n++) 2574 for (; n < (unsigned int)i; n++)
2595 { 2575 {
2596 XGetWindowAttributes (disp, parent[n], &wattr); 2576 XGetWindowAttributes (xdisp, parent[n], &wattr);
2577
2597 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2578 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2598 { 2579 {
2599 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2580 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2600 break; 2581 break;
2601 } 2582 }
2602 } 2583 }
2603 }
2604 2584
2605 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2585 if (n > (sizeof (parent) / sizeof (parent[0])))
2606 { 2586 {
2607 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]); 2587 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2608 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2588 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2609 am_transparent = 0; 2589 am_transparent = 0;
2610 /* XXX: also turn off Opt_transparent? */ 2590 /* XXX: also turn off Opt_transparent? */
2611 } 2591 }
2612 else 2592 else
2613 { 2593 {
2614 for (n = 0; n < (unsigned int)i; n++) 2594 for (n = 0; n < (unsigned int)i; n++)
2615 { 2595 {
2616 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); 2596 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2617 XClearWindow (disp, parent[n]); 2597 XClearWindow (xdisp, parent[n]);
2618 } 2598 }
2619 2599
2620 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2600 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2621 am_transparent = 1; 2601 am_transparent = 1;
2622 } 2602 }
2623 2603
2624 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2604 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2625 parent[i] = None; 2605 parent[i] = None;
2626 } 2606 }
2627 2607
2628 if (scrollBar.win) 2608 if (scrollBar.win)
2629 { 2609 {
2630 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2610 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2631 scrollBar.setIdle (); 2611 scrollBar.setIdle ();
2632 scrollbar_show (0); 2612 scrollbar_show (0);
2633 } 2613 }
2634 2614
2635 if (am_transparent) 2615 if (am_transparent)
… …
3086 scr_charset_set (2, (unsigned int)cmd_getc ()); 3066 scr_charset_set (2, (unsigned int)cmd_getc ());
3087 break; 3067 break;
3088 case '+': 3068 case '+':
3089 scr_charset_set (3, (unsigned int)cmd_getc ()); 3069 scr_charset_set (3, (unsigned int)cmd_getc ());
3090 break; 3070 break;
3091#if ENABLE_FRILLS 3071#if !ENABLE_MINIMAL
3092 case '6': 3072 case '6':
3093 scr_backindex (); 3073 scr_backindex ();
3094 break; 3074 break;
3095#endif 3075#endif
3096 case '7': 3076 case '7':
3097 scr_cursor (SAVE); 3077 scr_cursor (SAVE);
3098 break; 3078 break;
3099 case '8': 3079 case '8':
3100 scr_cursor (RESTORE); 3080 scr_cursor (RESTORE);
3101 break; 3081 break;
3102#if ENABLE_FRILLS 3082#if !ENABLE_MINIMAL
3103 case '9': 3083 case '9':
3104 scr_forwardindex (); 3084 scr_forwardindex ();
3105 break; 3085 break;
3106#endif 3086#endif
3107 case '=': 3087 case '=':
… …
3280 { 3260 {
3281 case '>': 3261 case '>':
3282 if (ch == CSI_DA) /* secondary device attributes */ 3262 if (ch == CSI_DA) /* secondary device attributes */
3283 { 3263 {
3284 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 3264 // 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. 3265 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3286 // 3266 //
3287 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 3267 // 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 3268 // 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). 3269 // that we do not support xterm mouse reporting (should be 95 when we do).
3290 // 3270 //
3291 tt_printf ("\033[>%c%c85;94;0c", VERSION[0], VERSION[1]); 3271 tt_printf ("\033[>%d;94;0c", 'U');
3292 } 3272 }
3293 break; 3273 break;
3294 case '?': 3274 case '?':
3295 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3275 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3296 process_terminal_mode (ch, priv, nargs, arg); 3276 process_terminal_mode (ch, priv, nargs, arg);
… …
3500 break; 3480 break;
3501 case CSI_75: 3481 case CSI_75:
3502 scr_cursor (RESTORE); 3482 scr_cursor (RESTORE);
3503 break; 3483 break;
3504 3484
3505#if ENABLE_FRILLS 3485#if !ENABLE_MINIMAL
3506 case CSI_74: 3486 case CSI_74:
3507 process_window_ops (arg, nargs); 3487 process_window_ops (arg, nargs);
3508 break; 3488 break;
3509#endif 3489#endif
3510 3490
… …
3517 break; 3497 break;
3518 } 3498 }
3519} 3499}
3520/*}}} */ 3500/*}}} */
3521 3501
3522#if ENABLE_FRILLS 3502#if !ENABLE_MINIMAL
3523/* ARGSUSED */ 3503/* ARGSUSED */
3524void 3504void
3525rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3505rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3526{ 3506{
3527 int x, y; 3507 int x, y;
3528 XWindowAttributes wattr; 3508 XWindowAttributes wattr;
3529 Window wdummy; 3509 Window wdummy;
3530 dDisp; 3510
3511 dLocal (Display *, xdisp);
3531 3512
3532 if (nargs == 0) 3513 if (nargs == 0)
3533 return; 3514 return;
3534 3515
3535 switch (args[0]) 3516 switch (args[0])
3536 { 3517 {
3537 /* 3518 /*
3538 * commands 3519 * commands
3539 */ 3520 */
3540 case 1: /* deiconify window */ 3521 case 1: /* deiconify window */
3541 XMapWindow (disp, parent[0]); 3522 XMapWindow (xdisp, parent[0]);
3542 break; 3523 break;
3543 case 2: /* iconify window */ 3524 case 2: /* iconify window */
3544 XIconifyWindow (disp, parent[0], display->screen); 3525 XIconifyWindow (xdisp, parent[0], display->screen);
3545 break; 3526 break;
3546 case 3: /* set position (pixels) */ 3527 case 3: /* set position (pixels) */
3547 XMoveWindow (disp, parent[0], args[1], args[2]); 3528 XMoveWindow (xdisp, parent[0], args[1], args[2]);
3548 break; 3529 break;
3549 case 4: /* set size (pixels) */ 3530 case 4: /* set size (pixels) */
3550 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3531 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3551 break; 3532 break;
3552 case 5: /* raise window */ 3533 case 5: /* raise window */
3553 XRaiseWindow (disp, parent[0]); 3534 XRaiseWindow (xdisp, parent[0]);
3554 break; 3535 break;
3555 case 6: /* lower window */ 3536 case 6: /* lower window */
3556 XLowerWindow (disp, parent[0]); 3537 XLowerWindow (xdisp, parent[0]);
3557 break; 3538 break;
3558 case 7: /* refresh window */ 3539 case 7: /* refresh window */
3559 scr_touch (true); 3540 scr_touch (true);
3560 break; 3541 break;
3561 case 8: /* set size (chars) */ 3542 case 8: /* set size (chars) */
… …
3568 if (args[0] >= 24) /* set height (chars) */ 3549 if (args[0] >= 24) /* set height (chars) */
3569 set_widthheight ((unsigned int)width, 3550 set_widthheight ((unsigned int)width,
3570 (unsigned int) (args[1] * fheight)); 3551 (unsigned int) (args[1] * fheight));
3571 break; 3552 break;
3572 3553
3573
3574 /* 3554 /*
3575 * reports - some output format copied from XTerm 3555 * reports - some output format copied from XTerm
3576 */ 3556 */
3577 case 11: /* report window state */ 3557 case 11: /* report window state */
3578 XGetWindowAttributes (disp, parent[0], &wattr); 3558 XGetWindowAttributes (xdisp, parent[0], &wattr);
3579 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3559 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3580 break; 3560 break;
3581 case 13: /* report window position */ 3561 case 13: /* report window position */
3582 XGetWindowAttributes (disp, parent[0], &wattr); 3562 XGetWindowAttributes (xdisp, parent[0], &wattr);
3583 XTranslateCoordinates (disp, parent[0], wattr.root, 3563 XTranslateCoordinates (xdisp, parent[0], wattr.root,
3584 -wattr.border_width, -wattr.border_width, 3564 -wattr.border_width, -wattr.border_width,
3585 &x, &y, &wdummy); 3565 &x, &y, &wdummy);
3586 tt_printf ("\033[3;%d;%dt", x, y); 3566 tt_printf ("\033[3;%d;%dt", x, y);
3587 break; 3567 break;
3588 case 14: /* report window size (pixels) */ 3568 case 14: /* report window size (pixels) */
3589 XGetWindowAttributes (disp, parent[0], &wattr); 3569 XGetWindowAttributes (xdisp, parent[0], &wattr);
3590 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3570 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3591 break; 3571 break;
3592 case 18: /* report text area size (chars) */ 3572 case 18: /* report text area size (chars) */
3593 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3573 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3594 break; 3574 break;
… …
3596 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3576 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3597 break; 3577 break;
3598 case 20: /* report icon label */ 3578 case 20: /* report icon label */
3599 { 3579 {
3600 char *s; 3580 char *s;
3601 XGetIconName (disp, parent[0], &s); 3581 XGetIconName (xdisp, parent[0], &s);
3602 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3582 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3603 XFree (s); 3583 XFree (s);
3604 } 3584 }
3605 break; 3585 break;
3606 case 21: /* report window title */ 3586 case 21: /* report window title */
3607 { 3587 {
3608 char *s; 3588 char *s;
3609 XFetchName (disp, parent[0], &s); 3589 XFetchName (xdisp, parent[0], &s);
3610 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3590 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3611 XFree (s); 3591 XFree (s);
3612 } 3592 }
3613 break; 3593 break;
3614 } 3594 }
… …
3715void 3695void
3716rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3696rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3717{ 3697{
3718 if (str[0] == '?' && !str[1]) 3698 if (str[0] == '?' && !str[1])
3719 { 3699 {
3720 unsigned short r, g, b; 3700 rgba c;
3721 pix_colors_focused[color].get (display, r, g, b); 3701 pix_colors_focused[color].get (c);
3702
3703#if XFT
3704 if (c.a != rgba::MAX_CC)
3705 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3706 else
3707#endif
3722 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3708 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3723 } 3709 }
3724 else 3710 else
3725 set_window_color (color, str); 3711 set_window_color (color, str);
3726} 3712}
3727 3713
… …
3733{ 3719{
3734 int color; 3720 int color;
3735 char *buf, *name; 3721 char *buf, *name;
3736 bool query = str[0] == '?' && !str[1]; 3722 bool query = str[0] == '?' && !str[1];
3737 int saveop = op; 3723 int saveop = op;
3738 dDisp; 3724
3725 dLocal (Display *, xdisp);
3739 3726
3740 assert (str != NULL); 3727 assert (str != NULL);
3741 switch (op) 3728 switch (op)
3742 { 3729 {
3743 case XTerm_name: 3730 case XTerm_name:
… …
3759 unsigned long bytes_after; 3746 unsigned long bytes_after;
3760 unsigned char *value = 0; 3747 unsigned char *value = 0;
3761 const char *str = ""; 3748 const char *str = "";
3762 3749
3763 if (prop 3750 if (prop
3764 && XGetWindowProperty (disp, parent[0], 3751 && XGetWindowProperty (xdisp, parent[0],
3765 prop, 0, 1<<16, 0, AnyPropertyType, 3752 prop, 0, 1<<16, 0, AnyPropertyType,
3766 &actual_type, &actual_format, 3753 &actual_type, &actual_format,
3767 &nitems, &bytes_after, &value) == Success 3754 &nitems, &bytes_after, &value) == Success
3768 && actual_type != None 3755 && actual_type != None
3769 && actual_format == 8) 3756 && actual_format == 8)
3770 str = (const char *)(value); 3757 str = (const char *)(value);
3771 3758
3772 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3759 tt_printf ("\033]%d;%s%c", op, str, resp);
3773 3760
3774 XFree (value); 3761 XFree (value);
3775 } 3762 }
3776 else 3763 else
3777 { 3764 {
… …
3781 { 3768 {
3782 *eq = 0; 3769 *eq = 0;
3783 set_utf8_property (display->atom (str), eq + 1); 3770 set_utf8_property (display->atom (str), eq + 1);
3784 } 3771 }
3785 else 3772 else
3786 XDeleteProperty (disp, parent[0], 3773 XDeleteProperty (xdisp, parent[0],
3787 display->atom (str)); 3774 display->atom (str));
3788 } 3775 }
3789 break; 3776 break;
3790 3777
3791 case XTerm_Color: 3778 case XTerm_Color:
… …
3801 break; 3788 break;
3802 3789
3803 if ((buf = strchr (name, ';')) != NULL) 3790 if ((buf = strchr (name, ';')) != NULL)
3804 *buf++ = '\0'; 3791 *buf++ = '\0';
3805 3792
3806 if (name[0] == '?' && !name[1]) 3793 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 } 3794 }
3815 break; 3795 break;
3816 case XTerm_Color00: 3796 case XTerm_Color00:
3817 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3797 process_color_seq (op, Color_fg, str, resp);
3818 break; 3798 break;
3819 case XTerm_Color01: 3799 case XTerm_Color01:
3820 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3800 process_color_seq (op, Color_bg, str, resp);
3821 break; 3801 break;
3822#ifndef NO_CURSORCOLOR 3802#ifndef NO_CURSORCOLOR
3823 case XTerm_Color_cursor: 3803 case XTerm_Color_cursor:
3824 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3804 process_color_seq (op, Color_cursor, str, resp);
3825 break; 3805 break;
3826#endif 3806#endif
3827 case XTerm_Color_pointer_fg: 3807 case XTerm_Color_pointer_fg:
3828 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3808 process_color_seq (op, Color_pointer_fg, str, resp);
3829 break; 3809 break;
3830 case XTerm_Color_pointer_bg: 3810 case XTerm_Color_pointer_bg:
3831 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3811 process_color_seq (op, Color_pointer_bg, str, resp);
3832 break; 3812 break;
3833#ifndef NO_BOLD_UNDERLINE_REVERSE 3813#ifndef NO_BOLD_UNDERLINE_REVERSE
3834 case XTerm_Color_RV: 3814 case XTerm_Color_RV:
3835 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3815 process_color_seq (op, Color_RV, str, resp);
3836 break; 3816 break;
3837 case Rxvt_Color_BD: 3817 case Rxvt_Color_BD:
3838 case URxvt_Color_BD: 3818 case URxvt_Color_BD:
3839 process_color_seq (op, Color_BD, str, resp); 3819 process_color_seq (op, Color_BD, str, resp);
3840 break; 3820 break;
3841 case Rxvt_Color_UL: 3821 case Rxvt_Color_UL:
3842 case URxvt_Color_UL: 3822 case URxvt_Color_UL:
3843 process_color_seq (op, Color_UL, str, resp); 3823 process_color_seq (op, Color_UL, str, resp);
3844 break; 3824 break;
3845 case URxvt_Color_IT: 3825 case URxvt_Color_IT:
3846 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3826 process_color_seq (op, Color_IT, str, resp);
3847 break; 3827 break;
3848#endif 3828#endif
3849#if TRANSPARENT && TINTING 3829#if TRANSPARENT && TINTING
3850 case URxvt_Color_tint: 3830 case URxvt_Color_tint:
3851 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3831 process_color_seq (op, Color_tint, str, resp);
3832
3852 check_our_parents (); 3833 check_our_parents ();
3834
3853 if (am_transparent) 3835 if (am_transparent)
3854 want_full_refresh = want_refresh = 1; 3836 want_full_refresh = want_refresh = 1;
3837
3855 break; 3838 break;
3856#endif 3839#endif
3857 3840
3858 case Rxvt_Pixmap: 3841 case Rxvt_Pixmap:
3859 { 3842 {
… …
3930 allocated.push_back ((void *)res); 3913 allocated.push_back ((void *)res);
3931 set_fonts (); 3914 set_fonts ();
3932 } 3915 }
3933 break; 3916 break;
3934 3917
3935#if ENABLE_FRILLS 3918 case URxvt_version:
3919 if (query)
3920 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3921 op,
3922 rs[Rs_name], VERSION[0], VERSION[2],
3923 resp);
3924 break;
3925
3926#if !ENABLE_MINIMAL
3936 case URxvt_locale: 3927 case URxvt_locale:
3937 if (query) 3928 if (query)
3938 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3929 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
3939 else 3930 else
3940 { 3931 {
3941 set_locale (str); 3932 set_locale (str);
3942 pty->set_utf8_mode (enc_utf8); 3933 pty->set_utf8_mode (enc_utf8);
3943 init_xlocale (); 3934 init_xlocale ();
… …
4304 scr_color (Color_bg, Color_bg); 4295 scr_color (Color_bg, Color_bg);
4305 break; 4296 break;
4306 4297
4307 //case 50: // not variable spacing 4298 //case 50: // not variable spacing
4308 4299
4309#if ENABLE_FRILLS 4300#if !ENABLE_MINIMAL
4310 case 90: 4301 case 90:
4311 case 91: /* set bright fg color */ 4302 case 91: /* set bright fg color */
4312 case 92: 4303 case 92:
4313 case 93: 4304 case 93:
4314 case 94: 4305 case 94:

Diff Legend

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