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.189 by root, Sun Jun 10 10:29:26 2012 UTC vs.
Revision 1.196 by root, Thu Jun 14 18:13:19 2012 UTC

… …
61#endif 61#endif
62typedef rxvt_img * urxvt__img; 62typedef rxvt_img * urxvt__img;
63 63
64///////////////////////////////////////////////////////////////////////////// 64/////////////////////////////////////////////////////////////////////////////
65 65
66static void 66static rgba
67parse_color (rxvt_screen *s, rxvt_color &c, SV *sv) 67parse_rgba (SV *sv, rxvt_screen *s = 0)
68{ 68{
69 //TODO: support component stuff, 0..1 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;
70 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;
71} 104}
72 105
73///////////////////////////////////////////////////////////////////////////// 106/////////////////////////////////////////////////////////////////////////////
74 107
75static wchar_t * 108static wchar_t *
… …
343 PERL_SYS_TERM (); 376 PERL_SYS_TERM ();
344 } 377 }
345} 378}
346 379
347void 380void
348rxvt_perl_interp::init (rxvt_term *term) 381rxvt_perl_interp::init ()
349{ 382{
350 if (!perl) 383 if (!perl)
351 { 384 {
352 rxvt_push_locale (""); // perl init destroys current locale 385 rxvt_push_locale (""); // perl init destroys current locale
353 386
… …
383 } 416 }
384 } 417 }
385 418
386 rxvt_pop_locale (); 419 rxvt_pop_locale ();
387 } 420 }
421}
422
423void
424rxvt_perl_interp::init (rxvt_term *term)
425{
426 init ();
388 427
389 if (perl && !term->perl.self) 428 if (perl && !term->perl.self)
390 { 429 {
391 // runs outside of perls ENV 430 // runs outside of perls ENV
392 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term"); 431 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term");
393 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);
394 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);
395 } 434 }
435}
436
437void
438rxvt_perl_interp::eval (const char *str)
439{
440 eval_pv (str, 1);
396} 441}
397 442
398void 443void
399rxvt_perl_interp::usage (rxvt_term *term, int type) 444rxvt_perl_interp::usage (rxvt_term *term, int type)
400{ 445{
… …
2032} 2077}
2033 2078
2034############################################################################# 2079#############################################################################
2035# fancy bg bloatstuff (TODO: should be moved up somewhere) 2080# fancy bg bloatstuff (TODO: should be moved up somewhere)
2036 2081
2037# TODO: ugly 2082bool
2083rxvt_term::has_render ()
2084 CODE:
2085 RETVAL = THIS->display->flags & DISPLAY_HAS_RENDER;
2086 OUTPUT:
2087 RETVAL
2088
2038void 2089void
2039rxvt_term::background_geometry (bool border = false) 2090rxvt_term::background_geometry (bool border = false)
2040 PPCODE: 2091 PPCODE:
2041 EXTEND (SP, 4); 2092 EXTEND (SP, 4);
2042 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))));
… …
2045 PUSHs (sv_2mortal (newSViv (border ? THIS->vt_height : THIS->szHint.height))); 2096 PUSHs (sv_2mortal (newSViv (border ? THIS->vt_height : THIS->szHint.height)));
2046 2097
2047#if HAVE_IMG 2098#if HAVE_IMG
2048 2099
2049rxvt_img * 2100rxvt_img *
2050rxvt_term::new_img (SV *format, int width = 1, int height = 1) 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, 0, 0, width, height); 2106 RETVAL = new rxvt_img (THIS, f, x, y, width, height);
2056 RETVAL->alloc (); 2107 RETVAL->alloc ();
2057 OUTPUT: 2108 OUTPUT:
2058 RETVAL 2109 RETVAL
2059 2110
2060#if ENABLE_TRANSPARENCY 2111#if ENABLE_TRANSPARENCY
… …
2090 2141
2091void 2142void
2092rxvt_term::set_background (rxvt_img *img, bool border = false) 2143rxvt_term::set_background (rxvt_img *img, bool border = false)
2093 CODE: 2144 CODE:
2094 THIS->bg_destroy (); 2145 THIS->bg_destroy ();
2095 THIS->bg_pixmap = None;
2096 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);
2097 2147
2098 if (img) // TODO: cannot be false 2148 if (img) // TODO: cannot be false
2099 { 2149 {
2100 img = img->clone (); // own the img 2150 img = img->clone (); // own the img
… …
2110 ->replace (img); 2160 ->replace (img);
2111 2161
2112 img->convert_format (XRenderFindVisualFormat (THIS->dpy, THIS->visual), THIS->pix_colors [Color_bg]) 2162 img->convert_format (XRenderFindVisualFormat (THIS->dpy, THIS->visual), THIS->pix_colors [Color_bg])
2113 ->replace (img); 2163 ->replace (img);
2114 2164
2115 THIS->bg_pixmap = img->steal (); 2165 THIS->bg_img = img;
2116 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;
2117 2167
2118 if (!border) 2168 if (!border)
2119 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT; 2169 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT;
2120
2121 delete img;
2122 } 2170 }
2123 2171
2124#endif 2172#endif
2125 2173
2126#endif 2174#endif
… …
2164#if HAVE_IMG 2212#if HAVE_IMG
2165 2213
2166# 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)
2167# 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);
2168 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
2169int 2240int
2170rxvt_img::w () 2241rxvt_img::w ()
2171 CODE: 2242 CODE:
2172 RETVAL = THIS->w; 2243 RETVAL = THIS->w;
2173 OUTPUT: 2244 OUTPUT:
… …
2188 RETVAL 2259 RETVAL
2189 2260
2190void 2261void
2191rxvt_img::fill (SV *c) 2262rxvt_img::fill (SV *c)
2192 INIT: 2263 INIT:
2193 rxvt_color rc; 2264 rgba cc = parse_rgba (c, THIS->s);
2194 parse_color (THIS->s, rc, c);
2195 C_ARGS: rc 2265 C_ARGS: cc
2196 2266
2197void 2267void
2198rxvt_img::DESTROY () 2268rxvt_img::DESTROY ()
2199 CODE: 2269 CODE:
2200 delete THIS; 2270 delete THIS;
… …
2230 2300
2231rxvt_img * 2301rxvt_img *
2232rxvt_img::blur (int rh, int rv) 2302rxvt_img::blur (int rh, int rv)
2233 2303
2234rxvt_img * 2304rxvt_img *
2235rxvt_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)
2236 INIT: 2306 INIT:
2237 double matrix[9] = { 2307 double matrix[3][3] = {
2238 p11, p12, p13, 2308 { p11, p12, p13 },
2239 p21, p22, p23, 2309 { p21, p22, p23 },
2240 p31, p32, p33 2310 { p31, p32, p33 }
2241 }; 2311 };
2242 C_ARGS: new_width, new_height, matrix 2312 C_ARGS: matrix
2243 2313
2244rxvt_img * 2314rxvt_img *
2245rxvt_img::scale (int new_width, int new_height) 2315rxvt_img::scale (int new_width, int new_height)
2246 2316
2247rxvt_img * 2317rxvt_img *
2248rxvt_img::rotate (int new_width, int new_height, int x, int y, NV phi) 2318rxvt_img::rotate (int x, int y, NV phi)
2249 2319
2250#endif 2320#endif
2251 2321

Diff Legend

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