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

Comparing rxvt-unicode/src/rxvtperl.xs (file contents):
Revision 1.142 by sf-exg, Fri Jul 1 19:07:08 2011 UTC vs.
Revision 1.166 by root, Tue Jun 5 11:00:40 2012 UTC

…		…
23	#define line_t perl_line_t	23	#define line_t perl_line_t
24	#include <EXTERN.h>	24	#include <EXTERN.h>
25	#include <perl.h>	25	#include <perl.h>
26	#include <XSUB.h>	26	#include <XSUB.h>
27	#undef line_t	27	#undef line_t
		28	#undef bool // perl defines it's own bool type, except with g++... what a trap
28		29
29	#include "../config.h"	30	#include "../config.h"
30		31
31	#include <cstddef>	32	#include <stddef.h>
32	#include <cstdarg>	33	#include <stdarg.h>
33		34
34	#include "unistd.h"	35	#include "unistd.h"
35		36
36	#include "ev_cpp.h"	37	#include "ev_cpp.h"
37	#include "rxvt.h"	38	#include "rxvt.h"
…		…
45		46
46	#undef LINENO	47	#undef LINENO
47	#define LINENO(n) MOD (THIS->term_start + int(n), THIS->total_rows)	48	#define LINENO(n) MOD (THIS->term_start + int(n), THIS->total_rows)
48	#undef ROW	49	#undef ROW
49	#define ROW(n) THIS->row_buf [LINENO (n)]	50	#define ROW(n) THIS->row_buf [LINENO (n)]
		51
		52	/////////////////////////////////////////////////////////////////////////////
		53
		54	typedef char * octet_string;
		55	typedef char * utf8_string;
		56
		57	typedef GdkPixbuf * urxvt__pixbuf;
		58	typedef rxvt_img * urxvt__img;
		59
		60	/////////////////////////////////////////////////////////////////////////////
		61
		62	static void
		63	parse_color (rxvt_screen s, rxvt_color &c, SV sv)
		64	{
		65	//TODO: support component stuff
		66	c.set (s, SvPVbyte_nolen (sv));
		67	}
50		68
51	/////////////////////////////////////////////////////////////////////////////	69	/////////////////////////////////////////////////////////////////////////////
52		70
53	static wchar_t *	71	static wchar_t *
54	sv2wcs (SV *sv)	72	sv2wcs (SV *sv)
…		…
782	const_iv (XIMSecondary),	800	const_iv (XIMSecondary),
783	const_iv (XIMTertiary),	801	const_iv (XIMTertiary),
784	const_iv (XIMVisibleToForward),	802	const_iv (XIMVisibleToForward),
785	const_iv (XIMVisibleToBackword),	803	const_iv (XIMVisibleToBackword),
786	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
787	# if 0	816	# if 0
788	const_iv (XIMForwardChar),	817	const_iv (XIMForwardChar),
789	const_iv (XIMBackwardChar),	818	const_iv (XIMBackwardChar),
790	const_iv (XIMForwardWord),	819	const_iv (XIMForwardWord),
791	const_iv (XIMBackwardWord),	820	const_iv (XIMBackwardWord),
…		…
799	const_iv (XIMDontChange),	828	const_iv (XIMDontChange),
800	# endif	829	# endif
801	# endif	830	# endif
802	};	831	};
803		832
804	for (civ = const_iv + ecb_array_length (const_iv); civ-- > const_iv; )	833	for (civ = const_iv + ecb_array_length (const_iv); civ > const_iv; civ--)
805	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	834	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
806	}	835	}
807		836
808	void	837	void
809	warn (const char *msg)	838	warn (const char *msg)
810	CODE:	839	CODE:
…		…
920	CODE:	949	CODE:
921	{	950	{
922	rxvt_term *term = new rxvt_term;	951	rxvt_term *term = new rxvt_term;
923		952
924	stringvec *argv = new stringvec;	953	stringvec *argv = new stringvec;
925	stringvec *envv = new stringvec;
926
927	for (int i = 0; i <= AvFILL (arg); i++)	954	for (int i = 0; i <= AvFILL (arg); i++)
928	argv->push_back (strdup (SvPVbyte_nolen (*av_fetch (arg, i, 1))));	955	argv->push_back (strdup (SvPVbyte_nolen (*av_fetch (arg, i, 1))));
929		956
		957	stringvec *envv = new stringvec;
930	for (int i = AvFILL (env) + 1; i--; )	958	for (int i = AvFILL (env) + 1; i--; )
931	envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1))));	959	envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1))));
932		960
933	envv->push_back (0);
934
935	try	961	try
936	{	962	{
937	term->init (argv, envv);	963	term->init (argv, envv);
938	}	964	}
939	catch (const class rxvt_failure_exception &e)	965	catch (const class rxvt_failure_exception &e)
…		…
952	rxvt_term::destroy ()	978	rxvt_term::destroy ()
953		979
954	void	980	void
955	rxvt_term::set_should_invoke (int htype, int inc)	981	rxvt_term::set_should_invoke (int htype, int inc)
956	CODE:	982	CODE:
957	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	}
958		996
959	int	997	int
960	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)
961	CODE:	999	CODE:
962	RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,	1000	RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,
…		…
978		1016
979	void	1017	void
980	rxvt_term::XUngrabKey (int keycode, U32 modifiers, Window window = THIS->vt)	1018	rxvt_term::XUngrabKey (int keycode, U32 modifiers, Window window = THIS->vt)
981	CODE:	1019	CODE:
982	XUngrabKey (THIS->dpy, keycode, modifiers, window);	1020	XUngrabKey (THIS->dpy, keycode, modifiers, window);
983
984	void
985	rxvt_term::XUngrabKeyboard (Time eventtime)
986	CODE:
987	XUngrabKeyboard (THIS->dpy, eventtime);
988		1021
989	bool	1022	bool
990	rxvt_term::grab (Time eventtime, int sync = 0)	1023	rxvt_term::grab (Time eventtime, int sync = 0)
991	CODE:	1024	CODE:
992	{	1025	{
…		…
1104	rxvt_pop_locale ();	1137	rxvt_pop_locale ();
1105		1138
1106	RETVAL = wcs2sv (wstr);	1139	RETVAL = wcs2sv (wstr);
1107	free (wstr);	1140	free (wstr);
1108	}	1141	}
1109	OUTPUT:
1110	RETVAL
1111
1112	char *
1113	rxvt_term::locale ()
1114	CODE:
1115	RETVAL = THIS->locale;
1116	OUTPUT:	1142	OUTPUT:
1117	RETVAL	1143	RETVAL
1118		1144
1119	#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)	1145	#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
1120		1146
…		…
1231	CODE:	1257	CODE:
1232	RETVAL = THIS->parent;	1258	RETVAL = THIS->parent;
1233	OUTPUT:	1259	OUTPUT:
1234	RETVAL	1260	RETVAL
1235		1261
1236	Window	1262	int
1237	rxvt_term::vt ()	1263	rxvt_term::parent_x ()
1238	CODE:	1264	CODE:
1239	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;
1240	OUTPUT:	1273	OUTPUT:
1241	RETVAL	1274	RETVAL
1242		1275
1243	void	1276	void
1244	rxvt_term::vt_emask_add (U32 emask)	1277	rxvt_term::vt_emask_add (U32 emask)
…		…
1264	if (newval <= 0)	1297	if (newval <= 0)
1265	THIS->scr_changeview (max (newval, THIS->top_row));	1298	THIS->scr_changeview (max (newval, THIS->top_row));
1266	}	1299	}
1267	OUTPUT:	1300	OUTPUT:
1268	RETVAL	1301	RETVAL
		1302
		1303	void
		1304	rxvt_term::set_urgency (bool enable)
1269		1305
1270	void	1306	void
1271	rxvt_term::focus_in ()	1307	rxvt_term::focus_in ()
1272		1308
1273	void	1309	void
…		…
1555		1591
1556	if (set >= 0)	1592	if (set >= 0)
1557	{	1593	{
1558	THIS->set_option (optval, set);	1594	THIS->set_option (optval, set);
1559		1595
1560	if (THIS->env_colorfgbg [0]) // avoid doing this before START	1596	if (THIS->init_done) // avoid doing this before START
1561	switch (optval)	1597	switch (optval)
1562	{	1598	{
1563	case Opt_skipBuiltinGlyphs:	1599	case Opt_skipBuiltinGlyphs:
1564	THIS->set_fonts ();	1600	THIS->set_fonts ();
1565	THIS->scr_remap_chars ();	1601	THIS->scr_remap_chars ();
1566	THIS->scr_touch (true);	1602	THIS->scr_touch (true);
1567	THIS->want_refresh = 1;	1603	THIS->want_refresh = 1;
1568	THIS->refresh_check ();	1604	THIS->refresh_check ();
1569	break;	1605	break;
		1606	#ifdef CURSOR_BLINK
		1607	case Opt_cursorBlink:
		1608	THIS->cursor_blink_reset ();
		1609	break;
		1610	#endif
1570		1611
1571	case Opt_cursorUnderline:	1612	case Opt_cursorUnderline:
1572	THIS->want_refresh = 1;	1613	THIS->want_refresh = 1;
1573	THIS->refresh_check ();	1614	THIS->refresh_check ();
1574	break;	1615	break;
…		…
1588	CODE:	1629	CODE:
1589	RETVAL = 0 < THIS->parse_keysym (keysym, str);	1630	RETVAL = 0 < THIS->parse_keysym (keysym, str);
1590	THIS->keyboard->register_done ();	1631	THIS->keyboard->register_done ();
1591	OUTPUT:	1632	OUTPUT:
1592	RETVAL	1633	RETVAL
		1634
		1635	void
		1636	rxvt_term::register_command (int keysym, unsigned int state, SV *str)
		1637	CODE:
		1638	wchar_t *wstr = sv2wcs (str);
		1639	THIS->keyboard->register_user_translation (keysym, state, wstr);
		1640	free (wstr);
1593		1641
1594	void	1642	void
1595	rxvt_term::screen_cur (...)	1643	rxvt_term::screen_cur (...)
1596	PROTOTYPE: $;$$	1644	PROTOTYPE: $;$$
1597	ALIAS:	1645	ALIAS:
…		…
1705		1753
1706	void	1754	void
1707	rxvt_term::scr_bell ()	1755	rxvt_term::scr_bell ()
1708		1756
1709	void	1757	void
		1758	rxvt_term::scr_recolour (bool refresh = true);
		1759
		1760	void
1710	rxvt_term::scr_change_screen (int screen)	1761	rxvt_term::scr_change_screen (int screen)
1711		1762
1712	void	1763	void
1713	rxvt_term::scr_add_lines (SV *string)	1764	rxvt_term::scr_add_lines (SV *string)
1714	CODE:	1765	CODE:
…		…
1827	type, format, PropModeReplace,	1878	type, format, PropModeReplace,
1828	(unsigned char *)data_, len / elemsize);	1879	(unsigned char *)data_, len / elemsize);
1829	}	1880	}
1830		1881
1831	Atom	1882	Atom
1832	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)
1833	C_ARGS: term->dpy, atom_name, only_if_exists	1884	C_ARGS: term->dpy, atom_name, only_if_exists
1834		1885
1835	char *	1886	char *
1836	XGetAtomName (rxvt_term *term, Atom atom)	1887	XGetAtomName (rxvt_term *term, Atom atom)
1837	C_ARGS: term->dpy, atom	1888	C_ARGS: term->dpy, atom
1838	CLEANUP:	1889	CLEANUP:
1839	XFree (RETVAL);	1890	XFree (RETVAL);
1840		1891
1841	void	1892	void
1842	XDeleteProperty (rxvt_term *term, Window window, Atom property)	1893	XDeleteProperty (rxvt_term *term, Window window, Atom property)
1843	C_ARGS: term->dpy, window, property	1894	C_ARGS: term->dpy, window, property
1844		1895
1845	Window	1896	Window
1846	rxvt_term::DefaultRootWindow ()	1897	rxvt_term::DefaultRootWindow ()
1847	CODE:	1898	CODE:
1848	RETVAL = THIS->display->root;	1899	RETVAL = THIS->display->root;
…		…
1900	PUSHs (newSVuv (child));	1951	PUSHs (newSVuv (child));
1901	}	1952	}
1902	}	1953	}
1903		1954
1904	#############################################################################	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	#############################################################################
1905	# urxvt::overlay	2035	# urxvt::overlay
1906	#############################################################################	2036	#############################################################################
1907		2037
1908	MODULE = urxvt PACKAGE = urxvt::overlay	2038	MODULE = urxvt PACKAGE = urxvt::overlay
1909		2039
…		…
1919	void	2049	void
1920	overlay::DESTROY ()	2050	overlay::DESTROY ()
1921		2051
1922	INCLUDE: $PERL <iom_perl.xs -pe s/IOM_MODULE/urxvt/g,s/IOM_CLASS/urxvt/g \|	2052	INCLUDE: $PERL <iom_perl.xs -pe s/IOM_MODULE/urxvt/g,s/IOM_CLASS/urxvt/g \|
1923		2053
		2054	MODULE = urxvt PACKAGE = urxvt::pixbuf PREFIX = gdk_pixbuf_
		2055
		2056	#if HAVE_PIXBUF
		2057
		2058	urxvt::pixbuf gdk_pixbuf_new_from_file (SV *klass, octet_string filename)
		2059	C_ARGS: filename, 0
		2060
		2061	void
		2062	DESTROY (urxvt::pixbuf self)
		2063	CODE:
		2064	gdk_pixbuf_unref (self);
		2065
		2066	#endif
		2067
		2068	MODULE = urxvt PACKAGE = urxvt::img
		2069
		2070	#if HAVE_IMG
		2071
		2072	# rxvt_img new (rxvt_screen screen, XRenderPictFormat *format, int width, int height)
		2073	# rxvt_img rxvt_img (rxvt_screen screen, XRenderPictFormat *format, int width, int height, Pixmap pixmap);
		2074
		2075	int
		2076	rxvt_img::w ()
		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:
		2106	rxvt_color rc;
		2107	parse_color (THIS->s, rc, c);
		2108	C_ARGS: rc
		2109
		2110	void
		2111	rxvt_img::DESTROY ()
		2112	CODE:
		2113	delete THIS;
		2114
		2115	void
		2116	rxvt_img::blur (int rh, int rv)
		2117
		2118	void
		2119	rxvt_img::brightness (NV r, NV g, NV b, NV a = 1.)
		2120
		2121	void
		2122	rxvt_img::contrast (NV r, NV g, NV b, NV a = 1.)
		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 *
		2141	rxvt_img::scale (int new_width, int new_height)
		2142
		2143	rxvt_img *
		2144	rxvt_img::rotate (int new_width, int new_height, int repeat, int x, int y, NV phi)
		2145
		2146	#endif
		2147

Diff Legend

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

Comparing rxvt-unicode/src/rxvtperl.xs (file contents): Revision 1.142 by sf-exg, Fri Jul 1 19:07:08 2011 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.142 by sf-exg, Fri Jul 1 19:07:08 2011 UTC vs.
Revision 1.166 by root, Tue Jun 5 11:00:40 2012 UTC