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.197 by root, Thu Jun 14 18:19:11 2012 UTC

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

Diff Legend

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