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.192 by root, Tue Jun 12 10:45:53 2012 UTC vs.
Revision 1.217 by sf-exg, Sat Nov 2 10:32:25 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, 0..1 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;
… …
774 const_iv (RS_Bold), 812 const_iv (RS_Bold),
775 const_iv (RS_Italic), 813 const_iv (RS_Italic),
776 const_iv (RS_Blink), 814 const_iv (RS_Blink),
777 const_iv (RS_RVid), 815 const_iv (RS_RVid),
778 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#if OFF_FOCUS_FADING
822 const_iv (Color_fade),
823#endif
824 const_iv (Color_pointer_fg),
825 const_iv (Color_pointer_bg),
826 const_iv (Color_border),
827 const_iv (NRS_COLORS),
828 const_iv (TOTAL_COLORS),
779 829
780 const_iv (CurrentTime), 830 const_iv (CurrentTime),
781 const_iv (ShiftMask), 831 const_iv (ShiftMask),
782 const_iv (LockMask), 832 const_iv (LockMask),
783 const_iv (ControlMask), 833 const_iv (ControlMask),
… …
875 const_iv (PictStandardA1), 925 const_iv (PictStandardA1),
876 const_iv (RepeatNone), 926 const_iv (RepeatNone),
877 const_iv (RepeatNormal), 927 const_iv (RepeatNormal),
878 const_iv (RepeatPad), 928 const_iv (RepeatPad),
879 const_iv (RepeatReflect), 929 const_iv (RepeatReflect),
930 // all versions
931 const_iv (PictOpClear),
932 const_iv (PictOpSrc),
933 const_iv (PictOpDst),
934 const_iv (PictOpOver),
935 const_iv (PictOpOverReverse),
936 const_iv (PictOpIn),
937 const_iv (PictOpInReverse),
938 const_iv (PictOpOut),
939 const_iv (PictOpOutReverse),
940 const_iv (PictOpAtop),
941 const_iv (PictOpAtopReverse),
942 const_iv (PictOpXor),
943 const_iv (PictOpAdd),
944 const_iv (PictOpSaturate),
945 // 0.2+
946 const_iv (PictOpDisjointClear),
947 const_iv (PictOpDisjointSrc),
948 const_iv (PictOpDisjointDst),
949 const_iv (PictOpDisjointOver),
950 const_iv (PictOpDisjointOverReverse),
951 const_iv (PictOpDisjointIn),
952 const_iv (PictOpDisjointInReverse),
953 const_iv (PictOpDisjointOut),
954 const_iv (PictOpDisjointOutReverse),
955 const_iv (PictOpDisjointAtop),
956 const_iv (PictOpDisjointAtopReverse),
957 const_iv (PictOpDisjointXor),
958 const_iv (PictOpConjointClear),
959 const_iv (PictOpConjointSrc),
960 const_iv (PictOpConjointDst),
961 const_iv (PictOpConjointOver),
962 const_iv (PictOpConjointOverReverse),
963 const_iv (PictOpConjointIn),
964 const_iv (PictOpConjointInReverse),
965 const_iv (PictOpConjointOut),
966 const_iv (PictOpConjointOutReverse),
967 const_iv (PictOpConjointAtop),
968 const_iv (PictOpConjointAtopReverse),
969 const_iv (PictOpConjointXor),
970 // 0.11+
971 const_iv (PictOpMultiply),
972 const_iv (PictOpScreen),
973 const_iv (PictOpOverlay),
974 const_iv (PictOpDarken),
975 const_iv (PictOpLighten),
976 const_iv (PictOpColorDodge),
977 const_iv (PictOpColorBurn),
978 const_iv (PictOpHardLight),
979 const_iv (PictOpSoftLight),
980 const_iv (PictOpDifference),
981 const_iv (PictOpExclusion),
982 const_iv (PictOpHSLHue),
983 const_iv (PictOpHSLSaturation),
984 const_iv (PictOpHSLColor),
985 const_iv (PictOpHSLLuminosity),
880#endif 986#endif
881# if 0 987# if 0
882 const_iv (XIMForwardChar), 988 const_iv (XIMForwardChar),
883 const_iv (XIMBackwardChar), 989 const_iv (XIMBackwardChar),
884 const_iv (XIMForwardWord), 990 const_iv (XIMForwardWord),
… …
1362 CODE: 1468 CODE:
1363 RETVAL = THIS->parent_y; 1469 RETVAL = THIS->parent_y;
1364 OUTPUT: 1470 OUTPUT:
1365 RETVAL 1471 RETVAL
1366 1472
1473Window
1474rxvt_term::vt ()
1475 CODE:
1476 RETVAL = THIS->vt;
1477 OUTPUT:
1478 RETVAL
1479
1367void 1480void
1368rxvt_term::vt_emask_add (U32 emask) 1481rxvt_term::vt_emask_add (U32 emask)
1369 CODE: 1482 CODE:
1370 THIS->vt_emask_perl |= emask; 1483 THIS->vt_emask_perl |= emask;
1371 THIS->vt_select_input (); 1484 THIS->vt_select_input ();
… …
1778 1891
1779 if (ix) 1892 if (ix)
1780 { 1893 {
1781 THIS->selection.screen = THIS->current_screen; 1894 THIS->selection.screen = THIS->current_screen;
1782 1895
1783 THIS->want_refresh = 1; 1896 THIS->selection_changed ();
1784 THIS->refresh_check (); 1897 THIS->refresh_check ();
1785 } 1898 }
1786 } 1899 }
1787} 1900}
1788 1901
… …
1792 RETVAL = THIS->selection.screen; 1905 RETVAL = THIS->selection.screen;
1793 if (screen >= 0) 1906 if (screen >= 0)
1794 THIS->selection.screen = screen; 1907 THIS->selection.screen = screen;
1795 OUTPUT: 1908 OUTPUT:
1796 RETVAL 1909 RETVAL
1910
1911void
1912rxvt_term::selection_request (Time tm, int selnum)
1797 1913
1798void 1914void
1799rxvt_term::selection_clear (bool clipboard = false) 1915rxvt_term::selection_clear (bool clipboard = false)
1800 1916
1801void 1917void
… …
2063 PUSHs (sv_2mortal (newSViv (border ? THIS->vt_height : THIS->szHint.height))); 2179 PUSHs (sv_2mortal (newSViv (border ? THIS->vt_height : THIS->szHint.height)));
2064 2180
2065#if HAVE_IMG 2181#if HAVE_IMG
2066 2182
2067rxvt_img * 2183rxvt_img *
2068rxvt_term::new_img (SV *format, int width = 1, int height = 1) 2184rxvt_term::new_img (SV *format = &PL_sv_undef, int x = 0, int y = 0, int width = 1, int height = 1)
2069 CODE: 2185 CODE:
2070 XRenderPictFormat *f = SvOK (format) 2186 XRenderPictFormat *f = SvOK (format)
2071 ? XRenderFindStandardFormat (THIS->dpy, SvIV (format)) 2187 ? XRenderFindStandardFormat (THIS->dpy, SvIV (format))
2072 : XRenderFindVisualFormat (THIS->dpy, THIS->visual); 2188 : XRenderFindVisualFormat (THIS->dpy, THIS->visual);
2073 RETVAL = new rxvt_img (THIS, f, 0, 0, width, height); 2189 RETVAL = new rxvt_img (THIS, f, x, y, width, height);
2074 RETVAL->alloc (); 2190 RETVAL->alloc ();
2075 OUTPUT: 2191 OUTPUT:
2076 RETVAL 2192 RETVAL
2077 2193
2078#if ENABLE_TRANSPARENCY 2194#if ENABLE_TRANSPARENCY
… …
2102 OUTPUT: 2218 OUTPUT:
2103 RETVAL 2219 RETVAL
2104 2220
2105#endif 2221#endif
2106 2222
2107#if HAVE_BG_PIXMAP
2108
2109void 2223void
2110rxvt_term::set_background (rxvt_img *img, bool border = false) 2224rxvt_term::set_background (rxvt_img *img, bool border = false)
2111 CODE: 2225 CODE:
2112 THIS->bg_destroy (); 2226 delete THIS->bg_img;
2113 THIS->bg_flags &= ~(rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER | rxvt_term::BG_IS_TRANSPARENT); 2227 THIS->bg_img = 0;
2228 THIS->bg_flags = 0;
2114 2229
2115 if (img) // TODO: cannot be false 2230 if (img) // TODO: cannot be false
2116 { 2231 {
2117 img = img->clone (); // own the img 2232 img = img->clone (); // own the img
2118 2233
2119 if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap 2234 if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap
2120 img->sub_rect (0, 0, 2235 img->sub_rect (0, 0,
2121 border ? THIS->vt_width : THIS->szHint.width, 2236 border ? THIS->vt_width : THIS->szHint.width,
2122 border ? THIS->vt_height : THIS->szHint.height) 2237 border ? THIS->vt_height : THIS->szHint.height)
2123 ->replace (img); 2238 ->replace (img);
2124 2239
2125 // just in case, should usually be a nop 2240 // just in case, should usually be a nop
2126 img->reify () 2241 img->reify ()
2127 ->replace (img); 2242 ->replace (img);
2128 2243
… …
2136 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT; 2251 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT;
2137 } 2252 }
2138 2253
2139#endif 2254#endif
2140 2255
2141#endif
2142
2143############################################################################# 2256#############################################################################
2144# urxvt::overlay 2257# urxvt::overlay
2145############################################################################# 2258#############################################################################
2146 2259
2147MODULE = urxvt PACKAGE = urxvt::overlay 2260MODULE = urxvt PACKAGE = urxvt::overlay
… …
2168 C_ARGS: filename, 0 2281 C_ARGS: filename, 0
2169 2282
2170void 2283void
2171DESTROY (urxvt::pixbuf self) 2284DESTROY (urxvt::pixbuf self)
2172 CODE: 2285 CODE:
2173 gdk_pixbuf_unref (self); 2286 g_object_unref (self);
2174 2287
2175#endif 2288#endif
2176 2289
2177MODULE = urxvt PACKAGE = urxvt::img 2290MODULE = urxvt PACKAGE = urxvt::img
2178 2291
2179#if HAVE_IMG 2292#if HAVE_IMG
2180 2293
2181# rxvt_img *new (rxvt_screen *screen, XRenderPictFormat *format, int width, int height) 2294# rxvt_img *new (rxvt_screen *screen, XRenderPictFormat *format, int width, int height)
2182# rxvt_img *rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int width, int height, Pixmap pixmap); 2295# rxvt_img *rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int width, int height, Pixmap pixmap);
2183 2296
2297void
2298rxvt_img::geometry ()
2299 PPCODE:
2300 EXTEND (SP, 4);
2301 PUSHs (sv_2mortal (newSViv (THIS->x)));
2302 PUSHs (sv_2mortal (newSViv (THIS->y)));
2303 PUSHs (sv_2mortal (newSViv (THIS->w)));
2304 PUSHs (sv_2mortal (newSViv (THIS->h)));
2305
2184int 2306int
2185rxvt_img::w () 2307rxvt_img::x ()
2308 ALIAS:
2309 x = 0
2310 y = 1
2311 w = 2
2312 h = 3
2186 CODE: 2313 CODE:
2187 RETVAL = THIS->w; 2314 switch (ix)
2188 OUTPUT: 2315 {
2189 RETVAL 2316 case 0: RETVAL = THIS->x; break;
2190 2317 case 1: RETVAL = THIS->y; break;
2191int 2318 case 2: RETVAL = THIS->w; break;
2192rxvt_img::h () 2319 case 3: RETVAL = THIS->h; break;
2193 CODE: 2320 }
2194 RETVAL = THIS->h;
2195 OUTPUT: 2321 OUTPUT:
2196 RETVAL 2322 RETVAL
2197 2323
2198Pixmap 2324Pixmap
2199rxvt_img::pm () 2325rxvt_img::pm ()
… …
2201 RETVAL = THIS->pm; 2327 RETVAL = THIS->pm;
2202 OUTPUT: 2328 OUTPUT:
2203 RETVAL 2329 RETVAL
2204 2330
2205void 2331void
2206rxvt_img::fill (SV *c) 2332rxvt_img::fill (SV *c, int x = 0, int y = 0, int w = THIS->w, int h = THIS->h)
2333 PROTOTYPE: $;$$$$
2207 INIT: 2334 INIT:
2208 rxvt_color rc; 2335 rgba cc = parse_rgba (c, THIS->s);
2209 parse_color (THIS->s, rc, c); 2336 C_ARGS: cc, x, y, w, h
2210 C_ARGS: rc
2211 2337
2212void 2338void
2213rxvt_img::DESTROY () 2339rxvt_img::DESTROY ()
2214 CODE: 2340 CODE:
2215 delete THIS; 2341 delete THIS;
2216 2342
2217void 2343void
2344rxvt_img::add_alpha ()
2345
2346void
2218rxvt_img::unshare () 2347rxvt_img::unshare ()
2219 2348
2220int 2349void
2221rxvt_img::repeat_mode (render_repeat_mode repeat = 0) 2350rxvt_img::repeat_mode (render_repeat_mode repeat = 0)
2222 CODE: 2351 PPCODE:
2223 if (items >= 2) 2352 if (items >= 2)
2224 THIS->repeat_mode (repeat); 2353 THIS->repeat_mode (repeat);
2225 if (GIMME_V != G_VOID) 2354 if (GIMME_V != G_VOID)
2226 XPUSHs (sv_2mortal (newSViv (THIS->repeat))); 2355 XPUSHs (sv_2mortal (newSViv (THIS->repeat)));
2227 2356
2228void 2357void
2229rxvt_img::move (int dx, int dy) 2358rxvt_img::move (int dx, int dy)
2230 2359
2231void 2360void
2232rxvt_img::brightness (NV r, NV g, NV b, NV a = 1.) 2361rxvt_img::brightness (rxvt_img::nv r, rxvt_img::nv g, rxvt_img::nv b, rxvt_img::nv a = 1.)
2233 2362
2234void 2363void
2235rxvt_img::contrast (NV r, NV g, NV b, NV a = 1.) 2364rxvt_img::contrast (rxvt_img::nv r, rxvt_img::nv g, rxvt_img::nv b, rxvt_img::nv a = 1.)
2365
2366void
2367rxvt_img::draw (rxvt_img *img, int op = PictOpOver, rxvt_img::nv mask = 1.);
2236 2368
2237rxvt_img * 2369rxvt_img *
2238rxvt_img::clone () 2370rxvt_img::clone ()
2239 2371
2240rxvt_img * 2372rxvt_img *
… …
2245 2377
2246rxvt_img * 2378rxvt_img *
2247rxvt_img::blur (int rh, int rv) 2379rxvt_img::blur (int rh, int rv)
2248 2380
2249rxvt_img * 2381rxvt_img *
2250rxvt_img::transform (NV p11, NV p12, NV p13, NV p21, NV p22, NV p23, NV p31, NV p32, NV p33, int new_width = 0, int new_height = 0) 2382rxvt_img::muladd (rxvt_img::nv mul, rxvt_img::nv add)
2383
2384rxvt_img *
2385rxvt_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)
2251 INIT: 2386 INIT:
2252 double matrix[9] = { 2387 rxvt_img::nv matrix[3][3] = {
2253 p11, p12, p13, 2388 { p11, p12, p13 },
2254 p21, p22, p23, 2389 { p21, p22, p23 },
2255 p31, p32, p33 2390 { p31, p32, p33 }
2256 }; 2391 };
2257 C_ARGS: matrix, new_width, new_height 2392 C_ARGS: matrix
2258 2393
2259rxvt_img * 2394rxvt_img *
2260rxvt_img::scale (int new_width, int new_height) 2395rxvt_img::scale (int new_width, int new_height)
2261 2396
2262rxvt_img * 2397rxvt_img *
2263rxvt_img::rotate (int x, int y, NV phi, int new_width = 0, int new_height = 0) 2398rxvt_img::rotate (int x, int y, rxvt_img::nv phi)
2399
2400rxvt_img *
2401rxvt_img::tint (SV *c)
2402 INIT:
2403 rgba cc = parse_rgba (c, THIS->s);
2404 C_ARGS: cc
2405
2406rxvt_img *
2407rxvt_img::shade (rxvt_img::nv factor)
2408
2409rxvt_img *
2410rxvt_img::filter (octet_string name, SV *params = &PL_sv_undef)
2411 CODE:
2412 rxvt_img::nv *vparams = 0;
2413 int nparams = 0;
2414
2415 if (SvOK (params))
2416 {
2417 if (!SvROK (params) || SvTYPE (SvRV (params)) != SVt_PVAV)
2418 croak ("rxvt_img::filter: params must be an array reference with parameter values");
2419
2420 nparams = av_len ((AV *)SvRV (params)) + 1;
2421 vparams = (rxvt_img::nv *)malloc (nparams * sizeof (rxvt_img::nv));
2422
2423 for (int i = 0; i < nparams; ++i)
2424 vparams [i] = SvNV (*av_fetch ((AV *)SvRV (params), i, 1));
2425 }
2426
2427 RETVAL = THIS->filter (name, nparams, vparams);
2428 free (vparams);
2429 OUTPUT:
2430 RETVAL
2264 2431
2265#endif 2432#endif
2266 2433

Diff Legend

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