[ViewVC] Diff of: cvs/rxvt-unicode/src/command.C

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.460 by sf-exg, Fri Nov 19 23:29:30 2010 UTC vs.
Revision 1.535 by root, Wed Mar 27 17:24:15 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-2007 Marc Lehmann <pcg@goof.com>	30	* Copyright (c) 2003-2011 Marc Lehmann <schmorp@schmorp.de>
31	* Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>	31	* Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
32	*	32	*
33	* This program is free software; you can redistribute it and/or modify	33	* This program is free software; you can redistribute it and/or modify
34	* it under the terms of the GNU General Public License as published by	34	* it under the terms of the GNU General Public License as published by
35	* the Free Software Foundation; either version 2 of the License, or	35	* the Free Software Foundation; either version 2 of the License, or
…		…
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
…		…
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
…		…
889	commit_iso14755 ();	889	commit_iso14755 ();
890		890
891	return;	891	return;
892	}	892	}
893		893
894	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)	894	for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
895	if (i[0] == keysym)	895	if (i[0] == keysym)
896	{	896	{
897	iso14755buf = ISO_14755_51 \| i[1];	897	iso14755buf = ISO_14755_51 \| i[1];
898	commit_iso14755 ();	898	commit_iso14755 ();
899		899
…		…
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 (bgPixmap.flags & bgPixmap_t::hasChanged)	947	if (bg_flags & BG_NEEDS_REFRESH)
981	{	948	{
982	bgPixmap.flags &= ~bgPixmap_t::hasChanged;	949	bg_flags &= ~BG_NEEDS_REFRESH;
983	// scr_clear (true); This needs to be researched further!
984	scr_touch (false);	950	scr_touch (false);
985	}	951	}
986	#endif	952	#endif
987		953
988	if (want_refresh)	954	if (want_refresh)
…		…
1025	while (row < end_row);	991	while (row < end_row);
1026	}	992	}
1027		993
1028	scr_refresh ();	994	scr_refresh ();
1029	scrollBar.show (1);	995	scrollBar.show (1);
1030	#ifdef USE_XIM	996	#if USE_XIM
1031	IMSendSpot ();	997	im_send_spot ();
1032	#endif	998	#endif
1033	}	999	}
1034		1000
1035	display->flush ();	1001	display->flush ();
1036	}	1002	}
…		…
1054	flush ();	1020	flush ();
1055	}	1021	}
1056		1022
1057	#ifdef CURSOR_BLINK	1023	#ifdef CURSOR_BLINK
1058	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
1059	rxvt_term::cursor_blink_cb (ev::timer &w, int revents)	1040	rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1060	{	1041	{
1061	hidden_cursor = !hidden_cursor;	1042	hidden_cursor = !hidden_cursor;
1062	want_refresh = 1;	1043	want_refresh = 1;
1063	refresh_check ();	1044	refresh_check ();
…		…
1081		1062
1082	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	1063	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1083	void	1064	void
1084	rxvt_term::cont_scroll_cb (ev::timer &w, int revents)	1065	rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1085	{	1066	{
1086	if ((scrollBar.state == STATE_UP \|\| scrollBar.state == STATE_DOWN)	1067	if ((scrollBar.state == SB_STATE_UP \|\| scrollBar.state == SB_STATE_DOWN)
1087	&& scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))	1068	&& scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1088	{	1069	{
1089	want_refresh = 1;	1070	want_refresh = 1;
1090	refresh_check ();	1071	refresh_check ();
1091	}	1072	}
1092	else	1073	else
…		…
1153	{	1134	{
1154	}	1135	}
1155	} event_handler;	1136	} event_handler;
1156	#endif	1137	#endif
1157		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
1158	bool	1172	bool
1159	rxvt_term::pty_fill ()	1173	rxvt_term::pty_fill ()
1160	{	1174	{
1161	ssize_t n = cmdbuf_endp - cmdbuf_ptr;	1175	cmdbuf_reify ();
1162		1176
1163	if (CBUFSIZ == n)	1177	size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1164	{	1178
1165	rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");	1179	if (!avail)
1166	n = 0;
1167	}	1180	{
1168		1181	// normally this indicates a "too long" command sequence - just drop the data we have
1169	memmove (cmdbuf_base, cmdbuf_ptr, n);
1170	cmdbuf_ptr = cmdbuf_base;	1182	cmdbuf_ptr = cmdbuf_base;
1171	cmdbuf_endp = cmdbuf_ptr + n;	1183	cmdbuf_endp = cmdbuf_ptr;
		1184	avail = CBUFSIZ;
		1185	}
1172		1186
1173	ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);	1187	ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1174		1188
1175	if (r > 0)	1189	if (r > 0)
1176	{	1190	{
1177	cmdbuf_endp += r;	1191	cmdbuf_endp += r;
1178	return true;	1192	return true;
…		…
1209	pty_write ();	1223	pty_write ();
1210		1224
1211	refresh_check ();	1225	refresh_check ();
1212	}	1226	}
1213		1227
1214	void	1228	void ecb_cold
1215	rxvt_term::pointer_unblank ()	1229	rxvt_term::pointer_unblank ()
1216	{	1230	{
1217	XDefineCursor (dpy, vt, TermWin_cursor);	1231	XDefineCursor (dpy, vt, TermWin_cursor);
1218	recolour_cursor ();	1232	recolour_cursor ();
1219		1233
…		…
1224	pointer_ev.start (pointerBlankDelay);	1238	pointer_ev.start (pointerBlankDelay);
1225	#endif	1239	#endif
1226	}	1240	}
1227		1241
1228	#ifdef POINTER_BLANK	1242	#ifdef POINTER_BLANK
1229	void	1243	void ecb_cold
1230	rxvt_term::pointer_blank ()	1244	rxvt_term::pointer_blank ()
1231	{	1245	{
1232	if (!option (Opt_pointerBlank))	1246	if (!option (Opt_pointerBlank))
1233	return;	1247	return;
1234		1248
…		…
1236	XFlush (dpy);	1250	XFlush (dpy);
1237		1251
1238	hidden_pointer = 1;	1252	hidden_pointer = 1;
1239	}	1253	}
1240		1254
1241	void	1255	void ecb_cold
1242	rxvt_term::pointer_cb (ev::timer &w, int revents)	1256	rxvt_term::pointer_cb (ev::timer &w, int revents)
1243	{	1257	{
1244	make_current ();	1258	make_current ();
1245		1259
1246	pointer_blank ();	1260	pointer_blank ();
…		…
1252	{	1266	{
1253	int button_number, key_state = 0;	1267	int button_number, key_state = 0;
1254	int x, y;	1268	int x, y;
1255	int code = 32;	1269	int code = 32;
1256		1270
1257	x = Pixel2Col (ev.x);	1271	x = Pixel2Col (ev.x) + 1;
1258	y = Pixel2Row (ev.y);	1272	y = Pixel2Row (ev.y) + 1;
		1273
1259	if (ev.type == MotionNotify)	1274	if (ev.type == MotionNotify)
1260	{	1275	{
1261	if (x == mouse_row && y == mouse_col)	1276	if (x == mouse_row && y == mouse_col)
1262	return;	1277	return;
		1278
1263	mouse_row = x;	1279	mouse_row = x;
1264	mouse_col = y;	1280	mouse_col = y;
1265	code += 32;	1281	code += 32;
1266	}	1282	}
1267		1283
…		…
1270	else	1286	else
1271	{	1287	{
1272	button_number = MEvent.button - Button1;	1288	button_number = MEvent.button - Button1;
1273	/* add 0x3D for wheel events, like xterm does */	1289	/* add 0x3D for wheel events, like xterm does */
1274	if (button_number >= 3)	1290	if (button_number >= 3)
1275	button_number += (64 - 3);	1291	button_number += 64 - 3;
1276	}	1292	}
1277		1293
1278	if (priv_modes & PrivMode_MouseX10)	1294	if (priv_modes & PrivMode_MouseX10)
1279	{	1295	{
1280	/*	1296	/*
…		…
1312	fputc ('A', stderr);	1328	fputc ('A', stderr);
1313	if (key_state & 32)	1329	if (key_state & 32)
1314	fputc ('2', stderr);	1330	fputc ('2', stderr);
1315	fprintf (stderr, "]: <%d>, %d/%d\n",	1331	fprintf (stderr, "]: <%d>, %d/%d\n",
1316	button_number,	1332	button_number,
1317	x + 1,	1333	x,
1318	y + 1);	1334	y);
1319	#endif	1335	#endif
1320		1336
		1337	#if ENABLE_FRILLS
		1338	if (priv_modes & PrivMode_ExtMouseRight)
		1339	tt_printf ("\033[%d;%d;%dM",
		1340	code + button_number + key_state,
		1341	x,
		1342	y);
		1343	else if (priv_modes & PrivMode_ExtModeMouse)
		1344	tt_printf ("\033[M%c%lc%lc",
		1345	code + button_number + key_state,
		1346	wint_t (32 + x),
		1347	wint_t (32 + y));
		1348	else
		1349	#endif
1321	tt_printf ("\033[M%c%c%c",	1350	tt_printf ("\033[M%c%c%c",
1322	(code + button_number + key_state),	1351	code + button_number + key_state,
1323	(32 + x + 1),	1352	32 + x,
1324	(32 + y + 1));	1353	32 + y);
1325	}	1354	}
1326		1355
1327	/{{{ process an X event /	1356	/{{{ process an X event /
1328	void	1357	void ecb_hot
1329	rxvt_term::x_cb (XEvent &ev)	1358	rxvt_term::x_cb (XEvent &ev)
1330	{	1359	{
1331	make_current ();	1360	make_current ();
1332		1361
1333	dLocal (Display *, dpy);	1362	dLocal (Display *, dpy);
…		…
1431	&& ev.xfocus.mode != NotifyGrab)	1460	&& ev.xfocus.mode != NotifyGrab)
1432	focus_out ();	1461	focus_out ();
1433	break;	1462	break;
1434		1463
1435	case ConfigureNotify:	1464	case ConfigureNotify:
1436	if (ev.xconfigure.window == parent[0])	1465	if (ev.xconfigure.window == parent)
1437	{	1466	{
1438	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))	1467	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1439	;	1468	;
1440		1469
		1470	bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
		1471
		1472	bool moved = false;
1441	#ifdef HAVE_BG_PIXMAP	1473	#ifdef HAVE_BG_PIXMAP
1442	bool moved = false;
1443	if (bgPixmap.window_position_sensitive ())	1474	if (bg_window_position_sensitive ())
		1475	{
		1476	want_position_change = true;
		1477	if (bg_img == 0)
		1478	moved = true;
		1479	}
		1480	#endif
		1481
		1482	if (want_position_change)
1444	{	1483	{
1445	int x, y;	1484	int x, y;
		1485
1446	if (ev.xconfigure.send_event)	1486	if (ev.xconfigure.send_event)
1447	{	1487	{
1448	x = ev.xconfigure.x;	1488	x = ev.xconfigure.x;
1449	y = ev.xconfigure.y;	1489	y = ev.xconfigure.y;
1450	}	1490	}
1451	else	1491	else
1452	get_window_origin (x, y);	1492	get_window_origin (x, y);
1453		1493
1454	if (bgPixmap.set_position (x, y)	1494	if (x != parent_x \|\| y != parent_y)
1455	\|\| (bgPixmap.flags & bgPixmap_t::isInvalid))	1495	{
		1496	parent_x = x;
		1497	parent_y = y;
		1498	HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1456	moved = true;	1499	moved = true;
		1500	}
1457	}	1501	}
1458	#endif
1459		1502
1460	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)	1503	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)
1461	{	1504	{
1462	seen_resize = 1;	1505	seen_resize = 1;
1463	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1506	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1464	}	1507	}
1465	else	1508	else
1466	{	1509	{
1467	#ifdef HAVE_BG_PIXMAP	1510	#ifdef HAVE_BG_PIXMAP
1468	if (moved)	1511	if (moved)
1469	{
1470	if (mapped)
1471	update_background ();	1512	update_background ();
1472	else
1473	bgPixmap.invalidate ();
1474	}
1475	#endif	1513	#endif
1476	}	1514	}
1477		1515
1478	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));	1516	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1479	}	1517	}
1480	break;	1518	break;
1481		1519
1482	case PropertyNotify:	1520	case PropertyNotify:
1483	if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))	1521	HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1484	if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1485	&& ev.xproperty.state == PropertyNewValue)
1486	selection_property (ev.xproperty.window, ev.xproperty.atom);
1487
1488	break;	1522	break;
1489		1523
1490	case SelectionClear:	1524	case SelectionClear:
1491	selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);	1525	selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1492	break;	1526	break;
1493		1527
1494	case SelectionNotify:
1495	if (selection_wait == Sel_normal)
1496	selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1497	break;
1498
1499	case SelectionRequest:	1528	case SelectionRequest:
1500	selection_send (ev.xselectionrequest);	1529	selection_send (ev.xselectionrequest);
1501	break;	1530	break;
1502		1531
1503	case MapNotify:	1532	case MapNotify:
1504	#ifdef HAVE_BG_PIXMAP	1533	#ifdef HAVE_BG_PIXMAP
1505	/* 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
1506	* non-reparenting window manager. In those cases we never get first	1535	// or a non-reparenting window manager and also because we
1507	* ConfigureNotify. Also that speeds startup under normal WM, by taking	1536	// defer bg image updates if the window is not mapped. The
1508	* care of multiplicity of ConfigureNotify events arriving while WM does	1537	// short delay is to optimize for multiple ConfigureNotify
1509	* reparenting.	1538	// events at startup when the window manager reparents the
1510	* We should not render background immediately, as there could be several	1539	// window, so as to perform the computation after we have
1511	* ConfigureNotify's to follow. Lets take care of all of them in one scoop	1540	// received all of them.
1512	* by scheduling background redraw as soon as we can, but giving a short	1541	if (bg_img == 0)
1513	* bit of time for ConfigureNotifies to arrive.
1514	* We should render background PRIOR to drawing any text, but AFTER all
1515	* of ConfigureNotifys for the best results.
1516	*/
1517	if (bgPixmap.flags & bgPixmap_t::isInvalid)
1518	update_background_ev.start (0.025);	1542	update_background_ev.start (0.025);
1519	#endif	1543	#endif
1520	mapped = 1;	1544	mapped = 1;
1521	#ifdef TEXT_BLINK	1545	#ifdef TEXT_BLINK
1522	text_blink_ev.start ();	1546	text_blink_ev.start ();
…		…
1537	if (ev.xany.window == vt)	1561	if (ev.xany.window == vt)
1538	{	1562	{
1539	do	1563	do
1540	{	1564	{
1541	scr_expose (ev.xexpose.x, ev.xexpose.y,	1565	scr_expose (ev.xexpose.x, ev.xexpose.y,
1542	ev.xexpose.width, ev.xexpose.height, False);	1566	ev.xexpose.width, ev.xexpose.height, false);
1543	}	1567	}
1544	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));	1568	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1545		1569
1546	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1570	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1547		1571
1548	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))	1572	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1549	{	1573	{
1550	scr_expose (ev.xexpose.x, ev.xexpose.y,	1574	scr_expose (ev.xexpose.x, ev.xexpose.y,
1551	ev.xexpose.width, ev.xexpose.height, False);	1575	ev.xexpose.width, ev.xexpose.height, false);
1552	}	1576	}
1553		1577
1554	want_refresh = 1;	1578	want_refresh = 1;
1555	}	1579	}
1556	else	1580	else
…		…
1562	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))	1586	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1563	;	1587	;
1564		1588
1565	if (scrollBar.state && ev.xany.window == scrollBar.win)	1589	if (scrollBar.state && ev.xany.window == scrollBar.win)
1566	{	1590	{
1567	scrollBar.state = STATE_IDLE;	1591	scrollBar.state = SB_STATE_IDLE;
1568	scrollBar.show (0);	1592	scrollBar.show (0);
1569	}	1593	}
1570	}	1594	}
1571	break;	1595	break;
1572		1596
…		…
1638	dist = int_bwidth - ev.xbutton.y;	1662	dist = int_bwidth - ev.xbutton.y;
1639	}	1663	}
1640	else	1664	else
1641	{	1665	{
1642	scroll_selection_dir = DN;	1666	scroll_selection_dir = DN;
1643	dist = ev.xbutton.y - (int_bwidth + height);	1667	dist = ev.xbutton.y - (int_bwidth + vt_height);
1644	}	1668	}
1645		1669
1646	scroll_selection_lines = Pixel2Height (dist)	1670	scroll_selection_lines = Pixel2Height (dist)
1647	/ SELECTION_SCROLL_LINE_SPEEDUP	1671	/ SELECTION_SCROLL_LINE_SPEEDUP
1648	+ 1;	1672	+ 1;
…		…
1660	#ifdef MOUSE_THRESHOLD	1684	#ifdef MOUSE_THRESHOLD
1661	}	1685	}
1662	#endif	1686	#endif
1663	}	1687	}
1664	}	1688	}
1665	else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)	1689	else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1666	{	1690	{
1667	while (XCheckTypedWindowEvent (dpy, scrollBar.win,	1691	while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1668	MotionNotify, &ev))	1692	MotionNotify, &ev))
1669	;	1693	;
1670		1694
1671	XQueryPointer (dpy, scrollBar.win,	1695	XQueryPointer (dpy, scrollBar.win,
1672	&unused_root, &unused_child,	1696	&unused_root, &unused_child,
1673	&unused_root_x, &unused_root_y,	1697	&unused_root_x, &unused_root_y,
1674	&ev.xbutton.x, &ev.xbutton.y,	1698	&ev.xbutton.x, &ev.xbutton.y,
1675	&unused_mask);	1699	&unused_mask);
1676	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1700	scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1677	scrollBar.size ());	1701	scrollBar.size ());
1678	want_refresh = 1;	1702	want_refresh = 1;
1679	scrollBar.show (1);	1703	scrollBar.show (1);
1680	}	1704	}
1681	break;	1705	break;
1682	}	1706	}
1683		1707
1684	#if defined(CURSOR_BLINK)	1708	#if defined(CURSOR_BLINK)
1685	if (option (Opt_cursorBlink) && ev.type == KeyPress)	1709	if (ev.type == KeyPress)
1686	{
1687	if (hidden_cursor)
1688	{
1689	hidden_cursor = 0;
1690	want_refresh = 1;
1691	}
1692
1693	cursor_blink_ev.again ();	1710	cursor_blink_reset ();
1694	}
1695	#endif	1711	#endif
1696		1712
1697	#if defined(POINTER_BLANK)	1713	#if defined(POINTER_BLANK)
1698	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)	1714	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1699	{	1715	{
…		…
1710		1726
1711	refresh_check ();	1727	refresh_check ();
1712	}	1728	}
1713		1729
1714	#if ENABLE_FRILLS	1730	#if ENABLE_FRILLS
1715	void	1731	void ecb_cold
1716	rxvt_term::set_urgency (bool enable)	1732	rxvt_term::set_urgency (bool enable)
1717	{	1733	{
1718	if (enable == urgency_hint)	1734	if (enable == urgency_hint)
1719	return;	1735	return;
1720		1736
1721	if (XWMHints *h = XGetWMHints (dpy, parent[0]))	1737	if (XWMHints *h = XGetWMHints (dpy, parent))
1722	{	1738	{
1723	h->flags = h->flags & ~XUrgencyHint \| (enable ? XUrgencyHint : 0);	1739	h->flags = h->flags & ~XUrgencyHint \| (enable ? XUrgencyHint : 0);
1724	XSetWMHints (dpy, parent[0], h);	1740	XSetWMHints (dpy, parent, h);
1725	urgency_hint = enable;	1741	urgency_hint = enable;
		1742	XFree (h);
1726	}	1743	}
1727	}	1744	}
1728	#endif	1745	#endif
1729		1746
1730	void	1747	void ecb_cold
1731	rxvt_term::focus_in ()	1748	rxvt_term::focus_in ()
1732	{	1749	{
1733	if (!focus)	1750	if (!focus)
1734	{	1751	{
1735	focus = 1;	1752	focus = 1;
1736	want_refresh = 1;	1753	want_refresh = 1;
1737		1754
1738	#if USE_XIM	1755	#if USE_XIM
1739	if (Input_Context != NULL)	1756	if (Input_Context != NULL)
1740	{	1757	{
1741	IMSetPosition ();	1758	im_set_position ();
1742	XSetICFocus (Input_Context);	1759	XSetICFocus (Input_Context);
1743	}	1760	}
1744	#endif	1761	#endif
1745	#if CURSOR_BLINK	1762	#if CURSOR_BLINK
1746	if (option (Opt_cursorBlink))	1763	if (option (Opt_cursorBlink))
…		…
1760		1777
1761	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));	1778	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1762	}	1779	}
1763	}	1780	}
1764		1781
1765	void	1782	void ecb_cold
1766	rxvt_term::focus_out ()	1783	rxvt_term::focus_out ()
1767	{	1784	{
1768	if (focus)	1785	if (focus)
1769	{	1786	{
1770	focus = 0;	1787	focus = 0;
…		…
1803		1820
1804	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));	1821	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1805	}	1822	}
1806	}	1823	}
1807		1824
1808	void	1825	void ecb_cold
1809	rxvt_term::update_fade_color (unsigned int idx)	1826	rxvt_term::update_fade_color (unsigned int idx)
1810	{	1827	{
1811	#if OFF_FOCUS_FADING	1828	#if OFF_FOCUS_FADING
1812	if (rs[Rs_fade])	1829	if (rs[Rs_fade])
1813	{	1830	{
…		…
1816	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);
1817	}	1834	}
1818	#endif	1835	#endif
1819	}	1836	}
1820		1837
1821	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	1838	#if BG_IMAGE_FROM_ROOT \|\| ENABLE_PERL
1822	void	1839	void ecb_hot
1823	rxvt_term::rootwin_cb (XEvent &ev)	1840	rxvt_term::rootwin_cb (XEvent &ev)
1824	{	1841	{
1825	make_current ();	1842	make_current ();
1826		1843
1827	if (SHOULD_INVOKE (HOOK_ROOT_EVENT)	1844	if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1828	&& HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))	1845	&& HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1829	return;	1846	return;
1830		1847
1831	# if ENABLE_TRANSPARENCY
1832	switch (ev.type)	1848	switch (ev.type)
1833	{	1849	{
1834	case PropertyNotify:	1850	case PropertyNotify:
1835	/*	1851	/*
1836	* 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,
1837	* 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.
1838	*/	1854	*/
1839	if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]	1855	if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1840	\|\| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])	1856	\|\| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1841	{	1857	{
1842	bgPixmap.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);
1843	update_background ();	1862	update_background ();
		1863	}
		1864	#endif
		1865	HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1844	}	1866	}
1845		1867
1846	break;	1868	break;
1847	}	1869	}
1848	# endif
1849		1870
1850	refresh_check ();	1871	refresh_check ();
1851	}	1872	}
1852	#endif	1873	#endif
1853		1874
…		…
1977	if (scrollBar.upButton (ev.y))	1998	if (scrollBar.upButton (ev.y))
1978	direction = UP; /* up */	1999	direction = UP; /* up */
1979	else if (scrollBar.dnButton (ev.y))	2000	else if (scrollBar.dnButton (ev.y))
1980	direction = DN; /* down */	2001	direction = DN; /* down */
1981		2002
1982	scrollBar.state = STATE_IDLE;	2003	scrollBar.state = SB_STATE_IDLE;
1983	/*	2004	/*
1984	* Rxvt-style scrollbar:	2005	* Rxvt-style scrollbar:
1985	* move up if mouse is above slider	2006	* move up if mouse is above slider
1986	* move dn if mouse is below slider	2007	* move dn if mouse is below slider
1987	*	2008	*
…		…
2026	cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);	2047	cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2027	#endif	2048	#endif
2028	if (scr_page (direction, 1))	2049	if (scr_page (direction, 1))
2029	{	2050	{
2030	if (direction == UP)	2051	if (direction == UP)
2031	scrollBar.state = STATE_UP;	2052	scrollBar.state = SB_STATE_UP;
2032	else	2053	else
2033	scrollBar.state = STATE_DOWN;	2054	scrollBar.state = SB_STATE_DOWN;
2034	}	2055	}
2035	}	2056	}
2036	else	2057	else
2037	switch (ev.button)	2058	switch (ev.button)
2038	{	2059	{
2039	case Button2:	2060	case Button2:
2040	switch (scrollBar.align)	2061	switch (scrollBar.align)
2041	{	2062	{
2042	case R_SB_ALIGN_TOP:	2063	case SB_ALIGN_TOP:
2043	csrO = 0;	2064	csrO = 0;
2044	break;	2065	break;
2045	case R_SB_ALIGN_CENTRE:	2066	case SB_ALIGN_CENTRE:
2046	csrO = (scrollBar.bot - scrollBar.top) / 2;	2067	csrO = (scrollBar.bot - scrollBar.top) / 2;
2047	break;	2068	break;
2048	case R_SB_ALIGN_BOTTOM:	2069	case SB_ALIGN_BOTTOM:
2049	csrO = scrollBar.bot - scrollBar.top;	2070	csrO = scrollBar.bot - scrollBar.top;
2050	break;	2071	break;
2051	}	2072	}
2052		2073
2053	if (scrollBar.style == R_SB_XTERM	2074	if (scrollBar.style == SB_STYLE_XTERM
2054	\|\| scrollbar_above_slider (ev.y)	2075	\|\| scrollBar.above_slider (ev.y)
2055	\|\| scrollbar_below_slider (ev.y))	2076	\|\| scrollBar.below_slider (ev.y))
2056	scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());	2077	scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2057		2078
2058	scrollBar.state = STATE_MOTION;	2079	scrollBar.state = SB_STATE_MOTION;
2059	break;	2080	break;
2060		2081
2061	case Button1:	2082	case Button1:
2062	if (scrollBar.align == R_SB_ALIGN_CENTRE)	2083	if (scrollBar.align == SB_ALIGN_CENTRE)
2063	csrO = ev.y - scrollBar.top;	2084	csrO = ev.y - scrollBar.top;
2064	/* FALLTHROUGH */	2085	/* FALLTHROUGH */
2065		2086
2066	case Button3:	2087	case Button3:
2067	if (scrollBar.style != R_SB_XTERM)	2088	if (scrollBar.style != SB_STYLE_XTERM)
2068	{	2089	{
2069	if (scrollbar_above_slider (ev.y))	2090	if (scrollBar.above_slider (ev.y))
2070	# ifdef RXVT_SCROLL_FULL	2091	# ifdef RXVT_SCROLL_FULL
2071	scr_page (UP, nrow - 1);	2092	scr_page (UP, nrow - 1);
2072	# else	2093	# else
2073	scr_page (UP, nrow / 4);	2094	scr_page (UP, nrow / 4);
2074	# endif	2095	# endif
2075	else if (scrollbar_below_slider (ev.y))	2096	else if (scrollBar.below_slider (ev.y))
2076	# ifdef RXVT_SCROLL_FULL	2097	# ifdef RXVT_SCROLL_FULL
2077	scr_page (DN, nrow - 1);	2098	scr_page (DN, nrow - 1);
2078	# else	2099	# else
2079	scr_page (DN, nrow / 4);	2100	scr_page (DN, nrow / 4);
2080	# endif	2101	# endif
2081	else	2102	else
2082	scrollBar.state = STATE_MOTION;	2103	scrollBar.state = SB_STATE_MOTION;
2083	}	2104	}
2084	else	2105	else
2085	{	2106	{
2086	scr_page ((ev.button == Button1 ? DN : UP),	2107	scr_page ((ev.button == Button1 ? DN : UP),
2087	(nrow	2108	(nrow
2088	* scrollbar_position (ev.y)	2109	* scrollBar.position (ev.y)
2089	/ scrollBar.size ()));	2110	/ scrollBar.size ()));
2090	}	2111	}
2091		2112
2092	break;	2113	break;
2093	}	2114	}
…		…
2104		2125
2105	csrO = 0; /* reset csr Offset */	2126	csrO = 0; /* reset csr Offset */
2106	if (!bypass_keystate)	2127	if (!bypass_keystate)
2107	reportmode = !! (priv_modes & PrivMode_mouse_report);	2128	reportmode = !! (priv_modes & PrivMode_mouse_report);
2108		2129
2109	if (scrollBar.state == STATE_UP \|\| scrollBar.state == STATE_DOWN)	2130	if (scrollBar.state == SB_STATE_UP \|\| scrollBar.state == SB_STATE_DOWN)
2110	{	2131	{
2111	scrollBar.state = STATE_IDLE;	2132	scrollBar.state = SB_STATE_IDLE;
2112	scrollBar.show (0);	2133	scrollBar.show (0);
2113	}	2134	}
2114		2135
2115	#ifdef SELECTION_SCROLLING	2136	#ifdef SELECTION_SCROLLING
2116	sel_scroll_ev.stop();	2137	sel_scroll_ev.stop();
…		…
2166	case Button3:	2187	case Button3:
2167	selection_make (ev.time);	2188	selection_make (ev.time);
2168	break;	2189	break;
2169		2190
2170	case Button2:	2191	case Button2:
2171	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?
2172	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);	2193	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2173	break;	2194	break;
2174		2195
2175	#ifdef MOUSE_WHEEL	2196	#ifdef MOUSE_WHEEL
2176	case Button4:	2197	case Button4:
…		…
2211	}	2232	}
2212	}	2233	}
2213		2234
2214	/}}} /	2235	/}}} /
2215		2236
2216	void	2237	void ecb_hot
2217	rxvt_term::cmd_parse ()	2238	rxvt_term::cmd_parse ()
2218	{	2239	{
2219	wchar_t ch = NOCHAR;	2240	wchar_t ch = NOCHAR;
2220	char *seq_begin; // remember start of esc-sequence here	2241	char *seq_begin; // remember start of esc-sequence here
2221		2242
2222	for (;;)	2243	for (;;)
2223	{	2244	{
2224	if (expect_false (ch == NOCHAR))	2245	if (ecb_unlikely (ch == NOCHAR))
2225	{	2246	{
2226	seq_begin = cmdbuf_ptr;	2247	seq_begin = cmdbuf_ptr;
2227	ch = next_char ();	2248	ch = next_char ();
2228		2249
2229	if (ch == NOCHAR)	2250	if (ch == NOCHAR)
2230	break;	2251	break;
2231	}	2252	}
2232		2253
2233	if (expect_true (!IS_CONTROL (ch) \|\| ch == C0_LF \|\| ch == C0_CR \|\| ch == C0_HT))	2254	if (ecb_likely (!IS_CONTROL (ch) \|\| ch == C0_LF \|\| ch == C0_CR \|\| ch == C0_HT))
2234	{	2255	{
2235	if (expect_false (!seen_input))	2256	if (ecb_unlikely (!seen_input))
2236	{	2257	{
2237	seen_input = 1;	2258	seen_input = 1;
2238	// many badly-written programs (e.g. jed) contain a race condition:	2259	// many badly-written programs (e.g. jed) contain a race condition:
2239	// they first read the screensize and then install a SIGWINCH handler.	2260	// they first read the screensize and then install a SIGWINCH handler.
2240	// some window managers resize the window early, and these programs	2261	// some window managers resize the window early, and these programs
…		…
2253	wchar_t *str = buf;	2274	wchar_t *str = buf;
2254	wchar_t *eol = str + min (ncol, UBUFSIZ);	2275	wchar_t *eol = str + min (ncol, UBUFSIZ);
2255		2276
2256	for (;;)	2277	for (;;)
2257	{	2278	{
2258	if (expect_false (ch == NOCHAR \|\| (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))	2279	if (ecb_unlikely (ch == NOCHAR \|\| (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2259	break;	2280	break;
2260		2281
2261	*str++ = ch;	2282	*str++ = ch;
2262		2283
2263	if (expect_false (ch == C0_LF \|\| str >= eol))	2284	if (ecb_unlikely (ch == C0_LF \|\| str >= eol))
2264	{	2285	{
2265	if (ch == C0_LF)	2286	if (ch == C0_LF)
2266	nlines++;	2287	nlines++;
2267		2288
2268	refresh_count++;	2289	refresh_count++;
…		…
2340	}	2361	}
2341	}	2362	}
2342	}	2363	}
2343		2364
2344	// read the next character	2365	// read the next character
2345	wchar_t	2366	wchar_t ecb_hot
2346	rxvt_term::next_char () NOTHROW	2367	rxvt_term::next_char () NOTHROW
2347	{	2368	{
2348	while (cmdbuf_ptr < cmdbuf_endp)	2369	while (cmdbuf_ptr < cmdbuf_endp)
2349	{	2370	{
2350	// assume 7-bit to be ascii ALWAYS	2371	// assume 7-bit to be ascii ALWAYS
2351	if (expect_true ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b))	2372	if (ecb_likely ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b))
2352	return *cmdbuf_ptr++;	2373	return *cmdbuf_ptr++;
2353		2374
2354	wchar_t wc;	2375	wchar_t wc;
2355	size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);	2376	size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2356		2377
…		…
2362	}	2383	}
2363		2384
2364	if (len == (size_t)-1)	2385	if (len == (size_t)-1)
2365	{	2386	{
2366	mbstate.reset (); // reset now undefined conversion state	2387	mbstate.reset (); // reset now undefined conversion state
		2388	// a -1 might indicate that a previous incomplete char is invalid (previous return -2)
		2389	// in which case we "erroneously" return the next byte which might be valid.
2367	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through	2390	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2368	}	2391	}
2369		2392
2370	// assume wchar == unicode	2393	// assume wchar == unicode
2371	cmdbuf_ptr += len;	2394	cmdbuf_ptr += len;
…		…
2374		2397
2375	return NOCHAR;	2398	return NOCHAR;
2376	}	2399	}
2377		2400
2378	// read the next octet	2401	// read the next octet
2379	uint32_t	2402	uint32_t ecb_hot
2380	rxvt_term::next_octet () NOTHROW	2403	rxvt_term::next_octet () NOTHROW
2381	{	2404	{
2382	return cmdbuf_ptr < cmdbuf_endp	2405	return cmdbuf_ptr < cmdbuf_endp
2383	? (unsigned char)*cmdbuf_ptr++	2406	? (unsigned char)*cmdbuf_ptr++
2384	: NOCHAR;	2407	: NOCHAR;
2385	}	2408	}
2386		2409
2387	static class out_of_input out_of_input;	2410	static class out_of_input out_of_input;
2388		2411
2389	/* rxvt_cmd_getc () - Return next input character */	2412	wchar_t ecb_hot
2390	/*
2391	* Return the next input character after first passing any keyboard input
2392	* to the command.
2393	*/
2394	wchar_t
2395	rxvt_term::cmd_getc () THROW ((class out_of_input))	2413	rxvt_term::cmd_getc () THROW ((class out_of_input))
2396	{	2414	{
2397	wchar_t c = next_char ();	2415	wchar_t c = next_char ();
2398		2416
2399	if (c == NOCHAR)	2417	if (c == NOCHAR)
2400	throw out_of_input;	2418	throw out_of_input;
2401		2419
2402	return c;	2420	return c;
2403	}	2421	}
2404		2422
2405	uint32_t	2423	uint32_t ecb_hot
2406	rxvt_term::cmd_get8 () THROW ((class out_of_input))	2424	rxvt_term::cmd_get8 () THROW ((class out_of_input))
2407	{	2425	{
2408	uint32_t c = next_octet ();	2426	uint32_t c = next_octet ();
2409		2427
2410	if (c == NOCHAR)	2428	if (c == NOCHAR)
…		…
2414	}	2432	}
2415		2433
2416	/{{{ print pipe /	2434	/{{{ print pipe /
2417	/----------------------------------------------------------------------/	2435	/----------------------------------------------------------------------/
2418	#ifdef PRINTPIPE	2436	#ifdef PRINTPIPE
2419	FILE *	2437	FILE * ecb_cold
2420	rxvt_term::popen_printer ()	2438	rxvt_term::popen_printer ()
2421	{	2439	{
2422	FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");	2440	FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2423		2441
2424	if (stream == NULL)	2442	if (stream == NULL)
2425	rxvt_warn ("can't open printer pipe, not printing.\n");	2443	rxvt_warn ("can't open printer pipe, not printing.\n");
2426		2444
2427	return stream;	2445	return stream;
2428	}	2446	}
2429		2447
2430	int	2448	int ecb_cold
2431	rxvt_term::pclose_printer (FILE *stream)	2449	rxvt_term::pclose_printer (FILE *stream)
2432	{	2450	{
2433	fflush (stream);	2451	fflush (stream);
2434	return pclose (stream);	2452	return pclose (stream);
2435	}	2453	}
2436		2454
2437	/*	2455	/*
2438	* simulate attached vt100 printer	2456	* simulate attached vt100 printer
2439	*/	2457	*/
2440	void	2458	void ecb_cold
2441	rxvt_term::process_print_pipe ()	2459	rxvt_term::process_print_pipe ()
2442	{	2460	{
2443	FILE *fd = popen_printer ();	2461	FILE *fd = popen_printer ();
2444		2462
2445	if (!fd)	2463	if (!fd)
…		…
2491	pclose_printer (fd);	2509	pclose_printer (fd);
2492	}	2510	}
2493	#endif /* PRINTPIPE */	2511	#endif /* PRINTPIPE */
2494	/}}} /	2512	/}}} /
2495		2513
2496	/* INDENT-OFF */
2497	enum {	2514	enum {
2498	C1_40 = 0x40,	2515	C1_40 = 0x40,
2499	C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,	2516	C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2500	C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,	2517	C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2501	C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,	2518	C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2502	C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,	2519	C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2503	};	2520	};
2504	/* INDENT-ON */
2505		2521
2506	/{{{ process non-printing single characters /	2522	/{{{ process non-printing single characters /
2507	void	2523	void ecb_hot
2508	rxvt_term::process_nonprinting (unicode_t ch)	2524	rxvt_term::process_nonprinting (unicode_t ch)
2509	{	2525	{
2510	switch (ch)	2526	switch (ch)
2511	{	2527	{
2512	case C0_ESC:	2528	case C0_ESC:
…		…
2558	}	2574	}
2559	/}}} /	2575	/}}} /
2560		2576
2561		2577
2562	/{{{ process VT52 escape sequences /	2578	/{{{ process VT52 escape sequences /
2563	void	2579	void ecb_cold
2564	rxvt_term::process_escape_vt52 (unicode_t ch)	2580	rxvt_term::process_escape_vt52 (unicode_t ch)
2565	{	2581	{
2566	int row, col;	2582	int row, col;
2567		2583
2568	switch (ch)	2584	switch (ch)
…		…
2602	break;	2618	break;
2603	case 'Z': /* identify the terminal type */	2619	case 'Z': /* identify the terminal type */
2604	tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */	2620	tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2605	break;	2621	break;
2606	case '<': /* turn off VT52 mode */	2622	case '<': /* turn off VT52 mode */
2607	set_privmode (PrivMode_vt52, 0);	2623	priv_modes &= ~PrivMode_vt52;
2608	break;	2624	break;
2609	case 'F': /* use special graphics character set */	2625	case 'F': /* use special graphics character set */
2610	case 'G': /* use regular character set */	2626	case 'G': /* use regular character set */
2611	/* unimplemented */	2627	/* unimplemented */
2612	break;	2628	break;
…		…
2618	}	2634	}
2619	/}}} /	2635	/}}} /
2620		2636
2621		2637
2622	/{{{ process escape sequences /	2638	/{{{ process escape sequences /
2623	void	2639	void ecb_hot
2624	rxvt_term::process_escape_seq ()	2640	rxvt_term::process_escape_seq ()
2625	{	2641	{
2626	unicode_t ch = cmd_getc ();	2642	unicode_t ch = cmd_getc ();
2627		2643
2628	if (priv_modes & PrivMode_vt52)	2644	if (priv_modes & PrivMode_vt52)
…		…
2631	return;	2647	return;
2632	}	2648	}
2633		2649
2634	switch (ch)	2650	switch (ch)
2635	{	2651	{
2636	/* case 1: do_tek_mode (); break; */
2637	case '#':	2652	case '#':
2638	if (cmd_getc () == '8')	2653	if (cmd_getc () == '8')
2639	scr_E ();	2654	scr_E ();
2640	break;	2655	break;
2641	case '(':	2656	case '(':
…		…
2664	#if !ENABLE_MINIMAL	2679	#if !ENABLE_MINIMAL
2665	case '9':	2680	case '9':
2666	scr_forwardindex ();	2681	scr_forwardindex ();
2667	break;	2682	break;
2668	#endif	2683	#endif
		2684	// DECPAM/DECPNM
2669	case '=':	2685	case '=':
		2686	priv_modes \|= PrivMode_aplKP;
		2687	break;
2670	case '>':	2688	case '>':
2671	set_privmode (PrivMode_aplKP, ch == '=');	2689	priv_modes &= ~PrivMode_aplKP;
2672	break;	2690	break;
2673		2691
2674	case C1_40:	2692	case C1_40:
2675	cmd_getc ();	2693	cmd_getc ();
2676	break;	2694	break;
…		…
2680		2698
2681	/* 8.3.87: NEXT LINE */	2699	/* 8.3.87: NEXT LINE */
2682	case C1_NEL: /* ESC E */	2700	case C1_NEL: /* ESC E */
2683	{	2701	{
2684	wchar_t nlcr[] = { C0_LF, C0_CR };	2702	wchar_t nlcr[] = { C0_LF, C0_CR };
2685	scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);	2703	scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2686	}	2704	}
2687	break;	2705	break;
2688		2706
2689	/* kidnapped escape sequence: Should be 8.3.48 */	2707	/* kidnapped escape sequence: Should be 8.3.48 */
2690	case C1_ESA: /* ESC G */	2708	case C1_ESA: /* ESC G */
2691	process_graphics ();	2709	// used by original rxvt for rob nations own graphics mode
		2710	if (cmd_getc () == 'Q')
		2711	tt_printf ("\033G0\012"); /* query graphics - no graphics */
2692	break;	2712	break;
2693		2713
2694	/* 8.3.63: CHARACTER TABULATION SET */	2714	/* 8.3.63: CHARACTER TABULATION SET */
2695	case C1_HTS: /* ESC H */	2715	case C1_HTS: /* ESC H */
2696	scr_set_tab (1);	2716	scr_set_tab (1);
…		…
2700	case C1_RI: /* ESC M */	2720	case C1_RI: /* ESC M */
2701	scr_index (DN);	2721	scr_index (DN);
2702	break;	2722	break;
2703		2723
2704	/* 8.3.142: SINGLE-SHIFT TWO */	2724	/* 8.3.142: SINGLE-SHIFT TWO */
2705	/case C1_SS2: scr_single_shift (2); break; /	2725	/* case C1_SS2: break; */
2706		2726
2707	/* 8.3.143: SINGLE-SHIFT THREE */	2727	/* 8.3.143: SINGLE-SHIFT THREE */
2708	/case C1_SS3: scr_single_shift (3); break; /	2728	/* case C1_SS3: break; */
2709		2729
2710	/* 8.3.27: DEVICE CONTROL STRING */	2730	/* 8.3.27: DEVICE CONTROL STRING */
2711	case C1_DCS: /* ESC P */	2731	case C1_DCS: /* ESC P */
2712	process_dcs_seq ();	2732	process_dcs_seq ();
2713	break;	2733	break;
…		…
2746	}	2766	}
2747	}	2767	}
2748	/}}} /	2768	/}}} /
2749		2769
2750	/{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' /	2770	/{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' /
2751	/* INDENT-OFF */
2752	enum {	2771	enum {
2753	CSI_ICH = 0x40,	2772	CSI_ICH = 0x40,
2754	CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,	2773	CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2755	CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,	2774	CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2756	CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,	2775	CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
…		…
2759	CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,	2778	CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2760	CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,	2779	CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2761	CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F	2780	CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2762	};	2781	};
2763		2782
2764	#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \	2783	#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2765	(((b7) << 7) \| ((b6) << 6) \| ((b5) << 5) \| ((b4) << 4) \	2784	(((b7) << 7) \| ((b6) << 6) \| ((b5) << 5) \| ((b4) << 4) \
2766	\| ((b3) << 3) \| ((b2) << 2) \| ((b1) << 1) \| (b0))	2785	\| ((b3) << 3) \| ((b2) << 2) \| ((b1) << 1) \| (b0))
2767	#define get_byte_array_bit(array, bit) \	2786	#define get_byte_array_bit(array, bit) \
2768	(!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7))))	2787	(!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2769		2788
2770	const unsigned char csi_defaults[] =	2789	static const unsigned char csi_defaults[] =
2771	{	2790	{
2772	make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */	2791	make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2773	make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */	2792	make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2774	make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */	2793	make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2775	make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */	2794	make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2776	make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */	2795	make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2777	make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */	2796	make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2778	make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */	2797	make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2779	make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, \|, }, ~, */	2798	make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, \|, }, ~, */
2780	};	2799	};
2781	/* INDENT-ON */
2782		2800
2783	void	2801	void ecb_hot
2784	rxvt_term::process_csi_seq ()	2802	rxvt_term::process_csi_seq ()
2785	{	2803	{
2786	unicode_t ch, priv, i;	2804	unicode_t ch, priv, prev_ch, i;
2787	unsigned int nargs, p;	2805	unsigned int nargs, p;
2788	int n, ndef;	2806	int n, ndef;
2789	int arg[ESC_ARGS] = { };	2807	int arg[ESC_ARGS] = { };
2790		2808
2791	nargs = 0;	2809	nargs = 0;
…		…
2797	/* '<' '=' '>' '?' '!' */	2815	/* '<' '=' '>' '?' '!' */
2798	priv = ch;	2816	priv = ch;
2799	ch = cmd_getc ();	2817	ch = cmd_getc ();
2800	}	2818	}
2801		2819
		2820	prev_ch = 0;
2802	/* read any numerical arguments */	2821	/* read any numerical arguments */
2803	for (n = -1; ch < CSI_ICH; )	2822	for (n = -1; ch < CSI_ICH; )
2804	{	2823	{
2805	if (isdigit (ch))	2824	if (isdigit (ch))
2806	{	2825	{
…		…
2816	n = -1;	2835	n = -1;
2817	}	2836	}
2818	else if (IS_CONTROL (ch))	2837	else if (IS_CONTROL (ch))
2819	process_nonprinting (ch);	2838	process_nonprinting (ch);
2820		2839
		2840	prev_ch = ch;
2821	ch = cmd_getc ();	2841	ch = cmd_getc ();
2822	}	2842	}
2823		2843
2824	if (ch > CSI_7F)	2844	if (ch > CSI_7F)
2825	return;	2845	return;
…		…
2864	{	2884	{
2865	/* DECSTR: soft terminal reset, used by our terminfo since 9.06 */	2885	/* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2866	scr_soft_reset ();	2886	scr_soft_reset ();
2867		2887
2868	static const int pm_h[] = { 7, 25 };	2888	static const int pm_h[] = { 7, 25 };
2869	static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 };	2889	static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2870		2890
2871	process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h);	2891	process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2872	process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l);	2892	process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2873	}	2893	}
2874	break;	2894	break;
2875	}	2895	}
2876		2896
2877	return;	2897	return;
…		…
2895	}	2915	}
2896	break;	2916	break;
2897	#endif	2917	#endif
2898		2918
2899	case CSI_CUU: /* 8.3.22: (1) CURSOR UP */	2919	case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2900	case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */	2920	case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2901	arg[0] = -arg[0];	2921	arg[0] = -arg[0];
2902	/* FALLTHROUGH */	2922	/* FALLTHROUGH */
2903	case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */	2923	case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2904	case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */	2924	case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2905	scr_gotorc (arg[0], 0, RELATIVE);	2925	scr_gotorc (arg[0], 0, RELATIVE);
2906	break;	2926	break;
2907		2927
2908	case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */	2928	case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2909	case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */	2929	case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
…		…
3059	scr_insert_mode (1);	3079	scr_insert_mode (1);
3060	else if (arg[0] == 20)	3080	else if (arg[0] == 20)
3061	priv_modes \|= PrivMode_LFNL;	3081	priv_modes \|= PrivMode_LFNL;
3062	break;	3082	break;
3063		3083
		3084	case CSI_71: // DESCUSR: set cursor style
		3085	if (prev_ch == ' ')
		3086	set_cursor_style (arg[0]);
		3087	break;
		3088
3064	/*	3089	/*
3065	* PRIVATE USE beyond this point. All CSI_7? sequences here	3090	* PRIVATE USE beyond this point. All CSI_7? sequences here
3066	*/	3091	*/
3067	case CSI_72: /* DECSTBM: set top and bottom margins */	3092	case CSI_72: /* DECSTBM: set top and bottom margins */
3068	if (nargs == 1)	3093	if (nargs == 1)
…		…
3096	}	3121	}
3097	}	3122	}
3098	/}}} /	3123	/}}} /
3099		3124
3100	#if !ENABLE_MINIMAL	3125	#if !ENABLE_MINIMAL
3101	/* ARGSUSED */
3102	void	3126	void
3103	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3127	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3104	{	3128	{
3105	int x, y;	3129	int x, y;
3106	XWindowAttributes wattr;	3130	XWindowAttributes wattr;
…		…
3115	{	3139	{
3116	/*	3140	/*
3117	* commands	3141	* commands
3118	*/	3142	*/
3119	case 1: /* deiconify window */	3143	case 1: /* deiconify window */
3120	XMapWindow (dpy, parent[0]);	3144	XMapWindow (dpy, parent);
3121	break;	3145	break;
3122	case 2: /* iconify window */	3146	case 2: /* iconify window */
3123	XIconifyWindow (dpy, parent[0], display->screen);	3147	XIconifyWindow (dpy, parent, display->screen);
3124	break;	3148	break;
3125	case 3: /* set position (pixels) */	3149	case 3: /* set position (pixels) */
3126	XMoveWindow (dpy, parent[0], args[1], args[2]);	3150	XMoveWindow (dpy, parent, args[1], args[2]);
3127	break;	3151	break;
3128	case 4: /* set size (pixels) */	3152	case 4: /* set size (pixels) */
3129	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3153	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3130	break;	3154	break;
3131	case 5: /* raise window */	3155	case 5: /* raise window */
3132	XRaiseWindow (dpy, parent[0]);	3156	XRaiseWindow (dpy, parent);
3133	break;	3157	break;
3134	case 6: /* lower window */	3158	case 6: /* lower window */
3135	XLowerWindow (dpy, parent[0]);	3159	XLowerWindow (dpy, parent);
3136	break;	3160	break;
3137	case 7: /* refresh window */	3161	case 7: /* refresh window */
3138	scr_touch (true);	3162	scr_touch (true);
3139	break;	3163	break;
3140	case 8: /* set size (chars) */	3164	case 8: /* set size (chars) */
…		…
3143	break;	3167	break;
3144		3168
3145	//case 9: NYI, TODO, restore maximized window or maximize window	3169	//case 9: NYI, TODO, restore maximized window or maximize window
3146	default:	3170	default:
3147	if (args[0] >= 24) /* set height (chars) */	3171	if (args[0] >= 24) /* set height (chars) */
3148	set_widthheight ((unsigned int)width,	3172	set_widthheight ((unsigned int)vt_width,
3149	(unsigned int) (args[1] * fheight));	3173	(unsigned int) (args[1] * fheight));
3150	break;	3174	break;
3151		3175
3152	/*	3176	/*
3153	* reports - some output format copied from XTerm	3177	* reports - some output format copied from XTerm
3154	*/	3178	*/
3155	case 11: /* report window state */	3179	case 11: /* report window state */
3156	XGetWindowAttributes (dpy, parent[0], &wattr);	3180	XGetWindowAttributes (dpy, parent, &wattr);
3157	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3181	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3158	break;	3182	break;
3159	case 13: /* report window position */	3183	case 13: /* report window position */
3160	XGetWindowAttributes (dpy, parent[0], &wattr);	3184	XGetWindowAttributes (dpy, parent, &wattr);
3161	XTranslateCoordinates (dpy, parent[0], wattr.root,	3185	XTranslateCoordinates (dpy, parent, wattr.root,
3162	-wattr.border_width, -wattr.border_width,	3186	-wattr.border_width, -wattr.border_width,
3163	&x, &y, &wdummy);	3187	&x, &y, &wdummy);
3164	tt_printf ("\033[3;%d;%dt", x, y);	3188	tt_printf ("\033[3;%d;%dt", x, y);
3165	break;	3189	break;
3166	case 14: /* report window size (pixels) */	3190	case 14: /* report window size (pixels) */
3167	XGetWindowAttributes (dpy, parent[0], &wattr);	3191	XGetWindowAttributes (dpy, parent, &wattr);
3168	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3192	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3169	break;	3193	break;
3170	case 18: /* report text area size (chars) */	3194	case 18: /* report text area size (chars) */
3171	tt_printf ("\033[8;%d;%dt", nrow, ncol);	3195	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3172	break;	3196	break;
…		…
3174	tt_printf ("\033[9;%d;%dt", nrow, ncol);	3198	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3175	break;	3199	break;
3176	case 20: /* report icon label */	3200	case 20: /* report icon label */
3177	{	3201	{
3178	char *s;	3202	char *s;
3179	XGetIconName (dpy, parent[0], &s);	3203	XGetIconName (dpy, parent, &s);
3180	tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */	3204	tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3181	XFree (s);	3205	XFree (s);
3182	}	3206	}
3183	break;	3207	break;
3184	case 21: /* report window title */	3208	case 21: /* report window title */
3185	{	3209	{
3186	char *s;	3210	char *s;
3187	XFetchName (dpy, parent[0], &s);	3211	XFetchName (dpy, parent, &s);
3188	tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */	3212	tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3189	XFree (s);	3213	XFree (s);
3190	}	3214	}
3191	break;	3215	break;
3192	}	3216	}
…		…
3346	unsigned long bytes_after;	3370	unsigned long bytes_after;
3347	unsigned char *value = 0;	3371	unsigned char *value = 0;
3348	const char *str = "";	3372	const char *str = "";
3349		3373
3350	if (prop	3374	if (prop
3351	&& XGetWindowProperty (dpy, parent[0],	3375	&& XGetWindowProperty (dpy, parent,
3352	prop, 0, 1<<16, 0, AnyPropertyType,	3376	prop, 0, 1<<16, 0, AnyPropertyType,
3353	&actual_type, &actual_format,	3377	&actual_type, &actual_format,
3354	&nitems, &bytes_after, &value) == Success	3378	&nitems, &bytes_after, &value) == Success
3355	&& actual_type != None	3379	&& actual_type != None
3356	&& actual_format == 8)	3380	&& actual_format == 8)
…		…
3368	{	3392	{
3369	*eq = 0;	3393	*eq = 0;
3370	set_utf8_property (display->atom (str), eq + 1);	3394	set_utf8_property (display->atom (str), eq + 1);
3371	}	3395	}
3372	else	3396	else
3373	XDeleteProperty (dpy, parent[0],	3397	XDeleteProperty (dpy, parent,
3374	display->atom (str));	3398	display->atom (str));
3375	}	3399	}
3376	break;	3400	break;
3377		3401
3378	case XTerm_Color:	3402	case XTerm_Color:
…		…
3432	break;	3456	break;
3433	#endif	3457	#endif
3434	case URxvt_Color_border:	3458	case URxvt_Color_border:
3435	process_color_seq (op, Color_border, str, resp);	3459	process_color_seq (op, Color_border, str, resp);
3436	break;	3460	break;
3437	#if ENABLE_TRANSPARENCY	3461
		3462	#if BG_IMAGE_FROM_ROOT
3438	case URxvt_Color_tint:	3463	case URxvt_Color_tint:
3439	process_color_seq (op, Color_tint, str, resp);	3464	process_color_seq (op, Color_tint, str, resp);
3440	{	3465	{
3441	bool changed = false;	3466	bool changed = false;
3442		3467
3443	if (ISSET_PIXCOLOR (Color_tint))	3468	if (ISSET_PIXCOLOR (Color_tint))
3444	changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);	3469	changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3445	else
3446	changed = bgPixmap.unset_tint ();
3447		3470
3448	if (changed)	3471	if (changed)
3449	update_background ();	3472	update_background ();
3450	}	3473	}
3451		3474
…		…
3455	#if BG_IMAGE_FROM_FILE	3478	#if BG_IMAGE_FROM_FILE
3456	case Rxvt_Pixmap:	3479	case Rxvt_Pixmap:
3457	if (!strcmp (str, "?"))	3480	if (!strcmp (str, "?"))
3458	{	3481	{
3459	char str[256];	3482	char str[256];
		3483	int h_scale = fimage.h_scale;
		3484	int v_scale = fimage.v_scale;
		3485	int h_align = fimage.h_align;
		3486	int v_align = fimage.v_align;
3460		3487
3461	sprintf (str, "[%dx%d+%d+%d]",	3488	sprintf (str, "[%dx%d+%d+%d]",
3462	min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),	3489	h_scale, v_scale,
3463	min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));	3490	h_align, v_align);
3464	process_xterm_seq (XTerm_title, str, CHAR_ST);	3491	process_xterm_seq (XTerm_title, str, CHAR_ST);
3465	}	3492	}
3466	else	3493	else
3467	{	3494	{
3468	int changed = 0;	3495	bool changed = false;
3469		3496
3470	if (*str != ';')	3497	if (*str != ';')
3471	{	3498	{
3472	if (bgPixmap.set_file (str)) /* change pixmap */	3499	try
3473	{	3500	{
		3501	fimage.set_file_geometry (this, str);
3474	changed++;	3502	changed = true;
3475	str = strchr (str, ';');
3476	if (str == NULL)
3477	bgPixmap.set_defaultGeometry ();
3478	else	3503	}
3479	bgPixmap.set_geometry (str+1);	3504	catch (const class rxvt_failure_exception &e)
		3505	{
3480	}	3506	}
3481	}	3507	}
3482	else	3508	else
3483	{	3509	{
3484	str++;	3510	str++;
3485	if (bgPixmap.set_geometry (str, true))	3511	if (fimage.set_geometry (str, true))
3486	changed++;	3512	changed = true;
3487	}	3513	}
3488		3514
3489	if (changed)	3515	if (changed)
3490	{	3516	{
3491	if (bgPixmap.window_position_sensitive ())	3517	if (bg_window_position_sensitive ())
3492	{	3518	{
3493	int x, y;	3519	int x, y;
3494	get_window_origin (x, y);	3520	get_window_origin (x, y);
3495	bgPixmap.set_position (x, y);	3521	parent_x = x;
		3522	parent_y = y;
3496	}	3523	}
3497	update_background ();	3524	update_background ();
3498	}	3525	}
3499	}	3526	}
3500	break;	3527	break;
…		…
3590	* 's' = save	3617	* 's' = save
3591	* 'r' = restore	3618	* 'r' = restore
3592	* 't' = toggle	3619	* 't' = toggle
3593	* so no need for fancy checking	3620	* so no need for fancy checking
3594	*/	3621	*/
3595	int	3622	int ecb_cold
3596	rxvt_term::privcases (int mode, unsigned long bit)	3623	rxvt_term::privcases (int mode, unsigned long bit)
3597	{	3624	{
3598	int state;	3625	int state;
3599		3626
3600	if (mode == 's')	3627	if (mode == 's')
3601	{	3628	{
3602	SavedModes \|= (priv_modes & bit);	3629	if (priv_modes & bit)
		3630	SavedModes \|= bit;
		3631	else
		3632	SavedModes &= ~bit;
3603	return -1;	3633	return -1;
3604	}	3634	}
3605	else	3635	else
3606	{	3636	{
3607	if (mode == 'r')	3637	if (mode == 'r')
3608	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */	3638	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3609	else	3639	else
3610	state = (mode == 't') ? ! (priv_modes & bit) : mode;	3640	state = (mode == 't') ? ! (priv_modes & bit) : mode;
3611		3641
3612	set_privmode (bit, state);	3642	if (state)
		3643	priv_modes \|= bit;
		3644	else
		3645	priv_modes &= ~bit;
3613	}	3646	}
3614		3647
3615	return state;	3648	return state;
3616	}	3649	}
3617		3650
3618	/* we're not using priv _yet_ */	3651	/* we're not using priv _yet_ */
3619	void	3652	void
3620	rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)	3653	rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3621	{	3654	{
3622	unsigned int i, j;	3655	unsigned int i, j;
3623	int state;	3656	int state;
3624		3657
3625	static const struct	3658	static const struct
3626	{	3659	{
3627	const int argval;	3660	const int argval;
3628	const unsigned long bit;	3661	const unsigned long bit;
3629	} argtopriv[] = {	3662	} argtopriv[] = {
3630	{ 1, PrivMode_aplCUR }, // DECCKM	3663	{ 1, PrivMode_aplCUR }, // DECCKM
3631	{ 2, PrivMode_vt52 },	3664	{ 2, PrivMode_vt52 }, // DECANM
3632	{ 3, PrivMode_132 }, // DECCOLM	3665	{ 3, PrivMode_132 }, // DECCOLM
3633	{ 4, PrivMode_smoothScroll }, // DECSCLM	3666	{ 4, PrivMode_smoothScroll }, // DECSCLM
3634	{ 5, PrivMode_rVideo }, // DECSCNM	3667	{ 5, PrivMode_rVideo }, // DECSCNM
3635	{ 6, PrivMode_relOrigin }, // DECOM	3668	{ 6, PrivMode_relOrigin }, // DECOM
3636	{ 7, PrivMode_Autowrap }, // DECAWM	3669	{ 7, PrivMode_Autowrap }, // DECAWM
3637	// 8, auto-repeat keys // DECARM	3670	// 8, auto-repeat keys // DECARM
3638	{ 9, PrivMode_MouseX10 },	3671	{ 9, PrivMode_MouseX10 },
3639	// 18 end FF to printer after print screen	3672	// 18 end FF to printer after print screen
3640	// 19 Print screen prints full screen/scroll region	3673	// 19 Print screen prints full screen/scroll region
3641	{ 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis	3674	{ 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3642	#ifdef scrollBar_esc	3675	#ifdef scrollBar_esc
3643	{ scrollBar_esc, PrivMode_scrollBar },	3676	{ scrollBar_esc, PrivMode_scrollBar },
3644	#endif	3677	#endif
3645	{ 35, PrivMode_ShiftKeys }, // rxvt extension	3678	{ 35, PrivMode_ShiftKeys }, // rxvt extension
3646	// 38, tektronix mode // DECTEK	3679	// 38, tektronix mode // DECTEK
3647	{ 40, PrivMode_132OK },	3680	{ 40, PrivMode_132OK },
3648	// 41 xterm more fixes NYI	3681	// 41 xterm more fixes NYI
3649	// 45 margin bell NYI	3682	// 45 margin bell NYI
3650	// 46 start logging	3683	// 46 start logging
3651	{ 47, PrivMode_Screen },	3684	{ 47, PrivMode_Screen },
3652	{ 66, PrivMode_aplKP }, // DECPAM/DECPNM	3685	{ 66, PrivMode_aplKP }, // DECNKM
3653	#ifndef NO_BACKSPACE_KEY	3686	#ifndef NO_BACKSPACE_KEY
3654	{ 67, PrivMode_BackSpace }, // DECBKM	3687	{ 67, PrivMode_BackSpace }, // DECBKM
3655	#endif	3688	#endif
3656	{ 1000, PrivMode_MouseX11 },	3689	{ 1000, PrivMode_MouseX11 },
3657	{ 1002, PrivMode_MouseBtnEvent },	3690	{ 1002, PrivMode_MouseBtnEvent },
3658	{ 1003, PrivMode_MouseAnyEvent },	3691	{ 1003, PrivMode_MouseAnyEvent },
		3692	#if ENABLE_FRILLS
		3693	{ 1005, PrivMode_ExtModeMouse },
		3694	#endif
3659	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension	3695	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension
3660	{ 1011, PrivMode_Keypress }, // rxvt extension	3696	{ 1011, PrivMode_Keypress }, // rxvt extension
		3697	#if ENABLE_FRILLS
		3698	{ 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
		3699	#endif
3661	// 1035 enable modifiers for alt, numlock NYI	3700	// 1035 enable modifiers for alt, numlock NYI
3662	// 1036 send ESC for meta keys NYI	3701	// 1036 send ESC for meta keys NYI
3663	// 1037 send DEL for keypad delete NYI	3702	// 1037 send DEL for keypad delete NYI
3664	{ 1047, PrivMode_Screen },	3703	{ 1047, PrivMode_Screen },
3665	// 1048 save and restore cursor	3704	// 1048 save and restore cursor, implemented in code
3666	{ 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */	3705	{ 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3667	// 1051, 1052, 1060, 1061 keyboard emulation NYI	3706	// 1051, 1052, 1060, 1061 keyboard emulation NYI
3668	{ 2004, PrivMode_BracketPaste },	3707	{ 2004, PrivMode_BracketPaste },
3669	};	3708	};
3670		3709
…		…
3680	for (i = 0; i < nargs; i++)	3719	for (i = 0; i < nargs; i++)
3681	{	3720	{
3682	state = -1;	3721	state = -1;
3683		3722
3684	/* basic handling */	3723	/* basic handling */
3685	for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++)	3724	for (j = 0; j < ecb_array_length (argtopriv); j++)
3686	if (argtopriv[j].argval == arg[i])	3725	if (argtopriv[j].argval == arg[i])
3687	{	3726	{
3688	state = privcases (mode, argtopriv[j].bit);	3727	state = privcases (mode, argtopriv[j].bit);
3689	break;	3728	break;
3690	}	3729	}
…		…
3716	case 2: /* VT52 mode */	3755	case 2: /* VT52 mode */
3717	/* oddball mode. should be set regardless of set/reset	3756	/* oddball mode. should be set regardless of set/reset
3718	* parameter. Return from VT52 mode with an ESC < from	3757	* parameter. Return from VT52 mode with an ESC < from
3719	* within VT52 mode	3758	* within VT52 mode
3720	*/	3759	*/
3721	set_privmode (PrivMode_vt52, 1);	3760	priv_modes \|= PrivMode_vt52;
3722	break;	3761	break;
3723	case 3: /* 80/132 */	3762	case 3: /* 80/132 */
3724	if (priv_modes & PrivMode_132OK)	3763	if (priv_modes & PrivMode_132OK)
3725	set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);	3764	set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3726	break;	3765	break;
…		…
3741	if (state) /* orthogonal */	3780	if (state) /* orthogonal */
3742	priv_modes &= ~(PrivMode_MouseX11\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);	3781	priv_modes &= ~(PrivMode_MouseX11\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);
3743	break;	3782	break;
3744	#ifdef scrollBar_esc	3783	#ifdef scrollBar_esc
3745	case scrollBar_esc:	3784	case scrollBar_esc:
3746	if (scrollBar.map (state))	3785	scrollBar.map (state);
3747	{
3748	resize_all_windows (0, 0, 0);	3786	resize_all_windows (0, 0, 0);
3749	scr_touch (true);	3787	scr_touch (true);
3750	}
3751	break;	3788	break;
3752	#endif	3789	#endif
3753	case 25: /* visible/invisible cursor */	3790	case 25: /* visible/invisible cursor */
3754	scr_cursor_visible (state);	3791	scr_cursor_visible (state);
3755	break;	3792	break;
…		…
3768	case 1003:	3805	case 1003:
3769	if (state)	3806	if (state)
3770	{	3807	{
3771	priv_modes &= ~(PrivMode_MouseX10\|PrivMode_MouseX11);	3808	priv_modes &= ~(PrivMode_MouseX10\|PrivMode_MouseX11);
3772	priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;	3809	priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
		3810	mouse_row = mouse_col = 0;
3773	vt_emask_mouse = PointerMotionMask;	3811	vt_emask_mouse = PointerMotionMask;
3774	}	3812	}
3775	else	3813	else
3776	vt_emask_mouse = NoEventMask;	3814	vt_emask_mouse = NoEventMask;
3777		3815
…		…
3809	}	3847	}
3810	}	3848	}
3811	/}}} /	3849	/}}} /
3812		3850
3813	/{{{ process sgr sequences /	3851	/{{{ process sgr sequences /
3814	void	3852	void ecb_hot
3815	rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)	3853	rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3816	{	3854	{
3817	unsigned int i;	3855	unsigned int i;
3818	short rendset;	3856	short rendset;
3819	int rendstyle;	3857	int rendstyle;
…		…
3960	break;	3998	break;
3961	#endif	3999	#endif
3962	}	4000	}
3963	}	4001	}
3964	}	4002	}
3965	/}}} /
3966		4003
3967	/{{{ (do not) process Rob Nation's own graphics mode sequences /
3968	void	4004	void
3969	rxvt_term::process_graphics ()	4005	rxvt_term::set_cursor_style (int style)
3970	{	4006	{
3971	unicode_t ch, cmd = cmd_getc ();	4007	if (!IN_RANGE_INC (style, 0, 4))
3972
3973	if (cmd == 'Q')
3974	{
3975	/* query graphics */
3976	tt_printf ("\033G0\012"); /* no graphics */
3977	return;	4008	return;
3978	}	4009
3979	/* swallow other graphics sequences until terminating ':' */	4010	set_option (Opt_cursorUnderline, style >= 3);
3980	do	4011
3981	ch = cmd_getc ();	4012	#ifdef CURSOR_BLINK
3982	while (ch != ':');	4013	set_option (Opt_cursorBlink, !style \|\| (style & 1));
		4014	cursor_blink_reset ();
		4015	#endif
		4016
		4017	want_refresh = 1;
3983	}	4018	}
3984	/}}} /	4019	/}}} /
3985		4020
3986	/* ------------------------------------------------------------------------- */	4021	/* ------------------------------------------------------------------------- */
3987		4022
…		…
4003		4038
4004	/* ---------------------------------------------------------------------- */	4039	/* ---------------------------------------------------------------------- */
4005	/* Write data to the pty as typed by the user, pasted with the mouse,	4040	/* Write data to the pty as typed by the user, pasted with the mouse,
4006	* or generated by us in response to a query ESC sequence.	4041	* or generated by us in response to a query ESC sequence.
4007	*/	4042	*/
4008	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT	4043	static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4009		4044
4010	void	4045	void
4011	rxvt_term::tt_write (const char *data, unsigned int len)	4046	rxvt_term::tt_write (const char *data, unsigned int len)
4012	{	4047	{
4013	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))	4048	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
…		…
4018		4053
4019	if (v_buflen == 0)	4054	if (v_buflen == 0)
4020	{	4055	{
4021	ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));	4056	ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4022		4057
		4058	max_it (written, 0);
		4059
4023	if ((unsigned int)written == len)	4060	if (written == len)
4024	return;	4061	return;
4025		4062
4026	data += written;	4063	data += written;
4027	len -= written;	4064	len -= written;
4028	}	4065	}
4029		4066
4030	v_buffer = (char *)realloc (v_buffer, v_buflen + len);	4067	v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4031		4068
4032	memcpy (v_buffer + v_buflen, data, len);	4069	memcpy (v_buffer + v_buflen, data, len);
4033	v_buflen += len;	4070	v_buflen += len;
4034		4071
4035	pty_ev.set (ev::READ \| ev::WRITE);	4072	pty_ev.set (ev::READ \| ev::WRITE);

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.460 by sf-exg, Fri Nov 19 23:29:30 2010 UTC vs. Revision 1.535 by root, Wed Mar 27 17:24:15 2013 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.460 by sf-exg, Fri Nov 19 23:29:30 2010 UTC vs.
Revision 1.535 by root, Wed Mar 27 17:24:15 2013 UTC