ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/rxvt-unicode/src/command.C

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.480 by sf-exg, Mon Mar 7 11:48:55 2011 UTC vs.
Revision 1.539 by sf-exg, Tue Apr 16 08:44:45 2013 UTC

…		…
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) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>	6	* Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7	* - original version	7	* - original version
8	* Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>	8	* Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
9	* - extensive modifications	9	* - extensive modifications
10	* Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com>	10	* Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com>
11	* - vt100 printing	11	* - vt100 printing
12	* Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu>	12	* Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu>
13	* - X11 mouse report mode and support for	13	* - X11 mouse report mode and support for
14	* DEC "private mode" save/restore functions.	14	* DEC "private mode" save/restore functions.
…		…
20	* Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es>	20	* Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es>
21	* - modification and cleanups for Solaris 2.x	21	* - modification and cleanups for Solaris 2.x
22	* and Linux 1.2.x	22	* and Linux 1.2.x
23	* Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>	23	* Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
24	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>	24	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
25	* - extensive modifications	25	* - extensive modifications
26	* Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>	26	* Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27	* Copyright (c) 2001 Marius Gedminas	27	* Copyright (c) 2001 Marius Gedminas
28	* - Ctrl/Mod4+Tab works like Meta+Tab (options)	28	* - Ctrl/Mod4+Tab works like Meta+Tab (options)
29	* Copyright (c) 2003 Rob McMullen <robm@flipturn.org>	29	* Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30	* Copyright (c) 2003-2011 Marc Lehmann <schmorp@schmorp.de>	30	* Copyright (c) 2003-2011 Marc Lehmann <schmorp@schmorp.de>
…		…
54		54
55	#ifdef KEYSYM_RESOURCE	55	#ifdef KEYSYM_RESOURCE
56	# include "keyboard.h"	56	# include "keyboard.h"
57	#endif	57	#endif
58		58
59	#include <csignal>	59	#include <signal.h>
60		60
61	#if LINUX_YIELD_HACK	61	#if LINUX_YIELD_HACK
62	# include <ctime>	62	# include <time.h>
63	#endif	63	#endif
64		64
65	/*----------------------------------------------------------------------*/	65	/*----------------------------------------------------------------------*/
66		66
67	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)	67	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
…		…
131	XK_KP_Space, 0x2422,	131	XK_KP_Space, 0x2422,
132	#endif	132	#endif
133	0,	133	0,
134	};	134	};
135		135
136	void	136	void ecb_cold
137	rxvt_term::iso14755_54 (int x, int y)	137	rxvt_term::iso14755_54 (int x, int y)
138	{	138	{
139	x = Pixel2Col (x);	139	x = Pixel2Col (x);
140	y = Pixel2Row (y);	140	y = Pixel2Row (y);
141		141
…		…
149		149
150	text_t t = l.t[x];	150	text_t t = l.t[x];
151		151
152	if (t != NOCHAR || !x)	152	if (t != NOCHAR || !x)
153	{	153	{
154	iso14755_51 (l.t[x], l.r[x], x, y);	154	iso14755_51 (l.t[x], l.r[x], x, y, view_start);
155	iso14755buf = ISO_14755_54;	155	iso14755buf = ISO_14755_54;
156	break;	156	break;
157	}	157	}
158		158
159	x--;	159	x--;
160	}	160	}
161	}	161	}
162		162
163	void	163	void ecb_cold
164	rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)	164	rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y, int y2)
165	{	165	{
166	rxvt_fontset *fs = FONTSET (r);	166	rxvt_fontset *fs = FONTSET (r);
167	wchar_t *chr, *alloc, ch2, **fname;	167	wchar_t *chr, *alloc, ch2, **fname;
168	int len;	168	int len;
169		169
…		…
181		181
182	alloc = 0;	182	alloc = 0;
183	chr = &ch2;	183	chr = &ch2;
184	len = 1;	184	len = 1;
185	}	185	}
		186
		187	char rowcol[40];
		188	snprintf (rowcol, sizeof rowcol, "col %d row %d @%d", x, y, y2);
186		189
187	char attr[80]; // plenty	190	char attr[80]; // plenty
188		191
189	sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",	192	sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
190	(int)r,	193	(int)r,
…		…
203	rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];	206	rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
204	fname[i] = rxvt_utf8towcs (f->name);	207	fname[i] = rxvt_utf8towcs (f->name);
205	max_it (width, wcswidth (fname[i], wcslen (fname[i])));	208	max_it (width, wcswidth (fname[i], wcslen (fname[i])));
206	}	209	}
207		210
208	max_it (width, 8+5); // for char + hex
209	max_it (width, strlen (attr));	211	max_it (width, strlen (attr));
210		212
211	if (y >= 0)	213	if (y >= 0)
212	{	214	{
213	y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;	215	y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
214	x = 0;	216	x = 0;
215	}	217	}
216		218
217	scr_overlay_new (x, y, width, len * 2 + 1);	219	scr_overlay_new (x, y, width, len * 2 + 2);
		220
		221	scr_overlay_set (0, 0, rowcol);
218		222
219	r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));	223	r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
220		224
221	for (int y = 0; y < len; y++)	225	for (int y = 0; y < len; y++)
222	{	226	{
223	char buf[9];	227	char buf[9];
224		228
225	ch = *chr++;	229	ch = *chr++;
226		230
227	sprintf (buf, "%8x", ch);	231	sprintf (buf, "%8x", ch);
228	scr_overlay_set (0, y, buf);	232	scr_overlay_set (0, y + 1, buf);
229	scr_overlay_set (9, y, '=');	233	scr_overlay_set (9, y + 1, '=');
230	# if !UNICODE_3	234	# if !UNICODE_3
231	if (ch >= 0x10000)	235	if (ch >= 0x10000)
232	ch = 0xfffd;	236	ch = 0xfffd;
233	# endif	237	# endif
234	scr_overlay_set (11, y, ch, r);	238	scr_overlay_set (11, y + 1, ch, r);
235		239
236	if (WCWIDTH (ch) >= 2)	240	if (WCWIDTH (ch) >= 2)
237	scr_overlay_set (12, y, NOCHAR, r);	241	scr_overlay_set (12, y + 1, NOCHAR, r);
238	}	242	}
239		243
240	// {	244	// {
241	// char buf[4+4+3+1];	245	// char buf[4+4+3+1];
242	// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);	246	// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
243	// scr_overlay_set (0, 0, buf);	247	// scr_overlay_set (0, 0, buf);
244	// }	248	// }
245	scr_overlay_set (0, len , attr);	249	scr_overlay_set (0, len + 1, attr);
246	for (int i = 0; i < len; i++)	250	for (int i = 0; i < len; i++)
247	{	251	{
248	scr_overlay_set (0, len + 1 + i, fname[i]);	252	scr_overlay_set (0, len + 2 + i, fname[i]);
249	free (fname[i]);	253	free (fname[i]);
250	}	254	}
251		255
252	# if ENABLE_COMBINING	256	# if ENABLE_COMBINING
253	if (alloc)	257	if (alloc)
254	delete [] alloc;	258	delete [] alloc;
255	# endif	259	# endif
256	}	260	}
257	#endif	261	#endif
258		262
259	void	263	void ecb_cold
260	rxvt_term::commit_iso14755 ()	264	rxvt_term::commit_iso14755 ()
261	{	265	{
262	wchar_t ch[2];
263
264	ch[0] = iso14755buf & ISO_14755_MASK;	266	wchar_t ch = iso14755buf & ISO_14755_MASK;
265	ch[1] = 0;
266		267
267	if (iso14755buf & ISO_14755_51)	268	if (iso14755buf & ISO_14755_51)
268	{	269	{
269	char mb[16];	270	char mb[MB_LEN_MAX];
270	int len;	271	int len;
271		272
272	// allow verbatim 0-bytes and control-bytes to be entered	273	// allow verbatim 0-bytes and control-bytes to be entered
273	if (ch[0] >= 0x20)	274	if (ch >= 0x20)
274	len = wcstombs (mb, ch, 16);	275	len = wctomb (mb, ch);
275	else	276	else
276	{	277	{
277	mb[0] = ch[0];	278	mb[0] = ch;
278	len = 1;	279	len = 1;
279	}	280	}
280		281
281	if (len > 0)	282	if (len > 0)
282	tt_write (mb, len);	283	tt_write (mb, len);
…		…
285	}	286	}
286		287
287	iso14755buf = 0;	288	iso14755buf = 0;
288	}	289	}
289		290
290	static int	291	static int ecb_cold
291	hex_keyval (XKeyEvent &ev)	292	hex_keyval (XKeyEvent &ev)
292	{	293	{
293	// check whether this event corresponds to a hex digit	294	// check whether this event corresponds to a hex digit
294	// if the modifiers had not been pressed.	295	// if the modifiers had not been pressed.
295	for (int index = 0; index < 8; index++)	296	for (int index = 0; index < 8; index++)
…		…
304		305
305	return -1;	306	return -1;
306	}	307	}
307	#endif	308	#endif
308		309
309	static inline KeySym	310	static inline KeySym ecb_cold
310	translate_keypad (KeySym keysym, bool kp)	311	translate_keypad (KeySym keysym, bool kp)
311	{	312	{
312	#ifdef XK_KP_Home	313	#ifdef XK_KP_Home
313	static const KeySym keypadtrans[] = {	314	static const KeySym keypadtrans[] = {
314	XK_KP_7, // XK_KP_Home	315	XK_KP_7, // XK_KP_Home
…		…
340	# endif	341	# endif
341	#endif	342	#endif
342	return keysym;	343	return keysym;
343	}	344	}
344		345
345	static inline int	346	static inline int ecb_cold
346	map_function_key (KeySym keysym)	347	map_function_key (KeySym keysym)
347	{	348	{
348	int param = 0;	349	int param = 0;
349		350
350	if (IN_RANGE_INC (keysym, XK_F1, XK_F35))	351	if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
…		…
399	break;	400	break;
400	}	401	}
401	return param;	402	return param;
402	}	403	}
403		404
404	void	405	void ecb_cold
405	rxvt_term::key_press (XKeyEvent &ev)	406	rxvt_term::key_press (XKeyEvent &ev)
406	{	407	{
407	int ctrl, meta, shft, len;	408	int ctrl, meta, shft, len;
408	KeySym keysym;	409	KeySym keysym;
409	int valid_keysym;	410	int valid_keysym;
…		…
424	ctrl = ev.state & ControlMask;	425	ctrl = ev.state & ControlMask;
425	meta = ev.state & ModMetaMask;	426	meta = ev.state & ModMetaMask;
426		427
427	kbuf[0] = 0;	428	kbuf[0] = 0;
428		429
429	#ifdef USE_XIM	430	#if USE_XIM
430	if (Input_Context)	431	if (Input_Context)
431	{	432	{
432	Status status_return;	433	Status status_return;
433		434
434	#if 0	435	#if 0
…		…
509	#endif	510	#endif
510	max_it (lnsppg, 1);	511	max_it (lnsppg, 1);
511		512
512	if (keysym == XK_Prior)	513	if (keysym == XK_Prior)
513	{	514	{
514	scr_page (UP, lnsppg);	515	scr_page (lnsppg);
515	return;	516	return;
516	}	517	}
517	else if (keysym == XK_Next)	518	else if (keysym == XK_Next)
518	{	519	{
519	scr_page (DN, lnsppg);	520	scr_page (-lnsppg);
520	return;	521	return;
521	}	522	}
522	}	523	}
523	#ifdef SCROLL_ON_UPDOWN_KEYS	524	#ifdef SCROLL_ON_UPDOWN_KEYS
524	if (IS_SCROLL_MOD)	525	if (IS_SCROLL_MOD)
525	{	526	{
526	if (keysym == XK_Up)	527	if (keysym == XK_Up)
527	{	528	{
528	scr_page (UP, 1);	529	scr_page (1);
529	return;	530	return;
530	}	531	}
531	else if (keysym == XK_Down)	532	else if (keysym == XK_Down)
532	{	533	{
533	scr_page (DN, 1);	534	scr_page (-1);
534	return;	535	return;
535	}	536	}
536	}	537	}
537	#endif	538	#endif
538	#ifdef SCROLL_ON_HOMEEND_KEYS	539	#ifdef SCROLL_ON_HOMEEND_KEYS
539	if (IS_SCROLL_MOD)	540	if (IS_SCROLL_MOD)
540	{	541	{
541	if (keysym == XK_Home)	542	if (keysym == XK_Home)
542	{	543	{
543	scr_move_to (0, 1);	544	scr_changeview (top_row);
544	return;	545	return;
545	}	546	}
546	else if (keysym == XK_End)	547	else if (keysym == XK_End)
547	{	548	{
548	scr_move_to (1, 1);	549	scr_changeview (0);
549	return;	550	return;
550	}	551	}
551	}	552	}
552	#endif	553	#endif
553	}	554	}
…		…
569	selection_request (ev.time);	570	selection_request (ev.time);
570	return;	571	return;
571	#if TODO	572	#if TODO
572	/* rxvt extras */	573	/* rxvt extras */
573	case XK_KP_Add: /* Shift+KP_Add = bigger font */	574	case XK_KP_Add: /* Shift+KP_Add = bigger font */
574	change_font (FONT_UP);
575	return;	575	return;
576	case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */	576	case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
577	change_font (FONT_DN);
578	return;	577	return;
579	#endif	578	#endif
580	}	579	}
581	}	580	}
582	}	581	}
…		…
781	}	780	}
782		781
783	if (newlen)	782	if (newlen)
784	len = strlen (kbuf);	783	len = strlen (kbuf);
785		784
		785	if (len > 0)
		786	{
786	/*	787	/*
		788	* pass Shift/Control indicators for function keys ending with `~'
		789	*
		790	* eg,
		791	* Prior = "ESC[5~"
		792	* Shift+Prior = "ESC[5$"
		793	* Ctrl+Prior = "ESC[5^"
		794	* Ctrl+Shift+Prior = "ESC[5@"
		795	*/
		796	if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
		797	kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
		798
		799	/*
787	* Pass meta for all function keys, if 'meta' option set	800	* Pass meta for all function keys, if 'meta' option set
788	*/	801	*/
789	#ifdef META8_OPTION	802	#ifdef META8_OPTION
790	if (meta && (meta_char == 0x80) && len > 0)	803	if (meta && (meta_char == 0x80))
791	kbuf[len - 1] |= 0x80;	804	kbuf[len - 1] |= 0x80;
792	#endif	805	#endif
		806	}
793		807
794	}	808	}
795	else if (ctrl && keysym == XK_minus)	809	else if (ctrl && keysym == XK_minus)
796	{	810	{
797	len = 1;	811	len = 1;
…		…
831	{	845	{
832	view_start = 0;	846	view_start = 0;
833	want_refresh = 1;	847	want_refresh = 1;
834	}	848	}
835		849
836	/*
837	* these modifications only affect the static keybuffer
838	* pass Shift/Control indicators for function keys ending with `~'
839	*
840	* eg,
841	* Prior = "ESC[5~"
842	* Shift+Prior = "ESC[5$"
843	* Ctrl+Prior = "ESC[5^"
844	* Ctrl+Shift+Prior = "ESC[5@"
845	* Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
846	*/
847	if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
848	kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
849
850	/* escape prefix */	850	/* escape prefix */
851	if (meta	851	if (meta
852	#ifdef META8_OPTION	852	#ifdef META8_OPTION
853	&& meta_char == C0_ESC	853	&& meta_char == C0_ESC
854	#endif	854	#endif
…		…
859	}	859	}
860		860
861	tt_write (kbuf, (unsigned int)len);	861	tt_write (kbuf, (unsigned int)len);
862	}	862	}
863		863
864	void	864	void ecb_cold
865	rxvt_term::key_release (XKeyEvent &ev)	865	rxvt_term::key_release (XKeyEvent &ev)
866	{	866	{
867	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL	867	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
868	KeySym keysym;	868	KeySym keysym;
869		869
…		…
936	else if (keysym == XK_Control_L || keysym == XK_Control_R)	936	else if (keysym == XK_Control_L || keysym == XK_Control_R)
937	mouse_slip_wheel_speed = 0;	937	mouse_slip_wheel_speed = 0;
938	#endif	938	#endif
939	}	939	}
940		940
941	#if defined (KEYSYM_RESOURCE)
942	unsigned int
943	rxvt_term::cmd_write (const char *str, unsigned int count)
944	{
945	unsigned int n, s;
946
947	n = cmdbuf_ptr - cmdbuf_base;
948	s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
949
950	if (n > 0 && s < count)
951	{
952	memmove (cmdbuf_base, cmdbuf_ptr,
953	(unsigned int) (cmdbuf_endp - cmdbuf_ptr));
954	cmdbuf_ptr = cmdbuf_base;
955	cmdbuf_endp -= n;
956	s += n;
957	}
958
959	if (count > s)
960	{
961	rxvt_warn ("data loss: cmd_write too large, continuing.\n");
962	count = s;
963	}
964
965	for (; count--;)
966	*cmdbuf_endp++ = *str++;
967
968	cmd_parse ();
969
970	return 0;
971	}
972	#endif
973
974	void	941	void
975	rxvt_term::flush ()	942	rxvt_term::flush ()
976	{	943	{
977	flush_ev.stop ();	944	flush_ev.stop ();
978		945
979	#ifdef HAVE_BG_PIXMAP	946	#ifdef HAVE_IMG
980	if (bg_flags & BG_NEEDS_REFRESH)	947	if (bg_flags & BG_NEEDS_REFRESH)
981	{	948	{
982	bg_flags &= ~BG_NEEDS_REFRESH;	949	bg_flags &= ~BG_NEEDS_REFRESH;
983	scr_touch (false);	950	scr_touch (false);
984	}	951	}
…		…
1024	while (row < end_row);	991	while (row < end_row);
1025	}	992	}
1026		993
1027	scr_refresh ();	994	scr_refresh ();
1028	scrollBar.show (1);	995	scrollBar.show (1);
1029	#ifdef USE_XIM	996	#if USE_XIM
1030	IMSendSpot ();	997	im_send_spot ();
1031	#endif	998	#endif
1032	}	999	}
1033		1000
1034	display->flush ();	1001	display->flush ();
1035	}	1002	}
…		…
1053	flush ();	1020	flush ();
1054	}	1021	}
1055		1022
1056	#ifdef CURSOR_BLINK	1023	#ifdef CURSOR_BLINK
1057	void	1024	void
		1025	rxvt_term::cursor_blink_reset ()
		1026	{
		1027	if (hidden_cursor)
		1028	{
		1029	hidden_cursor = 0;
		1030	want_refresh = 1;
		1031	}
		1032
		1033	if (option (Opt_cursorBlink))
		1034	cursor_blink_ev.again ();
		1035	else
		1036	cursor_blink_ev.stop ();
		1037	}
		1038
		1039	void
1058	rxvt_term::cursor_blink_cb (ev::timer &w, int revents)	1040	rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1059	{	1041	{
1060	hidden_cursor = !hidden_cursor;	1042	hidden_cursor = !hidden_cursor;
1061	want_refresh = 1;	1043	want_refresh = 1;
1062	refresh_check ();	1044	refresh_check ();
…		…
1080		1062
1081	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	1063	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1082	void	1064	void
1083	rxvt_term::cont_scroll_cb (ev::timer &w, int revents)	1065	rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1084	{	1066	{
1085	if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)	1067	if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1086	&& scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))	1068	&& scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1087	{	1069	{
1088	want_refresh = 1;	1070	want_refresh = 1;
1089	refresh_check ();	1071	refresh_check ();
1090	}	1072	}
1091	else	1073	else
…		…
1110		1092
1111	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	1093	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1112	void	1094	void
1113	rxvt_term::slip_wheel_cb (ev::timer &w, int revents)	1095	rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1114	{	1096	{
1115	if (scr_changeview (view_start - mouse_slip_wheel_speed))	1097	if (scr_page (mouse_slip_wheel_speed))
1116	{	1098	{
1117	want_refresh = 1;	1099	want_refresh = 1;
1118	refresh_check ();	1100	refresh_check ();
1119	}	1101	}
1120		1102
…		…
1152	{	1134	{
1153	}	1135	}
1154	} event_handler;	1136	} event_handler;
1155	#endif	1137	#endif
1156		1138
		1139	/* make sure all the cmd data is at beginning of cmdbuf */
		1140	void
		1141	rxvt_term::cmdbuf_reify ()
		1142	{
		1143	if (cmdbuf_ptr == cmdbuf_base)
		1144	return;
		1145
		1146	ssize_t used = cmdbuf_endp - cmdbuf_ptr;
		1147
		1148	memmove (cmdbuf_base, cmdbuf_ptr, used);
		1149	cmdbuf_ptr = cmdbuf_base;
		1150	cmdbuf_endp = cmdbuf_ptr + used;
		1151
		1152	}
		1153
		1154	#if defined (KEYSYM_RESOURCE)
		1155	void
		1156	rxvt_term::cmdbuf_append (const char *str, size_t count)
		1157	{
		1158	cmdbuf_reify ();
		1159
		1160	size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
		1161
		1162	if (count > avail)
		1163	return;
		1164
		1165	memcpy (cmdbuf_endp, str, count);
		1166	cmdbuf_endp += count;
		1167
		1168	cmd_parse ();
		1169	}
		1170	#endif
		1171
1157	bool	1172	bool
1158	rxvt_term::pty_fill ()	1173	rxvt_term::pty_fill ()
1159	{	1174	{
1160	ssize_t n = cmdbuf_endp - cmdbuf_ptr;	1175	cmdbuf_reify ();
1161		1176
1162	if (CBUFSIZ == n)	1177	size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
		1178
		1179	if (!avail)
		1180	{
1163	n = 0; // normally this indicates a "too long" command sequence - just drop the data we have	1181	// normally this indicates a "too long" command sequence - just drop the data we have
1164
1165	memmove (cmdbuf_base, cmdbuf_ptr, n);
1166	cmdbuf_ptr = cmdbuf_base;	1182	cmdbuf_ptr = cmdbuf_base;
1167	cmdbuf_endp = cmdbuf_ptr + n;	1183	cmdbuf_endp = cmdbuf_ptr;
		1184	avail = CBUFSIZ;
		1185	}
1168		1186
1169	ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);	1187	ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1170		1188
1171	if (r > 0)	1189	if (r > 0)
1172	{	1190	{
1173	cmdbuf_endp += r;	1191	cmdbuf_endp += r;
1174	return true;	1192	return true;
…		…
1205	pty_write ();	1223	pty_write ();
1206		1224
1207	refresh_check ();	1225	refresh_check ();
1208	}	1226	}
1209		1227
1210	void	1228	void ecb_cold
1211	rxvt_term::pointer_unblank ()	1229	rxvt_term::pointer_unblank ()
1212	{	1230	{
1213	XDefineCursor (dpy, vt, TermWin_cursor);	1231	XDefineCursor (dpy, vt, TermWin_cursor);
1214	recolour_cursor ();	1232	recolour_cursor ();
1215		1233
…		…
1220	pointer_ev.start (pointerBlankDelay);	1238	pointer_ev.start (pointerBlankDelay);
1221	#endif	1239	#endif
1222	}	1240	}
1223		1241
1224	#ifdef POINTER_BLANK	1242	#ifdef POINTER_BLANK
1225	void	1243	void ecb_cold
1226	rxvt_term::pointer_blank ()	1244	rxvt_term::pointer_blank ()
1227	{	1245	{
1228	if (!option (Opt_pointerBlank))	1246	if (!option (Opt_pointerBlank))
1229	return;	1247	return;
1230		1248
…		…
1232	XFlush (dpy);	1250	XFlush (dpy);
1233		1251
1234	hidden_pointer = 1;	1252	hidden_pointer = 1;
1235	}	1253	}
1236		1254
1237	void	1255	void ecb_cold
1238	rxvt_term::pointer_cb (ev::timer &w, int revents)	1256	rxvt_term::pointer_cb (ev::timer &w, int revents)
1239	{	1257	{
1240	make_current ();	1258	make_current ();
1241		1259
1242	pointer_blank ();	1260	pointer_blank ();
…		…
1334	32 + x,	1352	32 + x,
1335	32 + y);	1353	32 + y);
1336	}	1354	}
1337		1355
1338	/*{{{ process an X event */	1356	/*{{{ process an X event */
1339	void	1357	void ecb_hot
1340	rxvt_term::x_cb (XEvent &ev)	1358	rxvt_term::x_cb (XEvent &ev)
1341	{	1359	{
1342	make_current ();	1360	make_current ();
1343		1361
1344	dLocal (Display *, dpy);	1362	dLocal (Display *, dpy);
…		…
1442	&& ev.xfocus.mode != NotifyGrab)	1460	&& ev.xfocus.mode != NotifyGrab)
1443	focus_out ();	1461	focus_out ();
1444	break;	1462	break;
1445		1463
1446	case ConfigureNotify:	1464	case ConfigureNotify:
1447	if (ev.xconfigure.window == parent[0])	1465	if (ev.xconfigure.window == parent)
1448	{	1466	{
1449	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))	1467	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1450	;	1468	;
1451		1469
		1470	bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
		1471
		1472	bool moved = false;
1452	#ifdef HAVE_BG_PIXMAP	1473	#ifdef HAVE_BG_PIXMAP
1453	bool moved = false;
1454	if (bg_window_position_sensitive ())	1474	if (bg_window_position_sensitive ())
1455	{	1475	{
		1476	want_position_change = true;
		1477	if (bg_img == 0)
		1478	moved = true;
		1479	}
		1480	#endif
		1481
		1482	if (want_position_change)
		1483	{
1456	int x, y;	1484	int x, y;
		1485
1457	if (ev.xconfigure.send_event)	1486	if (ev.xconfigure.send_event)
1458	{	1487	{
1459	x = ev.xconfigure.x;	1488	x = ev.xconfigure.x;
1460	y = ev.xconfigure.y;	1489	y = ev.xconfigure.y;
1461	}	1490	}
1462	else	1491	else
1463	get_window_origin (x, y);	1492	get_window_origin (x, y);
1464		1493
1465	if (bg_set_position (x, y)	1494	if (x != parent_x || y != parent_y)
1466	|| !(bg_flags & BG_IS_VALID))	1495	{
		1496	parent_x = x;
		1497	parent_y = y;
		1498	HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1467	moved = true;	1499	moved = true;
		1500	}
1468	}	1501	}
1469	#endif
1470		1502
1471	if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)	1503	if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1472	{	1504	{
1473	seen_resize = 1;	1505	seen_resize = 1;
1474	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1506	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1475	}	1507	}
1476	else	1508	else
1477	{	1509	{
1478	#ifdef HAVE_BG_PIXMAP	1510	#ifdef HAVE_BG_PIXMAP
1479	if (moved)	1511	if (moved)
1480	{
1481	if (mapped)
1482	update_background ();	1512	update_background ();
1483	else
1484	bg_invalidate ();
1485	}
1486	#endif	1513	#endif
1487	}	1514	}
1488		1515
1489	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));	1516	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1490	}	1517	}
…		…
1502	selection_send (ev.xselectionrequest);	1529	selection_send (ev.xselectionrequest);
1503	break;	1530	break;
1504		1531
1505	case MapNotify:	1532	case MapNotify:
1506	#ifdef HAVE_BG_PIXMAP	1533	#ifdef HAVE_BG_PIXMAP
1507	/* This is needed specifically to fix the case of no window manager or a	1534	// This is needed at startup for the case of no window manager
1508	* non-reparenting window manager. In those cases we never get first	1535	// or a non-reparenting window manager and also because we
1509	* ConfigureNotify. Also that speeds startup under normal WM, by taking	1536	// defer bg image updates if the window is not mapped. The
1510	* care of multiplicity of ConfigureNotify events arriving while WM does	1537	// short delay is to optimize for multiple ConfigureNotify
1511	* reparenting.	1538	// events at startup when the window manager reparents the
1512	* We should not render background immediately, as there could be several	1539	// window, so as to perform the computation after we have
1513	* ConfigureNotify's to follow. Lets take care of all of them in one scoop	1540	// received all of them.
1514	* by scheduling background redraw as soon as we can, but giving a short	1541	if (bg_img == 0)
1515	* bit of time for ConfigureNotifies to arrive.
1516	* We should render background PRIOR to drawing any text, but AFTER all
1517	* of ConfigureNotifys for the best results.
1518	*/
1519	if (!(bg_flags & BG_IS_VALID))
1520	update_background_ev.start (0.025);	1542	update_background_ev.start (0.025);
1521	#endif	1543	#endif
1522	mapped = 1;	1544	mapped = 1;
1523	#ifdef TEXT_BLINK	1545	#ifdef TEXT_BLINK
1524	text_blink_ev.start ();	1546	text_blink_ev.start ();
…		…
1564	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))	1586	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1565	;	1587	;
1566		1588
1567	if (scrollBar.state && ev.xany.window == scrollBar.win)	1589	if (scrollBar.state && ev.xany.window == scrollBar.win)
1568	{	1590	{
1569	scrollBar.state = STATE_IDLE;	1591	scrollBar.state = SB_STATE_IDLE;
1570	scrollBar.show (0);	1592	scrollBar.show (0);
1571	}	1593	}
1572	}	1594	}
1573	break;	1595	break;
1574		1596
…		…
1640	dist = int_bwidth - ev.xbutton.y;	1662	dist = int_bwidth - ev.xbutton.y;
1641	}	1663	}
1642	else	1664	else
1643	{	1665	{
1644	scroll_selection_dir = DN;	1666	scroll_selection_dir = DN;
1645	dist = ev.xbutton.y - (int_bwidth + height);	1667	dist = ev.xbutton.y - (int_bwidth + vt_height);
1646	}	1668	}
1647		1669
1648	scroll_selection_lines = Pixel2Height (dist)	1670	scroll_selection_lines = Pixel2Height (dist)
1649	/ SELECTION_SCROLL_LINE_SPEEDUP	1671	/ SELECTION_SCROLL_LINE_SPEEDUP
1650	+ 1;	1672	+ 1;
…		…
1662	#ifdef MOUSE_THRESHOLD	1684	#ifdef MOUSE_THRESHOLD
1663	}	1685	}
1664	#endif	1686	#endif
1665	}	1687	}
1666	}	1688	}
1667	else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)	1689	else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1668	{	1690	{
1669	while (XCheckTypedWindowEvent (dpy, scrollBar.win,	1691	while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1670	MotionNotify, &ev))	1692	MotionNotify, &ev))
1671	;	1693	;
1672		1694
1673	XQueryPointer (dpy, scrollBar.win,	1695	XQueryPointer (dpy, scrollBar.win,
1674	&unused_root, &unused_child,	1696	&unused_root, &unused_child,
1675	&unused_root_x, &unused_root_y,	1697	&unused_root_x, &unused_root_y,
1676	&ev.xbutton.x, &ev.xbutton.y,	1698	&ev.xbutton.x, &ev.xbutton.y,
1677	&unused_mask);	1699	&unused_mask);
1678	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1700	scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1679	scrollBar.size ());	1701	scrollBar.size ());
1680	want_refresh = 1;	1702	want_refresh = 1;
1681	scrollBar.show (1);	1703	scrollBar.show (1);
1682	}	1704	}
1683	break;	1705	break;
1684	}	1706	}
1685		1707
1686	#if defined(CURSOR_BLINK)	1708	#if defined(CURSOR_BLINK)
1687	if (option (Opt_cursorBlink) && ev.type == KeyPress)	1709	if (ev.type == KeyPress)
1688	{
1689	if (hidden_cursor)
1690	{
1691	hidden_cursor = 0;
1692	want_refresh = 1;
1693	}
1694
1695	cursor_blink_ev.again ();	1710	cursor_blink_reset ();
1696	}
1697	#endif	1711	#endif
1698		1712
1699	#if defined(POINTER_BLANK)	1713	#if defined(POINTER_BLANK)
1700	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)	1714	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1701	{	1715	{
…		…
1712		1726
1713	refresh_check ();	1727	refresh_check ();
1714	}	1728	}
1715		1729
1716	#if ENABLE_FRILLS	1730	#if ENABLE_FRILLS
1717	void	1731	void ecb_cold
1718	rxvt_term::set_urgency (bool enable)	1732	rxvt_term::set_urgency (bool enable)
1719	{	1733	{
1720	if (enable == urgency_hint)	1734	if (enable == urgency_hint)
1721	return;	1735	return;
1722		1736
1723	if (XWMHints *h = XGetWMHints (dpy, parent[0]))	1737	if (XWMHints *h = XGetWMHints (dpy, parent))
1724	{	1738	{
1725	h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);	1739	h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1726	XSetWMHints (dpy, parent[0], h);	1740	XSetWMHints (dpy, parent, h);
1727	urgency_hint = enable;	1741	urgency_hint = enable;
		1742	XFree (h);
1728	}	1743	}
1729	}	1744	}
1730	#endif	1745	#endif
1731		1746
1732	void	1747	void ecb_cold
1733	rxvt_term::focus_in ()	1748	rxvt_term::focus_in ()
1734	{	1749	{
1735	if (!focus)	1750	if (!focus)
1736	{	1751	{
1737	focus = 1;	1752	focus = 1;
1738	want_refresh = 1;	1753	want_refresh = 1;
1739		1754
1740	#if USE_XIM	1755	#if USE_XIM
1741	if (Input_Context != NULL)	1756	if (Input_Context != NULL)
1742	{	1757	{
1743	IMSetPosition ();	1758	im_set_position ();
1744	XSetICFocus (Input_Context);	1759	XSetICFocus (Input_Context);
1745	}	1760	}
1746	#endif	1761	#endif
1747	#if CURSOR_BLINK	1762	#if CURSOR_BLINK
1748	if (option (Opt_cursorBlink))	1763	if (option (Opt_cursorBlink))
…		…
1762		1777
1763	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));	1778	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1764	}	1779	}
1765	}	1780	}
1766		1781
1767	void	1782	void ecb_cold
1768	rxvt_term::focus_out ()	1783	rxvt_term::focus_out ()
1769	{	1784	{
1770	if (focus)	1785	if (focus)
1771	{	1786	{
1772	focus = 0;	1787	focus = 0;
…		…
1805		1820
1806	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));	1821	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1807	}	1822	}
1808	}	1823	}
1809		1824
1810	void	1825	void ecb_cold
1811	rxvt_term::update_fade_color (unsigned int idx)	1826	rxvt_term::update_fade_color (unsigned int idx)
1812	{	1827	{
1813	#if OFF_FOCUS_FADING	1828	#if OFF_FOCUS_FADING
1814	if (rs[Rs_fade])	1829	if (rs[Rs_fade])
1815	{	1830	{
…		…
1818	pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);	1833	pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1819	}	1834	}
1820	#endif	1835	#endif
1821	}	1836	}
1822		1837
1823	#if ENABLE_TRANSPARENCY || ENABLE_PERL	1838	#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1824	void	1839	void ecb_hot
1825	rxvt_term::rootwin_cb (XEvent &ev)	1840	rxvt_term::rootwin_cb (XEvent &ev)
1826	{	1841	{
1827	make_current ();	1842	make_current ();
1828		1843
1829	if (SHOULD_INVOKE (HOOK_ROOT_EVENT)	1844	if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1830	&& HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))	1845	&& HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1831	return;	1846	return;
1832		1847
1833	# if ENABLE_TRANSPARENCY
1834	switch (ev.type)	1848	switch (ev.type)
1835	{	1849	{
1836	case PropertyNotify:	1850	case PropertyNotify:
1837	/*	1851	/*
1838	* if user used some Esetroot compatible prog to set the root bg,	1852	* if user used some Esetroot compatible prog to set the root bg,
1839	* use the property to determine the pixmap. We use it later on.	1853	* use the property to determine the pixmap. We use it later on.
1840	*/	1854	*/
1841	if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]	1855	if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1842	|| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])	1856	|| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1843	{	1857	{
1844	bg_set_root_pixmap ();	1858	#if BG_IMAGE_FROM_ROOT
		1859	if (option (Opt_transparent))
		1860	{
		1861	rxvt_img::new_from_root (this)->replace (root_img);
1845	update_background ();	1862	update_background ();
		1863	}
		1864	#endif
		1865	HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1846	}	1866	}
1847		1867
1848	break;	1868	break;
1849	}	1869	}
1850	# endif
1851		1870
1852	refresh_check ();	1871	refresh_check ();
1853	}	1872	}
1854	#endif	1873	#endif
1855		1874
…		…
1979	if (scrollBar.upButton (ev.y))	1998	if (scrollBar.upButton (ev.y))
1980	direction = UP; /* up */	1999	direction = UP; /* up */
1981	else if (scrollBar.dnButton (ev.y))	2000	else if (scrollBar.dnButton (ev.y))
1982	direction = DN; /* down */	2001	direction = DN; /* down */
1983		2002
1984	scrollBar.state = STATE_IDLE;	2003	scrollBar.state = SB_STATE_IDLE;
1985	/*	2004	/*
1986	* Rxvt-style scrollbar:	2005	* Rxvt-style scrollbar:
1987	* move up if mouse is above slider	2006	* move up if mouse is above slider
1988	* move dn if mouse is below slider	2007	* move dn if mouse is below slider
1989	*	2008	*
…		…
2028	cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);	2047	cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2029	#endif	2048	#endif
2030	if (scr_page (direction, 1))	2049	if (scr_page (direction, 1))
2031	{	2050	{
2032	if (direction == UP)	2051	if (direction == UP)
2033	scrollBar.state = STATE_UP;	2052	scrollBar.state = SB_STATE_UP;
2034	else	2053	else
2035	scrollBar.state = STATE_DOWN;	2054	scrollBar.state = SB_STATE_DOWN;
2036	}	2055	}
2037	}	2056	}
2038	else	2057	else
2039	switch (ev.button)	2058	switch (ev.button)
2040	{	2059	{
2041	case Button2:	2060	case Button2:
2042	switch (scrollBar.align)	2061	switch (scrollBar.align)
2043	{	2062	{
2044	case R_SB_ALIGN_TOP:	2063	case SB_ALIGN_TOP:
2045	csrO = 0;	2064	csrO = 0;
2046	break;	2065	break;
2047	case R_SB_ALIGN_CENTRE:	2066	case SB_ALIGN_CENTRE:
2048	csrO = (scrollBar.bot - scrollBar.top) / 2;	2067	csrO = (scrollBar.bot - scrollBar.top) / 2;
2049	break;	2068	break;
2050	case R_SB_ALIGN_BOTTOM:	2069	case SB_ALIGN_BOTTOM:
2051	csrO = scrollBar.bot - scrollBar.top;	2070	csrO = scrollBar.bot - scrollBar.top;
2052	break;	2071	break;
2053	}	2072	}
2054		2073
2055	if (scrollBar.style == R_SB_XTERM	2074	if (scrollBar.style == SB_STYLE_XTERM
2056	|| scrollbar_above_slider (ev.y)	2075	|| scrollBar.above_slider (ev.y)
2057	|| scrollbar_below_slider (ev.y))	2076	|| scrollBar.below_slider (ev.y))
2058	scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());	2077	scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2059		2078
2060	scrollBar.state = STATE_MOTION;	2079	scrollBar.state = SB_STATE_MOTION;
2061	break;	2080	break;
2062		2081
2063	case Button1:	2082	case Button1:
2064	if (scrollBar.align == R_SB_ALIGN_CENTRE)	2083	if (scrollBar.align == SB_ALIGN_CENTRE)
2065	csrO = ev.y - scrollBar.top;	2084	csrO = ev.y - scrollBar.top;
2066	/* FALLTHROUGH */	2085	/* FALLTHROUGH */
2067		2086
2068	case Button3:	2087	case Button3:
2069	if (scrollBar.style != R_SB_XTERM)	2088	if (scrollBar.style != SB_STYLE_XTERM)
2070	{	2089	{
2071	if (scrollbar_above_slider (ev.y))	2090	if (scrollBar.above_slider (ev.y))
2072	# ifdef RXVT_SCROLL_FULL	2091	# ifdef RXVT_SCROLL_FULL
2073	scr_page (UP, nrow - 1);	2092	scr_page (UP, nrow - 1);
2074	# else	2093	# else
2075	scr_page (UP, nrow / 4);	2094	scr_page (UP, nrow / 4);
2076	# endif	2095	# endif
2077	else if (scrollbar_below_slider (ev.y))	2096	else if (scrollBar.below_slider (ev.y))
2078	# ifdef RXVT_SCROLL_FULL	2097	# ifdef RXVT_SCROLL_FULL
2079	scr_page (DN, nrow - 1);	2098	scr_page (DN, nrow - 1);
2080	# else	2099	# else
2081	scr_page (DN, nrow / 4);	2100	scr_page (DN, nrow / 4);
2082	# endif	2101	# endif
2083	else	2102	else
2084	scrollBar.state = STATE_MOTION;	2103	scrollBar.state = SB_STATE_MOTION;
2085	}	2104	}
2086	else	2105	else
2087	{	2106	{
2088	scr_page ((ev.button == Button1 ? DN : UP),	2107	scr_page ((ev.button == Button1 ? DN : UP),
2089	(nrow	2108	(nrow
2090	* scrollbar_position (ev.y)	2109	* scrollBar.position (ev.y)
2091	/ scrollBar.size ()));	2110	/ scrollBar.size ()));
2092	}	2111	}
2093		2112
2094	break;	2113	break;
2095	}	2114	}
…		…
2106		2125
2107	csrO = 0; /* reset csr Offset */	2126	csrO = 0; /* reset csr Offset */
2108	if (!bypass_keystate)	2127	if (!bypass_keystate)
2109	reportmode = !! (priv_modes & PrivMode_mouse_report);	2128	reportmode = !! (priv_modes & PrivMode_mouse_report);
2110		2129
2111	if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)	2130	if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2112	{	2131	{
2113	scrollBar.state = STATE_IDLE;	2132	scrollBar.state = SB_STATE_IDLE;
2114	scrollBar.show (0);	2133	scrollBar.show (0);
2115	}	2134	}
2116		2135
2117	#ifdef SELECTION_SCROLLING	2136	#ifdef SELECTION_SCROLLING
2118	sel_scroll_ev.stop();	2137	sel_scroll_ev.stop();
…		…
2168	case Button3:	2187	case Button3:
2169	selection_make (ev.time);	2188	selection_make (ev.time);
2170	break;	2189	break;
2171		2190
2172	case Button2:	2191	case Button2:
2173	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?	2192	if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2174	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);	2193	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2175	break;	2194	break;
2176		2195
2177	#ifdef MOUSE_WHEEL	2196	#ifdef MOUSE_WHEEL
2178	case Button4:	2197	case Button4:
2179	case Button5:	2198	case Button5:
2180	{	2199	{
2181	int i;	2200	int lines;
2182	page_dirn v;	2201	page_dirn dirn;
2183		2202
2184	v = ev.button == Button4 ? UP : DN;	2203	dirn = ev.button == Button4 ? UP : DN;
2185		2204
2186	if (ev.state & ShiftMask)	2205	if (ev.state & ShiftMask)
2187	i = 1;	2206	lines = 1;
2188	else if (option (Opt_mouseWheelScrollPage))	2207	else if (option (Opt_mouseWheelScrollPage))
2189	i = nrow - 1;	2208	lines = nrow - 1;
2190	else	2209	else
2191	i = 5;	2210	lines = 5;
2192		2211
2193	# ifdef MOUSE_SLIP_WHEELING	2212	# ifdef MOUSE_SLIP_WHEELING
2194	if (ev.state & ControlMask)	2213	if (ev.state & ControlMask)
2195	{	2214	{
2196	mouse_slip_wheel_speed += v ? -1 : 1;	2215	mouse_slip_wheel_speed += dirn;
2197	if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;	2216	clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2198	if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2199		2217
2200	if (!slip_wheel_ev.is_active ())	2218	if (!slip_wheel_ev.is_active ())
2201	slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);	2219	slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2202	}	2220	}
2203	else	2221	else
2204	# endif	2222	# endif
2205	{	2223	{
2206	scr_page (v, i);	2224	scr_page (dirn, lines);
2207	scrollBar.show (1);	2225	scrollBar.show (1);
2208	}	2226	}
2209	}	2227	}
2210	break;	2228	break;
2211	#endif	2229	#endif
…		…
2213	}	2231	}
2214	}	2232	}
2215		2233
2216	/*}}} */	2234	/*}}} */
2217		2235
2218	void	2236	void ecb_hot
2219	rxvt_term::cmd_parse ()	2237	rxvt_term::cmd_parse ()
2220	{	2238	{
2221	wchar_t ch = NOCHAR;	2239	wchar_t ch = NOCHAR;
2222	char *seq_begin; // remember start of esc-sequence here	2240	char *seq_begin; // remember start of esc-sequence here
2223		2241
2224	for (;;)	2242	for (;;)
2225	{	2243	{
2226	if (expect_false (ch == NOCHAR))	2244	if (ecb_unlikely (ch == NOCHAR))
2227	{	2245	{
2228	seq_begin = cmdbuf_ptr;	2246	seq_begin = cmdbuf_ptr;
2229	ch = next_char ();	2247	ch = next_char ();
2230		2248
2231	if (ch == NOCHAR)	2249	if (ch == NOCHAR)
2232	break;	2250	break;
2233	}	2251	}
2234		2252
2235	if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))	2253	if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2236	{	2254	{
2237	if (expect_false (!seen_input))	2255	if (ecb_unlikely (!seen_input))
2238	{	2256	{
2239	seen_input = 1;	2257	seen_input = 1;
2240	// many badly-written programs (e.g. jed) contain a race condition:	2258	// many badly-written programs (e.g. jed) contain a race condition:
2241	// they first read the screensize and then install a SIGWINCH handler.	2259	// they first read the screensize and then install a SIGWINCH handler.
2242	// some window managers resize the window early, and these programs	2260	// some window managers resize the window early, and these programs
…		…
2255	wchar_t *str = buf;	2273	wchar_t *str = buf;
2256	wchar_t *eol = str + min (ncol, UBUFSIZ);	2274	wchar_t *eol = str + min (ncol, UBUFSIZ);
2257		2275
2258	for (;;)	2276	for (;;)
2259	{	2277	{
2260	if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))	2278	if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2261	break;	2279	break;
2262		2280
2263	*str++ = ch;	2281	*str++ = ch;
2264		2282
2265	if (expect_false (ch == C0_LF || str >= eol))	2283	if (ecb_unlikely (ch == C0_LF || str >= eol))
2266	{	2284	{
2267	if (ch == C0_LF)	2285	if (ch == C0_LF)
2268	nlines++;	2286	nlines++;
2269		2287
2270	refresh_count++;	2288	refresh_count++;
…		…
2342	}	2360	}
2343	}	2361	}
2344	}	2362	}
2345		2363
2346	// read the next character	2364	// read the next character
2347	wchar_t	2365	wchar_t ecb_hot
2348	rxvt_term::next_char () NOTHROW	2366	rxvt_term::next_char () NOTHROW
2349	{	2367	{
2350	while (cmdbuf_ptr < cmdbuf_endp)	2368	while (cmdbuf_ptr < cmdbuf_endp)
2351	{	2369	{
2352	// assume 7-bit to be ascii ALWAYS	2370	// assume 7-bit to be ascii ALWAYS
2353	if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))	2371	if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2354	return *cmdbuf_ptr++;	2372	return *cmdbuf_ptr++;
2355		2373
2356	wchar_t wc;	2374	wchar_t wc;
2357	size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);	2375	size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2358		2376
…		…
2364	}	2382	}
2365		2383
2366	if (len == (size_t)-1)	2384	if (len == (size_t)-1)
2367	{	2385	{
2368	mbstate.reset (); // reset now undefined conversion state	2386	mbstate.reset (); // reset now undefined conversion state
		2387	// a -1 might indicate that a previous incomplete char is invalid (previous return -2)
		2388	// in which case we "erroneously" return the next byte which might be valid.
2369	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through	2389	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2370	}	2390	}
2371		2391
2372	// assume wchar == unicode	2392	// assume wchar == unicode
2373	cmdbuf_ptr += len;	2393	cmdbuf_ptr += len;
…		…
2376		2396
2377	return NOCHAR;	2397	return NOCHAR;
2378	}	2398	}
2379		2399
2380	// read the next octet	2400	// read the next octet
2381	uint32_t	2401	uint32_t ecb_hot
2382	rxvt_term::next_octet () NOTHROW	2402	rxvt_term::next_octet () NOTHROW
2383	{	2403	{
2384	return cmdbuf_ptr < cmdbuf_endp	2404	return cmdbuf_ptr < cmdbuf_endp
2385	? (unsigned char)*cmdbuf_ptr++	2405	? (unsigned char)*cmdbuf_ptr++
2386	: NOCHAR;	2406	: NOCHAR;
2387	}	2407	}
2388		2408
2389	static class out_of_input out_of_input;	2409	static class out_of_input out_of_input;
2390		2410
2391	/* rxvt_cmd_getc () - Return next input character */	2411	wchar_t ecb_hot
2392	/*
2393	* Return the next input character after first passing any keyboard input
2394	* to the command.
2395	*/
2396	wchar_t
2397	rxvt_term::cmd_getc () THROW ((class out_of_input))	2412	rxvt_term::cmd_getc () THROW ((class out_of_input))
2398	{	2413	{
2399	wchar_t c = next_char ();	2414	wchar_t c = next_char ();
2400		2415
2401	if (c == NOCHAR)	2416	if (c == NOCHAR)
2402	throw out_of_input;	2417	throw out_of_input;
2403		2418
2404	return c;	2419	return c;
2405	}	2420	}
2406		2421
2407	uint32_t	2422	uint32_t ecb_hot
2408	rxvt_term::cmd_get8 () THROW ((class out_of_input))	2423	rxvt_term::cmd_get8 () THROW ((class out_of_input))
2409	{	2424	{
2410	uint32_t c = next_octet ();	2425	uint32_t c = next_octet ();
2411		2426
2412	if (c == NOCHAR)	2427	if (c == NOCHAR)
…		…
2416	}	2431	}
2417		2432
2418	/*{{{ print pipe */	2433	/*{{{ print pipe */
2419	/*----------------------------------------------------------------------*/	2434	/*----------------------------------------------------------------------*/
2420	#ifdef PRINTPIPE	2435	#ifdef PRINTPIPE
2421	FILE *	2436	FILE * ecb_cold
2422	rxvt_term::popen_printer ()	2437	rxvt_term::popen_printer ()
2423	{	2438	{
2424	FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");	2439	FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2425		2440
2426	if (stream == NULL)	2441	if (stream == NULL)
2427	rxvt_warn ("can't open printer pipe, not printing.\n");	2442	rxvt_warn ("can't open printer pipe, not printing.\n");
2428		2443
2429	return stream;	2444	return stream;
2430	}	2445	}
2431		2446
2432	int	2447	int ecb_cold
2433	rxvt_term::pclose_printer (FILE *stream)	2448	rxvt_term::pclose_printer (FILE *stream)
2434	{	2449	{
2435	fflush (stream);	2450	fflush (stream);
2436	return pclose (stream);	2451	return pclose (stream);
2437	}	2452	}
2438		2453
2439	/*	2454	/*
2440	* simulate attached vt100 printer	2455	* simulate attached vt100 printer
2441	*/	2456	*/
2442	void	2457	void ecb_cold
2443	rxvt_term::process_print_pipe ()	2458	rxvt_term::process_print_pipe ()
2444	{	2459	{
2445	FILE *fd = popen_printer ();	2460	FILE *fd = popen_printer ();
2446		2461
2447	if (!fd)	2462	if (!fd)
…		…
2493	pclose_printer (fd);	2508	pclose_printer (fd);
2494	}	2509	}
2495	#endif /* PRINTPIPE */	2510	#endif /* PRINTPIPE */
2496	/*}}} */	2511	/*}}} */
2497		2512
2498	/* *INDENT-OFF* */
2499	enum {	2513	enum {
2500	C1_40 = 0x40,	2514	C1_40 = 0x40,
2501	C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,	2515	C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2502	C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,	2516	C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2503	C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,	2517	C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2504	C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,	2518	C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2505	};	2519	};
2506	/* *INDENT-ON* */
2507		2520
2508	/*{{{ process non-printing single characters */	2521	/*{{{ process non-printing single characters */
2509	void	2522	void ecb_hot
2510	rxvt_term::process_nonprinting (unicode_t ch)	2523	rxvt_term::process_nonprinting (unicode_t ch)
2511	{	2524	{
2512	switch (ch)	2525	switch (ch)
2513	{	2526	{
2514	case C0_ESC:	2527	case C0_ESC:
…		…
2560	}	2573	}
2561	/*}}} */	2574	/*}}} */
2562		2575
2563		2576
2564	/*{{{ process VT52 escape sequences */	2577	/*{{{ process VT52 escape sequences */
2565	void	2578	void ecb_cold
2566	rxvt_term::process_escape_vt52 (unicode_t ch)	2579	rxvt_term::process_escape_vt52 (unicode_t ch)
2567	{	2580	{
2568	int row, col;	2581	int row, col;
2569		2582
2570	switch (ch)	2583	switch (ch)
…		…
2604	break;	2617	break;
2605	case 'Z': /* identify the terminal type */	2618	case 'Z': /* identify the terminal type */
2606	tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */	2619	tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2607	break;	2620	break;
2608	case '<': /* turn off VT52 mode */	2621	case '<': /* turn off VT52 mode */
2609	set_privmode (PrivMode_vt52, 0);	2622	priv_modes &= ~PrivMode_vt52;
2610	break;	2623	break;
2611	case 'F': /* use special graphics character set */	2624	case 'F': /* use special graphics character set */
2612	case 'G': /* use regular character set */	2625	case 'G': /* use regular character set */
2613	/* unimplemented */	2626	/* unimplemented */
2614	break;	2627	break;
…		…
2620	}	2633	}
2621	/*}}} */	2634	/*}}} */
2622		2635
2623		2636
2624	/*{{{ process escape sequences */	2637	/*{{{ process escape sequences */
2625	void	2638	void ecb_hot
2626	rxvt_term::process_escape_seq ()	2639	rxvt_term::process_escape_seq ()
2627	{	2640	{
2628	unicode_t ch = cmd_getc ();	2641	unicode_t ch = cmd_getc ();
2629		2642
2630	if (priv_modes & PrivMode_vt52)	2643	if (priv_modes & PrivMode_vt52)
…		…
2633	return;	2646	return;
2634	}	2647	}
2635		2648
2636	switch (ch)	2649	switch (ch)
2637	{	2650	{
2638	/* case 1: do_tek_mode (); break; */
2639	case '#':	2651	case '#':
2640	if (cmd_getc () == '8')	2652	if (cmd_getc () == '8')
2641	scr_E ();	2653	scr_E ();
2642	break;	2654	break;
2643	case '(':	2655	case '(':
…		…
2666	#if !ENABLE_MINIMAL	2678	#if !ENABLE_MINIMAL
2667	case '9':	2679	case '9':
2668	scr_forwardindex ();	2680	scr_forwardindex ();
2669	break;	2681	break;
2670	#endif	2682	#endif
		2683	// DECPAM/DECPNM
2671	case '=':	2684	case '=':
		2685	priv_modes |= PrivMode_aplKP;
		2686	break;
2672	case '>':	2687	case '>':
2673	set_privmode (PrivMode_aplKP, ch == '=');	2688	priv_modes &= ~PrivMode_aplKP;
2674	break;	2689	break;
2675		2690
2676	case C1_40:	2691	case C1_40:
2677	cmd_getc ();	2692	cmd_getc ();
2678	break;	2693	break;
…		…
2682		2697
2683	/* 8.3.87: NEXT LINE */	2698	/* 8.3.87: NEXT LINE */
2684	case C1_NEL: /* ESC E */	2699	case C1_NEL: /* ESC E */
2685	{	2700	{
2686	wchar_t nlcr[] = { C0_LF, C0_CR };	2701	wchar_t nlcr[] = { C0_LF, C0_CR };
2687	scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);	2702	scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2688	}	2703	}
2689	break;	2704	break;
2690		2705
2691	/* kidnapped escape sequence: Should be 8.3.48 */	2706	/* kidnapped escape sequence: Should be 8.3.48 */
2692	case C1_ESA: /* ESC G */	2707	case C1_ESA: /* ESC G */
…		…
2704	case C1_RI: /* ESC M */	2719	case C1_RI: /* ESC M */
2705	scr_index (DN);	2720	scr_index (DN);
2706	break;	2721	break;
2707		2722
2708	/* 8.3.142: SINGLE-SHIFT TWO */	2723	/* 8.3.142: SINGLE-SHIFT TWO */
2709	/*case C1_SS2: scr_single_shift (2); break; */	2724	/* case C1_SS2: break; */
2710		2725
2711	/* 8.3.143: SINGLE-SHIFT THREE */	2726	/* 8.3.143: SINGLE-SHIFT THREE */
2712	/*case C1_SS3: scr_single_shift (3); break; */	2727	/* case C1_SS3: break; */
2713		2728
2714	/* 8.3.27: DEVICE CONTROL STRING */	2729	/* 8.3.27: DEVICE CONTROL STRING */
2715	case C1_DCS: /* ESC P */	2730	case C1_DCS: /* ESC P */
2716	process_dcs_seq ();	2731	process_dcs_seq ();
2717	break;	2732	break;
…		…
2750	}	2765	}
2751	}	2766	}
2752	/*}}} */	2767	/*}}} */
2753		2768
2754	/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */	2769	/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2755	/* *INDENT-OFF* */
2756	enum {	2770	enum {
2757	CSI_ICH = 0x40,	2771	CSI_ICH = 0x40,
2758	CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,	2772	CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2759	CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,	2773	CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2760	CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,	2774	CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
…		…
2780	make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */	2794	make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2781	make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */	2795	make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2782	make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */	2796	make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2783	make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */	2797	make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2784	};	2798	};
2785	/* *INDENT-ON* */
2786		2799
2787	void	2800	void ecb_hot
2788	rxvt_term::process_csi_seq ()	2801	rxvt_term::process_csi_seq ()
2789	{	2802	{
2790	unicode_t ch, priv, i;	2803	unicode_t ch, priv, prev_ch, i;
2791	unsigned int nargs, p;	2804	unsigned int nargs, p;
2792	int n, ndef;	2805	int n, ndef;
2793	int arg[ESC_ARGS] = { };	2806	int arg[ESC_ARGS] = { };
2794		2807
2795	nargs = 0;	2808	nargs = 0;
…		…
2801	/* '<' '=' '>' '?' '!' */	2814	/* '<' '=' '>' '?' '!' */
2802	priv = ch;	2815	priv = ch;
2803	ch = cmd_getc ();	2816	ch = cmd_getc ();
2804	}	2817	}
2805		2818
		2819	prev_ch = 0;
2806	/* read any numerical arguments */	2820	/* read any numerical arguments */
2807	for (n = -1; ch < CSI_ICH; )	2821	for (n = -1; ch < CSI_ICH; )
2808	{	2822	{
2809	if (isdigit (ch))	2823	if (isdigit (ch))
2810	{	2824	{
…		…
2820	n = -1;	2834	n = -1;
2821	}	2835	}
2822	else if (IS_CONTROL (ch))	2836	else if (IS_CONTROL (ch))
2823	process_nonprinting (ch);	2837	process_nonprinting (ch);
2824		2838
		2839	prev_ch = ch;
2825	ch = cmd_getc ();	2840	ch = cmd_getc ();
2826	}	2841	}
2827		2842
2828	if (ch > CSI_7F)	2843	if (ch > CSI_7F)
2829	return;	2844	return;
…		…
2870	scr_soft_reset ();	2885	scr_soft_reset ();
2871		2886
2872	static const int pm_h[] = { 7, 25 };	2887	static const int pm_h[] = { 7, 25 };
2873	static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };	2888	static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2874		2889
2875	process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h);	2890	process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2876	process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l);	2891	process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2877	}	2892	}
2878	break;	2893	break;
2879	}	2894	}
2880		2895
2881	return;	2896	return;
…		…
2899	}	2914	}
2900	break;	2915	break;
2901	#endif	2916	#endif
2902		2917
2903	case CSI_CUU: /* 8.3.22: (1) CURSOR UP */	2918	case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2904	case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */	2919	case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2905	arg[0] = -arg[0];	2920	arg[0] = -arg[0];
2906	/* FALLTHROUGH */	2921	/* FALLTHROUGH */
2907	case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */	2922	case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2908	case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */	2923	case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2909	scr_gotorc (arg[0], 0, RELATIVE);	2924	scr_gotorc (arg[0], 0, RELATIVE);
2910	break;	2925	break;
2911		2926
2912	case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */	2927	case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2913	case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */	2928	case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
…		…
3063	scr_insert_mode (1);	3078	scr_insert_mode (1);
3064	else if (arg[0] == 20)	3079	else if (arg[0] == 20)
3065	priv_modes |= PrivMode_LFNL;	3080	priv_modes |= PrivMode_LFNL;
3066	break;	3081	break;
3067		3082
		3083	case CSI_71: // DESCUSR: set cursor style
		3084	if (prev_ch == ' ')
		3085	set_cursor_style (arg[0]);
		3086	break;
		3087
3068	/*	3088	/*
3069	* PRIVATE USE beyond this point. All CSI_7? sequences here	3089	* PRIVATE USE beyond this point. All CSI_7? sequences here
3070	*/	3090	*/
3071	case CSI_72: /* DECSTBM: set top and bottom margins */	3091	case CSI_72: /* DECSTBM: set top and bottom margins */
3072	if (nargs == 1)	3092	if (nargs == 1)
…		…
3100	}	3120	}
3101	}	3121	}
3102	/*}}} */	3122	/*}}} */
3103		3123
3104	#if !ENABLE_MINIMAL	3124	#if !ENABLE_MINIMAL
3105	/* ARGSUSED */
3106	void	3125	void
3107	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3126	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3108	{	3127	{
3109	int x, y;	3128	int x, y;
3110	XWindowAttributes wattr;	3129	XWindowAttributes wattr;
…		…
3119	{	3138	{
3120	/*	3139	/*
3121	* commands	3140	* commands
3122	*/	3141	*/
3123	case 1: /* deiconify window */	3142	case 1: /* deiconify window */
3124	XMapWindow (dpy, parent[0]);	3143	XMapWindow (dpy, parent);
3125	break;	3144	break;
3126	case 2: /* iconify window */	3145	case 2: /* iconify window */
3127	XIconifyWindow (dpy, parent[0], display->screen);	3146	XIconifyWindow (dpy, parent, display->screen);
3128	break;	3147	break;
3129	case 3: /* set position (pixels) */	3148	case 3: /* set position (pixels) */
3130	XMoveWindow (dpy, parent[0], args[1], args[2]);	3149	XMoveWindow (dpy, parent, args[1], args[2]);
3131	break;	3150	break;
3132	case 4: /* set size (pixels) */	3151	case 4: /* set size (pixels) */
3133	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3152	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3134	break;	3153	break;
3135	case 5: /* raise window */	3154	case 5: /* raise window */
3136	XRaiseWindow (dpy, parent[0]);	3155	XRaiseWindow (dpy, parent);
3137	break;	3156	break;
3138	case 6: /* lower window */	3157	case 6: /* lower window */
3139	XLowerWindow (dpy, parent[0]);	3158	XLowerWindow (dpy, parent);
3140	break;	3159	break;
3141	case 7: /* refresh window */	3160	case 7: /* refresh window */
3142	scr_touch (true);	3161	scr_touch (true);
3143	break;	3162	break;
3144	case 8: /* set size (chars) */	3163	case 8: /* set size (chars) */
…		…
3147	break;	3166	break;
3148		3167
3149	//case 9: NYI, TODO, restore maximized window or maximize window	3168	//case 9: NYI, TODO, restore maximized window or maximize window
3150	default:	3169	default:
3151	if (args[0] >= 24) /* set height (chars) */	3170	if (args[0] >= 24) /* set height (chars) */
3152	set_widthheight ((unsigned int)width,	3171	set_widthheight ((unsigned int)vt_width,
3153	(unsigned int) (args[1] * fheight));	3172	(unsigned int) (args[1] * fheight));
3154	break;	3173	break;
3155		3174
3156	/*	3175	/*
3157	* reports - some output format copied from XTerm	3176	* reports - some output format copied from XTerm
3158	*/	3177	*/
3159	case 11: /* report window state */	3178	case 11: /* report window state */
3160	XGetWindowAttributes (dpy, parent[0], &wattr);	3179	XGetWindowAttributes (dpy, parent, &wattr);
3161	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3180	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3162	break;	3181	break;
3163	case 13: /* report window position */	3182	case 13: /* report window position */
3164	XGetWindowAttributes (dpy, parent[0], &wattr);	3183	XGetWindowAttributes (dpy, parent, &wattr);
3165	XTranslateCoordinates (dpy, parent[0], wattr.root,	3184	XTranslateCoordinates (dpy, parent, wattr.root,
3166	-wattr.border_width, -wattr.border_width,	3185	-wattr.border_width, -wattr.border_width,
3167	&x, &y, &wdummy);	3186	&x, &y, &wdummy);
3168	tt_printf ("\033[3;%d;%dt", x, y);	3187	tt_printf ("\033[3;%d;%dt", x, y);
3169	break;	3188	break;
3170	case 14: /* report window size (pixels) */	3189	case 14: /* report window size (pixels) */
3171	XGetWindowAttributes (dpy, parent[0], &wattr);	3190	XGetWindowAttributes (dpy, parent, &wattr);
3172	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3191	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3173	break;	3192	break;
3174	case 18: /* report text area size (chars) */	3193	case 18: /* report text area size (chars) */
3175	tt_printf ("\033[8;%d;%dt", nrow, ncol);	3194	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3176	break;	3195	break;
…		…
3178	tt_printf ("\033[9;%d;%dt", nrow, ncol);	3197	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3179	break;	3198	break;
3180	case 20: /* report icon label */	3199	case 20: /* report icon label */
3181	{	3200	{
3182	char *s;	3201	char *s;
3183	XGetIconName (dpy, parent[0], &s);	3202	XGetIconName (dpy, parent, &s);
3184	tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */	3203	tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3185	XFree (s);	3204	XFree (s);
3186	}	3205	}
3187	break;	3206	break;
3188	case 21: /* report window title */	3207	case 21: /* report window title */
3189	{	3208	{
3190	char *s;	3209	char *s;
3191	XFetchName (dpy, parent[0], &s);	3210	XFetchName (dpy, parent, &s);
3192	tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */	3211	tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3193	XFree (s);	3212	XFree (s);
3194	}	3213	}
3195	break;	3214	break;
3196	}	3215	}
…		…
3350	unsigned long bytes_after;	3369	unsigned long bytes_after;
3351	unsigned char *value = 0;	3370	unsigned char *value = 0;
3352	const char *str = "";	3371	const char *str = "";
3353		3372
3354	if (prop	3373	if (prop
3355	&& XGetWindowProperty (dpy, parent[0],	3374	&& XGetWindowProperty (dpy, parent,
3356	prop, 0, 1<<16, 0, AnyPropertyType,	3375	prop, 0, 1<<16, 0, AnyPropertyType,
3357	&actual_type, &actual_format,	3376	&actual_type, &actual_format,
3358	&nitems, &bytes_after, &value) == Success	3377	&nitems, &bytes_after, &value) == Success
3359	&& actual_type != None	3378	&& actual_type != None
3360	&& actual_format == 8)	3379	&& actual_format == 8)
…		…
3372	{	3391	{
3373	*eq = 0;	3392	*eq = 0;
3374	set_utf8_property (display->atom (str), eq + 1);	3393	set_utf8_property (display->atom (str), eq + 1);
3375	}	3394	}
3376	else	3395	else
3377	XDeleteProperty (dpy, parent[0],	3396	XDeleteProperty (dpy, parent,
3378	display->atom (str));	3397	display->atom (str));
3379	}	3398	}
3380	break;	3399	break;
3381		3400
3382	case XTerm_Color:	3401	case XTerm_Color:
…		…
3436	break;	3455	break;
3437	#endif	3456	#endif
3438	case URxvt_Color_border:	3457	case URxvt_Color_border:
3439	process_color_seq (op, Color_border, str, resp);	3458	process_color_seq (op, Color_border, str, resp);
3440	break;	3459	break;
3441	#if ENABLE_TRANSPARENCY	3460
		3461	#if BG_IMAGE_FROM_ROOT
3442	case URxvt_Color_tint:	3462	case URxvt_Color_tint:
3443	process_color_seq (op, Color_tint, str, resp);	3463	process_color_seq (op, Color_tint, str, resp);
3444	{	3464	{
3445	bool changed = false;	3465	bool changed = false;
3446		3466
3447	if (ISSET_PIXCOLOR (Color_tint))	3467	if (ISSET_PIXCOLOR (Color_tint))
3448	changed = bg_set_tint (pix_colors_focused [Color_tint]);	3468	changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3449		3469
3450	if (changed)	3470	if (changed)
3451	update_background ();	3471	update_background ();
3452	}	3472	}
3453		3473
…		…
3457	#if BG_IMAGE_FROM_FILE	3477	#if BG_IMAGE_FROM_FILE
3458	case Rxvt_Pixmap:	3478	case Rxvt_Pixmap:
3459	if (!strcmp (str, "?"))	3479	if (!strcmp (str, "?"))
3460	{	3480	{
3461	char str[256];	3481	char str[256];
		3482	int h_scale = fimage.h_scale;
		3483	int v_scale = fimage.v_scale;
		3484	int h_align = fimage.h_align;
		3485	int v_align = fimage.v_align;
3462		3486
3463	sprintf (str, "[%dx%d+%d+%d]",	3487	sprintf (str, "[%dx%d+%d+%d]",
3464	min (h_scale, 32767), min (v_scale, 32767),	3488	h_scale, v_scale,
3465	min (h_align, 32767), min (v_align, 32767));	3489	h_align, v_align);
3466	process_xterm_seq (XTerm_title, str, CHAR_ST);	3490	process_xterm_seq (XTerm_title, str, CHAR_ST);
3467	}	3491	}
3468	else	3492	else
3469	{	3493	{
3470	int changed = 0;	3494	bool changed = false;
3471		3495
3472	if (*str != ';')	3496	if (*str != ';')
3473	{	3497	{
3474	if (bg_set_file (str)) /* change pixmap */	3498	try
3475	{	3499	{
		3500	fimage.set_file_geometry (this, str);
3476	changed++;	3501	changed = true;
3477	str = strchr (str, ';');
3478	if (str == NULL)
3479	bg_set_default_geometry ();
3480	else	3502	}
3481	bg_set_geometry (str+1);	3503	catch (const class rxvt_failure_exception &e)
		3504	{
3482	}	3505	}
3483	}	3506	}
3484	else	3507	else
3485	{	3508	{
3486	str++;	3509	str++;
3487	if (bg_set_geometry (str, true))	3510	if (fimage.set_geometry (str, true))
3488	changed++;	3511	changed = true;
3489	}	3512	}
3490		3513
3491	if (changed)	3514	if (changed)
3492	{	3515	{
3493	if (bg_window_position_sensitive ())	3516	if (bg_window_position_sensitive ())
3494	{	3517	{
3495	int x, y;	3518	int x, y;
3496	get_window_origin (x, y);	3519	get_window_origin (x, y);
3497	bg_set_position (x, y);	3520	parent_x = x;
		3521	parent_y = y;
3498	}	3522	}
3499	update_background ();	3523	update_background ();
3500	}	3524	}
3501	}	3525	}
3502	break;	3526	break;
…		…
3592	* 's' = save	3616	* 's' = save
3593	* 'r' = restore	3617	* 'r' = restore
3594	* 't' = toggle	3618	* 't' = toggle
3595	* so no need for fancy checking	3619	* so no need for fancy checking
3596	*/	3620	*/
3597	int	3621	int ecb_cold
3598	rxvt_term::privcases (int mode, unsigned long bit)	3622	rxvt_term::privcases (int mode, unsigned long bit)
3599	{	3623	{
3600	int state;	3624	int state;
3601		3625
3602	if (mode == 's')	3626	if (mode == 's')
3603	{	3627	{
3604	SavedModes |= (priv_modes & bit);	3628	if (priv_modes & bit)
		3629	SavedModes |= bit;
		3630	else
		3631	SavedModes &= ~bit;
3605	return -1;	3632	return -1;
3606	}	3633	}
3607	else	3634	else
3608	{	3635	{
3609	if (mode == 'r')	3636	if (mode == 'r')
3610	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */	3637	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3611	else	3638	else
3612	state = (mode == 't') ? ! (priv_modes & bit) : mode;	3639	state = (mode == 't') ? ! (priv_modes & bit) : mode;
3613		3640
3614	set_privmode (bit, state);	3641	if (state)
		3642	priv_modes |= bit;
		3643	else
		3644	priv_modes &= ~bit;
3615	}	3645	}
3616		3646
3617	return state;	3647	return state;
3618	}	3648	}
3619		3649
3620	/* we're not using priv _yet_ */	3650	/* we're not using priv _yet_ */
3621	void	3651	void
3622	rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)	3652	rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3623	{	3653	{
3624	unsigned int i, j;	3654	unsigned int i, j;
3625	int state;	3655	int state;
3626		3656
3627	static const struct	3657	static const struct
3628	{	3658	{
3629	const int argval;	3659	const int argval;
3630	const unsigned long bit;	3660	const unsigned long bit;
3631	} argtopriv[] = {	3661	} argtopriv[] = {
3632	{ 1, PrivMode_aplCUR }, // DECCKM	3662	{ 1, PrivMode_aplCUR }, // DECCKM
3633	{ 2, PrivMode_vt52 },	3663	{ 2, PrivMode_vt52 }, // DECANM
3634	{ 3, PrivMode_132 }, // DECCOLM	3664	{ 3, PrivMode_132 }, // DECCOLM
3635	{ 4, PrivMode_smoothScroll }, // DECSCLM	3665	{ 4, PrivMode_smoothScroll }, // DECSCLM
3636	{ 5, PrivMode_rVideo }, // DECSCNM	3666	{ 5, PrivMode_rVideo }, // DECSCNM
3637	{ 6, PrivMode_relOrigin }, // DECOM	3667	{ 6, PrivMode_relOrigin }, // DECOM
3638	{ 7, PrivMode_Autowrap }, // DECAWM	3668	{ 7, PrivMode_Autowrap }, // DECAWM
3639	// 8, auto-repeat keys // DECARM	3669	// 8, auto-repeat keys // DECARM
3640	{ 9, PrivMode_MouseX10 },	3670	{ 9, PrivMode_MouseX10 },
3641	// 18 end FF to printer after print screen	3671	// 18 end FF to printer after print screen
3642	// 19 Print screen prints full screen/scroll region	3672	// 19 Print screen prints full screen/scroll region
3643	{ 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis	3673	{ 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3644	#ifdef scrollBar_esc	3674	#ifdef scrollBar_esc
3645	{ scrollBar_esc, PrivMode_scrollBar },	3675	{ scrollBar_esc, PrivMode_scrollBar },
3646	#endif	3676	#endif
3647	{ 35, PrivMode_ShiftKeys }, // rxvt extension	3677	{ 35, PrivMode_ShiftKeys }, // rxvt extension
3648	// 38, tektronix mode // DECTEK	3678	// 38, tektronix mode // DECTEK
3649	{ 40, PrivMode_132OK },	3679	{ 40, PrivMode_132OK },
3650	// 41 xterm more fixes NYI	3680	// 41 xterm more fixes NYI
3651	// 45 margin bell NYI	3681	// 45 margin bell NYI
3652	// 46 start logging	3682	// 46 start logging
3653	{ 47, PrivMode_Screen },	3683	{ 47, PrivMode_Screen },
3654	{ 66, PrivMode_aplKP }, // DECPAM/DECPNM	3684	{ 66, PrivMode_aplKP }, // DECNKM
3655	#ifndef NO_BACKSPACE_KEY	3685	#ifndef NO_BACKSPACE_KEY
3656	{ 67, PrivMode_BackSpace }, // DECBKM	3686	{ 67, PrivMode_BackSpace }, // DECBKM
3657	#endif	3687	#endif
3658	{ 1000, PrivMode_MouseX11 },	3688	{ 1000, PrivMode_MouseX11 },
3659	{ 1002, PrivMode_MouseBtnEvent },	3689	{ 1002, PrivMode_MouseBtnEvent },
…		…
3688	for (i = 0; i < nargs; i++)	3718	for (i = 0; i < nargs; i++)
3689	{	3719	{
3690	state = -1;	3720	state = -1;
3691		3721
3692	/* basic handling */	3722	/* basic handling */
3693	for (j = 0; j < ARRAY_LENGTH(argtopriv); j++)	3723	for (j = 0; j < ecb_array_length (argtopriv); j++)
3694	if (argtopriv[j].argval == arg[i])	3724	if (argtopriv[j].argval == arg[i])
3695	{	3725	{
3696	state = privcases (mode, argtopriv[j].bit);	3726	state = privcases (mode, argtopriv[j].bit);
3697	break;	3727	break;
3698	}	3728	}
…		…
3724	case 2: /* VT52 mode */	3754	case 2: /* VT52 mode */
3725	/* oddball mode. should be set regardless of set/reset	3755	/* oddball mode. should be set regardless of set/reset
3726	* parameter. Return from VT52 mode with an ESC < from	3756	* parameter. Return from VT52 mode with an ESC < from
3727	* within VT52 mode	3757	* within VT52 mode
3728	*/	3758	*/
3729	set_privmode (PrivMode_vt52, 1);	3759	priv_modes |= PrivMode_vt52;
3730	break;	3760	break;
3731	case 3: /* 80/132 */	3761	case 3: /* 80/132 */
3732	if (priv_modes & PrivMode_132OK)	3762	if (priv_modes & PrivMode_132OK)
3733	set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);	3763	set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3734	break;	3764	break;
…		…
3749	if (state) /* orthogonal */	3779	if (state) /* orthogonal */
3750	priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);	3780	priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3751	break;	3781	break;
3752	#ifdef scrollBar_esc	3782	#ifdef scrollBar_esc
3753	case scrollBar_esc:	3783	case scrollBar_esc:
3754	if (scrollBar.map (state))	3784	scrollBar.map (state);
3755	{
3756	resize_all_windows (0, 0, 0);	3785	resize_all_windows (0, 0, 0);
3757	scr_touch (true);	3786	scr_touch (true);
3758	}
3759	break;	3787	break;
3760	#endif	3788	#endif
3761	case 25: /* visible/invisible cursor */	3789	case 25: /* visible/invisible cursor */
3762	scr_cursor_visible (state);	3790	scr_cursor_visible (state);
3763	break;	3791	break;
…		…
3818	}	3846	}
3819	}	3847	}
3820	/*}}} */	3848	/*}}} */
3821		3849
3822	/*{{{ process sgr sequences */	3850	/*{{{ process sgr sequences */
3823	void	3851	void ecb_hot
3824	rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)	3852	rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3825	{	3853	{
3826	unsigned int i;	3854	unsigned int i;
3827	short rendset;	3855	short rendset;
3828	int rendstyle;	3856	int rendstyle;
…		…
3969	break;	3997	break;
3970	#endif	3998	#endif
3971	}	3999	}
3972	}	4000	}
3973	}	4001	}
		4002
		4003	void
		4004	rxvt_term::set_cursor_style (int style)
		4005	{
		4006	if (!IN_RANGE_INC (style, 0, 4))
		4007	return;
		4008
		4009	set_option (Opt_cursorUnderline, style >= 3);
		4010
		4011	#ifdef CURSOR_BLINK
		4012	set_option (Opt_cursorBlink, !style || (style & 1));
		4013	cursor_blink_reset ();
		4014	#endif
		4015
		4016	want_refresh = 1;
		4017	}
3974	/*}}} */	4018	/*}}} */
3975		4019
3976	/* ------------------------------------------------------------------------- */	4020	/* ------------------------------------------------------------------------- */
3977		4021
3978	/*	4022	/*

Diff Legend

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