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.189 by root, Sun Jun 10 10:29:26 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
2042 PUSHs (sv_2mortal (newSViv (border ? THIS->vt_width : THIS->szHint.width ))); 2044 PUSHs (sv_2mortal (newSViv (border ? THIS->vt_width : THIS->szHint.width )));
2043 PUSHs (sv_2mortal (newSViv (border ? THIS->vt_height : THIS->szHint.height))); 2045 PUSHs (sv_2mortal (newSViv (border ? THIS->vt_height : THIS->szHint.height)));
2044 2046
2045#if HAVE_IMG 2047#if HAVE_IMG
2046 2048
2047#if 0
2048
2049rxvt_img * 2049rxvt_img *
2050rxvt_term::new_img (SV *format, int width, int height) 2050rxvt_term::new_img (SV *format, int width = 1, int height = 1)
2051 CODE: 2051 CODE:
2052 XRenderPictFormat *f = SvOK (format) 2052 XRenderPictFormat *f = SvOK (format)
2053 ? XRenderFindStandardFormat (THIS->dpy, SvIV (format)) 2053 ? XRenderFindStandardFormat (THIS->dpy, SvIV (format))
2054 : XRenderFindVisualFormat (THIS->dpy, THIS->visual); 2054 : XRenderFindVisualFormat (THIS->dpy, THIS->visual);
2055 RETVAL = new rxvt_img (THIS, f, width, height); 2055 RETVAL = new rxvt_img (THIS, f, 0, 0, width, height);
2056 RETVAL->alloc ();
2056 OUTPUT: 2057 OUTPUT:
2057 RETVAL 2058 RETVAL
2058
2059#endif
2060 2059
2061#if ENABLE_TRANSPARENCY 2060#if ENABLE_TRANSPARENCY
2062 2061
2063rxvt_img * 2062rxvt_img *
2064rxvt_term::new_img_from_root () 2063rxvt_term::new_img_from_root ()
2098 2097
2099 if (img) // TODO: cannot be false 2098 if (img) // TODO: cannot be false
2100 { 2099 {
2101 img = img->clone (); // own the img 2100 img = img->clone (); // own the img
2102 2101
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 2102 if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap
2110 {
2111 rxvt_img *img2 = img->sub_rect (0, 0, 2103 img->sub_rect (0, 0,
2112 border ? THIS->vt_width : THIS->szHint.width, 2104 border ? THIS->vt_width : THIS->szHint.width,
2113 border ? THIS->vt_height : THIS->szHint.height); 2105 border ? THIS->vt_height : THIS->szHint.height)
2114 delete img; 2106 ->replace (img);
2115 img = img2;
2116 }
2117 2107
2118 {
2119 // just in case, should usually be a nop 2108 // just in case, should usually be a nop
2120 rxvt_img *img2 = img->reify (); 2109 img->reify ()
2121 delete img; 2110 ->replace (img);
2122 img = img2; 2111
2123 } 2112 img->convert_format (XRenderFindVisualFormat (THIS->dpy, THIS->visual), THIS->pix_colors [Color_bg])
2113 ->replace (img);
2124 2114
2125 THIS->bg_pixmap = img->steal (); 2115 THIS->bg_pixmap = img->steal ();
2126 THIS->bg_flags |= rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER; 2116 THIS->bg_flags |= rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER;
2127 2117
2128 if (!border) 2118 if (!border)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines