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.438 by root, Thu Feb 4 21:55:12 2010 UTC vs.
Revision 1.514 by root, Mon Jun 4 15:18:52 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
…		…
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)
165	{	165	{
166	rxvt_fontset *fs = FONTSET (r);	166	rxvt_fontset *fs = FONTSET (r);
167	rxvt_font *f = (*fs)[fs->find_font (ch)];
168	wchar_t *chr, *alloc, ch2, *fname;	167	wchar_t *chr, *alloc, ch2, **fname;
169	int len;	168	int len;
170
171	fname = rxvt_utf8towcs (f->name);
172		169
173	# if ENABLE_COMBINING	170	# if ENABLE_COMBINING
174	if (IS_COMPOSE (ch))	171	if (IS_COMPOSE (ch))
175	{	172	{
176	len = rxvt_composite.expand (ch, 0);	173	len = rxvt_composite.expand (ch, 0);
…		…
197	r & RS_Blink ? " blink" : "",	194	r & RS_Blink ? " blink" : "",
198	r & RS_RVid ? " rvid" : "",	195	r & RS_RVid ? " rvid" : "",
199	r & RS_Uline ? " uline" : "",	196	r & RS_Uline ? " uline" : "",
200	r & RS_Careful ? " careful" : "");	197	r & RS_Careful ? " careful" : "");
201		198
		199	int width = 0;
		200	fname = rxvt_temp_buf<wchar_t *> (len);
		201	for (int i = 0; i < len; i++)
		202	{
		203	rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
		204	fname[i] = rxvt_utf8towcs (f->name);
202	int width = wcswidth (fname, wcslen (fname));	205	max_it (width, wcswidth (fname[i], wcslen (fname[i])));
		206	}
203		207
204	max_it (width, 8+5); // for char + hex	208	max_it (width, 8+5); // for char + hex
205	max_it (width, strlen (attr));	209	max_it (width, strlen (attr));
206		210
207	if (y >= 0)	211	if (y >= 0)
208	{	212	{
209	y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;	213	y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
210	x = 0;	214	x = 0;
211	}	215	}
212		216
213	scr_overlay_new (x, y, width, len + 2);	217	scr_overlay_new (x, y, width, len * 2 + 1);
214		218
215	r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));	219	r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
216		220
217	for (int y = 0; y < len; y++)	221	for (int y = 0; y < len; y++)
218	{	222	{
…		…
237	// char buf[4+4+3+1];	241	// char buf[4+4+3+1];
238	// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);	242	// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239	// scr_overlay_set (0, 0, buf);	243	// scr_overlay_set (0, 0, buf);
240	// }	244	// }
241	scr_overlay_set (0, len , attr);	245	scr_overlay_set (0, len , attr);
		246	for (int i = 0; i < len; i++)
		247	{
242	scr_overlay_set (0, len + 1, fname);	248	scr_overlay_set (0, len + 1 + i, fname[i]);
243
244	free (fname);	249	free (fname[i]);
		250	}
245		251
246	# if ENABLE_COMBINING	252	# if ENABLE_COMBINING
247	if (alloc)	253	if (alloc)
248	delete [] alloc;	254	delete [] alloc;
249	# endif	255	# endif
250	}	256	}
251	#endif	257	#endif
252		258
253	void	259	void ecb_cold
254	rxvt_term::commit_iso14755 ()	260	rxvt_term::commit_iso14755 ()
255	{	261	{
256	wchar_t ch[2];
257
258	ch[0] = iso14755buf & ISO_14755_MASK;	262	wchar_t ch = iso14755buf & ISO_14755_MASK;
259	ch[1] = 0;
260		263
261	if (iso14755buf & ISO_14755_51)	264	if (iso14755buf & ISO_14755_51)
262	{	265	{
263	char mb[16];	266	char mb[MB_LEN_MAX];
264	int len;	267	int len;
265		268
266	// allow verbatim 0-bytes and control-bytes to be entered	269	// allow verbatim 0-bytes and control-bytes to be entered
267	if (ch[0] >= 0x20)	270	if (ch >= 0x20)
268	len = wcstombs (mb, ch, 16);	271	len = wctomb (mb, ch);
269	else	272	else
270	{	273	{
271	mb[0] = ch[0];	274	mb[0] = ch;
272	len = 1;	275	len = 1;
273	}	276	}
274		277
275	if (len > 0)	278	if (len > 0)
276	tt_write (mb, len);	279	tt_write (mb, len);
…		…
279	}	282	}
280		283
281	iso14755buf = 0;	284	iso14755buf = 0;
282	}	285	}
283		286
284	static int	287	static int ecb_cold
285	hex_keyval (XKeyEvent &ev)	288	hex_keyval (XKeyEvent &ev)
286	{	289	{
287	// check wether this event corresponds to a hex digit	290	// check whether this event corresponds to a hex digit
288	// if the modifiers had not been pressed.	291	// if the modifiers had not been pressed.
289	for (int index = 0; index < 8; index++)	292	for (int index = 0; index < 8; index++)
290	{	293	{
291	KeySym k = XLookupKeysym (&ev, index);	294	KeySym k = XLookupKeysym (&ev, index);
292		295
…		…
298		301
299	return -1;	302	return -1;
300	}	303	}
301	#endif	304	#endif
302		305
303	static inline KeySym	306	static inline KeySym ecb_cold
304	translate_keypad (KeySym keysym, bool kp)	307	translate_keypad (KeySym keysym, bool kp)
305	{	308	{
306	#ifdef XK_KP_Home	309	#ifdef XK_KP_Home
307	static const KeySym keypadtrans[] = {	310	static const KeySym keypadtrans[] = {
308	XK_KP_7, // XK_KP_Home	311	XK_KP_7, // XK_KP_Home
…		…
334	# endif	337	# endif
335	#endif	338	#endif
336	return keysym;	339	return keysym;
337	}	340	}
338		341
339	static inline int	342	static inline int ecb_cold
340	map_function_key (KeySym keysym)	343	map_function_key (KeySym keysym)
341	{	344	{
342	int param = 0;	345	int param = 0;
343		346
344	if (IN_RANGE_INC (keysym, XK_F1, XK_F35))	347	if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
…		…
393	break;	396	break;
394	}	397	}
395	return param;	398	return param;
396	}	399	}
397		400
398	void	401	void ecb_cold
399	rxvt_term::key_press (XKeyEvent &ev)	402	rxvt_term::key_press (XKeyEvent &ev)
400	{	403	{
401	int ctrl, meta, shft, len;	404	int ctrl, meta, shft, len;
402	KeySym keysym;	405	KeySym keysym;
403	int valid_keysym;	406	int valid_keysym;
…		…
416	*/	419	*/
417	shft = ev.state & ShiftMask;	420	shft = ev.state & ShiftMask;
418	ctrl = ev.state & ControlMask;	421	ctrl = ev.state & ControlMask;
419	meta = ev.state & ModMetaMask;	422	meta = ev.state & ModMetaMask;
420		423
421	if (numlock_state || (ev.state & ModNumLockMask))
422	{
423	numlock_state = (ev.state & ModNumLockMask);
424	set_privmode (PrivMode_aplKP, !numlock_state);
425	}
426
427	kbuf[0] = 0;	424	kbuf[0] = 0;
428		425
429	#ifdef USE_XIM	426	#if USE_XIM
430	if (Input_Context)	427	if (Input_Context)
431	{	428	{
432	Status status_return;	429	Status status_return;
433		430
434	#if 0	431	#if 0
…		…
569	selection_request (ev.time);	566	selection_request (ev.time);
570	return;	567	return;
571	#if TODO	568	#if TODO
572	/* rxvt extras */	569	/* rxvt extras */
573	case XK_KP_Add: /* Shift+KP_Add = bigger font */	570	case XK_KP_Add: /* Shift+KP_Add = bigger font */
574	change_font (FONT_UP);
575	return;	571	return;
576	case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */	572	case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
577	change_font (FONT_DN);
578	return;	573	return;
579	#endif	574	#endif
580	}	575	}
581	}	576	}
582	}	577	}
…		…
647	if (keysym >= 0xFF00 && keysym <= 0xFFFF)	642	if (keysym >= 0xFF00 && keysym <= 0xFFFF)
648	{	643	{
649	bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;	644	bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
650	unsigned int newlen = 1;	645	unsigned int newlen = 1;
651		646
		647	if (ev.state & ModNumLockMask)
		648	kp = false;
		649
652	switch (translate_keypad (keysym, kp))	650	keysym = translate_keypad (keysym, kp);
		651
		652	switch (keysym)
653	{	653	{
654	#ifndef NO_BACKSPACE_KEY	654	#ifndef NO_BACKSPACE_KEY
655	case XK_BackSpace:	655	case XK_BackSpace:
656	if (priv_modes & PrivMode_HaveBackSpace)	656	if (priv_modes & PrivMode_HaveBackSpace)
657	{	657	{
…		…
776	}	776	}
777		777
778	if (newlen)	778	if (newlen)
779	len = strlen (kbuf);	779	len = strlen (kbuf);
780		780
		781	if (len > 0)
		782	{
781	/*	783	/*
		784	* pass Shift/Control indicators for function keys ending with `~'
		785	*
		786	* eg,
		787	* Prior = "ESC[5~"
		788	* Shift+Prior = "ESC[5$"
		789	* Ctrl+Prior = "ESC[5^"
		790	* Ctrl+Shift+Prior = "ESC[5@"
		791	*/
		792	if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
		793	kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
		794
		795	/*
782	* Pass meta for all function keys, if 'meta' option set	796	* Pass meta for all function keys, if 'meta' option set
783	*/	797	*/
784	#ifdef META8_OPTION	798	#ifdef META8_OPTION
785	if (meta && (meta_char == 0x80) && len > 0)	799	if (meta && (meta_char == 0x80))
786	kbuf[len - 1] |= 0x80;	800	kbuf[len - 1] |= 0x80;
787	#endif	801	#endif
		802	}
788		803
789	}	804	}
790	else if (ctrl && keysym == XK_minus)	805	else if (ctrl && keysym == XK_minus)
791	{	806	{
792	len = 1;	807	len = 1;
…		…
826	{	841	{
827	view_start = 0;	842	view_start = 0;
828	want_refresh = 1;	843	want_refresh = 1;
829	}	844	}
830		845
831	/*
832	* these modifications only affect the static keybuffer
833	* pass Shift/Control indicators for function keys ending with `~'
834	*
835	* eg,
836	* Prior = "ESC[5~"
837	* Shift+Prior = "ESC[5$"
838	* Ctrl+Prior = "ESC[5^"
839	* Ctrl+Shift+Prior = "ESC[5@"
840	* Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
841	*/
842	if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
843	kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
844
845	/* escape prefix */	846	/* escape prefix */
846	if (meta	847	if (meta
847	#ifdef META8_OPTION	848	#ifdef META8_OPTION
848	&& meta_char == C0_ESC	849	&& meta_char == C0_ESC
849	#endif	850	#endif
…		…
854	}	855	}
855		856
856	tt_write (kbuf, (unsigned int)len);	857	tt_write (kbuf, (unsigned int)len);
857	}	858	}
858		859
859	void	860	void ecb_cold
860	rxvt_term::key_release (XKeyEvent &ev)	861	rxvt_term::key_release (XKeyEvent &ev)
861	{	862	{
862	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL	863	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
863	KeySym keysym;	864	KeySym keysym;
864		865
…		…
884	commit_iso14755 ();	885	commit_iso14755 ();
885		886
886	return;	887	return;
887	}	888	}
888		889
889	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)	890	for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
890	if (i[0] == keysym)	891	if (i[0] == keysym)
891	{	892	{
892	iso14755buf = ISO_14755_51 | i[1];	893	iso14755buf = ISO_14755_51 | i[1];
893	commit_iso14755 ();	894	commit_iso14755 ();
894		895
…		…
931	else if (keysym == XK_Control_L || keysym == XK_Control_R)	932	else if (keysym == XK_Control_L || keysym == XK_Control_R)
932	mouse_slip_wheel_speed = 0;	933	mouse_slip_wheel_speed = 0;
933	#endif	934	#endif
934	}	935	}
935		936
936	#if defined (KEYSYM_RESOURCE)
937	unsigned int
938	rxvt_term::cmd_write (const char *str, unsigned int count)
939	{
940	unsigned int n, s;
941
942	n = cmdbuf_ptr - cmdbuf_base;
943	s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
944
945	if (n > 0 && s < count)
946	{
947	memmove (cmdbuf_base, cmdbuf_ptr,
948	(unsigned int) (cmdbuf_endp - cmdbuf_ptr));
949	cmdbuf_ptr = cmdbuf_base;
950	cmdbuf_endp -= n;
951	s += n;
952	}
953
954	if (count > s)
955	{
956	rxvt_warn ("data loss: cmd_write too large, continuing.\n");
957	count = s;
958	}
959
960	for (; count--;)
961	*cmdbuf_endp++ = *str++;
962
963	cmd_parse ();
964
965	return 0;
966	}
967	#endif
968
969	void	937	void
970	rxvt_term::flush ()	938	rxvt_term::flush ()
971	{	939	{
972	flush_ev.stop ();	940	flush_ev.stop ();
973		941
974	#ifdef HAVE_BG_PIXMAP	942	#ifdef HAVE_BG_PIXMAP
975	if (bgPixmap.check_clearChanged ())	943	if (bg_flags & BG_NEEDS_REFRESH)
976	{	944	{
977	// scr_clear (true); This needs to be researched further!	945	bg_flags &= ~BG_NEEDS_REFRESH;
978	scr_touch (false);	946	scr_touch (false);
979	}	947	}
980	#endif	948	#endif
981		949
982	if (want_refresh)	950	if (want_refresh)
…		…
1019	while (row < end_row);	987	while (row < end_row);
1020	}	988	}
1021		989
1022	scr_refresh ();	990	scr_refresh ();
1023	scrollBar.show (1);	991	scrollBar.show (1);
1024	#ifdef USE_XIM	992	#if USE_XIM
1025	IMSendSpot ();	993	im_send_spot ();
1026	#endif	994	#endif
1027	}	995	}
1028		996
1029	display->flush ();	997	display->flush ();
1030	}	998	}
1031		999
1032	/* checks wether a refresh is requested and starts the refresh timer */	1000	/* checks whether a refresh is requested and starts the refresh timer */
1033	void	1001	void
1034	rxvt_term::refresh_check ()	1002	rxvt_term::refresh_check ()
1035	{	1003	{
1036	if (want_refresh && !flush_ev.is_active ())	1004	if (want_refresh && !flush_ev.is_active ())
1037	flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally	1005	flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
…		…
1047	refresh_count = 0;	1015	refresh_count = 0;
1048	flush ();	1016	flush ();
1049	}	1017	}
1050		1018
1051	#ifdef CURSOR_BLINK	1019	#ifdef CURSOR_BLINK
		1020	void
		1021	rxvt_term::cursor_blink_reset ()
		1022	{
		1023	if (hidden_cursor)
		1024	{
		1025	hidden_cursor = 0;
		1026	want_refresh = 1;
		1027	}
		1028
		1029	if (option (Opt_cursorBlink))
		1030	cursor_blink_ev.again ();
		1031	else
		1032	cursor_blink_ev.stop ();
		1033	}
		1034
1052	void	1035	void
1053	rxvt_term::cursor_blink_cb (ev::timer &w, int revents)	1036	rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1054	{	1037	{
1055	hidden_cursor = !hidden_cursor;	1038	hidden_cursor = !hidden_cursor;
1056	want_refresh = 1;	1039	want_refresh = 1;
…		…
1075		1058
1076	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	1059	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1077	void	1060	void
1078	rxvt_term::cont_scroll_cb (ev::timer &w, int revents)	1061	rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1079	{	1062	{
1080	if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)	1063	if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1081	&& scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))	1064	&& scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1082	{	1065	{
1083	want_refresh = 1;	1066	want_refresh = 1;
1084	refresh_check ();	1067	refresh_check ();
1085	}	1068	}
1086	else	1069	else
…		…
1131	// this should really be sched_yield(), but the linux guys thought	1114	// this should really be sched_yield(), but the linux guys thought
1132	// that giving a process calling sched_yield () less cpu time than	1115	// that giving a process calling sched_yield () less cpu time than
1133	// ones with high nice levels is a useful thing to do. It surely is is	1116	// ones with high nice levels is a useful thing to do. It surely is is
1134	// allowed by the sus... as is returning ENOSYS.	1117	// allowed by the sus... as is returning ENOSYS.
1135	// since the linux guys additionally thought that breaking the only	1118	// since the linux guys additionally thought that breaking the only
1136	// known workaroudn against their unusable sched_yield hack is cool,	1119	// known workaround against their unusable sched_yield hack is cool,
1137	// we just nanosleep a bit and hope for the best.	1120	// we just nanosleep a bit and hope for the best.
1138		1121
1139	struct timespec ts = { 0, 1000 };	1122	struct timespec ts = { 0, 1000 };
1140	nanosleep (&ts, 0);	1123	nanosleep (&ts, 0);
1141		1124
…		…
1147	{	1130	{
1148	}	1131	}
1149	} event_handler;	1132	} event_handler;
1150	#endif	1133	#endif
1151		1134
		1135	/* make sure all the cmd data is at beginning of cmdbuf */
		1136	void
		1137	rxvt_term::cmdbuf_reify ()
		1138	{
		1139	if (cmdbuf_ptr == cmdbuf_base)
		1140	return;
		1141
		1142	ssize_t used = cmdbuf_endp - cmdbuf_ptr;
		1143
		1144	memmove (cmdbuf_base, cmdbuf_ptr, used);
		1145	cmdbuf_ptr = cmdbuf_base;
		1146	cmdbuf_endp = cmdbuf_ptr + used;
		1147
		1148	}
		1149
		1150	#if defined (KEYSYM_RESOURCE)
		1151	void
		1152	rxvt_term::cmdbuf_append (const char *str, size_t count)
		1153	{
		1154	cmdbuf_reify ();
		1155
		1156	size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
		1157
		1158	if (count > avail)
		1159	return;
		1160
		1161	memcpy (cmdbuf_endp, str, count);
		1162	cmdbuf_endp += count;
		1163
		1164	cmd_parse ();
		1165	}
		1166	#endif
		1167
1152	bool	1168	bool
1153	rxvt_term::pty_fill ()	1169	rxvt_term::pty_fill ()
1154	{	1170	{
1155	ssize_t n = cmdbuf_endp - cmdbuf_ptr;	1171	cmdbuf_reify ();
1156		1172
1157	if (CBUFSIZ == n)	1173	size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1158	{	1174
1159	rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");	1175	if (!avail)
1160	n = 0;
1161	}	1176	{
1162		1177	// normally this indicates a "too long" command sequence - just drop the data we have
1163	memmove (cmdbuf_base, cmdbuf_ptr, n);
1164	cmdbuf_ptr = cmdbuf_base;	1178	cmdbuf_ptr = cmdbuf_base;
1165	cmdbuf_endp = cmdbuf_ptr + n;	1179	cmdbuf_endp = cmdbuf_ptr;
		1180	avail = CBUFSIZ;
		1181	}
1166		1182
1167	ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);	1183	ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1168		1184
1169	if (r > 0)	1185	if (r > 0)
1170	{	1186	{
1171	cmdbuf_endp += r;	1187	cmdbuf_endp += r;
1172	return true;	1188	return true;
…		…
1203	pty_write ();	1219	pty_write ();
1204		1220
1205	refresh_check ();	1221	refresh_check ();
1206	}	1222	}
1207		1223
1208	void	1224	void ecb_cold
1209	rxvt_term::pointer_unblank ()	1225	rxvt_term::pointer_unblank ()
1210	{	1226	{
1211	XDefineCursor (dpy, vt, TermWin_cursor);	1227	XDefineCursor (dpy, vt, TermWin_cursor);
1212	recolour_cursor ();	1228	recolour_cursor ();
1213		1229
…		…
1218	pointer_ev.start (pointerBlankDelay);	1234	pointer_ev.start (pointerBlankDelay);
1219	#endif	1235	#endif
1220	}	1236	}
1221		1237
1222	#ifdef POINTER_BLANK	1238	#ifdef POINTER_BLANK
1223	void	1239	void ecb_cold
1224	rxvt_term::pointer_blank ()	1240	rxvt_term::pointer_blank ()
1225	{	1241	{
1226	if (!option (Opt_pointerBlank))	1242	if (!option (Opt_pointerBlank))
1227	return;	1243	return;
1228		1244
…		…
1230	XFlush (dpy);	1246	XFlush (dpy);
1231		1247
1232	hidden_pointer = 1;	1248	hidden_pointer = 1;
1233	}	1249	}
1234		1250
1235	void	1251	void ecb_cold
1236	rxvt_term::pointer_cb (ev::timer &w, int revents)	1252	rxvt_term::pointer_cb (ev::timer &w, int revents)
1237	{	1253	{
1238	make_current ();	1254	make_current ();
1239		1255
1240	pointer_blank ();	1256	pointer_blank ();
…		…
1246	{	1262	{
1247	int button_number, key_state = 0;	1263	int button_number, key_state = 0;
1248	int x, y;	1264	int x, y;
1249	int code = 32;	1265	int code = 32;
1250		1266
1251	x = Pixel2Col (ev.x);	1267	x = Pixel2Col (ev.x) + 1;
1252	y = Pixel2Row (ev.y);	1268	y = Pixel2Row (ev.y) + 1;
		1269
1253	if (ev.type == MotionNotify)	1270	if (ev.type == MotionNotify)
1254	{	1271	{
1255	if (x == mouse_row && y == mouse_col)	1272	if (x == mouse_row && y == mouse_col)
1256	return;	1273	return;
		1274
1257	mouse_row = x;	1275	mouse_row = x;
1258	mouse_col = y;	1276	mouse_col = y;
1259	code += 32;	1277	code += 32;
1260	}	1278	}
1261		1279
…		…
1264	else	1282	else
1265	{	1283	{
1266	button_number = MEvent.button - Button1;	1284	button_number = MEvent.button - Button1;
1267	/* add 0x3D for wheel events, like xterm does */	1285	/* add 0x3D for wheel events, like xterm does */
1268	if (button_number >= 3)	1286	if (button_number >= 3)
1269	button_number += (64 - 3);	1287	button_number += 64 - 3;
1270	}	1288	}
1271		1289
1272	if (priv_modes & PrivMode_MouseX10)	1290	if (priv_modes & PrivMode_MouseX10)
1273	{	1291	{
1274	/*	1292	/*
…		…
1306	fputc ('A', stderr);	1324	fputc ('A', stderr);
1307	if (key_state & 32)	1325	if (key_state & 32)
1308	fputc ('2', stderr);	1326	fputc ('2', stderr);
1309	fprintf (stderr, "]: <%d>, %d/%d\n",	1327	fprintf (stderr, "]: <%d>, %d/%d\n",
1310	button_number,	1328	button_number,
1311	x + 1,	1329	x,
1312	y + 1);	1330	y);
1313	#endif	1331	#endif
1314		1332
		1333	#if ENABLE_FRILLS
		1334	if (priv_modes & PrivMode_ExtMouseRight)
		1335	tt_printf ("\033[%d;%d;%dM",
		1336	code + button_number + key_state,
		1337	x,
		1338	y);
		1339	else if (priv_modes & PrivMode_ExtModeMouse)
		1340	tt_printf ("\033[M%c%lc%lc",
		1341	code + button_number + key_state,
		1342	wint_t (32 + x),
		1343	wint_t (32 + y));
		1344	else
		1345	#endif
1315	tt_printf ("\033[M%c%c%c",	1346	tt_printf ("\033[M%c%c%c",
1316	(code + button_number + key_state),	1347	code + button_number + key_state,
1317	(32 + x + 1),	1348	32 + x,
1318	(32 + y + 1));	1349	32 + y);
1319	}	1350	}
1320		1351
1321	/*{{{ process an X event */	1352	/*{{{ process an X event */
1322	void	1353	void ecb_hot
1323	rxvt_term::x_cb (XEvent &ev)	1354	rxvt_term::x_cb (XEvent &ev)
1324	{	1355	{
1325	make_current ();	1356	make_current ();
1326		1357
1327	dLocal (Display *, dpy);	1358	dLocal (Display *, dpy);
…		…
1425	&& ev.xfocus.mode != NotifyGrab)	1456	&& ev.xfocus.mode != NotifyGrab)
1426	focus_out ();	1457	focus_out ();
1427	break;	1458	break;
1428		1459
1429	case ConfigureNotify:	1460	case ConfigureNotify:
1430	/*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1431	ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1432	szHint.width, szHint.height);*/
1433	if (ev.xconfigure.window == parent[0])	1461	if (ev.xconfigure.window == parent)
1434	{	1462	{
1435	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))	1463	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1436	;	1464	;
		1465
		1466	#ifdef HAVE_BG_PIXMAP
		1467	bool moved = false;
		1468	if (bg_window_position_sensitive ())
		1469	{
		1470	int x, y;
		1471	if (ev.xconfigure.send_event)
		1472	{
		1473	x = ev.xconfigure.x;
		1474	y = ev.xconfigure.y;
		1475	}
		1476	else
		1477	get_window_origin (x, y);
		1478
		1479	if (bg_set_position (x, y)
		1480	|| !(bg_flags & BG_IS_VALID))
		1481	moved = true;
		1482	}
		1483	#endif
1437		1484
1438	if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)	1485	if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1439	{	1486	{
1440	seen_resize = 1;	1487	seen_resize = 1;
1441	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1488	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1442	}	1489	}
1443	else	1490	else
1444	{	1491	{
1445	#ifdef HAVE_BG_PIXMAP	1492	#ifdef HAVE_BG_PIXMAP
1446	if (bgPixmap.window_position_sensitive ())
1447	{
1448	if (mapped)	1493	if (moved)
1449	update_background ();	1494	update_background ();
1450	else
1451	bgPixmap.invalidate ();
1452	}
1453	#endif	1495	#endif
1454	}	1496	}
1455		1497
1456	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));	1498	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1457	}	1499	}
1458	break;	1500	break;
1459		1501
1460	case PropertyNotify:	1502	case PropertyNotify:
1461	if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))	1503	HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1462	if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1463	&& ev.xproperty.state == PropertyNewValue)
1464	selection_property (ev.xproperty.window, ev.xproperty.atom);
1465
1466	break;	1504	break;
1467		1505
1468	case SelectionClear:	1506	case SelectionClear:
1469	selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);	1507	selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1470	break;	1508	break;
1471		1509
1472	case SelectionNotify:
1473	if (selection_wait == Sel_normal)
1474	selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1475	break;
1476
1477	case SelectionRequest:	1510	case SelectionRequest:
1478	selection_send (ev.xselectionrequest);	1511	selection_send (ev.xselectionrequest);
1479	break;	1512	break;
1480		1513
1481	case MapNotify:	1514	case MapNotify:
1482	#ifdef HAVE_BG_PIXMAP	1515	#ifdef HAVE_BG_PIXMAP
1483	/* This is needed spcifically to fix the case of no window manager or a	1516	/* This is needed specifically to fix the case of no window manager or a
1484	* non-reparenting window manager. In those cases we never get first	1517	* non-reparenting window manager. In those cases we never get first
1485	* ConfigureNotify. Also that speeds startup under normal WM, by taking	1518	* ConfigureNotify. Also that speeds startup under normal WM, by taking
1486	* care of multiplicity of ConfigureNotify events arriwing while WM does	1519	* care of multiplicity of ConfigureNotify events arriving while WM does
1487	* reparenting.	1520	* reparenting.
1488	* We should not render background immidiately, as there could be several	1521	* We should not render background immediately, as there could be several
1489	* ConfigureNotify's to follow. Lets take care of all of them in one scoop	1522	* ConfigureNotify's to follow. Lets take care of all of them in one scoop
1490	* by scheduling background redraw as soon as we can, but giving a short	1523	* by scheduling background redraw as soon as we can, but giving a short
1491	* bit of time for ConfigureNotifies to arrive.	1524	* bit of time for ConfigureNotifies to arrive.
1492	* We should render background PRIOR to drawing any text, but AFTER all	1525	* We should render background PRIOR to drawing any text, but AFTER all
1493	* of ConfigureNotifys for the best results.	1526	* of ConfigureNotifys for the best results.
1494	*/	1527	*/
1495	if (bgPixmap.flags & bgPixmap_t::isInvalid)	1528	if (!(bg_flags & BG_IS_VALID))
1496	update_background_ev.start (0.025);	1529	update_background_ev.start (0.025);
1497	#endif	1530	#endif
1498	mapped = 1;	1531	mapped = 1;
1499	#ifdef TEXT_BLINK	1532	#ifdef TEXT_BLINK
1500	text_blink_ev.start ();	1533	text_blink_ev.start ();
…		…
1515	if (ev.xany.window == vt)	1548	if (ev.xany.window == vt)
1516	{	1549	{
1517	do	1550	do
1518	{	1551	{
1519	scr_expose (ev.xexpose.x, ev.xexpose.y,	1552	scr_expose (ev.xexpose.x, ev.xexpose.y,
1520	ev.xexpose.width, ev.xexpose.height, False);	1553	ev.xexpose.width, ev.xexpose.height, false);
1521	}	1554	}
1522	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));	1555	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1523		1556
1524	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1557	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1525		1558
1526	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))	1559	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1527	{	1560	{
1528	scr_expose (ev.xexpose.x, ev.xexpose.y,	1561	scr_expose (ev.xexpose.x, ev.xexpose.y,
1529	ev.xexpose.width, ev.xexpose.height, False);	1562	ev.xexpose.width, ev.xexpose.height, false);
1530	}	1563	}
1531		1564
1532	want_refresh = 1;	1565	want_refresh = 1;
1533	}	1566	}
1534	else	1567	else
…		…
1540	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))	1573	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1541	;	1574	;
1542		1575
1543	if (scrollBar.state && ev.xany.window == scrollBar.win)	1576	if (scrollBar.state && ev.xany.window == scrollBar.win)
1544	{	1577	{
1545	scrollBar.state = STATE_IDLE;	1578	scrollBar.state = SB_STATE_IDLE;
1546	scrollBar.show (0);	1579	scrollBar.show (0);
1547	}	1580	}
1548	}	1581	}
1549	break;	1582	break;
1550		1583
…		…
1616	dist = int_bwidth - ev.xbutton.y;	1649	dist = int_bwidth - ev.xbutton.y;
1617	}	1650	}
1618	else	1651	else
1619	{	1652	{
1620	scroll_selection_dir = DN;	1653	scroll_selection_dir = DN;
1621	dist = ev.xbutton.y - (int_bwidth + height);	1654	dist = ev.xbutton.y - (int_bwidth + vt_height);
1622	}	1655	}
1623		1656
1624	scroll_selection_lines = Pixel2Height (dist)	1657	scroll_selection_lines = Pixel2Height (dist)
1625	/ SELECTION_SCROLL_LINE_SPEEDUP	1658	/ SELECTION_SCROLL_LINE_SPEEDUP
1626	+ 1;	1659	+ 1;
…		…
1638	#ifdef MOUSE_THRESHOLD	1671	#ifdef MOUSE_THRESHOLD
1639	}	1672	}
1640	#endif	1673	#endif
1641	}	1674	}
1642	}	1675	}
1643	else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)	1676	else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1644	{	1677	{
1645	while (XCheckTypedWindowEvent (dpy, scrollBar.win,	1678	while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1646	MotionNotify, &ev))	1679	MotionNotify, &ev))
1647	;	1680	;
1648		1681
1649	XQueryPointer (dpy, scrollBar.win,	1682	XQueryPointer (dpy, scrollBar.win,
1650	&unused_root, &unused_child,	1683	&unused_root, &unused_child,
1651	&unused_root_x, &unused_root_y,	1684	&unused_root_x, &unused_root_y,
1652	&ev.xbutton.x, &ev.xbutton.y,	1685	&ev.xbutton.x, &ev.xbutton.y,
1653	&unused_mask);	1686	&unused_mask);
1654	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1687	scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1655	scrollBar.size ());	1688	scrollBar.size ());
1656	want_refresh = 1;	1689	want_refresh = 1;
1657	scrollBar.show (1);	1690	scrollBar.show (1);
1658	}	1691	}
1659	break;	1692	break;
1660	}	1693	}
1661		1694
1662	#if defined(CURSOR_BLINK)	1695	#if defined(CURSOR_BLINK)
1663	if (option (Opt_cursorBlink) && ev.type == KeyPress)	1696	if (ev.type == KeyPress)
1664	{
1665	if (hidden_cursor)
1666	{
1667	hidden_cursor = 0;
1668	want_refresh = 1;
1669	}
1670
1671	cursor_blink_ev.again ();	1697	cursor_blink_reset ();
1672	}
1673	#endif	1698	#endif
1674		1699
1675	#if defined(POINTER_BLANK)	1700	#if defined(POINTER_BLANK)
1676	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)	1701	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1677	{	1702	{
…		…
1688		1713
1689	refresh_check ();	1714	refresh_check ();
1690	}	1715	}
1691		1716
1692	#if ENABLE_FRILLS	1717	#if ENABLE_FRILLS
1693	void	1718	void ecb_cold
1694	rxvt_term::set_urgency (bool enable)	1719	rxvt_term::set_urgency (bool enable)
1695	{	1720	{
1696	if (enable == urgency_hint)	1721	if (enable == urgency_hint)
1697	return;	1722	return;
1698		1723
1699	if (XWMHints *h = XGetWMHints (dpy, parent[0]))	1724	if (XWMHints *h = XGetWMHints (dpy, parent))
1700	{	1725	{
1701	h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);	1726	h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1702	XSetWMHints (dpy, parent[0], h);	1727	XSetWMHints (dpy, parent, h);
1703	urgency_hint = enable;	1728	urgency_hint = enable;
		1729	XFree (h);
1704	}	1730	}
1705	}	1731	}
1706	#endif	1732	#endif
1707		1733
1708	void	1734	void ecb_cold
1709	rxvt_term::focus_in ()	1735	rxvt_term::focus_in ()
1710	{	1736	{
1711	if (!focus)	1737	if (!focus)
1712	{	1738	{
1713	focus = 1;	1739	focus = 1;
1714	want_refresh = 1;	1740	want_refresh = 1;
1715		1741
1716	#if USE_XIM	1742	#if USE_XIM
1717	if (Input_Context != NULL)	1743	if (Input_Context != NULL)
1718	{	1744	{
1719	IMSetPosition ();	1745	im_set_position ();
1720	XSetICFocus (Input_Context);	1746	XSetICFocus (Input_Context);
1721	}	1747	}
1722	#endif	1748	#endif
1723	#if CURSOR_BLINK	1749	#if CURSOR_BLINK
1724	if (option (Opt_cursorBlink))	1750	if (option (Opt_cursorBlink))
…		…
1738		1764
1739	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));	1765	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1740	}	1766	}
1741	}	1767	}
1742		1768
1743	void	1769	void ecb_cold
1744	rxvt_term::focus_out ()	1770	rxvt_term::focus_out ()
1745	{	1771	{
1746	if (focus)	1772	if (focus)
1747	{	1773	{
1748	focus = 0;	1774	focus = 0;
…		…
1781		1807
1782	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));	1808	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1783	}	1809	}
1784	}	1810	}
1785		1811
1786	void	1812	void ecb_cold
1787	rxvt_term::update_fade_color (unsigned int idx)	1813	rxvt_term::update_fade_color (unsigned int idx)
1788	{	1814	{
1789	#if OFF_FOCUS_FADING	1815	#if OFF_FOCUS_FADING
1790	if (rs[Rs_fade])	1816	if (rs[Rs_fade])
1791	{	1817	{
…		…
1795	}	1821	}
1796	#endif	1822	#endif
1797	}	1823	}
1798		1824
1799	#if ENABLE_TRANSPARENCY || ENABLE_PERL	1825	#if ENABLE_TRANSPARENCY || ENABLE_PERL
1800	void	1826	void ecb_hot
1801	rxvt_term::rootwin_cb (XEvent &ev)	1827	rxvt_term::rootwin_cb (XEvent &ev)
1802	{	1828	{
1803	make_current ();	1829	make_current ();
1804		1830
1805	if (SHOULD_INVOKE (HOOK_ROOT_EVENT)	1831	if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
…		…
1815	* use the property to determine the pixmap. We use it later on.	1841	* use the property to determine the pixmap. We use it later on.
1816	*/	1842	*/
1817	if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]	1843	if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1818	|| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])	1844	|| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1819	{	1845	{
1820	bgPixmap.set_root_pixmap ();	1846	bg_set_root_pixmap ();
1821	update_background ();	1847	update_background ();
1822	}	1848	}
1823		1849
1824	break;	1850	break;
1825	}	1851	}
…		…
1864	/* save the xbutton state (for ButtonRelease) */	1890	/* save the xbutton state (for ButtonRelease) */
1865	MEvent.state = ev.state;	1891	MEvent.state = ev.state;
1866	#ifdef MOUSE_REPORT_DOUBLECLICK	1892	#ifdef MOUSE_REPORT_DOUBLECLICK
1867	if (ev.button == MEvent.button && clickintime)	1893	if (ev.button == MEvent.button && clickintime)
1868	{	1894	{
1869	/* same button, within alloted time */	1895	/* same button, within allowed time */
1870	MEvent.clicks++;	1896	MEvent.clicks++;
1871		1897
1872	if (MEvent.clicks > 1)	1898	if (MEvent.clicks > 1)
1873	{	1899	{
1874	/* only report double clicks */	1900	/* only report double clicks */
…		…
1955	if (scrollBar.upButton (ev.y))	1981	if (scrollBar.upButton (ev.y))
1956	direction = UP; /* up */	1982	direction = UP; /* up */
1957	else if (scrollBar.dnButton (ev.y))	1983	else if (scrollBar.dnButton (ev.y))
1958	direction = DN; /* down */	1984	direction = DN; /* down */
1959		1985
1960	scrollBar.state = STATE_IDLE;	1986	scrollBar.state = SB_STATE_IDLE;
1961	/*	1987	/*
1962	* Rxvt-style scrollbar:	1988	* Rxvt-style scrollbar:
1963	* move up if mouse is above slider	1989	* move up if mouse is above slider
1964	* move dn if mouse is below slider	1990	* move dn if mouse is below slider
1965	*	1991	*
…		…
2004	cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);	2030	cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2005	#endif	2031	#endif
2006	if (scr_page (direction, 1))	2032	if (scr_page (direction, 1))
2007	{	2033	{
2008	if (direction == UP)	2034	if (direction == UP)
2009	scrollBar.state = STATE_UP;	2035	scrollBar.state = SB_STATE_UP;
2010	else	2036	else
2011	scrollBar.state = STATE_DOWN;	2037	scrollBar.state = SB_STATE_DOWN;
2012	}	2038	}
2013	}	2039	}
2014	else	2040	else
2015	switch (ev.button)	2041	switch (ev.button)
2016	{	2042	{
2017	case Button2:	2043	case Button2:
2018	switch (scrollBar.align)	2044	switch (scrollBar.align)
2019	{	2045	{
2020	case R_SB_ALIGN_TOP:	2046	case SB_ALIGN_TOP:
2021	csrO = 0;	2047	csrO = 0;
2022	break;	2048	break;
2023	case R_SB_ALIGN_CENTRE:	2049	case SB_ALIGN_CENTRE:
2024	csrO = (scrollBar.bot - scrollBar.top) / 2;	2050	csrO = (scrollBar.bot - scrollBar.top) / 2;
2025	break;	2051	break;
2026	case R_SB_ALIGN_BOTTOM:	2052	case SB_ALIGN_BOTTOM:
2027	csrO = scrollBar.bot - scrollBar.top;	2053	csrO = scrollBar.bot - scrollBar.top;
2028	break;	2054	break;
2029	}	2055	}
2030		2056
2031	if (scrollBar.style == R_SB_XTERM	2057	if (scrollBar.style == SB_STYLE_XTERM
2032	|| scrollbar_above_slider (ev.y)	2058	|| scrollBar.above_slider (ev.y)
2033	|| scrollbar_below_slider (ev.y))	2059	|| scrollBar.below_slider (ev.y))
2034	scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());	2060	scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2035		2061
2036	scrollBar.state = STATE_MOTION;	2062	scrollBar.state = SB_STATE_MOTION;
2037	break;	2063	break;
2038		2064
2039	case Button1:	2065	case Button1:
2040	if (scrollBar.align == R_SB_ALIGN_CENTRE)	2066	if (scrollBar.align == SB_ALIGN_CENTRE)
2041	csrO = ev.y - scrollBar.top;	2067	csrO = ev.y - scrollBar.top;
2042	/* FALLTHROUGH */	2068	/* FALLTHROUGH */
2043		2069
2044	case Button3:	2070	case Button3:
2045	if (scrollBar.style != R_SB_XTERM)	2071	if (scrollBar.style != SB_STYLE_XTERM)
2046	{	2072	{
2047	if (scrollbar_above_slider (ev.y))	2073	if (scrollBar.above_slider (ev.y))
2048	# ifdef RXVT_SCROLL_FULL	2074	# ifdef RXVT_SCROLL_FULL
2049	scr_page (UP, nrow - 1);	2075	scr_page (UP, nrow - 1);
2050	# else	2076	# else
2051	scr_page (UP, nrow / 4);	2077	scr_page (UP, nrow / 4);
2052	# endif	2078	# endif
2053	else if (scrollbar_below_slider (ev.y))	2079	else if (scrollBar.below_slider (ev.y))
2054	# ifdef RXVT_SCROLL_FULL	2080	# ifdef RXVT_SCROLL_FULL
2055	scr_page (DN, nrow - 1);	2081	scr_page (DN, nrow - 1);
2056	# else	2082	# else
2057	scr_page (DN, nrow / 4);	2083	scr_page (DN, nrow / 4);
2058	# endif	2084	# endif
2059	else	2085	else
2060	scrollBar.state = STATE_MOTION;	2086	scrollBar.state = SB_STATE_MOTION;
2061	}	2087	}
2062	else	2088	else
2063	{	2089	{
2064	scr_page ((ev.button == Button1 ? DN : UP),	2090	scr_page ((ev.button == Button1 ? DN : UP),
2065	(nrow	2091	(nrow
2066	* scrollbar_position (ev.y)	2092	* scrollBar.position (ev.y)
2067	/ scrollBar.size ()));	2093	/ scrollBar.size ()));
2068	}	2094	}
2069		2095
2070	break;	2096	break;
2071	}	2097	}
…		…
2082		2108
2083	csrO = 0; /* reset csr Offset */	2109	csrO = 0; /* reset csr Offset */
2084	if (!bypass_keystate)	2110	if (!bypass_keystate)
2085	reportmode = !! (priv_modes & PrivMode_mouse_report);	2111	reportmode = !! (priv_modes & PrivMode_mouse_report);
2086		2112
2087	if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)	2113	if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2088	{	2114	{
2089	scrollBar.state = STATE_IDLE;	2115	scrollBar.state = SB_STATE_IDLE;
2090	scrollBar.show (0);	2116	scrollBar.show (0);
2091	}	2117	}
2092		2118
2093	#ifdef SELECTION_SCROLLING	2119	#ifdef SELECTION_SCROLLING
2094	sel_scroll_ev.stop();	2120	sel_scroll_ev.stop();
…		…
2144	case Button3:	2170	case Button3:
2145	selection_make (ev.time);	2171	selection_make (ev.time);
2146	break;	2172	break;
2147		2173
2148	case Button2:	2174	case Button2:
2149	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?	2175	if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2150	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);	2176	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2151	break;	2177	break;
2152		2178
2153	#ifdef MOUSE_WHEEL	2179	#ifdef MOUSE_WHEEL
2154	case Button4:	2180	case Button4:
2155	case Button5:	2181	case Button5:
…		…
2189	}	2215	}
2190	}	2216	}
2191		2217
2192	/*}}} */	2218	/*}}} */
2193		2219
2194	void	2220	void ecb_hot
2195	rxvt_term::cmd_parse ()	2221	rxvt_term::cmd_parse ()
2196	{	2222	{
2197	wchar_t ch = NOCHAR;	2223	wchar_t ch = NOCHAR;
2198	char *seq_begin; // remember start of esc-sequence here	2224	char *seq_begin; // remember start of esc-sequence here
2199		2225
2200	for (;;)	2226	for (;;)
2201	{	2227	{
2202	if (expect_false (ch == NOCHAR))	2228	if (ecb_unlikely (ch == NOCHAR))
2203	{	2229	{
2204	seq_begin = cmdbuf_ptr;	2230	seq_begin = cmdbuf_ptr;
2205	ch = next_char ();	2231	ch = next_char ();
2206		2232
2207	if (ch == NOCHAR)	2233	if (ch == NOCHAR)
2208	break;	2234	break;
2209	}	2235	}
2210		2236
2211	if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))	2237	if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2212	{	2238	{
2213	if (expect_false (!seen_input))	2239	if (ecb_unlikely (!seen_input))
2214	{	2240	{
2215	seen_input = 1;	2241	seen_input = 1;
2216	// many badly-written programs (e.g. jed) contain a race condition:	2242	// many badly-written programs (e.g. jed) contain a race condition:
2217	// they first read the screensize and then install a SIGWINCH handler.	2243	// they first read the screensize and then install a SIGWINCH handler.
2218	// some window managers resize the window early, and these programs	2244	// some window managers resize the window early, and these programs
…		…
2231	wchar_t *str = buf;	2257	wchar_t *str = buf;
2232	wchar_t *eol = str + min (ncol, UBUFSIZ);	2258	wchar_t *eol = str + min (ncol, UBUFSIZ);
2233		2259
2234	for (;;)	2260	for (;;)
2235	{	2261	{
2236	if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))	2262	if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2237	break;	2263	break;
2238		2264
2239	*str++ = ch;	2265	*str++ = ch;
2240		2266
2241	if (expect_false (ch == C0_LF || str >= eol))	2267	if (ecb_unlikely (ch == C0_LF || str >= eol))
2242	{	2268	{
2243	if (ch == C0_LF)	2269	if (ch == C0_LF)
2244	nlines++;	2270	nlines++;
2245		2271
2246	refresh_count++;	2272	refresh_count++;
…		…
2318	}	2344	}
2319	}	2345	}
2320	}	2346	}
2321		2347
2322	// read the next character	2348	// read the next character
2323	wchar_t	2349	wchar_t ecb_hot
2324	rxvt_term::next_char () NOTHROW	2350	rxvt_term::next_char () NOTHROW
2325	{	2351	{
2326	while (cmdbuf_ptr < cmdbuf_endp)	2352	while (cmdbuf_ptr < cmdbuf_endp)
2327	{	2353	{
2328	// assume 7-bit to be ascii ALWAYS	2354	// assume 7-bit to be ascii ALWAYS
2329	if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))	2355	if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2330	return *cmdbuf_ptr++;	2356	return *cmdbuf_ptr++;
2331		2357
2332	wchar_t wc;	2358	wchar_t wc;
2333	size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);	2359	size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2334		2360
…		…
2352		2378
2353	return NOCHAR;	2379	return NOCHAR;
2354	}	2380	}
2355		2381
2356	// read the next octet	2382	// read the next octet
2357	uint32_t	2383	uint32_t ecb_hot
2358	rxvt_term::next_octet () NOTHROW	2384	rxvt_term::next_octet () NOTHROW
2359	{	2385	{
2360	return cmdbuf_ptr < cmdbuf_endp	2386	return cmdbuf_ptr < cmdbuf_endp
2361	? (unsigned char)*cmdbuf_ptr++	2387	? (unsigned char)*cmdbuf_ptr++
2362	: NOCHAR;	2388	: NOCHAR;
2363	}	2389	}
2364		2390
2365	static class out_of_input out_of_input;	2391	static class out_of_input out_of_input;
2366		2392
2367	/* rxvt_cmd_getc () - Return next input character */	2393	wchar_t ecb_hot
2368	/*
2369	* Return the next input character after first passing any keyboard input
2370	* to the command.
2371	*/
2372	wchar_t
2373	rxvt_term::cmd_getc () THROW ((class out_of_input))	2394	rxvt_term::cmd_getc () THROW ((class out_of_input))
2374	{	2395	{
2375	wchar_t c = next_char ();	2396	wchar_t c = next_char ();
2376		2397
2377	if (c == NOCHAR)	2398	if (c == NOCHAR)
2378	throw out_of_input;	2399	throw out_of_input;
2379		2400
2380	return c;	2401	return c;
2381	}	2402	}
2382		2403
2383	uint32_t	2404	uint32_t ecb_hot
2384	rxvt_term::cmd_get8 () THROW ((class out_of_input))	2405	rxvt_term::cmd_get8 () THROW ((class out_of_input))
2385	{	2406	{
2386	uint32_t c = next_octet ();	2407	uint32_t c = next_octet ();
2387		2408
2388	if (c == NOCHAR)	2409	if (c == NOCHAR)
…		…
2392	}	2413	}
2393		2414
2394	/*{{{ print pipe */	2415	/*{{{ print pipe */
2395	/*----------------------------------------------------------------------*/	2416	/*----------------------------------------------------------------------*/
2396	#ifdef PRINTPIPE	2417	#ifdef PRINTPIPE
2397	FILE *	2418	FILE * ecb_cold
2398	rxvt_term::popen_printer ()	2419	rxvt_term::popen_printer ()
2399	{	2420	{
2400	FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");	2421	FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2401		2422
2402	if (stream == NULL)	2423	if (stream == NULL)
2403	rxvt_warn ("can't open printer pipe, not printing.\n");	2424	rxvt_warn ("can't open printer pipe, not printing.\n");
2404		2425
2405	return stream;	2426	return stream;
2406	}	2427	}
2407		2428
2408	int	2429	int ecb_cold
2409	rxvt_term::pclose_printer (FILE *stream)	2430	rxvt_term::pclose_printer (FILE *stream)
2410	{	2431	{
2411	fflush (stream);	2432	fflush (stream);
2412	return pclose (stream);	2433	return pclose (stream);
2413	}	2434	}
2414		2435
2415	/*	2436	/*
2416	* simulate attached vt100 printer	2437	* simulate attached vt100 printer
2417	*/	2438	*/
2418	void	2439	void ecb_cold
2419	rxvt_term::process_print_pipe ()	2440	rxvt_term::process_print_pipe ()
2420	{	2441	{
2421	FILE *fd = popen_printer ();	2442	FILE *fd = popen_printer ();
2422		2443
2423	if (!fd)	2444	if (!fd)
…		…
2469	pclose_printer (fd);	2490	pclose_printer (fd);
2470	}	2491	}
2471	#endif /* PRINTPIPE */	2492	#endif /* PRINTPIPE */
2472	/*}}} */	2493	/*}}} */
2473		2494
2474	/* *INDENT-OFF* */
2475	enum {	2495	enum {
2476	C1_40 = 0x40,	2496	C1_40 = 0x40,
2477	C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,	2497	C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2478	C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,	2498	C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2479	C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,	2499	C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2480	C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,	2500	C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2481	};	2501	};
2482	/* *INDENT-ON* */
2483		2502
2484	/*{{{ process non-printing single characters */	2503	/*{{{ process non-printing single characters */
2485	void	2504	void ecb_hot
2486	rxvt_term::process_nonprinting (unicode_t ch)	2505	rxvt_term::process_nonprinting (unicode_t ch)
2487	{	2506	{
2488	switch (ch)	2507	switch (ch)
2489	{	2508	{
2490	case C0_ESC:	2509	case C0_ESC:
…		…
2536	}	2555	}
2537	/*}}} */	2556	/*}}} */
2538		2557
2539		2558
2540	/*{{{ process VT52 escape sequences */	2559	/*{{{ process VT52 escape sequences */
2541	void	2560	void ecb_cold
2542	rxvt_term::process_escape_vt52 (unicode_t ch)	2561	rxvt_term::process_escape_vt52 (unicode_t ch)
2543	{	2562	{
2544	int row, col;	2563	int row, col;
2545		2564
2546	switch (ch)	2565	switch (ch)
…		…
2580	break;	2599	break;
2581	case 'Z': /* identify the terminal type */	2600	case 'Z': /* identify the terminal type */
2582	tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */	2601	tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2583	break;	2602	break;
2584	case '<': /* turn off VT52 mode */	2603	case '<': /* turn off VT52 mode */
2585	set_privmode (PrivMode_vt52, 0);	2604	priv_modes &= ~PrivMode_vt52;
2586	break;	2605	break;
2587	case 'F': /* use special graphics character set */	2606	case 'F': /* use special graphics character set */
2588	case 'G': /* use regular character set */	2607	case 'G': /* use regular character set */
2589	/* unimplemented */	2608	/* unimplemented */
2590	break;	2609	break;
…		…
2596	}	2615	}
2597	/*}}} */	2616	/*}}} */
2598		2617
2599		2618
2600	/*{{{ process escape sequences */	2619	/*{{{ process escape sequences */
2601	void	2620	void ecb_hot
2602	rxvt_term::process_escape_seq ()	2621	rxvt_term::process_escape_seq ()
2603	{	2622	{
2604	unicode_t ch = cmd_getc ();	2623	unicode_t ch = cmd_getc ();
2605		2624
2606	if (priv_modes & PrivMode_vt52)	2625	if (priv_modes & PrivMode_vt52)
…		…
2609	return;	2628	return;
2610	}	2629	}
2611		2630
2612	switch (ch)	2631	switch (ch)
2613	{	2632	{
2614	/* case 1: do_tek_mode (); break; */
2615	case '#':	2633	case '#':
2616	if (cmd_getc () == '8')	2634	if (cmd_getc () == '8')
2617	scr_E ();	2635	scr_E ();
2618	break;	2636	break;
2619	case '(':	2637	case '(':
…		…
2642	#if !ENABLE_MINIMAL	2660	#if !ENABLE_MINIMAL
2643	case '9':	2661	case '9':
2644	scr_forwardindex ();	2662	scr_forwardindex ();
2645	break;	2663	break;
2646	#endif	2664	#endif
		2665	// DECPAM/DECPNM
2647	case '=':	2666	case '=':
		2667	priv_modes |= PrivMode_aplKP;
		2668	break;
2648	case '>':	2669	case '>':
2649	set_privmode (PrivMode_aplKP, ch == '=');	2670	priv_modes &= ~PrivMode_aplKP;
2650	break;	2671	break;
2651		2672
2652	case C1_40:	2673	case C1_40:
2653	cmd_getc ();	2674	cmd_getc ();
2654	break;	2675	break;
…		…
2658		2679
2659	/* 8.3.87: NEXT LINE */	2680	/* 8.3.87: NEXT LINE */
2660	case C1_NEL: /* ESC E */	2681	case C1_NEL: /* ESC E */
2661	{	2682	{
2662	wchar_t nlcr[] = { C0_LF, C0_CR };	2683	wchar_t nlcr[] = { C0_LF, C0_CR };
2663	scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);	2684	scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2664	}	2685	}
2665	break;	2686	break;
2666		2687
2667	/* kidnapped escape sequence: Should be 8.3.48 */	2688	/* kidnapped escape sequence: Should be 8.3.48 */
2668	case C1_ESA: /* ESC G */	2689	case C1_ESA: /* ESC G */
2669	process_graphics ();	2690	// used by original rxvt for rob nations own graphics mode
		2691	if (cmd_getc () == 'Q')
		2692	tt_printf ("\033G0\012"); /* query graphics - no graphics */
2670	break;	2693	break;
2671		2694
2672	/* 8.3.63: CHARACTER TABULATION SET */	2695	/* 8.3.63: CHARACTER TABULATION SET */
2673	case C1_HTS: /* ESC H */	2696	case C1_HTS: /* ESC H */
2674	scr_set_tab (1);	2697	scr_set_tab (1);
…		…
2678	case C1_RI: /* ESC M */	2701	case C1_RI: /* ESC M */
2679	scr_index (DN);	2702	scr_index (DN);
2680	break;	2703	break;
2681		2704
2682	/* 8.3.142: SINGLE-SHIFT TWO */	2705	/* 8.3.142: SINGLE-SHIFT TWO */
2683	/*case C1_SS2: scr_single_shift (2); break; */	2706	/* case C1_SS2: break; */
2684		2707
2685	/* 8.3.143: SINGLE-SHIFT THREE */	2708	/* 8.3.143: SINGLE-SHIFT THREE */
2686	/*case C1_SS3: scr_single_shift (3); break; */	2709	/* case C1_SS3: break; */
2687		2710
2688	/* 8.3.27: DEVICE CONTROL STRING */	2711	/* 8.3.27: DEVICE CONTROL STRING */
2689	case C1_DCS: /* ESC P */	2712	case C1_DCS: /* ESC P */
2690	process_dcs_seq ();	2713	process_dcs_seq ();
2691	break;	2714	break;
…		…
2724	}	2747	}
2725	}	2748	}
2726	/*}}} */	2749	/*}}} */
2727		2750
2728	/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */	2751	/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2729	/* *INDENT-OFF* */
2730	enum {	2752	enum {
2731	CSI_ICH = 0x40,	2753	CSI_ICH = 0x40,
2732	CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,	2754	CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2733	CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,	2755	CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2734	CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,	2756	CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
…		…
2737	CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,	2759	CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2738	CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,	2760	CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2739	CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F	2761	CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2740	};	2762	};
2741		2763
2742	#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \	2764	#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2743	(((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \	2765	(((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2744	| ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))	2766	| ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2745	#define get_byte_array_bit(array, bit) \	2767	#define get_byte_array_bit(array, bit) \
2746	(!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7))))	2768	(!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2747		2769
2748	const unsigned char csi_defaults[] =	2770	static const unsigned char csi_defaults[] =
2749	{	2771	{
2750	make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */	2772	make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2751	make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */	2773	make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2752	make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */	2774	make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2753	make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */	2775	make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2754	make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */	2776	make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2755	make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */	2777	make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2756	make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */	2778	make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2757	make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */	2779	make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2758	};	2780	};
2759	/* *INDENT-ON* */
2760		2781
2761	void	2782	void ecb_hot
2762	rxvt_term::process_csi_seq ()	2783	rxvt_term::process_csi_seq ()
2763	{	2784	{
2764	unicode_t ch, priv, i;	2785	unicode_t ch, priv, i;
2765	unsigned int nargs, p;	2786	unsigned int nargs, p;
2766	int n, ndef;	2787	int n, ndef;
…		…
2842	{	2863	{
2843	/* DECSTR: soft terminal reset, used by our terminfo since 9.06 */	2864	/* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2844	scr_soft_reset ();	2865	scr_soft_reset ();
2845		2866
2846	static const int pm_h[] = { 7, 25 };	2867	static const int pm_h[] = { 7, 25 };
2847	static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 };	2868	static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2848		2869
2849	process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h);	2870	process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2850	process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l);	2871	process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2851	}	2872	}
2852	break;	2873	break;
2853	}	2874	}
2854		2875
2855	return;	2876	return;
…		…
2873	}	2894	}
2874	break;	2895	break;
2875	#endif	2896	#endif
2876		2897
2877	case CSI_CUU: /* 8.3.22: (1) CURSOR UP */	2898	case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2878	case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */	2899	case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2879	arg[0] = -arg[0];	2900	arg[0] = -arg[0];
2880	/* FALLTHROUGH */	2901	/* FALLTHROUGH */
2881	case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */	2902	case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2882	case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */	2903	case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2883	scr_gotorc (arg[0], 0, RELATIVE);	2904	scr_gotorc (arg[0], 0, RELATIVE);
2884	break;	2905	break;
2885		2906
2886	case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */	2907	case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2887	case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */	2908	case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
…		…
3074	}	3095	}
3075	}	3096	}
3076	/*}}} */	3097	/*}}} */
3077		3098
3078	#if !ENABLE_MINIMAL	3099	#if !ENABLE_MINIMAL
3079	/* ARGSUSED */
3080	void	3100	void
3081	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3101	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3082	{	3102	{
3083	int x, y;	3103	int x, y;
3084	XWindowAttributes wattr;	3104	XWindowAttributes wattr;
…		…
3093	{	3113	{
3094	/*	3114	/*
3095	* commands	3115	* commands
3096	*/	3116	*/
3097	case 1: /* deiconify window */	3117	case 1: /* deiconify window */
3098	XMapWindow (dpy, parent[0]);	3118	XMapWindow (dpy, parent);
3099	break;	3119	break;
3100	case 2: /* iconify window */	3120	case 2: /* iconify window */
3101	XIconifyWindow (dpy, parent[0], display->screen);	3121	XIconifyWindow (dpy, parent, display->screen);
3102	break;	3122	break;
3103	case 3: /* set position (pixels) */	3123	case 3: /* set position (pixels) */
3104	XMoveWindow (dpy, parent[0], args[1], args[2]);	3124	XMoveWindow (dpy, parent, args[1], args[2]);
3105	break;	3125	break;
3106	case 4: /* set size (pixels) */	3126	case 4: /* set size (pixels) */
3107	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3127	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3108	break;	3128	break;
3109	case 5: /* raise window */	3129	case 5: /* raise window */
3110	XRaiseWindow (dpy, parent[0]);	3130	XRaiseWindow (dpy, parent);
3111	break;	3131	break;
3112	case 6: /* lower window */	3132	case 6: /* lower window */
3113	XLowerWindow (dpy, parent[0]);	3133	XLowerWindow (dpy, parent);
3114	break;	3134	break;
3115	case 7: /* refresh window */	3135	case 7: /* refresh window */
3116	scr_touch (true);	3136	scr_touch (true);
3117	break;	3137	break;
3118	case 8: /* set size (chars) */	3138	case 8: /* set size (chars) */
…		…
3121	break;	3141	break;
3122		3142
3123	//case 9: NYI, TODO, restore maximized window or maximize window	3143	//case 9: NYI, TODO, restore maximized window or maximize window
3124	default:	3144	default:
3125	if (args[0] >= 24) /* set height (chars) */	3145	if (args[0] >= 24) /* set height (chars) */
3126	set_widthheight ((unsigned int)width,	3146	set_widthheight ((unsigned int)vt_width,
3127	(unsigned int) (args[1] * fheight));	3147	(unsigned int) (args[1] * fheight));
3128	break;	3148	break;
3129		3149
3130	/*	3150	/*
3131	* reports - some output format copied from XTerm	3151	* reports - some output format copied from XTerm
3132	*/	3152	*/
3133	case 11: /* report window state */	3153	case 11: /* report window state */
3134	XGetWindowAttributes (dpy, parent[0], &wattr);	3154	XGetWindowAttributes (dpy, parent, &wattr);
3135	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3155	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3136	break;	3156	break;
3137	case 13: /* report window position */	3157	case 13: /* report window position */
3138	XGetWindowAttributes (dpy, parent[0], &wattr);	3158	XGetWindowAttributes (dpy, parent, &wattr);
3139	XTranslateCoordinates (dpy, parent[0], wattr.root,	3159	XTranslateCoordinates (dpy, parent, wattr.root,
3140	-wattr.border_width, -wattr.border_width,	3160	-wattr.border_width, -wattr.border_width,
3141	&x, &y, &wdummy);	3161	&x, &y, &wdummy);
3142	tt_printf ("\033[3;%d;%dt", x, y);	3162	tt_printf ("\033[3;%d;%dt", x, y);
3143	break;	3163	break;
3144	case 14: /* report window size (pixels) */	3164	case 14: /* report window size (pixels) */
3145	XGetWindowAttributes (dpy, parent[0], &wattr);	3165	XGetWindowAttributes (dpy, parent, &wattr);
3146	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3166	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3147	break;	3167	break;
3148	case 18: /* report text area size (chars) */	3168	case 18: /* report text area size (chars) */
3149	tt_printf ("\033[8;%d;%dt", nrow, ncol);	3169	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3150	break;	3170	break;
…		…
3152	tt_printf ("\033[9;%d;%dt", nrow, ncol);	3172	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3153	break;	3173	break;
3154	case 20: /* report icon label */	3174	case 20: /* report icon label */
3155	{	3175	{
3156	char *s;	3176	char *s;
3157	XGetIconName (dpy, parent[0], &s);	3177	XGetIconName (dpy, parent, &s);
3158	tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */	3178	tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3159	XFree (s);	3179	XFree (s);
3160	}	3180	}
3161	break;	3181	break;
3162	case 21: /* report window title */	3182	case 21: /* report window title */
3163	{	3183	{
3164	char *s;	3184	char *s;
3165	XFetchName (dpy, parent[0], &s);	3185	XFetchName (dpy, parent, &s);
3166	tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */	3186	tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3167	XFree (s);	3187	XFree (s);
3168	}	3188	}
3169	break;	3189	break;
3170	}	3190	}
…		…
3226	* process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'	3246	* process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3227	*/	3247	*/
3228	void	3248	void
3229	rxvt_term::process_dcs_seq ()	3249	rxvt_term::process_dcs_seq ()
3230	{	3250	{
3231	char *s;
3232	unicode_t eh;
3233
3234	/*	3251	/*
3235	* Not handled yet	3252	* Not handled yet
3236	*/	3253	*/
		3254
		3255	unicode_t eh;
3237	s = get_to_st (eh);	3256	char *s = get_to_st (eh);
3238	if (s)	3257	if (s)
3239	free (s);	3258	free (s);
3240		3259
3241	return;	3260	return;
3242	}	3261	}
…		…
3246	* process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'	3265	* process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3247	*/	3266	*/
3248	void	3267	void
3249	rxvt_term::process_osc_seq ()	3268	rxvt_term::process_osc_seq ()
3250	{	3269	{
3251	unicode_t ch, eh;
3252	int arg;	3270	int arg;
3253		3271
3254	ch = cmd_getc ();	3272	unicode_t ch = cmd_getc ();
3255	for (arg = 0; isdigit (ch); ch = cmd_getc ())	3273	for (arg = 0; isdigit (ch); ch = cmd_getc ())
3256	arg = arg * 10 + (ch - '0');	3274	arg = arg * 10 + (ch - '0');
3257		3275
3258	if (ch == ';')	3276	if (ch == ';')
3259	{	3277	{
		3278	unicode_t eh;
3260	char *s = get_to_st (eh);	3279	char *s = get_to_st (eh);
3261		3280
3262	if (s)	3281	if (s)
3263	{	3282	{
3264	process_xterm_seq (arg, s, eh);	3283	process_xterm_seq (arg, s, eh);
…		…
3325	unsigned long bytes_after;	3344	unsigned long bytes_after;
3326	unsigned char *value = 0;	3345	unsigned char *value = 0;
3327	const char *str = "";	3346	const char *str = "";
3328		3347
3329	if (prop	3348	if (prop
3330	&& XGetWindowProperty (dpy, parent[0],	3349	&& XGetWindowProperty (dpy, parent,
3331	prop, 0, 1<<16, 0, AnyPropertyType,	3350	prop, 0, 1<<16, 0, AnyPropertyType,
3332	&actual_type, &actual_format,	3351	&actual_type, &actual_format,
3333	&nitems, &bytes_after, &value) == Success	3352	&nitems, &bytes_after, &value) == Success
3334	&& actual_type != None	3353	&& actual_type != None
3335	&& actual_format == 8)	3354	&& actual_format == 8)
…		…
3347	{	3366	{
3348	*eq = 0;	3367	*eq = 0;
3349	set_utf8_property (display->atom (str), eq + 1);	3368	set_utf8_property (display->atom (str), eq + 1);
3350	}	3369	}
3351	else	3370	else
3352	XDeleteProperty (dpy, parent[0],	3371	XDeleteProperty (dpy, parent,
3353	display->atom (str));	3372	display->atom (str));
3354	}	3373	}
3355	break;	3374	break;
3356		3375
3357	case XTerm_Color:	3376	case XTerm_Color:
…		…
3389	process_color_seq (op, Color_pointer_fg, str, resp);	3408	process_color_seq (op, Color_pointer_fg, str, resp);
3390	break;	3409	break;
3391	case XTerm_Color_pointer_bg:	3410	case XTerm_Color_pointer_bg:
3392	process_color_seq (op, Color_pointer_bg, str, resp);	3411	process_color_seq (op, Color_pointer_bg, str, resp);
3393	break;	3412	break;
		3413	#ifdef OPTION_HC
		3414	case XTerm_Color_HC:
		3415	process_color_seq (op, Color_HC, str, resp);
		3416	break;
		3417	case XTerm_Color_HTC:
		3418	process_color_seq (op, Color_HTC, str, resp);
		3419	break;
		3420	#endif
3394	#ifndef NO_BOLD_UNDERLINE_REVERSE	3421	#ifndef NO_BOLD_UNDERLINE_REVERSE
3395	case XTerm_Color_RV:
3396	process_color_seq (op, Color_RV, str, resp);
3397	break;
3398	case Rxvt_Color_BD:
3399	case URxvt_Color_BD:	3422	case URxvt_Color_BD:
3400	process_color_seq (op, Color_BD, str, resp);	3423	process_color_seq (op, Color_BD, str, resp);
3401	break;	3424	break;
3402	case Rxvt_Color_UL:
3403	case URxvt_Color_UL:	3425	case URxvt_Color_UL:
3404	process_color_seq (op, Color_UL, str, resp);	3426	process_color_seq (op, Color_UL, str, resp);
3405	break;	3427	break;
3406	case URxvt_Color_IT:	3428	case URxvt_Color_IT:
3407	process_color_seq (op, Color_IT, str, resp);	3429	process_color_seq (op, Color_IT, str, resp);
…		…
3415	process_color_seq (op, Color_tint, str, resp);	3437	process_color_seq (op, Color_tint, str, resp);
3416	{	3438	{
3417	bool changed = false;	3439	bool changed = false;
3418		3440
3419	if (ISSET_PIXCOLOR (Color_tint))	3441	if (ISSET_PIXCOLOR (Color_tint))
3420	changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);	3442	changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3421	else
3422	changed = bgPixmap.unset_tint ();
3423		3443
3424	if (changed)	3444	if (changed)
3425	update_background ();	3445	update_background ();
3426	}	3446	}
3427		3447
…		…
3431	#if BG_IMAGE_FROM_FILE	3451	#if BG_IMAGE_FROM_FILE
3432	case Rxvt_Pixmap:	3452	case Rxvt_Pixmap:
3433	if (!strcmp (str, "?"))	3453	if (!strcmp (str, "?"))
3434	{	3454	{
3435	char str[256];	3455	char str[256];
		3456	int h_scale = 0, v_scale = 0;
		3457	int h_align = 0, v_align = 0;
		3458	if (image_vec.size () > 0)
		3459	{
		3460	h_scale = image_vec[0].h_scale;
		3461	v_scale = image_vec[0].v_scale;
		3462	h_align = image_vec[0].h_align;
		3463	v_align = image_vec[0].v_align;
		3464	}
3436		3465
3437	sprintf (str, "[%dx%d+%d+%d]",	3466	sprintf (str, "[%dx%d+%d+%d]",
3438	min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),	3467	h_scale, v_scale,
3439	min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));	3468	h_align, v_align);
3440	process_xterm_seq (XTerm_title, str, CHAR_ST);	3469	process_xterm_seq (XTerm_title, str, CHAR_ST);
3441	}	3470	}
3442	else	3471	else
3443	{	3472	{
3444	int changed = 0;	3473	bool changed = false;
3445		3474
3446	if (*str != ';')	3475	if (*str != ';')
3447	{	3476	{
3448	/* reset to default scaling :*/	3477	if (image_vec.size () > 0)
3449	bgPixmap.unset_geometry ();	3478	changed = image_vec[0].set_file_geometry (str);
3450	if (bgPixmap.set_file (str)) /* change pixmap */	3479	else
		3480	{
		3481	rxvt_image *image = new_image ();
		3482	if (!image->set_file_geometry (str))
		3483	image_vec.pop_back ();
		3484	else
3451	changed++;	3485	changed = true;
3452	str = strchr (str, ';');	3486	}
3453	if (str == NULL)
3454	bgPixmap.set_defaultGeometry ();
3455	}	3487	}
3456		3488	else
3457	while (str)
3458	{	3489	{
3459	str++;	3490	str++;
3460	if (bgPixmap.set_geometry (str))	3491	if (image_vec.size () > 0)
3461	changed++;	3492	changed = image_vec[0].set_geometry (str, true);
3462	str = strchr (str, ';');
3463	}	3493	}
3464		3494
3465	if (changed)	3495	if (changed)
		3496	{
		3497	if (bg_window_position_sensitive ())
		3498	{
		3499	int x, y;
		3500	get_window_origin (x, y);
		3501	bg_set_position (x, y);
		3502	}
3466	update_background ();	3503	update_background ();
		3504	}
3467	}	3505	}
3468	break;	3506	break;
3469	#endif	3507	#endif
3470		3508
3471	case XTerm_logfile:	3509	case XTerm_logfile:
…		…
3558	* 's' = save	3596	* 's' = save
3559	* 'r' = restore	3597	* 'r' = restore
3560	* 't' = toggle	3598	* 't' = toggle
3561	* so no need for fancy checking	3599	* so no need for fancy checking
3562	*/	3600	*/
3563	int	3601	int ecb_cold
3564	rxvt_term::privcases (int mode, unsigned long bit)	3602	rxvt_term::privcases (int mode, unsigned long bit)
3565	{	3603	{
3566	int state;	3604	int state;
3567		3605
3568	if (mode == 's')	3606	if (mode == 's')
3569	{	3607	{
3570	SavedModes |= (priv_modes & bit);	3608	if (priv_modes & bit)
		3609	SavedModes |= bit;
		3610	else
		3611	SavedModes &= ~bit;
3571	return -1;	3612	return -1;
3572	}	3613	}
3573	else	3614	else
3574	{	3615	{
3575	if (mode == 'r')	3616	if (mode == 'r')
3576	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */	3617	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3577	else	3618	else
3578	state = (mode == 't') ? ! (priv_modes & bit) : mode;	3619	state = (mode == 't') ? ! (priv_modes & bit) : mode;
3579	set_privmode (bit, state);	3620
		3621	if (state)
		3622	priv_modes |= bit;
		3623	else
		3624	priv_modes &= ~bit;
3580	}	3625	}
3581		3626
3582	return state;	3627	return state;
3583	}	3628	}
3584		3629
3585	/* we're not using priv _yet_ */	3630	/* we're not using priv _yet_ */
3586	void	3631	void
3587	rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)	3632	rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3588	{	3633	{
3589	unsigned int i, j;	3634	unsigned int i, j;
3590	int state;	3635	int state;
3591		3636
3592	static const struct	3637	static const struct
3593	{	3638	{
3594	const int argval;	3639	const int argval;
3595	const unsigned long bit;	3640	const unsigned long bit;
3596	} argtopriv[] = {	3641	} argtopriv[] = {
3597	{ 1, PrivMode_aplCUR }, // DECCKM	3642	{ 1, PrivMode_aplCUR }, // DECCKM
3598	{ 2, PrivMode_vt52 },	3643	{ 2, PrivMode_vt52 }, // DECANM
3599	{ 3, PrivMode_132 }, // DECCOLM	3644	{ 3, PrivMode_132 }, // DECCOLM
3600	{ 4, PrivMode_smoothScroll }, // DECSCLM	3645	{ 4, PrivMode_smoothScroll }, // DECSCLM
3601	{ 5, PrivMode_rVideo }, // DECSCNM	3646	{ 5, PrivMode_rVideo }, // DECSCNM
3602	{ 6, PrivMode_relOrigin }, // DECOM	3647	{ 6, PrivMode_relOrigin }, // DECOM
3603	{ 7, PrivMode_Autowrap }, // DECAWM	3648	{ 7, PrivMode_Autowrap }, // DECAWM
3604	// 8, auto-repeat keys // DECARM	3649	// 8, auto-repeat keys // DECARM
3605	{ 9, PrivMode_MouseX10 },	3650	{ 9, PrivMode_MouseX10 },
3606	// 18 end FF to printer after print screen	3651	// 18 end FF to printer after print screen
3607	// 19 Print screen prints full screen/scorll region	3652	// 19 Print screen prints full screen/scroll region
3608	{ 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis	3653	{ 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3609	#ifdef scrollBar_esc	3654	#ifdef scrollBar_esc
3610	{ scrollBar_esc, PrivMode_scrollBar },	3655	{ scrollBar_esc, PrivMode_scrollBar },
3611	#endif	3656	#endif
3612	{ 35, PrivMode_ShiftKeys }, // rxvt extension	3657	{ 35, PrivMode_ShiftKeys }, // rxvt extension
3613	// 38, tektronix mode // DECTEK	3658	// 38, tektronix mode // DECTEK
3614	{ 40, PrivMode_132OK },	3659	{ 40, PrivMode_132OK },
3615	// 41 xterm more fixes NYI	3660	// 41 xterm more fixes NYI
3616	// 45 margin bell NYI	3661	// 45 margin bell NYI
3617	// 46 start logging	3662	// 46 start logging
3618	{ 47, PrivMode_Screen },	3663	{ 47, PrivMode_Screen },
3619	{ 66, PrivMode_aplKP }, // DECPAM/DECPNM	3664	{ 66, PrivMode_aplKP }, // DECNKM
3620	#ifndef NO_BACKSPACE_KEY	3665	#ifndef NO_BACKSPACE_KEY
3621	{ 67, PrivMode_BackSpace }, // DECBKM	3666	{ 67, PrivMode_BackSpace }, // DECBKM
3622	#endif	3667	#endif
3623	{ 1000, PrivMode_MouseX11 },	3668	{ 1000, PrivMode_MouseX11 },
3624	{ 1002, PrivMode_MouseBtnEvent },	3669	{ 1002, PrivMode_MouseBtnEvent },
3625	{ 1003, PrivMode_MouseAnyEvent },	3670	{ 1003, PrivMode_MouseAnyEvent },
		3671	#if ENABLE_FRILLS
		3672	{ 1005, PrivMode_ExtModeMouse },
		3673	#endif
3626	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension	3674	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension
3627	{ 1011, PrivMode_Keypress }, // rxvt extension	3675	{ 1011, PrivMode_Keypress }, // rxvt extension
		3676	#if ENABLE_FRILLS
		3677	{ 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
		3678	#endif
3628	// 1035 enable modifiers for alt, numlock NYI	3679	// 1035 enable modifiers for alt, numlock NYI
3629	// 1036 send ESC for meta keys NYI	3680	// 1036 send ESC for meta keys NYI
3630	// 1037 send DEL for keypad delete NYI	3681	// 1037 send DEL for keypad delete NYI
3631	{ 1047, PrivMode_Screen },	3682	{ 1047, PrivMode_Screen },
3632	// 1048 save and restore cursor	3683	// 1048 save and restore cursor, implemented in code
3633	{ 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */	3684	{ 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3634	// 1051, 1052, 1060, 1061 keyboard emulation NYI	3685	// 1051, 1052, 1060, 1061 keyboard emulation NYI
3635	{ 2004, PrivMode_BracketPaste },	3686	{ 2004, PrivMode_BracketPaste },
3636	};	3687	};
3637		3688
…		…
3647	for (i = 0; i < nargs; i++)	3698	for (i = 0; i < nargs; i++)
3648	{	3699	{
3649	state = -1;	3700	state = -1;
3650		3701
3651	/* basic handling */	3702	/* basic handling */
3652	for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++)	3703	for (j = 0; j < ecb_array_length (argtopriv); j++)
3653	if (argtopriv[j].argval == arg[i])	3704	if (argtopriv[j].argval == arg[i])
3654	{	3705	{
3655	state = privcases (mode, argtopriv[j].bit);	3706	state = privcases (mode, argtopriv[j].bit);
3656	break;	3707	break;
3657	}	3708	}
…		…
3683	case 2: /* VT52 mode */	3734	case 2: /* VT52 mode */
3684	/* oddball mode. should be set regardless of set/reset	3735	/* oddball mode. should be set regardless of set/reset
3685	* parameter. Return from VT52 mode with an ESC < from	3736	* parameter. Return from VT52 mode with an ESC < from
3686	* within VT52 mode	3737	* within VT52 mode
3687	*/	3738	*/
3688	set_privmode (PrivMode_vt52, 1);	3739	priv_modes |= PrivMode_vt52;
3689	break;	3740	break;
3690	case 3: /* 80/132 */	3741	case 3: /* 80/132 */
3691	if (priv_modes & PrivMode_132OK)	3742	if (priv_modes & PrivMode_132OK)
3692	set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);	3743	set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3693	break;	3744	break;
…		…
3708	if (state) /* orthogonal */	3759	if (state) /* orthogonal */
3709	priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);	3760	priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3710	break;	3761	break;
3711	#ifdef scrollBar_esc	3762	#ifdef scrollBar_esc
3712	case scrollBar_esc:	3763	case scrollBar_esc:
3713	if (scrollBar.map (state))	3764	scrollBar.map (state);
3714	{
3715	resize_all_windows (0, 0, 0);	3765	resize_all_windows (0, 0, 0);
3716	scr_touch (true);	3766	scr_touch (true);
3717	}
3718	break;	3767	break;
3719	#endif	3768	#endif
3720	case 25: /* visible/invisible cursor */	3769	case 25: /* visible/invisible cursor */
3721	scr_cursor_visible (state);	3770	scr_cursor_visible (state);
3722	break;	3771	break;
…		…
3735	case 1003:	3784	case 1003:
3736	if (state)	3785	if (state)
3737	{	3786	{
3738	priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);	3787	priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3739	priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;	3788	priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
		3789	mouse_row = mouse_col = 0;
3740	vt_emask_mouse = PointerMotionMask;	3790	vt_emask_mouse = PointerMotionMask;
3741	}	3791	}
3742	else	3792	else
3743	vt_emask_mouse = NoEventMask;	3793	vt_emask_mouse = NoEventMask;
3744		3794
…		…
3776	}	3826	}
3777	}	3827	}
3778	/*}}} */	3828	/*}}} */
3779		3829
3780	/*{{{ process sgr sequences */	3830	/*{{{ process sgr sequences */
3781	void	3831	void ecb_hot
3782	rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)	3832	rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3783	{	3833	{
3784	unsigned int i;	3834	unsigned int i;
3785	short rendset;	3835	short rendset;
3786	int rendstyle;	3836	int rendstyle;
…		…
3929	}	3979	}
3930	}	3980	}
3931	}	3981	}
3932	/*}}} */	3982	/*}}} */
3933		3983
3934	/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3935	void
3936	rxvt_term::process_graphics ()
3937	{
3938	unicode_t ch, cmd = cmd_getc ();
3939
3940	if (cmd == 'Q')
3941	{
3942	/* query graphics */
3943	tt_printf ("\033G0\012"); /* no graphics */
3944	return;
3945	}
3946	/* swallow other graphics sequences until terminating ':' */
3947	do
3948	ch = cmd_getc ();
3949	while (ch != ':');
3950	}
3951	/*}}} */
3952
3953	/* ------------------------------------------------------------------------- */	3984	/* ------------------------------------------------------------------------- */
3954		3985
3955	/*	3986	/*
3956	* Send printf () formatted output to the command.	3987	* Send printf () formatted output to the command.
3957	* Only use for small amounts of data.	3988	* Only use for small amounts of data.
…		…
3970		4001
3971	/* ---------------------------------------------------------------------- */	4002	/* ---------------------------------------------------------------------- */
3972	/* Write data to the pty as typed by the user, pasted with the mouse,	4003	/* Write data to the pty as typed by the user, pasted with the mouse,
3973	* or generated by us in response to a query ESC sequence.	4004	* or generated by us in response to a query ESC sequence.
3974	*/	4005	*/
3975	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT	4006	static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3976		4007
3977	void	4008	void
3978	rxvt_term::tt_write (const char *data, unsigned int len)	4009	rxvt_term::tt_write (const char *data, unsigned int len)
3979	{	4010	{
3980	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))	4011	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
…		…
3985		4016
3986	if (v_buflen == 0)	4017	if (v_buflen == 0)
3987	{	4018	{
3988	ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));	4019	ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3989		4020
		4021	max_it (written, 0);
		4022
3990	if ((unsigned int)written == len)	4023	if (written == len)
3991	return;	4024	return;
3992		4025
3993	data += written;	4026	data += written;
3994	len -= written;	4027	len -= written;
3995	}	4028	}
3996		4029
3997	v_buffer = (char *)realloc (v_buffer, v_buflen + len);	4030	v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3998		4031
3999	memcpy (v_buffer + v_buflen, data, len);	4032	memcpy (v_buffer + v_buflen, data, len);
4000	v_buflen += len;	4033	v_buflen += len;
4001		4034
4002	pty_ev.set (ev::READ | ev::WRITE);	4035	pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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