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

Comparing rxvt-unicode/src/rxvtperl.xs (file contents):
Revision 1.166 by root, Tue Jun 5 11:00:40 2012 UTC vs.
Revision 1.189 by root, Sun Jun 10 10:29:26 2012 UTC

…		…
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		56
		57	typedef int render_repeat_mode;
		58
		59	#if HAVE_PIXBUF
57	typedef GdkPixbuf * urxvt__pixbuf;	60	typedef GdkPixbuf * urxvt__pixbuf;
		61	#endif
58	typedef rxvt_img * urxvt__img;	62	typedef rxvt_img * urxvt__img;
59		63
60	/////////////////////////////////////////////////////////////////////////////	64	/////////////////////////////////////////////////////////////////////////////
61		65
62	static void	66	static void
63	parse_color (rxvt_screen s, rxvt_color &c, SV sv)	67	parse_color (rxvt_screen s, rxvt_color &c, SV sv)
64	{	68	{
65	//TODO: support component stuff	69	//TODO: support component stuff, 0..1
66	c.set (s, SvPVbyte_nolen (sv));	70	c.set (s, SvPVbyte_nolen (sv));
67	}	71	}
68		72
69	/////////////////////////////////////////////////////////////////////////////	73	/////////////////////////////////////////////////////////////////////////////
70		74
…		…
380	}	384	}
381		385
382	rxvt_pop_locale ();	386	rxvt_pop_locale ();
383	}	387	}
384		388
385	if (perl)	389	if (perl && !term->perl.self)
386	{	390	{
387	// runs outside of perls ENV	391	// runs outside of perls ENV
388	term->perl.self = (void )newSVptr ((void )term, "urxvt::term");	392	term->perl.self = (void )newSVptr ((void )term, "urxvt::term");
389	hv_store ((HV )SvRV ((SV )term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newAV ()), 0);	393	hv_store ((HV )SvRV ((SV )term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newAV ()), 0);
390	hv_store ((HV )SvRV ((SV )term->perl.self), "_selection", 10, newRV_noinc ((SV *)newAV ()), 0);	394	hv_store ((HV )SvRV ((SV )term->perl.self), "_selection", 10, newRV_noinc ((SV *)newAV ()), 0);
391	}	395	}
392	}	396	}
393		397
		398	void
		399	rxvt_perl_interp::usage (rxvt_term *term, int type)
		400	{
		401	localise_env set_environ (perl_environ);
		402
		403	ENTER;
		404	SAVETMPS;
		405
		406	dSP;
		407	PUSHMARK (SP);
		408	EXTEND (SP, 2);
		409	PUSHs (sv_2mortal (newSVterm (term)));
		410	PUSHs (sv_2mortal (newSViv (type)));
		411	PUTBACK;
		412	call_pv ("urxvt::usage", G_VOID \| G_DISCARD);
		413
		414	FREETMPS;
		415	LEAVE;
		416	}
		417
		418	uint8_t
		419	rxvt_perl_interp::parse_resource (rxvt_term term, const char name, bool arg, bool longopt, bool flag, const char *value)
		420	{
		421	localise_env set_environ (perl_environ);
		422
		423	ENTER;
		424	SAVETMPS;
		425
		426	dSP;
		427	PUSHMARK (SP);
		428	EXTEND (SP, 6);
		429	PUSHs (sv_2mortal (newSVterm (term)));
		430	PUSHs (sv_2mortal (newSVpv (name, 0)));
		431	PUSHs (arg ? &PL_sv_yes : &PL_sv_no);
		432	PUSHs (longopt ? &PL_sv_yes : &PL_sv_no);
		433	PUSHs (flag ? &PL_sv_yes : &PL_sv_no);
		434	PUSHs (value ? sv_2mortal (newSVpv (value, 0)) : &PL_sv_undef);
		435	PUTBACK;
		436	call_pv ("urxvt::parse_resource", G_SCALAR);
		437	SPAGAIN;
		438
		439	uint8_t ret = POPi;
		440
		441	FREETMPS;
		442	LEAVE;
		443
		444	return ret;
		445	}
		446
394	static void	447	static void
395	ungrab (rxvt_term *THIS)	448	ungrab (rxvt_term *THIS)
396	{	449	{
397	if (THIS->perl.grabtime)	450	if (THIS->perl.grabtime)
398	{	451	{
…		…
429	}	482	}
430	}	483	}
431		484
432	bool event_consumed;	485	bool event_consumed;
433		486
434	if (htype == HOOK_INIT \|\| htype == HOOK_DESTROY // must be called always
435	\|\| term->perl.should_invoke [htype])	487	if (term->perl.should_invoke [htype])
436	{	488	{
437	dSP;	489	dSP;
438	va_list ap;	490	va_list ap;
439		491
440	va_start (ap, htype);	492	va_start (ap, htype);
…		…
650	ENTER;	702	ENTER;
651	SAVETMPS;	703	SAVETMPS;
652		704
653	dSP;	705	dSP;
654	XPUSHs (sv_2mortal (newSVpvn (data, len)));	706	XPUSHs (sv_2mortal (newSVpvn (data, len)));
		707	PUTBACK;
655	call_sv ((SV *)sel->cb_sv, G_VOID \| G_DISCARD \| G_EVAL);	708	call_sv ((SV *)sel->cb_sv, G_VOID \| G_DISCARD \| G_EVAL);
656		709
657	if (SvTRUE (ERRSV))	710	if (SvTRUE (ERRSV))
658	rxvt_warn ("perl selection callback evaluation error: %s", SvPVbyte_nolen (ERRSV));	711	rxvt_warn ("perl selection callback evaluation error: %s", SvPVbyte_nolen (ERRSV));
659		712
…		…
833	for (civ = const_iv + ecb_array_length (const_iv); civ > const_iv; civ--)	886	for (civ = const_iv + ecb_array_length (const_iv); civ > const_iv; civ--)
834	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));	887	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
835	}	888	}
836		889
837	void	890	void
		891	log (const char *msg)
		892	CODE:
		893	rxvt_log ("%s", msg);
		894
		895	void
838	warn (const char *msg)	896	warn (const char *msg)
839	CODE:	897	CODE:
840	rxvt_warn ("%s", msg);	898	rxvt_warn ("%s", msg);
841		899
842	void	900	void
…		…
844	CODE:	902	CODE:
845	rxvt_fatal ("%s", msg);	903	rxvt_fatal ("%s", msg);
846		904
847	void	905	void
848	_exit (int status)	906	_exit (int status)
		907
		908	void
		909	catch_fatal (SV *block)
		910	PROTOTYPE: &
		911	CODE:
		912	try
		913	{
		914	PUSHMARK (SP);
		915	PUTBACK;
		916	call_sv (block, G_VOID \| G_DISCARD);
		917	SPAGAIN;
		918	}
		919	catch (const rxvt_failure_exception &e)
		920	{
		921	croak ("rxvt_fatal exception caught, trying to continue.");
		922	}
849		923
850	NV	924	NV
851	NOW ()	925	NOW ()
852	CODE:	926	CODE:
853	RETVAL = ev::now ();	927	RETVAL = ev::now ();
…		…
991	case HOOK_POSITION_CHANGE:	1065	case HOOK_POSITION_CHANGE:
992	if (count)	1066	if (count)
993	THIS->get_window_origin (THIS->parent_x, THIS->parent_y);	1067	THIS->get_window_origin (THIS->parent_x, THIS->parent_y);
994	}	1068	}
995	}	1069	}
		1070
		1071	void
		1072	rxvt_term::put_option_db (octet_string specifier, octet_string value)
		1073	CODE:
		1074	XrmPutStringResource (&THIS->option_db, specifier, value);
996		1075
997	int	1076	int
998	rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)	1077	rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)
999	CODE:	1078	CODE:
1000	RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,	1079	RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,
…		…
1955	#############################################################################	2034	#############################################################################
1956	# fancy bg bloatstuff (TODO: should be moved up somewhere)	2035	# fancy bg bloatstuff (TODO: should be moved up somewhere)
1957		2036
1958	# TODO: ugly	2037	# TODO: ugly
1959	void	2038	void
1960	rxvt_term::get_geometry ()	2039	rxvt_term::background_geometry (bool border = false)
1961	PPCODE:	2040	PPCODE:
1962	EXTEND (SP, 4);	2041	EXTEND (SP, 4);
1963	PUSHs (sv_2mortal (newSViv (THIS->parent_x)));	2042	PUSHs (sv_2mortal (newSViv (THIS->parent_x + (border ? THIS->window_vt_x : 0))));
1964	PUSHs (sv_2mortal (newSViv (THIS->parent_y)));	2043	PUSHs (sv_2mortal (newSViv (THIS->parent_y + (border ? THIS->window_vt_y : 0))));
1965	PUSHs (sv_2mortal (newSViv (THIS->szHint.width)));	2044	PUSHs (sv_2mortal (newSViv (border ? THIS->vt_width : THIS->szHint.width )));
1966	PUSHs (sv_2mortal (newSViv (THIS->szHint.height)));	2045	PUSHs (sv_2mortal (newSViv (border ? THIS->vt_height : THIS->szHint.height)));
1967		2046
1968	#if HAVE_IMG	2047	#if HAVE_IMG
1969		2048
1970	rxvt_img *	2049	rxvt_img *
1971	rxvt_term::new_img (SV *format, int width, int height)	2050	rxvt_term::new_img (SV *format, int width = 1, int height = 1)
1972	CODE:	2051	CODE:
1973	XRenderPictFormat *f = SvOK (format)	2052	XRenderPictFormat *f = SvOK (format)
1974	? XRenderFindVisualFormat (THIS->dpy, THIS->visual)
1975	: XRenderFindStandardFormat (THIS->dpy, SvIV (format));	2053	? XRenderFindStandardFormat (THIS->dpy, SvIV (format))
		2054	: XRenderFindVisualFormat (THIS->dpy, THIS->visual);
1976	RETVAL = new rxvt_img (THIS, f, width, height);	2055	RETVAL = new rxvt_img (THIS, f, 0, 0, width, height);
		2056	RETVAL->alloc ();
1977	OUTPUT:	2057	OUTPUT:
1978	RETVAL	2058	RETVAL
1979		2059
1980	#if ENABLE_TRANSPARENCY	2060	#if ENABLE_TRANSPARENCY
1981
1982	#if 0
1983		2061
1984	rxvt_img *	2062	rxvt_img *
1985	rxvt_term::new_img_from_root ()	2063	rxvt_term::new_img_from_root ()
1986	CODE:	2064	CODE:
1987	RETVAL = rxvt_img::new_from_root (THIS);	2065	RETVAL = rxvt_img::new_from_root (THIS);
1988	OUTPUT:	2066	OUTPUT:
1989	RETVAL	2067	RETVAL
1990		2068
1991	#endif	2069	#endif
1992		2070
1993	#endif
1994
1995	#if HAVE_PIXBUF	2071	#if HAVE_PIXBUF
1996		2072
1997	rxvt_img *	2073	rxvt_img *
1998	rxvt_term::new_img_from_file (octet_string filename)	2074	rxvt_term::new_img_from_file (octet_string filename)
1999	CODE:	2075	CODE:
…		…
2011	#endif	2087	#endif
2012		2088
2013	#if HAVE_BG_PIXMAP	2089	#if HAVE_BG_PIXMAP
2014		2090
2015	void	2091	void
2016	rxvt_term::set_background (rxvt_img *img)	2092	rxvt_term::set_background (rxvt_img *img, bool border = false)
2017	CODE:	2093	CODE:
2018	THIS->bg_destroy ();	2094	THIS->bg_destroy ();
2019	THIS->bg_pixmap = None;	2095	THIS->bg_pixmap = None;
2020	THIS->bg_flags &= ~rxvt_term::BG_NEEDS_REFRESH;	2096	THIS->bg_flags &= ~(rxvt_term::BG_NEEDS_REFRESH \| rxvt_term::BG_INHIBIT_RENDER \| rxvt_term::BG_IS_TRANSPARENT);
2021		2097
2022	if (img) // TODO: cannot be false	2098	if (img) // TODO: cannot be false
2023	{	2099	{
		2100	img = img->clone (); // own the img
		2101
		2102	if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap
		2103	img->sub_rect (0, 0,
		2104	border ? THIS->vt_width : THIS->szHint.width,
		2105	border ? THIS->vt_height : THIS->szHint.height)
		2106	->replace (img);
		2107
		2108	// just in case, should usually be a nop
2024	img->unshare ();	2109	img->reify ()
		2110	->replace (img);
		2111
		2112	img->convert_format (XRenderFindVisualFormat (THIS->dpy, THIS->visual), THIS->pix_colors [Color_bg])
		2113	->replace (img);
		2114
2025	THIS->bg_pixmap = img->steal ();	2115	THIS->bg_pixmap = img->steal ();
		2116	THIS->bg_flags \|= rxvt_term::BG_NEEDS_REFRESH \| rxvt_term::BG_INHIBIT_RENDER;
		2117
		2118	if (!border)
2026	THIS->bg_flags \|= rxvt_term::BG_NEEDS_REFRESH;	2119	THIS->bg_flags \|= rxvt_term::BG_IS_TRANSPARENT;
2027	THIS->bg_valid_since = ev::now (); // TODO: extra bloat	2120
		2121	delete img;
2028	}	2122	}
2029		2123
2030	#endif	2124	#endif
2031		2125
2032	#endif	2126	#endif
…		…
2081		2175
2082	int	2176	int
2083	rxvt_img::h ()	2177	rxvt_img::h ()
2084	CODE:	2178	CODE:
2085	RETVAL = THIS->h;	2179	RETVAL = THIS->h;
2086	OUTPUT:
2087	RETVAL
2088
2089	bool
2090	rxvt_img::shared ()
2091	CODE:
2092	RETVAL = THIS->shared;
2093	OUTPUT:	2180	OUTPUT:
2094	RETVAL	2181	RETVAL
2095		2182
2096	Pixmap	2183	Pixmap
2097	rxvt_img::pm ()	2184	rxvt_img::pm ()
…		…
2111	rxvt_img::DESTROY ()	2198	rxvt_img::DESTROY ()
2112	CODE:	2199	CODE:
2113	delete THIS;	2200	delete THIS;
2114		2201
2115	void	2202	void
2116	rxvt_img::blur (int rh, int rv)	2203	rxvt_img::unshare ()
		2204
		2205	int
		2206	rxvt_img::repeat_mode (render_repeat_mode repeat = 0)
		2207	CODE:
		2208	if (items >= 2)
		2209	THIS->repeat_mode (repeat);
		2210	if (GIMME_V != G_VOID)
		2211	XPUSHs (sv_2mortal (newSViv (THIS->repeat)));
		2212
		2213	void
		2214	rxvt_img::move (int dx, int dy)
2117		2215
2118	void	2216	void
2119	rxvt_img::brightness (NV r, NV g, NV b, NV a = 1.)	2217	rxvt_img::brightness (NV r, NV g, NV b, NV a = 1.)
2120		2218
2121	void	2219	void
2122	rxvt_img::contrast (NV r, NV g, NV b, NV a = 1.)	2220	rxvt_img::contrast (NV r, NV g, NV b, NV a = 1.)
2123
2124	void
2125	rxvt_img::unshare ()
2126		2221
2127	rxvt_img *	2222	rxvt_img *
2128	rxvt_img::clone ()	2223	rxvt_img::clone ()
2129		2224
2130	rxvt_img *	2225	rxvt_img *
		2226	rxvt_img::reify ()
		2227
		2228	rxvt_img *
		2229	rxvt_img::sub_rect (int x, int y, int width, int height)
		2230
		2231	rxvt_img *
		2232	rxvt_img::blur (int rh, int rv)
		2233
		2234	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)	2235	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)
2132	INIT:	2236	INIT:
2133	double matrix[9] = {	2237	double matrix[9] = {
2134	p11, p12, p13,	2238	p11, p12, p13,
2135	p21, p22, p23,	2239	p21, p22, p23,
2136	p31, p32, p33	2240	p31, p32, p33
2137	};	2241	};
2138	C_ARGS: new_width, new_height, repeat, matrix	2242	C_ARGS: new_width, new_height, matrix
2139		2243
2140	rxvt_img *	2244	rxvt_img *
2141	rxvt_img::scale (int new_width, int new_height)	2245	rxvt_img::scale (int new_width, int new_height)
2142		2246
2143	rxvt_img *	2247	rxvt_img *
2144	rxvt_img::rotate (int new_width, int new_height, int repeat, int x, int y, NV phi)	2248	rxvt_img::rotate (int new_width, int new_height, int x, int y, NV phi)
2145		2249
2146	#endif	2250	#endif
2147		2251

Diff Legend

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

Comparing rxvt-unicode/src/rxvtperl.xs (file contents): Revision 1.166 by root, Tue Jun 5 11:00:40 2012 UTC vs. Revision 1.189 by root, Sun Jun 10 10:29:26 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtperl.xs (file contents):
Revision 1.166 by root, Tue Jun 5 11:00:40 2012 UTC vs.
Revision 1.189 by root, Sun Jun 10 10:29:26 2012 UTC