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.437 by sf-exg, Fri Jan 29 17:27:36 2010 UTC vs.
Revision 1.511 by sf-exg, Fri May 25 18:45:40 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)
…		…
162		162
163	void	163	void
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
…		…
251	#endif	257	#endif
252		258
253	void	259	void
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);
…		…
282	}	285	}
283		286
284	static int	287	static int
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
…		…
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	#ifdef USE_XIM
430	if (Input_Context)	427	if (Input_Context)
431	{	428	{
…		…
505	#ifdef PAGING_CONTEXT_LINES	502	#ifdef PAGING_CONTEXT_LINES
506	lnsppg = nrow - PAGING_CONTEXT_LINES;	503	lnsppg = nrow - PAGING_CONTEXT_LINES;
507	#else	504	#else
508	lnsppg = nrow * 4 / 5;	505	lnsppg = nrow * 4 / 5;
509	#endif	506	#endif
		507	max_it (lnsppg, 1);
		508
510	if (keysym == XK_Prior)	509	if (keysym == XK_Prior)
511	{	510	{
512	scr_page (UP, lnsppg);	511	scr_page (UP, lnsppg);
513	return;	512	return;
514	}	513	}
…		…
567	selection_request (ev.time);	566	selection_request (ev.time);
568	return;	567	return;
569	#if TODO	568	#if TODO
570	/* rxvt extras */	569	/* rxvt extras */
571	case XK_KP_Add: /* Shift+KP_Add = bigger font */	570	case XK_KP_Add: /* Shift+KP_Add = bigger font */
572	change_font (FONT_UP);
573	return;	571	return;
574	case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */	572	case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
575	change_font (FONT_DN);
576	return;	573	return;
577	#endif	574	#endif
578	}	575	}
579	}	576	}
580	}	577	}
…		…
645	if (keysym >= 0xFF00 && keysym <= 0xFFFF)	642	if (keysym >= 0xFF00 && keysym <= 0xFFFF)
646	{	643	{
647	bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;	644	bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
648	unsigned int newlen = 1;	645	unsigned int newlen = 1;
649		646
		647	if (ev.state & ModNumLockMask)
		648	kp = false;
		649
650	switch (translate_keypad (keysym, kp))	650	keysym = translate_keypad (keysym, kp);
		651
		652	switch (keysym)
651	{	653	{
652	#ifndef NO_BACKSPACE_KEY	654	#ifndef NO_BACKSPACE_KEY
653	case XK_BackSpace:	655	case XK_BackSpace:
654	if (priv_modes & PrivMode_HaveBackSpace)	656	if (priv_modes & PrivMode_HaveBackSpace)
655	{	657	{
…		…
774	}	776	}
775		777
776	if (newlen)	778	if (newlen)
777	len = strlen (kbuf);	779	len = strlen (kbuf);
778		780
		781	if (len > 0)
		782	{
779	/*	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	/*
780	* Pass meta for all function keys, if 'meta' option set	796	* Pass meta for all function keys, if 'meta' option set
781	*/	797	*/
782	#ifdef META8_OPTION	798	#ifdef META8_OPTION
783	if (meta && (meta_char == 0x80) && len > 0)	799	if (meta && (meta_char == 0x80))
784	kbuf[len - 1] |= 0x80;	800	kbuf[len - 1] |= 0x80;
785	#endif	801	#endif
		802	}
786		803
787	}	804	}
788	else if (ctrl && keysym == XK_minus)	805	else if (ctrl && keysym == XK_minus)
789	{	806	{
790	len = 1;	807	len = 1;
…		…
823	if (view_start)	840	if (view_start)
824	{	841	{
825	view_start = 0;	842	view_start = 0;
826	want_refresh = 1;	843	want_refresh = 1;
827	}	844	}
828
829	/*
830	* these modifications only affect the static keybuffer
831	* pass Shift/Control indicators for function keys ending with `~'
832	*
833	* eg,
834	* Prior = "ESC[5~"
835	* Shift+Prior = "ESC[5$"
836	* Ctrl+Prior = "ESC[5^"
837	* Ctrl+Shift+Prior = "ESC[5@"
838	* Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
839	*/
840	if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
841	kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
842		845
843	/* escape prefix */	846	/* escape prefix */
844	if (meta	847	if (meta
845	#ifdef META8_OPTION	848	#ifdef META8_OPTION
846	&& meta_char == C0_ESC	849	&& meta_char == C0_ESC
…		…
882	commit_iso14755 ();	885	commit_iso14755 ();
883		886
884	return;	887	return;
885	}	888	}
886		889
887	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)	890	for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
888	if (i[0] == keysym)	891	if (i[0] == keysym)
889	{	892	{
890	iso14755buf = ISO_14755_51 | i[1];	893	iso14755buf = ISO_14755_51 | i[1];
891	commit_iso14755 ();	894	commit_iso14755 ();
892		895
…		…
929	else if (keysym == XK_Control_L || keysym == XK_Control_R)	932	else if (keysym == XK_Control_L || keysym == XK_Control_R)
930	mouse_slip_wheel_speed = 0;	933	mouse_slip_wheel_speed = 0;
931	#endif	934	#endif
932	}	935	}
933		936
934	#if defined (KEYSYM_RESOURCE)
935	unsigned int
936	rxvt_term::cmd_write (const char *str, unsigned int count)
937	{
938	unsigned int n, s;
939
940	n = cmdbuf_ptr - cmdbuf_base;
941	s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
942
943	if (n > 0 && s < count)
944	{
945	memmove (cmdbuf_base, cmdbuf_ptr,
946	(unsigned int) (cmdbuf_endp - cmdbuf_ptr));
947	cmdbuf_ptr = cmdbuf_base;
948	cmdbuf_endp -= n;
949	s += n;
950	}
951
952	if (count > s)
953	{
954	rxvt_warn ("data loss: cmd_write too large, continuing.\n");
955	count = s;
956	}
957
958	for (; count--;)
959	*cmdbuf_endp++ = *str++;
960
961	cmd_parse ();
962
963	return 0;
964	}
965	#endif
966
967	void	937	void
968	rxvt_term::flush ()	938	rxvt_term::flush ()
969	{	939	{
970	flush_ev.stop ();	940	flush_ev.stop ();
971		941
972	#ifdef HAVE_BG_PIXMAP	942	#ifdef HAVE_BG_PIXMAP
973	if (bgPixmap.check_clearChanged ())	943	if (bg_flags & BG_NEEDS_REFRESH)
974	{	944	{
975	// scr_clear (true); This needs to be researched further!	945	bg_flags &= ~BG_NEEDS_REFRESH;
976	scr_touch (false);	946	scr_touch (false);
977	}	947	}
978	#endif	948	#endif
979		949
980	if (want_refresh)	950	if (want_refresh)
…		…
1018	}	988	}
1019		989
1020	scr_refresh ();	990	scr_refresh ();
1021	scrollBar.show (1);	991	scrollBar.show (1);
1022	#ifdef USE_XIM	992	#ifdef USE_XIM
1023	IMSendSpot ();	993	im_send_spot ();
1024	#endif	994	#endif
1025	}	995	}
1026		996
1027	display->flush ();	997	display->flush ();
1028	}	998	}
1029		999
1030	/* checks wether a refresh is requested and starts the refresh timer */	1000	/* checks whether a refresh is requested and starts the refresh timer */
1031	void	1001	void
1032	rxvt_term::refresh_check ()	1002	rxvt_term::refresh_check ()
1033	{	1003	{
1034	if (want_refresh && !flush_ev.is_active ())	1004	if (want_refresh && !flush_ev.is_active ())
1035	flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally	1005	flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
…		…
1045	refresh_count = 0;	1015	refresh_count = 0;
1046	flush ();	1016	flush ();
1047	}	1017	}
1048		1018
1049	#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
1050	void	1035	void
1051	rxvt_term::cursor_blink_cb (ev::timer &w, int revents)	1036	rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1052	{	1037	{
1053	hidden_cursor = !hidden_cursor;	1038	hidden_cursor = !hidden_cursor;
1054	want_refresh = 1;	1039	want_refresh = 1;
…		…
1073		1058
1074	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	1059	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1075	void	1060	void
1076	rxvt_term::cont_scroll_cb (ev::timer &w, int revents)	1061	rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1077	{	1062	{
1078	if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)	1063	if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1079	&& scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))	1064	&& scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1080	{	1065	{
1081	want_refresh = 1;	1066	want_refresh = 1;
1082	refresh_check ();	1067	refresh_check ();
1083	}	1068	}
1084	else	1069	else
…		…
1129	// this should really be sched_yield(), but the linux guys thought	1114	// this should really be sched_yield(), but the linux guys thought
1130	// that giving a process calling sched_yield () less cpu time than	1115	// that giving a process calling sched_yield () less cpu time than
1131	// 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
1132	// allowed by the sus... as is returning ENOSYS.	1117	// allowed by the sus... as is returning ENOSYS.
1133	// since the linux guys additionally thought that breaking the only	1118	// since the linux guys additionally thought that breaking the only
1134	// known workaroudn against their unusable sched_yield hack is cool,	1119	// known workaround against their unusable sched_yield hack is cool,
1135	// we just nanosleep a bit and hope for the best.	1120	// we just nanosleep a bit and hope for the best.
1136		1121
1137	struct timespec ts = { 0, 1000 };	1122	struct timespec ts = { 0, 1000 };
1138	nanosleep (&ts, 0);	1123	nanosleep (&ts, 0);
1139		1124
…		…
1145	{	1130	{
1146	}	1131	}
1147	} event_handler;	1132	} event_handler;
1148	#endif	1133	#endif
1149		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
1150	bool	1168	bool
1151	rxvt_term::pty_fill ()	1169	rxvt_term::pty_fill ()
1152	{	1170	{
1153	ssize_t n = cmdbuf_endp - cmdbuf_ptr;	1171	cmdbuf_reify ();
1154		1172
1155	if (CBUFSIZ == n)	1173	size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1156	{	1174
1157	rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");	1175	if (!avail)
1158	n = 0;
1159	}	1176	{
1160		1177	// normally this indicates a "too long" command sequence - just drop the data we have
1161	memmove (cmdbuf_base, cmdbuf_ptr, n);
1162	cmdbuf_ptr = cmdbuf_base;	1178	cmdbuf_ptr = cmdbuf_base;
1163	cmdbuf_endp = cmdbuf_ptr + n;	1179	cmdbuf_endp = cmdbuf_ptr;
		1180	avail = CBUFSIZ;
		1181	}
1164		1182
1165	ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);	1183	ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1166		1184
1167	if (r > 0)	1185	if (r > 0)
1168	{	1186	{
1169	cmdbuf_endp += r;	1187	cmdbuf_endp += r;
1170	return true;	1188	return true;
…		…
1244	{	1262	{
1245	int button_number, key_state = 0;	1263	int button_number, key_state = 0;
1246	int x, y;	1264	int x, y;
1247	int code = 32;	1265	int code = 32;
1248		1266
1249	x = Pixel2Col (ev.x);	1267	x = Pixel2Col (ev.x) + 1;
1250	y = Pixel2Row (ev.y);	1268	y = Pixel2Row (ev.y) + 1;
		1269
1251	if (ev.type == MotionNotify)	1270	if (ev.type == MotionNotify)
1252	{	1271	{
1253	if (x == mouse_row && y == mouse_col)	1272	if (x == mouse_row && y == mouse_col)
1254	return;	1273	return;
		1274
1255	mouse_row = x;	1275	mouse_row = x;
1256	mouse_col = y;	1276	mouse_col = y;
1257	code += 32;	1277	code += 32;
1258	}	1278	}
1259		1279
…		…
1262	else	1282	else
1263	{	1283	{
1264	button_number = MEvent.button - Button1;	1284	button_number = MEvent.button - Button1;
1265	/* add 0x3D for wheel events, like xterm does */	1285	/* add 0x3D for wheel events, like xterm does */
1266	if (button_number >= 3)	1286	if (button_number >= 3)
1267	button_number += (64 - 3);	1287	button_number += 64 - 3;
1268	}	1288	}
1269		1289
1270	if (priv_modes & PrivMode_MouseX10)	1290	if (priv_modes & PrivMode_MouseX10)
1271	{	1291	{
1272	/*	1292	/*
…		…
1304	fputc ('A', stderr);	1324	fputc ('A', stderr);
1305	if (key_state & 32)	1325	if (key_state & 32)
1306	fputc ('2', stderr);	1326	fputc ('2', stderr);
1307	fprintf (stderr, "]: <%d>, %d/%d\n",	1327	fprintf (stderr, "]: <%d>, %d/%d\n",
1308	button_number,	1328	button_number,
1309	x + 1,	1329	x,
1310	y + 1);	1330	y);
1311	#endif	1331	#endif
1312		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
1313	tt_printf ("\033[M%c%c%c",	1346	tt_printf ("\033[M%c%c%c",
1314	(code + button_number + key_state),	1347	code + button_number + key_state,
1315	(32 + x + 1),	1348	32 + x,
1316	(32 + y + 1));	1349	32 + y);
1317	}	1350	}
1318		1351
1319	/*{{{ process an X event */	1352	/*{{{ process an X event */
1320	void	1353	void
1321	rxvt_term::x_cb (XEvent &ev)	1354	rxvt_term::x_cb (XEvent &ev)
…		…
1423	&& ev.xfocus.mode != NotifyGrab)	1456	&& ev.xfocus.mode != NotifyGrab)
1424	focus_out ();	1457	focus_out ();
1425	break;	1458	break;
1426		1459
1427	case ConfigureNotify:	1460	case ConfigureNotify:
1428	/*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1429	ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1430	szHint.width, szHint.height);*/
1431	if (ev.xconfigure.window == parent[0])	1461	if (ev.xconfigure.window == parent)
1432	{	1462	{
1433	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))	1463	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1434	;	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
1435		1484
1436	if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)	1485	if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1437	{	1486	{
1438	seen_resize = 1;	1487	seen_resize = 1;
1439	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1488	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1440	}	1489	}
1441	else	1490	else
1442	{	1491	{
1443	#ifdef HAVE_BG_PIXMAP	1492	#ifdef HAVE_BG_PIXMAP
1444	if (bgPixmap.window_position_sensitive ())
1445	{
1446	if (mapped)	1493	if (moved)
1447	update_background ();	1494	update_background ();
1448	else
1449	bgPixmap.invalidate ();
1450	}
1451	#endif	1495	#endif
1452	}	1496	}
1453		1497
1454	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));	1498	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1455	}	1499	}
1456	break;	1500	break;
1457		1501
1458	case PropertyNotify:	1502	case PropertyNotify:
1459	if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))	1503	HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1460	if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1461	&& ev.xproperty.state == PropertyNewValue)
1462	selection_property (ev.xproperty.window, ev.xproperty.atom);
1463
1464	break;	1504	break;
1465		1505
1466	case SelectionClear:	1506	case SelectionClear:
1467	selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);	1507	selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1468	break;	1508	break;
1469		1509
1470	case SelectionNotify:
1471	if (selection_wait == Sel_normal)
1472	selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1473	break;
1474
1475	case SelectionRequest:	1510	case SelectionRequest:
1476	selection_send (ev.xselectionrequest);	1511	selection_send (ev.xselectionrequest);
1477	break;	1512	break;
1478		1513
1479	case MapNotify:	1514	case MapNotify:
1480	#ifdef HAVE_BG_PIXMAP	1515	#ifdef HAVE_BG_PIXMAP
1481	/* 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
1482	* non-reparenting window manager. In those cases we never get first	1517	* non-reparenting window manager. In those cases we never get first
1483	* ConfigureNotify. Also that speeds startup under normal WM, by taking	1518	* ConfigureNotify. Also that speeds startup under normal WM, by taking
1484	* care of multiplicity of ConfigureNotify events arriwing while WM does	1519	* care of multiplicity of ConfigureNotify events arriving while WM does
1485	* reparenting.	1520	* reparenting.
1486	* We should not render background immidiately, as there could be several	1521	* We should not render background immediately, as there could be several
1487	* 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
1488	* 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
1489	* bit of time for ConfigureNotifies to arrive.	1524	* bit of time for ConfigureNotifies to arrive.
1490	* 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
1491	* of ConfigureNotifys for the best results.	1526	* of ConfigureNotifys for the best results.
1492	*/	1527	*/
1493	if (bgPixmap.flags & bgPixmap_t::isInvalid)	1528	if (!(bg_flags & BG_IS_VALID))
1494	update_background_ev.start (0.025);	1529	update_background_ev.start (0.025);
1495	#endif	1530	#endif
1496	mapped = 1;	1531	mapped = 1;
1497	#ifdef TEXT_BLINK	1532	#ifdef TEXT_BLINK
1498	text_blink_ev.start ();	1533	text_blink_ev.start ();
…		…
1513	if (ev.xany.window == vt)	1548	if (ev.xany.window == vt)
1514	{	1549	{
1515	do	1550	do
1516	{	1551	{
1517	scr_expose (ev.xexpose.x, ev.xexpose.y,	1552	scr_expose (ev.xexpose.x, ev.xexpose.y,
1518	ev.xexpose.width, ev.xexpose.height, False);	1553	ev.xexpose.width, ev.xexpose.height, false);
1519	}	1554	}
1520	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));	1555	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1521		1556
1522	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1557	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1523		1558
1524	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))	1559	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1525	{	1560	{
1526	scr_expose (ev.xexpose.x, ev.xexpose.y,	1561	scr_expose (ev.xexpose.x, ev.xexpose.y,
1527	ev.xexpose.width, ev.xexpose.height, False);	1562	ev.xexpose.width, ev.xexpose.height, false);
1528	}	1563	}
1529		1564
1530	want_refresh = 1;	1565	want_refresh = 1;
1531	}	1566	}
1532	else	1567	else
…		…
1538	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))	1573	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1539	;	1574	;
1540		1575
1541	if (scrollBar.state && ev.xany.window == scrollBar.win)	1576	if (scrollBar.state && ev.xany.window == scrollBar.win)
1542	{	1577	{
1543	scrollBar.state = STATE_IDLE;	1578	scrollBar.state = SB_STATE_IDLE;
1544	scrollBar.show (0);	1579	scrollBar.show (0);
1545	}	1580	}
1546	}	1581	}
1547	break;	1582	break;
1548		1583
…		…
1614	dist = int_bwidth - ev.xbutton.y;	1649	dist = int_bwidth - ev.xbutton.y;
1615	}	1650	}
1616	else	1651	else
1617	{	1652	{
1618	scroll_selection_dir = DN;	1653	scroll_selection_dir = DN;
1619	dist = ev.xbutton.y - (int_bwidth + height);	1654	dist = ev.xbutton.y - (int_bwidth + vt_height);
1620	}	1655	}
1621		1656
1622	scroll_selection_lines = Pixel2Height (dist)	1657	scroll_selection_lines = Pixel2Height (dist)
1623	/ SELECTION_SCROLL_LINE_SPEEDUP	1658	/ SELECTION_SCROLL_LINE_SPEEDUP
1624	+ 1;	1659	+ 1;
…		…
1636	#ifdef MOUSE_THRESHOLD	1671	#ifdef MOUSE_THRESHOLD
1637	}	1672	}
1638	#endif	1673	#endif
1639	}	1674	}
1640	}	1675	}
1641	else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)	1676	else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1642	{	1677	{
1643	while (XCheckTypedWindowEvent (dpy, scrollBar.win,	1678	while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1644	MotionNotify, &ev))	1679	MotionNotify, &ev))
1645	;	1680	;
1646		1681
1647	XQueryPointer (dpy, scrollBar.win,	1682	XQueryPointer (dpy, scrollBar.win,
1648	&unused_root, &unused_child,	1683	&unused_root, &unused_child,
1649	&unused_root_x, &unused_root_y,	1684	&unused_root_x, &unused_root_y,
1650	&ev.xbutton.x, &ev.xbutton.y,	1685	&ev.xbutton.x, &ev.xbutton.y,
1651	&unused_mask);	1686	&unused_mask);
1652	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1687	scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1653	scrollBar.size ());	1688	scrollBar.size ());
1654	want_refresh = 1;	1689	want_refresh = 1;
1655	scrollBar.show (1);	1690	scrollBar.show (1);
1656	}	1691	}
1657	break;	1692	break;
1658	}	1693	}
1659		1694
1660	#if defined(CURSOR_BLINK)	1695	#if defined(CURSOR_BLINK)
1661	if (option (Opt_cursorBlink) && ev.type == KeyPress)	1696	if (ev.type == KeyPress)
1662	{
1663	if (hidden_cursor)
1664	{
1665	hidden_cursor = 0;
1666	want_refresh = 1;
1667	}
1668
1669	cursor_blink_ev.again ();	1697	cursor_blink_reset ();
1670	}
1671	#endif	1698	#endif
1672		1699
1673	#if defined(POINTER_BLANK)	1700	#if defined(POINTER_BLANK)
1674	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)	1701	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1675	{	1702	{
…		…
1692	rxvt_term::set_urgency (bool enable)	1719	rxvt_term::set_urgency (bool enable)
1693	{	1720	{
1694	if (enable == urgency_hint)	1721	if (enable == urgency_hint)
1695	return;	1722	return;
1696		1723
1697	if (XWMHints *h = XGetWMHints (dpy, parent[0]))	1724	if (XWMHints *h = XGetWMHints (dpy, parent))
1698	{	1725	{
1699	h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);	1726	h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1700	XSetWMHints (dpy, parent[0], h);	1727	XSetWMHints (dpy, parent, h);
1701	urgency_hint = enable;	1728	urgency_hint = enable;
		1729	XFree (h);
1702	}	1730	}
1703	}	1731	}
1704	#endif	1732	#endif
1705		1733
1706	void	1734	void
…		…
1712	want_refresh = 1;	1740	want_refresh = 1;
1713		1741
1714	#if USE_XIM	1742	#if USE_XIM
1715	if (Input_Context != NULL)	1743	if (Input_Context != NULL)
1716	{	1744	{
1717	IMSetPosition ();	1745	im_set_position ();
1718	XSetICFocus (Input_Context);	1746	XSetICFocus (Input_Context);
1719	}	1747	}
1720	#endif	1748	#endif
1721	#if CURSOR_BLINK	1749	#if CURSOR_BLINK
1722	if (option (Opt_cursorBlink))	1750	if (option (Opt_cursorBlink))
…		…
1813	* 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.
1814	*/	1842	*/
1815	if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]	1843	if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1816	|| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])	1844	|| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1817	{	1845	{
1818	bgPixmap.set_root_pixmap ();	1846	bg_set_root_pixmap ();
1819	update_background ();	1847	update_background ();
1820	}	1848	}
1821		1849
1822	break;	1850	break;
1823	}	1851	}
…		…
1862	/* save the xbutton state (for ButtonRelease) */	1890	/* save the xbutton state (for ButtonRelease) */
1863	MEvent.state = ev.state;	1891	MEvent.state = ev.state;
1864	#ifdef MOUSE_REPORT_DOUBLECLICK	1892	#ifdef MOUSE_REPORT_DOUBLECLICK
1865	if (ev.button == MEvent.button && clickintime)	1893	if (ev.button == MEvent.button && clickintime)
1866	{	1894	{
1867	/* same button, within alloted time */	1895	/* same button, within allowed time */
1868	MEvent.clicks++;	1896	MEvent.clicks++;
1869		1897
1870	if (MEvent.clicks > 1)	1898	if (MEvent.clicks > 1)
1871	{	1899	{
1872	/* only report double clicks */	1900	/* only report double clicks */
…		…
1953	if (scrollBar.upButton (ev.y))	1981	if (scrollBar.upButton (ev.y))
1954	direction = UP; /* up */	1982	direction = UP; /* up */
1955	else if (scrollBar.dnButton (ev.y))	1983	else if (scrollBar.dnButton (ev.y))
1956	direction = DN; /* down */	1984	direction = DN; /* down */
1957		1985
1958	scrollBar.state = STATE_IDLE;	1986	scrollBar.state = SB_STATE_IDLE;
1959	/*	1987	/*
1960	* Rxvt-style scrollbar:	1988	* Rxvt-style scrollbar:
1961	* move up if mouse is above slider	1989	* move up if mouse is above slider
1962	* move dn if mouse is below slider	1990	* move dn if mouse is below slider
1963	*	1991	*
…		…
2002	cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);	2030	cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2003	#endif	2031	#endif
2004	if (scr_page (direction, 1))	2032	if (scr_page (direction, 1))
2005	{	2033	{
2006	if (direction == UP)	2034	if (direction == UP)
2007	scrollBar.state = STATE_UP;	2035	scrollBar.state = SB_STATE_UP;
2008	else	2036	else
2009	scrollBar.state = STATE_DOWN;	2037	scrollBar.state = SB_STATE_DOWN;
2010	}	2038	}
2011	}	2039	}
2012	else	2040	else
2013	switch (ev.button)	2041	switch (ev.button)
2014	{	2042	{
2015	case Button2:	2043	case Button2:
2016	switch (scrollBar.align)	2044	switch (scrollBar.align)
2017	{	2045	{
2018	case R_SB_ALIGN_TOP:	2046	case SB_ALIGN_TOP:
2019	csrO = 0;	2047	csrO = 0;
2020	break;	2048	break;
2021	case R_SB_ALIGN_CENTRE:	2049	case SB_ALIGN_CENTRE:
2022	csrO = (scrollBar.bot - scrollBar.top) / 2;	2050	csrO = (scrollBar.bot - scrollBar.top) / 2;
2023	break;	2051	break;
2024	case R_SB_ALIGN_BOTTOM:	2052	case SB_ALIGN_BOTTOM:
2025	csrO = scrollBar.bot - scrollBar.top;	2053	csrO = scrollBar.bot - scrollBar.top;
2026	break;	2054	break;
2027	}	2055	}
2028		2056
2029	if (scrollBar.style == R_SB_XTERM	2057	if (scrollBar.style == SB_STYLE_XTERM
2030	|| scrollbar_above_slider (ev.y)	2058	|| scrollBar.above_slider (ev.y)
2031	|| scrollbar_below_slider (ev.y))	2059	|| scrollBar.below_slider (ev.y))
2032	scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());	2060	scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2033		2061
2034	scrollBar.state = STATE_MOTION;	2062	scrollBar.state = SB_STATE_MOTION;
2035	break;	2063	break;
2036		2064
2037	case Button1:	2065	case Button1:
2038	if (scrollBar.align == R_SB_ALIGN_CENTRE)	2066	if (scrollBar.align == SB_ALIGN_CENTRE)
2039	csrO = ev.y - scrollBar.top;	2067	csrO = ev.y - scrollBar.top;
2040	/* FALLTHROUGH */	2068	/* FALLTHROUGH */
2041		2069
2042	case Button3:	2070	case Button3:
2043	if (scrollBar.style != R_SB_XTERM)	2071	if (scrollBar.style != SB_STYLE_XTERM)
2044	{	2072	{
2045	if (scrollbar_above_slider (ev.y))	2073	if (scrollBar.above_slider (ev.y))
2046	# ifdef RXVT_SCROLL_FULL	2074	# ifdef RXVT_SCROLL_FULL
2047	scr_page (UP, nrow - 1);	2075	scr_page (UP, nrow - 1);
2048	# else	2076	# else
2049	scr_page (UP, nrow / 4);	2077	scr_page (UP, nrow / 4);
2050	# endif	2078	# endif
2051	else if (scrollbar_below_slider (ev.y))	2079	else if (scrollBar.below_slider (ev.y))
2052	# ifdef RXVT_SCROLL_FULL	2080	# ifdef RXVT_SCROLL_FULL
2053	scr_page (DN, nrow - 1);	2081	scr_page (DN, nrow - 1);
2054	# else	2082	# else
2055	scr_page (DN, nrow / 4);	2083	scr_page (DN, nrow / 4);
2056	# endif	2084	# endif
2057	else	2085	else
2058	scrollBar.state = STATE_MOTION;	2086	scrollBar.state = SB_STATE_MOTION;
2059	}	2087	}
2060	else	2088	else
2061	{	2089	{
2062	scr_page ((ev.button == Button1 ? DN : UP),	2090	scr_page ((ev.button == Button1 ? DN : UP),
2063	(nrow	2091	(nrow
2064	* scrollbar_position (ev.y)	2092	* scrollBar.position (ev.y)
2065	/ scrollBar.size ()));	2093	/ scrollBar.size ()));
2066	}	2094	}
2067		2095
2068	break;	2096	break;
2069	}	2097	}
…		…
2080		2108
2081	csrO = 0; /* reset csr Offset */	2109	csrO = 0; /* reset csr Offset */
2082	if (!bypass_keystate)	2110	if (!bypass_keystate)
2083	reportmode = !! (priv_modes & PrivMode_mouse_report);	2111	reportmode = !! (priv_modes & PrivMode_mouse_report);
2084		2112
2085	if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)	2113	if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2086	{	2114	{
2087	scrollBar.state = STATE_IDLE;	2115	scrollBar.state = SB_STATE_IDLE;
2088	scrollBar.show (0);	2116	scrollBar.show (0);
2089	}	2117	}
2090		2118
2091	#ifdef SELECTION_SCROLLING	2119	#ifdef SELECTION_SCROLLING
2092	sel_scroll_ev.stop();	2120	sel_scroll_ev.stop();
…		…
2142	case Button3:	2170	case Button3:
2143	selection_make (ev.time);	2171	selection_make (ev.time);
2144	break;	2172	break;
2145		2173
2146	case Button2:	2174	case Button2:
2147	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?
2148	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);	2176	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2149	break;	2177	break;
2150		2178
2151	#ifdef MOUSE_WHEEL	2179	#ifdef MOUSE_WHEEL
2152	case Button4:	2180	case Button4:
2153	case Button5:	2181	case Button5:
…		…
2195	wchar_t ch = NOCHAR;	2223	wchar_t ch = NOCHAR;
2196	char *seq_begin; // remember start of esc-sequence here	2224	char *seq_begin; // remember start of esc-sequence here
2197		2225
2198	for (;;)	2226	for (;;)
2199	{	2227	{
2200	if (expect_false (ch == NOCHAR))	2228	if (ecb_unlikely (ch == NOCHAR))
2201	{	2229	{
2202	seq_begin = cmdbuf_ptr;	2230	seq_begin = cmdbuf_ptr;
2203	ch = next_char ();	2231	ch = next_char ();
2204		2232
2205	if (ch == NOCHAR)	2233	if (ch == NOCHAR)
2206	break;	2234	break;
2207	}	2235	}
2208		2236
2209	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))
2210	{	2238	{
2211	if (expect_false (!seen_input))	2239	if (ecb_unlikely (!seen_input))
2212	{	2240	{
2213	seen_input = 1;	2241	seen_input = 1;
2214	// many badly-written programs (e.g. jed) contain a race condition:	2242	// many badly-written programs (e.g. jed) contain a race condition:
2215	// they first read the screensize and then install a SIGWINCH handler.	2243	// they first read the screensize and then install a SIGWINCH handler.
2216	// some window managers resize the window early, and these programs	2244	// some window managers resize the window early, and these programs
…		…
2229	wchar_t *str = buf;	2257	wchar_t *str = buf;
2230	wchar_t *eol = str + min (ncol, UBUFSIZ);	2258	wchar_t *eol = str + min (ncol, UBUFSIZ);
2231		2259
2232	for (;;)	2260	for (;;)
2233	{	2261	{
2234	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)))
2235	break;	2263	break;
2236		2264
2237	*str++ = ch;	2265	*str++ = ch;
2238		2266
2239	if (expect_false (ch == C0_LF || str >= eol))	2267	if (ecb_unlikely (ch == C0_LF || str >= eol))
2240	{	2268	{
2241	if (ch == C0_LF)	2269	if (ch == C0_LF)
2242	nlines++;	2270	nlines++;
2243		2271
2244	refresh_count++;	2272	refresh_count++;
…		…
2322	rxvt_term::next_char () NOTHROW	2350	rxvt_term::next_char () NOTHROW
2323	{	2351	{
2324	while (cmdbuf_ptr < cmdbuf_endp)	2352	while (cmdbuf_ptr < cmdbuf_endp)
2325	{	2353	{
2326	// assume 7-bit to be ascii ALWAYS	2354	// assume 7-bit to be ascii ALWAYS
2327	if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))	2355	if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2328	return *cmdbuf_ptr++;	2356	return *cmdbuf_ptr++;
2329		2357
2330	wchar_t wc;	2358	wchar_t wc;
2331	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);
2332		2360
…		…
2360	: NOCHAR;	2388	: NOCHAR;
2361	}	2389	}
2362		2390
2363	static class out_of_input out_of_input;	2391	static class out_of_input out_of_input;
2364		2392
2365	/* rxvt_cmd_getc () - Return next input character */
2366	/*
2367	* Return the next input character after first passing any keyboard input
2368	* to the command.
2369	*/
2370	wchar_t	2393	wchar_t
2371	rxvt_term::cmd_getc () THROW ((class out_of_input))	2394	rxvt_term::cmd_getc () THROW ((class out_of_input))
2372	{	2395	{
2373	wchar_t c = next_char ();	2396	wchar_t c = next_char ();
2374		2397
…		…
2467	pclose_printer (fd);	2490	pclose_printer (fd);
2468	}	2491	}
2469	#endif /* PRINTPIPE */	2492	#endif /* PRINTPIPE */
2470	/*}}} */	2493	/*}}} */
2471		2494
2472	/* *INDENT-OFF* */
2473	enum {	2495	enum {
2474	C1_40 = 0x40,	2496	C1_40 = 0x40,
2475	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,
2476	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,
2477	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,
2478	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,
2479	};	2501	};
2480	/* *INDENT-ON* */
2481		2502
2482	/*{{{ process non-printing single characters */	2503	/*{{{ process non-printing single characters */
2483	void	2504	void
2484	rxvt_term::process_nonprinting (unicode_t ch)	2505	rxvt_term::process_nonprinting (unicode_t ch)
2485	{	2506	{
…		…
2578	break;	2599	break;
2579	case 'Z': /* identify the terminal type */	2600	case 'Z': /* identify the terminal type */
2580	tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */	2601	tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2581	break;	2602	break;
2582	case '<': /* turn off VT52 mode */	2603	case '<': /* turn off VT52 mode */
2583	set_privmode (PrivMode_vt52, 0);	2604	priv_modes &= ~PrivMode_vt52;
2584	break;	2605	break;
2585	case 'F': /* use special graphics character set */	2606	case 'F': /* use special graphics character set */
2586	case 'G': /* use regular character set */	2607	case 'G': /* use regular character set */
2587	/* unimplemented */	2608	/* unimplemented */
2588	break;	2609	break;
…		…
2607	return;	2628	return;
2608	}	2629	}
2609		2630
2610	switch (ch)	2631	switch (ch)
2611	{	2632	{
2612	/* case 1: do_tek_mode (); break; */
2613	case '#':	2633	case '#':
2614	if (cmd_getc () == '8')	2634	if (cmd_getc () == '8')
2615	scr_E ();	2635	scr_E ();
2616	break;	2636	break;
2617	case '(':	2637	case '(':
…		…
2640	#if !ENABLE_MINIMAL	2660	#if !ENABLE_MINIMAL
2641	case '9':	2661	case '9':
2642	scr_forwardindex ();	2662	scr_forwardindex ();
2643	break;	2663	break;
2644	#endif	2664	#endif
		2665	// DECPAM/DECPNM
2645	case '=':	2666	case '=':
		2667	priv_modes |= PrivMode_aplKP;
		2668	break;
2646	case '>':	2669	case '>':
2647	set_privmode (PrivMode_aplKP, ch == '=');	2670	priv_modes &= ~PrivMode_aplKP;
2648	break;	2671	break;
2649		2672
2650	case C1_40:	2673	case C1_40:
2651	cmd_getc ();	2674	cmd_getc ();
2652	break;	2675	break;
…		…
2656		2679
2657	/* 8.3.87: NEXT LINE */	2680	/* 8.3.87: NEXT LINE */
2658	case C1_NEL: /* ESC E */	2681	case C1_NEL: /* ESC E */
2659	{	2682	{
2660	wchar_t nlcr[] = { C0_LF, C0_CR };	2683	wchar_t nlcr[] = { C0_LF, C0_CR };
2661	scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);	2684	scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2662	}	2685	}
2663	break;	2686	break;
2664		2687
2665	/* kidnapped escape sequence: Should be 8.3.48 */	2688	/* kidnapped escape sequence: Should be 8.3.48 */
2666	case C1_ESA: /* ESC G */	2689	case C1_ESA: /* ESC G */
2667	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 */
2668	break;	2693	break;
2669		2694
2670	/* 8.3.63: CHARACTER TABULATION SET */	2695	/* 8.3.63: CHARACTER TABULATION SET */
2671	case C1_HTS: /* ESC H */	2696	case C1_HTS: /* ESC H */
2672	scr_set_tab (1);	2697	scr_set_tab (1);
…		…
2676	case C1_RI: /* ESC M */	2701	case C1_RI: /* ESC M */
2677	scr_index (DN);	2702	scr_index (DN);
2678	break;	2703	break;
2679		2704
2680	/* 8.3.142: SINGLE-SHIFT TWO */	2705	/* 8.3.142: SINGLE-SHIFT TWO */
2681	/*case C1_SS2: scr_single_shift (2); break; */	2706	/* case C1_SS2: break; */
2682		2707
2683	/* 8.3.143: SINGLE-SHIFT THREE */	2708	/* 8.3.143: SINGLE-SHIFT THREE */
2684	/*case C1_SS3: scr_single_shift (3); break; */	2709	/* case C1_SS3: break; */
2685		2710
2686	/* 8.3.27: DEVICE CONTROL STRING */	2711	/* 8.3.27: DEVICE CONTROL STRING */
2687	case C1_DCS: /* ESC P */	2712	case C1_DCS: /* ESC P */
2688	process_dcs_seq ();	2713	process_dcs_seq ();
2689	break;	2714	break;
…		…
2722	}	2747	}
2723	}	2748	}
2724	/*}}} */	2749	/*}}} */
2725		2750
2726	/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */	2751	/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2727	/* *INDENT-OFF* */
2728	enum {	2752	enum {
2729	CSI_ICH = 0x40,	2753	CSI_ICH = 0x40,
2730	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,
2731	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 ,
2732	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,
…		…
2735	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,
2736	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 ,
2737	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
2738	};	2762	};
2739		2763
2740	#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \	2764	#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2741	(((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \	2765	(((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2742	| ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))	2766	| ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2743	#define get_byte_array_bit(array, bit) \	2767	#define get_byte_array_bit(array, bit) \
2744	(!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7))))	2768	(!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2745		2769
2746	const unsigned char csi_defaults[] =	2770	static const unsigned char csi_defaults[] =
2747	{	2771	{
2748	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, */
2749	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, */
2750	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, */
2751	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, [, \, ], ^, _, */
2752	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, */
2753	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, */
2754	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, */
2755	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, {, |, }, ~, */
2756	};	2780	};
2757	/* *INDENT-ON* */
2758		2781
2759	void	2782	void
2760	rxvt_term::process_csi_seq ()	2783	rxvt_term::process_csi_seq ()
2761	{	2784	{
2762	unicode_t ch, priv, i;	2785	unicode_t ch, priv, i;
…		…
2840	{	2863	{
2841	/* DECSTR: soft terminal reset, used by our terminfo since 9.06 */	2864	/* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2842	scr_soft_reset ();	2865	scr_soft_reset ();
2843		2866
2844	static const int pm_h[] = { 7, 25 };	2867	static const int pm_h[] = { 7, 25 };
2845	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 };
2846		2869
2847	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);
2848	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);
2849	}	2872	}
2850	break;	2873	break;
2851	}	2874	}
2852		2875
2853	return;	2876	return;
…		…
2871	}	2894	}
2872	break;	2895	break;
2873	#endif	2896	#endif
2874		2897
2875	case CSI_CUU: /* 8.3.22: (1) CURSOR UP */	2898	case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2876	case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */	2899	case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2877	arg[0] = -arg[0];	2900	arg[0] = -arg[0];
2878	/* FALLTHROUGH */	2901	/* FALLTHROUGH */
2879	case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */	2902	case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2880	case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */	2903	case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2881	scr_gotorc (arg[0], 0, RELATIVE);	2904	scr_gotorc (arg[0], 0, RELATIVE);
2882	break;	2905	break;
2883		2906
2884	case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */	2907	case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2885	case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */	2908	case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
…		…
3072	}	3095	}
3073	}	3096	}
3074	/*}}} */	3097	/*}}} */
3075		3098
3076	#if !ENABLE_MINIMAL	3099	#if !ENABLE_MINIMAL
3077	/* ARGSUSED */
3078	void	3100	void
3079	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3101	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3080	{	3102	{
3081	int x, y;	3103	int x, y;
3082	XWindowAttributes wattr;	3104	XWindowAttributes wattr;
…		…
3091	{	3113	{
3092	/*	3114	/*
3093	* commands	3115	* commands
3094	*/	3116	*/
3095	case 1: /* deiconify window */	3117	case 1: /* deiconify window */
3096	XMapWindow (dpy, parent[0]);	3118	XMapWindow (dpy, parent);
3097	break;	3119	break;
3098	case 2: /* iconify window */	3120	case 2: /* iconify window */
3099	XIconifyWindow (dpy, parent[0], display->screen);	3121	XIconifyWindow (dpy, parent, display->screen);
3100	break;	3122	break;
3101	case 3: /* set position (pixels) */	3123	case 3: /* set position (pixels) */
3102	XMoveWindow (dpy, parent[0], args[1], args[2]);	3124	XMoveWindow (dpy, parent, args[1], args[2]);
3103	break;	3125	break;
3104	case 4: /* set size (pixels) */	3126	case 4: /* set size (pixels) */
3105	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3127	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3106	break;	3128	break;
3107	case 5: /* raise window */	3129	case 5: /* raise window */
3108	XRaiseWindow (dpy, parent[0]);	3130	XRaiseWindow (dpy, parent);
3109	break;	3131	break;
3110	case 6: /* lower window */	3132	case 6: /* lower window */
3111	XLowerWindow (dpy, parent[0]);	3133	XLowerWindow (dpy, parent);
3112	break;	3134	break;
3113	case 7: /* refresh window */	3135	case 7: /* refresh window */
3114	scr_touch (true);	3136	scr_touch (true);
3115	break;	3137	break;
3116	case 8: /* set size (chars) */	3138	case 8: /* set size (chars) */
…		…
3119	break;	3141	break;
3120		3142
3121	//case 9: NYI, TODO, restore maximized window or maximize window	3143	//case 9: NYI, TODO, restore maximized window or maximize window
3122	default:	3144	default:
3123	if (args[0] >= 24) /* set height (chars) */	3145	if (args[0] >= 24) /* set height (chars) */
3124	set_widthheight ((unsigned int)width,	3146	set_widthheight ((unsigned int)vt_width,
3125	(unsigned int) (args[1] * fheight));	3147	(unsigned int) (args[1] * fheight));
3126	break;	3148	break;
3127		3149
3128	/*	3150	/*
3129	* reports - some output format copied from XTerm	3151	* reports - some output format copied from XTerm
3130	*/	3152	*/
3131	case 11: /* report window state */	3153	case 11: /* report window state */
3132	XGetWindowAttributes (dpy, parent[0], &wattr);	3154	XGetWindowAttributes (dpy, parent, &wattr);
3133	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3155	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3134	break;	3156	break;
3135	case 13: /* report window position */	3157	case 13: /* report window position */
3136	XGetWindowAttributes (dpy, parent[0], &wattr);	3158	XGetWindowAttributes (dpy, parent, &wattr);
3137	XTranslateCoordinates (dpy, parent[0], wattr.root,	3159	XTranslateCoordinates (dpy, parent, wattr.root,
3138	-wattr.border_width, -wattr.border_width,	3160	-wattr.border_width, -wattr.border_width,
3139	&x, &y, &wdummy);	3161	&x, &y, &wdummy);
3140	tt_printf ("\033[3;%d;%dt", x, y);	3162	tt_printf ("\033[3;%d;%dt", x, y);
3141	break;	3163	break;
3142	case 14: /* report window size (pixels) */	3164	case 14: /* report window size (pixels) */
3143	XGetWindowAttributes (dpy, parent[0], &wattr);	3165	XGetWindowAttributes (dpy, parent, &wattr);
3144	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3166	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3145	break;	3167	break;
3146	case 18: /* report text area size (chars) */	3168	case 18: /* report text area size (chars) */
3147	tt_printf ("\033[8;%d;%dt", nrow, ncol);	3169	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3148	break;	3170	break;
…		…
3150	tt_printf ("\033[9;%d;%dt", nrow, ncol);	3172	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3151	break;	3173	break;
3152	case 20: /* report icon label */	3174	case 20: /* report icon label */
3153	{	3175	{
3154	char *s;	3176	char *s;
3155	XGetIconName (dpy, parent[0], &s);	3177	XGetIconName (dpy, parent, &s);
3156	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 */
3157	XFree (s);	3179	XFree (s);
3158	}	3180	}
3159	break;	3181	break;
3160	case 21: /* report window title */	3182	case 21: /* report window title */
3161	{	3183	{
3162	char *s;	3184	char *s;
3163	XFetchName (dpy, parent[0], &s);	3185	XFetchName (dpy, parent, &s);
3164	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 */
3165	XFree (s);	3187	XFree (s);
3166	}	3188	}
3167	break;	3189	break;
3168	}	3190	}
…		…
3224	* 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)'
3225	*/	3247	*/
3226	void	3248	void
3227	rxvt_term::process_dcs_seq ()	3249	rxvt_term::process_dcs_seq ()
3228	{	3250	{
3229	char *s;
3230	unicode_t eh;
3231
3232	/*	3251	/*
3233	* Not handled yet	3252	* Not handled yet
3234	*/	3253	*/
		3254
		3255	unicode_t eh;
3235	s = get_to_st (eh);	3256	char *s = get_to_st (eh);
3236	if (s)	3257	if (s)
3237	free (s);	3258	free (s);
3238		3259
3239	return;	3260	return;
3240	}	3261	}
…		…
3244	* process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'	3265	* process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3245	*/	3266	*/
3246	void	3267	void
3247	rxvt_term::process_osc_seq ()	3268	rxvt_term::process_osc_seq ()
3248	{	3269	{
3249	unicode_t ch, eh;
3250	int arg;	3270	int arg;
3251		3271
3252	ch = cmd_getc ();	3272	unicode_t ch = cmd_getc ();
3253	for (arg = 0; isdigit (ch); ch = cmd_getc ())	3273	for (arg = 0; isdigit (ch); ch = cmd_getc ())
3254	arg = arg * 10 + (ch - '0');	3274	arg = arg * 10 + (ch - '0');
3255		3275
3256	if (ch == ';')	3276	if (ch == ';')
3257	{	3277	{
		3278	unicode_t eh;
3258	char *s = get_to_st (eh);	3279	char *s = get_to_st (eh);
3259		3280
3260	if (s)	3281	if (s)
3261	{	3282	{
3262	process_xterm_seq (arg, s, eh);	3283	process_xterm_seq (arg, s, eh);
…		…
3323	unsigned long bytes_after;	3344	unsigned long bytes_after;
3324	unsigned char *value = 0;	3345	unsigned char *value = 0;
3325	const char *str = "";	3346	const char *str = "";
3326		3347
3327	if (prop	3348	if (prop
3328	&& XGetWindowProperty (dpy, parent[0],	3349	&& XGetWindowProperty (dpy, parent,
3329	prop, 0, 1<<16, 0, AnyPropertyType,	3350	prop, 0, 1<<16, 0, AnyPropertyType,
3330	&actual_type, &actual_format,	3351	&actual_type, &actual_format,
3331	&nitems, &bytes_after, &value) == Success	3352	&nitems, &bytes_after, &value) == Success
3332	&& actual_type != None	3353	&& actual_type != None
3333	&& actual_format == 8)	3354	&& actual_format == 8)
…		…
3345	{	3366	{
3346	*eq = 0;	3367	*eq = 0;
3347	set_utf8_property (display->atom (str), eq + 1);	3368	set_utf8_property (display->atom (str), eq + 1);
3348	}	3369	}
3349	else	3370	else
3350	XDeleteProperty (dpy, parent[0],	3371	XDeleteProperty (dpy, parent,
3351	display->atom (str));	3372	display->atom (str));
3352	}	3373	}
3353	break;	3374	break;
3354		3375
3355	case XTerm_Color:	3376	case XTerm_Color:
…		…
3387	process_color_seq (op, Color_pointer_fg, str, resp);	3408	process_color_seq (op, Color_pointer_fg, str, resp);
3388	break;	3409	break;
3389	case XTerm_Color_pointer_bg:	3410	case XTerm_Color_pointer_bg:
3390	process_color_seq (op, Color_pointer_bg, str, resp);	3411	process_color_seq (op, Color_pointer_bg, str, resp);
3391	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
3392	#ifndef NO_BOLD_UNDERLINE_REVERSE	3421	#ifndef NO_BOLD_UNDERLINE_REVERSE
3393	case XTerm_Color_RV:
3394	process_color_seq (op, Color_RV, str, resp);
3395	break;
3396	case Rxvt_Color_BD:
3397	case URxvt_Color_BD:	3422	case URxvt_Color_BD:
3398	process_color_seq (op, Color_BD, str, resp);	3423	process_color_seq (op, Color_BD, str, resp);
3399	break;	3424	break;
3400	case Rxvt_Color_UL:
3401	case URxvt_Color_UL:	3425	case URxvt_Color_UL:
3402	process_color_seq (op, Color_UL, str, resp);	3426	process_color_seq (op, Color_UL, str, resp);
3403	break;	3427	break;
3404	case URxvt_Color_IT:	3428	case URxvt_Color_IT:
3405	process_color_seq (op, Color_IT, str, resp);	3429	process_color_seq (op, Color_IT, str, resp);
…		…
3413	process_color_seq (op, Color_tint, str, resp);	3437	process_color_seq (op, Color_tint, str, resp);
3414	{	3438	{
3415	bool changed = false;	3439	bool changed = false;
3416		3440
3417	if (ISSET_PIXCOLOR (Color_tint))	3441	if (ISSET_PIXCOLOR (Color_tint))
3418	changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);	3442	changed = bg_set_tint (pix_colors_focused [Color_tint]);
3419	else
3420	changed = bgPixmap.unset_tint ();
3421		3443
3422	if (changed)	3444	if (changed)
3423	update_background ();	3445	update_background ();
3424	}	3446	}
3425		3447
…		…
3429	#if BG_IMAGE_FROM_FILE	3451	#if BG_IMAGE_FROM_FILE
3430	case Rxvt_Pixmap:	3452	case Rxvt_Pixmap:
3431	if (!strcmp (str, "?"))	3453	if (!strcmp (str, "?"))
3432	{	3454	{
3433	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	}
3434		3465
3435	sprintf (str, "[%dx%d+%d+%d]",	3466	sprintf (str, "[%dx%d+%d+%d]",
3436	min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),	3467	h_scale, v_scale,
3437	min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));	3468	h_align, v_align);
3438	process_xterm_seq (XTerm_title, str, CHAR_ST);	3469	process_xterm_seq (XTerm_title, str, CHAR_ST);
3439	}	3470	}
3440	else	3471	else
3441	{	3472	{
3442	int changed = 0;	3473	bool changed = false;
3443		3474
3444	if (*str != ';')	3475	if (*str != ';')
3445	{	3476	{
3446	/* reset to default scaling :*/	3477	if (image_vec.size () > 0)
3447	bgPixmap.unset_geometry ();	3478	changed = image_vec[0].set_file_geometry (str);
3448	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
3449	changed++;	3485	changed = true;
3450	str = strchr (str, ';');	3486	}
3451	if (str == NULL)
3452	bgPixmap.set_defaultGeometry ();
3453	}	3487	}
3454		3488	else
3455	while (str)
3456	{	3489	{
3457	str++;	3490	str++;
3458	if (bgPixmap.set_geometry (str))	3491	if (image_vec.size () > 0)
3459	changed++;	3492	changed = image_vec[0].set_geometry (str, true);
3460	str = strchr (str, ';');
3461	}	3493	}
3462		3494
3463	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	}
3464	update_background ();	3503	update_background ();
		3504	}
3465	}	3505	}
3466	break;	3506	break;
3467	#endif	3507	#endif
3468		3508
3469	case XTerm_logfile:	3509	case XTerm_logfile:
…		…
3563	{	3603	{
3564	int state;	3604	int state;
3565		3605
3566	if (mode == 's')	3606	if (mode == 's')
3567	{	3607	{
3568	SavedModes |= (priv_modes & bit);	3608	if (priv_modes & bit)
		3609	SavedModes |= bit;
		3610	else
		3611	SavedModes &= ~bit;
3569	return -1;	3612	return -1;
3570	}	3613	}
3571	else	3614	else
3572	{	3615	{
3573	if (mode == 'r')	3616	if (mode == 'r')
3574	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */	3617	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3575	else	3618	else
3576	state = (mode == 't') ? ! (priv_modes & bit) : mode;	3619	state = (mode == 't') ? ! (priv_modes & bit) : mode;
3577	set_privmode (bit, state);	3620
		3621	if (state)
		3622	priv_modes |= bit;
		3623	else
		3624	priv_modes &= ~bit;
3578	}	3625	}
3579		3626
3580	return state;	3627	return state;
3581	}	3628	}
3582		3629
3583	/* we're not using priv _yet_ */	3630	/* we're not using priv _yet_ */
3584	void	3631	void
3585	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)
3586	{	3633	{
3587	unsigned int i, j;	3634	unsigned int i, j;
3588	int state;	3635	int state;
3589		3636
3590	static const struct	3637	static const struct
3591	{	3638	{
3592	const int argval;	3639	const int argval;
3593	const unsigned long bit;	3640	const unsigned long bit;
3594	} argtopriv[] = {	3641	} argtopriv[] = {
3595	{ 1, PrivMode_aplCUR }, // DECCKM	3642	{ 1, PrivMode_aplCUR }, // DECCKM
3596	{ 2, PrivMode_vt52 },	3643	{ 2, PrivMode_vt52 }, // DECANM
3597	{ 3, PrivMode_132 }, // DECCOLM	3644	{ 3, PrivMode_132 }, // DECCOLM
3598	{ 4, PrivMode_smoothScroll }, // DECSCLM	3645	{ 4, PrivMode_smoothScroll }, // DECSCLM
3599	{ 5, PrivMode_rVideo }, // DECSCNM	3646	{ 5, PrivMode_rVideo }, // DECSCNM
3600	{ 6, PrivMode_relOrigin }, // DECOM	3647	{ 6, PrivMode_relOrigin }, // DECOM
3601	{ 7, PrivMode_Autowrap }, // DECAWM	3648	{ 7, PrivMode_Autowrap }, // DECAWM
3602	// 8, auto-repeat keys // DECARM	3649	// 8, auto-repeat keys // DECARM
3603	{ 9, PrivMode_MouseX10 },	3650	{ 9, PrivMode_MouseX10 },
3604	// 18 end FF to printer after print screen	3651	// 18 end FF to printer after print screen
3605	// 19 Print screen prints full screen/scorll region	3652	// 19 Print screen prints full screen/scroll region
3606	{ 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis	3653	{ 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3607	#ifdef scrollBar_esc	3654	#ifdef scrollBar_esc
3608	{ scrollBar_esc, PrivMode_scrollBar },	3655	{ scrollBar_esc, PrivMode_scrollBar },
3609	#endif	3656	#endif
3610	{ 35, PrivMode_ShiftKeys }, // rxvt extension	3657	{ 35, PrivMode_ShiftKeys }, // rxvt extension
3611	// 38, tektronix mode // DECTEK	3658	// 38, tektronix mode // DECTEK
3612	{ 40, PrivMode_132OK },	3659	{ 40, PrivMode_132OK },
3613	// 41 xterm more fixes NYI	3660	// 41 xterm more fixes NYI
3614	// 45 margin bell NYI	3661	// 45 margin bell NYI
3615	// 46 start logging	3662	// 46 start logging
3616	{ 47, PrivMode_Screen },	3663	{ 47, PrivMode_Screen },
3617	{ 66, PrivMode_aplKP }, // DECPAM/DECPNM	3664	{ 66, PrivMode_aplKP }, // DECNKM
3618	#ifndef NO_BACKSPACE_KEY	3665	#ifndef NO_BACKSPACE_KEY
3619	{ 67, PrivMode_BackSpace }, // DECBKM	3666	{ 67, PrivMode_BackSpace }, // DECBKM
3620	#endif	3667	#endif
3621	{ 1000, PrivMode_MouseX11 },	3668	{ 1000, PrivMode_MouseX11 },
3622	{ 1002, PrivMode_MouseBtnEvent },	3669	{ 1002, PrivMode_MouseBtnEvent },
3623	{ 1003, PrivMode_MouseAnyEvent },	3670	{ 1003, PrivMode_MouseAnyEvent },
		3671	#if ENABLE_FRILLS
		3672	{ 1005, PrivMode_ExtModeMouse },
		3673	#endif
3624	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension	3674	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension
3625	{ 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
3626	// 1035 enable modifiers for alt, numlock NYI	3679	// 1035 enable modifiers for alt, numlock NYI
3627	// 1036 send ESC for meta keys NYI	3680	// 1036 send ESC for meta keys NYI
3628	// 1037 send DEL for keypad delete NYI	3681	// 1037 send DEL for keypad delete NYI
3629	{ 1047, PrivMode_Screen },	3682	{ 1047, PrivMode_Screen },
3630	// 1048 save and restore cursor	3683	// 1048 save and restore cursor, implemented in code
3631	{ 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 */
3632	// 1051, 1052, 1060, 1061 keyboard emulation NYI	3685	// 1051, 1052, 1060, 1061 keyboard emulation NYI
3633	{ 2004, PrivMode_BracketPaste },	3686	{ 2004, PrivMode_BracketPaste },
3634	};	3687	};
3635		3688
…		…
3645	for (i = 0; i < nargs; i++)	3698	for (i = 0; i < nargs; i++)
3646	{	3699	{
3647	state = -1;	3700	state = -1;
3648		3701
3649	/* basic handling */	3702	/* basic handling */
3650	for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++)	3703	for (j = 0; j < ecb_array_length (argtopriv); j++)
3651	if (argtopriv[j].argval == arg[i])	3704	if (argtopriv[j].argval == arg[i])
3652	{	3705	{
3653	state = privcases (mode, argtopriv[j].bit);	3706	state = privcases (mode, argtopriv[j].bit);
3654	break;	3707	break;
3655	}	3708	}
…		…
3681	case 2: /* VT52 mode */	3734	case 2: /* VT52 mode */
3682	/* oddball mode. should be set regardless of set/reset	3735	/* oddball mode. should be set regardless of set/reset
3683	* parameter. Return from VT52 mode with an ESC < from	3736	* parameter. Return from VT52 mode with an ESC < from
3684	* within VT52 mode	3737	* within VT52 mode
3685	*/	3738	*/
3686	set_privmode (PrivMode_vt52, 1);	3739	priv_modes |= PrivMode_vt52;
3687	break;	3740	break;
3688	case 3: /* 80/132 */	3741	case 3: /* 80/132 */
3689	if (priv_modes & PrivMode_132OK)	3742	if (priv_modes & PrivMode_132OK)
3690	set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);	3743	set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3691	break;	3744	break;
…		…
3706	if (state) /* orthogonal */	3759	if (state) /* orthogonal */
3707	priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);	3760	priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3708	break;	3761	break;
3709	#ifdef scrollBar_esc	3762	#ifdef scrollBar_esc
3710	case scrollBar_esc:	3763	case scrollBar_esc:
3711	if (scrollBar.map (state))	3764	scrollBar.map (state);
3712	{
3713	resize_all_windows (0, 0, 0);	3765	resize_all_windows (0, 0, 0);
3714	scr_touch (true);	3766	scr_touch (true);
3715	}
3716	break;	3767	break;
3717	#endif	3768	#endif
3718	case 25: /* visible/invisible cursor */	3769	case 25: /* visible/invisible cursor */
3719	scr_cursor_visible (state);	3770	scr_cursor_visible (state);
3720	break;	3771	break;
…		…
3733	case 1003:	3784	case 1003:
3734	if (state)	3785	if (state)
3735	{	3786	{
3736	priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);	3787	priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3737	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;
3738	vt_emask_mouse = PointerMotionMask;	3790	vt_emask_mouse = PointerMotionMask;
3739	}	3791	}
3740	else	3792	else
3741	vt_emask_mouse = NoEventMask;	3793	vt_emask_mouse = NoEventMask;
3742		3794
…		…
3927	}	3979	}
3928	}	3980	}
3929	}	3981	}
3930	/*}}} */	3982	/*}}} */
3931		3983
3932	/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3933	void
3934	rxvt_term::process_graphics ()
3935	{
3936	unicode_t ch, cmd = cmd_getc ();
3937
3938	if (cmd == 'Q')
3939	{
3940	/* query graphics */
3941	tt_printf ("\033G0\012"); /* no graphics */
3942	return;
3943	}
3944	/* swallow other graphics sequences until terminating ':' */
3945	do
3946	ch = cmd_getc ();
3947	while (ch != ':');
3948	}
3949	/*}}} */
3950
3951	/* ------------------------------------------------------------------------- */	3984	/* ------------------------------------------------------------------------- */
3952		3985
3953	/*	3986	/*
3954	* Send printf () formatted output to the command.	3987	* Send printf () formatted output to the command.
3955	* Only use for small amounts of data.	3988	* Only use for small amounts of data.
…		…
3968		4001
3969	/* ---------------------------------------------------------------------- */	4002	/* ---------------------------------------------------------------------- */
3970	/* 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,
3971	* or generated by us in response to a query ESC sequence.	4004	* or generated by us in response to a query ESC sequence.
3972	*/	4005	*/
3973	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT	4006	static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3974		4007
3975	void	4008	void
3976	rxvt_term::tt_write (const char *data, unsigned int len)	4009	rxvt_term::tt_write (const char *data, unsigned int len)
3977	{	4010	{
3978	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)))
…		…
3983		4016
3984	if (v_buflen == 0)	4017	if (v_buflen == 0)
3985	{	4018	{
3986	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));
3987		4020
		4021	max_it (written, 0);
		4022
3988	if ((unsigned int)written == len)	4023	if (written == len)
3989	return;	4024	return;
3990		4025
3991	data += written;	4026	data += written;
3992	len -= written;	4027	len -= written;
3993	}	4028	}
3994		4029
3995	v_buffer = (char *)realloc (v_buffer, v_buflen + len);	4030	v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3996		4031
3997	memcpy (v_buffer + v_buflen, data, len);	4032	memcpy (v_buffer + v_buflen, data, len);
3998	v_buflen += len;	4033	v_buflen += len;
3999		4034
4000	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