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

Comparing rxvt-unicode/src/rxvtperl.xs (file contents):
Revision 1.172 by root, Tue Jun 5 22:46:50 2012 UTC vs.
Revision 1.188 by sf-exg, Sat Jun 9 17:28:03 2012 UTC

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

Diff Legend

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

Comparing rxvt-unicode/src/rxvtperl.xs (file contents): Revision 1.172 by root, Tue Jun 5 22:46:50 2012 UTC vs. Revision 1.188 by sf-exg, Sat Jun 9 17:28:03 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtperl.xs (file contents):
Revision 1.172 by root, Tue Jun 5 22:46:50 2012 UTC vs.
Revision 1.188 by sf-exg, Sat Jun 9 17:28:03 2012 UTC