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

Comparing rxvt-unicode/src/rxvtperl.xs (file contents):
Revision 1.171 by root, Tue Jun 5 22:23:07 2012 UTC vs.
Revision 1.185 by root, Thu Jun 7 17:30:33 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);
…		…
400		400
401	ENTER;	401	ENTER;
402	SAVETMPS;	402	SAVETMPS;
403		403
404	dSP;	404	dSP;
		405	PUSHMARK (SP);
405	EXTEND (SP, 2);	406	EXTEND (SP, 2);
406	PUSHs (sv_2mortal (newSVterm (term)));	407	PUSHs (sv_2mortal (newSVterm (term)));
407	PUSHs (sv_2mortal (newSViv (type)));	408	PUSHs (sv_2mortal (newSViv (type)));
408	PUTBACK;	409	PUTBACK;
409	call_pv ("urxvt::usage", G_VOID \| G_DISCARD \| G_EVAL);	410	call_pv ("urxvt::usage", G_VOID \| G_DISCARD);
410		411
411	FREETMPS;	412	FREETMPS;
412	LEAVE;	413	LEAVE;
413	}	414	}
414		415
415	uint8_t	416	uint8_t
416	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)
417	{	418	{
418	localise_env set_environ (perl_environ);	419	localise_env set_environ (perl_environ);
419		420
420	ENTER;	421	ENTER;
421	SAVETMPS;	422	SAVETMPS;
422		423
423	dSP;	424	dSP;
		425	PUSHMARK (SP);
424	EXTEND (SP, 6);	426	EXTEND (SP, 6);
425	PUSHs (sv_2mortal (newSVterm (term)));	427	PUSHs (sv_2mortal (newSVterm (term)));
426	PUSHs (sv_2mortal (newSVpv (name, 0)));	428	PUSHs (sv_2mortal (newSVpv (name, 0)));
427	PUSHs (arg ? &PL_sv_yes : &PL_sv_no);	429	PUSHs (arg ? &PL_sv_yes : &PL_sv_no);
428	PUSHs (longopt ? &PL_sv_yes : &PL_sv_no);	430	PUSHs (longopt ? &PL_sv_yes : &PL_sv_no);
429	PUSHs (flag ? &PL_sv_yes : &PL_sv_no);	431	PUSHs (flag ? &PL_sv_yes : &PL_sv_no);
430	PUSHs (value ? sv_2mortal (newSVpv (value, 0)) : &PL_sv_undef);	432	PUSHs (value ? sv_2mortal (newSVpv (value, 0)) : &PL_sv_undef);
431	PUTBACK;	433	PUTBACK;
432	call_pv ("urxvt::resource", G_SCALAR \| G_EVAL);	434	call_pv ("urxvt::parse_resource", G_SCALAR);
		435	SPAGAIN;
433		436
434	uint8_t ret = POPi;	437	uint8_t ret = POPi;
435		438
436	FREETMPS;	439	FREETMPS;
437	LEAVE;	440	LEAVE;
…		…
1061	if (count)	1064	if (count)
1062	THIS->get_window_origin (THIS->parent_x, THIS->parent_y);	1065	THIS->get_window_origin (THIS->parent_x, THIS->parent_y);
1063	}	1066	}
1064	}	1067	}
1065		1068
		1069	void
		1070	rxvt_term::put_option_db (octet_string specifier, octet_string value)
		1071	CODE:
		1072	XrmPutStringResource (&THIS->option_db, specifier, value);
		1073
1066	int	1074	int
1067	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)
1068	CODE:	1076	CODE:
1069	RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,	1077	RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,
1070	ButtonPressMask \| ButtonReleaseMask \| EnterWindowMask \| LeaveWindowMask \| PointerMotionMask,	1078	ButtonPressMask \| ButtonReleaseMask \| EnterWindowMask \| LeaveWindowMask \| PointerMotionMask,
…		…
2024	#############################################################################	2032	#############################################################################
2025	# fancy bg bloatstuff (TODO: should be moved up somewhere)	2033	# fancy bg bloatstuff (TODO: should be moved up somewhere)
2026		2034
2027	# TODO: ugly	2035	# TODO: ugly
2028	void	2036	void
2029	rxvt_term::get_geometry ()	2037	rxvt_term::background_geometry (bool border = false)
2030	PPCODE:	2038	PPCODE:
2031	EXTEND (SP, 4);	2039	EXTEND (SP, 4);
2032	PUSHs (sv_2mortal (newSViv (THIS->parent_x)));	2040	PUSHs (sv_2mortal (newSViv (THIS->parent_x + (border ? THIS->window_vt_x : 0))));
2033	PUSHs (sv_2mortal (newSViv (THIS->parent_y)));	2041	PUSHs (sv_2mortal (newSViv (THIS->parent_y + (border ? THIS->window_vt_y : 0))));
2034	PUSHs (sv_2mortal (newSViv (THIS->szHint.width)));	2042	PUSHs (sv_2mortal (newSViv (border ? THIS->vt_width : THIS->szHint.width )));
2035	PUSHs (sv_2mortal (newSViv (THIS->szHint.height)));	2043	PUSHs (sv_2mortal (newSViv (border ? THIS->vt_height : THIS->szHint.height)));
2036		2044
2037	#if HAVE_IMG	2045	#if HAVE_IMG
		2046
		2047	#if 0
2038		2048
2039	rxvt_img *	2049	rxvt_img *
2040	rxvt_term::new_img (SV *format, int width, int height)	2050	rxvt_term::new_img (SV *format, int width, int height)
2041	CODE:	2051	CODE:
2042	XRenderPictFormat *f = SvOK (format)	2052	XRenderPictFormat *f = SvOK (format)
…		…
2044	: XRenderFindVisualFormat (THIS->dpy, THIS->visual);	2054	: XRenderFindVisualFormat (THIS->dpy, THIS->visual);
2045	RETVAL = new rxvt_img (THIS, f, width, height);	2055	RETVAL = new rxvt_img (THIS, f, width, height);
2046	OUTPUT:	2056	OUTPUT:
2047	RETVAL	2057	RETVAL
2048		2058
		2059	#endif
		2060
2049	#if ENABLE_TRANSPARENCY	2061	#if ENABLE_TRANSPARENCY
2050
2051	#if 0
2052		2062
2053	rxvt_img *	2063	rxvt_img *
2054	rxvt_term::new_img_from_root ()	2064	rxvt_term::new_img_from_root ()
2055	CODE:	2065	CODE:
2056	RETVAL = rxvt_img::new_from_root (THIS);	2066	RETVAL = rxvt_img::new_from_root (THIS);
2057	OUTPUT:	2067	OUTPUT:
2058	RETVAL	2068	RETVAL
2059		2069
2060	#endif	2070	#endif
2061		2071
2062	#endif
2063
2064	#if HAVE_PIXBUF	2072	#if HAVE_PIXBUF
2065		2073
2066	rxvt_img *	2074	rxvt_img *
2067	rxvt_term::new_img_from_file (octet_string filename)	2075	rxvt_term::new_img_from_file (octet_string filename)
2068	CODE:	2076	CODE:
…		…
2080	#endif	2088	#endif
2081		2089
2082	#if HAVE_BG_PIXMAP	2090	#if HAVE_BG_PIXMAP
2083		2091
2084	void	2092	void
2085	rxvt_term::set_background (rxvt_img *img)	2093	rxvt_term::set_background (rxvt_img *img, bool border = false)
2086	CODE:	2094	CODE:
2087	THIS->bg_destroy ();	2095	THIS->bg_destroy ();
2088	THIS->bg_pixmap = None;	2096	THIS->bg_pixmap = None;
2089	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);
2090		2098
2091	if (img) // TODO: cannot be false	2099	if (img) // TODO: cannot be false
2092	{	2100	{
2093	img->unshare ();	2101	img = img->clone (); // own the img
		2102
		2103	{
		2104	rxvt_img *img2 = img->convert_format (XRenderFindVisualFormat (THIS->dpy, THIS->visual), THIS->pix_colors [Color_bg]);
		2105	delete img;
		2106	img = img2;
		2107	}
		2108
		2109	if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap
		2110	{
		2111	rxvt_img *img2 = img->sub_rect (0, 0,
		2112	border ? THIS->vt_width : THIS->szHint.width,
		2113	border ? THIS->vt_height : THIS->szHint.height);
		2114	delete img;
		2115	img = img2;
		2116	}
		2117
		2118	{
		2119	// just in case, should usually be a nop
		2120	rxvt_img *img2 = img->reify ();
		2121	delete img;
		2122	img = img2;
		2123	}
		2124
2094	THIS->bg_pixmap = img->steal ();	2125	THIS->bg_pixmap = img->steal ();
		2126	THIS->bg_flags \|= rxvt_term::BG_NEEDS_REFRESH \| rxvt_term::BG_INHIBIT_RENDER;
		2127
		2128	if (!border)
2095	THIS->bg_flags \|= rxvt_term::BG_NEEDS_REFRESH;	2129	THIS->bg_flags \|= rxvt_term::BG_IS_TRANSPARENT;
2096	THIS->bg_valid_since = ev::now (); // TODO: extra bloat	2130
		2131	delete img;
2097	}	2132	}
2098		2133
2099	#endif	2134	#endif
2100		2135
2101	#endif	2136	#endif
…		…
2150		2185
2151	int	2186	int
2152	rxvt_img::h ()	2187	rxvt_img::h ()
2153	CODE:	2188	CODE:
2154	RETVAL = THIS->h;	2189	RETVAL = THIS->h;
2155	OUTPUT:
2156	RETVAL
2157
2158	bool
2159	rxvt_img::shared ()
2160	CODE:
2161	RETVAL = THIS->shared;
2162	OUTPUT:	2190	OUTPUT:
2163	RETVAL	2191	RETVAL
2164		2192
2165	Pixmap	2193	Pixmap
2166	rxvt_img::pm ()	2194	rxvt_img::pm ()
…		…
2179	void	2207	void
2180	rxvt_img::DESTROY ()	2208	rxvt_img::DESTROY ()
2181	CODE:	2209	CODE:
2182	delete THIS;	2210	delete THIS;
2183		2211
		2212	void
		2213	rxvt_img::unshare ()
		2214
		2215	int
		2216	rxvt_img::repeat_mode (render_repeat_mode repeat = 0)
		2217	CODE:
		2218	if (items >= 2)
		2219	THIS->repeat_mode (repeat);
		2220	if (GIMME_V != G_VOID)
		2221	XPUSHs (sv_2mortal (newSViv (THIS->repeat)));
		2222
		2223	void
		2224	rxvt_img::move (int dx, int dy)
		2225
		2226	void
		2227	rxvt_img::brightness (NV r, NV g, NV b, NV a = 1.)
		2228
		2229	void
		2230	rxvt_img::contrast (NV r, NV g, NV b, NV a = 1.)
		2231
		2232	rxvt_img *
		2233	rxvt_img::clone ()
		2234
		2235	rxvt_img *
		2236	rxvt_img::reify ()
		2237
		2238	rxvt_img *
		2239	rxvt_img::sub_rect (int x, int y, int width, int height)
		2240
2184	rxvt_img *	2241	rxvt_img *
2185	rxvt_img::blur (int rh, int rv)	2242	rxvt_img::blur (int rh, int rv)
2186		2243
2187	void
2188	rxvt_img::brightness (NV r, NV g, NV b, NV a = 1.)
2189
2190	void
2191	rxvt_img::contrast (NV r, NV g, NV b, NV a = 1.)
2192
2193	void
2194	rxvt_img::unshare ()
2195
2196	rxvt_img *	2244	rxvt_img *
2197	rxvt_img::clone ()
2198
2199	rxvt_img *
2200	rxvt_img::sub_rect (int x, int y, int width, int height, render_repeat_mode repeat = RepeatNormal)
2201
2202	rxvt_img *
2203	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)	2245	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)
2204	INIT:	2246	INIT:
2205	double matrix[9] = {	2247	double matrix[9] = {
2206	p11, p12, p13,	2248	p11, p12, p13,
2207	p21, p22, p23,	2249	p21, p22, p23,
2208	p31, p32, p33	2250	p31, p32, p33
2209	};	2251	};
2210	C_ARGS: new_width, new_height, matrix, repeat	2252	C_ARGS: new_width, new_height, matrix
2211		2253
2212	rxvt_img *	2254	rxvt_img *
2213	rxvt_img::scale (int new_width, int new_height)	2255	rxvt_img::scale (int new_width, int new_height)
2214		2256
2215	rxvt_img *	2257	rxvt_img *
2216	rxvt_img::rotate (int new_width, int new_height, int x, int y, NV phi, render_repeat_mode repeat = RepeatNormal)	2258	rxvt_img::rotate (int new_width, int new_height, int x, int y, NV phi)
2217		2259
2218	#endif	2260	#endif
2219		2261

Diff Legend

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

Comparing rxvt-unicode/src/rxvtperl.xs (file contents): Revision 1.171 by root, Tue Jun 5 22:23:07 2012 UTC vs. Revision 1.185 by root, Thu Jun 7 17:30:33 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtperl.xs (file contents):
Revision 1.171 by root, Tue Jun 5 22:23:07 2012 UTC vs.
Revision 1.185 by root, Thu Jun 7 17:30:33 2012 UTC