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

Comparing rxvt-unicode/src/rxvtperl.xs (file contents):
Revision 1.170 by root, Tue Jun 5 19:32:29 2012 UTC vs.
Revision 1.187 by root, Sat Jun 9 10:21:19 2012 UTC

…		…
382	}	382	}
383		383
384	rxvt_pop_locale ();	384	rxvt_pop_locale ();
385	}	385	}
386		386
387	if (perl)	387	if (perl && !term->perl.self)
388	{	388	{
389	// runs outside of perls ENV	389	// runs outside of perls ENV
390	term->perl.self = (void )newSVptr ((void )term, "urxvt::term");	390	term->perl.self = (void )newSVptr ((void )term, "urxvt::term");
391	hv_store ((HV )SvRV ((SV )term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newAV ()), 0);	391	hv_store ((HV )SvRV ((SV )term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newAV ()), 0);
392	hv_store ((HV )SvRV ((SV )term->perl.self), "_selection", 10, newRV_noinc ((SV *)newAV ()), 0);	392	hv_store ((HV )SvRV ((SV )term->perl.self), "_selection", 10, newRV_noinc ((SV *)newAV ()), 0);
393	}	393	}
394	}	394	}
395		395
396	void	396	void
397	rxvt_perl_interp::usage (int type)	397	rxvt_perl_interp::usage (rxvt_term *term, int type)
398	{	398	{
399	localise_env set_environ (perl_environ);	399	localise_env set_environ (perl_environ);
400		400
401	ENTER;	401	ENTER;
402	SAVETMPS;	402	SAVETMPS;
403		403
404	dSP;	404	dSP;
		405	PUSHMARK (SP);
		406	EXTEND (SP, 2);
		407	PUSHs (sv_2mortal (newSVterm (term)));
405	XPUSHs (sv_2mortal (newSViv (type)));	408	PUSHs (sv_2mortal (newSViv (type)));
406	PUTBACK;	409	PUTBACK;
407	call_pv ("urxvt::usage", G_VOID \| G_DISCARD \| G_EVAL);	410	call_pv ("urxvt::usage", G_VOID \| G_DISCARD);
408		411
409	FREETMPS;	412	FREETMPS;
410	LEAVE;	413	LEAVE;
411	}	414	}
412		415
413	uint8_t	416	uint8_t
414	rxvt_perl_interp::resource (rxvt_term term, const char name, bool arg, bool longopt, bool flag, const char *value)	417	rxvt_perl_interp::parse_resource (rxvt_term term, const char name, bool arg, bool longopt, bool flag, const char *value)
415	{	418	{
416	localise_env set_environ (perl_environ);	419	localise_env set_environ (perl_environ);
417		420
418	ENTER;	421	ENTER;
419	SAVETMPS;	422	SAVETMPS;
420		423
421	dSP;	424	dSP;
		425	PUSHMARK (SP);
422	EXTEND (SP, 6);	426	EXTEND (SP, 6);
423	PUSHs (sv_2mortal (newSVterm (term)));	427	PUSHs (sv_2mortal (newSVterm (term)));
424	PUSHs (sv_2mortal (newSVpv (name, 0)));	428	PUSHs (sv_2mortal (newSVpv (name, 0)));
425	PUSHs (arg ? &PL_sv_yes : &PL_sv_no);	429	PUSHs (arg ? &PL_sv_yes : &PL_sv_no);
426	PUSHs (longopt ? &PL_sv_yes : &PL_sv_no);	430	PUSHs (longopt ? &PL_sv_yes : &PL_sv_no);
427	PUSHs (flag ? &PL_sv_yes : &PL_sv_no);	431	PUSHs (flag ? &PL_sv_yes : &PL_sv_no);
428	PUSHs (value ? sv_2mortal (newSVpv (value, 0)) : &PL_sv_undef);	432	PUSHs (value ? sv_2mortal (newSVpv (value, 0)) : &PL_sv_undef);
429	PUTBACK;	433	PUTBACK;
430	call_pv ("urxvt::resource", G_SCALAR \| G_EVAL);	434	call_pv ("urxvt::parse_resource", G_SCALAR);
		435	SPAGAIN;
431		436
432	uint8_t ret = POPi;	437	uint8_t ret = POPi;
433		438
434	FREETMPS;	439	FREETMPS;
435	LEAVE;	440	LEAVE;
…		…
879	for (civ = const_iv + ecb_array_length (const_iv); civ > const_iv; civ--)	884	for (civ = const_iv + ecb_array_length (const_iv); civ > const_iv; civ--)
880	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));	885	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
881	}	886	}
882		887
883	void	888	void
		889	log (const char *msg)
		890	CODE:
		891	rxvt_log ("%s", msg);
		892
		893	void
884	warn (const char *msg)	894	warn (const char *msg)
885	CODE:	895	CODE:
886	rxvt_warn ("%s", msg);	896	rxvt_warn ("%s", msg);
887		897
888	void	898	void
…		…
1053	case HOOK_POSITION_CHANGE:	1063	case HOOK_POSITION_CHANGE:
1054	if (count)	1064	if (count)
1055	THIS->get_window_origin (THIS->parent_x, THIS->parent_y);	1065	THIS->get_window_origin (THIS->parent_x, THIS->parent_y);
1056	}	1066	}
1057	}	1067	}
		1068
		1069	void
		1070	rxvt_term::put_option_db (octet_string specifier, octet_string value)
		1071	CODE:
		1072	XrmPutStringResource (&THIS->option_db, specifier, value);
1058		1073
1059	int	1074	int
1060	rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)	1075	rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)
1061	CODE:	1076	CODE:
1062	RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,	1077	RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,
…		…
2017	#############################################################################	2032	#############################################################################
2018	# fancy bg bloatstuff (TODO: should be moved up somewhere)	2033	# fancy bg bloatstuff (TODO: should be moved up somewhere)
2019		2034
2020	# TODO: ugly	2035	# TODO: ugly
2021	void	2036	void
2022	rxvt_term::get_geometry ()	2037	rxvt_term::background_geometry (bool border = false)
2023	PPCODE:	2038	PPCODE:
2024	EXTEND (SP, 4);	2039	EXTEND (SP, 4);
2025	PUSHs (sv_2mortal (newSViv (THIS->parent_x)));	2040	PUSHs (sv_2mortal (newSViv (THIS->parent_x + (border ? THIS->window_vt_x : 0))));
2026	PUSHs (sv_2mortal (newSViv (THIS->parent_y)));	2041	PUSHs (sv_2mortal (newSViv (THIS->parent_y + (border ? THIS->window_vt_y : 0))));
2027	PUSHs (sv_2mortal (newSViv (THIS->szHint.width)));	2042	PUSHs (sv_2mortal (newSViv (border ? THIS->vt_width : THIS->szHint.width )));
2028	PUSHs (sv_2mortal (newSViv (THIS->szHint.height)));	2043	PUSHs (sv_2mortal (newSViv (border ? THIS->vt_height : THIS->szHint.height)));
2029		2044
2030	#if HAVE_IMG	2045	#if HAVE_IMG
		2046
		2047	#if 0
2031		2048
2032	rxvt_img *	2049	rxvt_img *
2033	rxvt_term::new_img (SV *format, int width, int height)	2050	rxvt_term::new_img (SV *format, int width, int height)
2034	CODE:	2051	CODE:
2035	XRenderPictFormat *f = SvOK (format)	2052	XRenderPictFormat *f = SvOK (format)
…		…
2037	: XRenderFindVisualFormat (THIS->dpy, THIS->visual);	2054	: XRenderFindVisualFormat (THIS->dpy, THIS->visual);
2038	RETVAL = new rxvt_img (THIS, f, width, height);	2055	RETVAL = new rxvt_img (THIS, f, width, height);
2039	OUTPUT:	2056	OUTPUT:
2040	RETVAL	2057	RETVAL
2041		2058
		2059	#endif
		2060
2042	#if ENABLE_TRANSPARENCY	2061	#if ENABLE_TRANSPARENCY
2043
2044	#if 0
2045		2062
2046	rxvt_img *	2063	rxvt_img *
2047	rxvt_term::new_img_from_root ()	2064	rxvt_term::new_img_from_root ()
2048	CODE:	2065	CODE:
2049	RETVAL = rxvt_img::new_from_root (THIS);	2066	RETVAL = rxvt_img::new_from_root (THIS);
2050	OUTPUT:	2067	OUTPUT:
2051	RETVAL	2068	RETVAL
2052		2069
2053	#endif	2070	#endif
2054		2071
2055	#endif
2056
2057	#if HAVE_PIXBUF	2072	#if HAVE_PIXBUF
2058		2073
2059	rxvt_img *	2074	rxvt_img *
2060	rxvt_term::new_img_from_file (octet_string filename)	2075	rxvt_term::new_img_from_file (octet_string filename)
2061	CODE:	2076	CODE:
…		…
2073	#endif	2088	#endif
2074		2089
2075	#if HAVE_BG_PIXMAP	2090	#if HAVE_BG_PIXMAP
2076		2091
2077	void	2092	void
2078	rxvt_term::set_background (rxvt_img *img)	2093	rxvt_term::set_background (rxvt_img *img, bool border = false)
2079	CODE:	2094	CODE:
2080	THIS->bg_destroy ();	2095	THIS->bg_destroy ();
2081	THIS->bg_pixmap = None;	2096	THIS->bg_pixmap = None;
2082	THIS->bg_flags &= ~rxvt_term::BG_NEEDS_REFRESH;	2097	THIS->bg_flags &= ~(rxvt_term::BG_NEEDS_REFRESH \| rxvt_term::BG_INHIBIT_RENDER \| rxvt_term::BG_IS_TRANSPARENT);
2083		2098
2084	if (img) // TODO: cannot be false	2099	if (img) // TODO: cannot be false
2085	{	2100	{
		2101	img = img->clone (); // own the img
		2102
		2103	if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap
		2104	img->sub_rect (0, 0,
		2105	border ? THIS->vt_width : THIS->szHint.width,
		2106	border ? THIS->vt_height : THIS->szHint.height)
		2107	->replace (img);
		2108
		2109	// just in case, should usually be a nop
2086	img->unshare ();	2110	img->reify ()
		2111	->replace (img);
		2112
		2113	img->convert_format (XRenderFindVisualFormat (THIS->dpy, THIS->visual), THIS->pix_colors [Color_bg])
		2114	->replace (img);
		2115
2087	THIS->bg_pixmap = img->steal ();	2116	THIS->bg_pixmap = img->steal ();
		2117	THIS->bg_flags \|= rxvt_term::BG_NEEDS_REFRESH \| rxvt_term::BG_INHIBIT_RENDER;
		2118
		2119	if (!border)
2088	THIS->bg_flags \|= rxvt_term::BG_NEEDS_REFRESH;	2120	THIS->bg_flags \|= rxvt_term::BG_IS_TRANSPARENT;
2089	THIS->bg_valid_since = ev::now (); // TODO: extra bloat	2121
		2122	delete img;
2090	}	2123	}
2091		2124
2092	#endif	2125	#endif
2093		2126
2094	#endif	2127	#endif
…		…
2143		2176
2144	int	2177	int
2145	rxvt_img::h ()	2178	rxvt_img::h ()
2146	CODE:	2179	CODE:
2147	RETVAL = THIS->h;	2180	RETVAL = THIS->h;
2148	OUTPUT:
2149	RETVAL
2150
2151	bool
2152	rxvt_img::shared ()
2153	CODE:
2154	RETVAL = THIS->shared;
2155	OUTPUT:	2181	OUTPUT:
2156	RETVAL	2182	RETVAL
2157		2183
2158	Pixmap	2184	Pixmap
2159	rxvt_img::pm ()	2185	rxvt_img::pm ()
…		…
2172	void	2198	void
2173	rxvt_img::DESTROY ()	2199	rxvt_img::DESTROY ()
2174	CODE:	2200	CODE:
2175	delete THIS;	2201	delete THIS;
2176		2202
		2203	void
		2204	rxvt_img::unshare ()
		2205
		2206	int
		2207	rxvt_img::repeat_mode (render_repeat_mode repeat = 0)
		2208	CODE:
		2209	if (items >= 2)
		2210	THIS->repeat_mode (repeat);
		2211	if (GIMME_V != G_VOID)
		2212	XPUSHs (sv_2mortal (newSViv (THIS->repeat)));
		2213
		2214	void
		2215	rxvt_img::move (int dx, int dy)
		2216
		2217	void
		2218	rxvt_img::brightness (NV r, NV g, NV b, NV a = 1.)
		2219
		2220	void
		2221	rxvt_img::contrast (NV r, NV g, NV b, NV a = 1.)
		2222
		2223	rxvt_img *
		2224	rxvt_img::clone ()
		2225
		2226	rxvt_img *
		2227	rxvt_img::reify ()
		2228
		2229	rxvt_img *
		2230	rxvt_img::sub_rect (int x, int y, int width, int height)
		2231
2177	rxvt_img *	2232	rxvt_img *
2178	rxvt_img::blur (int rh, int rv)	2233	rxvt_img::blur (int rh, int rv)
2179		2234
2180	void
2181	rxvt_img::brightness (NV r, NV g, NV b, NV a = 1.)
2182
2183	void
2184	rxvt_img::contrast (NV r, NV g, NV b, NV a = 1.)
2185
2186	void
2187	rxvt_img::unshare ()
2188
2189	rxvt_img *	2235	rxvt_img *
2190	rxvt_img::clone ()
2191
2192	rxvt_img *
2193	rxvt_img::sub_rect (int x, int y, int width, int height, render_repeat_mode repeat = RepeatNormal)
2194
2195	rxvt_img *
2196	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)	2236	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)
2197	INIT:	2237	INIT:
2198	double matrix[9] = {	2238	double matrix[9] = {
2199	p11, p12, p13,	2239	p11, p12, p13,
2200	p21, p22, p23,	2240	p21, p22, p23,
2201	p31, p32, p33	2241	p31, p32, p33
2202	};	2242	};
2203	C_ARGS: new_width, new_height, matrix, repeat	2243	C_ARGS: new_width, new_height, matrix
2204		2244
2205	rxvt_img *	2245	rxvt_img *
2206	rxvt_img::scale (int new_width, int new_height)	2246	rxvt_img::scale (int new_width, int new_height)
2207		2247
2208	rxvt_img *	2248	rxvt_img *
2209	rxvt_img::rotate (int new_width, int new_height, int x, int y, NV phi, render_repeat_mode repeat = RepeatNormal)	2249	rxvt_img::rotate (int new_width, int new_height, int x, int y, NV phi)
2210		2250
2211	#endif	2251	#endif
2212		2252

Diff Legend

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

Comparing rxvt-unicode/src/rxvtperl.xs (file contents): Revision 1.170 by root, Tue Jun 5 19:32:29 2012 UTC vs. Revision 1.187 by root, Sat Jun 9 10:21:19 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtperl.xs (file contents):
Revision 1.170 by root, Tue Jun 5 19:32:29 2012 UTC vs.
Revision 1.187 by root, Sat Jun 9 10:21:19 2012 UTC