[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.165 by root, Mon Jun 4 21:33:47 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
933	envv->push_back (0);
934		960
935	try	961	try
936	{	962	{
937	term->init (argv, envv);	963	term->init (argv, envv);
938	}	964	}
…		…
978		1004
979	void	1005	void
980	rxvt_term::XUngrabKey (int keycode, U32 modifiers, Window window = THIS->vt)	1006	rxvt_term::XUngrabKey (int keycode, U32 modifiers, Window window = THIS->vt)
981	CODE:	1007	CODE:
982	XUngrabKey (THIS->dpy, keycode, modifiers, window);	1008	XUngrabKey (THIS->dpy, keycode, modifiers, window);
983
984	void
985	rxvt_term::XUngrabKeyboard (Time eventtime)
986	CODE:
987	XUngrabKeyboard (THIS->dpy, eventtime);
988		1009
989	bool	1010	bool
990	rxvt_term::grab (Time eventtime, int sync = 0)	1011	rxvt_term::grab (Time eventtime, int sync = 0)
991	CODE:	1012	CODE:
992	{	1013	{
…		…
1104	rxvt_pop_locale ();	1125	rxvt_pop_locale ();
1105		1126
1106	RETVAL = wcs2sv (wstr);	1127	RETVAL = wcs2sv (wstr);
1107	free (wstr);	1128	free (wstr);
1108	}	1129	}
1109	OUTPUT:
1110	RETVAL
1111
1112	char *
1113	rxvt_term::locale ()
1114	CODE:
1115	RETVAL = THIS->locale;
1116	OUTPUT:	1130	OUTPUT:
1117	RETVAL	1131	RETVAL
1118		1132
1119	#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)	1133	#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
1120		1134
…		…
1266	}	1280	}
1267	OUTPUT:	1281	OUTPUT:
1268	RETVAL	1282	RETVAL
1269		1283
1270	void	1284	void
		1285	rxvt_term::set_urgency (bool enable)
		1286
		1287	void
1271	rxvt_term::focus_in ()	1288	rxvt_term::focus_in ()
1272		1289
1273	void	1290	void
1274	rxvt_term::focus_out ()	1291	rxvt_term::focus_out ()
1275		1292
…		…
1555		1572
1556	if (set >= 0)	1573	if (set >= 0)
1557	{	1574	{
1558	THIS->set_option (optval, set);	1575	THIS->set_option (optval, set);
1559		1576
1560	if (THIS->env_colorfgbg [0]) // avoid doing this before START	1577	if (THIS->init_done) // avoid doing this before START
1561	switch (optval)	1578	switch (optval)
1562	{	1579	{
1563	case Opt_skipBuiltinGlyphs:	1580	case Opt_skipBuiltinGlyphs:
1564	THIS->set_fonts ();	1581	THIS->set_fonts ();
1565	THIS->scr_remap_chars ();	1582	THIS->scr_remap_chars ();
1566	THIS->scr_touch (true);	1583	THIS->scr_touch (true);
1567	THIS->want_refresh = 1;	1584	THIS->want_refresh = 1;
1568	THIS->refresh_check ();	1585	THIS->refresh_check ();
1569	break;	1586	break;
		1587	#ifdef CURSOR_BLINK
		1588	case Opt_cursorBlink:
		1589	THIS->cursor_blink_reset ();
		1590	break;
		1591	#endif
1570		1592
1571	case Opt_cursorUnderline:	1593	case Opt_cursorUnderline:
1572	THIS->want_refresh = 1;	1594	THIS->want_refresh = 1;
1573	THIS->refresh_check ();	1595	THIS->refresh_check ();
1574	break;	1596	break;
…		…
1588	CODE:	1610	CODE:
1589	RETVAL = 0 < THIS->parse_keysym (keysym, str);	1611	RETVAL = 0 < THIS->parse_keysym (keysym, str);
1590	THIS->keyboard->register_done ();	1612	THIS->keyboard->register_done ();
1591	OUTPUT:	1613	OUTPUT:
1592	RETVAL	1614	RETVAL
		1615
		1616	void
		1617	rxvt_term::register_command (int keysym, unsigned int state, SV *str)
		1618	CODE:
		1619	wchar_t *wstr = sv2wcs (str);
		1620	THIS->keyboard->register_user_translation (keysym, state, wstr);
		1621	free (wstr);
1593		1622
1594	void	1623	void
1595	rxvt_term::screen_cur (...)	1624	rxvt_term::screen_cur (...)
1596	PROTOTYPE: $;$$	1625	PROTOTYPE: $;$$
1597	ALIAS:	1626	ALIAS:
…		…
1705		1734
1706	void	1735	void
1707	rxvt_term::scr_bell ()	1736	rxvt_term::scr_bell ()
1708		1737
1709	void	1738	void
		1739	rxvt_term::scr_recolour (bool refresh = true);
		1740
		1741	void
1710	rxvt_term::scr_change_screen (int screen)	1742	rxvt_term::scr_change_screen (int screen)
1711		1743
1712	void	1744	void
1713	rxvt_term::scr_add_lines (SV *string)	1745	rxvt_term::scr_add_lines (SV *string)
1714	CODE:	1746	CODE:
…		…
1827	type, format, PropModeReplace,	1859	type, format, PropModeReplace,
1828	(unsigned char *)data_, len / elemsize);	1860	(unsigned char *)data_, len / elemsize);
1829	}	1861	}
1830		1862
1831	Atom	1863	Atom
1832	XInternAtom (rxvt_term term, char atom_name, int only_if_exists = FALSE)	1864	XInternAtom (rxvt_term *term, octet_string atom_name, int only_if_exists = FALSE)
1833	C_ARGS: term->dpy, atom_name, only_if_exists	1865	C_ARGS: term->dpy, atom_name, only_if_exists
1834		1866
1835	char *	1867	char *
1836	XGetAtomName (rxvt_term *term, Atom atom)	1868	XGetAtomName (rxvt_term *term, Atom atom)
1837	C_ARGS: term->dpy, atom	1869	C_ARGS: term->dpy, atom
1838	CLEANUP:	1870	CLEANUP:
1839	XFree (RETVAL);	1871	XFree (RETVAL);
1840		1872
1841	void	1873	void
1842	XDeleteProperty (rxvt_term *term, Window window, Atom property)	1874	XDeleteProperty (rxvt_term *term, Window window, Atom property)
1843	C_ARGS: term->dpy, window, property	1875	C_ARGS: term->dpy, window, property
1844		1876
1845	Window	1877	Window
1846	rxvt_term::DefaultRootWindow ()	1878	rxvt_term::DefaultRootWindow ()
1847	CODE:	1879	CODE:
1848	RETVAL = THIS->display->root;	1880	RETVAL = THIS->display->root;
…		…
1900	PUSHs (newSVuv (child));	1932	PUSHs (newSVuv (child));
1901	}	1933	}
1902	}	1934	}
1903		1935
1904	#############################################################################	1936	#############################################################################
		1937	# fancy bg bloatstuff (TODO: should be moved up somewhere)
		1938
		1939	# TODO: ugly
		1940	void
		1941	rxvt_term::get_geometry ()
		1942	PPCODE:
		1943	Window wdummy;
		1944	int x, y;
		1945	XWindowAttributes wattr;
		1946	XGetWindowAttributes (THIS->dpy, THIS->parent, &wattr);
		1947	XTranslateCoordinates (THIS->dpy, THIS->parent, wattr.root,
		1948	-wattr.border_width, -wattr.border_width,
		1949	&x, &y, &wdummy);
		1950	EXTEND (SP, 4);
		1951	PUSHs (sv_2mortal (newSViv (x)));
		1952	PUSHs (sv_2mortal (newSViv (y)));
		1953	PUSHs (sv_2mortal (newSViv (wattr.width)));
		1954	PUSHs (sv_2mortal (newSViv (wattr.height)));
		1955
		1956	#if HAVE_IMG
		1957
		1958	rxvt_img *
		1959	rxvt_term::new_img (SV *format, int width, int height)
		1960	CODE:
		1961	XRenderPictFormat *f = SvOK (format)
		1962	? XRenderFindVisualFormat (THIS->dpy, THIS->visual)
		1963	: XRenderFindStandardFormat (THIS->dpy, SvIV (format));
		1964	RETVAL = new rxvt_img (THIS, f, width, height);
		1965	OUTPUT:
		1966	RETVAL
		1967
		1968	#if ENABLE_TRANSPARENCY
		1969
		1970	#if 0
		1971
		1972	rxvt_img *
		1973	rxvt_term::new_img_from_root ()
		1974	CODE:
		1975	RETVAL = rxvt_img::new_from_root (THIS);
		1976	OUTPUT:
		1977	RETVAL
		1978
		1979	#endif
		1980
		1981	#endif
		1982
		1983	#if HAVE_PIXBUF
		1984
		1985	rxvt_img *
		1986	rxvt_term::new_img_from_file (octet_string filename)
		1987	CODE:
		1988	try
		1989	{
		1990	RETVAL = rxvt_img::new_from_file (THIS, filename);
		1991	}
		1992	catch (const class rxvt_failure_exception &e)
		1993	{
		1994	croak ("new_img_from_file failed");
		1995	}
		1996	OUTPUT:
		1997	RETVAL
		1998
		1999	#endif
		2000
		2001	#if HAVE_BG_PIXMAP
		2002
		2003	void
		2004	rxvt_term::set_background (rxvt_img *img)
		2005	CODE:
		2006	THIS->bg_destroy ();
		2007	THIS->bg_pixmap = None;
		2008	THIS->bg_flags &= ~rxvt_term::BG_NEEDS_REFRESH;
		2009
		2010	if (img) // TODO: cannot be false
		2011	{
		2012	img->unshare ();
		2013	THIS->bg_pixmap = img->steal ();
		2014	THIS->bg_flags \|= rxvt_term::BG_NEEDS_REFRESH;
		2015	THIS->bg_valid_since = ev::now (); // TODO: extra bloat
		2016	}
		2017
		2018	#endif
		2019
		2020	#endif
		2021
		2022	#############################################################################
1905	# urxvt::overlay	2023	# urxvt::overlay
1906	#############################################################################	2024	#############################################################################
1907		2025
1908	MODULE = urxvt PACKAGE = urxvt::overlay	2026	MODULE = urxvt PACKAGE = urxvt::overlay
1909		2027
…		…
1919	void	2037	void
1920	overlay::DESTROY ()	2038	overlay::DESTROY ()
1921		2039
1922	INCLUDE: $PERL <iom_perl.xs -pe s/IOM_MODULE/urxvt/g,s/IOM_CLASS/urxvt/g \|	2040	INCLUDE: $PERL <iom_perl.xs -pe s/IOM_MODULE/urxvt/g,s/IOM_CLASS/urxvt/g \|
1923		2041
		2042	MODULE = urxvt PACKAGE = urxvt::pixbuf PREFIX = gdk_pixbuf_
		2043
		2044	#if HAVE_PIXBUF
		2045
		2046	urxvt::pixbuf gdk_pixbuf_new_from_file (SV *klass, octet_string filename)
		2047	C_ARGS: filename, 0
		2048
		2049	void
		2050	DESTROY (urxvt::pixbuf self)
		2051	CODE:
		2052	gdk_pixbuf_unref (self);
		2053
		2054	#endif
		2055
		2056	MODULE = urxvt PACKAGE = urxvt::img
		2057
		2058	#if HAVE_IMG
		2059
		2060	# rxvt_img new (rxvt_screen screen, XRenderPictFormat *format, int width, int height)
		2061	# rxvt_img rxvt_img (rxvt_screen screen, XRenderPictFormat *format, int width, int height, Pixmap pixmap);
		2062
		2063	int
		2064	rxvt_img::w ()
		2065	CODE:
		2066	RETVAL = THIS->w;
		2067	OUTPUT:
		2068	RETVAL
		2069
		2070	int
		2071	rxvt_img::h ()
		2072	CODE:
		2073	RETVAL = THIS->h;
		2074	OUTPUT:
		2075	RETVAL
		2076
		2077	bool
		2078	rxvt_img::shared ()
		2079	CODE:
		2080	RETVAL = THIS->shared;
		2081	OUTPUT:
		2082	RETVAL
		2083
		2084	Pixmap
		2085	rxvt_img::pm ()
		2086	CODE:
		2087	RETVAL = THIS->pm;
		2088	OUTPUT:
		2089	RETVAL
		2090
		2091	void
		2092	rxvt_img::fill (SV *c)
		2093	INIT:
		2094	rxvt_color rc;
		2095	parse_color (THIS->s, rc, c);
		2096	C_ARGS: rc
		2097
		2098	void
		2099	rxvt_img::DESTROY ()
		2100	CODE:
		2101	delete THIS;
		2102
		2103	void
		2104	rxvt_img::blur (int rh, int rv)
		2105
		2106	void
		2107	rxvt_img::brightness (NV r, NV g, NV b, NV a = 1.)
		2108
		2109	void
		2110	rxvt_img::contrast (NV r, NV g, NV b, NV a = 1.)
		2111
		2112	void
		2113	rxvt_img::unshare ()
		2114
		2115	rxvt_img *
		2116	rxvt_img::clone ()
		2117
		2118	rxvt_img *
		2119	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)
		2120	INIT:
		2121	double matrix[9] = {
		2122	p11, p12, p13,
		2123	p21, p22, p23,
		2124	p31, p32, p33
		2125	};
		2126	C_ARGS: new_width, new_height, repeat, matrix
		2127
		2128	rxvt_img *
		2129	rxvt_img::scale (int new_width, int new_height)
		2130
		2131	rxvt_img *
		2132	rxvt_img::rotate (int new_width, int new_height, int repeat, int x, int y, NV phi)
		2133
		2134	#endif
		2135

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.165 by root, Mon Jun 4 21:33:47 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.165 by root, Mon Jun 4 21:33:47 2012 UTC