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.319 by ayin, Fri Feb 16 21:46:05 2007 UTC vs.
Revision 1.324 by sasha, Fri Jun 8 20:04:12 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 }
… …
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
… …
1458 break; 1466 break;
1459 } 1467 }
1460 break; 1468 break;
1461 1469
1462 case FocusIn: 1470 case FocusIn:
1463 if (ev.xfocus.detail != NotifyInferior && ev.xfocus.detail != NotifyPointer) 1471 if (ev.xfocus.detail != NotifyInferior
1472 && ev.xfocus.detail != NotifyPointer
1473 && ev.xfocus.mode != NotifyGrab)
1464 focus_in (); 1474 focus_in ();
1465 break; 1475 break;
1466 1476
1467 case FocusOut: 1477 case FocusOut:
1468 if (ev.xfocus.detail != NotifyInferior && ev.xfocus.detail != NotifyPointer) 1478 if (ev.xfocus.detail != NotifyInferior
1479 && ev.xfocus.detail != NotifyPointer
1480 && ev.xfocus.mode != NotifyGrab)
1469 focus_out (); 1481 focus_out ();
1470 break; 1482 break;
1471 1483
1472 case ConfigureNotify: 1484 case ConfigureNotify:
1473 if (ev.xconfigure.window == parent[0]) 1485 if (ev.xconfigure.window == parent[0])
… …
1477 1489
1478 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1490 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1479 { 1491 {
1480 seen_resize = 1; 1492 seen_resize = 1;
1481 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
1482 } 1501 }
1483 1502
1484 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1503 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1485 1504
1486#ifdef TRANSPARENT 1505#ifdef TRANSPARENT
1487 if (OPTION (Opt_transparent)) 1506 if (option (Opt_transparent))
1488 check_our_parents (); 1507 check_our_parents ();
1489#endif 1508#endif
1490 } 1509 }
1491 break; 1510 break;
1492 1511
… …
1681 } 1700 }
1682 break; 1701 break;
1683 } 1702 }
1684 1703
1685#if defined(CURSOR_BLINK) 1704#if defined(CURSOR_BLINK)
1686 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1705 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1687 { 1706 {
1688 if (hidden_cursor) 1707 if (hidden_cursor)
1689 { 1708 {
1690 hidden_cursor = 0; 1709 hidden_cursor = 0;
1691 want_refresh = 1; 1710 want_refresh = 1;
… …
1694 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1713 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1695 } 1714 }
1696#endif 1715#endif
1697 1716
1698#if defined(POINTER_BLANK) 1717#if defined(POINTER_BLANK)
1699 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1718 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1700 { 1719 {
1701 if (ev.type == MotionNotify 1720 if (ev.type == MotionNotify
1702 || ev.type == ButtonPress 1721 || ev.type == ButtonPress
1703 || ev.type == ButtonRelease) 1722 || ev.type == ButtonRelease)
1704 if (hidden_pointer) 1723 if (hidden_pointer)
… …
1726 IMSetPosition (); 1745 IMSetPosition ();
1727 XSetICFocus (Input_Context); 1746 XSetICFocus (Input_Context);
1728 } 1747 }
1729#endif 1748#endif
1730#if CURSOR_BLINK 1749#if CURSOR_BLINK
1731 if (OPTION (Opt_cursorBlink)) 1750 if (option (Opt_cursorBlink))
1732 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1751 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1733#endif 1752#endif
1734#if OFF_FOCUS_FADING 1753#if OFF_FOCUS_FADING
1735 if (rs[Rs_fade]) 1754 if (rs[Rs_fade])
1736 { 1755 {
1737 pix_colors = pix_colors_focused; 1756 pix_colors = pix_colors_focused;
1738 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 }
1739 } 1771 }
1740#endif 1772#endif
1741 } 1773 }
1742} 1774}
1743 1775
… …
1763#if USE_XIM 1795#if USE_XIM
1764 if (Input_Context != NULL) 1796 if (Input_Context != NULL)
1765 XUnsetICFocus (Input_Context); 1797 XUnsetICFocus (Input_Context);
1766#endif 1798#endif
1767#if CURSOR_BLINK 1799#if CURSOR_BLINK
1768 if (OPTION (Opt_cursorBlink)) 1800 if (option (Opt_cursorBlink))
1769 cursor_blink_ev.stop (); 1801 cursor_blink_ev.stop ();
1770 hidden_cursor = 0; 1802 hidden_cursor = 0;
1771#endif 1803#endif
1772#if OFF_FOCUS_FADING 1804#if OFF_FOCUS_FADING
1773 if (rs[Rs_fade]) 1805 if (rs[Rs_fade])
… …
1814 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1846 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1815 return; 1847 return;
1816 1848
1817 /* FALLTHROUGH */ 1849 /* FALLTHROUGH */
1818 case ReparentNotify: 1850 case ReparentNotify:
1819 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent) 1851 if (option (Opt_transparent))
1820 want_refresh = want_full_refresh = 1; 1852 check_our_parents ();
1821 break; 1853 break;
1822 } 1854 }
1823# endif 1855# endif
1824} 1856}
1825#endif 1857#endif
… …
2170 2202
2171 v = ev.button == Button4 ? UP : DN; 2203 v = ev.button == Button4 ? UP : DN;
2172 2204
2173 if (ev.state & ShiftMask) 2205 if (ev.state & ShiftMask)
2174 i = 1; 2206 i = 1;
2175 else if (OPTION (Opt_mouseWheelScrollPage)) 2207 else if (option (Opt_mouseWheelScrollPage))
2176 i = nrow - 1; 2208 i = nrow - 1;
2177 else 2209 else
2178 i = 5; 2210 i = 5;
2179 2211
2180# ifdef MOUSE_SLIP_WHEELING 2212# ifdef MOUSE_SLIP_WHEELING
… …
2203 } 2235 }
2204 } 2236 }
2205} 2237}
2206 2238
2207#ifdef TRANSPARENT 2239#ifdef TRANSPARENT
2208#if TINTING 2240#if TINTING && !defined(HAVE_AFTERIMAGE)
2209/* taken from aterm-0.4.2 */ 2241/* taken from aterm-0.4.2 */
2210 2242
2211typedef uint32_t RUINT32T; 2243typedef uint32_t RUINT32T;
2212 2244
2213void 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)
… …
2441 * Do transparency updates if required 2473 * Do transparency updates if required
2442 */ 2474 */
2443int 2475int
2444rxvt_term::check_our_parents () 2476rxvt_term::check_our_parents ()
2445{ 2477{
2478#if TRANSPARENT || ENABLE_PERL
2479 check_our_aprents_ev.stop();
2480 check_our_aprents_ev.start(NOW + 1./3.);
2481#endif
2482 return 0;
2483}
2484
2485void
2486rxvt_term::check_our_parents_cb (time_watcher &w)
2487{
2446 int i, pchanged, aformat, have_pixmap, rootdepth; 2488 int i, pchanged, aformat, have_pixmap, rootdepth;
2447 unsigned long nitems, bytes_after; 2489 unsigned long nitems, bytes_after;
2448 Atom atype; 2490 Atom atype;
2449 unsigned char *prop = NULL; 2491 unsigned char *prop = NULL;
2450 Window root, oldp, *list; 2492 Window root, oldp, *list;
2451 Pixmap rootpixmap = None; 2493 Pixmap rootpixmap = None;
2452 XWindowAttributes wattr, wrootattr; 2494 XWindowAttributes wattr, wrootattr;
2495 int sx, sy;
2496 Window cr;
2453 2497
2454 pchanged = 0; 2498 pchanged = 0;
2455 2499
2456 if (!OPTION (Opt_transparent)) 2500 if (!option (Opt_transparent))
2457 return pchanged; /* Don't try any more */ 2501 return /*pchanged*/; /* Don't try any more */
2458 2502
2459 XGetWindowAttributes (dpy, display->root, &wrootattr); 2503 XGetWindowAttributes (dpy, display->root, &wrootattr);
2460 rootdepth = wrootattr.depth; 2504 rootdepth = wrootattr.depth;
2461 2505
2462 XGetWindowAttributes (dpy, parent[0], &wattr); 2506 XGetWindowAttributes (dpy, parent[0], &wattr);
… …
2468 pchanged = 1; 2512 pchanged = 1;
2469 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]); 2513 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2470 am_transparent = am_pixmap_trans = 0; 2514 am_transparent = am_pixmap_trans = 0;
2471 } 2515 }
2472 2516
2473 return pchanged; /* Don't try any more */ 2517 return /*pchanged*/; /* Don't try any more */
2474 } 2518 }
2475 2519
2476 /* Get all X ops out of the queue so that our information is up-to-date. */ 2520 /* Get all X ops out of the queue so that our information is up-to-date. */
2477 XSync (dpy, False); 2521 XSync (dpy, False);
2478 2522
2523 XTranslateCoordinates (dpy, parent[0], display->root,
2524 0, 0, &sx, &sy, &cr);
2525
2526 /* check if we are outside of the visible part of the virtual screen : */
2527 if( sx + (int)szHint.width <= 0 || sy + (int)szHint.height <= 0
2528 || sx >= wrootattr.width || sy >= wrootattr.height )
2529 return /* 0 */ ;
2479 /* 2530 /*
2480 * Make the frame window set by the window manager have 2531 * Make the frame window set by the window manager have
2481 * the root background. Some window managers put multiple nested frame 2532 * the root background. Some window managers put multiple nested frame
2482 * windows for each client, so we have to take care about that. 2533 * windows for each client, so we have to take care about that.
2483 */ 2534 */
… …
2492 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2543 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2493 &nitems, &bytes_after, &prop) == Success); 2544 &nitems, &bytes_after, &prop) == Success);
2494 2545
2495 if (!i || prop == NULL 2546 if (!i || prop == NULL
2496#if TINTING 2547#if TINTING
2497 || !ISSET_PIXCOLOR (Color_tint) 2548 || (!ISSET_PIXCOLOR (Color_tint) && rs[Rs_shade] == NULL
2549#ifdef HAVE_AFTERIMAGE
2550 && original_asim == NULL && rs[Rs_blurradius] == NULL
2551#endif
2552 )
2498#endif 2553#endif
2499 ) 2554 )
2500 have_pixmap = 0; 2555 have_pixmap = 0;
2501 else 2556 else
2502 { 2557 {
… …
2505 XFree (prop); 2560 XFree (prop);
2506 } 2561 }
2507 2562
2508 if (have_pixmap) 2563 if (have_pixmap)
2509 { 2564 {
2565 Bool success = False ;
2566 GC gc;
2567 XGCValues gcvalue;
2568#ifdef HAVE_AFTERIMAGE
2569 {
2570 Pixmap tmp_pmap = None ;
2571 ShadingInfo shade;
2572 ARGB32 tint ;
2573 unsigned int pmap_w = 0, pmap_h = 0;
2574
2575 if (get_drawable_size( rootpixmap, &pmap_w, &pmap_h ))
2576 {
2577 int root_x = 0, root_y = 0;
2578
2579 shade.shading = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2580 if (ISSET_PIXCOLOR (Color_tint))
2581 {
2582 rgba c;
2583 pix_colors_focused [Color_tint].get (c);
2584 shade.tintColor.red = c.r;
2585 shade.tintColor.green = c.g;
2586 shade.tintColor.blue = c.b;
2587 }
2588 else
2589 shade.tintColor.red = shade.tintColor.green = shade.tintColor.blue = 0xFFFF;
2590 tint = shading2tint32( &shade );
2591 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2592 if (GetWinPosition (parent[0], &root_x, &root_y) )
2593 {
2594 ASImageLayer *layers = create_image_layers( 2 );
2595 ASImage *merged_im = NULL;
2596 int back_x, back_y, back_w, back_h;
2597 /* merge_layers does good job at tiling background appropriately,
2598 so all we need is to cut out smallest possible piece : */
2599#define MAKE_ROOTPMAP_GEOM(xy,wh,widthheight) \
2600 do{ while( root_##xy < 0 ) root_##xy += (int)wrootattr.widthheight; \
2601 back_##xy = root_##xy % pmap_##wh; /* that gives us left side of the closest tile : */ \
2602 if( pmap_##wh >= back_##xy + szHint.widthheight ) \
2603 back_##wh = szHint.widthheight;/* background is large - limit it by our size */ \
2604 else \
2605 { /* small background - need the whole of it for successfull tiling :*/ \
2606 back_##xy = 0; \
2607 back_##wh = pmap_##wh; \
2608 }}while(0)
2609
2610 MAKE_ROOTPMAP_GEOM(x,w,width);
2611 MAKE_ROOTPMAP_GEOM(y,h,height);
2612
2613 layers[0].im = pixmap2asimage (display->asv, rootpixmap, back_x, back_y, back_w, back_h, AllPlanes, ASA_ASImage, 100);
2614 layers[0].clip_x = (back_w == pmap_w)?root_x:0;
2615 layers[0].clip_y = (back_h == pmap_h)?root_y:0;
2616 layers[0].clip_width = szHint.width;
2617 layers[0].clip_height = szHint.height;
2618 layers[0].tint = tint;
2619 if (rs[Rs_blurradius] && layers[0].im)
2620 {
2621 double r = atof(rs[Rs_blurradius]);
2622 ASImage* tmp = blur_asimage_gauss(display->asv, layers[0].im, r, r, 0xFFFFFFFF, ASA_ASImage, 100, ASIMAGE_QUALITY_DEFAULT );
2623 if( tmp )
2624 {
2625 destroy_asimage( &layers[0].im );
2626 layers[0].im = tmp;
2627 }
2628 }
2629 if (original_asim != NULL)
2630 {
2631 int fore_w, fore_h;
2632 layers[1].im = original_asim;
2633 if( bgPixmap.auto_resize )
2634 {
2635 fore_w = szHint.width;
2636 fore_h = szHint.height;
2637 }
2638 else
2639 {
2640 fore_w = bgPixmap.w;
2641 fore_h = bgPixmap.h;
2642 }
2643 if (fore_w != original_asim->width
2644 || fore_h != original_asim->height)
2645 {
2646 layers[1].im = scale_asimage( display->asv,
2647 original_asim,
2648 fore_w, fore_h,
2649 ASA_ASImage, 100,
2650 ASIMAGE_QUALITY_DEFAULT );
2651 }
2652
2653 layers[1].clip_width = szHint.width;
2654 layers[1].clip_height = szHint.height;
2655
2656 if (rs[Rs_blendtype])
2657 {
2658 layers[1].merge_scanlines = blend_scanlines_name2func(rs[Rs_blendtype]);
2659 if( layers[1].merge_scanlines == NULL )
2660 layers[1].merge_scanlines = alphablend_scanlines;
2661 }
2662 }
2663 merged_im = merge_layers( display->asv, layers, layers[1].im?2:1,
2664 szHint.width, szHint.height,
2665 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT );
2666 if (layers[1].im != original_asim)
2667 destroy_asimage( &(layers[1].im) );
2668 destroy_asimage( &(layers[0].im) );
2669 if (merged_im != NULL)
2670 {
2671 tmp_pmap = asimage2pixmap( display->asv, DefaultRootWindow(dpy), merged_im, gc, True );
2672 destroy_asimage( &merged_im );
2673 }
2674 free( layers );
2675 }
2676 }
2677 if (tmp_pmap != None)
2678 {
2679 success = True;
2680 if (pixmap != None)
2681 XFreePixmap (dpy, pixmap);
2682 pixmap = tmp_pmap;
2683 }
2684 }
2685#else /* HAVE_AFTERIMAGE */
2686 {
2510 /* 2687 /*
2511 * Copy display->root pixmap transparency 2688 * Copy display->root pixmap transparency
2512 */ 2689 */
2513 int sx, sy, nx, ny; 2690 int nx, ny;
2514 unsigned int nw, nh; 2691 unsigned int nw, nh;
2515 Window cr;
2516 XImage *image; 2692 XImage *image;
2517 GC gc;
2518 XGCValues gcvalue;
2519 2693
2520 XTranslateCoordinates (dpy, parent[0], display->root,
2521 0, 0, &sx, &sy, &cr);
2522 nw = (unsigned int)szHint.width; 2694 nw = (unsigned int)szHint.width;
2523 nh = (unsigned int)szHint.height; 2695 nh = (unsigned int)szHint.height;
2524 nx = ny = 0; 2696 nx = ny = 0;
2525 2697
2526 if (sx < 0) 2698 if (sx < 0)
2527 { 2699 {
2528 nw += sx; 2700 nw += sx;
2529 nx = -sx; 2701 nx = -sx;
2530 sx = 0; 2702 sx = 0;
2531 } 2703 }
2532 2704
2533 if (sy < 0) 2705 if (sy < 0)
2534 { 2706 {
2535 nh += sy; 2707 nh += sy;
2536 ny = -sy; 2708 ny = -sy;
2537 sy = 0; 2709 sy = 0;
2538 } 2710 }
2539 2711
2540 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2712 min_it (nw, (unsigned int) (wrootattr.width - sx));
2541 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2713 min_it (nh, (unsigned int) (wrootattr.height - sy));
2542 2714
2543 XSync (dpy, False); 2715 XSync (dpy, False);
2544 allowedxerror = -1; 2716 allowedxerror = -1;
2545 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2717 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2546 2718
2547 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2719 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2548 /* XXX: may need a delay here? */ 2720 /* XXX: may need a delay here? */
2549 allowedxerror = 0; 2721 allowedxerror = 0;
2550
2551 if (image == NULL) 2722 if (image != NULL)
2723 {
2724 if (pixmap != None)
2725 XFreePixmap (dpy, pixmap);
2726
2727#if TINTING
2728 if (ISSET_PIXCOLOR (Color_tint))
2729 {
2730 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2731
2732 rgba c;
2733 pix_colors_focused [Color_tint].get (c);
2734 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2735 }
2736#endif
2737
2738 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2739 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2740 XPutImage (dpy, pixmap, gc, image, 0, 0,
2741 nx, ny, image->width, image->height);
2742 XDestroyImage (image);
2743 success = True ;
2744 }
2745 }
2746#endif /* HAVE_AFTERIMAGE */
2747 if (gc != NULL)
2748 XFreeGC (dpy, gc);
2749
2750 if (!success)
2552 { 2751 {
2553 if (am_transparent && am_pixmap_trans) 2752 if (am_transparent && am_pixmap_trans)
2554 { 2753 {
2555 pchanged = 1; 2754 pchanged = 1;
2556 if (pixmap != None) 2755 if (pixmap != None)
… …
2562 2761
2563 am_pixmap_trans = 0; 2762 am_pixmap_trans = 0;
2564 } 2763 }
2565 else 2764 else
2566 { 2765 {
2567 if (pixmap != None)
2568 XFreePixmap (dpy, pixmap);
2569
2570#if TINTING
2571 if (ISSET_PIXCOLOR (Color_tint))
2572 {
2573 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2574
2575 rgba c;
2576 pix_colors_focused [Color_tint].get (c);
2577
2578 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2579 }
2580#endif
2581
2582 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2583 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2584 XPutImage (dpy, pixmap, gc, image, 0, 0,
2585 nx, ny, image->width, image->height);
2586 XFreeGC (dpy, gc);
2587 XDestroyImage (image);
2588 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap); 2766 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2589 XClearWindow (dpy, parent[0]); 2767 XClearWindow (dpy, parent[0]);
2590 2768
2591 if (!am_transparent || !am_pixmap_trans) 2769 if (!am_transparent || !am_pixmap_trans)
2592 pchanged = 1; 2770 pchanged = 1;
… …
2670 want_refresh = want_full_refresh = 1; 2848 want_refresh = want_full_refresh = 1;
2671 if (am_pixmap_trans) 2849 if (am_pixmap_trans)
2672 flush (); 2850 flush ();
2673 } 2851 }
2674 2852
2675 return pchanged; 2853// return pchanged;
2676} 2854}
2677#endif 2855#endif
2678 2856
2679/*}}} */ 2857/*}}} */
2680 2858
… …
2731 if (ch == C0_LF) 2909 if (ch == C0_LF)
2732 nlines++; 2910 nlines++;
2733 2911
2734 refresh_count++; 2912 refresh_count++;
2735 2913
2736 if (!OPTION (Opt_jumpScroll) 2914 if (!option (Opt_jumpScroll)
2737 || (refresh_count >= refresh_limit * (nrow - 1))) 2915 || (refresh_count >= refresh_limit * (nrow - 1)))
2738 { 2916 {
2739 refreshnow = true; 2917 refreshnow = true;
2740 refresh_count = 0; 2918 refresh_count = 0;
2741 ch = NOCHAR; 2919 ch = NOCHAR;
… …
2781 * the number of pages between refreshes is refresh_limit, which 2959 * the number of pages between refreshes is refresh_limit, which
2782 * is incremented here because we must be doing flat-out scrolling. 2960 * is incremented here because we must be doing flat-out scrolling.
2783 */ 2961 */
2784 if (refreshnow) 2962 if (refreshnow)
2785 { 2963 {
2786 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2964 if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2787 refresh_limit++; 2965 refresh_limit++;
2788 else 2966 else
2789 { 2967 {
2790 flag = true; 2968 flag = true;
2791 //TODO: due to popular request, implement "skipscroll" option here 2969 //TODO: due to popular request, implement "skipscroll" option here
… …
3457 break; 3635 break;
3458 case 6: /* CPR requested */ 3636 case 6: /* CPR requested */
3459 scr_report_position (); 3637 scr_report_position ();
3460 break; 3638 break;
3461 case 7: /* unofficial extension */ 3639 case 7: /* unofficial extension */
3462 if (OPTION (Opt_insecure)) 3640 if (option (Opt_insecure))
3463 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3641 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3464 break; 3642 break;
3465 case 8: /* unofficial extension */ 3643 case 8: /* unofficial extension */
3466 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3644 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3467 break; 3645 break;
… …
3631 break; 3809 break;
3632 case 20: /* report icon label */ 3810 case 20: /* report icon label */
3633 { 3811 {
3634 char *s; 3812 char *s;
3635 XGetIconName (dpy, parent[0], &s); 3813 XGetIconName (dpy, parent[0], &s);
3636 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3814 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3637 XFree (s); 3815 XFree (s);
3638 } 3816 }
3639 break; 3817 break;
3640 case 21: /* report window title */ 3818 case 21: /* report window title */
3641 { 3819 {
3642 char *s; 3820 char *s;
3643 XFetchName (dpy, parent[0], &s); 3821 XFetchName (dpy, parent[0], &s);
3644 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3822 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3645 XFree (s); 3823 XFree (s);
3646 } 3824 }
3647 break; 3825 break;
3648 } 3826 }
3649} 3827}
… …
3921#ifdef XPM_BACKGROUND 4099#ifdef XPM_BACKGROUND
3922 resize_pixmap (); 4100 resize_pixmap ();
3923 scr_touch (true); 4101 scr_touch (true);
3924#endif 4102#endif
3925 } 4103 }
4104#if TRANSPARENT && defined(HAVE_AFTERIMAGE)
4105 if (option(Opt_transparent))
4106 check_our_parents ();
4107#endif
4108
3926 } 4109 }
3927 break; 4110 break;
3928 4111
3929 case Rxvt_restoreFG: 4112 case Rxvt_restoreFG:
3930 set_window_color (Color_fg, str); 4113 set_window_color (Color_fg, str);
… …
3957 case URxvt_italicFont: 4140 case URxvt_italicFont:
3958 case URxvt_boldItalicFont: 4141 case URxvt_boldItalicFont:
3959#endif 4142#endif
3960 if (query) 4143 if (query)
3961 tt_printf ("\33]%d;%-.250s%c", saveop, 4144 tt_printf ("\33]%d;%-.250s%c", saveop,
3962 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 4145 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3963 ? fontset[op - URxvt_font]->fontdesc : "", 4146 ? fontset[op - URxvt_font]->fontdesc : "",
3964 resp); 4147 resp);
3965 else 4148 else
3966 { 4149 {
3967 const char *&res = rs[Rs_font + (op - URxvt_font)]; 4150 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3981 break; 4164 break;
3982 4165
3983#if !ENABLE_MINIMAL 4166#if !ENABLE_MINIMAL
3984 case URxvt_locale: 4167 case URxvt_locale:
3985 if (query) 4168 if (query)
3986 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp); 4169 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3987 else 4170 else
3988 { 4171 {
3989 set_locale (str); 4172 set_locale (str);
3990 pty->set_utf8_mode (enc_utf8); 4173 pty->set_utf8_mode (enc_utf8);
3991 init_xlocale (); 4174 init_xlocale ();
… …
4132 scr_touch (true); 4315 scr_touch (true);
4133 break; 4316 break;
4134#endif 4317#endif
4135 case 1048: /* alternative cursor save */ 4318 case 1048: /* alternative cursor save */
4136 case 1049: 4319 case 1049:
4137 if (OPTION (Opt_secondaryScreen)) 4320 if (option (Opt_secondaryScreen))
4138 if (mode == 0) 4321 if (mode == 0)
4139 scr_cursor (RESTORE); 4322 scr_cursor (RESTORE);
4140 else if (mode == 1) 4323 else if (mode == 1)
4141 scr_cursor (SAVE); 4324 scr_cursor (SAVE);
4142 break; 4325 break;
… …
4207 break; 4390 break;
4208 case 1011: /* scroll to bottom on key press */ 4391 case 1011: /* scroll to bottom on key press */
4209 set_option (Opt_scrollTtyKeypress, state); 4392 set_option (Opt_scrollTtyKeypress, state);
4210 break; 4393 break;
4211 case 1047: /* secondary screen w/ clearing last */ 4394 case 1047: /* secondary screen w/ clearing last */
4212 if (OPTION (Opt_secondaryScreen)) 4395 if (option (Opt_secondaryScreen))
4213 if (current_screen != PRIMARY) 4396 if (current_screen != PRIMARY)
4214 scr_erase_screen (2); 4397 scr_erase_screen (2);
4215 scr_change_screen (state); 4398 scr_change_screen (state);
4216 break; 4399 break;
4217 case 1049: /* secondary screen w/ clearing first */ 4400 case 1049: /* secondary screen w/ clearing first */
4218 scr_change_screen (state); 4401 scr_change_screen (state);
4219 if (OPTION (Opt_secondaryScreen)) 4402 if (option (Opt_secondaryScreen))
4220 if (current_screen != PRIMARY) 4403 if (current_screen != PRIMARY)
4221 scr_erase_screen (2); 4404 scr_erase_screen (2);
4222 break; 4405 break;
4223 default: 4406 default:
4224 break; 4407 break;

Diff Legend

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