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.197 by root, Thu Jun 14 18:19:11 2012 UTC vs.
Revision 1.218 by root, Sat Apr 26 20:51:12 2014 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;
63typedef rxvt_img::nv rxvt_img__nv; 64typedef rxvt_img::nv rxvt_img__nv;
64 65
65///////////////////////////////////////////////////////////////////////////// 66/////////////////////////////////////////////////////////////////////////////
66 67
67static rgba 68static rgba
68parse_rgba (SV *sv, rxvt_screen *s = 0) 69parse_rgba (SV *sv, rxvt_screen *s = 0)
69{ 70{
70 rgba c; 71 rgba c;
71 72
72 if (AV *av = (AV *)SvRV (sv)) 73 if (SvROK (sv))
73 { 74 {
75 AV *av = (AV *)SvRV (sv);
76
74 if (SvTYPE ((SV *)av) != SVt_PVAV) 77 if (SvTYPE ((SV *)av) != SVt_PVAV)
75 croak ("colour must be either a colour string, or an array,"); 78 croak ("colour must be either a colour string, or an array,");
76 79
77 int len = av_len (av) + 1; 80 int len = av_len (av) + 1;
78 81
… …
103 106
104 return c; 107 return c;
105} 108}
106 109
107///////////////////////////////////////////////////////////////////////////// 110/////////////////////////////////////////////////////////////////////////////
111#endif
108 112
109static wchar_t * 113static wchar_t *
110sv2wcs (SV *sv) 114sv2wcs (SV *sv)
111{ 115{
112 STRLEN len; 116 STRLEN len;
… …
789 static const struct { 793 static const struct {
790 const char *name; 794 const char *name;
791 IV iv; 795 IV iv;
792 } *civ, const_iv[] = { 796 } *civ, const_iv[] = {
793# define const_iv(name) { # name, (IV)name } 797# define const_iv(name) { # name, (IV)name }
798 const_iv (HOOK_INIT),
799 const_iv (HOOK_DESTROY),
800 const_iv (HOOK_KEYBOARD_DISPATCH),
801
794 const_iv (NUM_RESOURCES), 802 const_iv (NUM_RESOURCES),
795 const_iv (DEFAULT_RSTYLE), 803 const_iv (DEFAULT_RSTYLE),
796 const_iv (OVERLAY_RSTYLE), 804 const_iv (OVERLAY_RSTYLE),
797 const_iv (Color_Bits), 805 const_iv (Color_Bits),
798 const_iv (RS_bgShift), const_iv (RS_bgMask), 806 const_iv (RS_bgShift), const_iv (RS_bgMask),
… …
808 const_iv (RS_Bold), 816 const_iv (RS_Bold),
809 const_iv (RS_Italic), 817 const_iv (RS_Italic),
810 const_iv (RS_Blink), 818 const_iv (RS_Blink),
811 const_iv (RS_RVid), 819 const_iv (RS_RVid),
812 const_iv (RS_Uline), 820 const_iv (RS_Uline),
821
822 // TODO: should support all colour constants, create colorinc.h &c
823 const_iv (Color_fg),
824 const_iv (Color_bg),
825#if OFF_FOCUS_FADING
826 const_iv (Color_fade),
827#endif
828 const_iv (Color_pointer_fg),
829 const_iv (Color_pointer_bg),
830 const_iv (Color_border),
831 const_iv (NRS_COLORS),
832 const_iv (TOTAL_COLORS),
813 833
814 const_iv (CurrentTime), 834 const_iv (CurrentTime),
815 const_iv (ShiftMask), 835 const_iv (ShiftMask),
816 const_iv (LockMask), 836 const_iv (LockMask),
817 const_iv (ControlMask), 837 const_iv (ControlMask),
… …
909 const_iv (PictStandardA1), 929 const_iv (PictStandardA1),
910 const_iv (RepeatNone), 930 const_iv (RepeatNone),
911 const_iv (RepeatNormal), 931 const_iv (RepeatNormal),
912 const_iv (RepeatPad), 932 const_iv (RepeatPad),
913 const_iv (RepeatReflect), 933 const_iv (RepeatReflect),
934 // all versions
935 const_iv (PictOpClear),
936 const_iv (PictOpSrc),
937 const_iv (PictOpDst),
938 const_iv (PictOpOver),
939 const_iv (PictOpOverReverse),
940 const_iv (PictOpIn),
941 const_iv (PictOpInReverse),
942 const_iv (PictOpOut),
943 const_iv (PictOpOutReverse),
944 const_iv (PictOpAtop),
945 const_iv (PictOpAtopReverse),
946 const_iv (PictOpXor),
947 const_iv (PictOpAdd),
948 const_iv (PictOpSaturate),
949 // 0.2+
950 const_iv (PictOpDisjointClear),
951 const_iv (PictOpDisjointSrc),
952 const_iv (PictOpDisjointDst),
953 const_iv (PictOpDisjointOver),
954 const_iv (PictOpDisjointOverReverse),
955 const_iv (PictOpDisjointIn),
956 const_iv (PictOpDisjointInReverse),
957 const_iv (PictOpDisjointOut),
958 const_iv (PictOpDisjointOutReverse),
959 const_iv (PictOpDisjointAtop),
960 const_iv (PictOpDisjointAtopReverse),
961 const_iv (PictOpDisjointXor),
962 const_iv (PictOpConjointClear),
963 const_iv (PictOpConjointSrc),
964 const_iv (PictOpConjointDst),
965 const_iv (PictOpConjointOver),
966 const_iv (PictOpConjointOverReverse),
967 const_iv (PictOpConjointIn),
968 const_iv (PictOpConjointInReverse),
969 const_iv (PictOpConjointOut),
970 const_iv (PictOpConjointOutReverse),
971 const_iv (PictOpConjointAtop),
972 const_iv (PictOpConjointAtopReverse),
973 const_iv (PictOpConjointXor),
974 // 0.11+
975 const_iv (PictOpMultiply),
976 const_iv (PictOpScreen),
977 const_iv (PictOpOverlay),
978 const_iv (PictOpDarken),
979 const_iv (PictOpLighten),
980 const_iv (PictOpColorDodge),
981 const_iv (PictOpColorBurn),
982 const_iv (PictOpHardLight),
983 const_iv (PictOpSoftLight),
984 const_iv (PictOpDifference),
985 const_iv (PictOpExclusion),
986 const_iv (PictOpHSLHue),
987 const_iv (PictOpHSLSaturation),
988 const_iv (PictOpHSLColor),
989 const_iv (PictOpHSLLuminosity),
914#endif 990#endif
915# if 0 991# if 0
916 const_iv (XIMForwardChar), 992 const_iv (XIMForwardChar),
917 const_iv (XIMBackwardChar), 993 const_iv (XIMBackwardChar),
918 const_iv (XIMForwardWord), 994 const_iv (XIMForwardWord),
… …
1396 CODE: 1472 CODE:
1397 RETVAL = THIS->parent_y; 1473 RETVAL = THIS->parent_y;
1398 OUTPUT: 1474 OUTPUT:
1399 RETVAL 1475 RETVAL
1400 1476
1477Window
1478rxvt_term::vt ()
1479 CODE:
1480 RETVAL = THIS->vt;
1481 OUTPUT:
1482 RETVAL
1483
1401void 1484void
1402rxvt_term::vt_emask_add (U32 emask) 1485rxvt_term::vt_emask_add (U32 emask)
1403 CODE: 1486 CODE:
1404 THIS->vt_emask_perl |= emask; 1487 THIS->vt_emask_perl |= emask;
1405 THIS->vt_select_input (); 1488 THIS->vt_select_input ();
… …
1812 1895
1813 if (ix) 1896 if (ix)
1814 { 1897 {
1815 THIS->selection.screen = THIS->current_screen; 1898 THIS->selection.screen = THIS->current_screen;
1816 1899
1817 THIS->want_refresh = 1; 1900 THIS->selection_changed ();
1818 THIS->refresh_check (); 1901 THIS->refresh_check ();
1819 } 1902 }
1820 } 1903 }
1821} 1904}
1822 1905
… …
1826 RETVAL = THIS->selection.screen; 1909 RETVAL = THIS->selection.screen;
1827 if (screen >= 0) 1910 if (screen >= 0)
1828 THIS->selection.screen = screen; 1911 THIS->selection.screen = screen;
1829 OUTPUT: 1912 OUTPUT:
1830 RETVAL 1913 RETVAL
1914
1915void
1916rxvt_term::selection_request (Time tm, int selnum)
1831 1917
1832void 1918void
1833rxvt_term::selection_clear (bool clipboard = false) 1919rxvt_term::selection_clear (bool clipboard = false)
1834 1920
1835void 1921void
… …
2097 PUSHs (sv_2mortal (newSViv (border ? THIS->vt_height : THIS->szHint.height))); 2183 PUSHs (sv_2mortal (newSViv (border ? THIS->vt_height : THIS->szHint.height)));
2098 2184
2099#if HAVE_IMG 2185#if HAVE_IMG
2100 2186
2101rxvt_img * 2187rxvt_img *
2102rxvt_term::new_img (SV *format, int x = 0, int y = 0, int width = 1, int height = 1) 2188rxvt_term::new_img (SV *format = &PL_sv_undef, int x = 0, int y = 0, int width = 1, int height = 1)
2103 CODE: 2189 CODE:
2104 XRenderPictFormat *f = SvOK (format) 2190 XRenderPictFormat *f = SvOK (format)
2105 ? XRenderFindStandardFormat (THIS->dpy, SvIV (format)) 2191 ? XRenderFindStandardFormat (THIS->dpy, SvIV (format))
2106 : XRenderFindVisualFormat (THIS->dpy, THIS->visual); 2192 : XRenderFindVisualFormat (THIS->dpy, THIS->visual);
2107 RETVAL = new rxvt_img (THIS, f, x, y, width, height); 2193 RETVAL = new rxvt_img (THIS, f, x, y, width, height);
… …
2136 OUTPUT: 2222 OUTPUT:
2137 RETVAL 2223 RETVAL
2138 2224
2139#endif 2225#endif
2140 2226
2141#if HAVE_BG_PIXMAP
2142
2143void 2227void
2144rxvt_term::set_background (rxvt_img *img, bool border = false) 2228rxvt_term::set_background (rxvt_img *img, bool border = false)
2145 CODE: 2229 CODE:
2146 THIS->bg_destroy (); 2230 delete THIS->bg_img;
2147 THIS->bg_flags &= ~(rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER | rxvt_term::BG_IS_TRANSPARENT); 2231 THIS->bg_img = 0;
2232 THIS->bg_flags = 0;
2148 2233
2149 if (img) // TODO: cannot be false 2234 if (img) // TODO: cannot be false
2150 { 2235 {
2151 img = img->clone (); // own the img 2236 img = img->clone (); // own the img
2152 2237
2153 if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap 2238 if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap
2154 img->sub_rect (0, 0, 2239 img->sub_rect (0, 0,
2155 border ? THIS->vt_width : THIS->szHint.width, 2240 border ? THIS->vt_width : THIS->szHint.width,
2156 border ? THIS->vt_height : THIS->szHint.height) 2241 border ? THIS->vt_height : THIS->szHint.height)
2157 ->replace (img); 2242 ->replace (img);
2158 2243
2159 // just in case, should usually be a nop 2244 // just in case, should usually be a nop
2160 img->reify () 2245 img->reify ()
2161 ->replace (img); 2246 ->replace (img);
2162 2247
… …
2170 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT; 2255 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT;
2171 } 2256 }
2172 2257
2173#endif 2258#endif
2174 2259
2175#endif
2176
2177############################################################################# 2260#############################################################################
2178# urxvt::overlay 2261# urxvt::overlay
2179############################################################################# 2262#############################################################################
2180 2263
2181MODULE = urxvt PACKAGE = urxvt::overlay 2264MODULE = urxvt PACKAGE = urxvt::overlay
… …
2202 C_ARGS: filename, 0 2285 C_ARGS: filename, 0
2203 2286
2204void 2287void
2205DESTROY (urxvt::pixbuf self) 2288DESTROY (urxvt::pixbuf self)
2206 CODE: 2289 CODE:
2207 gdk_pixbuf_unref (self); 2290 g_object_unref (self);
2208 2291
2209#endif 2292#endif
2210 2293
2211MODULE = urxvt PACKAGE = urxvt::img 2294MODULE = urxvt PACKAGE = urxvt::img
2212 2295
… …
2224 PUSHs (sv_2mortal (newSViv (THIS->w))); 2307 PUSHs (sv_2mortal (newSViv (THIS->w)));
2225 PUSHs (sv_2mortal (newSViv (THIS->h))); 2308 PUSHs (sv_2mortal (newSViv (THIS->h)));
2226 2309
2227int 2310int
2228rxvt_img::x () 2311rxvt_img::x ()
2312 ALIAS:
2313 x = 0
2314 y = 1
2315 w = 2
2316 h = 3
2229 CODE: 2317 CODE:
2230 RETVAL = THIS->x; 2318 switch (ix)
2231 OUTPUT: 2319 {
2232 RETVAL 2320 case 0: RETVAL = THIS->x; break;
2233 2321 case 1: RETVAL = THIS->y; break;
2234int 2322 case 2: RETVAL = THIS->w; break;
2235rxvt_img::y () 2323 case 3: RETVAL = THIS->h; break;
2236 CODE: 2324 }
2237 RETVAL = THIS->y;
2238 OUTPUT:
2239 RETVAL
2240
2241int
2242rxvt_img::w ()
2243 CODE:
2244 RETVAL = THIS->w;
2245 OUTPUT:
2246 RETVAL
2247
2248int
2249rxvt_img::h ()
2250 CODE:
2251 RETVAL = THIS->h;
2252 OUTPUT: 2325 OUTPUT:
2253 RETVAL 2326 RETVAL
2254 2327
2255Pixmap 2328Pixmap
2256rxvt_img::pm () 2329rxvt_img::pm ()
… …
2258 RETVAL = THIS->pm; 2331 RETVAL = THIS->pm;
2259 OUTPUT: 2332 OUTPUT:
2260 RETVAL 2333 RETVAL
2261 2334
2262void 2335void
2263rxvt_img::fill (SV *c) 2336rxvt_img::fill (SV *c, int x = 0, int y = 0, int w = THIS->w, int h = THIS->h)
2337 PROTOTYPE: $;$$$$
2264 INIT: 2338 INIT:
2265 rgba cc = parse_rgba (c, THIS->s); 2339 rgba cc = parse_rgba (c, THIS->s);
2266 C_ARGS: cc 2340 C_ARGS: cc, x, y, w, h
2267 2341
2268void 2342void
2269rxvt_img::DESTROY () 2343rxvt_img::DESTROY ()
2270 CODE: 2344 CODE:
2271 delete THIS; 2345 delete THIS;
2272 2346
2273void 2347void
2348rxvt_img::add_alpha ()
2349
2350void
2274rxvt_img::unshare () 2351rxvt_img::unshare ()
2275 2352
2276int 2353void
2277rxvt_img::repeat_mode (render_repeat_mode repeat = 0) 2354rxvt_img::repeat_mode (render_repeat_mode repeat = 0)
2278 CODE: 2355 PPCODE:
2279 if (items >= 2) 2356 if (items >= 2)
2280 THIS->repeat_mode (repeat); 2357 THIS->repeat_mode (repeat);
2281 if (GIMME_V != G_VOID) 2358 if (GIMME_V != G_VOID)
2282 XPUSHs (sv_2mortal (newSViv (THIS->repeat))); 2359 XPUSHs (sv_2mortal (newSViv (THIS->repeat)));
2283 2360
… …
2288rxvt_img::brightness (rxvt_img::nv r, rxvt_img::nv g, rxvt_img::nv b, rxvt_img::nv a = 1.) 2365rxvt_img::brightness (rxvt_img::nv r, rxvt_img::nv g, rxvt_img::nv b, rxvt_img::nv a = 1.)
2289 2366
2290void 2367void
2291rxvt_img::contrast (rxvt_img::nv r, rxvt_img::nv g, rxvt_img::nv b, rxvt_img::nv a = 1.) 2368rxvt_img::contrast (rxvt_img::nv r, rxvt_img::nv g, rxvt_img::nv b, rxvt_img::nv a = 1.)
2292 2369
2370void
2371rxvt_img::draw (rxvt_img *img, int op = PictOpOver, rxvt_img::nv mask = 1.);
2372
2293rxvt_img * 2373rxvt_img *
2294rxvt_img::clone () 2374rxvt_img::clone ()
2295 2375
2296rxvt_img * 2376rxvt_img *
2297rxvt_img::reify () 2377rxvt_img::reify ()
… …
2299rxvt_img * 2379rxvt_img *
2300rxvt_img::sub_rect (int x, int y, int width, int height) 2380rxvt_img::sub_rect (int x, int y, int width, int height)
2301 2381
2302rxvt_img * 2382rxvt_img *
2303rxvt_img::blur (int rh, int rv) 2383rxvt_img::blur (int rh, int rv)
2384
2385rxvt_img *
2386rxvt_img::muladd (rxvt_img::nv mul, rxvt_img::nv add)
2304 2387
2305rxvt_img * 2388rxvt_img *
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) 2389rxvt_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)
2307 INIT: 2390 INIT:
2308 rxvt_img::nv matrix[3][3] = { 2391 rxvt_img::nv matrix[3][3] = {
… …
2316rxvt_img::scale (int new_width, int new_height) 2399rxvt_img::scale (int new_width, int new_height)
2317 2400
2318rxvt_img * 2401rxvt_img *
2319rxvt_img::rotate (int x, int y, rxvt_img::nv phi) 2402rxvt_img::rotate (int x, int y, rxvt_img::nv phi)
2320 2403
2404rxvt_img *
2405rxvt_img::tint (SV *c)
2406 INIT:
2407 rgba cc = parse_rgba (c, THIS->s);
2408 C_ARGS: cc
2409
2410rxvt_img *
2411rxvt_img::shade (rxvt_img::nv factor)
2412
2413rxvt_img *
2414rxvt_img::filter (octet_string name, SV *params = &PL_sv_undef)
2415 CODE:
2416 rxvt_img::nv *vparams = 0;
2417 int nparams = 0;
2418
2419 if (SvOK (params))
2420 {
2421 if (!SvROK (params) || SvTYPE (SvRV (params)) != SVt_PVAV)
2422 croak ("rxvt_img::filter: params must be an array reference with parameter values");
2423
2424 nparams = av_len ((AV *)SvRV (params)) + 1;
2425 vparams = (rxvt_img::nv *)malloc (nparams * sizeof (rxvt_img::nv));
2426
2427 for (int i = 0; i < nparams; ++i)
2428 vparams [i] = SvNV (*av_fetch ((AV *)SvRV (params), i, 1));
2429 }
2430
2431 RETVAL = THIS->filter (name, nparams, vparams);
2432 free (vparams);
2433 OUTPUT:
2434 RETVAL
2435
2321#endif 2436#endif
2322 2437

Diff Legend

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