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

Comparing rxvt-unicode/src/rxvtperl.xs (file contents):
Revision 1.147 by sf-exg, Tue Dec 6 11:29:52 2011 UTC vs.
Revision 1.159 by root, Mon Jun 4 15:15:49 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 HAVE_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),
…		…
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	try	961	try
934	{	962	{
…		…
1097	rxvt_pop_locale ();	1125	rxvt_pop_locale ();
1098		1126
1099	RETVAL = wcs2sv (wstr);	1127	RETVAL = wcs2sv (wstr);
1100	free (wstr);	1128	free (wstr);
1101	}	1129	}
1102	OUTPUT:
1103	RETVAL
1104
1105	char *
1106	rxvt_term::locale ()
1107	CODE:
1108	RETVAL = THIS->locale;
1109	OUTPUT:	1130	OUTPUT:
1110	RETVAL	1131	RETVAL
1111		1132
1112	#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)	1133	#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
1113		1134
…		…
1551		1572
1552	if (set >= 0)	1573	if (set >= 0)
1553	{	1574	{
1554	THIS->set_option (optval, set);	1575	THIS->set_option (optval, set);
1555		1576
1556	if (THIS->env_colorfgbg [0]) // avoid doing this before START	1577	if (THIS->init_done) // avoid doing this before START
1557	switch (optval)	1578	switch (optval)
1558	{	1579	{
1559	case Opt_skipBuiltinGlyphs:	1580	case Opt_skipBuiltinGlyphs:
1560	THIS->set_fonts ();	1581	THIS->set_fonts ();
1561	THIS->scr_remap_chars ();	1582	THIS->scr_remap_chars ();
1562	THIS->scr_touch (true);	1583	THIS->scr_touch (true);
1563	THIS->want_refresh = 1;	1584	THIS->want_refresh = 1;
1564	THIS->refresh_check ();	1585	THIS->refresh_check ();
1565	break;	1586	break;
		1587	#ifdef CURSOR_BLINK
		1588	case Opt_cursorBlink:
		1589	THIS->cursor_blink_reset ();
		1590	break;
		1591	#endif
1566		1592
1567	case Opt_cursorUnderline:	1593	case Opt_cursorUnderline:
1568	THIS->want_refresh = 1;	1594	THIS->want_refresh = 1;
1569	THIS->refresh_check ();	1595	THIS->refresh_check ();
1570	break;	1596	break;
…		…
1830	type, format, PropModeReplace,	1856	type, format, PropModeReplace,
1831	(unsigned char *)data_, len / elemsize);	1857	(unsigned char *)data_, len / elemsize);
1832	}	1858	}
1833		1859
1834	Atom	1860	Atom
1835	XInternAtom (rxvt_term term, char atom_name, int only_if_exists = FALSE)	1861	XInternAtom (rxvt_term *term, octet_string atom_name, int only_if_exists = FALSE)
1836	C_ARGS: term->dpy, atom_name, only_if_exists	1862	C_ARGS: term->dpy, atom_name, only_if_exists
1837		1863
1838	char *	1864	char *
1839	XGetAtomName (rxvt_term *term, Atom atom)	1865	XGetAtomName (rxvt_term *term, Atom atom)
1840	C_ARGS: term->dpy, atom	1866	C_ARGS: term->dpy, atom
1841	CLEANUP:	1867	CLEANUP:
1842	XFree (RETVAL);	1868	XFree (RETVAL);
1843		1869
1844	void	1870	void
1845	XDeleteProperty (rxvt_term *term, Window window, Atom property)	1871	XDeleteProperty (rxvt_term *term, Window window, Atom property)
1846	C_ARGS: term->dpy, window, property	1872	C_ARGS: term->dpy, window, property
1847		1873
1848	Window	1874	Window
1849	rxvt_term::DefaultRootWindow ()	1875	rxvt_term::DefaultRootWindow ()
1850	CODE:	1876	CODE:
1851	RETVAL = THIS->display->root;	1877	RETVAL = THIS->display->root;
…		…
1903	PUSHs (newSVuv (child));	1929	PUSHs (newSVuv (child));
1904	}	1930	}
1905	}	1931	}
1906		1932
1907	#############################################################################	1933	#############################################################################
		1934	# fancy bg bloatstuff (TODO: should be moved up somewhere)
		1935
		1936	#ifdef ENABLE_TRANSPARENCY
		1937
		1938	#if 0
		1939
		1940	rxvt_img *
		1941	rxvt_term::new_img_from_root ()
		1942	CODE:
		1943	RETVAL = rxvt_img::new_from_root (THIS);
		1944	OUTPUT:
		1945	RETVAL
		1946
		1947	#endif
		1948
		1949	#endif
		1950
		1951	#if HAVE_PIXBUF
		1952
		1953	rxvt_img *
		1954	rxvt_term::new_img_from_file (octet_string filename)
		1955	CODE:
		1956	try
		1957	{
		1958	RETVAL = rxvt_img::new_from_file (THIS, filename);
		1959	}
		1960	catch (const class rxvt_failure_exception &e)
		1961	{
		1962	croak ("new_img_from_file failed");
		1963	}
		1964	OUTPUT:
		1965	RETVAL
		1966
		1967	#endif
		1968
		1969	#############################################################################
1908	# urxvt::overlay	1970	# urxvt::overlay
1909	#############################################################################	1971	#############################################################################
1910		1972
1911	MODULE = urxvt PACKAGE = urxvt::overlay	1973	MODULE = urxvt PACKAGE = urxvt::overlay
1912		1974
…		…
1922	void	1984	void
1923	overlay::DESTROY ()	1985	overlay::DESTROY ()
1924		1986
1925	INCLUDE: $PERL <iom_perl.xs -pe s/IOM_MODULE/urxvt/g,s/IOM_CLASS/urxvt/g \|	1987	INCLUDE: $PERL <iom_perl.xs -pe s/IOM_MODULE/urxvt/g,s/IOM_CLASS/urxvt/g \|
1926		1988
		1989	MODULE = urxvt PACKAGE = urxvt::pixbuf PREFIX = gdk_pixbuf_
		1990
		1991	#if HAVE_PIXBUF
		1992
		1993	urxvt::pixbuf gdk_pixbuf_new_from_file (SV *klass, octet_string filename)
		1994	C_ARGS: filename, 0
		1995
		1996	void
		1997	DESTROY (urxvt::pixbuf self)
		1998	CODE:
		1999	gdk_pixbuf_unref (self);
		2000
		2001	#endif
		2002
		2003	MODULE = urxvt PACKAGE = urxvt::img
		2004
		2005	#if HAVE_IMG
		2006
		2007	# rxvt_img new (rxvt_screen screen, XRenderPictFormat *format, int width, int height)
		2008	# rxvt_img rxvt_img (rxvt_screen screen, XRenderPictFormat *format, int width, int height, Pixmap pixmap);
		2009
		2010	void
		2011	rxvt_img::fill (SV *c)
		2012	INIT:
		2013	rxvt_color rc;
		2014	parse_color (THIS->s, rc, c);
		2015	C_ARGS: rc
		2016
		2017	void
		2018	rxvt_img::DESTROY ()
		2019	CODE:
		2020	delete THIS;
		2021
		2022	void
		2023	rxvt_img::blur (int rh, int rv)
		2024
		2025	void
		2026	rxvt_img::brightness (NV r, NV g, NV b, NV a = 1.)
		2027
		2028	void
		2029	rxvt_img::contrast (NV r, NV g, NV b, NV a = 1.)
		2030
		2031	void
		2032	rxvt_img::unshare ()
		2033
		2034	rxvt_img *
		2035	rxvt_img::clone ()
		2036
		2037	rxvt_img *
		2038	rxvt_img::scale (int new_width, int new_height)
		2039
		2040	rxvt_img *
		2041	rxvt_img::transform (int new_width, int new_height, int repeat,
		2042	NV p11, NV p12, NV p13,
		2043	NV p21, NV p22, NV p23,
		2044	NV p31, NV p32, NV p23)
		2045	INIT:
		2046	double matrix[9] = {
		2047	p11, p12, p13,
		2048	p21, p22, p23,
		2049	p31, p32, p33
		2050	};
		2051	C_ARGS: new_width, new_height, repeat, matrix
		2052
		2053
		2054	#endif
		2055

Diff Legend

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

Comparing rxvt-unicode/src/rxvtperl.xs (file contents): Revision 1.147 by sf-exg, Tue Dec 6 11:29:52 2011 UTC vs. Revision 1.159 by root, Mon Jun 4 15:15:49 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtperl.xs (file contents):
Revision 1.147 by sf-exg, Tue Dec 6 11:29:52 2011 UTC vs.
Revision 1.159 by root, Mon Jun 4 15:15:49 2012 UTC