[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.168 by sf-exg, Tue Jun 5 15:12:43 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 int render_repeat_mode;
		58
		59	typedef GdkPixbuf * urxvt__pixbuf;
		60	typedef rxvt_img * urxvt__img;
		61
		62	/////////////////////////////////////////////////////////////////////////////
		63
		64	static void
		65	parse_color (rxvt_screen s, rxvt_color &c, SV sv)
		66	{
		67	//TODO: support component stuff
		68	c.set (s, SvPVbyte_nolen (sv));
		69	}
50		70
51	/////////////////////////////////////////////////////////////////////////////	71	/////////////////////////////////////////////////////////////////////////////
52		72
53	static wchar_t *	73	static wchar_t *
54	sv2wcs (SV *sv)	74	sv2wcs (SV *sv)
…		…
782	const_iv (XIMSecondary),	802	const_iv (XIMSecondary),
783	const_iv (XIMTertiary),	803	const_iv (XIMTertiary),
784	const_iv (XIMVisibleToForward),	804	const_iv (XIMVisibleToForward),
785	const_iv (XIMVisibleToBackword),	805	const_iv (XIMVisibleToBackword),
786	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
787	# if 0	818	# if 0
788	const_iv (XIMForwardChar),	819	const_iv (XIMForwardChar),
789	const_iv (XIMBackwardChar),	820	const_iv (XIMBackwardChar),
790	const_iv (XIMForwardWord),	821	const_iv (XIMForwardWord),
791	const_iv (XIMBackwardWord),	822	const_iv (XIMBackwardWord),
…		…
799	const_iv (XIMDontChange),	830	const_iv (XIMDontChange),
800	# endif	831	# endif
801	# endif	832	# endif
802	};	833	};
803		834
804	for (civ = const_iv + ecb_array_length (const_iv); civ-- > const_iv; )	835	for (civ = const_iv + ecb_array_length (const_iv); civ > const_iv; civ--)
805	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	836	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
806	}	837	}
807		838
808	void	839	void
809	warn (const char *msg)	840	warn (const char *msg)
810	CODE:	841	CODE:
…		…
815	CODE:	846	CODE:
816	rxvt_fatal ("%s", msg);	847	rxvt_fatal ("%s", msg);
817		848
818	void	849	void
819	_exit (int status)	850	_exit (int status)
		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	}
820		867
821	NV	868	NV
822	NOW ()	869	NOW ()
823	CODE:	870	CODE:
824	RETVAL = ev::now ();	871	RETVAL = ev::now ();
…		…
920	CODE:	967	CODE:
921	{	968	{
922	rxvt_term *term = new rxvt_term;	969	rxvt_term *term = new rxvt_term;
923		970
924	stringvec *argv = new stringvec;	971	stringvec *argv = new stringvec;
925	stringvec *envv = new stringvec;
926
927	for (int i = 0; i <= AvFILL (arg); i++)	972	for (int i = 0; i <= AvFILL (arg); i++)
928	argv->push_back (strdup (SvPVbyte_nolen (*av_fetch (arg, i, 1))));	973	argv->push_back (strdup (SvPVbyte_nolen (*av_fetch (arg, i, 1))));
929		974
		975	stringvec *envv = new stringvec;
930	for (int i = AvFILL (env) + 1; i--; )	976	for (int i = AvFILL (env) + 1; i--; )
931	envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1))));	977	envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1))));
932		978
933	envv->push_back (0);
934
935	try	979	try
936	{	980	{
937	term->init (argv, envv);	981	term->init (argv, envv);
938	}	982	}
939	catch (const class rxvt_failure_exception &e)	983	catch (const class rxvt_failure_exception &e)
…		…
952	rxvt_term::destroy ()	996	rxvt_term::destroy ()
953		997
954	void	998	void
955	rxvt_term::set_should_invoke (int htype, int inc)	999	rxvt_term::set_should_invoke (int htype, int inc)
956	CODE:	1000	CODE:
957	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	}
958		1014
959	int	1015	int
960	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)
961	CODE:	1017	CODE:
962	RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,	1018	RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,
…		…
978		1034
979	void	1035	void
980	rxvt_term::XUngrabKey (int keycode, U32 modifiers, Window window = THIS->vt)	1036	rxvt_term::XUngrabKey (int keycode, U32 modifiers, Window window = THIS->vt)
981	CODE:	1037	CODE:
982	XUngrabKey (THIS->dpy, keycode, modifiers, window);	1038	XUngrabKey (THIS->dpy, keycode, modifiers, window);
983
984	void
985	rxvt_term::XUngrabKeyboard (Time eventtime)
986	CODE:
987	XUngrabKeyboard (THIS->dpy, eventtime);
988		1039
989	bool	1040	bool
990	rxvt_term::grab (Time eventtime, int sync = 0)	1041	rxvt_term::grab (Time eventtime, int sync = 0)
991	CODE:	1042	CODE:
992	{	1043	{
…		…
1104	rxvt_pop_locale ();	1155	rxvt_pop_locale ();
1105		1156
1106	RETVAL = wcs2sv (wstr);	1157	RETVAL = wcs2sv (wstr);
1107	free (wstr);	1158	free (wstr);
1108	}	1159	}
1109	OUTPUT:
1110	RETVAL
1111
1112	char *
1113	rxvt_term::locale ()
1114	CODE:
1115	RETVAL = THIS->locale;
1116	OUTPUT:	1160	OUTPUT:
1117	RETVAL	1161	RETVAL
1118		1162
1119	#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)	1163	#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
1120		1164
…		…
1231	CODE:	1275	CODE:
1232	RETVAL = THIS->parent;	1276	RETVAL = THIS->parent;
1233	OUTPUT:	1277	OUTPUT:
1234	RETVAL	1278	RETVAL
1235		1279
1236	Window	1280	int
1237	rxvt_term::vt ()	1281	rxvt_term::parent_x ()
1238	CODE:	1282	CODE:
1239	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;
1240	OUTPUT:	1291	OUTPUT:
1241	RETVAL	1292	RETVAL
1242		1293
1243	void	1294	void
1244	rxvt_term::vt_emask_add (U32 emask)	1295	rxvt_term::vt_emask_add (U32 emask)
…		…
1264	if (newval <= 0)	1315	if (newval <= 0)
1265	THIS->scr_changeview (max (newval, THIS->top_row));	1316	THIS->scr_changeview (max (newval, THIS->top_row));
1266	}	1317	}
1267	OUTPUT:	1318	OUTPUT:
1268	RETVAL	1319	RETVAL
		1320
		1321	void
		1322	rxvt_term::set_urgency (bool enable)
1269		1323
1270	void	1324	void
1271	rxvt_term::focus_in ()	1325	rxvt_term::focus_in ()
1272		1326
1273	void	1327	void
…		…
1555		1609
1556	if (set >= 0)	1610	if (set >= 0)
1557	{	1611	{
1558	THIS->set_option (optval, set);	1612	THIS->set_option (optval, set);
1559		1613
1560	if (THIS->env_colorfgbg [0]) // avoid doing this before START	1614	if (THIS->init_done) // avoid doing this before START
1561	switch (optval)	1615	switch (optval)
1562	{	1616	{
1563	case Opt_skipBuiltinGlyphs:	1617	case Opt_skipBuiltinGlyphs:
1564	THIS->set_fonts ();	1618	THIS->set_fonts ();
1565	THIS->scr_remap_chars ();	1619	THIS->scr_remap_chars ();
1566	THIS->scr_touch (true);	1620	THIS->scr_touch (true);
1567	THIS->want_refresh = 1;	1621	THIS->want_refresh = 1;
1568	THIS->refresh_check ();	1622	THIS->refresh_check ();
1569	break;	1623	break;
		1624	#ifdef CURSOR_BLINK
		1625	case Opt_cursorBlink:
		1626	THIS->cursor_blink_reset ();
		1627	break;
		1628	#endif
1570		1629
1571	case Opt_cursorUnderline:	1630	case Opt_cursorUnderline:
1572	THIS->want_refresh = 1;	1631	THIS->want_refresh = 1;
1573	THIS->refresh_check ();	1632	THIS->refresh_check ();
1574	break;	1633	break;
…		…
1588	CODE:	1647	CODE:
1589	RETVAL = 0 < THIS->parse_keysym (keysym, str);	1648	RETVAL = 0 < THIS->parse_keysym (keysym, str);
1590	THIS->keyboard->register_done ();	1649	THIS->keyboard->register_done ();
1591	OUTPUT:	1650	OUTPUT:
1592	RETVAL	1651	RETVAL
		1652
		1653	void
		1654	rxvt_term::register_command (int keysym, unsigned int state, SV *str)
		1655	CODE:
		1656	wchar_t *wstr = sv2wcs (str);
		1657	THIS->keyboard->register_user_translation (keysym, state, wstr);
		1658	free (wstr);
1593		1659
1594	void	1660	void
1595	rxvt_term::screen_cur (...)	1661	rxvt_term::screen_cur (...)
1596	PROTOTYPE: $;$$	1662	PROTOTYPE: $;$$
1597	ALIAS:	1663	ALIAS:
…		…
1705		1771
1706	void	1772	void
1707	rxvt_term::scr_bell ()	1773	rxvt_term::scr_bell ()
1708		1774
1709	void	1775	void
		1776	rxvt_term::scr_recolour (bool refresh = true);
		1777
		1778	void
1710	rxvt_term::scr_change_screen (int screen)	1779	rxvt_term::scr_change_screen (int screen)
1711		1780
1712	void	1781	void
1713	rxvt_term::scr_add_lines (SV *string)	1782	rxvt_term::scr_add_lines (SV *string)
1714	CODE:	1783	CODE:
…		…
1827	type, format, PropModeReplace,	1896	type, format, PropModeReplace,
1828	(unsigned char *)data_, len / elemsize);	1897	(unsigned char *)data_, len / elemsize);
1829	}	1898	}
1830		1899
1831	Atom	1900	Atom
1832	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)
1833	C_ARGS: term->dpy, atom_name, only_if_exists	1902	C_ARGS: term->dpy, atom_name, only_if_exists
1834		1903
1835	char *	1904	char *
1836	XGetAtomName (rxvt_term *term, Atom atom)	1905	XGetAtomName (rxvt_term *term, Atom atom)
1837	C_ARGS: term->dpy, atom	1906	C_ARGS: term->dpy, atom
1838	CLEANUP:	1907	CLEANUP:
1839	XFree (RETVAL);	1908	XFree (RETVAL);
1840		1909
1841	void	1910	void
1842	XDeleteProperty (rxvt_term *term, Window window, Atom property)	1911	XDeleteProperty (rxvt_term *term, Window window, Atom property)
1843	C_ARGS: term->dpy, window, property	1912	C_ARGS: term->dpy, window, property
1844		1913
1845	Window	1914	Window
1846	rxvt_term::DefaultRootWindow ()	1915	rxvt_term::DefaultRootWindow ()
1847	CODE:	1916	CODE:
1848	RETVAL = THIS->display->root;	1917	RETVAL = THIS->display->root;
…		…
1900	PUSHs (newSVuv (child));	1969	PUSHs (newSVuv (child));
1901	}	1970	}
1902	}	1971	}
1903		1972
1904	#############################################################################	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	#############################################################################
1905	# urxvt::overlay	2053	# urxvt::overlay
1906	#############################################################################	2054	#############################################################################
1907		2055
1908	MODULE = urxvt PACKAGE = urxvt::overlay	2056	MODULE = urxvt PACKAGE = urxvt::overlay
1909		2057
…		…
1919	void	2067	void
1920	overlay::DESTROY ()	2068	overlay::DESTROY ()
1921		2069
1922	INCLUDE: $PERL <iom_perl.xs -pe s/IOM_MODULE/urxvt/g,s/IOM_CLASS/urxvt/g \|	2070	INCLUDE: $PERL <iom_perl.xs -pe s/IOM_MODULE/urxvt/g,s/IOM_CLASS/urxvt/g \|
1923		2071
		2072	MODULE = urxvt PACKAGE = urxvt::pixbuf PREFIX = gdk_pixbuf_
		2073
		2074	#if HAVE_PIXBUF
		2075
		2076	urxvt::pixbuf gdk_pixbuf_new_from_file (SV *klass, octet_string filename)
		2077	C_ARGS: filename, 0
		2078
		2079	void
		2080	DESTROY (urxvt::pixbuf self)
		2081	CODE:
		2082	gdk_pixbuf_unref (self);
		2083
		2084	#endif
		2085
		2086	MODULE = urxvt PACKAGE = urxvt::img
		2087
		2088	#if HAVE_IMG
		2089
		2090	# rxvt_img new (rxvt_screen screen, XRenderPictFormat *format, int width, int height)
		2091	# rxvt_img rxvt_img (rxvt_screen screen, XRenderPictFormat *format, int width, int height, Pixmap pixmap);
		2092
		2093	int
		2094	rxvt_img::w ()
		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:
		2124	rxvt_color rc;
		2125	parse_color (THIS->s, rc, c);
		2126	C_ARGS: rc
		2127
		2128	void
		2129	rxvt_img::DESTROY ()
		2130	CODE:
		2131	delete THIS;
		2132
		2133	void
		2134	rxvt_img::blur (int rh, int rv)
		2135
		2136	void
		2137	rxvt_img::brightness (NV r, NV g, NV b, NV a = 1.)
		2138
		2139	void
		2140	rxvt_img::contrast (NV r, NV g, NV b, NV a = 1.)
		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 *
		2162	rxvt_img::scale (int new_width, int new_height)
		2163
		2164	rxvt_img *
		2165	rxvt_img::rotate (int new_width, int new_height, int x, int y, NV phi, render_repeat_mode repeat = RepeatNormal)
		2166
		2167	#endif
		2168

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.168 by sf-exg, Tue Jun 5 15:12:43 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.168 by sf-exg, Tue Jun 5 15:12:43 2012 UTC