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.171 by root, Tue Jun 5 22:23:07 2012 UTC vs.
Revision 1.194 by root, Thu Jun 14 17:06:57 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
101 return c;
69} 102}
70 103
71///////////////////////////////////////////////////////////////////////////// 104/////////////////////////////////////////////////////////////////////////////
72 105
73static wchar_t * 106static wchar_t *
… …
341 PERL_SYS_TERM (); 374 PERL_SYS_TERM ();
342 } 375 }
343} 376}
344 377
345void 378void
346rxvt_perl_interp::init (rxvt_term *term) 379rxvt_perl_interp::init ()
347{ 380{
348 if (!perl) 381 if (!perl)
349 { 382 {
350 rxvt_push_locale (""); // perl init destroys current locale 383 rxvt_push_locale (""); // perl init destroys current locale
351 384
… …
381 } 414 }
382 } 415 }
383 416
384 rxvt_pop_locale (); 417 rxvt_pop_locale ();
385 } 418 }
419}
386 420
387 if (perl) 421void
422rxvt_perl_interp::init (rxvt_term *term)
423{
424 init ();
425
426 if (perl && !term->perl.self)
388 { 427 {
389 // runs outside of perls ENV 428 // runs outside of perls ENV
390 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term"); 429 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); 430 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); 431 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_selection", 10, newRV_noinc ((SV *)newAV ()), 0);
393 } 432 }
394} 433}
395 434
396void 435void
436rxvt_perl_interp::eval (const char *str)
437{
438 eval_pv (str, 1);
439}
440
441void
397rxvt_perl_interp::usage (rxvt_term *term, int type) 442rxvt_perl_interp::usage (rxvt_term *term, int type)
398{ 443{
399 localise_env set_environ (perl_environ); 444 localise_env set_environ (perl_environ);
400 445
401 ENTER; 446 ENTER;
402 SAVETMPS; 447 SAVETMPS;
403 448
404 dSP; 449 dSP;
450 PUSHMARK (SP);
405 EXTEND (SP, 2); 451 EXTEND (SP, 2);
406 PUSHs (sv_2mortal (newSVterm (term))); 452 PUSHs (sv_2mortal (newSVterm (term)));
407 PUSHs (sv_2mortal (newSViv (type))); 453 PUSHs (sv_2mortal (newSViv (type)));
408 PUTBACK; 454 PUTBACK;
409 call_pv ("urxvt::usage", G_VOID | G_DISCARD | G_EVAL); 455 call_pv ("urxvt::usage", G_VOID | G_DISCARD);
410 456
411 FREETMPS; 457 FREETMPS;
412 LEAVE; 458 LEAVE;
413} 459}
414 460
415uint8_t 461uint8_t
416rxvt_perl_interp::resource (rxvt_term *term, const char *name, bool arg, bool longopt, bool flag, const char *value) 462rxvt_perl_interp::parse_resource (rxvt_term *term, const char *name, bool arg, bool longopt, bool flag, const char *value)
417{ 463{
418 localise_env set_environ (perl_environ); 464 localise_env set_environ (perl_environ);
419 465
420 ENTER; 466 ENTER;
421 SAVETMPS; 467 SAVETMPS;
422 468
423 dSP; 469 dSP;
470 PUSHMARK (SP);
424 EXTEND (SP, 6); 471 EXTEND (SP, 6);
425 PUSHs (sv_2mortal (newSVterm (term))); 472 PUSHs (sv_2mortal (newSVterm (term)));
426 PUSHs (sv_2mortal (newSVpv (name, 0))); 473 PUSHs (sv_2mortal (newSVpv (name, 0)));
427 PUSHs (arg ? &PL_sv_yes : &PL_sv_no); 474 PUSHs (arg ? &PL_sv_yes : &PL_sv_no);
428 PUSHs (longopt ? &PL_sv_yes : &PL_sv_no); 475 PUSHs (longopt ? &PL_sv_yes : &PL_sv_no);
429 PUSHs (flag ? &PL_sv_yes : &PL_sv_no); 476 PUSHs (flag ? &PL_sv_yes : &PL_sv_no);
430 PUSHs (value ? sv_2mortal (newSVpv (value, 0)) : &PL_sv_undef); 477 PUSHs (value ? sv_2mortal (newSVpv (value, 0)) : &PL_sv_undef);
431 PUTBACK; 478 PUTBACK;
432 call_pv ("urxvt::resource", G_SCALAR | G_EVAL); 479 call_pv ("urxvt::parse_resource", G_SCALAR);
480 SPAGAIN;
433 481
434 uint8_t ret = POPi; 482 uint8_t ret = POPi;
435 483
436 FREETMPS; 484 FREETMPS;
437 LEAVE; 485 LEAVE;
… …
1061 if (count) 1109 if (count)
1062 THIS->get_window_origin (THIS->parent_x, THIS->parent_y); 1110 THIS->get_window_origin (THIS->parent_x, THIS->parent_y);
1063 } 1111 }
1064 } 1112 }
1065 1113
1114void
1115rxvt_term::put_option_db (octet_string specifier, octet_string value)
1116 CODE:
1117 XrmPutStringResource (&THIS->option_db, specifier, value);
1118
1066int 1119int
1067rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt) 1120rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)
1068 CODE: 1121 CODE:
1069 RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1, 1122 RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,
1070 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 1123 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
… …
2022} 2075}
2023 2076
2024############################################################################# 2077#############################################################################
2025# fancy bg bloatstuff (TODO: should be moved up somewhere) 2078# fancy bg bloatstuff (TODO: should be moved up somewhere)
2026 2079
2027# TODO: ugly 2080bool
2081rxvt_term::has_render ()
2082 CODE:
2083 RETVAL = THIS->display->flags & DISPLAY_HAS_RENDER;
2084 OUTPUT:
2085 RETVAL
2086
2028void 2087void
2029rxvt_term::get_geometry () 2088rxvt_term::background_geometry (bool border = false)
2030 PPCODE: 2089 PPCODE:
2031 EXTEND (SP, 4); 2090 EXTEND (SP, 4);
2032 PUSHs (sv_2mortal (newSViv (THIS->parent_x))); 2091 PUSHs (sv_2mortal (newSViv (THIS->parent_x + (border ? THIS->window_vt_x : 0))));
2033 PUSHs (sv_2mortal (newSViv (THIS->parent_y))); 2092 PUSHs (sv_2mortal (newSViv (THIS->parent_y + (border ? THIS->window_vt_y : 0))));
2034 PUSHs (sv_2mortal (newSViv (THIS->szHint.width))); 2093 PUSHs (sv_2mortal (newSViv (border ? THIS->vt_width : THIS->szHint.width )));
2035 PUSHs (sv_2mortal (newSViv (THIS->szHint.height))); 2094 PUSHs (sv_2mortal (newSViv (border ? THIS->vt_height : THIS->szHint.height)));
2036 2095
2037#if HAVE_IMG 2096#if HAVE_IMG
2038 2097
2039rxvt_img * 2098rxvt_img *
2040rxvt_term::new_img (SV *format, int width, int height) 2099rxvt_term::new_img (SV *format, int width = 1, int height = 1)
2041 CODE: 2100 CODE:
2042 XRenderPictFormat *f = SvOK (format) 2101 XRenderPictFormat *f = SvOK (format)
2043 ? XRenderFindStandardFormat (THIS->dpy, SvIV (format)) 2102 ? XRenderFindStandardFormat (THIS->dpy, SvIV (format))
2044 : XRenderFindVisualFormat (THIS->dpy, THIS->visual); 2103 : XRenderFindVisualFormat (THIS->dpy, THIS->visual);
2045 RETVAL = new rxvt_img (THIS, f, width, height); 2104 RETVAL = new rxvt_img (THIS, f, 0, 0, width, height);
2105 RETVAL->alloc ();
2046 OUTPUT: 2106 OUTPUT:
2047 RETVAL 2107 RETVAL
2048 2108
2049#if ENABLE_TRANSPARENCY 2109#if ENABLE_TRANSPARENCY
2050
2051#if 0
2052 2110
2053rxvt_img * 2111rxvt_img *
2054rxvt_term::new_img_from_root () 2112rxvt_term::new_img_from_root ()
2055 CODE: 2113 CODE:
2056 RETVAL = rxvt_img::new_from_root (THIS); 2114 RETVAL = rxvt_img::new_from_root (THIS);
2057 OUTPUT: 2115 OUTPUT:
2058 RETVAL 2116 RETVAL
2059 2117
2060#endif 2118#endif
2061 2119
2062#endif
2063
2064#if HAVE_PIXBUF 2120#if HAVE_PIXBUF
2065 2121
2066rxvt_img * 2122rxvt_img *
2067rxvt_term::new_img_from_file (octet_string filename) 2123rxvt_term::new_img_from_file (octet_string filename)
2068 CODE: 2124 CODE:
… …
2080#endif 2136#endif
2081 2137
2082#if HAVE_BG_PIXMAP 2138#if HAVE_BG_PIXMAP
2083 2139
2084void 2140void
2085rxvt_term::set_background (rxvt_img *img) 2141rxvt_term::set_background (rxvt_img *img, bool border = false)
2086 CODE: 2142 CODE:
2087 THIS->bg_destroy (); 2143 THIS->bg_destroy ();
2088 THIS->bg_pixmap = None; 2144 THIS->bg_flags &= ~(rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER | rxvt_term::BG_IS_TRANSPARENT);
2089 THIS->bg_flags &= ~rxvt_term::BG_NEEDS_REFRESH;
2090 2145
2091 if (img) // TODO: cannot be false 2146 if (img) // TODO: cannot be false
2092 { 2147 {
2148 img = img->clone (); // own the img
2149
2150 if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap
2151 img->sub_rect (0, 0,
2152 border ? THIS->vt_width : THIS->szHint.width,
2153 border ? THIS->vt_height : THIS->szHint.height)
2154 ->replace (img);
2155
2156 // just in case, should usually be a nop
2093 img->unshare (); 2157 img->reify ()
2094 THIS->bg_pixmap = img->steal (); 2158 ->replace (img);
2159
2160 img->convert_format (XRenderFindVisualFormat (THIS->dpy, THIS->visual), THIS->pix_colors [Color_bg])
2161 ->replace (img);
2162
2163 THIS->bg_img = img;
2164 THIS->bg_flags |= rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER;
2165
2166 if (!border)
2095 THIS->bg_flags |= rxvt_term::BG_NEEDS_REFRESH; 2167 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT;
2096 THIS->bg_valid_since = ev::now (); // TODO: extra bloat
2097 } 2168 }
2098 2169
2099#endif 2170#endif
2100 2171
2101#endif 2172#endif
… …
2153 CODE: 2224 CODE:
2154 RETVAL = THIS->h; 2225 RETVAL = THIS->h;
2155 OUTPUT: 2226 OUTPUT:
2156 RETVAL 2227 RETVAL
2157 2228
2158bool
2159rxvt_img::shared ()
2160 CODE:
2161 RETVAL = THIS->shared;
2162 OUTPUT:
2163 RETVAL
2164
2165Pixmap 2229Pixmap
2166rxvt_img::pm () 2230rxvt_img::pm ()
2167 CODE: 2231 CODE:
2168 RETVAL = THIS->pm; 2232 RETVAL = THIS->pm;
2169 OUTPUT: 2233 OUTPUT:
2170 RETVAL 2234 RETVAL
2171 2235
2172void 2236void
2173rxvt_img::fill (SV *c) 2237rxvt_img::fill (SV *c)
2174 INIT: 2238 INIT:
2175 rxvt_color rc; 2239 rgba cc = parse_rgba (c, THIS->s);
2176 parse_color (THIS->s, rc, c);
2177 C_ARGS: rc 2240 C_ARGS: cc
2178 2241
2179void 2242void
2180rxvt_img::DESTROY () 2243rxvt_img::DESTROY ()
2181 CODE: 2244 CODE:
2182 delete THIS; 2245 delete THIS;
2246
2247void
2248rxvt_img::unshare ()
2249
2250int
2251rxvt_img::repeat_mode (render_repeat_mode repeat = 0)
2252 CODE:
2253 if (items >= 2)
2254 THIS->repeat_mode (repeat);
2255 if (GIMME_V != G_VOID)
2256 XPUSHs (sv_2mortal (newSViv (THIS->repeat)));
2257
2258void
2259rxvt_img::move (int dx, int dy)
2260
2261void
2262rxvt_img::brightness (NV r, NV g, NV b, NV a = 1.)
2263
2264void
2265rxvt_img::contrast (NV r, NV g, NV b, NV a = 1.)
2266
2267rxvt_img *
2268rxvt_img::clone ()
2269
2270rxvt_img *
2271rxvt_img::reify ()
2272
2273rxvt_img *
2274rxvt_img::sub_rect (int x, int y, int width, int height)
2183 2275
2184rxvt_img * 2276rxvt_img *
2185rxvt_img::blur (int rh, int rv) 2277rxvt_img::blur (int rh, int rv)
2186 2278
2187void
2188rxvt_img::brightness (NV r, NV g, NV b, NV a = 1.)
2189
2190void
2191rxvt_img::contrast (NV r, NV g, NV b, NV a = 1.)
2192
2193void
2194rxvt_img::unshare ()
2195
2196rxvt_img * 2279rxvt_img *
2197rxvt_img::clone () 2280rxvt_img::transform (NV p11, NV p12, NV p13, NV p21, NV p22, NV p23, NV p31, NV p32, NV p33)
2198
2199rxvt_img *
2200rxvt_img::sub_rect (int x, int y, int width, int height, render_repeat_mode repeat = RepeatNormal)
2201
2202rxvt_img *
2203rxvt_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, render_repeat_mode repeat = RepeatNormal)
2204 INIT: 2281 INIT:
2205 double matrix[9] = { 2282 double matrix[3][3] = {
2206 p11, p12, p13, 2283 { p11, p12, p13 },
2207 p21, p22, p23, 2284 { p21, p22, p23 },
2208 p31, p32, p33 2285 { p31, p32, p33 }
2209 }; 2286 };
2210 C_ARGS: new_width, new_height, matrix, repeat 2287 C_ARGS: matrix
2211 2288
2212rxvt_img * 2289rxvt_img *
2213rxvt_img::scale (int new_width, int new_height) 2290rxvt_img::scale (int new_width, int new_height)
2214 2291
2215rxvt_img * 2292rxvt_img *
2216rxvt_img::rotate (int new_width, int new_height, int x, int y, NV phi, render_repeat_mode repeat = RepeatNormal) 2293rxvt_img::rotate (int x, int y, NV phi)
2217 2294
2218#endif 2295#endif
2219 2296

Diff Legend

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