ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/rxvt-unicode/src/rxvtperl.xs

Comparing rxvt-unicode/src/rxvtperl.xs (file contents):
Revision 1.94 by root, Thu Jan 26 00:09:47 2006 UTC vs.
Revision 1.185 by root, Thu Jun 7 17:30:33 2012 UTC

1	/*----------------------------------------------------------------------*	1	/*----------------------------------------------------------------------*
2	* File: rxvtperl.xs	2	* File: rxvtperl.xs
3	*----------------------------------------------------------------------*	3	*----------------------------------------------------------------------*
4	*	4	*
5	* All portions of code are copyright by their respective author/s.	5	* All portions of code are copyright by their respective author/s.
6	* Copyright (c) 2005-2006 Marc Lehmann <pcg@goof.com>	6	* Copyright (c) 2005-2008,2011 Marc Lehmann <schmorp@schmorp.de>
7	*	7	*
8	* This program is free software; you can redistribute it and/or modify	8	* This program is free software; you can redistribute it and/or modify
9	* it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
10	* the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation; either version 2 of the License, or
11	* (at your option) any later version.	11	* (at your option) any later version.
…		…
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 "iom.h"	37	#include "ev_cpp.h"
37	#include "rxvt.h"	38	#include "rxvt.h"
38	#include "keyboard.h"	39	#include "keyboard.h"
39	#include "rxvtutil.h"	40	#include "rxvtutil.h"
40	#include "rxvtperl.h"	41	#include "rxvtperl.h"
41		42
42	#include "perlxsi.c"	43	#include "perlxsi.c"
43		44
44	#ifdef HAVE_SCROLLBARS
45	# define GRAB_CURSOR THIS->leftptr_cursor	45	#define GRAB_CURSOR THIS->scrollBar.leftptr_cursor
46	#else
47	# define GRAB_CURSOR None
48	#endif
49		46
50	#undef LINENO	47	#undef LINENO
51	#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)
52	#undef ROW	49	#undef ROW
53	#define ROW(n) THIS->row_buf [LINENO (n)]	50	#define ROW(n) THIS->row_buf [LINENO (n)]
54		51
55	typedef int CHAINED UNUSED;	52	/////////////////////////////////////////////////////////////////////////////
		53
		54	typedef char * octet_string;
		55	typedef char * utf8_string;
		56
		57	typedef int render_repeat_mode;
		58
		59	typedef GdkPixbuf * urxvt__pixbuf;
		60	typedef rxvt_img * urxvt__img;
		61
		62	/////////////////////////////////////////////////////////////////////////////
		63
		64	static void
		65	parse_color (rxvt_screen *s, rxvt_color &c, SV *sv)
		66	{
		67	//TODO: support component stuff
		68	c.set (s, SvPVbyte_nolen (sv));
		69	}
56		70
57	/////////////////////////////////////////////////////////////////////////////	71	/////////////////////////////////////////////////////////////////////////////
58		72
59	static wchar_t *	73	static wchar_t *
60	sv2wcs (SV *sv)	74	sv2wcs (SV *sv)
…		…
75		89
76	return sv;	90	return sv;
77	}	91	}
78		92
79	static SV *	93	static SV *
80	new_ref (HV *hv, const char *klass)
81	{
82	return sv_bless (newRV ((SV *)hv), gv_stashpv (klass, 1));
83	}
84
85	//TODO: use magic
86	static SV *
87	newSVptr (void *ptr, const char *klass)	94	newSVptr (void *ptr, const char *klass)
88	{	95	{
89	HV *hv = newHV ();	96	HV *hv = newHV ();
90	sv_magic ((SV *)hv, 0, PERL_MAGIC_ext, (char *)ptr, 0);	97	sv_magic ((SV *)hv, 0, PERL_MAGIC_ext, (char *)ptr, 0);
91	return sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));	98	return sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
…		…
113	croak ("perl code used %s object, but C++ object is already destroyed, caught", klass);	120	croak ("perl code used %s object, but C++ object is already destroyed, caught", klass);
114		121
115	return (long)mg->mg_ptr;	122	return (long)mg->mg_ptr;
116	}	123	}
117		124
118	#define newSVterm(term) SvREFCNT_inc ((SV *)term->perl.self)	125	#define newSVterm(term) SvREFCNT_inc ((SV *)(term)->perl.self)
119	#define SvTERM(sv) (rxvt_term *)SvPTR (sv, "urxvt::term")	126	#define SvTERM(sv) (rxvt_term *)SvPTR ((sv), "urxvt::term")
120		127
121	/////////////////////////////////////////////////////////////////////////////	128	/////////////////////////////////////////////////////////////////////////////
122		129
123	#define SvWATCHER(sv) (perl_watcher *)SvPTR (sv, "urxvt::watcher")
124
125	struct perl_watcher
126	{
127	SV *cbsv;
128	HV *self;
129
130	perl_watcher ()
131	: cbsv (0)
132	{
133	}
134
135	~perl_watcher ()
136	{
137	SvREFCNT_dec (cbsv);
138	}
139
140	void cb (SV *cb)
141	{
142	SvREFCNT_dec (cbsv);
143	cbsv = newSVsv (cb);
144	}
145
146	void invoke (const char *type, SV *self, int arg = -1);
147	};
148
149	void
150	perl_watcher::invoke (const char *type, SV *self, int arg)
151	{
152	dSP;
153
154	ENTER;
155	SAVETMPS;
156
157	PUSHMARK (SP);
158
159	XPUSHs (sv_2mortal (self));
160
161	if (arg >= 0)
162	XPUSHs (sv_2mortal (newSViv (arg)));
163
164	PUTBACK;
165	call_sv (cbsv, G_VOID | G_EVAL | G_DISCARD);
166	SPAGAIN;
167
168	PUTBACK;
169	FREETMPS;
170	LEAVE;
171
172	if (SvTRUE (ERRSV))
173	rxvt_warn ("%s callback evaluation error: %s", type, SvPV_nolen (ERRSV));
174	}
175
176	#define newSVtimer(timer) new_ref (timer->self, "urxvt::timer")
177	#define SvTIMER(sv) (timer *)(perl_watcher *)SvPTR (sv, "urxvt::timer")
178
179	struct timer : perl_watcher, time_watcher
180	{
181	tstamp interval;
182
183	timer ()
184	: time_watcher (this, &timer::execute)
185	{
186	}
187
188	void execute (time_watcher &w)
189	{
190	if (interval)
191	start (at + interval);
192
193	invoke ("urxvt::timer", newSVtimer (this));
194	}
195	};
196
197	#define newSViow(iow) new_ref (iow->self, "urxvt::iow")
198	#define SvIOW(sv) (iow *)(perl_watcher *)SvPTR (sv, "urxvt::iow")
199
200	struct iow : perl_watcher, io_watcher
201	{
202	iow ()
203	: io_watcher (this, &iow::execute)
204	{
205	}
206
207	void execute (io_watcher &w, short revents)
208	{
209	invoke ("urxvt::iow", newSViow (this), revents);
210	}
211	};
212
213	#define newSViw(iw) new_ref (iw->self, "urxvt::iw")
214	#define SvIW(sv) (iw *)(perl_watcher *)SvPTR (sv, "urxvt::iw")
215
216	struct iw : perl_watcher, idle_watcher
217	{
218	iw ()
219	: idle_watcher (this, &iw::execute)
220	{
221	}
222
223	void execute (idle_watcher &w)
224	{
225	invoke ("urxvt::iw", newSViw (this));
226	}
227	};
228
229	#define newSVpw(pw) new_ref (pw->self, "urxvt::pw")
230	#define SvPW(sv) (pw *)(perl_watcher *)SvPTR (sv, "urxvt::pw")
231
232	struct pw : perl_watcher, child_watcher
233	{
234	pw ()
235	: child_watcher (this, &pw::execute)
236	{
237	}
238
239	void execute (child_watcher &w, int status)
240	{
241	invoke ("urxvt::pw", newSVpw (this), status);
242	}
243	};
244
245	/////////////////////////////////////////////////////////////////////////////
246
247	#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay")	130	#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay")
248		131
249	class overlay {	132	class overlay : overlay_base
		133	{
250	rxvt_term *THIS;	134	rxvt_term *THIS;
251	AV *overlay_av;	135	AV *overlay_av;
252	int x, y, w, h;
253	int border;	136	int border;
254	text_t **text;
255	rend_t **rend;
256		137
257	public:	138	public:
258	HV *self;	139	HV *self;
259		140
260	overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border);	141	overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border);
…		…
267		148
268	void set (int x, int y, SV *str, SV *rend);	149	void set (int x, int y, SV *str, SV *rend);
269	};	150	};
270		151
271	overlay::overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border)	152	overlay::overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border)
272	: THIS(THIS), x(x_), y(y_), w(w_), h(h_), border(border == 2), overlay_av (0)	153	: THIS(THIS), border(border == 2), overlay_av (0)
273	{	154	{
		155	x = x_;
		156	y = y_;
		157	w = w_;
		158	h = h_;
		159
		160	if (w < 0) w = 0;
		161	if (h < 0) h = 0;
		162
274	if (border == 2)	163	if (border == 2)
275	{	164	{
276	w += 2;	165	w += 2;
277	h += 2;	166	h += 2;
278	}	167	}
…		…
344	*hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0)	233	*hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0)
345	));	234	));
346	av_push (overlay_av, newSViv ((long)this));	235	av_push (overlay_av, newSViv ((long)this));
347		236
348	THIS->want_refresh = 1;	237	THIS->want_refresh = 1;
		238	THIS->refresh_check ();
349	}	239	}
350		240
351	void	241	void
352	overlay::hide ()	242	overlay::hide ()
353	{	243	{
…		…
356		246
357	int i;	247	int i;
358		248
359	for (i = AvFILL (overlay_av); i >= 0; i--)	249	for (i = AvFILL (overlay_av); i >= 0; i--)
360	if (SvIV (*av_fetch (overlay_av, i, 1)) == (long)this)	250	if (SvIV (*av_fetch (overlay_av, i, 1)) == (long)this)
361	{
362	av_delete (overlay_av, i, G_DISCARD);
363	break;	251	break;
364	}
365		252
366	for (; i < AvFILL (overlay_av); i++)	253	for (; i < AvFILL (overlay_av); i++)
367	av_store (overlay_av, i, SvREFCNT_inc (*av_fetch (overlay_av, i + 1, 0)));	254	av_store (overlay_av, i, SvREFCNT_inc (*av_fetch (overlay_av, i + 1, 0)));
368		255
369	av_pop (overlay_av);	256	av_pop (overlay_av);
370		257
371	SvREFCNT_dec (overlay_av);	258	SvREFCNT_dec (overlay_av);
372	overlay_av = 0;	259	overlay_av = 0;
373		260
374	THIS->want_refresh = 1;	261	THIS->want_refresh = 1;
		262	THIS->refresh_check ();
375	}	263	}
376		264
377	void overlay::swap ()	265	void overlay::swap ()
378	{	266	{
379	int ov_x = max (0, min (MOD (x, THIS->ncol), THIS->ncol - w));	267	int ov_x = max (0, min (MOD (x, THIS->ncol), THIS->ncol - w));
380	int ov_y = max (0, min (MOD (y, THIS->nrow), THIS->nrow - h));	268	int ov_y = max (0, min (MOD (y, THIS->nrow), THIS->nrow - h));
381		269
382	int ov_w = min (w, THIS->ncol - ov_x);	270	int ov_w = min (w, THIS->ncol - ov_x);
383	int ov_h = min (h, THIS->nrow - ov_y);	271	int ov_h = min (h, THIS->nrow - ov_y);
		272
		273	// hide cursor if it is within the overlay area
		274	if (IN_RANGE_EXC (THIS->screen.cur.col - ov_x, 0, ov_w)
		275	&& IN_RANGE_EXC (THIS->screen.cur.row - ov_y, 0, ov_h))
		276	THIS->screen.flags &= ~Screen_VisibleCursor;
384		277
385	for (int y = ov_h; y--; )	278	for (int y = ov_h; y--; )
386	{	279	{
387	text_t *t1 = text [y];	280	text_t *t1 = text [y];
388	rend_t *r1 = rend [y];	281	rend_t *r1 = rend [y];
…		…
424	for (int col = min (AvFILL (av) + 1, w - x - border); col--; )	317	for (int col = min (AvFILL (av) + 1, w - x - border); col--; )
425	this->rend [y][x + col] = SvIV (*av_fetch (av, col, 1));	318	this->rend [y][x + col] = SvIV (*av_fetch (av, col, 1));
426	}	319	}
427		320
428	THIS->want_refresh = 1;	321	THIS->want_refresh = 1;
		322	THIS->refresh_check ();
429	}	323	}
430		324
		325	/////////////////////////////////////////////////////////////////////////////
		326
		327	#include "iom_perl.h"
431		328
432	/////////////////////////////////////////////////////////////////////////////	329	/////////////////////////////////////////////////////////////////////////////
433		330
434	struct rxvt_perl_interp rxvt_perl;	331	struct rxvt_perl_interp rxvt_perl;
435		332
…		…
439	{	336	{
440	if (perl)	337	if (perl)
441	{	338	{
442	perl_destruct (perl);	339	perl_destruct (perl);
443	perl_free (perl);	340	perl_free (perl);
		341	PERL_SYS_TERM ();
444	}	342	}
445	}	343	}
446		344
447	void	345	void
448	rxvt_perl_interp::init (rxvt_term *term)	346	rxvt_perl_interp::init (rxvt_term *term)
449	{	347	{
450	if (!perl)	348	if (!perl)
451	{	349	{
452	rxvt_push_locale (""); // perl init destroys current locale	350	rxvt_push_locale (""); // perl init destroys current locale
453		351
		352	{
454	perl_environ = rxvt_environ;	353	perl_environ = rxvt_environ;
455	swap (perl_environ, environ);	354	localise_env set_environ (perl_environ);
456		355
457	char *argv[] = {	356	char *args[] = {
458	"",	357	"",
459	"-e"	358	"-e"
460	"BEGIN {"	359	"BEGIN {"
461	" urxvt->bootstrap;"	360	" urxvt->bootstrap;"
462	" unshift @INC, '" LIBDIR "';"	361	" unshift @INC, '" LIBDIR "';"
463	"}"	362	"}"
464	""	363	""
465	"use urxvt;"	364	"use urxvt;"
466	};	365	};
		366	int argc = ecb_array_length (args);
		367	char **argv = args;
467		368
		369	PERL_SYS_INIT3 (&argc, &argv, &environ);
468	perl = perl_alloc ();	370	perl = perl_alloc ();
469	perl_construct (perl);	371	perl_construct (perl);
470		372
471	if (perl_parse (perl, xs_init, 2, argv, (char **)NULL)	373	if (perl_parse (perl, xs_init, argc, argv, (char **)NULL)
472	|| perl_run (perl))	374	|| perl_run (perl))
473	{	375	{
474	rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n");	376	rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n");
475		377
476	perl_destruct (perl);	378	perl_destruct (perl);
477	perl_free (perl);	379	perl_free (perl);
478	perl = 0;	380	perl = 0;
479	}	381	}
480		382	}
481	swap (perl_environ, environ);
482		383
483	rxvt_pop_locale ();	384	rxvt_pop_locale ();
484	}	385	}
485		386
486	if (perl)	387	if (perl && !term->perl.self)
487	{	388	{
488	// runs outside of perls ENV	389	// runs outside of perls ENV
489	term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term");	390	term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term");
490	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);
491	}	393	}
		394	}
		395
		396	void
		397	rxvt_perl_interp::usage (rxvt_term *term, int type)
		398	{
		399	localise_env set_environ (perl_environ);
		400
		401	ENTER;
		402	SAVETMPS;
		403
		404	dSP;
		405	PUSHMARK (SP);
		406	EXTEND (SP, 2);
		407	PUSHs (sv_2mortal (newSVterm (term)));
		408	PUSHs (sv_2mortal (newSViv (type)));
		409	PUTBACK;
		410	call_pv ("urxvt::usage", G_VOID | G_DISCARD);
		411
		412	FREETMPS;
		413	LEAVE;
		414	}
		415
		416	uint8_t
		417	rxvt_perl_interp::parse_resource (rxvt_term *term, const char *name, bool arg, bool longopt, bool flag, const char *value)
		418	{
		419	localise_env set_environ (perl_environ);
		420
		421	ENTER;
		422	SAVETMPS;
		423
		424	dSP;
		425	PUSHMARK (SP);
		426	EXTEND (SP, 6);
		427	PUSHs (sv_2mortal (newSVterm (term)));
		428	PUSHs (sv_2mortal (newSVpv (name, 0)));
		429	PUSHs (arg ? &PL_sv_yes : &PL_sv_no);
		430	PUSHs (longopt ? &PL_sv_yes : &PL_sv_no);
		431	PUSHs (flag ? &PL_sv_yes : &PL_sv_no);
		432	PUSHs (value ? sv_2mortal (newSVpv (value, 0)) : &PL_sv_undef);
		433	PUTBACK;
		434	call_pv ("urxvt::parse_resource", G_SCALAR);
		435	SPAGAIN;
		436
		437	uint8_t ret = POPi;
		438
		439	FREETMPS;
		440	LEAVE;
		441
		442	return ret;
492	}	443	}
493		444
494	static void	445	static void
495	ungrab (rxvt_term *THIS)	446	ungrab (rxvt_term *THIS)
496	{	447	{
497	if (THIS->perl.grabtime)	448	if (THIS->perl.grabtime)
498	{	449	{
499	XUngrabKeyboard (THIS->display->display, THIS->perl.grabtime);	450	XUngrabKeyboard (THIS->dpy, THIS->perl.grabtime);
500	XUngrabPointer (THIS->display->display, THIS->perl.grabtime);	451	XUngrabPointer (THIS->dpy, THIS->perl.grabtime);
501	THIS->perl.grabtime = 0;	452	THIS->perl.grabtime = 0;
502	}	453	}
503	}	454	}
504		455
505	bool	456	bool
506	rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)	457	rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)
507	{	458	{
508	if (!perl || !term->perl.self)	459	if (!perl || !term->perl.self)
509	return false;	460	return false;
		461
		462	localise_env set_environ (perl_environ);
510		463
511	// pre-handling of some events	464	// pre-handling of some events
512	if (htype == HOOK_REFRESH_END)	465	if (htype == HOOK_REFRESH_END)
513	{	466	{
514	AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));	467	AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
515		468
516	for (int i = 0; i <= AvFILL (av); i++)	469	for (int i = 0; i <= AvFILL (av); i++)
517	((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();	470	((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
518	}	471	}
		472	else if (htype == HOOK_DESTROY)
		473	{
		474	AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_selection", 10, 0));
519		475
520	swap (perl_environ, environ);	476	for (int i = AvFILL (av); i >= 0; i--)
		477	{
		478	rxvt_selection *req = (rxvt_selection *)SvIV (*av_fetch (av, i, 0));
		479	delete req;
		480	}
		481	}
521		482
522	bool event_consumed;	483	bool event_consumed;
523		484
524	if (htype == HOOK_INIT || htype == HOOK_DESTROY // must be called always
525	|| term->perl.should_invoke [htype])	485	if (term->perl.should_invoke [htype])
526	try
527	{	486	{
528	dSP;	487	dSP;
529	va_list ap;	488	va_list ap;
530		489
531	va_start (ap, htype);	490	va_start (ap, htype);
532		491
533	ENTER;	492	ENTER;
534	SAVETMPS;	493	SAVETMPS;
535		494
536	PUSHMARK (SP);	495	PUSHMARK (SP);
537		496
		497	EXTEND (SP, 2);
538	XPUSHs (sv_2mortal (newSVterm (term)));	498	PUSHs (sv_2mortal (newSVterm (term)));
539	XPUSHs (sv_2mortal (newSViv (htype)));	499	PUSHs (sv_2mortal (newSViv (htype)));
540		500
541	for (;;) {	501	for (;;) {
542	data_type dt = (data_type)va_arg (ap, int);	502	data_type dt = (data_type)va_arg (ap, int);
543		503
544	switch (dt)	504	switch (dt)
545	{	505	{
546	case DT_INT:	506	case DT_INT:
547	XPUSHs (sv_2mortal (newSViv (va_arg (ap, int))));	507	XPUSHs (sv_2mortal (newSViv (va_arg (ap, int))));
548	break;	508	break;
549		509
550	case DT_LONG:	510	case DT_LONG:
551	XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));	511	XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));
552	break;	512	break;
553		513
554	case DT_STR:	514	case DT_STR:
555	XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0)));	515	XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0)));
556	break;	516	break;
557		517
558	case DT_STR_LEN:	518	case DT_STR_LEN:
559	{	519	{
560	char *str = va_arg (ap, char *);	520	char *str = va_arg (ap, char *);
561	int len = va_arg (ap, int);	521	int len = va_arg (ap, int);
562		522
563	XPUSHs (sv_2mortal (newSVpvn (str, len)));	523	XPUSHs (sv_2mortal (newSVpvn (str, len)));
564	}	524	}
565	break;	525	break;
566		526
567	case DT_WCS_LEN:	527	case DT_WCS_LEN:
568	{	528	{
569	wchar_t *wstr = va_arg (ap, wchar_t *);	529	wchar_t *wstr = va_arg (ap, wchar_t *);
570	int wlen = va_arg (ap, int);	530	int wlen = va_arg (ap, int);
571		531
572	XPUSHs (sv_2mortal (wcs2sv (wstr, wlen)));	532	XPUSHs (sv_2mortal (wcs2sv (wstr, wlen)));
573	}	533	}
574	break;	534	break;
575		535
576	case DT_LCS_LEN:	536	case DT_LCS_LEN:
577	{	537	{
578	long *lstr = va_arg (ap, long *);	538	long *lstr = va_arg (ap, long *);
579	int llen = va_arg (ap, int);	539	int llen = va_arg (ap, int);
580		540
581	XPUSHs (sv_2mortal (newSVpvn ((char *)lstr, llen * sizeof (long))));	541	XPUSHs (sv_2mortal (newSVpvn ((char *)lstr, llen * sizeof (long))));
582	}	542	}
583	break;	543	break;
584		544
585	case DT_XEVENT:	545	case DT_XEVENT:
586	{	546	{
587	XEvent *xe = va_arg (ap, XEvent *);	547	XEvent *xe = va_arg (ap, XEvent *);
588	HV *hv = newHV ();	548	HV *hv = newHV ();
589		549
590	# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0)	550	# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0)
591	# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0)	551	# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0)
592	# define setuv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSVuv (val), 0)	552	# define setuv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSVuv (val), 0)
593	# undef set	553	# undef set
594		554
595	setiv (type, xe->type);	555	setiv (type, xe->type);
596	setiv (send_event, xe->xany.send_event);	556	setiv (send_event, xe->xany.send_event);
597	setiv (serial, xe->xany.serial);	557	setiv (serial, xe->xany.serial);
598		558
599	switch (xe->type)	559	switch (xe->type)
600	{	560	{
601	case KeyPress:	561	case KeyPress:
602	case KeyRelease:	562	case KeyRelease:
603	case ButtonPress:	563	case ButtonPress:
604	case ButtonRelease:	564	case ButtonRelease:
605	case MotionNotify:	565	case MotionNotify:
606	setuv (window, xe->xmotion.window);	566	setuv (window, xe->xmotion.window);
607	setuv (root, xe->xmotion.root);	567	setuv (root, xe->xmotion.root);
608	setuv (subwindow, xe->xmotion.subwindow);	568	setuv (subwindow, xe->xmotion.subwindow);
609	setuv (time, xe->xmotion.time);	569	setuv (time, xe->xmotion.time);
610	setiv (x, xe->xmotion.x);	570	setiv (x, xe->xmotion.x);
611	setiv (y, xe->xmotion.y);	571	setiv (y, xe->xmotion.y);
612	setiv (row, xe->xmotion.y / term->fheight + term->view_start);	572	setiv (row, xe->xmotion.y / term->fheight + term->view_start);
613	setiv (col, xe->xmotion.x / term->fwidth);	573	setiv (col, xe->xmotion.x / term->fwidth);
614	setiv (x_root, xe->xmotion.x_root);	574	setiv (x_root, xe->xmotion.x_root);
615	setiv (y_root, xe->xmotion.y_root);	575	setiv (y_root, xe->xmotion.y_root);
616	setuv (state, xe->xmotion.state);	576	setuv (state, xe->xmotion.state);
617		577
618	switch (xe->type)	578	switch (xe->type)
619	{	579	{
620	case KeyPress:	580	case KeyPress:
621	case KeyRelease:	581	case KeyRelease:
622	setuv (keycode, xe->xkey.keycode);	582	setuv (keycode, xe->xkey.keycode);
623	break;	583	break;
624		584
625	case ButtonPress:	585	case ButtonPress:
626	case ButtonRelease:	586	case ButtonRelease:
627	setuv (button, xe->xbutton.button);	587	setuv (button, xe->xbutton.button);
628	break;	588	break;
629		589
630	case MotionNotify:	590	case MotionNotify:
631	setiv (is_hint, xe->xmotion.is_hint);	591	setiv (is_hint, xe->xmotion.is_hint);
632	break;	592	break;
633	}	593	}
634		594
635	break;	595	break;
636		596
637	case MapNotify:	597	case MapNotify:
638	case UnmapNotify:	598	case UnmapNotify:
639	case ConfigureNotify:	599	case ConfigureNotify:
640	setuv (event, xe->xconfigure.event);	600	setuv (event, xe->xconfigure.event);
641	setuv (window, xe->xconfigure.window);	601	setuv (window, xe->xconfigure.window);
642		602
643	switch (xe->type)	603	switch (xe->type)
644	{	604	{
645	case ConfigureNotify:	605	case ConfigureNotify:
646	setiv (x, xe->xconfigure.x);	606	setiv (x, xe->xconfigure.x);
647	setiv (y, xe->xconfigure.y);	607	setiv (y, xe->xconfigure.y);
648	setiv (width, xe->xconfigure.width);	608	setiv (width, xe->xconfigure.width);
649	setiv (height, xe->xconfigure.height);	609	setiv (height, xe->xconfigure.height);
650	setuv (above, xe->xconfigure.above);	610	setuv (above, xe->xconfigure.above);
651	break;	611	break;
652	}	612	}
653		613
654	break;	614	break;
655		615
656	case PropertyNotify:	616	case PropertyNotify:
657	setuv (window, xe->xproperty.window);	617	setuv (window, xe->xproperty.window);
658	setuv (atom, xe->xproperty.atom);	618	setuv (atom, xe->xproperty.atom);
659	setuv (time, xe->xproperty.time);	619	setuv (time, xe->xproperty.time);
660	setiv (state, xe->xproperty.state);	620	setiv (state, xe->xproperty.state);
661	break;	621	break;
662		622
663	case ClientMessage:	623	case ClientMessage:
664	setuv (window, xe->xclient.window);	624	setuv (window, xe->xclient.window);
665	setuv (message_type, xe->xclient.message_type);	625	setuv (message_type, xe->xclient.message_type);
666	setuv (format, xe->xclient.format);	626	setuv (format, xe->xclient.format);
667	setuv (l0, xe->xclient.data.l[0]);	627	setuv (l0, xe->xclient.data.l[0]);
668	setuv (l1, xe->xclient.data.l[1]);	628	setuv (l1, xe->xclient.data.l[1]);
669	setuv (l2, xe->xclient.data.l[2]);	629	setuv (l2, xe->xclient.data.l[2]);
670	setuv (l3, xe->xclient.data.l[3]);	630	setuv (l3, xe->xclient.data.l[3]);
671	setuv (l4, xe->xclient.data.l[4]);	631	setuv (l4, xe->xclient.data.l[4]);
672	break;	632	break;
673	}	633	}
674		634
675	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	635	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
676	}	636	}
677	break;	637	break;
678		638
679	case DT_END:	639	case DT_END:
680	goto call;	640	goto call;
681		641
682	default:	642	default:
683	rxvt_fatal ("FATAL: unable to pass data type %d\n", dt);	643	rxvt_fatal ("FATAL: unable to pass data type %d\n", dt);
684	}	644	}
		645	}
		646
		647	call:
		648	va_end (ap);
		649
		650	PUTBACK;
		651	int count = call_pv ("urxvt::invoke", G_ARRAY | G_EVAL);
		652	SPAGAIN;
		653
		654	if (count)
		655	{
		656	SV *status = POPs;
		657	count = SvTRUE (status);
685	}	658	}
686		659
687	call:
688	va_end (ap);
689
690	PUTBACK;	660	PUTBACK;
691	int count = call_pv ("urxvt::invoke", G_ARRAY | G_EVAL);
692	SPAGAIN;
693
694	if (count)
695	{
696	SV *status = POPs;
697	count = SvTRUE (status);
698	}
699
700	PUTBACK;
701	FREETMPS;	661	FREETMPS;
702	LEAVE;	662	LEAVE;
703		663
704	if (SvTRUE (ERRSV))	664	if (SvTRUE (ERRSV))
705	{	665	{
706	rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV));	666	rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPVbyte_nolen (ERRSV));
707	ungrab (term); // better lose the grab than the session	667	ungrab (term); // better lose the grab than the session
708	}	668	}
709		669
710	event_consumed = !!count;	670	event_consumed = !!count;
711	}	671	}
712	catch (...)
713	{
714	swap (perl_environ, environ);
715	throw;
716	}
717	else	672	else
718	event_consumed = false;	673	event_consumed = false;
719		674
720	// post-handling of some events	675	// post-handling of some events
721	if (htype == HOOK_REFRESH_BEGIN)	676	if (htype == HOOK_REFRESH_BEGIN)
722	{	677	{
723	AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));	678	AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
724		679
725	for (int i = AvFILL (av); i >= 0; i--)	680	for (int i = AvFILL (av); i >= 0; i--)
726	((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();	681	((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
727	}	682	}
728	else if (htype == HOOK_DESTROY)	683	else if (htype == HOOK_DESTROY)
729	{	684	{
730	clearSVptr ((SV *)term->perl.self);	685	clearSVptr ((SV *)term->perl.self);
731	SvREFCNT_dec ((SV *)term->perl.self);	686	SvREFCNT_dec ((SV *)term->perl.self);
732		687
733	// don't allow further calls	688	// don't allow further calls
734	term->perl.self = 0;	689	term->perl.self = 0;
735	}	690	}
736		691
737	swap (perl_environ, environ);
738
739	return event_consumed;	692	return event_consumed;
		693	}
		694
		695	void
		696	rxvt_perl_interp::selection_finish (rxvt_selection *sel, char *data, unsigned int len)
		697	{
		698	localise_env set_environ (perl_environ);
		699
		700	ENTER;
		701	SAVETMPS;
		702
		703	dSP;
		704	XPUSHs (sv_2mortal (newSVpvn (data, len)));
		705	PUTBACK;
		706	call_sv ((SV *)sel->cb_sv, G_VOID | G_DISCARD | G_EVAL);
		707
		708	if (SvTRUE (ERRSV))
		709	rxvt_warn ("perl selection callback evaluation error: %s", SvPVbyte_nolen (ERRSV));
		710
		711	FREETMPS;
		712	LEAVE;
740	}	713	}
741		714
742	/////////////////////////////////////////////////////////////////////////////	715	/////////////////////////////////////////////////////////////////////////////
743		716
744	MODULE = urxvt PACKAGE = urxvt	717	MODULE = urxvt PACKAGE = urxvt
…		…
756	# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0));	729	# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0));
757	# include "hookinc.h"	730	# include "hookinc.h"
758	# undef def	731	# undef def
759		732
760	HV *option = get_hv ("urxvt::OPTION", 1);	733	HV *option = get_hv ("urxvt::OPTION", 1);
761	# define def(name,val) hv_store (option, # name, sizeof (# name) - 1, newSVuv (Opt_ ## name), 0);	734	# define def(name) hv_store (option, # name, sizeof (# name) - 1, newSVuv (Opt_ ## name), 0);
762	# define nodef(name)	735	# define nodef(name)
763	# include "optinc.h"	736	# include "optinc.h"
764	# undef nodef	737	# undef nodef
765	# undef def	738	# undef def
766		739
767	HV *stash = gv_stashpv ("urxvt", 1);	740	HV *stash = gv_stashpv ("urxvt", 1);
768	struct {	741	static const struct {
769	const char *name;	742	const char *name;
770	IV iv;	743	IV iv;
771	} *civ, const_iv[] = {	744	} *civ, const_iv[] = {
772	# define const_iv(name) { # name, (IV)name }	745	# define const_iv(name) { # name, (IV)name }
		746	const_iv (NUM_RESOURCES),
773	const_iv (DEFAULT_RSTYLE),	747	const_iv (DEFAULT_RSTYLE),
774	const_iv (OVERLAY_RSTYLE),	748	const_iv (OVERLAY_RSTYLE),
		749	const_iv (Color_Bits),
		750	const_iv (RS_bgShift), const_iv (RS_bgMask),
		751	const_iv (RS_fgShift), const_iv (RS_fgMask),
		752	const_iv (RS_Careful),
		753	const_iv (RS_fontCount),
		754	const_iv (RS_fontShift),
		755	const_iv (RS_fontMask),
		756	const_iv (RS_baseattrMask),
		757	const_iv (RS_attrMask),
		758	const_iv (RS_redraw),
		759	const_iv (RS_Sel),
775	const_iv (RS_Bold),	760	const_iv (RS_Bold),
776	const_iv (RS_Italic),	761	const_iv (RS_Italic),
777	const_iv (RS_Blink),	762	const_iv (RS_Blink),
778	const_iv (RS_RVid),	763	const_iv (RS_RVid),
779	const_iv (RS_Uline),	764	const_iv (RS_Uline),
…		…
792	const_iv (Button3Mask),	777	const_iv (Button3Mask),
793	const_iv (Button4Mask),	778	const_iv (Button4Mask),
794	const_iv (Button5Mask),	779	const_iv (Button5Mask),
795	const_iv (AnyModifier),	780	const_iv (AnyModifier),
796		781
797	const_iv (EVENT_NONE),	782	const_iv (NoSymbol),
798	const_iv (EVENT_READ),	783	const_iv (GrabModeSync),
799	const_iv (EVENT_WRITE),	784	const_iv (GrabModeAsync),
800		785
801	const_iv (NoEventMask),	786	const_iv (NoEventMask),
802	const_iv (KeyPressMask),	787	const_iv (KeyPressMask),
803	const_iv (KeyReleaseMask),	788	const_iv (KeyReleaseMask),
804	const_iv (ButtonPressMask),	789	const_iv (ButtonPressMask),
…		…
866	const_iv (XIMSecondary),	851	const_iv (XIMSecondary),
867	const_iv (XIMTertiary),	852	const_iv (XIMTertiary),
868	const_iv (XIMVisibleToForward),	853	const_iv (XIMVisibleToForward),
869	const_iv (XIMVisibleToBackword),	854	const_iv (XIMVisibleToBackword),
870	const_iv (XIMVisibleToCenter),	855	const_iv (XIMVisibleToCenter),
		856	#if XRENDER
		857	const_iv (PictStandardARGB32),
		858	const_iv (PictStandardRGB24),
		859	const_iv (PictStandardA8),
		860	const_iv (PictStandardA4),
		861	const_iv (PictStandardA1),
		862	const_iv (RepeatNone),
		863	const_iv (RepeatNormal),
		864	const_iv (RepeatPad),
		865	const_iv (RepeatReflect),
		866	#endif
871	# if 0	867	# if 0
872	const_iv (XIMForwardChar),	868	const_iv (XIMForwardChar),
873	const_iv (XIMBackwardChar),	869	const_iv (XIMBackwardChar),
874	const_iv (XIMForwardWord),	870	const_iv (XIMForwardWord),
875	const_iv (XIMBackwardWord),	871	const_iv (XIMBackwardWord),
…		…
883	const_iv (XIMDontChange),	879	const_iv (XIMDontChange),
884	# endif	880	# endif
885	# endif	881	# endif
886	};	882	};
887		883
888	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]);	884	for (civ = const_iv + ecb_array_length (const_iv); civ > const_iv; civ--)
889	civ-- > const_iv; )
890	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	885	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
891	}	886	}
		887
		888	void
		889	log (const char *msg)
		890	CODE:
		891	rxvt_log ("%s", msg);
892		892
893	void	893	void
894	warn (const char *msg)	894	warn (const char *msg)
895	CODE:	895	CODE:
896	rxvt_warn ("%s", msg);	896	rxvt_warn ("%s", msg);
…		…
900	CODE:	900	CODE:
901	rxvt_fatal ("%s", msg);	901	rxvt_fatal ("%s", msg);
902		902
903	void	903	void
904	_exit (int status)	904	_exit (int status)
		905
		906	void
		907	catch_fatal (SV *block)
		908	PROTOTYPE: &
		909	CODE:
		910	try
		911	{
		912	PUSHMARK (SP);
		913	PUTBACK;
		914	call_sv (block, G_VOID | G_DISCARD);
		915	SPAGAIN;
		916	}
		917	catch (const rxvt_failure_exception &e)
		918	{
		919	croak ("rxvt_fatal exception caught, trying to continue.");
		920	}
905		921
906	NV	922	NV
907	NOW ()	923	NOW ()
908	CODE:	924	CODE:
909	RETVAL = NOW;	925	RETVAL = ev::now ();
910	OUTPUT:	926	OUTPUT:
911	RETVAL	927	RETVAL
912		928
913	int	929	int
914	GET_BASEFG (int rend)	930	GET_BASEFG (int rend)
…		…
925	RETVAL	941	RETVAL
926		942
927	int	943	int
928	SET_FGCOLOR (int rend, int new_color)	944	SET_FGCOLOR (int rend, int new_color)
929	CODE:	945	CODE:
930	RETVAL = SET_FGCOLOR (rend, new_color);	946	RETVAL = SET_FGCOLOR (rend, clamp (new_color, 0, TOTAL_COLORS - 1));
931	OUTPUT:	947	OUTPUT:
932	RETVAL	948	RETVAL
933		949
934	int	950	int
935	SET_BGCOLOR (int rend, int new_color)	951	SET_BGCOLOR (int rend, int new_color)
936	CODE:	952	CODE:
937	RETVAL = SET_BGCOLOR (rend, new_color);	953	RETVAL = SET_BGCOLOR (rend, clamp (new_color, 0, TOTAL_COLORS - 1));
938	OUTPUT:	954	OUTPUT:
939	RETVAL	955	RETVAL
940		956
941	int	957	int
942	GET_CUSTOM (int rend)	958	GET_CUSTOM (int rend)
943	CODE:	959	CODE:
944	RETVAL = (rend && RS_customMask) >> RS_customShift;	960	RETVAL = (rend & RS_customMask) >> RS_customShift;
945	OUTPUT:	961	OUTPUT:
946	RETVAL	962	RETVAL
947		963
948	int	964	int
949	SET_CUSTOM (int rend, int new_value)	965	SET_CUSTOM (int rend, int new_value)
…		…
956	| ((new_value << RS_customShift) & RS_customMask);	972	| ((new_value << RS_customShift) & RS_customMask);
957	}	973	}
958	OUTPUT:	974	OUTPUT:
959	RETVAL	975	RETVAL
960		976
		977	void
		978	termlist ()
		979	PPCODE:
		980	{
		981	EXTEND (SP, rxvt_term::termlist.size ());
		982
		983	for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
		984	if ((*t)->perl.self)
		985	PUSHs (sv_2mortal (newSVterm (*t)));
		986	}
		987
		988	IV
		989	_new_selection_request (rxvt_term *term, int selnum, Time tm, Window win, Atom prop, SV *cb)
		990	CODE:
		991	rxvt_selection *req = new rxvt_selection (term->display, selnum, tm, win, prop, term);
		992	req->cb_sv = newSVsv (cb);
		993	AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_selection", 10, 0));
		994	av_push (av, newSViv ((IV)req));
		995	RETVAL = (IV)req;
		996	OUTPUT:
		997	RETVAL
		998
		999	void
		1000	_delete_selection_request (IV req_)
		1001	CODE:
		1002	rxvt_selection *req = (rxvt_selection *)req_;
		1003	AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)req->term->perl.self), "_selection", 10, 0));
		1004	int i;
		1005
		1006	for (i = AvFILL (av); i >= 0; i--)
		1007	if (SvIV (*av_fetch (av, i, 1)) == req_)
		1008	break;
		1009
		1010	for (; i < AvFILL (av); i++)
		1011	av_store (av, i, SvREFCNT_inc (*av_fetch (av, i + 1, 0)));
		1012
		1013	av_pop (av);
		1014
		1015	delete req;
		1016
961	MODULE = urxvt PACKAGE = urxvt::term	1017	MODULE = urxvt PACKAGE = urxvt::term
962		1018
963	SV *	1019	SV *
964	_new (...)	1020	_new (AV *env, AV *arg)
965	CODE:	1021	CODE:
966	{	1022	{
967	if (items < 1 || !SvROK (ST (0)) || SvTYPE (SvRV (ST (0))) != SVt_PVAV)
968	croak ("first argument to urxvt::term->_new must be arrayref");
969
970	rxvt_term *term = new rxvt_term;	1023	rxvt_term *term = new rxvt_term;
971		1024
972	stringvec *argv = new stringvec;	1025	stringvec *argv = new stringvec;
		1026	for (int i = 0; i <= AvFILL (arg); i++)
		1027	argv->push_back (strdup (SvPVbyte_nolen (*av_fetch (arg, i, 1))));
		1028
973	stringvec *envv = new stringvec;	1029	stringvec *envv = new stringvec;
974
975	for (int i = 1; i < items; i++)
976	argv->push_back (strdup (SvPVbyte_nolen (ST (i))));
977
978	AV *env = (AV *)SvRV (ST (0));
979	for (int i = AvFILL (env) + 1; i--; )	1030	for (int i = AvFILL (env) + 1; i--; )
980	envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1))));	1031	envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1))));
981		1032
982	envv->push_back (0);
983
984	bool success;
985
986	try	1033	try
987	{	1034	{
988	success = term->init (argv, envv);	1035	term->init (argv, envv);
989	}	1036	}
990	catch (const class rxvt_failure_exception &e)	1037	catch (const class rxvt_failure_exception &e)
991	{
992	success = false;
993	}
994
995	if (!success)
996	{	1038	{
997	term->destroy ();	1039	term->destroy ();
998	croak ("error while initializing new terminal instance");	1040	croak ("error while initializing new terminal instance");
999	}	1041	}
1000		1042
…		…
1008	rxvt_term::destroy ()	1050	rxvt_term::destroy ()
1009		1051
1010	void	1052	void
1011	rxvt_term::set_should_invoke (int htype, int inc)	1053	rxvt_term::set_should_invoke (int htype, int inc)
1012	CODE:	1054	CODE:
1013	THIS->perl.should_invoke [htype] += inc;	1055	uint8_t &count = THIS->perl.should_invoke [htype];
		1056	uint8_t prev = count;
		1057	count += inc;
		1058	if (!prev != !count)
		1059	{
		1060	// hook status changed, react
		1061	switch (htype)
		1062	{
		1063	case HOOK_POSITION_CHANGE:
		1064	if (count)
		1065	THIS->get_window_origin (THIS->parent_x, THIS->parent_y);
		1066	}
		1067	}
1014		1068
1015	void	1069	void
		1070	rxvt_term::put_option_db (octet_string specifier, octet_string value)
		1071	CODE:
		1072	XrmPutStringResource (&THIS->option_db, specifier, value);
		1073
		1074	int
1016	rxvt_term::grab_button (int button, U32 modifiers)	1075	rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)
1017	CODE:	1076	CODE:
1018	XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1,	1077	RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,
1019	ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,	1078	ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
1020	GrabModeSync, GrabModeSync, None, GRAB_CURSOR);	1079	GrabModeSync, GrabModeSync, None, GRAB_CURSOR);
		1080	OUTPUT: RETVAL
		1081
		1082	int
		1083	rxvt_term::ungrab_button (int button, U32 modifiers, Window window = THIS->vt)
		1084	CODE:
		1085	RETVAL = XUngrabButton (THIS->dpy, button, modifiers, window);
		1086	OUTPUT: RETVAL
		1087
		1088	void
		1089	rxvt_term::XGrabKey (int keycode, U32 modifiers, Window window = THIS->vt, \
		1090	int owner_events = 1, int pointer_mode = GrabModeAsync, int keyboard_mode = GrabModeAsync)
		1091	CODE:
		1092	XGrabKey (THIS->dpy, keycode, modifiers, window, owner_events, pointer_mode, keyboard_mode);
		1093
		1094	void
		1095	rxvt_term::XUngrabKey (int keycode, U32 modifiers, Window window = THIS->vt)
		1096	CODE:
		1097	XUngrabKey (THIS->dpy, keycode, modifiers, window);
1021		1098
1022	bool	1099	bool
1023	rxvt_term::grab (Time eventtime, int sync = 0)	1100	rxvt_term::grab (Time eventtime, int sync = 0)
1024	CODE:	1101	CODE:
1025	{	1102	{
1026	int mode = sync ? GrabModeSync : GrabModeAsync;	1103	int mode = sync ? GrabModeSync : GrabModeAsync;
1027		1104
1028	THIS->perl.grabtime = 0;	1105	THIS->perl.grabtime = 0;
1029		1106
1030	if (!XGrabPointer (THIS->display->display, THIS->vt, 0,	1107	if (!XGrabPointer (THIS->dpy, THIS->vt, 0,
1031	ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,	1108	ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
1032	mode, mode, None, GRAB_CURSOR, eventtime))	1109	mode, mode, None, GRAB_CURSOR, eventtime))
1033	if (!XGrabKeyboard (THIS->display->display, THIS->vt, 0, mode, mode, eventtime))	1110	if (!XGrabKeyboard (THIS->dpy, THIS->vt, 0, mode, mode, eventtime))
1034	THIS->perl.grabtime = eventtime;	1111	THIS->perl.grabtime = eventtime;
1035	else	1112	else
1036	XUngrabPointer (THIS->display->display, eventtime);	1113	XUngrabPointer (THIS->dpy, eventtime);
1037		1114
1038	RETVAL = !!THIS->perl.grabtime;	1115	RETVAL = !!THIS->perl.grabtime;
1039	}	1116	}
1040	OUTPUT:	1117	OUTPUT:
1041	RETVAL	1118	RETVAL
1042		1119
1043	void	1120	void
1044	rxvt_term::allow_events_async ()	1121	rxvt_term::allow_events_async ()
1045	CODE:	1122	CODE:
1046	XAllowEvents (THIS->display->display, AsyncBoth, THIS->perl.grabtime);	1123	XAllowEvents (THIS->dpy, AsyncBoth, THIS->perl.grabtime);
1047		1124
1048	void	1125	void
1049	rxvt_term::allow_events_sync ()	1126	rxvt_term::allow_events_sync ()
1050	CODE:	1127	CODE:
1051	XAllowEvents (THIS->display->display, SyncBoth, THIS->perl.grabtime);	1128	XAllowEvents (THIS->dpy, SyncBoth, THIS->perl.grabtime);
1052		1129
1053	void	1130	void
1054	rxvt_term::allow_events_replay ()	1131	rxvt_term::allow_events_replay ()
1055	CODE:	1132	CODE:
1056	XAllowEvents (THIS->display->display, ReplayPointer, THIS->perl.grabtime);	1133	XAllowEvents (THIS->dpy, ReplayPointer, THIS->perl.grabtime);
1057	XAllowEvents (THIS->display->display, ReplayKeyboard, THIS->perl.grabtime);	1134	XAllowEvents (THIS->dpy, ReplayKeyboard, THIS->perl.grabtime);
1058		1135
1059	void	1136	void
1060	rxvt_term::ungrab ()	1137	rxvt_term::ungrab ()
1061	CODE:	1138	CODE:
1062	ungrab (THIS);	1139	ungrab (THIS);
1063		1140
1064	int	1141	int
		1142	rxvt_term::XStringToKeysym (char *string)
		1143	CODE:
		1144	RETVAL = XStringToKeysym (string);
		1145	OUTPUT: RETVAL
		1146
		1147	char *
		1148	rxvt_term::XKeysymToString (int sym)
		1149	CODE:
		1150	RETVAL = XKeysymToString (sym);
		1151	OUTPUT: RETVAL
		1152
		1153	int
		1154	rxvt_term::XKeysymToKeycode (int sym)
		1155	CODE:
		1156	RETVAL = XKeysymToKeycode (THIS->dpy, sym);
		1157	OUTPUT: RETVAL
		1158
		1159	int
		1160	rxvt_term::XKeycodeToKeysym (int code, int index)
		1161	CODE:
		1162	RETVAL = XKeycodeToKeysym (THIS->dpy, code, index);
		1163	OUTPUT: RETVAL
		1164
		1165	int
1065	rxvt_term::strwidth (SV *str)	1166	rxvt_term::strwidth (SV *str)
1066	CODE:	1167	CODE:
1067	{	1168	{
1068	wchar_t *wstr = sv2wcs (str);	1169	wchar_t *wstr = sv2wcs (str);
1069		1170
1070	rxvt_push_locale (THIS->locale);	1171	rxvt_push_locale (THIS->locale);
1071	RETVAL = wcswidth (wstr, wcslen (wstr));	1172	RETVAL = 0;
		1173	for (wchar_t *wc = wstr; *wc; wc++)
		1174	{
		1175	int w = WCWIDTH (*wc);
		1176
		1177	if (w)
		1178	RETVAL += max (w, 1);
		1179	}
1072	rxvt_pop_locale ();	1180	rxvt_pop_locale ();
1073		1181
1074	free (wstr);	1182	free (wstr);
1075	}	1183	}
1076	OUTPUT:	1184	OUTPUT:
…		…
1111	OUTPUT:	1219	OUTPUT:
1112	RETVAL	1220	RETVAL
1113		1221
1114	#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)	1222	#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
1115		1223
1116	#define TERM_OFFSET_width TERM_OFFSET(width)	1224	#define TERM_OFFSET_width TERM_OFFSET(width)
1117	#define TERM_OFFSET_height TERM_OFFSET(height)	1225	#define TERM_OFFSET_height TERM_OFFSET(height)
1118	#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth)	1226	#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth)
1119	#define TERM_OFFSET_fheight TERM_OFFSET(fheight)	1227	#define TERM_OFFSET_fheight TERM_OFFSET(fheight)
1120	#define TERM_OFFSET_fbase TERM_OFFSET(fbase)	1228	#define TERM_OFFSET_fbase TERM_OFFSET(fbase)
1121	#define TERM_OFFSET_nrow TERM_OFFSET(nrow)	1229	#define TERM_OFFSET_nrow TERM_OFFSET(nrow)
1122	#define TERM_OFFSET_ncol TERM_OFFSET(ncol)	1230	#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
1123	#define TERM_OFFSET_focus TERM_OFFSET(focus)	1231	#define TERM_OFFSET_focus TERM_OFFSET(focus)
1124	#define TERM_OFFSET_mapped TERM_OFFSET(mapped)	1232	#define TERM_OFFSET_mapped TERM_OFFSET(mapped)
1125	#define TERM_OFFSET_int_bwidth TERM_OFFSET(int_bwidth)	1233	#define TERM_OFFSET_int_bwidth TERM_OFFSET(int_bwidth)
1126	#define TERM_OFFSET_ext_bwidth TERM_OFFSET(ext_bwidth)	1234	#define TERM_OFFSET_ext_bwidth TERM_OFFSET(ext_bwidth)
1127	#define TERM_OFFSET_lineSpace TERM_OFFSET(lineSpace)	1235	#define TERM_OFFSET_lineSpace TERM_OFFSET(lineSpace)
		1236	#define TERM_OFFSET_letterSpace TERM_OFFSET(letterSpace)
1128	#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)	1237	#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
1129	#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)	1238	#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
1130	#define TERM_OFFSET_top_row TERM_OFFSET(top_row)	1239	#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
1131		1240
1132	int	1241	int
1133	rxvt_term::width ()	1242	rxvt_term::width ()
1134	ALIAS:	1243	ALIAS:
1135	width = TERM_OFFSET_width	1244	width = TERM_OFFSET_width
1136	height = TERM_OFFSET_height	1245	height = TERM_OFFSET_height
1137	fwidth = TERM_OFFSET_fwidth	1246	fwidth = TERM_OFFSET_fwidth
1138	fheight = TERM_OFFSET_fheight	1247	fheight = TERM_OFFSET_fheight
1139	fbase = TERM_OFFSET_fbase	1248	fbase = TERM_OFFSET_fbase
1140	nrow = TERM_OFFSET_nrow	1249	nrow = TERM_OFFSET_nrow
1141	ncol = TERM_OFFSET_ncol	1250	ncol = TERM_OFFSET_ncol
1142	focus = TERM_OFFSET_focus	1251	focus = TERM_OFFSET_focus
1143	mapped = TERM_OFFSET_mapped	1252	mapped = TERM_OFFSET_mapped
1144	int_bwidth = TERM_OFFSET_int_bwidth	1253	int_bwidth = TERM_OFFSET_int_bwidth
1145	ext_bwidth = TERM_OFFSET_ext_bwidth	1254	ext_bwidth = TERM_OFFSET_ext_bwidth
1146	lineSpace = TERM_OFFSET_lineSpace	1255	lineSpace = TERM_OFFSET_lineSpace
		1256	letterSpace = TERM_OFFSET_letterSpace
1147	saveLines = TERM_OFFSET_saveLines	1257	saveLines = TERM_OFFSET_saveLines
1148	total_rows = TERM_OFFSET_total_rows	1258	total_rows = TERM_OFFSET_total_rows
1149	top_row = TERM_OFFSET_top_row	1259	top_row = TERM_OFFSET_top_row
1150	CODE:	1260	CODE:
1151	RETVAL = *(int *)((char *)THIS + ix);	1261	RETVAL = *(int *)((char *)THIS + ix);
1152	OUTPUT:	1262	OUTPUT:
1153	RETVAL	1263	RETVAL
1154		1264
…		…
1165	{	1275	{
1166	case 0: RETVAL = THIS->ModLevel3Mask; break;	1276	case 0: RETVAL = THIS->ModLevel3Mask; break;
1167	case 1: RETVAL = THIS->ModMetaMask; break;	1277	case 1: RETVAL = THIS->ModMetaMask; break;
1168	case 2: RETVAL = THIS->ModNumLockMask; break;	1278	case 2: RETVAL = THIS->ModNumLockMask; break;
1169	case 3: RETVAL = THIS->current_screen; break;	1279	case 3: RETVAL = THIS->current_screen; break;
		1280	#ifdef CURSOR_BLINK
1170	case 4: RETVAL = THIS->hidden_cursor; break;	1281	case 4: RETVAL = THIS->hidden_cursor; break;
		1282	#endif
1171	}	1283	}
1172	OUTPUT:	1284	OUTPUT:
1173	RETVAL	1285	RETVAL
1174		1286
1175	char *	1287	char *
…		…
1185	}	1297	}
1186	OUTPUT:	1298	OUTPUT:
1187	RETVAL	1299	RETVAL
1188		1300
1189	SV *	1301	SV *
1190	rxvt_term::_env ()	1302	rxvt_term::envv ()
		1303	ALIAS:
		1304	argv = 1
1191	CODE:	1305	PPCODE:
1192	{	1306	{
1193	if (THIS->envv)	1307	stringvec *vec = ix ? THIS->argv : THIS->envv;
1194	{
1195	AV *av = newAV ();
1196		1308
		1309	EXTEND (SP, vec->size ());
		1310
1197	for (char **i = THIS->envv->begin (); i != THIS->envv->end (); ++i)	1311	for (char **i = vec->begin (); i != vec->end (); ++i)
1198	if (*i)	1312	if (*i)
1199	av_push (av, newSVpv (*i, 0));	1313	PUSHs (sv_2mortal (newSVpv (*i, 0)));
1200
1201	RETVAL = newRV_noinc ((SV *)av);
1202	}
1203	else
1204	RETVAL = &PL_sv_undef;
1205	}	1314	}
1206	OUTPUT:
1207	RETVAL
1208		1315
1209	int	1316	int
1210	rxvt_term::pty_ev_events (int events = EVENT_UNDEF)	1317	rxvt_term::pty_ev_events (int events = ev::UNDEF)
1211	CODE:	1318	CODE:
1212	RETVAL = THIS->pty_ev.events;	1319	RETVAL = THIS->pty_ev.events;
1213	if (events != EVENT_UNDEF)	1320	if (events != ev::UNDEF)
1214	THIS->pty_ev.set (events);	1321	THIS->pty_ev.set (events);
1215	OUTPUT:	1322	OUTPUT:
1216	RETVAL	1323	RETVAL
1217		1324
1218	int	1325	int
…		…
1223	RETVAL	1330	RETVAL
1224		1331
1225	Window	1332	Window
1226	rxvt_term::parent ()	1333	rxvt_term::parent ()
1227	CODE:	1334	CODE:
1228	RETVAL = THIS->parent [0];	1335	RETVAL = THIS->parent;
1229	OUTPUT:	1336	OUTPUT:
1230	RETVAL	1337	RETVAL
1231		1338
1232	Window	1339	int
1233	rxvt_term::vt ()	1340	rxvt_term::parent_x ()
1234	CODE:	1341	CODE:
1235	RETVAL = THIS->vt;	1342	RETVAL = THIS->parent_x;
		1343	OUTPUT:
		1344	RETVAL
		1345
		1346	int
		1347	rxvt_term::parent_y ()
		1348	CODE:
		1349	RETVAL = THIS->parent_y;
1236	OUTPUT:	1350	OUTPUT:
1237	RETVAL	1351	RETVAL
1238		1352
1239	void	1353	void
1240	rxvt_term::vt_emask_add (U32 emask)	1354	rxvt_term::vt_emask_add (U32 emask)
…		…
1262	}	1376	}
1263	OUTPUT:	1377	OUTPUT:
1264	RETVAL	1378	RETVAL
1265		1379
1266	void	1380	void
		1381	rxvt_term::set_urgency (bool enable)
		1382
		1383	void
1267	rxvt_term::focus_in ()	1384	rxvt_term::focus_in ()
1268		1385
1269	void	1386	void
1270	rxvt_term::focus_out ()	1387	rxvt_term::focus_out ()
1271		1388
1272	void	1389	void
		1390	rxvt_term::key_press (unsigned int state, unsigned int keycode, Time time = CurrentTime)
		1391	ALIAS:
		1392	key_release = 1
		1393	CODE:
		1394	{
		1395	XKeyEvent xkey;
		1396
		1397	memset (&xkey, 0, sizeof (xkey));
		1398
		1399	xkey.time = time;
		1400	xkey.state = state;
		1401	xkey.keycode = keycode;
		1402
		1403	xkey.type = ix ? KeyRelease : KeyPress;
		1404	xkey.display = THIS->dpy;
		1405	xkey.window = THIS->vt;
		1406	xkey.root = THIS->display->root;
		1407	xkey.subwindow = THIS->vt;
		1408
		1409	if (ix)
		1410	THIS->key_release (xkey);
		1411	else
		1412	THIS->key_press (xkey);
		1413	}
		1414
		1415	void
1273	rxvt_term::want_refresh ()	1416	rxvt_term::want_refresh ()
1274	CODE:	1417	CODE:
1275	THIS->want_refresh = 1;	1418	THIS->want_refresh = 1;
		1419	THIS->refresh_check ();
1276		1420
1277	void	1421	void
1278	rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)	1422	rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
1279	PPCODE:	1423	PPCODE:
1280	{	1424	{
…		…
1435	SV *	1579	SV *
1436	rxvt_term::special_decode (SV *text)	1580	rxvt_term::special_decode (SV *text)
1437	CODE:	1581	CODE:
1438	{	1582	{
1439	wchar_t *wstr = sv2wcs (text);	1583	wchar_t *wstr = sv2wcs (text);
1440	int wlen = wcslen (wstr);
1441	int dlen = 0;	1584	int dlen = 0;
1442		1585
1443	// find length	1586	// find length
1444	for (wchar_t *s = wstr; *s; s++)	1587	for (wchar_t *s = wstr; *s; s++)
1445	if (*s == NOCHAR)	1588	if (*s == NOCHAR)
…		…
1468		1611
1469	void	1612	void
1470	rxvt_term::_resource (char *name, int index, SV *newval = 0)	1613	rxvt_term::_resource (char *name, int index, SV *newval = 0)
1471	PPCODE:	1614	PPCODE:
1472	{	1615	{
1473	struct resval { const char *name; int value; } rslist [] = {	1616	static const struct resval { const char *name; int value; } *rs, rslist [] = {
1474	# define def(name) { # name, Rs_ ## name },	1617	# define def(name) { # name, Rs_ ## name },
1475	# define reserve(name,count)	1618	# define reserve(name,count)
1476	# include "rsinc.h"	1619	# include "rsinc.h"
1477	# undef def	1620	# undef def
1478	# undef reserve	1621	# undef reserve
1479	};	1622	};
1480		1623
1481	struct resval *rs = rslist + sizeof (rslist) / sizeof (rslist [0]);	1624	rs = rslist + ecb_array_length (rslist);
1482		1625
		1626	if (*name)
1483	do {	1627	{
		1628	do {
1484	if (rs-- == rslist)	1629	if (rs-- == rslist)
1485	croak ("no such resource '%s', requested", name);	1630	croak ("no such resource '%s', requested", name);
1486	} while (strcmp (name, rs->name));	1631	} while (strcmp (name, rs->name));
1487		1632
1488	index += rs->value;	1633	index += rs->value;
		1634	}
		1635	else
		1636	{
		1637	--rs;
		1638	name = "";
		1639	}
1489		1640
1490	if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))	1641	if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1491	croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);	1642	croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
1492		1643
1493	if (GIMME_V != G_VOID)	1644	if (GIMME_V != G_VOID)
…		…
1508		1659
1509	const char *	1660	const char *
1510	rxvt_term::x_resource (const char *name)	1661	rxvt_term::x_resource (const char *name)
1511		1662
1512	bool	1663	bool
1513	rxvt_term::option (U32 optval, int set = -1)	1664	rxvt_term::option (U8 optval, int set = -1)
1514	CODE:	1665	CODE:
1515	{	1666	{
1516	RETVAL = THIS->options & optval;	1667	RETVAL = THIS->option (optval);
1517		1668
1518	if (set >= 0)	1669	if (set >= 0)
1519	{	1670	{
1520	if (set)
1521	THIS->options |= optval;	1671	THIS->set_option (optval, set);
1522	else
1523	THIS->options &= ~optval;
1524		1672
1525	if (THIS->check_ev.is_active ()) // avoid doing this before START	1673	if (THIS->init_done) // avoid doing this before START
1526	switch (optval)	1674	switch (optval)
1527	{	1675	{
1528	case Opt_skipBuiltinGlyphs:	1676	case Opt_skipBuiltinGlyphs:
1529	THIS->set_fonts ();	1677	THIS->set_fonts ();
1530	THIS->scr_remap_chars ();	1678	THIS->scr_remap_chars ();
1531	THIS->scr_touch (true);	1679	THIS->scr_touch (true);
1532	THIS->want_refresh = 1;	1680	THIS->want_refresh = 1;
		1681	THIS->refresh_check ();
1533	break;	1682	break;
		1683	#ifdef CURSOR_BLINK
		1684	case Opt_cursorBlink:
		1685	THIS->cursor_blink_reset ();
		1686	break;
		1687	#endif
1534		1688
1535	case Opt_cursorUnderline:	1689	case Opt_cursorUnderline:
1536	THIS->want_refresh = 1;	1690	THIS->want_refresh = 1;
		1691	THIS->refresh_check ();
1537	break;	1692	break;
1538		1693
1539	# case Opt_scrollBar_floating:	1694	# case Opt_scrollBar_floating:
1540	# case Opt_scrollBar_right:	1695	# case Opt_scrollBar_right:
1541	# THIS->resize_all_windows (THIS->width, THIS->height, 1);	1696	# THIS->resize_all_windows (THIS->width, THIS->height, 1);
…		…
1551	CODE:	1706	CODE:
1552	RETVAL = 0 < THIS->parse_keysym (keysym, str);	1707	RETVAL = 0 < THIS->parse_keysym (keysym, str);
1553	THIS->keyboard->register_done ();	1708	THIS->keyboard->register_done ();
1554	OUTPUT:	1709	OUTPUT:
1555	RETVAL	1710	RETVAL
		1711
		1712	void
		1713	rxvt_term::register_command (int keysym, unsigned int state, SV *str)
		1714	CODE:
		1715	wchar_t *wstr = sv2wcs (str);
		1716	THIS->keyboard->register_user_translation (keysym, state, wstr);
		1717	free (wstr);
1556		1718
1557	void	1719	void
1558	rxvt_term::screen_cur (...)	1720	rxvt_term::screen_cur (...)
1559	PROTOTYPE: $;$$	1721	PROTOTYPE: $;$$
1560	ALIAS:	1722	ALIAS:
…		…
1574	EXTEND (SP, 2);	1736	EXTEND (SP, 2);
1575	PUSHs (sv_2mortal (newSViv (rc.row)));	1737	PUSHs (sv_2mortal (newSViv (rc.row)));
1576	PUSHs (sv_2mortal (newSViv (rc.col)));	1738	PUSHs (sv_2mortal (newSViv (rc.col)));
1577	}	1739	}
1578		1740
1579	if (items == 3)	1741	if (items >= 3)
1580	{	1742	{
1581	rc.row = SvIV (ST (1));	1743	rc.row = SvIV (ST (1));
1582	rc.col = SvIV (ST (2));	1744	rc.col = SvIV (ST (2));
1583		1745
1584	if (ix == 2)	1746	if (ix == 2)
…		…
1599		1761
1600	clamp_it (rc.col, 0, THIS->ncol);	1762	clamp_it (rc.col, 0, THIS->ncol);
1601	clamp_it (rc.row, THIS->top_row, THIS->nrow - 1);	1763	clamp_it (rc.row, THIS->top_row, THIS->nrow - 1);
1602		1764
1603	if (ix)	1765	if (ix)
		1766	{
		1767	THIS->selection.screen = THIS->current_screen;
		1768
1604	THIS->want_refresh = 1;	1769	THIS->want_refresh = 1;
		1770	THIS->refresh_check ();
1605	}	1771	}
		1772	}
1606	}	1773	}
1607		1774
1608	char	1775	int
1609	rxvt_term::cur_charset ()	1776	rxvt_term::selection_screen (int screen = -1)
1610	CODE:	1777	CODE:
1611	RETVAL = THIS->charsets [THIS->screen.charset];	1778	RETVAL = THIS->selection.screen;
1612	OUTPUT:	1779	if (screen >= 0)
		1780	THIS->selection.screen = screen;
		1781	OUTPUT:
1613	RETVAL	1782	RETVAL
1614		1783
1615	void	1784	void
1616	rxvt_term::selection_clear ()	1785	rxvt_term::selection_clear (bool clipboard = false)
1617		1786
1618	void	1787	void
1619	rxvt_term::selection_make (Time eventtime, bool rect = false)	1788	rxvt_term::selection_make (Time eventtime, bool rect = false)
1620	CODE:	1789	CODE:
1621	THIS->selection.op = SELECTION_CONT;	1790	THIS->selection.op = SELECTION_CONT;
1622	THIS->selection.rect = rect;	1791	THIS->selection.rect = rect;
1623	THIS->selection_make (eventtime);	1792	THIS->selection_make (eventtime);
1624		1793
1625	int	1794	int
1626	rxvt_term::selection_grab (Time eventtime)	1795	rxvt_term::selection_grab (Time eventtime, bool clipboard = false)
1627		1796
1628	void	1797	void
1629	rxvt_term::selection (SV *newtext = 0)	1798	rxvt_term::selection (SV *newtext = 0, bool clipboard = false)
1630	PPCODE:	1799	PPCODE:
1631	{	1800	{
		1801	wchar_t * &text = clipboard ? THIS->selection.clip_text : THIS->selection.text;
		1802	unsigned int &len = clipboard ? THIS->selection.clip_len : THIS->selection.len;
		1803
1632	if (GIMME_V != G_VOID)	1804	if (GIMME_V != G_VOID)
1633	XPUSHs (THIS->selection.text	1805	XPUSHs (text
1634	? sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len))	1806	? sv_2mortal (wcs2sv (text, len))
1635	: &PL_sv_undef);	1807	: &PL_sv_undef);
1636		1808
1637	if (newtext)	1809	if (newtext)
1638	{	1810	{
1639	free (THIS->selection.text);	1811	free (text);
1640		1812
1641	THIS->selection.text = sv2wcs (newtext);	1813	text = sv2wcs (newtext);
1642	THIS->selection.len = wcslen (THIS->selection.text);	1814	len = wcslen (text);
1643	}	1815	}
1644	}	1816	}
		1817
		1818	char
		1819	rxvt_term::cur_charset ()
		1820	CODE:
		1821	RETVAL = THIS->charsets [THIS->screen.charset];
		1822	OUTPUT:
		1823	RETVAL
1645		1824
1646	void	1825	void
1647	rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle1 = RS_RVid, U32 rstyle2 = RS_RVid | RS_Uline)	1826	rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle1 = RS_RVid, U32 rstyle2 = RS_RVid | RS_Uline)
1648		1827
1649	void	1828	void
1650	rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle = RS_RVid)	1829	rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle = RS_RVid)
1651		1830
1652	void	1831	void
1653	rxvt_term::scr_bell ()	1832	rxvt_term::scr_bell ()
		1833
		1834	void
		1835	rxvt_term::scr_recolour (bool refresh = true);
1654		1836
1655	void	1837	void
1656	rxvt_term::scr_change_screen (int screen)	1838	rxvt_term::scr_change_screen (int screen)
1657		1839
1658	void	1840	void
…		…
1671	char *str = SvPVbyte (octets, len);	1853	char *str = SvPVbyte (octets, len);
1672	C_ARGS:	1854	C_ARGS:
1673	str, len	1855	str, len
1674		1856
1675	void	1857	void
		1858	rxvt_term::tt_paste (SV *octets)
		1859	INIT:
		1860	STRLEN len;
		1861	char *str = SvPVbyte (octets, len);
		1862	C_ARGS:
		1863	str, len
		1864
		1865	void
1676	rxvt_term::cmd_parse (SV *octets)	1866	rxvt_term::cmd_parse (SV *octets)
1677	CODE:	1867	CODE:
1678	{	1868	{
1679	STRLEN len;	1869	STRLEN len;
1680	char *str = SvPVbyte (octets, len);	1870	char *str = SvPVbyte (octets, len);
…		…
1711	void	1901	void
1712	rxvt_term::XListProperties (Window window)	1902	rxvt_term::XListProperties (Window window)
1713	PPCODE:	1903	PPCODE:
1714	{	1904	{
1715	int count;	1905	int count;
1716	Atom *props = XListProperties (THIS->display->display, window, &count);	1906	Atom *props = XListProperties (THIS->dpy, window, &count);
1717		1907
1718	EXTEND (SP, count);	1908	EXTEND (SP, count);
1719	while (count--)	1909	while (count--)
1720	PUSHs (newSVuv ((U32)props [count]));	1910	PUSHs (newSVuv ((U32)props [count]));
1721		1911
1722	XFree (props);	1912	XFree (props);
1723	}	1913	}
1724		1914
1725	void	1915	void
1726	rxvt_term::XGetWindowProperty (Window window, Atom property)	1916	rxvt_term::XGetWindowProperty (Window window, Atom property)
…		…
1730	int format;	1920	int format;
1731	unsigned long nitems;	1921	unsigned long nitems;
1732	unsigned long bytes_after;	1922	unsigned long bytes_after;
1733	unsigned char *prop;	1923	unsigned char *prop;
1734		1924
1735	XGetWindowProperty (THIS->display->display, window, property,	1925	XGetWindowProperty (THIS->dpy, window, property,
1736	0, 1<<24, 0, AnyPropertyType,	1926	0, 1<<24, 0, AnyPropertyType,
1737	&type, &format, &nitems, &bytes_after, &prop);	1927	&type, &format, &nitems, &bytes_after, &prop);
1738		1928
1739	if (type != None)	1929	if (type != None)
1740	{	1930	{
…		…
1749	XFree (prop);	1939	XFree (prop);
1750	}	1940	}
1751	}	1941	}
1752		1942
1753	void	1943	void
1754	rxvt_term::XChangeWindowProperty (Window window, Atom property, Atom type, int format, SV *data)	1944	rxvt_term::XChangeProperty (Window window, Atom property, Atom type, int format, SV *data)
1755	CODE:	1945	CODE:
1756	{	1946	{
1757	STRLEN len;	1947	STRLEN len;
1758	char *data_ = SvPVbyte (data, len);	1948	char *data_ = SvPVbyte (data, len);
1759		1949
1760	int elemsize = format == 16 ? sizeof (short)	1950	int elemsize = format == 16 ? sizeof (short)
1761	: format == 32 ? sizeof (long)	1951	: format == 32 ? sizeof (long)
1762	: 1;	1952	: 1;
1763		1953
1764	XChangeProperty (THIS->display->display, window, property,	1954	XChangeProperty (THIS->dpy, window, property,
1765	type, format, PropModeReplace,	1955	type, format, PropModeReplace,
1766	(unsigned char *)data_, len / elemsize);	1956	(unsigned char *)data_, len / elemsize);
1767	XSync (THIS->display->display, 0);
1768	}	1957	}
1769		1958
1770	Atom	1959	Atom
1771	XInternAtom (rxvt_term *term, char *atom_name, int only_if_exists = FALSE)	1960	XInternAtom (rxvt_term *term, octet_string atom_name, int only_if_exists = FALSE)
1772	C_ARGS: term->display->display, atom_name, only_if_exists	1961	C_ARGS: term->dpy, atom_name, only_if_exists
1773		1962
1774	char *	1963	char *
1775	XGetAtomName (rxvt_term *term, Atom atom)	1964	XGetAtomName (rxvt_term *term, Atom atom)
1776	C_ARGS: term->display->display, atom	1965	C_ARGS: term->dpy, atom
1777	CLEANUP:	1966	CLEANUP:
1778	XFree (RETVAL);	1967	XFree (RETVAL);
1779		1968
1780	void	1969	void
1781	XDeleteProperty (rxvt_term *term, Window window, Atom property)	1970	XDeleteProperty (rxvt_term *term, Window window, Atom property)
1782	C_ARGS: term->display->display, window, property	1971	C_ARGS: term->dpy, window, property
1783		1972
1784	Window	1973	Window
1785	rxvt_term::DefaultRootWindow ()	1974	rxvt_term::DefaultRootWindow ()
1786	CODE:	1975	CODE:
1787	RETVAL = THIS->display->root;	1976	RETVAL = THIS->display->root;
…		…
1790		1979
1791	#if 0	1980	#if 0
1792		1981
1793	Window	1982	Window
1794	XCreateSimpleWindow (rxvt_term *term, Window parent, int x, int y, unsigned int width, unsigned int height)	1983	XCreateSimpleWindow (rxvt_term *term, Window parent, int x, int y, unsigned int width, unsigned int height)
1795	C_ARGS: term->display->display, (Window)parent,	1984	C_ARGS: term->dpy, (Window)parent,
1796	x, y, width, height, 0,	1985	x, y, width, height, 0,
1797	term->pix_colors_focused[Color_border],	1986	term->pix_colors_focused[Color_border],
1798	term->pix_colors_focused[Color_border]	1987	term->pix_colors_focused[Color_border]
1799		1988
1800	#endif	1989	#endif
1801		1990
1802	void	1991	void
1803	XReparentWindow (rxvt_term *term, Window window, Window parent, int x = 0, int y = 0)	1992	XReparentWindow (rxvt_term *term, Window window, Window parent, int x = 0, int y = 0)
1804	C_ARGS: term->display->display, window, parent, x, y	1993	C_ARGS: term->dpy, window, parent, x, y
1805		1994
1806	void	1995	void
1807	XMapWindow (rxvt_term *term, Window window)	1996	XMapWindow (rxvt_term *term, Window window)
1808	C_ARGS: term->display->display, window	1997	C_ARGS: term->dpy, window
1809		1998
1810	void	1999	void
1811	XUnmapWindow (rxvt_term *term, Window window)	2000	XUnmapWindow (rxvt_term *term, Window window)
1812	C_ARGS: term->display->display, window	2001	C_ARGS: term->dpy, window
1813		2002
1814	void	2003	void
1815	XMoveResizeWindow (rxvt_term *term, Window window, int x, int y, unsigned int width, unsigned int height)	2004	XMoveResizeWindow (rxvt_term *term, Window window, int x, int y, unsigned int width, unsigned int height)
1816	C_ARGS: term->display->display, window, x, y, width, height	2005	C_ARGS: term->dpy, window, x, y, width, height
1817		2006
1818	void	2007	void
1819	rxvt_term::XChangeInput (Window window, U32 add_events, U32 del_events = 0)	2008	rxvt_term::XChangeInput (Window window, U32 add_events, U32 del_events = 0)
1820	CODE:	2009	CODE:
1821	{	2010	{
1822	XWindowAttributes attr;	2011	XWindowAttributes attr;
1823	XGetWindowAttributes (THIS->display->display, window, &attr);	2012	XGetWindowAttributes (THIS->dpy, window, &attr);
1824	XSelectInput (THIS->display->display, window, attr.your_event_mask | add_events & ~del_events);	2013	XSelectInput (THIS->dpy, window, attr.your_event_mask | add_events & ~del_events);
1825	}	2014	}
1826		2015
1827	void	2016	void
1828	rxvt_term::XTranslateCoordinates (Window src, Window dst, int x, int y)	2017	rxvt_term::XTranslateCoordinates (Window src, Window dst, int x, int y)
1829	PPCODE:	2018	PPCODE:
1830	{	2019	{
1831	int dx, dy;	2020	int dx, dy;
1832	Window child;	2021	Window child;
1833		2022
1834	if (XTranslateCoordinates (THIS->display->display, src, dst, x, y, &dx, &dy, &child))	2023	if (XTranslateCoordinates (THIS->dpy, src, dst, x, y, &dx, &dy, &child))
1835	{	2024	{
1836	EXTEND (SP, 3);	2025	EXTEND (SP, 3);
1837	PUSHs (newSViv (dx));	2026	PUSHs (newSViv (dx));
1838	PUSHs (newSViv (dy));	2027	PUSHs (newSViv (dy));
1839	PUSHs (newSVuv (child));	2028	PUSHs (newSVuv (child));
1840	}	2029	}
1841	}	2030	}
1842		2031
1843	#############################################################################	2032	#############################################################################
		2033	# fancy bg bloatstuff (TODO: should be moved up somewhere)
		2034
		2035	# TODO: ugly
		2036	void
		2037	rxvt_term::background_geometry (bool border = false)
		2038	PPCODE:
		2039	EXTEND (SP, 4);
		2040	PUSHs (sv_2mortal (newSViv (THIS->parent_x + (border ? THIS->window_vt_x : 0))));
		2041	PUSHs (sv_2mortal (newSViv (THIS->parent_y + (border ? THIS->window_vt_y : 0))));
		2042	PUSHs (sv_2mortal (newSViv (border ? THIS->vt_width : THIS->szHint.width )));
		2043	PUSHs (sv_2mortal (newSViv (border ? THIS->vt_height : THIS->szHint.height)));
		2044
		2045	#if HAVE_IMG
		2046
		2047	#if 0
		2048
		2049	rxvt_img *
		2050	rxvt_term::new_img (SV *format, int width, int height)
		2051	CODE:
		2052	XRenderPictFormat *f = SvOK (format)
		2053	? XRenderFindStandardFormat (THIS->dpy, SvIV (format))
		2054	: XRenderFindVisualFormat (THIS->dpy, THIS->visual);
		2055	RETVAL = new rxvt_img (THIS, f, width, height);
		2056	OUTPUT:
		2057	RETVAL
		2058
		2059	#endif
		2060
		2061	#if ENABLE_TRANSPARENCY
		2062
		2063	rxvt_img *
		2064	rxvt_term::new_img_from_root ()
		2065	CODE:
		2066	RETVAL = rxvt_img::new_from_root (THIS);
		2067	OUTPUT:
		2068	RETVAL
		2069
		2070	#endif
		2071
		2072	#if HAVE_PIXBUF
		2073
		2074	rxvt_img *
		2075	rxvt_term::new_img_from_file (octet_string filename)
		2076	CODE:
		2077	try
		2078	{
		2079	RETVAL = rxvt_img::new_from_file (THIS, filename);
		2080	}
		2081	catch (const class rxvt_failure_exception &e)
		2082	{
		2083	croak ("new_img_from_file failed");
		2084	}
		2085	OUTPUT:
		2086	RETVAL
		2087
		2088	#endif
		2089
		2090	#if HAVE_BG_PIXMAP
		2091
		2092	void
		2093	rxvt_term::set_background (rxvt_img *img, bool border = false)
		2094	CODE:
		2095	THIS->bg_destroy ();
		2096	THIS->bg_pixmap = None;
		2097	THIS->bg_flags &= ~(rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER | rxvt_term::BG_IS_TRANSPARENT);
		2098
		2099	if (img) // TODO: cannot be false
		2100	{
		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
		2125	THIS->bg_pixmap = img->steal ();
		2126	THIS->bg_flags |= rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER;
		2127
		2128	if (!border)
		2129	THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT;
		2130
		2131	delete img;
		2132	}
		2133
		2134	#endif
		2135
		2136	#endif
		2137
		2138	#############################################################################
1844	# urxvt::overlay	2139	# urxvt::overlay
1845	#############################################################################	2140	#############################################################################
1846		2141
1847	MODULE = urxvt PACKAGE = urxvt::overlay	2142	MODULE = urxvt PACKAGE = urxvt::overlay
1848		2143
…		…
1856	overlay::hide ()	2151	overlay::hide ()
1857		2152
1858	void	2153	void
1859	overlay::DESTROY ()	2154	overlay::DESTROY ()
1860		2155
1861	#############################################################################	2156	INCLUDE: $PERL <iom_perl.xs -pe s/IOM_MODULE/urxvt/g,s/IOM_CLASS/urxvt/g |
1862	# urxvt::watcher
1863	#############################################################################
1864		2157
1865	MODULE = urxvt PACKAGE = urxvt::watcher
1866
1867	CHAINED
1868	perl_watcher::cb (SV *cb)
1869	CODE:
1870	THIS->cb (cb);
1871	OUTPUT:
1872	RETVAL
1873
1874	#############################################################################
1875	# urxvt::timer
1876	#############################################################################
1877
1878	MODULE = urxvt PACKAGE = urxvt::timer
1879
1880	SV *
1881	timer::new ()
1882	CODE:
1883	timer *w = new timer;
1884	w->start (NOW);
1885	RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::timer");
1886	w->self = (HV *)SvRV (RETVAL);
1887	OUTPUT:
1888	RETVAL
1889
1890	NV
1891	timer::at ()
1892	CODE:
1893	RETVAL = THIS->at;
1894	OUTPUT:
1895	RETVAL
1896
1897	CHAINED
1898	timer::interval (NV interval)
1899	CODE:
1900	THIS->interval = interval;
1901	OUTPUT:
1902	RETVAL
1903
1904	CHAINED
1905	timer::set (NV tstamp)
1906	CODE:
1907	THIS->set (tstamp);
1908	OUTPUT:
1909	RETVAL
1910
1911	CHAINED
1912	timer::start (NV tstamp = THIS->at)
1913	CODE:
1914	THIS->start (tstamp);
1915	OUTPUT:
1916	RETVAL
1917
1918	CHAINED
1919	timer::after (NV delay)
1920	CODE:
1921	THIS->start (NOW + delay);
1922	OUTPUT:
1923	RETVAL
1924
1925	CHAINED
1926	timer::stop ()
1927	CODE:
1928	THIS->stop ();
1929	OUTPUT:
1930	RETVAL
1931
1932	void
1933	timer::DESTROY ()
1934
1935	#############################################################################
1936	# urxvt::iow
1937	#############################################################################
1938
1939	MODULE = urxvt PACKAGE = urxvt::iow	2158	MODULE = urxvt PACKAGE = urxvt::pixbuf PREFIX = gdk_pixbuf_
1940		2159
1941	SV *	2160	#if HAVE_PIXBUF
1942	iow::new ()
1943	CODE:
1944	iow *w = new iow;
1945	RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::iow");
1946	w->self = (HV *)SvRV (RETVAL);
1947	OUTPUT:
1948	RETVAL
1949		2161
1950	CHAINED	2162	urxvt::pixbuf gdk_pixbuf_new_from_file (SV *klass, octet_string filename)
1951	iow::fd (int fd)	2163	C_ARGS: filename, 0
1952	CODE:
1953	THIS->fd = fd;
1954	OUTPUT:
1955	RETVAL
1956		2164
1957	CHAINED
1958	iow::events (short events)
1959	CODE:
1960	THIS->events = events;
1961	OUTPUT:
1962	RETVAL
1963
1964	CHAINED
1965	iow::start ()
1966	CODE:
1967	THIS->start ();
1968	OUTPUT:
1969	RETVAL
1970
1971	CHAINED
1972	iow::stop ()
1973	CODE:
1974	THIS->stop ();
1975	OUTPUT:
1976	RETVAL
1977
1978	void	2165	void
1979	iow::DESTROY ()	2166	DESTROY (urxvt::pixbuf self)
		2167	CODE:
		2168	gdk_pixbuf_unref (self);
1980		2169
1981	#############################################################################	2170	#endif
1982	# urxvt::iw
1983	#############################################################################
1984		2171
1985	MODULE = urxvt PACKAGE = urxvt::iw	2172	MODULE = urxvt PACKAGE = urxvt::img
1986		2173
1987	SV *	2174	#if HAVE_IMG
1988	iw::new ()
1989	CODE:
1990	iw *w = new iw;
1991	RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::iw");
1992	w->self = (HV *)SvRV (RETVAL);
1993	OUTPUT:
1994	RETVAL
1995		2175
1996	CHAINED	2176	# rxvt_img *new (rxvt_screen *screen, XRenderPictFormat *format, int width, int height)
1997	iw::start ()	2177	# rxvt_img *rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int width, int height, Pixmap pixmap);
1998	CODE:
1999	THIS->start ();
2000	OUTPUT:
2001	RETVAL
2002		2178
2003	CHAINED	2179	int
2004	iw::stop ()	2180	rxvt_img::w ()
2005	CODE:	2181	CODE:
2006	THIS->stop ();	2182	RETVAL = THIS->w;
2007	OUTPUT:	2183	OUTPUT:
2008	RETVAL	2184	RETVAL
2009		2185
		2186	int
		2187	rxvt_img::h ()
		2188	CODE:
		2189	RETVAL = THIS->h;
		2190	OUTPUT:
		2191	RETVAL
		2192
		2193	Pixmap
		2194	rxvt_img::pm ()
		2195	CODE:
		2196	RETVAL = THIS->pm;
		2197	OUTPUT:
		2198	RETVAL
		2199
2010	void	2200	void
		2201	rxvt_img::fill (SV *c)
		2202	INIT:
		2203	rxvt_color rc;
		2204	parse_color (THIS->s, rc, c);
		2205	C_ARGS: rc
		2206
		2207	void
2011	iw::DESTROY ()	2208	rxvt_img::DESTROY ()
2012
2013	#############################################################################
2014	# urxvt::pw
2015	#############################################################################
2016
2017	MODULE = urxvt PACKAGE = urxvt::pw
2018
2019	SV *
2020	pw::new ()
2021	CODE:	2209	CODE:
2022	pw *w = new pw;	2210	delete THIS;
2023	RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::pw");
2024	w->self = (HV *)SvRV (RETVAL);
2025	OUTPUT:
2026	RETVAL
2027		2211
2028	CHAINED
2029	pw::start (int pid)
2030	CODE:
2031	THIS->start (pid);
2032	OUTPUT:
2033	RETVAL
2034
2035	CHAINED
2036	pw::stop ()
2037	CODE:
2038	THIS->stop ();
2039	OUTPUT:
2040	RETVAL
2041
2042	void	2212	void
2043	pw::DESTROY ()	2213	rxvt_img::unshare ()
2044		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)));
2045		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
		2241	rxvt_img *
		2242	rxvt_img::blur (int rh, int rv)
		2243
		2244	rxvt_img *
		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)
		2246	INIT:
		2247	double matrix[9] = {
		2248	p11, p12, p13,
		2249	p21, p22, p23,
		2250	p31, p32, p33
		2251	};
		2252	C_ARGS: new_width, new_height, matrix
		2253
		2254	rxvt_img *
		2255	rxvt_img::scale (int new_width, int new_height)
		2256
		2257	rxvt_img *
		2258	rxvt_img::rotate (int new_width, int new_height, int x, int y, NV phi)
		2259
		2260	#endif
		2261

Diff Legend

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