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.454 by sf-exg, Sat Aug 21 16:07:15 2010 UTC vs.
Revision 1.522 by sf-exg, Mon Jun 11 14:45:53 2012 UTC

…		…
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
…		…
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	}
…		…
771		770
772	default:	771	default:
773	{	772	{
774	int param = map_function_key (keysym);	773	int param = map_function_key (keysym);
775	if (param > 0)	774	if (param > 0)
776	{
777	int n = sprintf (kbuf,"\033[%d~", param);	775	sprintf (kbuf,"\033[%d~", param);
778	/*
779	* pass Shift/Control indicators for function keys ending with `~'
780	*
781	* eg,
782	* Prior = "ESC[5~"
783	* Shift+Prior = "ESC[5$"
784	* Ctrl+Prior = "ESC[5^"
785	* Ctrl+Shift+Prior = "ESC[5@"
786	*/
787	kbuf[n-1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
788	}
789	else	776	else
790	newlen = 0;	777	newlen = 0;
791	}	778	}
792	break;	779	break;
793	}	780	}
794		781
795	if (newlen)	782	if (newlen)
796	len = strlen (kbuf);	783	len = strlen (kbuf);
797		784
		785	if (len > 0)
		786	{
798	/*	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	/*
799	* Pass meta for all function keys, if 'meta' option set	800	* Pass meta for all function keys, if 'meta' option set
800	*/	801	*/
801	#ifdef META8_OPTION	802	#ifdef META8_OPTION
802	if (meta && (meta_char == 0x80) && len > 0)	803	if (meta && (meta_char == 0x80))
803	kbuf[len - 1] |= 0x80;	804	kbuf[len - 1] |= 0x80;
804	#endif	805	#endif
		806	}
805		807
806	}	808	}
807	else if (ctrl && keysym == XK_minus)	809	else if (ctrl && keysym == XK_minus)
808	{	810	{
809	len = 1;	811	len = 1;
…		…
843	{	845	{
844	view_start = 0;	846	view_start = 0;
845	want_refresh = 1;	847	want_refresh = 1;
846	}	848	}
847		849
848	/*
849	* Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
850	*/
851
852	/* escape prefix */	850	/* escape prefix */
853	if (meta	851	if (meta
854	#ifdef META8_OPTION	852	#ifdef META8_OPTION
855	&& meta_char == C0_ESC	853	&& meta_char == C0_ESC
856	#endif	854	#endif
…		…
861	}	859	}
862		860
863	tt_write (kbuf, (unsigned int)len);	861	tt_write (kbuf, (unsigned int)len);
864	}	862	}
865		863
866	void	864	void ecb_cold
867	rxvt_term::key_release (XKeyEvent &ev)	865	rxvt_term::key_release (XKeyEvent &ev)
868	{	866	{
869	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL	867	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
870	KeySym keysym;	868	KeySym keysym;
871		869
…		…
891	commit_iso14755 ();	889	commit_iso14755 ();
892		890
893	return;	891	return;
894	}	892	}
895		893
896	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)	894	for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
897	if (i[0] == keysym)	895	if (i[0] == keysym)
898	{	896	{
899	iso14755buf = ISO_14755_51 | i[1];	897	iso14755buf = ISO_14755_51 | i[1];
900	commit_iso14755 ();	898	commit_iso14755 ();
901		899
…		…
938	else if (keysym == XK_Control_L || keysym == XK_Control_R)	936	else if (keysym == XK_Control_L || keysym == XK_Control_R)
939	mouse_slip_wheel_speed = 0;	937	mouse_slip_wheel_speed = 0;
940	#endif	938	#endif
941	}	939	}
942		940
943	#if defined (KEYSYM_RESOURCE)
944	unsigned int
945	rxvt_term::cmd_write (const char *str, unsigned int count)
946	{
947	unsigned int n, s;
948
949	n = cmdbuf_ptr - cmdbuf_base;
950	s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
951
952	if (n > 0 && s < count)
953	{
954	memmove (cmdbuf_base, cmdbuf_ptr,
955	(unsigned int) (cmdbuf_endp - cmdbuf_ptr));
956	cmdbuf_ptr = cmdbuf_base;
957	cmdbuf_endp -= n;
958	s += n;
959	}
960
961	if (count > s)
962	{
963	rxvt_warn ("data loss: cmd_write too large, continuing.\n");
964	count = s;
965	}
966
967	for (; count--;)
968	*cmdbuf_endp++ = *str++;
969
970	cmd_parse ();
971
972	return 0;
973	}
974	#endif
975
976	void	941	void
977	rxvt_term::flush ()	942	rxvt_term::flush ()
978	{	943	{
979	flush_ev.stop ();	944	flush_ev.stop ();
980		945
981	#ifdef HAVE_BG_PIXMAP	946	#ifdef HAVE_BG_PIXMAP
982	if (bgPixmap.check_clearChanged ())	947	if (bg_flags & BG_NEEDS_REFRESH)
983	{	948	{
984	// scr_clear (true); This needs to be researched further!	949	bg_flags &= ~BG_NEEDS_REFRESH;
985	scr_touch (false);	950	scr_touch (false);
986	}	951	}
987	#endif	952	#endif
988		953
989	if (want_refresh)	954	if (want_refresh)
…		…
1026	while (row < end_row);	991	while (row < end_row);
1027	}	992	}
1028		993
1029	scr_refresh ();	994	scr_refresh ();
1030	scrollBar.show (1);	995	scrollBar.show (1);
1031	#ifdef USE_XIM	996	#if USE_XIM
1032	IMSendSpot ();	997	im_send_spot ();
1033	#endif	998	#endif
1034	}	999	}
1035		1000
1036	display->flush ();	1001	display->flush ();
1037	}	1002	}
…		…
1055	flush ();	1020	flush ();
1056	}	1021	}
1057		1022
1058	#ifdef CURSOR_BLINK	1023	#ifdef CURSOR_BLINK
1059	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
1060	rxvt_term::cursor_blink_cb (ev::timer &w, int revents)	1040	rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1061	{	1041	{
1062	hidden_cursor = !hidden_cursor;	1042	hidden_cursor = !hidden_cursor;
1063	want_refresh = 1;	1043	want_refresh = 1;
1064	refresh_check ();	1044	refresh_check ();
…		…
1082		1062
1083	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	1063	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1084	void	1064	void
1085	rxvt_term::cont_scroll_cb (ev::timer &w, int revents)	1065	rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1086	{	1066	{
1087	if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)	1067	if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1088	&& scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))	1068	&& scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1089	{	1069	{
1090	want_refresh = 1;	1070	want_refresh = 1;
1091	refresh_check ();	1071	refresh_check ();
1092	}	1072	}
1093	else	1073	else
…		…
1154	{	1134	{
1155	}	1135	}
1156	} event_handler;	1136	} event_handler;
1157	#endif	1137	#endif
1158		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
1159	bool	1172	bool
1160	rxvt_term::pty_fill ()	1173	rxvt_term::pty_fill ()
1161	{	1174	{
1162	ssize_t n = cmdbuf_endp - cmdbuf_ptr;	1175	cmdbuf_reify ();
1163		1176
1164	if (CBUFSIZ == n)	1177	size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1165	{	1178
1166	rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");	1179	if (!avail)
1167	n = 0;
1168	}	1180	{
1169		1181	// normally this indicates a "too long" command sequence - just drop the data we have
1170	memmove (cmdbuf_base, cmdbuf_ptr, n);
1171	cmdbuf_ptr = cmdbuf_base;	1182	cmdbuf_ptr = cmdbuf_base;
1172	cmdbuf_endp = cmdbuf_ptr + n;	1183	cmdbuf_endp = cmdbuf_ptr;
		1184	avail = CBUFSIZ;
		1185	}
1173		1186
1174	ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);	1187	ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1175		1188
1176	if (r > 0)	1189	if (r > 0)
1177	{	1190	{
1178	cmdbuf_endp += r;	1191	cmdbuf_endp += r;
1179	return true;	1192	return true;
…		…
1210	pty_write ();	1223	pty_write ();
1211		1224
1212	refresh_check ();	1225	refresh_check ();
1213	}	1226	}
1214		1227
1215	void	1228	void ecb_cold
1216	rxvt_term::pointer_unblank ()	1229	rxvt_term::pointer_unblank ()
1217	{	1230	{
1218	XDefineCursor (dpy, vt, TermWin_cursor);	1231	XDefineCursor (dpy, vt, TermWin_cursor);
1219	recolour_cursor ();	1232	recolour_cursor ();
1220		1233
…		…
1225	pointer_ev.start (pointerBlankDelay);	1238	pointer_ev.start (pointerBlankDelay);
1226	#endif	1239	#endif
1227	}	1240	}
1228		1241
1229	#ifdef POINTER_BLANK	1242	#ifdef POINTER_BLANK
1230	void	1243	void ecb_cold
1231	rxvt_term::pointer_blank ()	1244	rxvt_term::pointer_blank ()
1232	{	1245	{
1233	if (!option (Opt_pointerBlank))	1246	if (!option (Opt_pointerBlank))
1234	return;	1247	return;
1235		1248
…		…
1237	XFlush (dpy);	1250	XFlush (dpy);
1238		1251
1239	hidden_pointer = 1;	1252	hidden_pointer = 1;
1240	}	1253	}
1241		1254
1242	void	1255	void ecb_cold
1243	rxvt_term::pointer_cb (ev::timer &w, int revents)	1256	rxvt_term::pointer_cb (ev::timer &w, int revents)
1244	{	1257	{
1245	make_current ();	1258	make_current ();
1246		1259
1247	pointer_blank ();	1260	pointer_blank ();
…		…
1253	{	1266	{
1254	int button_number, key_state = 0;	1267	int button_number, key_state = 0;
1255	int x, y;	1268	int x, y;
1256	int code = 32;	1269	int code = 32;
1257		1270
1258	x = Pixel2Col (ev.x);	1271	x = Pixel2Col (ev.x) + 1;
1259	y = Pixel2Row (ev.y);	1272	y = Pixel2Row (ev.y) + 1;
		1273
1260	if (ev.type == MotionNotify)	1274	if (ev.type == MotionNotify)
1261	{	1275	{
1262	if (x == mouse_row && y == mouse_col)	1276	if (x == mouse_row && y == mouse_col)
1263	return;	1277	return;
		1278
1264	mouse_row = x;	1279	mouse_row = x;
1265	mouse_col = y;	1280	mouse_col = y;
1266	code += 32;	1281	code += 32;
1267	}	1282	}
1268		1283
…		…
1271	else	1286	else
1272	{	1287	{
1273	button_number = MEvent.button - Button1;	1288	button_number = MEvent.button - Button1;
1274	/* add 0x3D for wheel events, like xterm does */	1289	/* add 0x3D for wheel events, like xterm does */
1275	if (button_number >= 3)	1290	if (button_number >= 3)
1276	button_number += (64 - 3);	1291	button_number += 64 - 3;
1277	}	1292	}
1278		1293
1279	if (priv_modes & PrivMode_MouseX10)	1294	if (priv_modes & PrivMode_MouseX10)
1280	{	1295	{
1281	/*	1296	/*
…		…
1313	fputc ('A', stderr);	1328	fputc ('A', stderr);
1314	if (key_state & 32)	1329	if (key_state & 32)
1315	fputc ('2', stderr);	1330	fputc ('2', stderr);
1316	fprintf (stderr, "]: <%d>, %d/%d\n",	1331	fprintf (stderr, "]: <%d>, %d/%d\n",
1317	button_number,	1332	button_number,
1318	x + 1,	1333	x,
1319	y + 1);	1334	y);
1320	#endif	1335	#endif
1321		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
1322	tt_printf ("\033[M%c%c%c",	1350	tt_printf ("\033[M%c%c%c",
1323	(code + button_number + key_state),	1351	code + button_number + key_state,
1324	(32 + x + 1),	1352	32 + x,
1325	(32 + y + 1));	1353	32 + y);
1326	}	1354	}
1327		1355
1328	/*{{{ process an X event */	1356	/*{{{ process an X event */
1329	void	1357	void ecb_hot
1330	rxvt_term::x_cb (XEvent &ev)	1358	rxvt_term::x_cb (XEvent &ev)
1331	{	1359	{
1332	make_current ();	1360	make_current ();
1333		1361
1334	dLocal (Display *, dpy);	1362	dLocal (Display *, dpy);
…		…
1432	&& ev.xfocus.mode != NotifyGrab)	1460	&& ev.xfocus.mode != NotifyGrab)
1433	focus_out ();	1461	focus_out ();
1434	break;	1462	break;
1435		1463
1436	case ConfigureNotify:	1464	case ConfigureNotify:
1437	/*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1438	ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1439	szHint.width, szHint.height);*/
1440	if (ev.xconfigure.window == parent[0])	1465	if (ev.xconfigure.window == parent)
1441	{	1466	{
1442	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))	1467	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1443	;	1468	;
		1469
		1470	bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
		1471
		1472	#ifdef HAVE_BG_PIXMAP
		1473	if (bg_window_position_sensitive ())
		1474	want_position_change = true;
		1475	#endif
		1476
		1477	bool moved = false;
		1478
		1479	if (want_position_change)
		1480	{
		1481	int x, y;
		1482
		1483	if (ev.xconfigure.send_event)
		1484	{
		1485	x = ev.xconfigure.x;
		1486	y = ev.xconfigure.y;
		1487	}
		1488	else
		1489	get_window_origin (x, y);
		1490
		1491	if (x != parent_x || y != parent_y)
		1492	{
		1493	parent_x = x;
		1494	parent_y = y;
		1495	HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
		1496	moved = true;
		1497	}
		1498
		1499	if (!(bg_flags & BG_IS_VALID))
		1500	moved = true;
		1501	}
1444		1502
1445	if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)	1503	if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1446	{	1504	{
1447	seen_resize = 1;	1505	seen_resize = 1;
1448	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1506	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1449	}	1507	}
1450	else	1508	else
1451	{	1509	{
1452	#ifdef HAVE_BG_PIXMAP	1510	#ifdef HAVE_BG_PIXMAP
1453	if (bgPixmap.window_position_sensitive ())
1454	{
1455	if (mapped)	1511	if (moved)
1456	update_background ();	1512	update_background ();
1457	else
1458	bgPixmap.invalidate ();
1459	}
1460	#endif	1513	#endif
1461	}	1514	}
1462		1515
1463	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));	1516	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1464	}	1517	}
1465	break;	1518	break;
1466		1519
1467	case PropertyNotify:	1520	case PropertyNotify:
1468	if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))	1521	HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1469	if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1470	&& ev.xproperty.state == PropertyNewValue)
1471	selection_property (ev.xproperty.window, ev.xproperty.atom);
1472
1473	break;	1522	break;
1474		1523
1475	case SelectionClear:	1524	case SelectionClear:
1476	selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);	1525	selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1477	break;
1478
1479	case SelectionNotify:
1480	if (selection_wait == Sel_normal)
1481	selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1482	break;	1526	break;
1483		1527
1484	case SelectionRequest:	1528	case SelectionRequest:
1485	selection_send (ev.xselectionrequest);	1529	selection_send (ev.xselectionrequest);
1486	break;	1530	break;
…		…
1497	* by scheduling background redraw as soon as we can, but giving a short	1541	* by scheduling background redraw as soon as we can, but giving a short
1498	* bit of time for ConfigureNotifies to arrive.	1542	* bit of time for ConfigureNotifies to arrive.
1499	* We should render background PRIOR to drawing any text, but AFTER all	1543	* We should render background PRIOR to drawing any text, but AFTER all
1500	* of ConfigureNotifys for the best results.	1544	* of ConfigureNotifys for the best results.
1501	*/	1545	*/
1502	if (bgPixmap.flags & bgPixmap_t::isInvalid)	1546	if (!(bg_flags & BG_IS_VALID))
1503	update_background_ev.start (0.025);	1547	update_background_ev.start (0.025);
1504	#endif	1548	#endif
1505	mapped = 1;	1549	mapped = 1;
1506	#ifdef TEXT_BLINK	1550	#ifdef TEXT_BLINK
1507	text_blink_ev.start ();	1551	text_blink_ev.start ();
…		…
1522	if (ev.xany.window == vt)	1566	if (ev.xany.window == vt)
1523	{	1567	{
1524	do	1568	do
1525	{	1569	{
1526	scr_expose (ev.xexpose.x, ev.xexpose.y,	1570	scr_expose (ev.xexpose.x, ev.xexpose.y,
1527	ev.xexpose.width, ev.xexpose.height, False);	1571	ev.xexpose.width, ev.xexpose.height, false);
1528	}	1572	}
1529	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));	1573	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1530		1574
1531	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1575	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1532		1576
1533	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))	1577	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1534	{	1578	{
1535	scr_expose (ev.xexpose.x, ev.xexpose.y,	1579	scr_expose (ev.xexpose.x, ev.xexpose.y,
1536	ev.xexpose.width, ev.xexpose.height, False);	1580	ev.xexpose.width, ev.xexpose.height, false);
1537	}	1581	}
1538		1582
1539	want_refresh = 1;	1583	want_refresh = 1;
1540	}	1584	}
1541	else	1585	else
…		…
1547	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))	1591	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1548	;	1592	;
1549		1593
1550	if (scrollBar.state && ev.xany.window == scrollBar.win)	1594	if (scrollBar.state && ev.xany.window == scrollBar.win)
1551	{	1595	{
1552	scrollBar.state = STATE_IDLE;	1596	scrollBar.state = SB_STATE_IDLE;
1553	scrollBar.show (0);	1597	scrollBar.show (0);
1554	}	1598	}
1555	}	1599	}
1556	break;	1600	break;
1557		1601
…		…
1623	dist = int_bwidth - ev.xbutton.y;	1667	dist = int_bwidth - ev.xbutton.y;
1624	}	1668	}
1625	else	1669	else
1626	{	1670	{
1627	scroll_selection_dir = DN;	1671	scroll_selection_dir = DN;
1628	dist = ev.xbutton.y - (int_bwidth + height);	1672	dist = ev.xbutton.y - (int_bwidth + vt_height);
1629	}	1673	}
1630		1674
1631	scroll_selection_lines = Pixel2Height (dist)	1675	scroll_selection_lines = Pixel2Height (dist)
1632	/ SELECTION_SCROLL_LINE_SPEEDUP	1676	/ SELECTION_SCROLL_LINE_SPEEDUP
1633	+ 1;	1677	+ 1;
…		…
1645	#ifdef MOUSE_THRESHOLD	1689	#ifdef MOUSE_THRESHOLD
1646	}	1690	}
1647	#endif	1691	#endif
1648	}	1692	}
1649	}	1693	}
1650	else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)	1694	else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1651	{	1695	{
1652	while (XCheckTypedWindowEvent (dpy, scrollBar.win,	1696	while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1653	MotionNotify, &ev))	1697	MotionNotify, &ev))
1654	;	1698	;
1655		1699
1656	XQueryPointer (dpy, scrollBar.win,	1700	XQueryPointer (dpy, scrollBar.win,
1657	&unused_root, &unused_child,	1701	&unused_root, &unused_child,
1658	&unused_root_x, &unused_root_y,	1702	&unused_root_x, &unused_root_y,
1659	&ev.xbutton.x, &ev.xbutton.y,	1703	&ev.xbutton.x, &ev.xbutton.y,
1660	&unused_mask);	1704	&unused_mask);
1661	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1705	scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1662	scrollBar.size ());	1706	scrollBar.size ());
1663	want_refresh = 1;	1707	want_refresh = 1;
1664	scrollBar.show (1);	1708	scrollBar.show (1);
1665	}	1709	}
1666	break;	1710	break;
1667	}	1711	}
1668		1712
1669	#if defined(CURSOR_BLINK)	1713	#if defined(CURSOR_BLINK)
1670	if (option (Opt_cursorBlink) && ev.type == KeyPress)	1714	if (ev.type == KeyPress)
1671	{
1672	if (hidden_cursor)
1673	{
1674	hidden_cursor = 0;
1675	want_refresh = 1;
1676	}
1677
1678	cursor_blink_ev.again ();	1715	cursor_blink_reset ();
1679	}
1680	#endif	1716	#endif
1681		1717
1682	#if defined(POINTER_BLANK)	1718	#if defined(POINTER_BLANK)
1683	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)	1719	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1684	{	1720	{
…		…
1695		1731
1696	refresh_check ();	1732	refresh_check ();
1697	}	1733	}
1698		1734
1699	#if ENABLE_FRILLS	1735	#if ENABLE_FRILLS
1700	void	1736	void ecb_cold
1701	rxvt_term::set_urgency (bool enable)	1737	rxvt_term::set_urgency (bool enable)
1702	{	1738	{
1703	if (enable == urgency_hint)	1739	if (enable == urgency_hint)
1704	return;	1740	return;
1705		1741
1706	if (XWMHints *h = XGetWMHints (dpy, parent[0]))	1742	if (XWMHints *h = XGetWMHints (dpy, parent))
1707	{	1743	{
1708	h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);	1744	h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1709	XSetWMHints (dpy, parent[0], h);	1745	XSetWMHints (dpy, parent, h);
1710	urgency_hint = enable;	1746	urgency_hint = enable;
		1747	XFree (h);
1711	}	1748	}
1712	}	1749	}
1713	#endif	1750	#endif
1714		1751
1715	void	1752	void ecb_cold
1716	rxvt_term::focus_in ()	1753	rxvt_term::focus_in ()
1717	{	1754	{
1718	if (!focus)	1755	if (!focus)
1719	{	1756	{
1720	focus = 1;	1757	focus = 1;
1721	want_refresh = 1;	1758	want_refresh = 1;
1722		1759
1723	#if USE_XIM	1760	#if USE_XIM
1724	if (Input_Context != NULL)	1761	if (Input_Context != NULL)
1725	{	1762	{
1726	IMSetPosition ();	1763	im_set_position ();
1727	XSetICFocus (Input_Context);	1764	XSetICFocus (Input_Context);
1728	}	1765	}
1729	#endif	1766	#endif
1730	#if CURSOR_BLINK	1767	#if CURSOR_BLINK
1731	if (option (Opt_cursorBlink))	1768	if (option (Opt_cursorBlink))
…		…
1745		1782
1746	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));	1783	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1747	}	1784	}
1748	}	1785	}
1749		1786
1750	void	1787	void ecb_cold
1751	rxvt_term::focus_out ()	1788	rxvt_term::focus_out ()
1752	{	1789	{
1753	if (focus)	1790	if (focus)
1754	{	1791	{
1755	focus = 0;	1792	focus = 0;
…		…
1788		1825
1789	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));	1826	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1790	}	1827	}
1791	}	1828	}
1792		1829
1793	void	1830	void ecb_cold
1794	rxvt_term::update_fade_color (unsigned int idx)	1831	rxvt_term::update_fade_color (unsigned int idx)
1795	{	1832	{
1796	#if OFF_FOCUS_FADING	1833	#if OFF_FOCUS_FADING
1797	if (rs[Rs_fade])	1834	if (rs[Rs_fade])
1798	{	1835	{
…		…
1802	}	1839	}
1803	#endif	1840	#endif
1804	}	1841	}
1805		1842
1806	#if ENABLE_TRANSPARENCY || ENABLE_PERL	1843	#if ENABLE_TRANSPARENCY || ENABLE_PERL
1807	void	1844	void ecb_hot
1808	rxvt_term::rootwin_cb (XEvent &ev)	1845	rxvt_term::rootwin_cb (XEvent &ev)
1809	{	1846	{
1810	make_current ();	1847	make_current ();
1811		1848
1812	if (SHOULD_INVOKE (HOOK_ROOT_EVENT)	1849	if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1813	&& HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))	1850	&& HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1814	return;	1851	return;
1815		1852
1816	# if ENABLE_TRANSPARENCY
1817	switch (ev.type)	1853	switch (ev.type)
1818	{	1854	{
1819	case PropertyNotify:	1855	case PropertyNotify:
1820	/*	1856	/*
1821	* if user used some Esetroot compatible prog to set the root bg,	1857	* if user used some Esetroot compatible prog to set the root bg,
1822	* use the property to determine the pixmap. We use it later on.	1858	* use the property to determine the pixmap. We use it later on.
1823	*/	1859	*/
1824	if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]	1860	if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1825	|| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])	1861	|| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1826	{	1862	{
		1863	# if ENABLE_TRANSPARENCY
1827	bgPixmap.set_root_pixmap ();	1864	bg_set_root_pixmap ();
1828	update_background ();	1865	update_background ();
		1866	#endif
		1867	#if ENABLE_PERL
		1868	HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
		1869	#endif
1829	}	1870	}
1830		1871
1831	break;	1872	break;
1832	}	1873	}
1833	# endif
1834		1874
1835	refresh_check ();	1875	refresh_check ();
1836	}	1876	}
1837	#endif	1877	#endif
1838		1878
…		…
1962	if (scrollBar.upButton (ev.y))	2002	if (scrollBar.upButton (ev.y))
1963	direction = UP; /* up */	2003	direction = UP; /* up */
1964	else if (scrollBar.dnButton (ev.y))	2004	else if (scrollBar.dnButton (ev.y))
1965	direction = DN; /* down */	2005	direction = DN; /* down */
1966		2006
1967	scrollBar.state = STATE_IDLE;	2007	scrollBar.state = SB_STATE_IDLE;
1968	/*	2008	/*
1969	* Rxvt-style scrollbar:	2009	* Rxvt-style scrollbar:
1970	* move up if mouse is above slider	2010	* move up if mouse is above slider
1971	* move dn if mouse is below slider	2011	* move dn if mouse is below slider
1972	*	2012	*
…		…
2011	cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);	2051	cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2012	#endif	2052	#endif
2013	if (scr_page (direction, 1))	2053	if (scr_page (direction, 1))
2014	{	2054	{
2015	if (direction == UP)	2055	if (direction == UP)
2016	scrollBar.state = STATE_UP;	2056	scrollBar.state = SB_STATE_UP;
2017	else	2057	else
2018	scrollBar.state = STATE_DOWN;	2058	scrollBar.state = SB_STATE_DOWN;
2019	}	2059	}
2020	}	2060	}
2021	else	2061	else
2022	switch (ev.button)	2062	switch (ev.button)
2023	{	2063	{
2024	case Button2:	2064	case Button2:
2025	switch (scrollBar.align)	2065	switch (scrollBar.align)
2026	{	2066	{
2027	case R_SB_ALIGN_TOP:	2067	case SB_ALIGN_TOP:
2028	csrO = 0;	2068	csrO = 0;
2029	break;	2069	break;
2030	case R_SB_ALIGN_CENTRE:	2070	case SB_ALIGN_CENTRE:
2031	csrO = (scrollBar.bot - scrollBar.top) / 2;	2071	csrO = (scrollBar.bot - scrollBar.top) / 2;
2032	break;	2072	break;
2033	case R_SB_ALIGN_BOTTOM:	2073	case SB_ALIGN_BOTTOM:
2034	csrO = scrollBar.bot - scrollBar.top;	2074	csrO = scrollBar.bot - scrollBar.top;
2035	break;	2075	break;
2036	}	2076	}
2037		2077
2038	if (scrollBar.style == R_SB_XTERM	2078	if (scrollBar.style == SB_STYLE_XTERM
2039	|| scrollbar_above_slider (ev.y)	2079	|| scrollBar.above_slider (ev.y)
2040	|| scrollbar_below_slider (ev.y))	2080	|| scrollBar.below_slider (ev.y))
2041	scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());	2081	scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2042		2082
2043	scrollBar.state = STATE_MOTION;	2083	scrollBar.state = SB_STATE_MOTION;
2044	break;	2084	break;
2045		2085
2046	case Button1:	2086	case Button1:
2047	if (scrollBar.align == R_SB_ALIGN_CENTRE)	2087	if (scrollBar.align == SB_ALIGN_CENTRE)
2048	csrO = ev.y - scrollBar.top;	2088	csrO = ev.y - scrollBar.top;
2049	/* FALLTHROUGH */	2089	/* FALLTHROUGH */
2050		2090
2051	case Button3:	2091	case Button3:
2052	if (scrollBar.style != R_SB_XTERM)	2092	if (scrollBar.style != SB_STYLE_XTERM)
2053	{	2093	{
2054	if (scrollbar_above_slider (ev.y))	2094	if (scrollBar.above_slider (ev.y))
2055	# ifdef RXVT_SCROLL_FULL	2095	# ifdef RXVT_SCROLL_FULL
2056	scr_page (UP, nrow - 1);	2096	scr_page (UP, nrow - 1);
2057	# else	2097	# else
2058	scr_page (UP, nrow / 4);	2098	scr_page (UP, nrow / 4);
2059	# endif	2099	# endif
2060	else if (scrollbar_below_slider (ev.y))	2100	else if (scrollBar.below_slider (ev.y))
2061	# ifdef RXVT_SCROLL_FULL	2101	# ifdef RXVT_SCROLL_FULL
2062	scr_page (DN, nrow - 1);	2102	scr_page (DN, nrow - 1);
2063	# else	2103	# else
2064	scr_page (DN, nrow / 4);	2104	scr_page (DN, nrow / 4);
2065	# endif	2105	# endif
2066	else	2106	else
2067	scrollBar.state = STATE_MOTION;	2107	scrollBar.state = SB_STATE_MOTION;
2068	}	2108	}
2069	else	2109	else
2070	{	2110	{
2071	scr_page ((ev.button == Button1 ? DN : UP),	2111	scr_page ((ev.button == Button1 ? DN : UP),
2072	(nrow	2112	(nrow
2073	* scrollbar_position (ev.y)	2113	* scrollBar.position (ev.y)
2074	/ scrollBar.size ()));	2114	/ scrollBar.size ()));
2075	}	2115	}
2076		2116
2077	break;	2117	break;
2078	}	2118	}
…		…
2089		2129
2090	csrO = 0; /* reset csr Offset */	2130	csrO = 0; /* reset csr Offset */
2091	if (!bypass_keystate)	2131	if (!bypass_keystate)
2092	reportmode = !! (priv_modes & PrivMode_mouse_report);	2132	reportmode = !! (priv_modes & PrivMode_mouse_report);
2093		2133
2094	if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)	2134	if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2095	{	2135	{
2096	scrollBar.state = STATE_IDLE;	2136	scrollBar.state = SB_STATE_IDLE;
2097	scrollBar.show (0);	2137	scrollBar.show (0);
2098	}	2138	}
2099		2139
2100	#ifdef SELECTION_SCROLLING	2140	#ifdef SELECTION_SCROLLING
2101	sel_scroll_ev.stop();	2141	sel_scroll_ev.stop();
…		…
2151	case Button3:	2191	case Button3:
2152	selection_make (ev.time);	2192	selection_make (ev.time);
2153	break;	2193	break;
2154		2194
2155	case Button2:	2195	case Button2:
2156	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?	2196	if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2157	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);	2197	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2158	break;	2198	break;
2159		2199
2160	#ifdef MOUSE_WHEEL	2200	#ifdef MOUSE_WHEEL
2161	case Button4:	2201	case Button4:
…		…
2196	}	2236	}
2197	}	2237	}
2198		2238
2199	/*}}} */	2239	/*}}} */
2200		2240
2201	void	2241	void ecb_hot
2202	rxvt_term::cmd_parse ()	2242	rxvt_term::cmd_parse ()
2203	{	2243	{
2204	wchar_t ch = NOCHAR;	2244	wchar_t ch = NOCHAR;
2205	char *seq_begin; // remember start of esc-sequence here	2245	char *seq_begin; // remember start of esc-sequence here
2206		2246
2207	for (;;)	2247	for (;;)
2208	{	2248	{
2209	if (expect_false (ch == NOCHAR))	2249	if (ecb_unlikely (ch == NOCHAR))
2210	{	2250	{
2211	seq_begin = cmdbuf_ptr;	2251	seq_begin = cmdbuf_ptr;
2212	ch = next_char ();	2252	ch = next_char ();
2213		2253
2214	if (ch == NOCHAR)	2254	if (ch == NOCHAR)
2215	break;	2255	break;
2216	}	2256	}
2217		2257
2218	if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))	2258	if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2219	{	2259	{
2220	if (expect_false (!seen_input))	2260	if (ecb_unlikely (!seen_input))
2221	{	2261	{
2222	seen_input = 1;	2262	seen_input = 1;
2223	// many badly-written programs (e.g. jed) contain a race condition:	2263	// many badly-written programs (e.g. jed) contain a race condition:
2224	// they first read the screensize and then install a SIGWINCH handler.	2264	// they first read the screensize and then install a SIGWINCH handler.
2225	// some window managers resize the window early, and these programs	2265	// some window managers resize the window early, and these programs
…		…
2238	wchar_t *str = buf;	2278	wchar_t *str = buf;
2239	wchar_t *eol = str + min (ncol, UBUFSIZ);	2279	wchar_t *eol = str + min (ncol, UBUFSIZ);
2240		2280
2241	for (;;)	2281	for (;;)
2242	{	2282	{
2243	if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))	2283	if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2244	break;	2284	break;
2245		2285
2246	*str++ = ch;	2286	*str++ = ch;
2247		2287
2248	if (expect_false (ch == C0_LF || str >= eol))	2288	if (ecb_unlikely (ch == C0_LF || str >= eol))
2249	{	2289	{
2250	if (ch == C0_LF)	2290	if (ch == C0_LF)
2251	nlines++;	2291	nlines++;
2252		2292
2253	refresh_count++;	2293	refresh_count++;
…		…
2325	}	2365	}
2326	}	2366	}
2327	}	2367	}
2328		2368
2329	// read the next character	2369	// read the next character
2330	wchar_t	2370	wchar_t ecb_hot
2331	rxvt_term::next_char () NOTHROW	2371	rxvt_term::next_char () NOTHROW
2332	{	2372	{
2333	while (cmdbuf_ptr < cmdbuf_endp)	2373	while (cmdbuf_ptr < cmdbuf_endp)
2334	{	2374	{
2335	// assume 7-bit to be ascii ALWAYS	2375	// assume 7-bit to be ascii ALWAYS
2336	if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))	2376	if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2337	return *cmdbuf_ptr++;	2377	return *cmdbuf_ptr++;
2338		2378
2339	wchar_t wc;	2379	wchar_t wc;
2340	size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);	2380	size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2341		2381
…		…
2359		2399
2360	return NOCHAR;	2400	return NOCHAR;
2361	}	2401	}
2362		2402
2363	// read the next octet	2403	// read the next octet
2364	uint32_t	2404	uint32_t ecb_hot
2365	rxvt_term::next_octet () NOTHROW	2405	rxvt_term::next_octet () NOTHROW
2366	{	2406	{
2367	return cmdbuf_ptr < cmdbuf_endp	2407	return cmdbuf_ptr < cmdbuf_endp
2368	? (unsigned char)*cmdbuf_ptr++	2408	? (unsigned char)*cmdbuf_ptr++
2369	: NOCHAR;	2409	: NOCHAR;
2370	}	2410	}
2371		2411
2372	static class out_of_input out_of_input;	2412	static class out_of_input out_of_input;
2373		2413
2374	/* rxvt_cmd_getc () - Return next input character */	2414	wchar_t ecb_hot
2375	/*
2376	* Return the next input character after first passing any keyboard input
2377	* to the command.
2378	*/
2379	wchar_t
2380	rxvt_term::cmd_getc () THROW ((class out_of_input))	2415	rxvt_term::cmd_getc () THROW ((class out_of_input))
2381	{	2416	{
2382	wchar_t c = next_char ();	2417	wchar_t c = next_char ();
2383		2418
2384	if (c == NOCHAR)	2419	if (c == NOCHAR)
2385	throw out_of_input;	2420	throw out_of_input;
2386		2421
2387	return c;	2422	return c;
2388	}	2423	}
2389		2424
2390	uint32_t	2425	uint32_t ecb_hot
2391	rxvt_term::cmd_get8 () THROW ((class out_of_input))	2426	rxvt_term::cmd_get8 () THROW ((class out_of_input))
2392	{	2427	{
2393	uint32_t c = next_octet ();	2428	uint32_t c = next_octet ();
2394		2429
2395	if (c == NOCHAR)	2430	if (c == NOCHAR)
…		…
2399	}	2434	}
2400		2435
2401	/*{{{ print pipe */	2436	/*{{{ print pipe */
2402	/*----------------------------------------------------------------------*/	2437	/*----------------------------------------------------------------------*/
2403	#ifdef PRINTPIPE	2438	#ifdef PRINTPIPE
2404	FILE *	2439	FILE * ecb_cold
2405	rxvt_term::popen_printer ()	2440	rxvt_term::popen_printer ()
2406	{	2441	{
2407	FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");	2442	FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2408		2443
2409	if (stream == NULL)	2444	if (stream == NULL)
2410	rxvt_warn ("can't open printer pipe, not printing.\n");	2445	rxvt_warn ("can't open printer pipe, not printing.\n");
2411		2446
2412	return stream;	2447	return stream;
2413	}	2448	}
2414		2449
2415	int	2450	int ecb_cold
2416	rxvt_term::pclose_printer (FILE *stream)	2451	rxvt_term::pclose_printer (FILE *stream)
2417	{	2452	{
2418	fflush (stream);	2453	fflush (stream);
2419	return pclose (stream);	2454	return pclose (stream);
2420	}	2455	}
2421		2456
2422	/*	2457	/*
2423	* simulate attached vt100 printer	2458	* simulate attached vt100 printer
2424	*/	2459	*/
2425	void	2460	void ecb_cold
2426	rxvt_term::process_print_pipe ()	2461	rxvt_term::process_print_pipe ()
2427	{	2462	{
2428	FILE *fd = popen_printer ();	2463	FILE *fd = popen_printer ();
2429		2464
2430	if (!fd)	2465	if (!fd)
…		…
2476	pclose_printer (fd);	2511	pclose_printer (fd);
2477	}	2512	}
2478	#endif /* PRINTPIPE */	2513	#endif /* PRINTPIPE */
2479	/*}}} */	2514	/*}}} */
2480		2515
2481	/* *INDENT-OFF* */
2482	enum {	2516	enum {
2483	C1_40 = 0x40,	2517	C1_40 = 0x40,
2484	C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,	2518	C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2485	C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,	2519	C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2486	C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,	2520	C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2487	C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,	2521	C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2488	};	2522	};
2489	/* *INDENT-ON* */
2490		2523
2491	/*{{{ process non-printing single characters */	2524	/*{{{ process non-printing single characters */
2492	void	2525	void ecb_hot
2493	rxvt_term::process_nonprinting (unicode_t ch)	2526	rxvt_term::process_nonprinting (unicode_t ch)
2494	{	2527	{
2495	switch (ch)	2528	switch (ch)
2496	{	2529	{
2497	case C0_ESC:	2530	case C0_ESC:
…		…
2543	}	2576	}
2544	/*}}} */	2577	/*}}} */
2545		2578
2546		2579
2547	/*{{{ process VT52 escape sequences */	2580	/*{{{ process VT52 escape sequences */
2548	void	2581	void ecb_cold
2549	rxvt_term::process_escape_vt52 (unicode_t ch)	2582	rxvt_term::process_escape_vt52 (unicode_t ch)
2550	{	2583	{
2551	int row, col;	2584	int row, col;
2552		2585
2553	switch (ch)	2586	switch (ch)
…		…
2587	break;	2620	break;
2588	case 'Z': /* identify the terminal type */	2621	case 'Z': /* identify the terminal type */
2589	tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */	2622	tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2590	break;	2623	break;
2591	case '<': /* turn off VT52 mode */	2624	case '<': /* turn off VT52 mode */
2592	set_privmode (PrivMode_vt52, 0);	2625	priv_modes &= ~PrivMode_vt52;
2593	break;	2626	break;
2594	case 'F': /* use special graphics character set */	2627	case 'F': /* use special graphics character set */
2595	case 'G': /* use regular character set */	2628	case 'G': /* use regular character set */
2596	/* unimplemented */	2629	/* unimplemented */
2597	break;	2630	break;
…		…
2603	}	2636	}
2604	/*}}} */	2637	/*}}} */
2605		2638
2606		2639
2607	/*{{{ process escape sequences */	2640	/*{{{ process escape sequences */
2608	void	2641	void ecb_hot
2609	rxvt_term::process_escape_seq ()	2642	rxvt_term::process_escape_seq ()
2610	{	2643	{
2611	unicode_t ch = cmd_getc ();	2644	unicode_t ch = cmd_getc ();
2612		2645
2613	if (priv_modes & PrivMode_vt52)	2646	if (priv_modes & PrivMode_vt52)
…		…
2616	return;	2649	return;
2617	}	2650	}
2618		2651
2619	switch (ch)	2652	switch (ch)
2620	{	2653	{
2621	/* case 1: do_tek_mode (); break; */
2622	case '#':	2654	case '#':
2623	if (cmd_getc () == '8')	2655	if (cmd_getc () == '8')
2624	scr_E ();	2656	scr_E ();
2625	break;	2657	break;
2626	case '(':	2658	case '(':
…		…
2649	#if !ENABLE_MINIMAL	2681	#if !ENABLE_MINIMAL
2650	case '9':	2682	case '9':
2651	scr_forwardindex ();	2683	scr_forwardindex ();
2652	break;	2684	break;
2653	#endif	2685	#endif
		2686	// DECPAM/DECPNM
2654	case '=':	2687	case '=':
		2688	priv_modes |= PrivMode_aplKP;
		2689	break;
2655	case '>':	2690	case '>':
2656	set_privmode (PrivMode_aplKP, ch == '=');	2691	priv_modes &= ~PrivMode_aplKP;
2657	break;	2692	break;
2658		2693
2659	case C1_40:	2694	case C1_40:
2660	cmd_getc ();	2695	cmd_getc ();
2661	break;	2696	break;
…		…
2665		2700
2666	/* 8.3.87: NEXT LINE */	2701	/* 8.3.87: NEXT LINE */
2667	case C1_NEL: /* ESC E */	2702	case C1_NEL: /* ESC E */
2668	{	2703	{
2669	wchar_t nlcr[] = { C0_LF, C0_CR };	2704	wchar_t nlcr[] = { C0_LF, C0_CR };
2670	scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);	2705	scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2671	}	2706	}
2672	break;	2707	break;
2673		2708
2674	/* kidnapped escape sequence: Should be 8.3.48 */	2709	/* kidnapped escape sequence: Should be 8.3.48 */
2675	case C1_ESA: /* ESC G */	2710	case C1_ESA: /* ESC G */
2676	process_graphics ();	2711	// used by original rxvt for rob nations own graphics mode
		2712	if (cmd_getc () == 'Q')
		2713	tt_printf ("\033G0\012"); /* query graphics - no graphics */
2677	break;	2714	break;
2678		2715
2679	/* 8.3.63: CHARACTER TABULATION SET */	2716	/* 8.3.63: CHARACTER TABULATION SET */
2680	case C1_HTS: /* ESC H */	2717	case C1_HTS: /* ESC H */
2681	scr_set_tab (1);	2718	scr_set_tab (1);
…		…
2685	case C1_RI: /* ESC M */	2722	case C1_RI: /* ESC M */
2686	scr_index (DN);	2723	scr_index (DN);
2687	break;	2724	break;
2688		2725
2689	/* 8.3.142: SINGLE-SHIFT TWO */	2726	/* 8.3.142: SINGLE-SHIFT TWO */
2690	/*case C1_SS2: scr_single_shift (2); break; */	2727	/* case C1_SS2: break; */
2691		2728
2692	/* 8.3.143: SINGLE-SHIFT THREE */	2729	/* 8.3.143: SINGLE-SHIFT THREE */
2693	/*case C1_SS3: scr_single_shift (3); break; */	2730	/* case C1_SS3: break; */
2694		2731
2695	/* 8.3.27: DEVICE CONTROL STRING */	2732	/* 8.3.27: DEVICE CONTROL STRING */
2696	case C1_DCS: /* ESC P */	2733	case C1_DCS: /* ESC P */
2697	process_dcs_seq ();	2734	process_dcs_seq ();
2698	break;	2735	break;
…		…
2731	}	2768	}
2732	}	2769	}
2733	/*}}} */	2770	/*}}} */
2734		2771
2735	/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */	2772	/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2736	/* *INDENT-OFF* */
2737	enum {	2773	enum {
2738	CSI_ICH = 0x40,	2774	CSI_ICH = 0x40,
2739	CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,	2775	CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2740	CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,	2776	CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2741	CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,	2777	CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
…		…
2744	CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,	2780	CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2745	CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,	2781	CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2746	CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F	2782	CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2747	};	2783	};
2748		2784
2749	#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \	2785	#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2750	(((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \	2786	(((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2751	| ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))	2787	| ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2752	#define get_byte_array_bit(array, bit) \	2788	#define get_byte_array_bit(array, bit) \
2753	(!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7))))	2789	(!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2754		2790
2755	const unsigned char csi_defaults[] =	2791	static const unsigned char csi_defaults[] =
2756	{	2792	{
2757	make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */	2793	make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2758	make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */	2794	make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2759	make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */	2795	make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2760	make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */	2796	make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2761	make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */	2797	make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2762	make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */	2798	make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2763	make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */	2799	make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2764	make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */	2800	make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2765	};	2801	};
2766	/* *INDENT-ON* */
2767		2802
2768	void	2803	void ecb_hot
2769	rxvt_term::process_csi_seq ()	2804	rxvt_term::process_csi_seq ()
2770	{	2805	{
2771	unicode_t ch, priv, i;	2806	unicode_t ch, priv, i;
2772	unsigned int nargs, p;	2807	unsigned int nargs, p;
2773	int n, ndef;	2808	int n, ndef;
…		…
2849	{	2884	{
2850	/* DECSTR: soft terminal reset, used by our terminfo since 9.06 */	2885	/* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2851	scr_soft_reset ();	2886	scr_soft_reset ();
2852		2887
2853	static const int pm_h[] = { 7, 25 };	2888	static const int pm_h[] = { 7, 25 };
2854	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 };
2855		2890
2856	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);
2857	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);
2858	}	2893	}
2859	break;	2894	break;
2860	}	2895	}
2861		2896
2862	return;	2897	return;
…		…
2880	}	2915	}
2881	break;	2916	break;
2882	#endif	2917	#endif
2883		2918
2884	case CSI_CUU: /* 8.3.22: (1) CURSOR UP */	2919	case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2885	case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */	2920	case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2886	arg[0] = -arg[0];	2921	arg[0] = -arg[0];
2887	/* FALLTHROUGH */	2922	/* FALLTHROUGH */
2888	case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */	2923	case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2889	case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */	2924	case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2890	scr_gotorc (arg[0], 0, RELATIVE);	2925	scr_gotorc (arg[0], 0, RELATIVE);
2891	break;	2926	break;
2892		2927
2893	case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */	2928	case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2894	case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */	2929	case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
…		…
3081	}	3116	}
3082	}	3117	}
3083	/*}}} */	3118	/*}}} */
3084		3119
3085	#if !ENABLE_MINIMAL	3120	#if !ENABLE_MINIMAL
3086	/* ARGSUSED */
3087	void	3121	void
3088	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3122	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3089	{	3123	{
3090	int x, y;	3124	int x, y;
3091	XWindowAttributes wattr;	3125	XWindowAttributes wattr;
…		…
3100	{	3134	{
3101	/*	3135	/*
3102	* commands	3136	* commands
3103	*/	3137	*/
3104	case 1: /* deiconify window */	3138	case 1: /* deiconify window */
3105	XMapWindow (dpy, parent[0]);	3139	XMapWindow (dpy, parent);
3106	break;	3140	break;
3107	case 2: /* iconify window */	3141	case 2: /* iconify window */
3108	XIconifyWindow (dpy, parent[0], display->screen);	3142	XIconifyWindow (dpy, parent, display->screen);
3109	break;	3143	break;
3110	case 3: /* set position (pixels) */	3144	case 3: /* set position (pixels) */
3111	XMoveWindow (dpy, parent[0], args[1], args[2]);	3145	XMoveWindow (dpy, parent, args[1], args[2]);
3112	break;	3146	break;
3113	case 4: /* set size (pixels) */	3147	case 4: /* set size (pixels) */
3114	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3148	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3115	break;	3149	break;
3116	case 5: /* raise window */	3150	case 5: /* raise window */
3117	XRaiseWindow (dpy, parent[0]);	3151	XRaiseWindow (dpy, parent);
3118	break;	3152	break;
3119	case 6: /* lower window */	3153	case 6: /* lower window */
3120	XLowerWindow (dpy, parent[0]);	3154	XLowerWindow (dpy, parent);
3121	break;	3155	break;
3122	case 7: /* refresh window */	3156	case 7: /* refresh window */
3123	scr_touch (true);	3157	scr_touch (true);
3124	break;	3158	break;
3125	case 8: /* set size (chars) */	3159	case 8: /* set size (chars) */
…		…
3128	break;	3162	break;
3129		3163
3130	//case 9: NYI, TODO, restore maximized window or maximize window	3164	//case 9: NYI, TODO, restore maximized window or maximize window
3131	default:	3165	default:
3132	if (args[0] >= 24) /* set height (chars) */	3166	if (args[0] >= 24) /* set height (chars) */
3133	set_widthheight ((unsigned int)width,	3167	set_widthheight ((unsigned int)vt_width,
3134	(unsigned int) (args[1] * fheight));	3168	(unsigned int) (args[1] * fheight));
3135	break;	3169	break;
3136		3170
3137	/*	3171	/*
3138	* reports - some output format copied from XTerm	3172	* reports - some output format copied from XTerm
3139	*/	3173	*/
3140	case 11: /* report window state */	3174	case 11: /* report window state */
3141	XGetWindowAttributes (dpy, parent[0], &wattr);	3175	XGetWindowAttributes (dpy, parent, &wattr);
3142	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3176	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3143	break;	3177	break;
3144	case 13: /* report window position */	3178	case 13: /* report window position */
3145	XGetWindowAttributes (dpy, parent[0], &wattr);	3179	XGetWindowAttributes (dpy, parent, &wattr);
3146	XTranslateCoordinates (dpy, parent[0], wattr.root,	3180	XTranslateCoordinates (dpy, parent, wattr.root,
3147	-wattr.border_width, -wattr.border_width,	3181	-wattr.border_width, -wattr.border_width,
3148	&x, &y, &wdummy);	3182	&x, &y, &wdummy);
3149	tt_printf ("\033[3;%d;%dt", x, y);	3183	tt_printf ("\033[3;%d;%dt", x, y);
3150	break;	3184	break;
3151	case 14: /* report window size (pixels) */	3185	case 14: /* report window size (pixels) */
3152	XGetWindowAttributes (dpy, parent[0], &wattr);	3186	XGetWindowAttributes (dpy, parent, &wattr);
3153	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3187	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3154	break;	3188	break;
3155	case 18: /* report text area size (chars) */	3189	case 18: /* report text area size (chars) */
3156	tt_printf ("\033[8;%d;%dt", nrow, ncol);	3190	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3157	break;	3191	break;
…		…
3159	tt_printf ("\033[9;%d;%dt", nrow, ncol);	3193	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3160	break;	3194	break;
3161	case 20: /* report icon label */	3195	case 20: /* report icon label */
3162	{	3196	{
3163	char *s;	3197	char *s;
3164	XGetIconName (dpy, parent[0], &s);	3198	XGetIconName (dpy, parent, &s);
3165	tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */	3199	tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3166	XFree (s);	3200	XFree (s);
3167	}	3201	}
3168	break;	3202	break;
3169	case 21: /* report window title */	3203	case 21: /* report window title */
3170	{	3204	{
3171	char *s;	3205	char *s;
3172	XFetchName (dpy, parent[0], &s);	3206	XFetchName (dpy, parent, &s);
3173	tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */	3207	tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3174	XFree (s);	3208	XFree (s);
3175	}	3209	}
3176	break;	3210	break;
3177	}	3211	}
…		…
3331	unsigned long bytes_after;	3365	unsigned long bytes_after;
3332	unsigned char *value = 0;	3366	unsigned char *value = 0;
3333	const char *str = "";	3367	const char *str = "";
3334		3368
3335	if (prop	3369	if (prop
3336	&& XGetWindowProperty (dpy, parent[0],	3370	&& XGetWindowProperty (dpy, parent,
3337	prop, 0, 1<<16, 0, AnyPropertyType,	3371	prop, 0, 1<<16, 0, AnyPropertyType,
3338	&actual_type, &actual_format,	3372	&actual_type, &actual_format,
3339	&nitems, &bytes_after, &value) == Success	3373	&nitems, &bytes_after, &value) == Success
3340	&& actual_type != None	3374	&& actual_type != None
3341	&& actual_format == 8)	3375	&& actual_format == 8)
…		…
3353	{	3387	{
3354	*eq = 0;	3388	*eq = 0;
3355	set_utf8_property (display->atom (str), eq + 1);	3389	set_utf8_property (display->atom (str), eq + 1);
3356	}	3390	}
3357	else	3391	else
3358	XDeleteProperty (dpy, parent[0],	3392	XDeleteProperty (dpy, parent,
3359	display->atom (str));	3393	display->atom (str));
3360	}	3394	}
3361	break;	3395	break;
3362		3396
3363	case XTerm_Color:	3397	case XTerm_Color:
…		…
3424	process_color_seq (op, Color_tint, str, resp);	3458	process_color_seq (op, Color_tint, str, resp);
3425	{	3459	{
3426	bool changed = false;	3460	bool changed = false;
3427		3461
3428	if (ISSET_PIXCOLOR (Color_tint))	3462	if (ISSET_PIXCOLOR (Color_tint))
3429	changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);	3463	changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3430	else
3431	changed = bgPixmap.unset_tint ();
3432		3464
3433	if (changed)	3465	if (changed)
3434	update_background ();	3466	update_background ();
3435	}	3467	}
3436		3468
…		…
3440	#if BG_IMAGE_FROM_FILE	3472	#if BG_IMAGE_FROM_FILE
3441	case Rxvt_Pixmap:	3473	case Rxvt_Pixmap:
3442	if (!strcmp (str, "?"))	3474	if (!strcmp (str, "?"))
3443	{	3475	{
3444	char str[256];	3476	char str[256];
		3477	int h_scale = fimage.h_scale;
		3478	int v_scale = fimage.v_scale;
		3479	int h_align = fimage.h_align;
		3480	int v_align = fimage.v_align;
3445		3481
3446	sprintf (str, "[%dx%d+%d+%d]",	3482	sprintf (str, "[%dx%d+%d+%d]",
3447	min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),	3483	h_scale, v_scale,
3448	min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));	3484	h_align, v_align);
3449	process_xterm_seq (XTerm_title, str, CHAR_ST);	3485	process_xterm_seq (XTerm_title, str, CHAR_ST);
3450	}	3486	}
3451	else	3487	else
3452	{	3488	{
3453	int changed = 0;	3489	bool changed = false;
3454		3490
3455	if (*str != ';')	3491	if (*str != ';')
3456	{	3492	{
3457	/* reset to default scaling :*/	3493	try
3458	bgPixmap.unset_geometry ();	3494	{
3459	if (bgPixmap.set_file (str)) /* change pixmap */	3495	fimage.set_file_geometry (this, str);
3460	changed++;	3496	changed = true;
3461	str = strchr (str, ';');	3497	}
3462	if (str == NULL)	3498	catch (const class rxvt_failure_exception &e)
3463	bgPixmap.set_defaultGeometry ();	3499	{
		3500	}
3464	}	3501	}
3465		3502	else
3466	while (str)
3467	{	3503	{
3468	str++;	3504	str++;
3469	if (bgPixmap.set_geometry (str))	3505	if (fimage.set_geometry (str, true))
3470	changed++;	3506	changed = true;
3471	str = strchr (str, ';');
3472	}	3507	}
3473		3508
3474	if (changed)	3509	if (changed)
		3510	{
		3511	if (bg_window_position_sensitive ())
		3512	{
		3513	int x, y;
		3514	get_window_origin (x, y);
		3515	parent_x = x;
		3516	parent_y = y;
		3517	}
3475	update_background ();	3518	update_background ();
		3519	}
3476	}	3520	}
3477	break;	3521	break;
3478	#endif	3522	#endif
3479		3523
3480	case XTerm_logfile:	3524	case XTerm_logfile:
…		…
3567	* 's' = save	3611	* 's' = save
3568	* 'r' = restore	3612	* 'r' = restore
3569	* 't' = toggle	3613	* 't' = toggle
3570	* so no need for fancy checking	3614	* so no need for fancy checking
3571	*/	3615	*/
3572	int	3616	int ecb_cold
3573	rxvt_term::privcases (int mode, unsigned long bit)	3617	rxvt_term::privcases (int mode, unsigned long bit)
3574	{	3618	{
3575	int state;	3619	int state;
3576		3620
3577	if (mode == 's')	3621	if (mode == 's')
3578	{	3622	{
3579	SavedModes |= (priv_modes & bit);	3623	if (priv_modes & bit)
		3624	SavedModes |= bit;
		3625	else
		3626	SavedModes &= ~bit;
3580	return -1;	3627	return -1;
3581	}	3628	}
3582	else	3629	else
3583	{	3630	{
3584	if (mode == 'r')	3631	if (mode == 'r')
3585	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */	3632	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3586	else	3633	else
3587	state = (mode == 't') ? ! (priv_modes & bit) : mode;	3634	state = (mode == 't') ? ! (priv_modes & bit) : mode;
3588		3635
3589	set_privmode (bit, state);	3636	if (state)
		3637	priv_modes |= bit;
		3638	else
		3639	priv_modes &= ~bit;
3590	}	3640	}
3591		3641
3592	return state;	3642	return state;
3593	}	3643	}
3594		3644
3595	/* we're not using priv _yet_ */	3645	/* we're not using priv _yet_ */
3596	void	3646	void
3597	rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)	3647	rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3598	{	3648	{
3599	unsigned int i, j;	3649	unsigned int i, j;
3600	int state;	3650	int state;
3601		3651
3602	static const struct	3652	static const struct
3603	{	3653	{
3604	const int argval;	3654	const int argval;
3605	const unsigned long bit;	3655	const unsigned long bit;
3606	} argtopriv[] = {	3656	} argtopriv[] = {
3607	{ 1, PrivMode_aplCUR }, // DECCKM	3657	{ 1, PrivMode_aplCUR }, // DECCKM
3608	{ 2, PrivMode_vt52 },	3658	{ 2, PrivMode_vt52 }, // DECANM
3609	{ 3, PrivMode_132 }, // DECCOLM	3659	{ 3, PrivMode_132 }, // DECCOLM
3610	{ 4, PrivMode_smoothScroll }, // DECSCLM	3660	{ 4, PrivMode_smoothScroll }, // DECSCLM
3611	{ 5, PrivMode_rVideo }, // DECSCNM	3661	{ 5, PrivMode_rVideo }, // DECSCNM
3612	{ 6, PrivMode_relOrigin }, // DECOM	3662	{ 6, PrivMode_relOrigin }, // DECOM
3613	{ 7, PrivMode_Autowrap }, // DECAWM	3663	{ 7, PrivMode_Autowrap }, // DECAWM
3614	// 8, auto-repeat keys // DECARM	3664	// 8, auto-repeat keys // DECARM
3615	{ 9, PrivMode_MouseX10 },	3665	{ 9, PrivMode_MouseX10 },
3616	// 18 end FF to printer after print screen	3666	// 18 end FF to printer after print screen
3617	// 19 Print screen prints full screen/scroll region	3667	// 19 Print screen prints full screen/scroll region
3618	{ 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis	3668	{ 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3619	#ifdef scrollBar_esc	3669	#ifdef scrollBar_esc
3620	{ scrollBar_esc, PrivMode_scrollBar },	3670	{ scrollBar_esc, PrivMode_scrollBar },
3621	#endif	3671	#endif
3622	{ 35, PrivMode_ShiftKeys }, // rxvt extension	3672	{ 35, PrivMode_ShiftKeys }, // rxvt extension
3623	// 38, tektronix mode // DECTEK	3673	// 38, tektronix mode // DECTEK
3624	{ 40, PrivMode_132OK },	3674	{ 40, PrivMode_132OK },
3625	// 41 xterm more fixes NYI	3675	// 41 xterm more fixes NYI
3626	// 45 margin bell NYI	3676	// 45 margin bell NYI
3627	// 46 start logging	3677	// 46 start logging
3628	{ 47, PrivMode_Screen },	3678	{ 47, PrivMode_Screen },
3629	{ 66, PrivMode_aplKP }, // DECPAM/DECPNM	3679	{ 66, PrivMode_aplKP }, // DECNKM
3630	#ifndef NO_BACKSPACE_KEY	3680	#ifndef NO_BACKSPACE_KEY
3631	{ 67, PrivMode_BackSpace }, // DECBKM	3681	{ 67, PrivMode_BackSpace }, // DECBKM
3632	#endif	3682	#endif
3633	{ 1000, PrivMode_MouseX11 },	3683	{ 1000, PrivMode_MouseX11 },
3634	{ 1002, PrivMode_MouseBtnEvent },	3684	{ 1002, PrivMode_MouseBtnEvent },
3635	{ 1003, PrivMode_MouseAnyEvent },	3685	{ 1003, PrivMode_MouseAnyEvent },
		3686	#if ENABLE_FRILLS
		3687	{ 1005, PrivMode_ExtModeMouse },
		3688	#endif
3636	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension	3689	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension
3637	{ 1011, PrivMode_Keypress }, // rxvt extension	3690	{ 1011, PrivMode_Keypress }, // rxvt extension
		3691	#if ENABLE_FRILLS
		3692	{ 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
		3693	#endif
3638	// 1035 enable modifiers for alt, numlock NYI	3694	// 1035 enable modifiers for alt, numlock NYI
3639	// 1036 send ESC for meta keys NYI	3695	// 1036 send ESC for meta keys NYI
3640	// 1037 send DEL for keypad delete NYI	3696	// 1037 send DEL for keypad delete NYI
3641	{ 1047, PrivMode_Screen },	3697	{ 1047, PrivMode_Screen },
3642	// 1048 save and restore cursor	3698	// 1048 save and restore cursor, implemented in code
3643	{ 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */	3699	{ 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3644	// 1051, 1052, 1060, 1061 keyboard emulation NYI	3700	// 1051, 1052, 1060, 1061 keyboard emulation NYI
3645	{ 2004, PrivMode_BracketPaste },	3701	{ 2004, PrivMode_BracketPaste },
3646	};	3702	};
3647		3703
…		…
3657	for (i = 0; i < nargs; i++)	3713	for (i = 0; i < nargs; i++)
3658	{	3714	{
3659	state = -1;	3715	state = -1;
3660		3716
3661	/* basic handling */	3717	/* basic handling */
3662	for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++)	3718	for (j = 0; j < ecb_array_length (argtopriv); j++)
3663	if (argtopriv[j].argval == arg[i])	3719	if (argtopriv[j].argval == arg[i])
3664	{	3720	{
3665	state = privcases (mode, argtopriv[j].bit);	3721	state = privcases (mode, argtopriv[j].bit);
3666	break;	3722	break;
3667	}	3723	}
…		…
3693	case 2: /* VT52 mode */	3749	case 2: /* VT52 mode */
3694	/* oddball mode. should be set regardless of set/reset	3750	/* oddball mode. should be set regardless of set/reset
3695	* parameter. Return from VT52 mode with an ESC < from	3751	* parameter. Return from VT52 mode with an ESC < from
3696	* within VT52 mode	3752	* within VT52 mode
3697	*/	3753	*/
3698	set_privmode (PrivMode_vt52, 1);	3754	priv_modes |= PrivMode_vt52;
3699	break;	3755	break;
3700	case 3: /* 80/132 */	3756	case 3: /* 80/132 */
3701	if (priv_modes & PrivMode_132OK)	3757	if (priv_modes & PrivMode_132OK)
3702	set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);	3758	set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3703	break;	3759	break;
…		…
3718	if (state) /* orthogonal */	3774	if (state) /* orthogonal */
3719	priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);	3775	priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3720	break;	3776	break;
3721	#ifdef scrollBar_esc	3777	#ifdef scrollBar_esc
3722	case scrollBar_esc:	3778	case scrollBar_esc:
3723	if (scrollBar.map (state))	3779	scrollBar.map (state);
3724	{
3725	resize_all_windows (0, 0, 0);	3780	resize_all_windows (0, 0, 0);
3726	scr_touch (true);	3781	scr_touch (true);
3727	}
3728	break;	3782	break;
3729	#endif	3783	#endif
3730	case 25: /* visible/invisible cursor */	3784	case 25: /* visible/invisible cursor */
3731	scr_cursor_visible (state);	3785	scr_cursor_visible (state);
3732	break;	3786	break;
…		…
3745	case 1003:	3799	case 1003:
3746	if (state)	3800	if (state)
3747	{	3801	{
3748	priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);	3802	priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3749	priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;	3803	priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
		3804	mouse_row = mouse_col = 0;
3750	vt_emask_mouse = PointerMotionMask;	3805	vt_emask_mouse = PointerMotionMask;
3751	}	3806	}
3752	else	3807	else
3753	vt_emask_mouse = NoEventMask;	3808	vt_emask_mouse = NoEventMask;
3754		3809
…		…
3786	}	3841	}
3787	}	3842	}
3788	/*}}} */	3843	/*}}} */
3789		3844
3790	/*{{{ process sgr sequences */	3845	/*{{{ process sgr sequences */
3791	void	3846	void ecb_hot
3792	rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)	3847	rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3793	{	3848	{
3794	unsigned int i;	3849	unsigned int i;
3795	short rendset;	3850	short rendset;
3796	int rendstyle;	3851	int rendstyle;
…		…
3939	}	3994	}
3940	}	3995	}
3941	}	3996	}
3942	/*}}} */	3997	/*}}} */
3943		3998
3944	/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3945	void
3946	rxvt_term::process_graphics ()
3947	{
3948	unicode_t ch, cmd = cmd_getc ();
3949
3950	if (cmd == 'Q')
3951	{
3952	/* query graphics */
3953	tt_printf ("\033G0\012"); /* no graphics */
3954	return;
3955	}
3956	/* swallow other graphics sequences until terminating ':' */
3957	do
3958	ch = cmd_getc ();
3959	while (ch != ':');
3960	}
3961	/*}}} */
3962
3963	/* ------------------------------------------------------------------------- */	3999	/* ------------------------------------------------------------------------- */
3964		4000
3965	/*	4001	/*
3966	* Send printf () formatted output to the command.	4002	* Send printf () formatted output to the command.
3967	* Only use for small amounts of data.	4003	* Only use for small amounts of data.
…		…
3980		4016
3981	/* ---------------------------------------------------------------------- */	4017	/* ---------------------------------------------------------------------- */
3982	/* Write data to the pty as typed by the user, pasted with the mouse,	4018	/* Write data to the pty as typed by the user, pasted with the mouse,
3983	* or generated by us in response to a query ESC sequence.	4019	* or generated by us in response to a query ESC sequence.
3984	*/	4020	*/
3985	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT	4021	static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3986		4022
3987	void	4023	void
3988	rxvt_term::tt_write (const char *data, unsigned int len)	4024	rxvt_term::tt_write (const char *data, unsigned int len)
3989	{	4025	{
3990	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))	4026	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
…		…
3995		4031
3996	if (v_buflen == 0)	4032	if (v_buflen == 0)
3997	{	4033	{
3998	ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));	4034	ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3999		4035
		4036	max_it (written, 0);
		4037
4000	if ((unsigned int)written == len)	4038	if (written == len)
4001	return;	4039	return;
4002		4040
4003	data += written;	4041	data += written;
4004	len -= written;	4042	len -= written;
4005	}	4043	}
4006		4044
4007	v_buffer = (char *)realloc (v_buffer, v_buflen + len);	4045	v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4008		4046
4009	memcpy (v_buffer + v_buflen, data, len);	4047	memcpy (v_buffer + v_buflen, data, len);
4010	v_buflen += len;	4048	v_buflen += len;
4011		4049
4012	pty_ev.set (ev::READ | ev::WRITE);	4050	pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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