ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.283 by root, Tue Jan 24 19:40:12 2006 UTC vs.
Revision 1.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
… …
1266 (32 + button_number + key_state), 1250 (32 + button_number + key_state),
1267 (32 + x + 1), 1251 (32 + x + 1),
1268 (32 + y + 1)); 1252 (32 + y + 1));
1269} 1253}
1270 1254
1271#ifdef USING_W11LIB
1272void
1273rxvt_W11_process_x_event (XEvent *ev)
1274{
1275 rxvt_t *r = rxvt_get_r ();
1276
1277 x_cb (*ev);
1278}
1279#endif
1280
1281/*{{{ process an X event */ 1255/*{{{ process an X event */
1282void 1256void
1283rxvt_term::x_cb (XEvent &ev) 1257rxvt_term::x_cb (XEvent &ev)
1284{ 1258{
1285 make_current (); 1259 make_current ();
1286 1260
1287 dDisp; 1261 dLocal (Display *, xdisp);
1288 1262
1289 if (ev.xany.window == vt 1263 if (ev.xany.window == vt
1290 && SHOULD_INVOKE (HOOK_X_EVENT) 1264 && SHOULD_INVOKE (HOOK_X_EVENT)
1291 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1265 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1292 return; 1266 return;
… …
1402 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)))
1403 destroy (); 1377 destroy ();
1404 } 1378 }
1405#if ENABLE_EWMH 1379#if ENABLE_EWMH
1406 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])
1407 XSendEvent (disp, ev.xclient.window = display->root, 1381 XSendEvent (xdisp, ev.xclient.window = display->root,
1408 False, SubstructureRedirectMask | SubstructureNotifyMask, 1382 False, SubstructureRedirectMask | SubstructureNotifyMask,
1409 &ev); 1383 &ev);
1410#endif 1384#endif
1411 } 1385 }
1412 } 1386 }
… …
1460 break; 1434 break;
1461 1435
1462 case ConfigureNotify: 1436 case ConfigureNotify:
1463 if (ev.xconfigure.window == parent[0]) 1437 if (ev.xconfigure.window == parent[0])
1464 { 1438 {
1465 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1439 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev))
1466 ; 1440 ;
1467 1441
1468 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1442 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1469 { 1443 {
1470 seen_resize = 1; 1444 seen_resize = 1;
… …
1528 if (ev.xany.window == vt) 1502 if (ev.xany.window == vt)
1529 { 1503 {
1530 do 1504 do
1531 scr_expose (ev.xexpose.x, ev.xexpose.y, 1505 scr_expose (ev.xexpose.x, ev.xexpose.y,
1532 ev.xexpose.width, ev.xexpose.height, False); 1506 ev.xexpose.width, ev.xexpose.height, False);
1533 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1507 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev));
1534 1508
1535 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1509 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1536 1510
1537 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1511 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev))
1538 scr_expose (ev.xexpose.x, ev.xexpose.y, 1512 scr_expose (ev.xexpose.x, ev.xexpose.y,
1539 ev.xexpose.width, ev.xexpose.height, False); 1513 ev.xexpose.width, ev.xexpose.height, False);
1540 1514
1541 want_refresh = 1; 1515 want_refresh = 1;
1542 } 1516 }
1543 else 1517 else
1544 { 1518 {
1545 XEvent unused_event; 1519 XEvent unused_event;
1546 1520
1547 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1521 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event))
1548 ; 1522 ;
1549 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1523 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event))
1550 ; 1524 ;
1551 1525
1552 if (isScrollbarWindow (ev.xany.window)) 1526 if (isScrollbarWindow (ev.xany.window))
1553 { 1527 {
1554 scrollBar.setIdle (); 1528 scrollBar.setIdle ();
1555 scrollbar_show (0); 1529 scrollbar_show (0);
1556 } 1530 }
1557 1531
1558#ifdef TRANSPARENT 1532#ifdef TRANSPARENT
1559 if (am_transparent && ev.xany.window == parent[0]) 1533 if (am_transparent && ev.xany.window == parent[0])
1560 XClearWindow (disp, ev.xany.window); 1534 XClearWindow (xdisp, ev.xany.window);
1561#endif 1535#endif
1562 } 1536 }
1563 break; 1537 break;
1564 1538
1565 case MotionNotify: 1539 case MotionNotify:
… …
1575 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1549 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1576 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1550 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1577 ; // nop 1551 ; // nop
1578 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1552 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1579 { 1553 {
1580 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1554 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev))
1581 ; 1555 ;
1582 1556
1583 XQueryPointer (disp, vt, 1557 XQueryPointer (xdisp, vt,
1584 &unused_root, &unused_child, 1558 &unused_root, &unused_child,
1585 &unused_root_x, &unused_root_y, 1559 &unused_root_x, &unused_root_y,
1586 &ev.xbutton.x, &ev.xbutton.y, 1560 &ev.xbutton.x, &ev.xbutton.y,
1587 &ev.xbutton.state); 1561 &ev.xbutton.state);
1588#ifdef MOUSE_THRESHOLD 1562#ifdef MOUSE_THRESHOLD
… …
1652#endif 1626#endif
1653 } 1627 }
1654 } 1628 }
1655 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1629 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1656 { 1630 {
1657 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1631 while (XCheckTypedWindowEvent (xdisp, scrollBar.win,
1658 MotionNotify, &ev)) 1632 MotionNotify, &ev))
1659 ; 1633 ;
1660 1634
1661 XQueryPointer (disp, scrollBar.win, 1635 XQueryPointer (xdisp, scrollBar.win,
1662 &unused_root, &unused_child, 1636 &unused_root, &unused_child,
1663 &unused_root_x, &unused_root_y, 1637 &unused_root_x, &unused_root_y,
1664 &ev.xbutton.x, &ev.xbutton.y, 1638 &ev.xbutton.x, &ev.xbutton.y,
1665 &unused_mask); 1639 &unused_mask);
1666 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1640 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
… …
2181#if TINTING 2155#if TINTING
2182/* taken from aterm-0.4.2 */ 2156/* taken from aterm-0.4.2 */
2183 2157
2184typedef uint32_t RUINT32T; 2158typedef uint32_t RUINT32T;
2185 2159
2186void 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)
2187{ 2161{
2188 int sh_r, sh_g, sh_b; 2162 int sh_r, sh_g, sh_b;
2189 RUINT32T mask_r, mask_g, mask_b; 2163 RUINT32T mask_r, mask_g, mask_b;
2190 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2164 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2191 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2165 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2192 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2166 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2193 int i; 2167 int i;
2194 2168
2195 Visual *visual = display->visual; 2169 Visual *visual = term->visual;
2196 2170
2197 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2171 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2198 2172
2199 /* for convenience */ 2173 /* for convenience */
2200 mask_r = visual->red_mask; 2174 mask_r = visual->red_mask;
… …
2421 Atom atype; 2395 Atom atype;
2422 unsigned char *prop = NULL; 2396 unsigned char *prop = NULL;
2423 Window root, oldp, *list; 2397 Window root, oldp, *list;
2424 Pixmap rootpixmap = None; 2398 Pixmap rootpixmap = None;
2425 XWindowAttributes wattr, wrootattr; 2399 XWindowAttributes wattr, wrootattr;
2426 dDisp;
2427 2400
2428 pchanged = 0; 2401 pchanged = 0;
2429 2402
2430 if (!OPTION (Opt_transparent)) 2403 if (!OPTION (Opt_transparent))
2431 return pchanged; /* Don't try any more */ 2404 return pchanged; /* Don't try any more */
2432 2405
2433 XGetWindowAttributes (disp, display->root, &wrootattr); 2406 XGetWindowAttributes (xdisp, display->root, &wrootattr);
2434 rootdepth = wrootattr.depth; 2407 rootdepth = wrootattr.depth;
2435 2408
2436 XGetWindowAttributes (disp, parent[0], &wattr); 2409 XGetWindowAttributes (xdisp, parent[0], &wattr);
2437 2410
2438 if (rootdepth != wattr.depth) 2411 if (rootdepth != wattr.depth)
2439 { 2412 {
2440 if (am_transparent) 2413 if (am_transparent)
2441 { 2414 {
2442 pchanged = 1; 2415 pchanged = 1;
2443 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2416 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2444 am_transparent = am_pixmap_trans = 0; 2417 am_transparent = am_pixmap_trans = 0;
2445 } 2418 }
2446 2419
2447 return pchanged; /* Don't try any more */ 2420 return pchanged; /* Don't try any more */
2448 } 2421 }
2449 2422
2450 /* 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. */
2451 XSync (disp, False); 2424 XSync (xdisp, False);
2452 2425
2453 /* 2426 /*
2454 * Make the frame window set by the window manager have 2427 * Make the frame window set by the window manager have
2455 * the root background. Some window managers put multiple nested frame 2428 * the root background. Some window managers put multiple nested frame
2456 * 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.
2457 */ 2430 */
2458 i = (xa[XA_XROOTPMAP_ID] 2431 i = (xa[XA_XROOTPMAP_ID]
2459 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], 2432 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2460 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2433 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2461 &nitems, &bytes_after, &prop) == Success); 2434 &nitems, &bytes_after, &prop) == Success);
2462 2435
2463 if (!i || prop == NULL) 2436 if (!i || prop == NULL)
2464 i = (xa[XA_ESETROOT_PMAP_ID] 2437 i = (xa[XA_ESETROOT_PMAP_ID]
2465 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], 2438 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2466 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2439 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2467 &nitems, &bytes_after, &prop) == Success); 2440 &nitems, &bytes_after, &prop) == Success);
2468 2441
2469 if (!i || prop == NULL 2442 if (!i || prop == NULL
2470#if TINTING 2443#if TINTING
2471 || !rs[Rs_color + Color_tint] 2444 || !ISSET_PIXCOLOR (Color_tint)
2472#endif 2445#endif
2473 ) 2446 )
2474 have_pixmap = 0; 2447 have_pixmap = 0;
2475 else 2448 else
2476 { 2449 {
… …
2489 Window cr; 2462 Window cr;
2490 XImage *image; 2463 XImage *image;
2491 GC gc; 2464 GC gc;
2492 XGCValues gcvalue; 2465 XGCValues gcvalue;
2493 2466
2494 XTranslateCoordinates (disp, parent[0], display->root, 2467 XTranslateCoordinates (xdisp, parent[0], display->root,
2495 0, 0, &sx, &sy, &cr); 2468 0, 0, &sx, &sy, &cr);
2496 nw = (unsigned int)szHint.width; 2469 nw = (unsigned int)szHint.width;
2497 nh = (unsigned int)szHint.height; 2470 nh = (unsigned int)szHint.height;
2498 nx = ny = 0; 2471 nx = ny = 0;
2499 2472
… …
2512 } 2485 }
2513 2486
2514 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2487 min_it (nw, (unsigned int) (wrootattr.width - sx));
2515 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2488 min_it (nh, (unsigned int) (wrootattr.height - sy));
2516 2489
2517 XSync (disp, False); 2490 XSync (xdisp, False);
2518 allowedxerror = -1; 2491 allowedxerror = -1;
2519 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2492 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2520 2493
2521 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2494 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2522 /* XXX: may need a delay here? */ 2495 /* XXX: may need a delay here? */
2523 allowedxerror = 0; 2496 allowedxerror = 0;
2524 2497
… …
2527 if (am_transparent && am_pixmap_trans) 2500 if (am_transparent && am_pixmap_trans)
2528 { 2501 {
2529 pchanged = 1; 2502 pchanged = 1;
2530 if (pixmap != None) 2503 if (pixmap != None)
2531 { 2504 {
2532 XFreePixmap (disp, pixmap); 2505 XFreePixmap (xdisp, pixmap);
2533 pixmap = None; 2506 pixmap = None;
2534 } 2507 }
2535 } 2508 }
2536 2509
2537 am_pixmap_trans = 0; 2510 am_pixmap_trans = 0;
2538 } 2511 }
2539 else 2512 else
2540 { 2513 {
2541 if (pixmap != None) 2514 if (pixmap != None)
2542 XFreePixmap (disp, pixmap); 2515 XFreePixmap (xdisp, pixmap);
2543 2516
2544#if TINTING 2517#if TINTING
2545 if (ISSET_PIXCOLOR (Color_tint)) 2518 if (ISSET_PIXCOLOR (Color_tint))
2546 { 2519 {
2547 unsigned short rm, gm, bm;
2548 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2520 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2549 2521
2522 rgba c;
2550 pix_colors_focused[Color_tint].get (display, rm, gm, bm); 2523 pix_colors_focused [Color_tint].get (c);
2551 2524
2552 ShadeXImage (display, image, shade, rm, gm, bm); 2525 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2553 } 2526 }
2554#endif 2527#endif
2555 2528
2556 pixmap = XCreatePixmap (disp, vt, 2529 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2557 szHint.width, szHint.height, image->depth);
2558 gc = XCreateGC (disp, vt, 0UL, &gcvalue); 2530 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2559 XPutImage (disp, pixmap, gc, image, 0, 0, 2531 XPutImage (xdisp, pixmap, gc, image, 0, 0,
2560 nx, ny, image->width, image->height); 2532 nx, ny, image->width, image->height);
2561 XFreeGC (disp, gc); 2533 XFreeGC (xdisp, gc);
2562 XDestroyImage (image); 2534 XDestroyImage (image);
2563 XSetWindowBackgroundPixmap (disp, parent[0], pixmap); 2535 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2564 XClearWindow (disp, parent[0]); 2536 XClearWindow (xdisp, parent[0]);
2565 2537
2566 if (!am_transparent || !am_pixmap_trans) 2538 if (!am_transparent || !am_pixmap_trans)
2567 pchanged = 1; 2539 pchanged = 1;
2568 2540
2569 am_transparent = am_pixmap_trans = 1; 2541 am_transparent = am_pixmap_trans = 1;
2570 } 2542 }
2571 } 2543 }
2572 2544
2573 if (am_pixmap_trans) 2545 if (am_pixmap_trans)
2574 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2546 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2575 else 2547 else
2576 { 2548 {
2577 unsigned int n; 2549 unsigned int n;
2578 /* 2550 /*
2579 * InheritPixmap transparency 2551 * InheritPixmap transparency
2580 */ 2552 */
2581 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2553 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2582 { 2554 {
2583 oldp = parent[i]; 2555 oldp = parent[i];
2584 XQueryTree (disp, parent[i - 1], &root, 2556 XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n);
2585 &parent[i], &list, &n);
2586 XFree (list); 2557 XFree (list);
2587 2558
2588 if (parent[i] == display->root) 2559 if (parent[i] == display->root)
2589 { 2560 {
2590 if (oldp != None) 2561 if (oldp != None)
… …
2598 } 2569 }
2599 2570
2600 n = 0; 2571 n = 0;
2601 2572
2602 if (pchanged) 2573 if (pchanged)
2603 {
2604 for (; n < (unsigned int)i; n++) 2574 for (; n < (unsigned int)i; n++)
2605 { 2575 {
2606 XGetWindowAttributes (disp, parent[n], &wattr); 2576 XGetWindowAttributes (xdisp, parent[n], &wattr);
2577
2607 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2578 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2608 { 2579 {
2609 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2580 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2610 break; 2581 break;
2611 } 2582 }
2612 } 2583 }
2613 }
2614 2584
2615 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2585 if (n > (sizeof (parent) / sizeof (parent[0])))
2616 { 2586 {
2617 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]); 2587 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2618 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2588 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2619 am_transparent = 0; 2589 am_transparent = 0;
2620 /* XXX: also turn off Opt_transparent? */ 2590 /* XXX: also turn off Opt_transparent? */
2621 } 2591 }
2622 else 2592 else
2623 { 2593 {
2624 for (n = 0; n < (unsigned int)i; n++) 2594 for (n = 0; n < (unsigned int)i; n++)
2625 { 2595 {
2626 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); 2596 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2627 XClearWindow (disp, parent[n]); 2597 XClearWindow (xdisp, parent[n]);
2628 } 2598 }
2629 2599
2630 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2600 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2631 am_transparent = 1; 2601 am_transparent = 1;
2632 } 2602 }
2633 2603
2634 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2604 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2635 parent[i] = None; 2605 parent[i] = None;
2636 } 2606 }
2637 2607
2638 if (scrollBar.win) 2608 if (scrollBar.win)
2639 { 2609 {
2640 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2610 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2641 scrollBar.setIdle (); 2611 scrollBar.setIdle ();
2642 scrollbar_show (0); 2612 scrollbar_show (0);
2643 } 2613 }
2644 2614
2645 if (am_transparent) 2615 if (am_transparent)
… …
3096 scr_charset_set (2, (unsigned int)cmd_getc ()); 3066 scr_charset_set (2, (unsigned int)cmd_getc ());
3097 break; 3067 break;
3098 case '+': 3068 case '+':
3099 scr_charset_set (3, (unsigned int)cmd_getc ()); 3069 scr_charset_set (3, (unsigned int)cmd_getc ());
3100 break; 3070 break;
3101#if ENABLE_FRILLS 3071#if !ENABLE_MINIMAL
3102 case '6': 3072 case '6':
3103 scr_backindex (); 3073 scr_backindex ();
3104 break; 3074 break;
3105#endif 3075#endif
3106 case '7': 3076 case '7':
3107 scr_cursor (SAVE); 3077 scr_cursor (SAVE);
3108 break; 3078 break;
3109 case '8': 3079 case '8':
3110 scr_cursor (RESTORE); 3080 scr_cursor (RESTORE);
3111 break; 3081 break;
3112#if ENABLE_FRILLS 3082#if !ENABLE_MINIMAL
3113 case '9': 3083 case '9':
3114 scr_forwardindex (); 3084 scr_forwardindex ();
3115 break; 3085 break;
3116#endif 3086#endif
3117 case '=': 3087 case '=':
… …
3290 { 3260 {
3291 case '>': 3261 case '>':
3292 if (ch == CSI_DA) /* secondary device attributes */ 3262 if (ch == CSI_DA) /* secondary device attributes */
3293 { 3263 {
3294 // 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,
3295 // '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).
3296 // 3266 //
3297 // 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
3298 // 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
3299 // 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).
3300 // 3270 //
3301 tt_printf ("\033[>%c%c85;94;0c", VERSION[0], VERSION[1]); 3271 tt_printf ("\033[>%d;94;0c", 'U');
3302 } 3272 }
3303 break; 3273 break;
3304 case '?': 3274 case '?':
3305 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3275 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3306 process_terminal_mode (ch, priv, nargs, arg); 3276 process_terminal_mode (ch, priv, nargs, arg);
… …
3510 break; 3480 break;
3511 case CSI_75: 3481 case CSI_75:
3512 scr_cursor (RESTORE); 3482 scr_cursor (RESTORE);
3513 break; 3483 break;
3514 3484
3515#if ENABLE_FRILLS 3485#if !ENABLE_MINIMAL
3516 case CSI_74: 3486 case CSI_74:
3517 process_window_ops (arg, nargs); 3487 process_window_ops (arg, nargs);
3518 break; 3488 break;
3519#endif 3489#endif
3520 3490
… …
3527 break; 3497 break;
3528 } 3498 }
3529} 3499}
3530/*}}} */ 3500/*}}} */
3531 3501
3532#if ENABLE_FRILLS 3502#if !ENABLE_MINIMAL
3533/* ARGSUSED */ 3503/* ARGSUSED */
3534void 3504void
3535rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3505rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3536{ 3506{
3537 int x, y; 3507 int x, y;
3538 XWindowAttributes wattr; 3508 XWindowAttributes wattr;
3539 Window wdummy; 3509 Window wdummy;
3540 dDisp; 3510
3511 dLocal (Display *, xdisp);
3541 3512
3542 if (nargs == 0) 3513 if (nargs == 0)
3543 return; 3514 return;
3544 3515
3545 switch (args[0]) 3516 switch (args[0])
3546 { 3517 {
3547 /* 3518 /*
3548 * commands 3519 * commands
3549 */ 3520 */
3550 case 1: /* deiconify window */ 3521 case 1: /* deiconify window */
3551 XMapWindow (disp, parent[0]); 3522 XMapWindow (xdisp, parent[0]);
3552 break; 3523 break;
3553 case 2: /* iconify window */ 3524 case 2: /* iconify window */
3554 XIconifyWindow (disp, parent[0], display->screen); 3525 XIconifyWindow (xdisp, parent[0], display->screen);
3555 break; 3526 break;
3556 case 3: /* set position (pixels) */ 3527 case 3: /* set position (pixels) */
3557 XMoveWindow (disp, parent[0], args[1], args[2]); 3528 XMoveWindow (xdisp, parent[0], args[1], args[2]);
3558 break; 3529 break;
3559 case 4: /* set size (pixels) */ 3530 case 4: /* set size (pixels) */
3560 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3531 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3561 break; 3532 break;
3562 case 5: /* raise window */ 3533 case 5: /* raise window */
3563 XRaiseWindow (disp, parent[0]); 3534 XRaiseWindow (xdisp, parent[0]);
3564 break; 3535 break;
3565 case 6: /* lower window */ 3536 case 6: /* lower window */
3566 XLowerWindow (disp, parent[0]); 3537 XLowerWindow (xdisp, parent[0]);
3567 break; 3538 break;
3568 case 7: /* refresh window */ 3539 case 7: /* refresh window */
3569 scr_touch (true); 3540 scr_touch (true);
3570 break; 3541 break;
3571 case 8: /* set size (chars) */ 3542 case 8: /* set size (chars) */
… …
3578 if (args[0] >= 24) /* set height (chars) */ 3549 if (args[0] >= 24) /* set height (chars) */
3579 set_widthheight ((unsigned int)width, 3550 set_widthheight ((unsigned int)width,
3580 (unsigned int) (args[1] * fheight)); 3551 (unsigned int) (args[1] * fheight));
3581 break; 3552 break;
3582 3553
3583
3584 /* 3554 /*
3585 * reports - some output format copied from XTerm 3555 * reports - some output format copied from XTerm
3586 */ 3556 */
3587 case 11: /* report window state */ 3557 case 11: /* report window state */
3588 XGetWindowAttributes (disp, parent[0], &wattr); 3558 XGetWindowAttributes (xdisp, parent[0], &wattr);
3589 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3559 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3590 break; 3560 break;
3591 case 13: /* report window position */ 3561 case 13: /* report window position */
3592 XGetWindowAttributes (disp, parent[0], &wattr); 3562 XGetWindowAttributes (xdisp, parent[0], &wattr);
3593 XTranslateCoordinates (disp, parent[0], wattr.root, 3563 XTranslateCoordinates (xdisp, parent[0], wattr.root,
3594 -wattr.border_width, -wattr.border_width, 3564 -wattr.border_width, -wattr.border_width,
3595 &x, &y, &wdummy); 3565 &x, &y, &wdummy);
3596 tt_printf ("\033[3;%d;%dt", x, y); 3566 tt_printf ("\033[3;%d;%dt", x, y);
3597 break; 3567 break;
3598 case 14: /* report window size (pixels) */ 3568 case 14: /* report window size (pixels) */
3599 XGetWindowAttributes (disp, parent[0], &wattr); 3569 XGetWindowAttributes (xdisp, parent[0], &wattr);
3600 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3570 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3601 break; 3571 break;
3602 case 18: /* report text area size (chars) */ 3572 case 18: /* report text area size (chars) */
3603 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3573 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3604 break; 3574 break;
… …
3606 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3576 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3607 break; 3577 break;
3608 case 20: /* report icon label */ 3578 case 20: /* report icon label */
3609 { 3579 {
3610 char *s; 3580 char *s;
3611 XGetIconName (disp, parent[0], &s); 3581 XGetIconName (xdisp, parent[0], &s);
3612 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 */
3613 XFree (s); 3583 XFree (s);
3614 } 3584 }
3615 break; 3585 break;
3616 case 21: /* report window title */ 3586 case 21: /* report window title */
3617 { 3587 {
3618 char *s; 3588 char *s;
3619 XFetchName (disp, parent[0], &s); 3589 XFetchName (xdisp, parent[0], &s);
3620 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 */
3621 XFree (s); 3591 XFree (s);
3622 } 3592 }
3623 break; 3593 break;
3624 } 3594 }
… …
3725void 3695void
3726rxvt_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)
3727{ 3697{
3728 if (str[0] == '?' && !str[1]) 3698 if (str[0] == '?' && !str[1])
3729 { 3699 {
3730 unsigned short r, g, b; 3700 rgba c;
3731 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
3732 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);
3733 } 3709 }
3734 else 3710 else
3735 set_window_color (color, str); 3711 set_window_color (color, str);
3736} 3712}
3737 3713
… …
3743{ 3719{
3744 int color; 3720 int color;
3745 char *buf, *name; 3721 char *buf, *name;
3746 bool query = str[0] == '?' && !str[1]; 3722 bool query = str[0] == '?' && !str[1];
3747 int saveop = op; 3723 int saveop = op;
3748 dDisp; 3724
3725 dLocal (Display *, xdisp);
3749 3726
3750 assert (str != NULL); 3727 assert (str != NULL);
3751 switch (op) 3728 switch (op)
3752 { 3729 {
3753 case XTerm_name: 3730 case XTerm_name:
… …
3769 unsigned long bytes_after; 3746 unsigned long bytes_after;
3770 unsigned char *value = 0; 3747 unsigned char *value = 0;
3771 const char *str = ""; 3748 const char *str = "";
3772 3749
3773 if (prop 3750 if (prop
3774 && XGetWindowProperty (disp, parent[0], 3751 && XGetWindowProperty (xdisp, parent[0],
3775 prop, 0, 1<<16, 0, AnyPropertyType, 3752 prop, 0, 1<<16, 0, AnyPropertyType,
3776 &actual_type, &actual_format, 3753 &actual_type, &actual_format,
3777 &nitems, &bytes_after, &value) == Success 3754 &nitems, &bytes_after, &value) == Success
3778 && actual_type != None 3755 && actual_type != None
3779 && actual_format == 8) 3756 && actual_format == 8)
3780 str = (const char *)(value); 3757 str = (const char *)(value);
3781 3758
3782 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3759 tt_printf ("\033]%d;%s%c", op, str, resp);
3783 3760
3784 XFree (value); 3761 XFree (value);
3785 } 3762 }
3786 else 3763 else
3787 { 3764 {
… …
3791 { 3768 {
3792 *eq = 0; 3769 *eq = 0;
3793 set_utf8_property (display->atom (str), eq + 1); 3770 set_utf8_property (display->atom (str), eq + 1);
3794 } 3771 }
3795 else 3772 else
3796 XDeleteProperty (disp, parent[0], 3773 XDeleteProperty (xdisp, parent[0],
3797 display->atom (str)); 3774 display->atom (str));
3798 } 3775 }
3799 break; 3776 break;
3800 3777
3801 case XTerm_Color: 3778 case XTerm_Color:
… …
3811 break; 3788 break;
3812 3789
3813 if ((buf = strchr (name, ';')) != NULL) 3790 if ((buf = strchr (name, ';')) != NULL)
3814 *buf++ = '\0'; 3791 *buf++ = '\0';
3815 3792
3816 if (name[0] == '?' && !name[1]) 3793 process_color_seq (op, color, name, resp);
3817 {
3818 unsigned short r, g, b;
3819 pix_colors_focused[color].get (display, r, g, b);
3820 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3821 }
3822 else
3823 set_window_color (color, name);
3824 } 3794 }
3825 break; 3795 break;
3826 case XTerm_Color00: 3796 case XTerm_Color00:
3827 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3797 process_color_seq (op, Color_fg, str, resp);
3828 break; 3798 break;
3829 case XTerm_Color01: 3799 case XTerm_Color01:
3830 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3800 process_color_seq (op, Color_bg, str, resp);
3831 break; 3801 break;
3832#ifndef NO_CURSORCOLOR 3802#ifndef NO_CURSORCOLOR
3833 case XTerm_Color_cursor: 3803 case XTerm_Color_cursor:
3834 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3804 process_color_seq (op, Color_cursor, str, resp);
3835 break; 3805 break;
3836#endif 3806#endif
3837 case XTerm_Color_pointer_fg: 3807 case XTerm_Color_pointer_fg:
3838 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3808 process_color_seq (op, Color_pointer_fg, str, resp);
3839 break; 3809 break;
3840 case XTerm_Color_pointer_bg: 3810 case XTerm_Color_pointer_bg:
3841 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3811 process_color_seq (op, Color_pointer_bg, str, resp);
3842 break; 3812 break;
3843#ifndef NO_BOLD_UNDERLINE_REVERSE 3813#ifndef NO_BOLD_UNDERLINE_REVERSE
3844 case XTerm_Color_RV: 3814 case XTerm_Color_RV:
3845 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3815 process_color_seq (op, Color_RV, str, resp);
3846 break; 3816 break;
3847 case Rxvt_Color_BD: 3817 case Rxvt_Color_BD:
3848 case URxvt_Color_BD: 3818 case URxvt_Color_BD:
3849 process_color_seq (op, Color_BD, str, resp); 3819 process_color_seq (op, Color_BD, str, resp);
3850 break; 3820 break;
3851 case Rxvt_Color_UL: 3821 case Rxvt_Color_UL:
3852 case URxvt_Color_UL: 3822 case URxvt_Color_UL:
3853 process_color_seq (op, Color_UL, str, resp); 3823 process_color_seq (op, Color_UL, str, resp);
3854 break; 3824 break;
3855 case URxvt_Color_IT: 3825 case URxvt_Color_IT:
3856 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3826 process_color_seq (op, Color_IT, str, resp);
3857 break; 3827 break;
3858#endif 3828#endif
3859#if TRANSPARENT && TINTING 3829#if TRANSPARENT && TINTING
3860 case URxvt_Color_tint: 3830 case URxvt_Color_tint:
3861 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3831 process_color_seq (op, Color_tint, str, resp);
3832
3862 check_our_parents (); 3833 check_our_parents ();
3834
3863 if (am_transparent) 3835 if (am_transparent)
3864 want_full_refresh = want_refresh = 1; 3836 want_full_refresh = want_refresh = 1;
3837
3865 break; 3838 break;
3866#endif 3839#endif
3867 3840
3868 case Rxvt_Pixmap: 3841 case Rxvt_Pixmap:
3869 { 3842 {
… …
3940 allocated.push_back ((void *)res); 3913 allocated.push_back ((void *)res);
3941 set_fonts (); 3914 set_fonts ();
3942 } 3915 }
3943 break; 3916 break;
3944 3917
3945#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
3946 case URxvt_locale: 3927 case URxvt_locale:
3947 if (query) 3928 if (query)
3948 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);
3949 else 3930 else
3950 { 3931 {
3951 set_locale (str); 3932 set_locale (str);
3952 pty->set_utf8_mode (enc_utf8); 3933 pty->set_utf8_mode (enc_utf8);
3953 init_xlocale (); 3934 init_xlocale ();
… …
4314 scr_color (Color_bg, Color_bg); 4295 scr_color (Color_bg, Color_bg);
4315 break; 4296 break;
4316 4297
4317 //case 50: // not variable spacing 4298 //case 50: // not variable spacing
4318 4299
4319#if ENABLE_FRILLS 4300#if !ENABLE_MINIMAL
4320 case 90: 4301 case 90:
4321 case 91: /* set bright fg color */ 4302 case 91: /* set bright fg color */
4322 case 92: 4303 case 92:
4323 case 93: 4304 case 93:
4324 case 94: 4305 case 94:

Diff Legend

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