[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.166 by root, Tue Jun 5 11:00:40 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;
57		56
58	typedef GdkPixbuf * urxvt__pixbuf;	57	typedef GdkPixbuf * urxvt__pixbuf;
59	typedef rxvt_img * urxvt__img;	58	typedef rxvt_img * urxvt__img;
60		59
61	/////////////////////////////////////////////////////////////////////////////	60	/////////////////////////////////////////////////////////////////////////////
…		…
801	const_iv (XIMSecondary),	800	const_iv (XIMSecondary),
802	const_iv (XIMTertiary),	801	const_iv (XIMTertiary),
803	const_iv (XIMVisibleToForward),	802	const_iv (XIMVisibleToForward),
804	const_iv (XIMVisibleToBackword),	803	const_iv (XIMVisibleToBackword),
805	const_iv (XIMVisibleToCenter),	804	const_iv (XIMVisibleToCenter),
		805	#if XRENDER
		806	const_iv (PictStandardARGB32),
		807	const_iv (PictStandardRGB24),
		808	const_iv (PictStandardA8),
		809	const_iv (PictStandardA4),
		810	const_iv (PictStandardA1),
		811	const_iv (RepeatNone),
		812	const_iv (RepeatNormal),
		813	const_iv (RepeatPad),
		814	const_iv (RepeatReflect),
		815	#endif
806	# if 0	816	# if 0
807	const_iv (XIMForwardChar),	817	const_iv (XIMForwardChar),
808	const_iv (XIMBackwardChar),	818	const_iv (XIMBackwardChar),
809	const_iv (XIMForwardWord),	819	const_iv (XIMForwardWord),
810	const_iv (XIMBackwardWord),	820	const_iv (XIMBackwardWord),
…		…
968	rxvt_term::destroy ()	978	rxvt_term::destroy ()
969		979
970	void	980	void
971	rxvt_term::set_should_invoke (int htype, int inc)	981	rxvt_term::set_should_invoke (int htype, int inc)
972	CODE:	982	CODE:
973	THIS->perl.should_invoke [htype] += inc;	983	uint8_t &count = THIS->perl.should_invoke [htype];
		984	uint8_t prev = count;
		985	count += inc;
		986	if (!prev != !count)
		987	{
		988	// hook status changed, react
		989	switch (htype)
		990	{
		991	case HOOK_POSITION_CHANGE:
		992	if (count)
		993	THIS->get_window_origin (THIS->parent_x, THIS->parent_y);
		994	}
		995	}
974		996
975	int	997	int
976	rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)	998	rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)
977	CODE:	999	CODE:
978	RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,	1000	RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,
…		…
1235	CODE:	1257	CODE:
1236	RETVAL = THIS->parent;	1258	RETVAL = THIS->parent;
1237	OUTPUT:	1259	OUTPUT:
1238	RETVAL	1260	RETVAL
1239		1261
1240	Window	1262	int
1241	rxvt_term::vt ()	1263	rxvt_term::parent_x ()
1242	CODE:	1264	CODE:
1243	RETVAL = THIS->vt;	1265	RETVAL = THIS->parent_x;
		1266	OUTPUT:
		1267	RETVAL
		1268
		1269	int
		1270	rxvt_term::parent_y ()
		1271	CODE:
		1272	RETVAL = THIS->parent_y;
1244	OUTPUT:	1273	OUTPUT:
1245	RETVAL	1274	RETVAL
1246		1275
1247	void	1276	void
1248	rxvt_term::vt_emask_add (U32 emask)	1277	rxvt_term::vt_emask_add (U32 emask)
…		…
1724		1753
1725	void	1754	void
1726	rxvt_term::scr_bell ()	1755	rxvt_term::scr_bell ()
1727		1756
1728	void	1757	void
		1758	rxvt_term::scr_recolour (bool refresh = true);
		1759
		1760	void
1729	rxvt_term::scr_change_screen (int screen)	1761	rxvt_term::scr_change_screen (int screen)
1730		1762
1731	void	1763	void
1732	rxvt_term::scr_add_lines (SV *string)	1764	rxvt_term::scr_add_lines (SV *string)
1733	CODE:	1765	CODE:
…		…
1846	type, format, PropModeReplace,	1878	type, format, PropModeReplace,
1847	(unsigned char *)data_, len / elemsize);	1879	(unsigned char *)data_, len / elemsize);
1848	}	1880	}
1849		1881
1850	Atom	1882	Atom
1851	XInternAtom (rxvt_term term, char atom_name, int only_if_exists = FALSE)	1883	XInternAtom (rxvt_term *term, octet_string atom_name, int only_if_exists = FALSE)
1852	C_ARGS: term->dpy, atom_name, only_if_exists	1884	C_ARGS: term->dpy, atom_name, only_if_exists
1853		1885
1854	char *	1886	char *
1855	XGetAtomName (rxvt_term *term, Atom atom)	1887	XGetAtomName (rxvt_term *term, Atom atom)
1856	C_ARGS: term->dpy, atom	1888	C_ARGS: term->dpy, atom
1857	CLEANUP:	1889	CLEANUP:
1858	XFree (RETVAL);	1890	XFree (RETVAL);
1859		1891
1860	void	1892	void
1861	XDeleteProperty (rxvt_term *term, Window window, Atom property)	1893	XDeleteProperty (rxvt_term *term, Window window, Atom property)
1862	C_ARGS: term->dpy, window, property	1894	C_ARGS: term->dpy, window, property
1863		1895
1864	Window	1896	Window
1865	rxvt_term::DefaultRootWindow ()	1897	rxvt_term::DefaultRootWindow ()
1866	CODE:	1898	CODE:
1867	RETVAL = THIS->display->root;	1899	RETVAL = THIS->display->root;
…		…
1919	PUSHs (newSVuv (child));	1951	PUSHs (newSVuv (child));
1920	}	1952	}
1921	}	1953	}
1922		1954
1923	#############################################################################	1955	#############################################################################
		1956	# fancy bg bloatstuff (TODO: should be moved up somewhere)
		1957
		1958	# TODO: ugly
		1959	void
		1960	rxvt_term::get_geometry ()
		1961	PPCODE:
		1962	EXTEND (SP, 4);
		1963	PUSHs (sv_2mortal (newSViv (THIS->parent_x)));
		1964	PUSHs (sv_2mortal (newSViv (THIS->parent_y)));
		1965	PUSHs (sv_2mortal (newSViv (THIS->szHint.width)));
		1966	PUSHs (sv_2mortal (newSViv (THIS->szHint.height)));
		1967
		1968	#if HAVE_IMG
		1969
		1970	rxvt_img *
		1971	rxvt_term::new_img (SV *format, int width, int height)
		1972	CODE:
		1973	XRenderPictFormat *f = SvOK (format)
		1974	? XRenderFindVisualFormat (THIS->dpy, THIS->visual)
		1975	: XRenderFindStandardFormat (THIS->dpy, SvIV (format));
		1976	RETVAL = new rxvt_img (THIS, f, width, height);
		1977	OUTPUT:
		1978	RETVAL
		1979
		1980	#if ENABLE_TRANSPARENCY
		1981
		1982	#if 0
		1983
		1984	rxvt_img *
		1985	rxvt_term::new_img_from_root ()
		1986	CODE:
		1987	RETVAL = rxvt_img::new_from_root (THIS);
		1988	OUTPUT:
		1989	RETVAL
		1990
		1991	#endif
		1992
		1993	#endif
		1994
		1995	#if HAVE_PIXBUF
		1996
		1997	rxvt_img *
		1998	rxvt_term::new_img_from_file (octet_string filename)
		1999	CODE:
		2000	try
		2001	{
		2002	RETVAL = rxvt_img::new_from_file (THIS, filename);
		2003	}
		2004	catch (const class rxvt_failure_exception &e)
		2005	{
		2006	croak ("new_img_from_file failed");
		2007	}
		2008	OUTPUT:
		2009	RETVAL
		2010
		2011	#endif
		2012
		2013	#if HAVE_BG_PIXMAP
		2014
		2015	void
		2016	rxvt_term::set_background (rxvt_img *img)
		2017	CODE:
		2018	THIS->bg_destroy ();
		2019	THIS->bg_pixmap = None;
		2020	THIS->bg_flags &= ~rxvt_term::BG_NEEDS_REFRESH;
		2021
		2022	if (img) // TODO: cannot be false
		2023	{
		2024	img->unshare ();
		2025	THIS->bg_pixmap = img->steal ();
		2026	THIS->bg_flags \|= rxvt_term::BG_NEEDS_REFRESH;
		2027	THIS->bg_valid_since = ev::now (); // TODO: extra bloat
		2028	}
		2029
		2030	#endif
		2031
		2032	#endif
		2033
		2034	#############################################################################
1924	# urxvt::overlay	2035	# urxvt::overlay
1925	#############################################################################	2036	#############################################################################
1926		2037
1927	MODULE = urxvt PACKAGE = urxvt::overlay	2038	MODULE = urxvt PACKAGE = urxvt::overlay
1928		2039
…		…
1956		2067
1957	MODULE = urxvt PACKAGE = urxvt::img	2068	MODULE = urxvt PACKAGE = urxvt::img
1958		2069
1959	#if HAVE_IMG	2070	#if HAVE_IMG
1960		2071
1961	# rxvt_img (rxvt_screen screen, XRenderPictFormat format, int width, int height);	2072	# 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);	2073	# rxvt_img rxvt_img (rxvt_screen screen, XRenderPictFormat *format, int width, int height, Pixmap pixmap);
1963		2074
1964	void fill (urxvt::img self, SV *c)	2075	int
		2076	rxvt_img::w ()
1965	CODE:	2077	CODE:
		2078	RETVAL = THIS->w;
		2079	OUTPUT:
		2080	RETVAL
		2081
		2082	int
		2083	rxvt_img::h ()
		2084	CODE:
		2085	RETVAL = THIS->h;
		2086	OUTPUT:
		2087	RETVAL
		2088
		2089	bool
		2090	rxvt_img::shared ()
		2091	CODE:
		2092	RETVAL = THIS->shared;
		2093	OUTPUT:
		2094	RETVAL
		2095
		2096	Pixmap
		2097	rxvt_img::pm ()
		2098	CODE:
		2099	RETVAL = THIS->pm;
		2100	OUTPUT:
		2101	RETVAL
		2102
		2103	void
		2104	rxvt_img::fill (SV *c)
		2105	INIT:
1966	rxvt_color rc;	2106	rxvt_color rc;
1967	parse_color (self->s, rc, c);	2107	parse_color (THIS->s, rc, c);
1968	self->fill (rc);	2108	C_ARGS: rc
1969		2109
1970	void blur (urxvt::img self, int rh, int rv)	2110	void
		2111	rxvt_img::DESTROY ()
1971	CODE:	2112	CODE:
1972	self->blur (rh, rv);	2113	delete THIS;
1973		2114
1974	void brightness (urxvt::img self, double r, double g, double b, double a = 1.)	2115	void
1975	CODE:	2116	rxvt_img::blur (int rh, int rv)
1976	self->brightness (r, g, b, a);
1977		2117
1978	void contrast (urxvt::img self, double r, double g, double b, double a = 1.)	2118	void
1979	CODE:	2119	rxvt_img::brightness (NV r, NV g, NV b, NV a = 1.)
1980	self->contrast (r, g, b, a);
1981		2120
1982	urxvt::img copy (urxvt::img self)	2121	void
1983	CODE:	2122	rxvt_img::contrast (NV r, NV g, NV b, NV a = 1.)
1984	RETVAL = self->copy ();
1985	OUTPUT:
1986	RETVAL
1987		2123
		2124	void
		2125	rxvt_img::unshare ()
		2126
		2127	rxvt_img *
		2128	rxvt_img::clone ()
		2129
		2130	rxvt_img *
		2131	rxvt_img::transform (int new_width, int new_height, int repeat, NV p11, NV p12, NV p13, NV p21, NV p22, NV p23, NV p31, NV p32, NV p33)
		2132	INIT:
		2133	double matrix[9] = {
		2134	p11, p12, p13,
		2135	p21, p22, p23,
		2136	p31, p32, p33
		2137	};
		2138	C_ARGS: new_width, new_height, repeat, matrix
		2139
		2140	rxvt_img *
1988	urxvt::img scale (urxvt::img self, int new_width, int new_height)	2141	rxvt_img::scale (int new_width, int new_height)
1989	CODE:
1990	RETVAL = self->scale (new_width, new_height);
1991	OUTPUT:
1992	RETVAL
1993		2142
1994	# rxvt_img *transform (urxvt::img self, int new_width, int new_height, double matrix[16]);	2143	rxvt_img *
		2144	rxvt_img::rotate (int new_width, int new_height, int repeat, int x, int y, NV phi)
1995		2145
1996	#endif	2146	#endif
1997		2147

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.166 by root, Tue Jun 5 11:00:40 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.166 by root, Tue Jun 5 11:00:40 2012 UTC