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.222 by root, Sat May 17 15:25:04 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;
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;
… …
755 static const struct { 793 static const struct {
756 const char *name; 794 const char *name;
757 IV iv; 795 IV iv;
758 } *civ, const_iv[] = { 796 } *civ, const_iv[] = {
759# 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_ACTION),
801
760 const_iv (NUM_RESOURCES), 802 const_iv (NUM_RESOURCES),
761 const_iv (DEFAULT_RSTYLE), 803 const_iv (DEFAULT_RSTYLE),
762 const_iv (OVERLAY_RSTYLE), 804 const_iv (OVERLAY_RSTYLE),
763 const_iv (Color_Bits), 805 const_iv (Color_Bits),
764 const_iv (RS_bgShift), const_iv (RS_bgMask), 806 const_iv (RS_bgShift), const_iv (RS_bgMask),
… …
774 const_iv (RS_Bold), 816 const_iv (RS_Bold),
775 const_iv (RS_Italic), 817 const_iv (RS_Italic),
776 const_iv (RS_Blink), 818 const_iv (RS_Blink),
777 const_iv (RS_RVid), 819 const_iv (RS_RVid),
778 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),
779 833
780 const_iv (CurrentTime), 834 const_iv (CurrentTime),
781 const_iv (ShiftMask), 835 const_iv (ShiftMask),
782 const_iv (LockMask), 836 const_iv (LockMask),
783 const_iv (ControlMask), 837 const_iv (ControlMask),
… …
875 const_iv (PictStandardA1), 929 const_iv (PictStandardA1),
876 const_iv (RepeatNone), 930 const_iv (RepeatNone),
877 const_iv (RepeatNormal), 931 const_iv (RepeatNormal),
878 const_iv (RepeatPad), 932 const_iv (RepeatPad),
879 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),
880#endif 990#endif
881# if 0 991# if 0
882 const_iv (XIMForwardChar), 992 const_iv (XIMForwardChar),
883 const_iv (XIMBackwardChar), 993 const_iv (XIMBackwardChar),
884 const_iv (XIMForwardWord), 994 const_iv (XIMForwardWord),
… …
1362 CODE: 1472 CODE:
1363 RETVAL = THIS->parent_y; 1473 RETVAL = THIS->parent_y;
1364 OUTPUT: 1474 OUTPUT:
1365 RETVAL 1475 RETVAL
1366 1476
1477Window
1478rxvt_term::vt ()
1479 CODE:
1480 RETVAL = THIS->vt;
1481 OUTPUT:
1482 RETVAL
1483
1367void 1484void
1368rxvt_term::vt_emask_add (U32 emask) 1485rxvt_term::vt_emask_add (U32 emask)
1369 CODE: 1486 CODE:
1370 THIS->vt_emask_perl |= emask; 1487 THIS->vt_emask_perl |= emask;
1371 THIS->vt_select_input (); 1488 THIS->vt_select_input ();
… …
1714} 1831}
1715 OUTPUT: 1832 OUTPUT:
1716 RETVAL 1833 RETVAL
1717 1834
1718bool 1835bool
1719rxvt_term::parse_keysym (char *keysym, char *str) 1836rxvt_term::bind_action (char *keysym, char *str)
1837 ALIAS:
1838 parse_keysym = 1
1720 CODE: 1839 CODE:
1721 RETVAL = 0 < THIS->parse_keysym (keysym, str); 1840 RETVAL = 0 < THIS->bind_action (keysym, str);
1722 THIS->keyboard->register_done (); 1841 THIS->keyboard->register_done ();
1723 OUTPUT: 1842 OUTPUT:
1724 RETVAL 1843 RETVAL
1725 1844
1726void 1845void
1727rxvt_term::register_command (int keysym, unsigned int state, SV *str) 1846rxvt_term::register_command (int keysym, unsigned int state, SV *str)
1728 CODE: 1847 CODE:
1729 wchar_t *wstr = sv2wcs (str); 1848 wchar_t *wstr = sv2wcs (str);
1730 THIS->keyboard->register_user_translation (keysym, state, wstr); 1849 THIS->keyboard->register_action (keysym, state, wstr);
1731 free (wstr); 1850 free (wstr);
1732 1851
1733void 1852void
1734rxvt_term::screen_cur (...) 1853rxvt_term::screen_cur (...)
1735 PROTOTYPE: $;$$ 1854 PROTOTYPE: $;$$
… …
1778 1897
1779 if (ix) 1898 if (ix)
1780 { 1899 {
1781 THIS->selection.screen = THIS->current_screen; 1900 THIS->selection.screen = THIS->current_screen;
1782 1901
1783 THIS->want_refresh = 1; 1902 THIS->selection_changed ();
1784 THIS->refresh_check (); 1903 THIS->refresh_check ();
1785 } 1904 }
1786 } 1905 }
1787} 1906}
1788 1907
… …
1794 THIS->selection.screen = screen; 1913 THIS->selection.screen = screen;
1795 OUTPUT: 1914 OUTPUT:
1796 RETVAL 1915 RETVAL
1797 1916
1798void 1917void
1918rxvt_term::selection_request (Time tm, int selnum)
1919
1920void
1799rxvt_term::selection_clear (bool clipboard = false) 1921rxvt_term::selection_clear (bool clipboard = false)
1800 1922
1801void 1923void
1802rxvt_term::selection_make (Time eventtime, bool rect = false) 1924rxvt_term::selection_make (Time eventtime, bool rect = false)
1803 CODE: 1925 CODE:
… …
1857{ 1979{
1858 wchar_t *wstr = sv2wcs (string); 1980 wchar_t *wstr = sv2wcs (string);
1859 THIS->scr_add_lines (wstr, wcslen (wstr)); 1981 THIS->scr_add_lines (wstr, wcslen (wstr));
1860 free (wstr); 1982 free (wstr);
1861} 1983}
1984
1985void
1986rxvt_term::tt_write_user_input (SV *octets)
1987 INIT:
1988 STRLEN len;
1989 char *str = SvPVbyte (octets, len);
1990 C_ARGS:
1991 str, len
1862 1992
1863void 1993void
1864rxvt_term::tt_write (SV *octets) 1994rxvt_term::tt_write (SV *octets)
1865 INIT: 1995 INIT:
1866 STRLEN len; 1996 STRLEN len;
… …
2063 PUSHs (sv_2mortal (newSViv (border ? THIS->vt_height : THIS->szHint.height))); 2193 PUSHs (sv_2mortal (newSViv (border ? THIS->vt_height : THIS->szHint.height)));
2064 2194
2065#if HAVE_IMG 2195#if HAVE_IMG
2066 2196
2067rxvt_img * 2197rxvt_img *
2068rxvt_term::new_img (SV *format, int width = 1, int height = 1) 2198rxvt_term::new_img (SV *format = &PL_sv_undef, int x = 0, int y = 0, int width = 1, int height = 1)
2069 CODE: 2199 CODE:
2070 XRenderPictFormat *f = SvOK (format) 2200 XRenderPictFormat *f = SvOK (format)
2071 ? XRenderFindStandardFormat (THIS->dpy, SvIV (format)) 2201 ? XRenderFindStandardFormat (THIS->dpy, SvIV (format))
2072 : XRenderFindVisualFormat (THIS->dpy, THIS->visual); 2202 : XRenderFindVisualFormat (THIS->dpy, THIS->visual);
2073 RETVAL = new rxvt_img (THIS, f, 0, 0, width, height); 2203 RETVAL = new rxvt_img (THIS, f, x, y, width, height);
2074 RETVAL->alloc (); 2204 RETVAL->alloc ();
2075 OUTPUT: 2205 OUTPUT:
2076 RETVAL 2206 RETVAL
2077 2207
2078#if ENABLE_TRANSPARENCY 2208#if ENABLE_TRANSPARENCY
… …
2102 OUTPUT: 2232 OUTPUT:
2103 RETVAL 2233 RETVAL
2104 2234
2105#endif 2235#endif
2106 2236
2107#if HAVE_BG_PIXMAP
2108
2109void 2237void
2110rxvt_term::set_background (rxvt_img *img, bool border = false) 2238rxvt_term::set_background (rxvt_img *img, bool border = false)
2111 CODE: 2239 CODE:
2112 THIS->bg_destroy (); 2240 delete THIS->bg_img;
2113 THIS->bg_flags &= ~(rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER | rxvt_term::BG_IS_TRANSPARENT); 2241 THIS->bg_img = 0;
2242 THIS->bg_flags = 0;
2114 2243
2115 if (img) // TODO: cannot be false 2244 if (img) // TODO: cannot be false
2116 { 2245 {
2117 img = img->clone (); // own the img 2246 img = img->clone (); // own the img
2118 2247
2119 if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap 2248 if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap
2120 img->sub_rect (0, 0, 2249 img->sub_rect (0, 0,
2121 border ? THIS->vt_width : THIS->szHint.width, 2250 border ? THIS->vt_width : THIS->szHint.width,
2122 border ? THIS->vt_height : THIS->szHint.height) 2251 border ? THIS->vt_height : THIS->szHint.height)
2123 ->replace (img); 2252 ->replace (img);
2124 2253
2125 // just in case, should usually be a nop 2254 // just in case, should usually be a nop
2126 img->reify () 2255 img->reify ()
2127 ->replace (img); 2256 ->replace (img);
2128 2257
… …
2136 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT; 2265 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT;
2137 } 2266 }
2138 2267
2139#endif 2268#endif
2140 2269
2141#endif
2142
2143############################################################################# 2270#############################################################################
2144# urxvt::overlay 2271# urxvt::overlay
2145############################################################################# 2272#############################################################################
2146 2273
2147MODULE = urxvt PACKAGE = urxvt::overlay 2274MODULE = urxvt PACKAGE = urxvt::overlay
… …
2168 C_ARGS: filename, 0 2295 C_ARGS: filename, 0
2169 2296
2170void 2297void
2171DESTROY (urxvt::pixbuf self) 2298DESTROY (urxvt::pixbuf self)
2172 CODE: 2299 CODE:
2173 gdk_pixbuf_unref (self); 2300 g_object_unref (self);
2174 2301
2175#endif 2302#endif
2176 2303
2177MODULE = urxvt PACKAGE = urxvt::img 2304MODULE = urxvt PACKAGE = urxvt::img
2178 2305
2179#if HAVE_IMG 2306#if HAVE_IMG
2180 2307
2181# rxvt_img *new (rxvt_screen *screen, XRenderPictFormat *format, int width, int height) 2308# 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); 2309# rxvt_img *rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int width, int height, Pixmap pixmap);
2183 2310
2311void
2312rxvt_img::geometry ()
2313 PPCODE:
2314 EXTEND (SP, 4);
2315 PUSHs (sv_2mortal (newSViv (THIS->x)));
2316 PUSHs (sv_2mortal (newSViv (THIS->y)));
2317 PUSHs (sv_2mortal (newSViv (THIS->w)));
2318 PUSHs (sv_2mortal (newSViv (THIS->h)));
2319
2184int 2320int
2185rxvt_img::w () 2321rxvt_img::x ()
2322 ALIAS:
2323 x = 0
2324 y = 1
2325 w = 2
2326 h = 3
2186 CODE: 2327 CODE:
2187 RETVAL = THIS->w; 2328 switch (ix)
2188 OUTPUT: 2329 {
2189 RETVAL 2330 case 0: RETVAL = THIS->x; break;
2190 2331 case 1: RETVAL = THIS->y; break;
2191int 2332 case 2: RETVAL = THIS->w; break;
2192rxvt_img::h () 2333 case 3: RETVAL = THIS->h; break;
2193 CODE: 2334 }
2194 RETVAL = THIS->h;
2195 OUTPUT: 2335 OUTPUT:
2196 RETVAL 2336 RETVAL
2197 2337
2198Pixmap 2338Pixmap
2199rxvt_img::pm () 2339rxvt_img::pm ()
… …
2201 RETVAL = THIS->pm; 2341 RETVAL = THIS->pm;
2202 OUTPUT: 2342 OUTPUT:
2203 RETVAL 2343 RETVAL
2204 2344
2205void 2345void
2206rxvt_img::fill (SV *c) 2346rxvt_img::fill (SV *c, int x = 0, int y = 0, int w = THIS->w, int h = THIS->h)
2347 PROTOTYPE: $;$$$$
2207 INIT: 2348 INIT:
2208 rxvt_color rc; 2349 rgba cc = parse_rgba (c, THIS->s);
2209 parse_color (THIS->s, rc, c); 2350 C_ARGS: cc, x, y, w, h
2210 C_ARGS: rc
2211 2351
2212void 2352void
2213rxvt_img::DESTROY () 2353rxvt_img::DESTROY ()
2214 CODE: 2354 CODE:
2215 delete THIS; 2355 delete THIS;
2216 2356
2217void 2357void
2358rxvt_img::add_alpha ()
2359
2360void
2218rxvt_img::unshare () 2361rxvt_img::unshare ()
2219 2362
2220int 2363void
2221rxvt_img::repeat_mode (render_repeat_mode repeat = 0) 2364rxvt_img::repeat_mode (render_repeat_mode repeat = 0)
2222 CODE: 2365 PPCODE:
2223 if (items >= 2) 2366 if (items >= 2)
2224 THIS->repeat_mode (repeat); 2367 THIS->repeat_mode (repeat);
2225 if (GIMME_V != G_VOID) 2368 if (GIMME_V != G_VOID)
2226 XPUSHs (sv_2mortal (newSViv (THIS->repeat))); 2369 XPUSHs (sv_2mortal (newSViv (THIS->repeat)));
2227 2370
2228void 2371void
2229rxvt_img::move (int dx, int dy) 2372rxvt_img::move (int dx, int dy)
2230 2373
2231void 2374void
2232rxvt_img::brightness (NV r, NV g, NV b, NV a = 1.) 2375rxvt_img::brightness (rxvt_img::nv r, rxvt_img::nv g, rxvt_img::nv b, rxvt_img::nv a = 1.)
2233 2376
2234void 2377void
2235rxvt_img::contrast (NV r, NV g, NV b, NV a = 1.) 2378rxvt_img::contrast (rxvt_img::nv r, rxvt_img::nv g, rxvt_img::nv b, rxvt_img::nv a = 1.)
2379
2380void
2381rxvt_img::draw (rxvt_img *img, int op = PictOpOver, rxvt_img::nv mask = 1.);
2236 2382
2237rxvt_img * 2383rxvt_img *
2238rxvt_img::clone () 2384rxvt_img::clone ()
2239 2385
2240rxvt_img * 2386rxvt_img *
… …
2245 2391
2246rxvt_img * 2392rxvt_img *
2247rxvt_img::blur (int rh, int rv) 2393rxvt_img::blur (int rh, int rv)
2248 2394
2249rxvt_img * 2395rxvt_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) 2396rxvt_img::muladd (rxvt_img::nv mul, rxvt_img::nv add)
2397
2398rxvt_img *
2399rxvt_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: 2400 INIT:
2252 double matrix[9] = { 2401 rxvt_img::nv matrix[3][3] = {
2253 p11, p12, p13, 2402 { p11, p12, p13 },
2254 p21, p22, p23, 2403 { p21, p22, p23 },
2255 p31, p32, p33 2404 { p31, p32, p33 }
2256 }; 2405 };
2257 C_ARGS: matrix, new_width, new_height 2406 C_ARGS: matrix
2258 2407
2259rxvt_img * 2408rxvt_img *
2260rxvt_img::scale (int new_width, int new_height) 2409rxvt_img::scale (int new_width, int new_height)
2261 2410
2262rxvt_img * 2411rxvt_img *
2263rxvt_img::rotate (int x, int y, NV phi, int new_width = 0, int new_height = 0) 2412rxvt_img::rotate (int x, int y, rxvt_img::nv phi)
2413
2414rxvt_img *
2415rxvt_img::tint (SV *c)
2416 INIT:
2417 rgba cc = parse_rgba (c, THIS->s);
2418 C_ARGS: cc
2419
2420rxvt_img *
2421rxvt_img::shade (rxvt_img::nv factor)
2422
2423rxvt_img *
2424rxvt_img::filter (octet_string name, SV *params = &PL_sv_undef)
2425 CODE:
2426 rxvt_img::nv *vparams = 0;
2427 int nparams = 0;
2428
2429 if (SvOK (params))
2430 {
2431 if (!SvROK (params) || SvTYPE (SvRV (params)) != SVt_PVAV)
2432 croak ("rxvt_img::filter: params must be an array reference with parameter values");
2433
2434 nparams = av_len ((AV *)SvRV (params)) + 1;
2435 vparams = (rxvt_img::nv *)malloc (nparams * sizeof (rxvt_img::nv));
2436
2437 for (int i = 0; i < nparams; ++i)
2438 vparams [i] = SvNV (*av_fetch ((AV *)SvRV (params), i, 1));
2439 }
2440
2441 RETVAL = THIS->filter (name, nparams, vparams);
2442 free (vparams);
2443 OUTPUT:
2444 RETVAL
2264 2445
2265#endif 2446#endif
2266 2447

Diff Legend

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