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.320 by root, Mon Apr 30 15:07:09 2007 UTC vs.
Revision 1.327 by ayin, Mon Jun 11 13:33:34 2007 UTC

… …
497 { 497 {
498 commit_iso14755 (); 498 commit_iso14755 ();
499 iso14755buf = ISO_14755_51; 499 iso14755buf = ISO_14755_51;
500# if ISO_14755 500# if ISO_14755
501 iso14755_51 (0); 501 iso14755_51 (0);
502# endif
503 return;
504 }
505 else if (keysym == XK_BackSpace)
506 {
507 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
508# if ISO_14755
509 iso14755_51 (iso14755buf & ISO_14755_MASK);
502# endif 510# endif
503 return; 511 return;
504 } 512 }
505 else if ((hv = hex_keyval (ev)) >= 0) 513 else if ((hv = hex_keyval (ev)) >= 0)
506 { 514 {
… …
877 return; 885 return;
878 886
879 if (len <= 0) 887 if (len <= 0)
880 return; /* not mapped */ 888 return; /* not mapped */
881 889
882 if (OPTION (Opt_scrollTtyKeypress)) 890 if (option (Opt_scrollTtyKeypress))
883 if (view_start) 891 if (view_start)
884 { 892 {
885 view_start = 0; 893 view_start = 0;
886 want_refresh = 1; 894 want_refresh = 1;
887 } 895 }
… …
965 scr_overlay_off (); 973 scr_overlay_off ();
966# endif 974# endif
967 if (iso14755buf & ISO_14755_51) 975 if (iso14755buf & ISO_14755_51)
968 commit_iso14755 (); 976 commit_iso14755 ();
969#if ISO_14755 977#if ISO_14755
970 else if (iso14755buf & ISO_14755_STARTED) 978 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
971 { 979 {
972 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair 980 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
973 981
974 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1); 982 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
975 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE"); 983 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
… …
1232 } 1240 }
1233 else 1241 else
1234 { 1242 {
1235 pty_ev.stop (); 1243 pty_ev.stop ();
1236 1244
1237 if (!OPTION (Opt_hold)) 1245 if (!option (Opt_hold))
1238 destroy (); 1246 destroy ();
1239 } 1247 }
1240 1248
1241 return false; 1249 return false;
1242} 1250}
… …
1263 recolour_cursor (); 1271 recolour_cursor ();
1264 1272
1265#ifdef POINTER_BLANK 1273#ifdef POINTER_BLANK
1266 hidden_pointer = 0; 1274 hidden_pointer = 0;
1267 1275
1268 if (OPTION (Opt_pointerBlank)) 1276 if (option (Opt_pointerBlank))
1269 pointer_ev.start (NOW + pointerBlankDelay); 1277 pointer_ev.start (NOW + pointerBlankDelay);
1270#endif 1278#endif
1271} 1279}
1272 1280
1273#ifdef POINTER_BLANK 1281#ifdef POINTER_BLANK
1274void 1282void
1275rxvt_term::pointer_blank () 1283rxvt_term::pointer_blank ()
1276{ 1284{
1277 if (!OPTION (Opt_pointerBlank)) 1285 if (!option (Opt_pointerBlank))
1278 return; 1286 return;
1279 1287
1280 XDefineCursor (dpy, vt, display->blank_cursor); 1288 XDefineCursor (dpy, vt, display->blank_cursor);
1281 XFlush (dpy); 1289 XFlush (dpy);
1282 1290
… …
1481 1489
1482 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1490 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1483 { 1491 {
1484 seen_resize = 1; 1492 seen_resize = 1;
1485 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1493 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1494#ifdef XPM_BACKGROUND
1495 if (!option(Opt_transparent) && bgPixmap.auto_resize)
1496 {
1497 resize_pixmap ();
1498 scr_touch (true);
1499 }
1500#endif
1486 } 1501 }
1487 1502
1488 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1503 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1489 1504
1490#ifdef TRANSPARENT 1505#ifdef TRANSPARENT
1491 if (OPTION (Opt_transparent)) 1506 if (option (Opt_transparent))
1492 check_our_parents (); 1507 check_our_parents ();
1493#endif 1508#endif
1494 } 1509 }
1495 break; 1510 break;
1496 1511
… …
1685 } 1700 }
1686 break; 1701 break;
1687 } 1702 }
1688 1703
1689#if defined(CURSOR_BLINK) 1704#if defined(CURSOR_BLINK)
1690 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1705 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1691 { 1706 {
1692 if (hidden_cursor) 1707 if (hidden_cursor)
1693 { 1708 {
1694 hidden_cursor = 0; 1709 hidden_cursor = 0;
1695 want_refresh = 1; 1710 want_refresh = 1;
… …
1698 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1713 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1699 } 1714 }
1700#endif 1715#endif
1701 1716
1702#if defined(POINTER_BLANK) 1717#if defined(POINTER_BLANK)
1703 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1718 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1704 { 1719 {
1705 if (ev.type == MotionNotify 1720 if (ev.type == MotionNotify
1706 || ev.type == ButtonPress 1721 || ev.type == ButtonPress
1707 || ev.type == ButtonRelease) 1722 || ev.type == ButtonRelease)
1708 if (hidden_pointer) 1723 if (hidden_pointer)
… …
1730 IMSetPosition (); 1745 IMSetPosition ();
1731 XSetICFocus (Input_Context); 1746 XSetICFocus (Input_Context);
1732 } 1747 }
1733#endif 1748#endif
1734#if CURSOR_BLINK 1749#if CURSOR_BLINK
1735 if (OPTION (Opt_cursorBlink)) 1750 if (option (Opt_cursorBlink))
1736 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1751 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1737#endif 1752#endif
1738#if OFF_FOCUS_FADING 1753#if OFF_FOCUS_FADING
1739 if (rs[Rs_fade]) 1754 if (rs[Rs_fade])
1740 { 1755 {
1741 pix_colors = pix_colors_focused; 1756 pix_colors = pix_colors_focused;
1742 scr_recolour (); 1757 scr_recolour ();
1758 }
1759#endif
1760#if ENABLE_FRILLS
1761 if (option (Opt_urgentOnBell))
1762 {
1763 XWMHints *h;
1764
1765 h = XGetWMHints(dpy, parent[0]);
1766 if (h != NULL)
1767 {
1768 h->flags &= ~XUrgencyHint;
1769 XSetWMHints(dpy, parent[0], h);
1770 }
1743 } 1771 }
1744#endif 1772#endif
1745 } 1773 }
1746} 1774}
1747 1775
… …
1767#if USE_XIM 1795#if USE_XIM
1768 if (Input_Context != NULL) 1796 if (Input_Context != NULL)
1769 XUnsetICFocus (Input_Context); 1797 XUnsetICFocus (Input_Context);
1770#endif 1798#endif
1771#if CURSOR_BLINK 1799#if CURSOR_BLINK
1772 if (OPTION (Opt_cursorBlink)) 1800 if (option (Opt_cursorBlink))
1773 cursor_blink_ev.stop (); 1801 cursor_blink_ev.stop ();
1774 hidden_cursor = 0; 1802 hidden_cursor = 0;
1775#endif 1803#endif
1776#if OFF_FOCUS_FADING 1804#if OFF_FOCUS_FADING
1777 if (rs[Rs_fade]) 1805 if (rs[Rs_fade])
… …
1818 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1846 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1819 return; 1847 return;
1820 1848
1821 /* FALLTHROUGH */ 1849 /* FALLTHROUGH */
1822 case ReparentNotify: 1850 case ReparentNotify:
1823 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent) 1851 if (option (Opt_transparent))
1824 want_refresh = want_full_refresh = 1; 1852 check_our_parents ();
1825 break; 1853 break;
1826 } 1854 }
1827# endif 1855# endif
1828} 1856}
1829#endif 1857#endif
… …
2174 2202
2175 v = ev.button == Button4 ? UP : DN; 2203 v = ev.button == Button4 ? UP : DN;
2176 2204
2177 if (ev.state & ShiftMask) 2205 if (ev.state & ShiftMask)
2178 i = 1; 2206 i = 1;
2179 else if (OPTION (Opt_mouseWheelScrollPage)) 2207 else if (option (Opt_mouseWheelScrollPage))
2180 i = nrow - 1; 2208 i = nrow - 1;
2181 else 2209 else
2182 i = 5; 2210 i = 5;
2183 2211
2184# ifdef MOUSE_SLIP_WHEELING 2212# ifdef MOUSE_SLIP_WHEELING
… …
2207 } 2235 }
2208 } 2236 }
2209} 2237}
2210 2238
2211#ifdef TRANSPARENT 2239#ifdef TRANSPARENT
2212#if TINTING 2240#if TINTING && !defined(HAVE_AFTERIMAGE)
2213/* taken from aterm-0.4.2 */ 2241/* taken from aterm-0.4.2 */
2214 2242
2215typedef uint32_t RUINT32T; 2243typedef uint32_t RUINT32T;
2216 2244
2217void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm) 2245void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
… …
2445 * Do transparency updates if required 2473 * Do transparency updates if required
2446 */ 2474 */
2447int 2475int
2448rxvt_term::check_our_parents () 2476rxvt_term::check_our_parents ()
2449{ 2477{
2478 check_our_parents_ev.stop ();
2479 check_our_parents_ev.start (NOW + .1);
2480 return 0;
2481}
2482
2483void
2484rxvt_term::check_our_parents_cb (time_watcher &w)
2485{
2450 int i, pchanged, aformat, have_pixmap, rootdepth; 2486 int i, pchanged, aformat, have_pixmap, rootdepth;
2451 unsigned long nitems, bytes_after; 2487 unsigned long nitems, bytes_after;
2452 Atom atype; 2488 Atom atype;
2453 unsigned char *prop = NULL; 2489 unsigned char *prop = NULL;
2454 Window root, oldp, *list; 2490 Window root, oldp, *list;
2455 Pixmap rootpixmap = None; 2491 Pixmap rootpixmap = None;
2456 XWindowAttributes wattr, wrootattr; 2492 XWindowAttributes wattr, wrootattr;
2493 int sx, sy;
2494 Window cr;
2457 2495
2458 pchanged = 0; 2496 pchanged = 0;
2459 2497
2460 if (!OPTION (Opt_transparent)) 2498 if (!option (Opt_transparent))
2461 return pchanged; /* Don't try any more */ 2499 return /*pchanged*/; /* Don't try any more */
2462 2500
2463 XGetWindowAttributes (dpy, display->root, &wrootattr); 2501 XGetWindowAttributes (dpy, display->root, &wrootattr);
2464 rootdepth = wrootattr.depth; 2502 rootdepth = wrootattr.depth;
2465 2503
2466 XGetWindowAttributes (dpy, parent[0], &wattr); 2504 XGetWindowAttributes (dpy, parent[0], &wattr);
… …
2472 pchanged = 1; 2510 pchanged = 1;
2473 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]); 2511 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2474 am_transparent = am_pixmap_trans = 0; 2512 am_transparent = am_pixmap_trans = 0;
2475 } 2513 }
2476 2514
2477 return pchanged; /* Don't try any more */ 2515 return /*pchanged*/; /* Don't try any more */
2478 } 2516 }
2479 2517
2480 /* Get all X ops out of the queue so that our information is up-to-date. */ 2518 /* Get all X ops out of the queue so that our information is up-to-date. */
2481 XSync (dpy, False); 2519 XSync (dpy, False);
2482 2520
2521 XTranslateCoordinates (dpy, parent[0], display->root,
2522 0, 0, &sx, &sy, &cr);
2523
2524 /* check if we are outside of the visible part of the virtual screen : */
2525 if( sx + (int)szHint.width <= 0 || sy + (int)szHint.height <= 0
2526 || sx >= wrootattr.width || sy >= wrootattr.height )
2527 return /* 0 */ ;
2483 /* 2528 /*
2484 * Make the frame window set by the window manager have 2529 * Make the frame window set by the window manager have
2485 * the root background. Some window managers put multiple nested frame 2530 * the root background. Some window managers put multiple nested frame
2486 * windows for each client, so we have to take care about that. 2531 * windows for each client, so we have to take care about that.
2487 */ 2532 */
… …
2496 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2541 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2497 &nitems, &bytes_after, &prop) == Success); 2542 &nitems, &bytes_after, &prop) == Success);
2498 2543
2499 if (!i || prop == NULL 2544 if (!i || prop == NULL
2500#if TINTING 2545#if TINTING
2501 || !ISSET_PIXCOLOR (Color_tint) 2546 || (!ISSET_PIXCOLOR (Color_tint) && rs[Rs_shade] == NULL
2547#ifdef HAVE_AFTERIMAGE
2548 && original_asim == NULL && rs[Rs_blurradius] == NULL
2549#endif
2550 )
2502#endif 2551#endif
2503 ) 2552 )
2504 have_pixmap = 0; 2553 have_pixmap = 0;
2505 else 2554 else
2506 { 2555 {
… …
2509 XFree (prop); 2558 XFree (prop);
2510 } 2559 }
2511 2560
2512 if (have_pixmap) 2561 if (have_pixmap)
2513 { 2562 {
2563 Bool success = False ;
2564 GC gc;
2565 XGCValues gcvalue;
2566#ifdef HAVE_AFTERIMAGE
2567 {
2568 Pixmap tmp_pmap = None ;
2569 ShadingInfo shade;
2570 ARGB32 tint ;
2571 unsigned int pmap_w = 0, pmap_h = 0;
2572
2573 if (get_drawable_size( rootpixmap, &pmap_w, &pmap_h ))
2574 {
2575 int root_x = 0, root_y = 0;
2576
2577 shade.shading = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2578 if (ISSET_PIXCOLOR (Color_tint))
2579 {
2580 rgba c;
2581 pix_colors_focused [Color_tint].get (c);
2582 shade.tintColor.red = c.r;
2583 shade.tintColor.green = c.g;
2584 shade.tintColor.blue = c.b;
2585 }
2586 else
2587 shade.tintColor.red = shade.tintColor.green = shade.tintColor.blue = 0xFFFF;
2588 tint = shading2tint32( &shade );
2589 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2590 if (GetWinPosition (parent[0], &root_x, &root_y) )
2591 {
2592 ASImageLayer *layers = create_image_layers( 2 );
2593 ASImage *merged_im = NULL;
2594 int back_x, back_y, back_w, back_h;
2595 /* merge_layers does good job at tiling background appropriately,
2596 so all we need is to cut out smallest possible piece : */
2597#define MAKE_ROOTPMAP_GEOM(xy,wh,widthheight) \
2598 do{ while( root_##xy < 0 ) root_##xy += (int)wrootattr.widthheight; \
2599 back_##xy = root_##xy % pmap_##wh; /* that gives us left side of the closest tile : */ \
2600 if( pmap_##wh >= back_##xy + szHint.widthheight ) \
2601 back_##wh = szHint.widthheight;/* background is large - limit it by our size */ \
2602 else \
2603 { /* small background - need the whole of it for successfull tiling :*/ \
2604 back_##xy = 0; \
2605 back_##wh = pmap_##wh; \
2606 }}while(0)
2607
2608 MAKE_ROOTPMAP_GEOM(x,w,width);
2609 MAKE_ROOTPMAP_GEOM(y,h,height);
2610
2611 layers[0].im = pixmap2asimage (display->asv, rootpixmap, back_x, back_y, back_w, back_h, AllPlanes, ASA_ASImage, 100);
2612 layers[0].clip_x = (back_w == pmap_w)?root_x:0;
2613 layers[0].clip_y = (back_h == pmap_h)?root_y:0;
2614 layers[0].clip_width = szHint.width;
2615 layers[0].clip_height = szHint.height;
2616 layers[0].tint = tint;
2617 if (rs[Rs_blurradius] && layers[0].im)
2618 {
2619 double r = atof(rs[Rs_blurradius]);
2620 ASImage* tmp = blur_asimage_gauss(display->asv, layers[0].im, r, r, 0xFFFFFFFF, ASA_ASImage, 100, ASIMAGE_QUALITY_DEFAULT );
2621 if( tmp )
2622 {
2623 destroy_asimage( &layers[0].im );
2624 layers[0].im = tmp;
2625 }
2626 }
2627 if (original_asim != NULL)
2628 {
2629 int fore_w, fore_h;
2630 layers[1].im = original_asim;
2631 if( bgPixmap.auto_resize )
2632 {
2633 fore_w = szHint.width;
2634 fore_h = szHint.height;
2635 }
2636 else
2637 {
2638 fore_w = bgPixmap.w;
2639 fore_h = bgPixmap.h;
2640 }
2641 if (fore_w != original_asim->width
2642 || fore_h != original_asim->height)
2643 {
2644 layers[1].im = scale_asimage( display->asv,
2645 original_asim,
2646 fore_w, fore_h,
2647 ASA_ASImage, 100,
2648 ASIMAGE_QUALITY_DEFAULT );
2649 }
2650
2651 layers[1].clip_width = szHint.width;
2652 layers[1].clip_height = szHint.height;
2653
2654 if (rs[Rs_blendtype])
2655 {
2656 layers[1].merge_scanlines = blend_scanlines_name2func(rs[Rs_blendtype]);
2657 if( layers[1].merge_scanlines == NULL )
2658 layers[1].merge_scanlines = alphablend_scanlines;
2659 }
2660 }
2661 merged_im = merge_layers( display->asv, layers, layers[1].im?2:1,
2662 szHint.width, szHint.height,
2663 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT );
2664 if (layers[1].im != original_asim)
2665 destroy_asimage( &(layers[1].im) );
2666 destroy_asimage( &(layers[0].im) );
2667 if (merged_im != NULL)
2668 {
2669 tmp_pmap = asimage2pixmap( display->asv, DefaultRootWindow(dpy), merged_im, gc, True );
2670 destroy_asimage( &merged_im );
2671 }
2672 free( layers );
2673 }
2674 }
2675 if (tmp_pmap != None)
2676 {
2677 success = True;
2678 if (pixmap != None)
2679 XFreePixmap (dpy, pixmap);
2680 pixmap = tmp_pmap;
2681 }
2682 }
2683#else /* HAVE_AFTERIMAGE */
2684 {
2514 /* 2685 /*
2515 * Copy display->root pixmap transparency 2686 * Copy display->root pixmap transparency
2516 */ 2687 */
2517 int sx, sy, nx, ny; 2688 int nx, ny;
2518 unsigned int nw, nh; 2689 unsigned int nw, nh;
2519 Window cr;
2520 XImage *image; 2690 XImage *image;
2521 GC gc;
2522 XGCValues gcvalue;
2523 2691
2524 XTranslateCoordinates (dpy, parent[0], display->root,
2525 0, 0, &sx, &sy, &cr);
2526 nw = (unsigned int)szHint.width; 2692 nw = (unsigned int)szHint.width;
2527 nh = (unsigned int)szHint.height; 2693 nh = (unsigned int)szHint.height;
2528 nx = ny = 0; 2694 nx = ny = 0;
2529 2695
2530 if (sx < 0) 2696 if (sx < 0)
2531 { 2697 {
2532 nw += sx; 2698 nw += sx;
2533 nx = -sx; 2699 nx = -sx;
2534 sx = 0; 2700 sx = 0;
2535 } 2701 }
2536 2702
2537 if (sy < 0) 2703 if (sy < 0)
2538 { 2704 {
2539 nh += sy; 2705 nh += sy;
2540 ny = -sy; 2706 ny = -sy;
2541 sy = 0; 2707 sy = 0;
2542 } 2708 }
2543 2709
2544 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2710 min_it (nw, (unsigned int) (wrootattr.width - sx));
2545 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2711 min_it (nh, (unsigned int) (wrootattr.height - sy));
2546 2712
2547 XSync (dpy, False); 2713 XSync (dpy, False);
2548 allowedxerror = -1; 2714 allowedxerror = -1;
2549 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2715 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2550 2716
2551 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2717 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2552 /* XXX: may need a delay here? */ 2718 /* XXX: may need a delay here? */
2553 allowedxerror = 0; 2719 allowedxerror = 0;
2554
2555 if (image == NULL) 2720 if (image != NULL)
2721 {
2722 if (pixmap != None)
2723 XFreePixmap (dpy, pixmap);
2724
2725#if TINTING
2726 if (ISSET_PIXCOLOR (Color_tint))
2727 {
2728 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2729
2730 rgba c;
2731 pix_colors_focused [Color_tint].get (c);
2732 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2733 }
2734#endif
2735
2736 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2737 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2738 XPutImage (dpy, pixmap, gc, image, 0, 0,
2739 nx, ny, image->width, image->height);
2740 XDestroyImage (image);
2741 success = True ;
2742 }
2743 }
2744#endif /* HAVE_AFTERIMAGE */
2745 if (gc != NULL)
2746 XFreeGC (dpy, gc);
2747
2748 if (!success)
2556 { 2749 {
2557 if (am_transparent && am_pixmap_trans) 2750 if (am_transparent && am_pixmap_trans)
2558 { 2751 {
2559 pchanged = 1; 2752 pchanged = 1;
2560 if (pixmap != None) 2753 if (pixmap != None)
… …
2566 2759
2567 am_pixmap_trans = 0; 2760 am_pixmap_trans = 0;
2568 } 2761 }
2569 else 2762 else
2570 { 2763 {
2571 if (pixmap != None)
2572 XFreePixmap (dpy, pixmap);
2573
2574#if TINTING
2575 if (ISSET_PIXCOLOR (Color_tint))
2576 {
2577 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2578
2579 rgba c;
2580 pix_colors_focused [Color_tint].get (c);
2581
2582 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2583 }
2584#endif
2585
2586 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2587 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2588 XPutImage (dpy, pixmap, gc, image, 0, 0,
2589 nx, ny, image->width, image->height);
2590 XFreeGC (dpy, gc);
2591 XDestroyImage (image);
2592 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap); 2764 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2593 XClearWindow (dpy, parent[0]); 2765 XClearWindow (dpy, parent[0]);
2594 2766
2595 if (!am_transparent || !am_pixmap_trans) 2767 if (!am_transparent || !am_pixmap_trans)
2596 pchanged = 1; 2768 pchanged = 1;
… …
2674 want_refresh = want_full_refresh = 1; 2846 want_refresh = want_full_refresh = 1;
2675 if (am_pixmap_trans) 2847 if (am_pixmap_trans)
2676 flush (); 2848 flush ();
2677 } 2849 }
2678 2850
2679 return pchanged; 2851// return pchanged;
2680} 2852}
2681#endif 2853#endif
2682 2854
2683/*}}} */ 2855/*}}} */
2684 2856
… …
2735 if (ch == C0_LF) 2907 if (ch == C0_LF)
2736 nlines++; 2908 nlines++;
2737 2909
2738 refresh_count++; 2910 refresh_count++;
2739 2911
2740 if (!OPTION (Opt_jumpScroll) 2912 if (!option (Opt_jumpScroll)
2741 || (refresh_count >= refresh_limit * (nrow - 1))) 2913 || (refresh_count >= refresh_limit * (nrow - 1)))
2742 { 2914 {
2743 refreshnow = true; 2915 refreshnow = true;
2744 refresh_count = 0; 2916 refresh_count = 0;
2745 ch = NOCHAR; 2917 ch = NOCHAR;
… …
2785 * the number of pages between refreshes is refresh_limit, which 2957 * the number of pages between refreshes is refresh_limit, which
2786 * is incremented here because we must be doing flat-out scrolling. 2958 * is incremented here because we must be doing flat-out scrolling.
2787 */ 2959 */
2788 if (refreshnow) 2960 if (refreshnow)
2789 { 2961 {
2790 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2962 if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2791 refresh_limit++; 2963 refresh_limit++;
2792 else 2964 else
2793 { 2965 {
2794 flag = true; 2966 flag = true;
2795 //TODO: due to popular request, implement "skipscroll" option here 2967 //TODO: due to popular request, implement "skipscroll" option here
… …
3461 break; 3633 break;
3462 case 6: /* CPR requested */ 3634 case 6: /* CPR requested */
3463 scr_report_position (); 3635 scr_report_position ();
3464 break; 3636 break;
3465 case 7: /* unofficial extension */ 3637 case 7: /* unofficial extension */
3466 if (OPTION (Opt_insecure)) 3638 if (option (Opt_insecure))
3467 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3639 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3468 break; 3640 break;
3469 case 8: /* unofficial extension */ 3641 case 8: /* unofficial extension */
3470 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3642 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3471 break; 3643 break;
… …
3635 break; 3807 break;
3636 case 20: /* report icon label */ 3808 case 20: /* report icon label */
3637 { 3809 {
3638 char *s; 3810 char *s;
3639 XGetIconName (dpy, parent[0], &s); 3811 XGetIconName (dpy, parent[0], &s);
3640 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3812 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3641 XFree (s); 3813 XFree (s);
3642 } 3814 }
3643 break; 3815 break;
3644 case 21: /* report window title */ 3816 case 21: /* report window title */
3645 { 3817 {
3646 char *s; 3818 char *s;
3647 XFetchName (dpy, parent[0], &s); 3819 XFetchName (dpy, parent[0], &s);
3648 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3820 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3649 XFree (s); 3821 XFree (s);
3650 } 3822 }
3651 break; 3823 break;
3652 } 3824 }
3653} 3825}
… …
3925#ifdef XPM_BACKGROUND 4097#ifdef XPM_BACKGROUND
3926 resize_pixmap (); 4098 resize_pixmap ();
3927 scr_touch (true); 4099 scr_touch (true);
3928#endif 4100#endif
3929 } 4101 }
4102#if TRANSPARENT && defined(HAVE_AFTERIMAGE)
4103 if (option(Opt_transparent))
4104 check_our_parents ();
4105#endif
4106
3930 } 4107 }
3931 break; 4108 break;
3932 4109
3933 case Rxvt_restoreFG: 4110 case Rxvt_restoreFG:
3934 set_window_color (Color_fg, str); 4111 set_window_color (Color_fg, str);
… …
3961 case URxvt_italicFont: 4138 case URxvt_italicFont:
3962 case URxvt_boldItalicFont: 4139 case URxvt_boldItalicFont:
3963#endif 4140#endif
3964 if (query) 4141 if (query)
3965 tt_printf ("\33]%d;%-.250s%c", saveop, 4142 tt_printf ("\33]%d;%-.250s%c", saveop,
3966 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 4143 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3967 ? fontset[op - URxvt_font]->fontdesc : "", 4144 ? fontset[op - URxvt_font]->fontdesc : "",
3968 resp); 4145 resp);
3969 else 4146 else
3970 { 4147 {
3971 const char *&res = rs[Rs_font + (op - URxvt_font)]; 4148 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3985 break; 4162 break;
3986 4163
3987#if !ENABLE_MINIMAL 4164#if !ENABLE_MINIMAL
3988 case URxvt_locale: 4165 case URxvt_locale:
3989 if (query) 4166 if (query)
3990 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp); 4167 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3991 else 4168 else
3992 { 4169 {
3993 set_locale (str); 4170 set_locale (str);
3994 pty->set_utf8_mode (enc_utf8); 4171 pty->set_utf8_mode (enc_utf8);
3995 init_xlocale (); 4172 init_xlocale ();
… …
4136 scr_touch (true); 4313 scr_touch (true);
4137 break; 4314 break;
4138#endif 4315#endif
4139 case 1048: /* alternative cursor save */ 4316 case 1048: /* alternative cursor save */
4140 case 1049: 4317 case 1049:
4141 if (OPTION (Opt_secondaryScreen)) 4318 if (option (Opt_secondaryScreen))
4142 if (mode == 0) 4319 if (mode == 0)
4143 scr_cursor (RESTORE); 4320 scr_cursor (RESTORE);
4144 else if (mode == 1) 4321 else if (mode == 1)
4145 scr_cursor (SAVE); 4322 scr_cursor (SAVE);
4146 break; 4323 break;
… …
4211 break; 4388 break;
4212 case 1011: /* scroll to bottom on key press */ 4389 case 1011: /* scroll to bottom on key press */
4213 set_option (Opt_scrollTtyKeypress, state); 4390 set_option (Opt_scrollTtyKeypress, state);
4214 break; 4391 break;
4215 case 1047: /* secondary screen w/ clearing last */ 4392 case 1047: /* secondary screen w/ clearing last */
4216 if (OPTION (Opt_secondaryScreen)) 4393 if (option (Opt_secondaryScreen))
4217 if (current_screen != PRIMARY) 4394 if (current_screen != PRIMARY)
4218 scr_erase_screen (2); 4395 scr_erase_screen (2);
4219 scr_change_screen (state); 4396 scr_change_screen (state);
4220 break; 4397 break;
4221 case 1049: /* secondary screen w/ clearing first */ 4398 case 1049: /* secondary screen w/ clearing first */
4222 scr_change_screen (state); 4399 scr_change_screen (state);
4223 if (OPTION (Opt_secondaryScreen)) 4400 if (option (Opt_secondaryScreen))
4224 if (current_screen != PRIMARY) 4401 if (current_screen != PRIMARY)
4225 scr_erase_screen (2); 4402 scr_erase_screen (2);
4226 break; 4403 break;
4227 default: 4404 default:
4228 break; 4405 break;

Diff Legend

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