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.188 by sf-exg, Sat Jun 9 17:28:03 2012 UTC vs.
Revision 1.216 by root, Thu Oct 3 01:11:38 2013 UTC

… …
57typedef int render_repeat_mode; 57typedef int render_repeat_mode;
58 58
59#if HAVE_PIXBUF 59#if HAVE_PIXBUF
60typedef GdkPixbuf * urxvt__pixbuf; 60typedef GdkPixbuf * urxvt__pixbuf;
61#endif 61#endif
62#if HAVE_IMG
62typedef rxvt_img * urxvt__img; 63typedef rxvt_img * urxvt__img;
64typedef rxvt_img::nv rxvt_img__nv;
63 65
64///////////////////////////////////////////////////////////////////////////// 66/////////////////////////////////////////////////////////////////////////////
65 67
66static void 68static rgba
67parse_color (rxvt_screen *s, rxvt_color &c, SV *sv) 69parse_rgba (SV *sv, rxvt_screen *s = 0)
68{ 70{
69 //TODO: support component stuff 71 rgba c;
72
73 if (SvROK (sv))
74 {
75 AV *av = (AV *)SvRV (sv);
76
77 if (SvTYPE ((SV *)av) != SVt_PVAV)
78 croak ("colour must be either a colour string, or an array,");
79
80 int len = av_len (av) + 1;
81
82 if (len != 1 && len != 3 && len != 4)
83 croak ("component colour array must have 1, 3 or 4 components,");
84
85 c.a = rgba::MAX_CC;
86
87 c.r = c.g = c.b = float_to_component (SvIV (*av_fetch (av, 0, 0)));
88
89 if (len >= 3)
90 {
91 c.g = float_to_component (SvIV (*av_fetch (av, 1, 0)));
92 c.b = float_to_component (SvIV (*av_fetch (av, 2, 0)));
93
94 if (len >= 4)
95 c.a = float_to_component (SvIV (*av_fetch (av, 3, 0)));
96 }
97 }
98 else if (s)
99 {
100 rxvt_color rc;
70 c.set (s, SvPVbyte_nolen (sv)); 101 rc.set (s, SvPVbyte_nolen (sv));
102 rc.get (c);
103 }
104 else
105 croak ("unable to parse colour,");
106
107 return c;
71} 108}
72 109
73///////////////////////////////////////////////////////////////////////////// 110/////////////////////////////////////////////////////////////////////////////
111#endif
74 112
75static wchar_t * 113static wchar_t *
76sv2wcs (SV *sv) 114sv2wcs (SV *sv)
77{ 115{
78 STRLEN len; 116 STRLEN len;
… …
343 PERL_SYS_TERM (); 381 PERL_SYS_TERM ();
344 } 382 }
345} 383}
346 384
347void 385void
348rxvt_perl_interp::init (rxvt_term *term) 386rxvt_perl_interp::init ()
349{ 387{
350 if (!perl) 388 if (!perl)
351 { 389 {
352 rxvt_push_locale (""); // perl init destroys current locale 390 rxvt_push_locale (""); // perl init destroys current locale
353 391
… …
383 } 421 }
384 } 422 }
385 423
386 rxvt_pop_locale (); 424 rxvt_pop_locale ();
387 } 425 }
426}
427
428void
429rxvt_perl_interp::init (rxvt_term *term)
430{
431 init ();
388 432
389 if (perl && !term->perl.self) 433 if (perl && !term->perl.self)
390 { 434 {
391 // runs outside of perls ENV 435 // runs outside of perls ENV
392 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term"); 436 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); 437 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); 438 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_selection", 10, newRV_noinc ((SV *)newAV ()), 0);
395 } 439 }
440}
441
442void
443rxvt_perl_interp::eval (const char *str)
444{
445 eval_pv (str, 1);
396} 446}
397 447
398void 448void
399rxvt_perl_interp::usage (rxvt_term *term, int type) 449rxvt_perl_interp::usage (rxvt_term *term, int type)
400{ 450{
… …
762 const_iv (RS_Bold), 812 const_iv (RS_Bold),
763 const_iv (RS_Italic), 813 const_iv (RS_Italic),
764 const_iv (RS_Blink), 814 const_iv (RS_Blink),
765 const_iv (RS_RVid), 815 const_iv (RS_RVid),
766 const_iv (RS_Uline), 816 const_iv (RS_Uline),
817
818 // TODO: should support all colour constants, create colorinc.h &c
819 const_iv (Color_fg),
820 const_iv (Color_bg),
821 const_iv (Color_fade),
822 const_iv (Color_pointer_fg),
823 const_iv (Color_pointer_bg),
824 const_iv (Color_border),
825 const_iv (NRS_COLORS),
826 const_iv (TOTAL_COLORS),
767 827
768 const_iv (CurrentTime), 828 const_iv (CurrentTime),
769 const_iv (ShiftMask), 829 const_iv (ShiftMask),
770 const_iv (LockMask), 830 const_iv (LockMask),
771 const_iv (ControlMask), 831 const_iv (ControlMask),
… …
863 const_iv (PictStandardA1), 923 const_iv (PictStandardA1),
864 const_iv (RepeatNone), 924 const_iv (RepeatNone),
865 const_iv (RepeatNormal), 925 const_iv (RepeatNormal),
866 const_iv (RepeatPad), 926 const_iv (RepeatPad),
867 const_iv (RepeatReflect), 927 const_iv (RepeatReflect),
928 // all versions
929 const_iv (PictOpClear),
930 const_iv (PictOpSrc),
931 const_iv (PictOpDst),
932 const_iv (PictOpOver),
933 const_iv (PictOpOverReverse),
934 const_iv (PictOpIn),
935 const_iv (PictOpInReverse),
936 const_iv (PictOpOut),
937 const_iv (PictOpOutReverse),
938 const_iv (PictOpAtop),
939 const_iv (PictOpAtopReverse),
940 const_iv (PictOpXor),
941 const_iv (PictOpAdd),
942 const_iv (PictOpSaturate),
943 // 0.2+
944 const_iv (PictOpDisjointClear),
945 const_iv (PictOpDisjointSrc),
946 const_iv (PictOpDisjointDst),
947 const_iv (PictOpDisjointOver),
948 const_iv (PictOpDisjointOverReverse),
949 const_iv (PictOpDisjointIn),
950 const_iv (PictOpDisjointInReverse),
951 const_iv (PictOpDisjointOut),
952 const_iv (PictOpDisjointOutReverse),
953 const_iv (PictOpDisjointAtop),
954 const_iv (PictOpDisjointAtopReverse),
955 const_iv (PictOpDisjointXor),
956 const_iv (PictOpConjointClear),
957 const_iv (PictOpConjointSrc),
958 const_iv (PictOpConjointDst),
959 const_iv (PictOpConjointOver),
960 const_iv (PictOpConjointOverReverse),
961 const_iv (PictOpConjointIn),
962 const_iv (PictOpConjointInReverse),
963 const_iv (PictOpConjointOut),
964 const_iv (PictOpConjointOutReverse),
965 const_iv (PictOpConjointAtop),
966 const_iv (PictOpConjointAtopReverse),
967 const_iv (PictOpConjointXor),
968 // 0.11+
969 const_iv (PictOpMultiply),
970 const_iv (PictOpScreen),
971 const_iv (PictOpOverlay),
972 const_iv (PictOpDarken),
973 const_iv (PictOpLighten),
974 const_iv (PictOpColorDodge),
975 const_iv (PictOpColorBurn),
976 const_iv (PictOpHardLight),
977 const_iv (PictOpSoftLight),
978 const_iv (PictOpDifference),
979 const_iv (PictOpExclusion),
980 const_iv (PictOpHSLHue),
981 const_iv (PictOpHSLSaturation),
982 const_iv (PictOpHSLColor),
983 const_iv (PictOpHSLLuminosity),
868#endif 984#endif
869# if 0 985# if 0
870 const_iv (XIMForwardChar), 986 const_iv (XIMForwardChar),
871 const_iv (XIMBackwardChar), 987 const_iv (XIMBackwardChar),
872 const_iv (XIMForwardWord), 988 const_iv (XIMForwardWord),
… …
1350 CODE: 1466 CODE:
1351 RETVAL = THIS->parent_y; 1467 RETVAL = THIS->parent_y;
1352 OUTPUT: 1468 OUTPUT:
1353 RETVAL 1469 RETVAL
1354 1470
1471Window
1472rxvt_term::vt ()
1473 CODE:
1474 RETVAL = THIS->vt;
1475 OUTPUT:
1476 RETVAL
1477
1355void 1478void
1356rxvt_term::vt_emask_add (U32 emask) 1479rxvt_term::vt_emask_add (U32 emask)
1357 CODE: 1480 CODE:
1358 THIS->vt_emask_perl |= emask; 1481 THIS->vt_emask_perl |= emask;
1359 THIS->vt_select_input (); 1482 THIS->vt_select_input ();
… …
1766 1889
1767 if (ix) 1890 if (ix)
1768 { 1891 {
1769 THIS->selection.screen = THIS->current_screen; 1892 THIS->selection.screen = THIS->current_screen;
1770 1893
1771 THIS->want_refresh = 1; 1894 THIS->selection_changed ();
1772 THIS->refresh_check (); 1895 THIS->refresh_check ();
1773 } 1896 }
1774 } 1897 }
1775} 1898}
1776 1899
… …
1780 RETVAL = THIS->selection.screen; 1903 RETVAL = THIS->selection.screen;
1781 if (screen >= 0) 1904 if (screen >= 0)
1782 THIS->selection.screen = screen; 1905 THIS->selection.screen = screen;
1783 OUTPUT: 1906 OUTPUT:
1784 RETVAL 1907 RETVAL
1908
1909void
1910rxvt_term::selection_request (Time tm, int selnum)
1785 1911
1786void 1912void
1787rxvt_term::selection_clear (bool clipboard = false) 1913rxvt_term::selection_clear (bool clipboard = false)
1788 1914
1789void 1915void
… …
2032} 2158}
2033 2159
2034############################################################################# 2160#############################################################################
2035# fancy bg bloatstuff (TODO: should be moved up somewhere) 2161# fancy bg bloatstuff (TODO: should be moved up somewhere)
2036 2162
2037# TODO: ugly 2163bool
2164rxvt_term::has_render ()
2165 CODE:
2166 RETVAL = THIS->display->flags & DISPLAY_HAS_RENDER;
2167 OUTPUT:
2168 RETVAL
2169
2038void 2170void
2039rxvt_term::background_geometry (bool border = false) 2171rxvt_term::background_geometry (bool border = false)
2040 PPCODE: 2172 PPCODE:
2041 EXTEND (SP, 4); 2173 EXTEND (SP, 4);
2042 PUSHs (sv_2mortal (newSViv (THIS->parent_x + (border ? THIS->window_vt_x : 0)))); 2174 PUSHs (sv_2mortal (newSViv (THIS->parent_x + (border ? THIS->window_vt_x : 0))));
… …
2044 PUSHs (sv_2mortal (newSViv (border ? THIS->vt_width : THIS->szHint.width ))); 2176 PUSHs (sv_2mortal (newSViv (border ? THIS->vt_width : THIS->szHint.width )));
2045 PUSHs (sv_2mortal (newSViv (border ? THIS->vt_height : THIS->szHint.height))); 2177 PUSHs (sv_2mortal (newSViv (border ? THIS->vt_height : THIS->szHint.height)));
2046 2178
2047#if HAVE_IMG 2179#if HAVE_IMG
2048 2180
2049#if 0
2050
2051rxvt_img * 2181rxvt_img *
2052rxvt_term::new_img (SV *format, int width, int height) 2182rxvt_term::new_img (SV *format = &PL_sv_undef, int x = 0, int y = 0, int width = 1, int height = 1)
2053 CODE: 2183 CODE:
2054 XRenderPictFormat *f = SvOK (format) 2184 XRenderPictFormat *f = SvOK (format)
2055 ? XRenderFindStandardFormat (THIS->dpy, SvIV (format)) 2185 ? XRenderFindStandardFormat (THIS->dpy, SvIV (format))
2056 : XRenderFindVisualFormat (THIS->dpy, THIS->visual); 2186 : XRenderFindVisualFormat (THIS->dpy, THIS->visual);
2057 RETVAL = new rxvt_img (THIS, f, width, height); 2187 RETVAL = new rxvt_img (THIS, f, x, y, width, height);
2188 RETVAL->alloc ();
2058 OUTPUT: 2189 OUTPUT:
2059 RETVAL 2190 RETVAL
2060
2061#endif
2062 2191
2063#if ENABLE_TRANSPARENCY 2192#if ENABLE_TRANSPARENCY
2064 2193
2065rxvt_img * 2194rxvt_img *
2066rxvt_term::new_img_from_root () 2195rxvt_term::new_img_from_root ()
… …
2087 OUTPUT: 2216 OUTPUT:
2088 RETVAL 2217 RETVAL
2089 2218
2090#endif 2219#endif
2091 2220
2092#if HAVE_BG_PIXMAP
2093
2094void 2221void
2095rxvt_term::set_background (rxvt_img *img, bool border = false) 2222rxvt_term::set_background (rxvt_img *img, bool border = false)
2096 CODE: 2223 CODE:
2097 THIS->bg_destroy (); 2224 delete THIS->bg_img;
2098 THIS->bg_pixmap = None; 2225 THIS->bg_img = 0;
2099 THIS->bg_flags &= ~(rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER | rxvt_term::BG_IS_TRANSPARENT); 2226 THIS->bg_flags = 0;
2100 2227
2101 if (img) // TODO: cannot be false 2228 if (img) // TODO: cannot be false
2102 { 2229 {
2103 img = img->clone (); // own the img 2230 img = img->clone (); // own the img
2104 2231
2105 if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap 2232 if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap
2106 img->sub_rect (0, 0, 2233 img->sub_rect (0, 0,
2107 border ? THIS->vt_width : THIS->szHint.width, 2234 border ? THIS->vt_width : THIS->szHint.width,
2108 border ? THIS->vt_height : THIS->szHint.height) 2235 border ? THIS->vt_height : THIS->szHint.height)
2109 ->replace (img); 2236 ->replace (img);
2110 2237
2111 // just in case, should usually be a nop 2238 // just in case, should usually be a nop
2112 img->reify () 2239 img->reify ()
2113 ->replace (img); 2240 ->replace (img);
2114 2241
2115 img->convert_format (XRenderFindVisualFormat (THIS->dpy, THIS->visual), THIS->pix_colors [Color_bg]) 2242 img->convert_format (XRenderFindVisualFormat (THIS->dpy, THIS->visual), THIS->pix_colors [Color_bg])
2116 ->replace (img); 2243 ->replace (img);
2117 2244
2118 THIS->bg_pixmap = img->steal (); 2245 THIS->bg_img = img;
2119 THIS->bg_flags |= rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER; 2246 THIS->bg_flags |= rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER;
2120 2247
2121 if (!border) 2248 if (!border)
2122 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT; 2249 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT;
2123
2124 delete img;
2125 } 2250 }
2126
2127#endif
2128 2251
2129#endif 2252#endif
2130 2253
2131############################################################################# 2254#############################################################################
2132# urxvt::overlay 2255# urxvt::overlay
… …
2156 C_ARGS: filename, 0 2279 C_ARGS: filename, 0
2157 2280
2158void 2281void
2159DESTROY (urxvt::pixbuf self) 2282DESTROY (urxvt::pixbuf self)
2160 CODE: 2283 CODE:
2161 gdk_pixbuf_unref (self); 2284 g_object_unref (self);
2162 2285
2163#endif 2286#endif
2164 2287
2165MODULE = urxvt PACKAGE = urxvt::img 2288MODULE = urxvt PACKAGE = urxvt::img
2166 2289
2167#if HAVE_IMG 2290#if HAVE_IMG
2168 2291
2169# rxvt_img *new (rxvt_screen *screen, XRenderPictFormat *format, int width, int height) 2292# 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); 2293# rxvt_img *rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int width, int height, Pixmap pixmap);
2171 2294
2295void
2296rxvt_img::geometry ()
2297 PPCODE:
2298 EXTEND (SP, 4);
2299 PUSHs (sv_2mortal (newSViv (THIS->x)));
2300 PUSHs (sv_2mortal (newSViv (THIS->y)));
2301 PUSHs (sv_2mortal (newSViv (THIS->w)));
2302 PUSHs (sv_2mortal (newSViv (THIS->h)));
2303
2172int 2304int
2173rxvt_img::w () 2305rxvt_img::x ()
2306 ALIAS:
2307 x = 0
2308 y = 1
2309 w = 2
2310 h = 3
2174 CODE: 2311 CODE:
2175 RETVAL = THIS->w; 2312 switch (ix)
2176 OUTPUT: 2313 {
2177 RETVAL 2314 case 0: RETVAL = THIS->x; break;
2178 2315 case 1: RETVAL = THIS->y; break;
2179int 2316 case 2: RETVAL = THIS->w; break;
2180rxvt_img::h () 2317 case 3: RETVAL = THIS->h; break;
2181 CODE: 2318 }
2182 RETVAL = THIS->h;
2183 OUTPUT: 2319 OUTPUT:
2184 RETVAL 2320 RETVAL
2185 2321
2186Pixmap 2322Pixmap
2187rxvt_img::pm () 2323rxvt_img::pm ()
… …
2189 RETVAL = THIS->pm; 2325 RETVAL = THIS->pm;
2190 OUTPUT: 2326 OUTPUT:
2191 RETVAL 2327 RETVAL
2192 2328
2193void 2329void
2194rxvt_img::fill (SV *c) 2330rxvt_img::fill (SV *c, int x = 0, int y = 0, int w = THIS->w, int h = THIS->h)
2331 PROTOTYPE: $;$$$$
2195 INIT: 2332 INIT:
2196 rxvt_color rc; 2333 rgba cc = parse_rgba (c, THIS->s);
2197 parse_color (THIS->s, rc, c); 2334 C_ARGS: cc, x, y, w, h
2198 C_ARGS: rc
2199 2335
2200void 2336void
2201rxvt_img::DESTROY () 2337rxvt_img::DESTROY ()
2202 CODE: 2338 CODE:
2203 delete THIS; 2339 delete THIS;
2204 2340
2205void 2341void
2342rxvt_img::add_alpha ()
2343
2344void
2206rxvt_img::unshare () 2345rxvt_img::unshare ()
2207 2346
2208int 2347void
2209rxvt_img::repeat_mode (render_repeat_mode repeat = 0) 2348rxvt_img::repeat_mode (render_repeat_mode repeat = 0)
2210 CODE: 2349 PPCODE:
2211 if (items >= 2) 2350 if (items >= 2)
2212 THIS->repeat_mode (repeat); 2351 THIS->repeat_mode (repeat);
2213 if (GIMME_V != G_VOID) 2352 if (GIMME_V != G_VOID)
2214 XPUSHs (sv_2mortal (newSViv (THIS->repeat))); 2353 XPUSHs (sv_2mortal (newSViv (THIS->repeat)));
2215 2354
2216void 2355void
2217rxvt_img::move (int dx, int dy) 2356rxvt_img::move (int dx, int dy)
2218 2357
2219void 2358void
2220rxvt_img::brightness (NV r, NV g, NV b, NV a = 1.) 2359rxvt_img::brightness (rxvt_img::nv r, rxvt_img::nv g, rxvt_img::nv b, rxvt_img::nv a = 1.)
2221 2360
2222void 2361void
2223rxvt_img::contrast (NV r, NV g, NV b, NV a = 1.) 2362rxvt_img::contrast (rxvt_img::nv r, rxvt_img::nv g, rxvt_img::nv b, rxvt_img::nv a = 1.)
2363
2364void
2365rxvt_img::draw (rxvt_img *img, int op = PictOpOver, rxvt_img::nv mask = 1.);
2224 2366
2225rxvt_img * 2367rxvt_img *
2226rxvt_img::clone () 2368rxvt_img::clone ()
2227 2369
2228rxvt_img * 2370rxvt_img *
… …
2233 2375
2234rxvt_img * 2376rxvt_img *
2235rxvt_img::blur (int rh, int rv) 2377rxvt_img::blur (int rh, int rv)
2236 2378
2237rxvt_img * 2379rxvt_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) 2380rxvt_img::muladd (rxvt_img::nv mul, rxvt_img::nv add)
2381
2382rxvt_img *
2383rxvt_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)
2239 INIT: 2384 INIT:
2240 double matrix[9] = { 2385 rxvt_img::nv matrix[3][3] = {
2241 p11, p12, p13, 2386 { p11, p12, p13 },
2242 p21, p22, p23, 2387 { p21, p22, p23 },
2243 p31, p32, p33 2388 { p31, p32, p33 }
2244 }; 2389 };
2245 C_ARGS: new_width, new_height, matrix 2390 C_ARGS: matrix
2246 2391
2247rxvt_img * 2392rxvt_img *
2248rxvt_img::scale (int new_width, int new_height) 2393rxvt_img::scale (int new_width, int new_height)
2249 2394
2250rxvt_img * 2395rxvt_img *
2251rxvt_img::rotate (int new_width, int new_height, int x, int y, NV phi) 2396rxvt_img::rotate (int x, int y, rxvt_img::nv phi)
2397
2398rxvt_img *
2399rxvt_img::tint (SV *c)
2400 INIT:
2401 rgba cc = parse_rgba (c, THIS->s);
2402 C_ARGS: cc
2403
2404rxvt_img *
2405rxvt_img::shade (rxvt_img::nv factor)
2406
2407rxvt_img *
2408rxvt_img::filter (octet_string name, SV *params = &PL_sv_undef)
2409 CODE:
2410 rxvt_img::nv *vparams = 0;
2411 int nparams = 0;
2412
2413 if (SvOK (params))
2414 {
2415 if (!SvROK (params) || SvTYPE (SvRV (params)) != SVt_PVAV)
2416 croak ("rxvt_img::filter: params must be an array reference with parameter values");
2417
2418 nparams = av_len ((AV *)SvRV (params)) + 1;
2419 vparams = (rxvt_img::nv *)malloc (nparams * sizeof (rxvt_img::nv));
2420
2421 for (int i = 0; i < nparams; ++i)
2422 vparams [i] = SvNV (*av_fetch ((AV *)SvRV (params), i, 1));
2423 }
2424
2425 RETVAL = THIS->filter (name, nparams, vparams);
2426 free (vparams);
2427 OUTPUT:
2428 RETVAL
2252 2429
2253#endif 2430#endif
2254 2431

Diff Legend

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