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.195 by root, Thu Jun 14 17:16:05 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 rgba 68static rgba
67parse_rgba (SV *sv, rxvt_screen *s = 0) 69parse_rgba (SV *sv, rxvt_screen *s = 0)
68{ 70{
69 rgba c; 71 rgba c;
70 72
71 if (AV *av = (AV *)SvRV (sv)) 73 if (SvROK (sv))
72 { 74 {
75 AV *av = (AV *)SvRV (sv);
76
73 if (SvTYPE ((SV *)av) != SVt_PVAV) 77 if (SvTYPE ((SV *)av) != SVt_PVAV)
74 croak ("colour must be either a colour string, or an array,"); 78 croak ("colour must be either a colour string, or an array,");
75 79
76 int len = av_len (av) + 1; 80 int len = av_len (av) + 1;
77 81
… …
102 106
103 return c; 107 return c;
104} 108}
105 109
106///////////////////////////////////////////////////////////////////////////// 110/////////////////////////////////////////////////////////////////////////////
111#endif
107 112
108static wchar_t * 113static wchar_t *
109sv2wcs (SV *sv) 114sv2wcs (SV *sv)
110{ 115{
111 STRLEN len; 116 STRLEN len;
… …
807 const_iv (RS_Bold), 812 const_iv (RS_Bold),
808 const_iv (RS_Italic), 813 const_iv (RS_Italic),
809 const_iv (RS_Blink), 814 const_iv (RS_Blink),
810 const_iv (RS_RVid), 815 const_iv (RS_RVid),
811 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),
812 827
813 const_iv (CurrentTime), 828 const_iv (CurrentTime),
814 const_iv (ShiftMask), 829 const_iv (ShiftMask),
815 const_iv (LockMask), 830 const_iv (LockMask),
816 const_iv (ControlMask), 831 const_iv (ControlMask),
… …
908 const_iv (PictStandardA1), 923 const_iv (PictStandardA1),
909 const_iv (RepeatNone), 924 const_iv (RepeatNone),
910 const_iv (RepeatNormal), 925 const_iv (RepeatNormal),
911 const_iv (RepeatPad), 926 const_iv (RepeatPad),
912 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),
913#endif 984#endif
914# if 0 985# if 0
915 const_iv (XIMForwardChar), 986 const_iv (XIMForwardChar),
916 const_iv (XIMBackwardChar), 987 const_iv (XIMBackwardChar),
917 const_iv (XIMForwardWord), 988 const_iv (XIMForwardWord),
… …
1395 CODE: 1466 CODE:
1396 RETVAL = THIS->parent_y; 1467 RETVAL = THIS->parent_y;
1397 OUTPUT: 1468 OUTPUT:
1398 RETVAL 1469 RETVAL
1399 1470
1471Window
1472rxvt_term::vt ()
1473 CODE:
1474 RETVAL = THIS->vt;
1475 OUTPUT:
1476 RETVAL
1477
1400void 1478void
1401rxvt_term::vt_emask_add (U32 emask) 1479rxvt_term::vt_emask_add (U32 emask)
1402 CODE: 1480 CODE:
1403 THIS->vt_emask_perl |= emask; 1481 THIS->vt_emask_perl |= emask;
1404 THIS->vt_select_input (); 1482 THIS->vt_select_input ();
… …
1811 1889
1812 if (ix) 1890 if (ix)
1813 { 1891 {
1814 THIS->selection.screen = THIS->current_screen; 1892 THIS->selection.screen = THIS->current_screen;
1815 1893
1816 THIS->want_refresh = 1; 1894 THIS->selection_changed ();
1817 THIS->refresh_check (); 1895 THIS->refresh_check ();
1818 } 1896 }
1819 } 1897 }
1820} 1898}
1821 1899
… …
1825 RETVAL = THIS->selection.screen; 1903 RETVAL = THIS->selection.screen;
1826 if (screen >= 0) 1904 if (screen >= 0)
1827 THIS->selection.screen = screen; 1905 THIS->selection.screen = screen;
1828 OUTPUT: 1906 OUTPUT:
1829 RETVAL 1907 RETVAL
1908
1909void
1910rxvt_term::selection_request (Time tm, int selnum)
1830 1911
1831void 1912void
1832rxvt_term::selection_clear (bool clipboard = false) 1913rxvt_term::selection_clear (bool clipboard = false)
1833 1914
1834void 1915void
… …
2096 PUSHs (sv_2mortal (newSViv (border ? THIS->vt_height : THIS->szHint.height))); 2177 PUSHs (sv_2mortal (newSViv (border ? THIS->vt_height : THIS->szHint.height)));
2097 2178
2098#if HAVE_IMG 2179#if HAVE_IMG
2099 2180
2100rxvt_img * 2181rxvt_img *
2101rxvt_term::new_img (SV *format, int width = 1, int height = 1) 2182rxvt_term::new_img (SV *format = &PL_sv_undef, int x = 0, int y = 0, int width = 1, int height = 1)
2102 CODE: 2183 CODE:
2103 XRenderPictFormat *f = SvOK (format) 2184 XRenderPictFormat *f = SvOK (format)
2104 ? XRenderFindStandardFormat (THIS->dpy, SvIV (format)) 2185 ? XRenderFindStandardFormat (THIS->dpy, SvIV (format))
2105 : XRenderFindVisualFormat (THIS->dpy, THIS->visual); 2186 : XRenderFindVisualFormat (THIS->dpy, THIS->visual);
2106 RETVAL = new rxvt_img (THIS, f, 0, 0, width, height); 2187 RETVAL = new rxvt_img (THIS, f, x, y, width, height);
2107 RETVAL->alloc (); 2188 RETVAL->alloc ();
2108 OUTPUT: 2189 OUTPUT:
2109 RETVAL 2190 RETVAL
2110 2191
2111#if ENABLE_TRANSPARENCY 2192#if ENABLE_TRANSPARENCY
… …
2135 OUTPUT: 2216 OUTPUT:
2136 RETVAL 2217 RETVAL
2137 2218
2138#endif 2219#endif
2139 2220
2140#if HAVE_BG_PIXMAP
2141
2142void 2221void
2143rxvt_term::set_background (rxvt_img *img, bool border = false) 2222rxvt_term::set_background (rxvt_img *img, bool border = false)
2144 CODE: 2223 CODE:
2145 THIS->bg_destroy (); 2224 delete THIS->bg_img;
2146 THIS->bg_flags &= ~(rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER | rxvt_term::BG_IS_TRANSPARENT); 2225 THIS->bg_img = 0;
2226 THIS->bg_flags = 0;
2147 2227
2148 if (img) // TODO: cannot be false 2228 if (img) // TODO: cannot be false
2149 { 2229 {
2150 img = img->clone (); // own the img 2230 img = img->clone (); // own the img
2151 2231
2152 if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap 2232 if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap
2153 img->sub_rect (0, 0, 2233 img->sub_rect (0, 0,
2154 border ? THIS->vt_width : THIS->szHint.width, 2234 border ? THIS->vt_width : THIS->szHint.width,
2155 border ? THIS->vt_height : THIS->szHint.height) 2235 border ? THIS->vt_height : THIS->szHint.height)
2156 ->replace (img); 2236 ->replace (img);
2157 2237
2158 // just in case, should usually be a nop 2238 // just in case, should usually be a nop
2159 img->reify () 2239 img->reify ()
2160 ->replace (img); 2240 ->replace (img);
2161 2241
… …
2169 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT; 2249 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT;
2170 } 2250 }
2171 2251
2172#endif 2252#endif
2173 2253
2174#endif
2175
2176############################################################################# 2254#############################################################################
2177# urxvt::overlay 2255# urxvt::overlay
2178############################################################################# 2256#############################################################################
2179 2257
2180MODULE = urxvt PACKAGE = urxvt::overlay 2258MODULE = urxvt PACKAGE = urxvt::overlay
… …
2201 C_ARGS: filename, 0 2279 C_ARGS: filename, 0
2202 2280
2203void 2281void
2204DESTROY (urxvt::pixbuf self) 2282DESTROY (urxvt::pixbuf self)
2205 CODE: 2283 CODE:
2206 gdk_pixbuf_unref (self); 2284 g_object_unref (self);
2207 2285
2208#endif 2286#endif
2209 2287
2210MODULE = urxvt PACKAGE = urxvt::img 2288MODULE = urxvt PACKAGE = urxvt::img
2211 2289
2212#if HAVE_IMG 2290#if HAVE_IMG
2213 2291
2214# 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)
2215# 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);
2216 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
2217int 2304int
2218rxvt_img::w () 2305rxvt_img::x ()
2306 ALIAS:
2307 x = 0
2308 y = 1
2309 w = 2
2310 h = 3
2219 CODE: 2311 CODE:
2220 RETVAL = THIS->w; 2312 switch (ix)
2221 OUTPUT: 2313 {
2222 RETVAL 2314 case 0: RETVAL = THIS->x; break;
2223 2315 case 1: RETVAL = THIS->y; break;
2224int 2316 case 2: RETVAL = THIS->w; break;
2225rxvt_img::h () 2317 case 3: RETVAL = THIS->h; break;
2226 CODE: 2318 }
2227 RETVAL = THIS->h;
2228 OUTPUT: 2319 OUTPUT:
2229 RETVAL 2320 RETVAL
2230 2321
2231Pixmap 2322Pixmap
2232rxvt_img::pm () 2323rxvt_img::pm ()
… …
2234 RETVAL = THIS->pm; 2325 RETVAL = THIS->pm;
2235 OUTPUT: 2326 OUTPUT:
2236 RETVAL 2327 RETVAL
2237 2328
2238void 2329void
2239rxvt_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: $;$$$$
2240 INIT: 2332 INIT:
2241 rgba cc = parse_rgba (c, THIS->s); 2333 rgba cc = parse_rgba (c, THIS->s);
2242 C_ARGS: cc 2334 C_ARGS: cc, x, y, w, h
2243 2335
2244void 2336void
2245rxvt_img::DESTROY () 2337rxvt_img::DESTROY ()
2246 CODE: 2338 CODE:
2247 delete THIS; 2339 delete THIS;
2248 2340
2249void 2341void
2342rxvt_img::add_alpha ()
2343
2344void
2250rxvt_img::unshare () 2345rxvt_img::unshare ()
2251 2346
2252int 2347void
2253rxvt_img::repeat_mode (render_repeat_mode repeat = 0) 2348rxvt_img::repeat_mode (render_repeat_mode repeat = 0)
2254 CODE: 2349 PPCODE:
2255 if (items >= 2) 2350 if (items >= 2)
2256 THIS->repeat_mode (repeat); 2351 THIS->repeat_mode (repeat);
2257 if (GIMME_V != G_VOID) 2352 if (GIMME_V != G_VOID)
2258 XPUSHs (sv_2mortal (newSViv (THIS->repeat))); 2353 XPUSHs (sv_2mortal (newSViv (THIS->repeat)));
2259 2354
2260void 2355void
2261rxvt_img::move (int dx, int dy) 2356rxvt_img::move (int dx, int dy)
2262 2357
2263void 2358void
2264rxvt_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.)
2265 2360
2266void 2361void
2267rxvt_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.);
2268 2366
2269rxvt_img * 2367rxvt_img *
2270rxvt_img::clone () 2368rxvt_img::clone ()
2271 2369
2272rxvt_img * 2370rxvt_img *
… …
2277 2375
2278rxvt_img * 2376rxvt_img *
2279rxvt_img::blur (int rh, int rv) 2377rxvt_img::blur (int rh, int rv)
2280 2378
2281rxvt_img * 2379rxvt_img *
2282rxvt_img::transform (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)
2283 INIT: 2384 INIT:
2284 double matrix[3][3] = { 2385 rxvt_img::nv matrix[3][3] = {
2285 { p11, p12, p13 }, 2386 { p11, p12, p13 },
2286 { p21, p22, p23 }, 2387 { p21, p22, p23 },
2287 { p31, p32, p33 } 2388 { p31, p32, p33 }
2288 }; 2389 };
2289 C_ARGS: matrix 2390 C_ARGS: matrix
2290 2391
2291rxvt_img * 2392rxvt_img *
2292rxvt_img::scale (int new_width, int new_height) 2393rxvt_img::scale (int new_width, int new_height)
2293 2394
2294rxvt_img * 2395rxvt_img *
2295rxvt_img::rotate (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
2296 2429
2297#endif 2430#endif
2298 2431

Diff Legend

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