[ViewVC] Diff of: cvs/rxvt-unicode/src/rxvtperl.xs

Comparing rxvt-unicode/src/rxvtperl.xs (file contents):
Revision 1.156 by root, Sun Jun 3 15:54:05 2012 UTC vs.
Revision 1.169 by sf-exg, Tue Jun 5 15:18:24 2012 UTC

…		…
51		51
52	/////////////////////////////////////////////////////////////////////////////	52	/////////////////////////////////////////////////////////////////////////////
53		53
54	typedef char * octet_string;	54	typedef char * octet_string;
55	typedef char * utf8_string;	55	typedef char * utf8_string;
56	typedef SV * urxvt_color;	56
		57	typedef int render_repeat_mode;
57		58
58	typedef GdkPixbuf * urxvt__pixbuf;	59	typedef GdkPixbuf * urxvt__pixbuf;
59	typedef rxvt_img * urxvt__img;	60	typedef rxvt_img * urxvt__img;
60		61
61	/////////////////////////////////////////////////////////////////////////////	62	/////////////////////////////////////////////////////////////////////////////
…		…
801	const_iv (XIMSecondary),	802	const_iv (XIMSecondary),
802	const_iv (XIMTertiary),	803	const_iv (XIMTertiary),
803	const_iv (XIMVisibleToForward),	804	const_iv (XIMVisibleToForward),
804	const_iv (XIMVisibleToBackword),	805	const_iv (XIMVisibleToBackword),
805	const_iv (XIMVisibleToCenter),	806	const_iv (XIMVisibleToCenter),
		807	#if XRENDER
		808	const_iv (PictStandardARGB32),
		809	const_iv (PictStandardRGB24),
		810	const_iv (PictStandardA8),
		811	const_iv (PictStandardA4),
		812	const_iv (PictStandardA1),
		813	const_iv (RepeatNone),
		814	const_iv (RepeatNormal),
		815	const_iv (RepeatPad),
		816	const_iv (RepeatReflect),
		817	#endif
806	# if 0	818	# if 0
807	const_iv (XIMForwardChar),	819	const_iv (XIMForwardChar),
808	const_iv (XIMBackwardChar),	820	const_iv (XIMBackwardChar),
809	const_iv (XIMForwardWord),	821	const_iv (XIMForwardWord),
810	const_iv (XIMBackwardWord),	822	const_iv (XIMBackwardWord),
…		…
835	rxvt_fatal ("%s", msg);	847	rxvt_fatal ("%s", msg);
836		848
837	void	849	void
838	_exit (int status)	850	_exit (int status)
839		851
		852	void
		853	catch_fatal (SV *block)
		854	PROTOTYPE: &
		855	CODE:
		856	try
		857	{
		858	PUSHMARK (SP);
		859	PUTBACK;
		860	call_sv (block, G_VOID \| G_DISCARD);
		861	SPAGAIN;
		862	}
		863	catch (const rxvt_failure_exception &e)
		864	{
		865	croak ("rxvt_fatal exception caught, trying to continue.");
		866	}
		867
840	NV	868	NV
841	NOW ()	869	NOW ()
842	CODE:	870	CODE:
843	RETVAL = ev::now ();	871	RETVAL = ev::now ();
844	OUTPUT:	872	OUTPUT:
…		…
968	rxvt_term::destroy ()	996	rxvt_term::destroy ()
969		997
970	void	998	void
971	rxvt_term::set_should_invoke (int htype, int inc)	999	rxvt_term::set_should_invoke (int htype, int inc)
972	CODE:	1000	CODE:
973	THIS->perl.should_invoke [htype] += inc;	1001	uint8_t &count = THIS->perl.should_invoke [htype];
		1002	uint8_t prev = count;
		1003	count += inc;
		1004	if (!prev != !count)
		1005	{
		1006	// hook status changed, react
		1007	switch (htype)
		1008	{
		1009	case HOOK_POSITION_CHANGE:
		1010	if (count)
		1011	THIS->get_window_origin (THIS->parent_x, THIS->parent_y);
		1012	}
		1013	}
974		1014
975	int	1015	int
976	rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)	1016	rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)
977	CODE:	1017	CODE:
978	RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,	1018	RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,
…		…
1235	CODE:	1275	CODE:
1236	RETVAL = THIS->parent;	1276	RETVAL = THIS->parent;
1237	OUTPUT:	1277	OUTPUT:
1238	RETVAL	1278	RETVAL
1239		1279
1240	Window	1280	int
1241	rxvt_term::vt ()	1281	rxvt_term::parent_x ()
1242	CODE:	1282	CODE:
1243	RETVAL = THIS->vt;	1283	RETVAL = THIS->parent_x;
		1284	OUTPUT:
		1285	RETVAL
		1286
		1287	int
		1288	rxvt_term::parent_y ()
		1289	CODE:
		1290	RETVAL = THIS->parent_y;
1244	OUTPUT:	1291	OUTPUT:
1245	RETVAL	1292	RETVAL
1246		1293
1247	void	1294	void
1248	rxvt_term::vt_emask_add (U32 emask)	1295	rxvt_term::vt_emask_add (U32 emask)
…		…
1724		1771
1725	void	1772	void
1726	rxvt_term::scr_bell ()	1773	rxvt_term::scr_bell ()
1727		1774
1728	void	1775	void
		1776	rxvt_term::scr_recolour (bool refresh = true);
		1777
		1778	void
1729	rxvt_term::scr_change_screen (int screen)	1779	rxvt_term::scr_change_screen (int screen)
1730		1780
1731	void	1781	void
1732	rxvt_term::scr_add_lines (SV *string)	1782	rxvt_term::scr_add_lines (SV *string)
1733	CODE:	1783	CODE:
…		…
1846	type, format, PropModeReplace,	1896	type, format, PropModeReplace,
1847	(unsigned char *)data_, len / elemsize);	1897	(unsigned char *)data_, len / elemsize);
1848	}	1898	}
1849		1899
1850	Atom	1900	Atom
1851	XInternAtom (rxvt_term term, char atom_name, int only_if_exists = FALSE)	1901	XInternAtom (rxvt_term *term, octet_string atom_name, int only_if_exists = FALSE)
1852	C_ARGS: term->dpy, atom_name, only_if_exists	1902	C_ARGS: term->dpy, atom_name, only_if_exists
1853		1903
1854	char *	1904	char *
1855	XGetAtomName (rxvt_term *term, Atom atom)	1905	XGetAtomName (rxvt_term *term, Atom atom)
1856	C_ARGS: term->dpy, atom	1906	C_ARGS: term->dpy, atom
1857	CLEANUP:	1907	CLEANUP:
1858	XFree (RETVAL);	1908	XFree (RETVAL);
1859		1909
1860	void	1910	void
1861	XDeleteProperty (rxvt_term *term, Window window, Atom property)	1911	XDeleteProperty (rxvt_term *term, Window window, Atom property)
1862	C_ARGS: term->dpy, window, property	1912	C_ARGS: term->dpy, window, property
1863		1913
1864	Window	1914	Window
1865	rxvt_term::DefaultRootWindow ()	1915	rxvt_term::DefaultRootWindow ()
1866	CODE:	1916	CODE:
1867	RETVAL = THIS->display->root;	1917	RETVAL = THIS->display->root;
…		…
1919	PUSHs (newSVuv (child));	1969	PUSHs (newSVuv (child));
1920	}	1970	}
1921	}	1971	}
1922		1972
1923	#############################################################################	1973	#############################################################################
		1974	# fancy bg bloatstuff (TODO: should be moved up somewhere)
		1975
		1976	# TODO: ugly
		1977	void
		1978	rxvt_term::get_geometry ()
		1979	PPCODE:
		1980	EXTEND (SP, 4);
		1981	PUSHs (sv_2mortal (newSViv (THIS->parent_x)));
		1982	PUSHs (sv_2mortal (newSViv (THIS->parent_y)));
		1983	PUSHs (sv_2mortal (newSViv (THIS->szHint.width)));
		1984	PUSHs (sv_2mortal (newSViv (THIS->szHint.height)));
		1985
		1986	#if HAVE_IMG
		1987
		1988	rxvt_img *
		1989	rxvt_term::new_img (SV *format, int width, int height)
		1990	CODE:
		1991	XRenderPictFormat *f = SvOK (format)
		1992	? XRenderFindStandardFormat (THIS->dpy, SvIV (format))
		1993	: XRenderFindVisualFormat (THIS->dpy, THIS->visual);
		1994	RETVAL = new rxvt_img (THIS, f, width, height);
		1995	OUTPUT:
		1996	RETVAL
		1997
		1998	#if ENABLE_TRANSPARENCY
		1999
		2000	#if 0
		2001
		2002	rxvt_img *
		2003	rxvt_term::new_img_from_root ()
		2004	CODE:
		2005	RETVAL = rxvt_img::new_from_root (THIS);
		2006	OUTPUT:
		2007	RETVAL
		2008
		2009	#endif
		2010
		2011	#endif
		2012
		2013	#if HAVE_PIXBUF
		2014
		2015	rxvt_img *
		2016	rxvt_term::new_img_from_file (octet_string filename)
		2017	CODE:
		2018	try
		2019	{
		2020	RETVAL = rxvt_img::new_from_file (THIS, filename);
		2021	}
		2022	catch (const class rxvt_failure_exception &e)
		2023	{
		2024	croak ("new_img_from_file failed");
		2025	}
		2026	OUTPUT:
		2027	RETVAL
		2028
		2029	#endif
		2030
		2031	#if HAVE_BG_PIXMAP
		2032
		2033	void
		2034	rxvt_term::set_background (rxvt_img *img)
		2035	CODE:
		2036	THIS->bg_destroy ();
		2037	THIS->bg_pixmap = None;
		2038	THIS->bg_flags &= ~rxvt_term::BG_NEEDS_REFRESH;
		2039
		2040	if (img) // TODO: cannot be false
		2041	{
		2042	img->unshare ();
		2043	THIS->bg_pixmap = img->steal ();
		2044	THIS->bg_flags \|= rxvt_term::BG_NEEDS_REFRESH;
		2045	THIS->bg_valid_since = ev::now (); // TODO: extra bloat
		2046	}
		2047
		2048	#endif
		2049
		2050	#endif
		2051
		2052	#############################################################################
1924	# urxvt::overlay	2053	# urxvt::overlay
1925	#############################################################################	2054	#############################################################################
1926		2055
1927	MODULE = urxvt PACKAGE = urxvt::overlay	2056	MODULE = urxvt PACKAGE = urxvt::overlay
1928		2057
…		…
1956		2085
1957	MODULE = urxvt PACKAGE = urxvt::img	2086	MODULE = urxvt PACKAGE = urxvt::img
1958		2087
1959	#if HAVE_IMG	2088	#if HAVE_IMG
1960		2089
1961	# rxvt_img (rxvt_screen screen, XRenderPictFormat format, int width, int height);	2090	# rxvt_img new (rxvt_screen screen, XRenderPictFormat *format, int width, int height)
1962	# rxvt_img (rxvt_screen screen, XRenderPictFormat format, int width, int height, Pixmap pixmap);	2091	# rxvt_img rxvt_img (rxvt_screen screen, XRenderPictFormat *format, int width, int height, Pixmap pixmap);
1963		2092
1964	void fill (urxvt::img self, SV *c)	2093	int
		2094	rxvt_img::w ()
1965	CODE:	2095	CODE:
		2096	RETVAL = THIS->w;
		2097	OUTPUT:
		2098	RETVAL
		2099
		2100	int
		2101	rxvt_img::h ()
		2102	CODE:
		2103	RETVAL = THIS->h;
		2104	OUTPUT:
		2105	RETVAL
		2106
		2107	bool
		2108	rxvt_img::shared ()
		2109	CODE:
		2110	RETVAL = THIS->shared;
		2111	OUTPUT:
		2112	RETVAL
		2113
		2114	Pixmap
		2115	rxvt_img::pm ()
		2116	CODE:
		2117	RETVAL = THIS->pm;
		2118	OUTPUT:
		2119	RETVAL
		2120
		2121	void
		2122	rxvt_img::fill (SV *c)
		2123	INIT:
1966	rxvt_color rc;	2124	rxvt_color rc;
1967	parse_color (self->s, rc, c);	2125	parse_color (THIS->s, rc, c);
1968	self->fill (rc);	2126	C_ARGS: rc
1969		2127
1970	void blur (urxvt::img self, int rh, int rv)	2128	void
		2129	rxvt_img::DESTROY ()
1971	CODE:	2130	CODE:
1972	self->blur (rh, rv);	2131	delete THIS;
1973		2132
1974	void brightness (urxvt::img self, double r, double g, double b, double a = 1.)	2133	rxvt_img *
1975	CODE:	2134	rxvt_img::blur (int rh, int rv)
1976	self->brightness (r, g, b, a);
1977		2135
1978	void contrast (urxvt::img self, double r, double g, double b, double a = 1.)	2136	void
1979	CODE:	2137	rxvt_img::brightness (NV r, NV g, NV b, NV a = 1.)
1980	self->contrast (r, g, b, a);
1981		2138
1982	urxvt::img copy (urxvt::img self)	2139	void
1983	CODE:	2140	rxvt_img::contrast (NV r, NV g, NV b, NV a = 1.)
1984	RETVAL = self->copy ();
1985	OUTPUT:
1986	RETVAL
1987		2141
		2142	void
		2143	rxvt_img::unshare ()
		2144
		2145	rxvt_img *
		2146	rxvt_img::clone ()
		2147
		2148	rxvt_img *
		2149	rxvt_img::sub_rect (int x, int y, int width, int height, render_repeat_mode repeat = RepeatNormal)
		2150
		2151	rxvt_img *
		2152	rxvt_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, render_repeat_mode repeat = RepeatNormal)
		2153	INIT:
		2154	double matrix[9] = {
		2155	p11, p12, p13,
		2156	p21, p22, p23,
		2157	p31, p32, p33
		2158	};
		2159	C_ARGS: new_width, new_height, matrix, repeat
		2160
		2161	rxvt_img *
1988	urxvt::img scale (urxvt::img self, int new_width, int new_height)	2162	rxvt_img::scale (int new_width, int new_height)
1989	CODE:
1990	RETVAL = self->scale (new_width, new_height);
1991	OUTPUT:
1992	RETVAL
1993		2163
1994	# rxvt_img *transform (urxvt::img self, int new_width, int new_height, double matrix[16]);	2164	rxvt_img *
		2165	rxvt_img::rotate (int new_width, int new_height, int x, int y, NV phi, render_repeat_mode repeat = RepeatNormal)
1995		2166
1996	#endif	2167	#endif
1997		2168

Diff Legend

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

Comparing rxvt-unicode/src/rxvtperl.xs (file contents): Revision 1.156 by root, Sun Jun 3 15:54:05 2012 UTC vs. Revision 1.169 by sf-exg, Tue Jun 5 15:18:24 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtperl.xs (file contents):
Revision 1.156 by root, Sun Jun 3 15:54:05 2012 UTC vs.
Revision 1.169 by sf-exg, Tue Jun 5 15:18:24 2012 UTC