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.300 by root, Tue Jan 31 19:53:30 2006 UTC

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

Diff Legend

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