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

Comparing rxvt-unicode/src/rxvtperl.xs (file contents):
Revision 1.185 by root, Thu Jun 7 17:30:33 2012 UTC vs.
Revision 1.191 by root, Sun Jun 10 15:01:14 2012 UTC

… …
54typedef char * octet_string; 54typedef char * octet_string;
55typedef char * utf8_string; 55typedef char * utf8_string;
56 56
57typedef int render_repeat_mode; 57typedef int render_repeat_mode;
58 58
59#if HAVE_PIXBUF
59typedef GdkPixbuf * urxvt__pixbuf; 60typedef GdkPixbuf * urxvt__pixbuf;
61#endif
60typedef rxvt_img * urxvt__img; 62typedef rxvt_img * urxvt__img;
61 63
62///////////////////////////////////////////////////////////////////////////// 64/////////////////////////////////////////////////////////////////////////////
63 65
64static void 66static void
65parse_color (rxvt_screen *s, rxvt_color &c, SV *sv) 67parse_color (rxvt_screen *s, rxvt_color &c, SV *sv)
66{ 68{
67 //TODO: support component stuff 69 //TODO: support component stuff, 0..1
68 c.set (s, SvPVbyte_nolen (sv)); 70 c.set (s, SvPVbyte_nolen (sv));
69} 71}
70 72
71///////////////////////////////////////////////////////////////////////////// 73/////////////////////////////////////////////////////////////////////////////
72 74
… …
2030} 2032}
2031 2033
2032############################################################################# 2034#############################################################################
2033# fancy bg bloatstuff (TODO: should be moved up somewhere) 2035# fancy bg bloatstuff (TODO: should be moved up somewhere)
2034 2036
2037bool
2038rxvt_term::has_render ()
2039 CODE:
2040 RETVAL = THIS->display->flags & DISPLAY_HAS_RENDER;
2041 OUTPUT:
2042 RETVAL
2043
2035# TODO: ugly 2044# TODO: ugly
2036void 2045void
2037rxvt_term::background_geometry (bool border = false) 2046rxvt_term::background_geometry (bool border = false)
2038 PPCODE: 2047 PPCODE:
2039 EXTEND (SP, 4); 2048 EXTEND (SP, 4);
… …
2042 PUSHs (sv_2mortal (newSViv (border ? THIS->vt_width : THIS->szHint.width ))); 2051 PUSHs (sv_2mortal (newSViv (border ? THIS->vt_width : THIS->szHint.width )));
2043 PUSHs (sv_2mortal (newSViv (border ? THIS->vt_height : THIS->szHint.height))); 2052 PUSHs (sv_2mortal (newSViv (border ? THIS->vt_height : THIS->szHint.height)));
2044 2053
2045#if HAVE_IMG 2054#if HAVE_IMG
2046 2055
2047#if 0
2048
2049rxvt_img * 2056rxvt_img *
2050rxvt_term::new_img (SV *format, int width, int height) 2057rxvt_term::new_img (SV *format, int width = 1, int height = 1)
2051 CODE: 2058 CODE:
2052 XRenderPictFormat *f = SvOK (format) 2059 XRenderPictFormat *f = SvOK (format)
2053 ? XRenderFindStandardFormat (THIS->dpy, SvIV (format)) 2060 ? XRenderFindStandardFormat (THIS->dpy, SvIV (format))
2054 : XRenderFindVisualFormat (THIS->dpy, THIS->visual); 2061 : XRenderFindVisualFormat (THIS->dpy, THIS->visual);
2055 RETVAL = new rxvt_img (THIS, f, width, height); 2062 RETVAL = new rxvt_img (THIS, f, 0, 0, width, height);
2063 RETVAL->alloc ();
2056 OUTPUT: 2064 OUTPUT:
2057 RETVAL 2065 RETVAL
2058
2059#endif
2060 2066
2061#if ENABLE_TRANSPARENCY 2067#if ENABLE_TRANSPARENCY
2062 2068
2063rxvt_img * 2069rxvt_img *
2064rxvt_term::new_img_from_root () 2070rxvt_term::new_img_from_root ()
… …
2091 2097
2092void 2098void
2093rxvt_term::set_background (rxvt_img *img, bool border = false) 2099rxvt_term::set_background (rxvt_img *img, bool border = false)
2094 CODE: 2100 CODE:
2095 THIS->bg_destroy (); 2101 THIS->bg_destroy ();
2096 THIS->bg_pixmap = None;
2097 THIS->bg_flags &= ~(rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER | rxvt_term::BG_IS_TRANSPARENT); 2102 THIS->bg_flags &= ~(rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER | rxvt_term::BG_IS_TRANSPARENT);
2098 2103
2099 if (img) // TODO: cannot be false 2104 if (img) // TODO: cannot be false
2100 { 2105 {
2101 img = img->clone (); // own the img 2106 img = img->clone (); // own the img
2102 2107
2103 {
2104 rxvt_img *img2 = img->convert_format (XRenderFindVisualFormat (THIS->dpy, THIS->visual), THIS->pix_colors [Color_bg]);
2105 delete img;
2106 img = img2;
2107 }
2108
2109 if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap 2108 if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap
2110 {
2111 rxvt_img *img2 = img->sub_rect (0, 0, 2109 img->sub_rect (0, 0,
2112 border ? THIS->vt_width : THIS->szHint.width, 2110 border ? THIS->vt_width : THIS->szHint.width,
2113 border ? THIS->vt_height : THIS->szHint.height); 2111 border ? THIS->vt_height : THIS->szHint.height)
2114 delete img; 2112 ->replace (img);
2115 img = img2;
2116 }
2117 2113
2118 {
2119 // just in case, should usually be a nop 2114 // just in case, should usually be a nop
2120 rxvt_img *img2 = img->reify (); 2115 img->reify ()
2121 delete img; 2116 ->replace (img);
2117
2118 img->convert_format (XRenderFindVisualFormat (THIS->dpy, THIS->visual), THIS->pix_colors [Color_bg])
2119 ->replace (img);
2120
2122 img = img2; 2121 THIS->bg_img = img;
2123 }
2124
2125 THIS->bg_pixmap = img->steal ();
2126 THIS->bg_flags |= rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER; 2122 THIS->bg_flags |= rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER;
2127 2123
2128 if (!border) 2124 if (!border)
2129 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT; 2125 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT;
2130
2131 delete img;
2132 } 2126 }
2133 2127
2134#endif 2128#endif
2135 2129
2136#endif 2130#endif

Diff Legend

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