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.183 by root, Thu Jun 7 17:04:33 2012 UTC vs.
Revision 1.196 by root, Thu Jun 14 18:13:19 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 rgba
65parse_color (rxvt_screen *s, rxvt_color &c, SV *sv) 67parse_rgba (SV *sv, rxvt_screen *s = 0)
66{ 68{
67 //TODO: support component stuff 69 rgba c;
70
71 if (AV *av = (AV *)SvRV (sv))
72 {
73 if (SvTYPE ((SV *)av) != SVt_PVAV)
74 croak ("colour must be either a colour string, or an array,");
75
76 int len = av_len (av) + 1;
77
78 if (len != 1 && len != 3 && len != 4)
79 croak ("component colour array must have 1, 3 or 4 components,");
80
81 c.a = rgba::MAX_CC;
82
83 c.r = c.g = c.b = float_to_component (SvIV (*av_fetch (av, 0, 0)));
84
85 if (len >= 3)
86 {
87 c.g = float_to_component (SvIV (*av_fetch (av, 1, 0)));
88 c.b = float_to_component (SvIV (*av_fetch (av, 2, 0)));
89
90 if (len >= 4)
91 c.a = float_to_component (SvIV (*av_fetch (av, 3, 0)));
92 }
93 }
94 else if (s)
95 {
96 rxvt_color rc;
68 c.set (s, SvPVbyte_nolen (sv)); 97 rc.set (s, SvPVbyte_nolen (sv));
98 rc.get (c);
99 }
100 else
101 croak ("unable to parse colour,");
102
103 return c;
69} 104}
70 105
71///////////////////////////////////////////////////////////////////////////// 106/////////////////////////////////////////////////////////////////////////////
72 107
73static wchar_t * 108static wchar_t *
… …
341 PERL_SYS_TERM (); 376 PERL_SYS_TERM ();
342 } 377 }
343} 378}
344 379
345void 380void
346rxvt_perl_interp::init (rxvt_term *term) 381rxvt_perl_interp::init ()
347{ 382{
348 if (!perl) 383 if (!perl)
349 { 384 {
350 rxvt_push_locale (""); // perl init destroys current locale 385 rxvt_push_locale (""); // perl init destroys current locale
351 386
… …
381 } 416 }
382 } 417 }
383 418
384 rxvt_pop_locale (); 419 rxvt_pop_locale ();
385 } 420 }
421}
422
423void
424rxvt_perl_interp::init (rxvt_term *term)
425{
426 init ();
386 427
387 if (perl && !term->perl.self) 428 if (perl && !term->perl.self)
388 { 429 {
389 // runs outside of perls ENV 430 // runs outside of perls ENV
390 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term"); 431 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term");
391 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newAV ()), 0); 432 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newAV ()), 0);
392 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_selection", 10, newRV_noinc ((SV *)newAV ()), 0); 433 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_selection", 10, newRV_noinc ((SV *)newAV ()), 0);
393 } 434 }
435}
436
437void
438rxvt_perl_interp::eval (const char *str)
439{
440 eval_pv (str, 1);
394} 441}
395 442
396void 443void
397rxvt_perl_interp::usage (rxvt_term *term, int type) 444rxvt_perl_interp::usage (rxvt_term *term, int type)
398{ 445{
… …
2030} 2077}
2031 2078
2032############################################################################# 2079#############################################################################
2033# fancy bg bloatstuff (TODO: should be moved up somewhere) 2080# fancy bg bloatstuff (TODO: should be moved up somewhere)
2034 2081
2035# TODO: ugly 2082bool
2083rxvt_term::has_render ()
2084 CODE:
2085 RETVAL = THIS->display->flags & DISPLAY_HAS_RENDER;
2086 OUTPUT:
2087 RETVAL
2088
2036void 2089void
2037rxvt_term::background_geometry (bool border = false) 2090rxvt_term::background_geometry (bool border = false)
2038 PPCODE: 2091 PPCODE:
2039 EXTEND (SP, 4); 2092 EXTEND (SP, 4);
2040 PUSHs (sv_2mortal (newSViv (THIS->parent_x + (border ? THIS->window_vt_x : 0)))); 2093 PUSHs (sv_2mortal (newSViv (THIS->parent_x + (border ? THIS->window_vt_x : 0))));
… …
2042 PUSHs (sv_2mortal (newSViv (border ? THIS->vt_width : THIS->szHint.width ))); 2095 PUSHs (sv_2mortal (newSViv (border ? THIS->vt_width : THIS->szHint.width )));
2043 PUSHs (sv_2mortal (newSViv (border ? THIS->vt_height : THIS->szHint.height))); 2096 PUSHs (sv_2mortal (newSViv (border ? THIS->vt_height : THIS->szHint.height)));
2044 2097
2045#if HAVE_IMG 2098#if HAVE_IMG
2046 2099
2047#if 0
2048
2049rxvt_img * 2100rxvt_img *
2050rxvt_term::new_img (SV *format, int width, int height) 2101rxvt_term::new_img (SV *format, int x = 0, int y = 0, int width = 1, int height = 1)
2051 CODE: 2102 CODE:
2052 XRenderPictFormat *f = SvOK (format) 2103 XRenderPictFormat *f = SvOK (format)
2053 ? XRenderFindStandardFormat (THIS->dpy, SvIV (format)) 2104 ? XRenderFindStandardFormat (THIS->dpy, SvIV (format))
2054 : XRenderFindVisualFormat (THIS->dpy, THIS->visual); 2105 : XRenderFindVisualFormat (THIS->dpy, THIS->visual);
2055 RETVAL = new rxvt_img (THIS, f, width, height); 2106 RETVAL = new rxvt_img (THIS, f, x, y, width, height);
2107 RETVAL->alloc ();
2056 OUTPUT: 2108 OUTPUT:
2057 RETVAL 2109 RETVAL
2058
2059#endif
2060 2110
2061#if ENABLE_TRANSPARENCY 2111#if ENABLE_TRANSPARENCY
2062 2112
2063rxvt_img * 2113rxvt_img *
2064rxvt_term::new_img_from_root () 2114rxvt_term::new_img_from_root ()
… …
2091 2141
2092void 2142void
2093rxvt_term::set_background (rxvt_img *img, bool border = false) 2143rxvt_term::set_background (rxvt_img *img, bool border = false)
2094 CODE: 2144 CODE:
2095 THIS->bg_destroy (); 2145 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); 2146 THIS->bg_flags &= ~(rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER | rxvt_term::BG_IS_TRANSPARENT);
2098 2147
2099 if (img) // TODO: cannot be false 2148 if (img) // TODO: cannot be false
2100 { 2149 {
2101 img = img->clone (); // own the img 2150 img = img->clone (); // own the img
2102 2151
2103 if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap 2152 if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap
2104 {
2105 rxvt_img *img2 = img->sub_rect (0, 0, 2153 img->sub_rect (0, 0,
2106 border ? THIS->vt_width : THIS->szHint.width, 2154 border ? THIS->vt_width : THIS->szHint.width,
2107 border ? THIS->vt_height : THIS->szHint.height); 2155 border ? THIS->vt_height : THIS->szHint.height)
2156 ->replace (img);
2157
2158 // just in case, should usually be a nop
2159 img->reify ()
2108 delete img; 2160 ->replace (img);
2109 img = img2;
2110 }
2111 2161
2112 {
2113 rxvt_img *img2 = img->convert_to (XRenderFindVisualFormat (THIS->dpy, THIS->visual), THIS->pix_colors [Color_bg]); 2162 img->convert_format (XRenderFindVisualFormat (THIS->dpy, THIS->visual), THIS->pix_colors [Color_bg])
2114 delete img; 2163 ->replace (img);
2164
2115 img = img2; 2165 THIS->bg_img = img;
2116 }
2117
2118 THIS->bg_pixmap = img->steal ();
2119 THIS->bg_flags |= rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER; 2166 THIS->bg_flags |= rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER;
2120 2167
2121 if (!border) 2168 if (!border)
2122 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT; 2169 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT;
2123
2124 delete img;
2125 } 2170 }
2126 2171
2127#endif 2172#endif
2128 2173
2129#endif 2174#endif
… …
2167#if HAVE_IMG 2212#if HAVE_IMG
2168 2213
2169# rxvt_img *new (rxvt_screen *screen, XRenderPictFormat *format, int width, int height) 2214# rxvt_img *new (rxvt_screen *screen, XRenderPictFormat *format, int width, int height)
2170# rxvt_img *rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int width, int height, Pixmap pixmap); 2215# rxvt_img *rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int width, int height, Pixmap pixmap);
2171 2216
2217void
2218rxvt_img::geometry ()
2219 PPCODE:
2220 EXTEND (SP, 4);
2221 PUSHs (sv_2mortal (newSViv (THIS->x)));
2222 PUSHs (sv_2mortal (newSViv (THIS->y)));
2223 PUSHs (sv_2mortal (newSViv (THIS->w)));
2224 PUSHs (sv_2mortal (newSViv (THIS->h)));
2225
2226int
2227rxvt_img::x ()
2228 CODE:
2229 RETVAL = THIS->x;
2230 OUTPUT:
2231 RETVAL
2232
2233int
2234rxvt_img::y ()
2235 CODE:
2236 RETVAL = THIS->y;
2237 OUTPUT:
2238 RETVAL
2239
2172int 2240int
2173rxvt_img::w () 2241rxvt_img::w ()
2174 CODE: 2242 CODE:
2175 RETVAL = THIS->w; 2243 RETVAL = THIS->w;
2176 OUTPUT: 2244 OUTPUT:
… …
2191 RETVAL 2259 RETVAL
2192 2260
2193void 2261void
2194rxvt_img::fill (SV *c) 2262rxvt_img::fill (SV *c)
2195 INIT: 2263 INIT:
2196 rxvt_color rc; 2264 rgba cc = parse_rgba (c, THIS->s);
2197 parse_color (THIS->s, rc, c);
2198 C_ARGS: rc 2265 C_ARGS: cc
2199 2266
2200void 2267void
2201rxvt_img::DESTROY () 2268rxvt_img::DESTROY ()
2202 CODE: 2269 CODE:
2203 delete THIS; 2270 delete THIS;
… …
2233 2300
2234rxvt_img * 2301rxvt_img *
2235rxvt_img::blur (int rh, int rv) 2302rxvt_img::blur (int rh, int rv)
2236 2303
2237rxvt_img * 2304rxvt_img *
2238rxvt_img::transform (int new_width, int new_height, NV p11, NV p12, NV p13, NV p21, NV p22, NV p23, NV p31, NV p32, NV p33) 2305rxvt_img::transform (NV p11, NV p12, NV p13, NV p21, NV p22, NV p23, NV p31, NV p32, NV p33)
2239 INIT: 2306 INIT:
2240 double matrix[9] = { 2307 double matrix[3][3] = {
2241 p11, p12, p13, 2308 { p11, p12, p13 },
2242 p21, p22, p23, 2309 { p21, p22, p23 },
2243 p31, p32, p33 2310 { p31, p32, p33 }
2244 }; 2311 };
2245 C_ARGS: new_width, new_height, matrix 2312 C_ARGS: matrix
2246 2313
2247rxvt_img * 2314rxvt_img *
2248rxvt_img::scale (int new_width, int new_height) 2315rxvt_img::scale (int new_width, int new_height)
2249 2316
2250rxvt_img * 2317rxvt_img *
2251rxvt_img::rotate (int new_width, int new_height, int x, int y, NV phi) 2318rxvt_img::rotate (int x, int y, NV phi)
2252 2319
2253#endif 2320#endif
2254 2321

Diff Legend

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