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.423 by root, Tue Nov 4 22:44:09 2008 UTC vs.
Revision 1.503 by sf-exg, Mon Dec 5 13:36:56 2011 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
…		…
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	}
581		578
582	#if ENABLE_FRILLS || ISO_14755	579	#if ENABLE_FRILLS || ISO_14755
583	// ISO 14755 support	580	// ISO 14755 support
584	if (shft && ctrl)	581	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
585	{	582	{
586	int hv;	583	int hv;
587		584
588	if (iso14755buf & ISO_14755_51	585	if (iso14755buf & ISO_14755_51
589	&& (keysym == XK_space || keysym == XK_KP_Space	586	&& (keysym == XK_space || keysym == XK_KP_Space
…		…
619	scr_overlay_off ();	616	scr_overlay_off ();
620	# endif	617	# endif
621	iso14755buf = 0;	618	iso14755buf = 0;
622	}	619	}
623	}	620	}
		621	else if (option (Opt_iso14755) &&
624	else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))	622	((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
625	|| (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))	623	|| (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
626	if (!(iso14755buf & ISO_14755_STARTED))	624	if (!(iso14755buf & ISO_14755_STARTED))
627	{	625	{
628	iso14755buf |= ISO_14755_STARTED;	626	iso14755buf |= ISO_14755_STARTED;
629	# if ISO_14755	627	# if ISO_14755
630	scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);	628	scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
…		…
644	if (keysym >= 0xFF00 && keysym <= 0xFFFF)	642	if (keysym >= 0xFF00 && keysym <= 0xFFFF)
645	{	643	{
646	bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;	644	bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
647	unsigned int newlen = 1;	645	unsigned int newlen = 1;
648		646
		647	if (ev.state & ModNumLockMask)
		648	kp = false;
		649
649	switch (translate_keypad (keysym, kp))	650	keysym = translate_keypad (keysym, kp);
		651
		652	switch (keysym)
650	{	653	{
651	#ifndef NO_BACKSPACE_KEY	654	#ifndef NO_BACKSPACE_KEY
652	case XK_BackSpace:	655	case XK_BackSpace:
653	if (priv_modes & PrivMode_HaveBackSpace)	656	if (priv_modes & PrivMode_HaveBackSpace)
654	{	657	{
…		…
773	}	776	}
774		777
775	if (newlen)	778	if (newlen)
776	len = strlen (kbuf);	779	len = strlen (kbuf);
777		780
		781	if (len > 0)
		782	{
778	/*	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	/*
779	* Pass meta for all function keys, if 'meta' option set	796	* Pass meta for all function keys, if 'meta' option set
780	*/	797	*/
781	#ifdef META8_OPTION	798	#ifdef META8_OPTION
782	if (meta && (meta_char == 0x80) && len > 0)	799	if (meta && (meta_char == 0x80))
783	kbuf[len - 1] |= 0x80;	800	kbuf[len - 1] |= 0x80;
784	#endif	801	#endif
		802	}
785		803
786	}	804	}
787	else if (ctrl && keysym == XK_minus)	805	else if (ctrl && keysym == XK_minus)
788	{	806	{
789	len = 1;	807	len = 1;
…		…
822	if (view_start)	840	if (view_start)
823	{	841	{
824	view_start = 0;	842	view_start = 0;
825	want_refresh = 1;	843	want_refresh = 1;
826	}	844	}
827
828	/*
829	* these modifications only affect the static keybuffer
830	* pass Shift/Control indicators for function keys ending with `~'
831	*
832	* eg,
833	* Prior = "ESC[5~"
834	* Shift+Prior = "ESC[5$"
835	* Ctrl+Prior = "ESC[5^"
836	* Ctrl+Shift+Prior = "ESC[5@"
837	* Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
838	*/
839	if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
840	kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
841		845
842	/* escape prefix */	846	/* escape prefix */
843	if (meta	847	if (meta
844	#ifdef META8_OPTION	848	#ifdef META8_OPTION
845	&& meta_char == C0_ESC	849	&& meta_char == C0_ESC
…		…
881	commit_iso14755 ();	885	commit_iso14755 ();
882		886
883	return;	887	return;
884	}	888	}
885		889
886	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)	890	for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
887	if (i[0] == keysym)	891	if (i[0] == keysym)
888	{	892	{
889	iso14755buf = ISO_14755_51 | i[1];	893	iso14755buf = ISO_14755_51 | i[1];
890	commit_iso14755 ();	894	commit_iso14755 ();
891		895
…		…
928	else if (keysym == XK_Control_L || keysym == XK_Control_R)	932	else if (keysym == XK_Control_L || keysym == XK_Control_R)
929	mouse_slip_wheel_speed = 0;	933	mouse_slip_wheel_speed = 0;
930	#endif	934	#endif
931	}	935	}
932		936
933	#if defined (KEYSYM_RESOURCE)
934	unsigned int
935	rxvt_term::cmd_write (const char *str, unsigned int count)
936	{
937	unsigned int n, s;
938
939	n = cmdbuf_ptr - cmdbuf_base;
940	s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
941
942	if (n > 0 && s < count)
943	{
944	memmove (cmdbuf_base, cmdbuf_ptr,
945	(unsigned int) (cmdbuf_endp - cmdbuf_ptr));
946	cmdbuf_ptr = cmdbuf_base;
947	cmdbuf_endp -= n;
948	s += n;
949	}
950
951	if (count > s)
952	{
953	rxvt_warn ("data loss: cmd_write too large, continuing.\n");
954	count = s;
955	}
956
957	for (; count--;)
958	*cmdbuf_endp++ = *str++;
959
960	cmd_parse ();
961
962	return 0;
963	}
964	#endif
965
966	void	937	void
967	rxvt_term::flush ()	938	rxvt_term::flush ()
968	{	939	{
969	flush_ev.stop ();	940	flush_ev.stop ();
970		941
971	#ifdef HAVE_BG_PIXMAP	942	#ifdef HAVE_BG_PIXMAP
972	if (bgPixmap.check_clearChanged ())	943	if (bg_flags & BG_NEEDS_REFRESH)
973	{	944	{
974	// scr_clear (true); This needs to be researched further!	945	bg_flags &= ~BG_NEEDS_REFRESH;
975	scr_touch (false);	946	scr_touch (false);
976	}	947	}
977	#endif	948	#endif
978		949
979	if (want_refresh)	950	if (want_refresh)
…		…
1017	}	988	}
1018		989
1019	scr_refresh ();	990	scr_refresh ();
1020	scrollBar.show (1);	991	scrollBar.show (1);
1021	#ifdef USE_XIM	992	#ifdef USE_XIM
1022	IMSendSpot ();	993	im_send_spot ();
1023	#endif	994	#endif
1024	}	995	}
1025		996
1026	display->flush ();	997	display->flush ();
1027	}	998	}
1028		999
1029	/* checks wether a refresh is requested and starts the refresh timer */	1000	/* checks whether a refresh is requested and starts the refresh timer */
1030	void	1001	void
1031	rxvt_term::refresh_check ()	1002	rxvt_term::refresh_check ()
1032	{	1003	{
1033	if (want_refresh && !flush_ev.is_active ())	1004	if (want_refresh && !flush_ev.is_active ())
1034	flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally	1005	flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
…		…
1072		1043
1073	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	1044	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1074	void	1045	void
1075	rxvt_term::cont_scroll_cb (ev::timer &w, int revents)	1046	rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1076	{	1047	{
1077	if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)	1048	if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1078	&& scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))	1049	&& scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1079	{	1050	{
1080	want_refresh = 1;	1051	want_refresh = 1;
1081	refresh_check ();	1052	refresh_check ();
1082	}	1053	}
1083	else	1054	else
…		…
1128	// this should really be sched_yield(), but the linux guys thought	1099	// this should really be sched_yield(), but the linux guys thought
1129	// that giving a process calling sched_yield () less cpu time than	1100	// that giving a process calling sched_yield () less cpu time than
1130	// ones with high nice levels is a useful thing to do. It surely is is	1101	// ones with high nice levels is a useful thing to do. It surely is is
1131	// allowed by the sus... as is returning ENOSYS.	1102	// allowed by the sus... as is returning ENOSYS.
1132	// since the linux guys additionally thought that breaking the only	1103	// since the linux guys additionally thought that breaking the only
1133	// known workaroudn against their unusable sched_yield hack is cool,	1104	// known workaround against their unusable sched_yield hack is cool,
1134	// we just nanosleep a bit and hope for the best.	1105	// we just nanosleep a bit and hope for the best.
1135		1106
1136	struct timespec ts = { 0, 1000 };	1107	struct timespec ts = { 0, 1000 };
1137	nanosleep (&ts, 0);	1108	nanosleep (&ts, 0);
1138		1109
…		…
1144	{	1115	{
1145	}	1116	}
1146	} event_handler;	1117	} event_handler;
1147	#endif	1118	#endif
1148		1119
		1120	/* make sure all the cmd data is at beginning of cmdbuf */
		1121	void
		1122	rxvt_term::cmdbuf_reify ()
		1123	{
		1124	if (cmdbuf_ptr == cmdbuf_base)
		1125	return;
		1126
		1127	ssize_t used = cmdbuf_endp - cmdbuf_ptr;
		1128
		1129	memmove (cmdbuf_base, cmdbuf_ptr, used);
		1130	cmdbuf_ptr = cmdbuf_base;
		1131	cmdbuf_endp = cmdbuf_ptr + used;
		1132
		1133	}
		1134
		1135	#if defined (KEYSYM_RESOURCE)
		1136	void
		1137	rxvt_term::cmdbuf_append (const char *str, size_t count)
		1138	{
		1139	cmdbuf_reify ();
		1140
		1141	size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
		1142
		1143	if (count > avail)
		1144	return;
		1145
		1146	memcpy (cmdbuf_endp, str, count);
		1147	cmdbuf_endp += count;
		1148
		1149	cmd_parse ();
		1150	}
		1151	#endif
		1152
1149	bool	1153	bool
1150	rxvt_term::pty_fill ()	1154	rxvt_term::pty_fill ()
1151	{	1155	{
1152	ssize_t n = cmdbuf_endp - cmdbuf_ptr;	1156	cmdbuf_reify ();
1153		1157
1154	if (CBUFSIZ == n)	1158	size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1155	{	1159
1156	rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");	1160	if (!avail)
1157	n = 0;
1158	}	1161	{
1159		1162	// normally this indicates a "too long" command sequence - just drop the data we have
1160	memmove (cmdbuf_base, cmdbuf_ptr, n);
1161	cmdbuf_ptr = cmdbuf_base;	1163	cmdbuf_ptr = cmdbuf_base;
1162	cmdbuf_endp = cmdbuf_ptr + n;	1164	cmdbuf_endp = cmdbuf_ptr;
		1165	avail = CBUFSIZ;
		1166	}
1163		1167
1164	ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);	1168	ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1165		1169
1166	if (r > 0)	1170	if (r > 0)
1167	{	1171	{
1168	cmdbuf_endp += r;	1172	cmdbuf_endp += r;
1169	return true;	1173	return true;
…		…
1243	{	1247	{
1244	int button_number, key_state = 0;	1248	int button_number, key_state = 0;
1245	int x, y;	1249	int x, y;
1246	int code = 32;	1250	int code = 32;
1247		1251
1248	x = Pixel2Col (ev.x);	1252	x = Pixel2Col (ev.x) + 1;
1249	y = Pixel2Row (ev.y);	1253	y = Pixel2Row (ev.y) + 1;
		1254
1250	if (ev.type == MotionNotify)	1255	if (ev.type == MotionNotify)
1251	{	1256	{
1252	if (x == mouse_row && y == mouse_col)	1257	if (x == mouse_row && y == mouse_col)
1253	return;	1258	return;
		1259
1254	mouse_row = x;	1260	mouse_row = x;
1255	mouse_col = y;	1261	mouse_col = y;
1256	code += 32;	1262	code += 32;
1257	}	1263	}
1258		1264
…		…
1261	else	1267	else
1262	{	1268	{
1263	button_number = MEvent.button - Button1;	1269	button_number = MEvent.button - Button1;
1264	/* add 0x3D for wheel events, like xterm does */	1270	/* add 0x3D for wheel events, like xterm does */
1265	if (button_number >= 3)	1271	if (button_number >= 3)
1266	button_number += (64 - 3);	1272	button_number += 64 - 3;
1267	}	1273	}
1268		1274
1269	if (priv_modes & PrivMode_MouseX10)	1275	if (priv_modes & PrivMode_MouseX10)
1270	{	1276	{
1271	/*	1277	/*
…		…
1303	fputc ('A', stderr);	1309	fputc ('A', stderr);
1304	if (key_state & 32)	1310	if (key_state & 32)
1305	fputc ('2', stderr);	1311	fputc ('2', stderr);
1306	fprintf (stderr, "]: <%d>, %d/%d\n",	1312	fprintf (stderr, "]: <%d>, %d/%d\n",
1307	button_number,	1313	button_number,
1308	x + 1,	1314	x,
1309	y + 1);	1315	y);
1310	#endif	1316	#endif
1311		1317
		1318	#if ENABLE_FRILLS
		1319	if (priv_modes & PrivMode_ExtMouseRight)
		1320	tt_printf ("\033[%d;%d;%dM",
		1321	code + button_number + key_state,
		1322	x,
		1323	y);
		1324	else if (priv_modes & PrivMode_ExtModeMouse)
		1325	tt_printf ("\033[M%c%lc%lc",
		1326	code + button_number + key_state,
		1327	wint_t (32 + x),
		1328	wint_t (32 + y));
		1329	else
		1330	#endif
1312	tt_printf ("\033[M%c%c%c",	1331	tt_printf ("\033[M%c%c%c",
1313	(code + button_number + key_state),	1332	code + button_number + key_state,
1314	(32 + x + 1),	1333	32 + x,
1315	(32 + y + 1));	1334	32 + y);
1316	}	1335	}
1317		1336
1318	/*{{{ process an X event */	1337	/*{{{ process an X event */
1319	void	1338	void
1320	rxvt_term::x_cb (XEvent &ev)	1339	rxvt_term::x_cb (XEvent &ev)
…		…
1422	&& ev.xfocus.mode != NotifyGrab)	1441	&& ev.xfocus.mode != NotifyGrab)
1423	focus_out ();	1442	focus_out ();
1424	break;	1443	break;
1425		1444
1426	case ConfigureNotify:	1445	case ConfigureNotify:
1427	/*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1428	ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1429	szHint.width, szHint.height);*/
1430	if (ev.xconfigure.window == parent[0])	1446	if (ev.xconfigure.window == parent)
1431	{	1447	{
1432	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))	1448	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1433	;	1449	;
		1450
		1451	#ifdef HAVE_BG_PIXMAP
		1452	bool moved = false;
		1453	if (bg_window_position_sensitive ())
		1454	{
		1455	int x, y;
		1456	if (ev.xconfigure.send_event)
		1457	{
		1458	x = ev.xconfigure.x;
		1459	y = ev.xconfigure.y;
		1460	}
		1461	else
		1462	get_window_origin (x, y);
		1463
		1464	if (bg_set_position (x, y)
		1465	|| !(bg_flags & BG_IS_VALID))
		1466	moved = true;
		1467	}
		1468	#endif
1434		1469
1435	if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)	1470	if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1436	{	1471	{
1437	seen_resize = 1;	1472	seen_resize = 1;
1438	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1473	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1439	}	1474	}
1440	else	1475	else
1441	{	1476	{
1442	#ifdef HAVE_BG_PIXMAP	1477	#ifdef HAVE_BG_PIXMAP
1443	if (bgPixmap.window_position_sensitive ())
1444	{
1445	if (mapped)	1478	if (moved)
1446	update_background ();	1479	update_background ();
1447	else
1448	bgPixmap.invalidate ();
1449	}
1450	#endif	1480	#endif
1451	}	1481	}
1452		1482
1453	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));	1483	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1454	}	1484	}
1455	break;	1485	break;
1456		1486
1457	case PropertyNotify:	1487	case PropertyNotify:
1458	if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))	1488	HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1459	if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1460	&& ev.xproperty.state == PropertyNewValue)
1461	selection_property (ev.xproperty.window, ev.xproperty.atom);
1462
1463	break;	1489	break;
1464		1490
1465	case SelectionClear:	1491	case SelectionClear:
1466	selection_clear ();	1492	selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1467	break;
1468
1469	case SelectionNotify:
1470	if (selection_wait == Sel_normal)
1471	selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1472	break;	1493	break;
1473		1494
1474	case SelectionRequest:	1495	case SelectionRequest:
1475	selection_send (ev.xselectionrequest);	1496	selection_send (ev.xselectionrequest);
1476	break;	1497	break;
1477		1498
1478	case MapNotify:	1499	case MapNotify:
1479	#ifdef HAVE_BG_PIXMAP	1500	#ifdef HAVE_BG_PIXMAP
1480	/* This is needed spcifically to fix the case of no window manager or a	1501	/* This is needed specifically to fix the case of no window manager or a
1481	* non-reparenting window manager. In those cases we never get first	1502	* non-reparenting window manager. In those cases we never get first
1482	* ConfigureNotify. Also that speeds startup under normal WM, by taking	1503	* ConfigureNotify. Also that speeds startup under normal WM, by taking
1483	* care of multiplicity of ConfigureNotify events arriwing while WM does	1504	* care of multiplicity of ConfigureNotify events arriving while WM does
1484	* reparenting.	1505	* reparenting.
1485	* We should not render background immidiately, as there could be several	1506	* We should not render background immediately, as there could be several
1486	* ConfigureNotify's to follow. Lets take care of all of them in one scoop	1507	* ConfigureNotify's to follow. Lets take care of all of them in one scoop
1487	* by scheduling background redraw as soon as we can, but giving a short	1508	* by scheduling background redraw as soon as we can, but giving a short
1488	* bit of time for ConfigureNotifies to arrive.	1509	* bit of time for ConfigureNotifies to arrive.
1489	* We should render background PRIOR to drawing any text, but AFTER all	1510	* We should render background PRIOR to drawing any text, but AFTER all
1490	* of ConfigureNotifys for the best results.	1511	* of ConfigureNotifys for the best results.
1491	*/	1512	*/
1492	if (bgPixmap.flags & bgPixmap_t::isInvalid)	1513	if (!(bg_flags & BG_IS_VALID))
1493	update_background_ev.start (0.025);	1514	update_background_ev.start (0.025);
1494	#endif	1515	#endif
1495	mapped = 1;	1516	mapped = 1;
1496	#ifdef TEXT_BLINK	1517	#ifdef TEXT_BLINK
1497	text_blink_ev.start ();	1518	text_blink_ev.start ();
…		…
1512	if (ev.xany.window == vt)	1533	if (ev.xany.window == vt)
1513	{	1534	{
1514	do	1535	do
1515	{	1536	{
1516	scr_expose (ev.xexpose.x, ev.xexpose.y,	1537	scr_expose (ev.xexpose.x, ev.xexpose.y,
1517	ev.xexpose.width, ev.xexpose.height, False);	1538	ev.xexpose.width, ev.xexpose.height, false);
1518	}	1539	}
1519	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));	1540	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1520		1541
1521	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1542	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1522		1543
1523	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))	1544	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1524	{	1545	{
1525	scr_expose (ev.xexpose.x, ev.xexpose.y,	1546	scr_expose (ev.xexpose.x, ev.xexpose.y,
1526	ev.xexpose.width, ev.xexpose.height, False);	1547	ev.xexpose.width, ev.xexpose.height, false);
1527	}	1548	}
1528		1549
1529	want_refresh = 1;	1550	want_refresh = 1;
1530	}	1551	}
1531	else	1552	else
…		…
1537	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))	1558	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1538	;	1559	;
1539		1560
1540	if (scrollBar.state && ev.xany.window == scrollBar.win)	1561	if (scrollBar.state && ev.xany.window == scrollBar.win)
1541	{	1562	{
1542	scrollBar.state = STATE_IDLE;	1563	scrollBar.state = SB_STATE_IDLE;
1543	scrollBar.show (0);	1564	scrollBar.show (0);
1544	}	1565	}
1545	}	1566	}
1546	break;	1567	break;
1547		1568
…		…
1635	#ifdef MOUSE_THRESHOLD	1656	#ifdef MOUSE_THRESHOLD
1636	}	1657	}
1637	#endif	1658	#endif
1638	}	1659	}
1639	}	1660	}
1640	else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)	1661	else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1641	{	1662	{
1642	while (XCheckTypedWindowEvent (dpy, scrollBar.win,	1663	while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1643	MotionNotify, &ev))	1664	MotionNotify, &ev))
1644	;	1665	;
1645		1666
1646	XQueryPointer (dpy, scrollBar.win,	1667	XQueryPointer (dpy, scrollBar.win,
1647	&unused_root, &unused_child,	1668	&unused_root, &unused_child,
1648	&unused_root_x, &unused_root_y,	1669	&unused_root_x, &unused_root_y,
1649	&ev.xbutton.x, &ev.xbutton.y,	1670	&ev.xbutton.x, &ev.xbutton.y,
1650	&unused_mask);	1671	&unused_mask);
1651	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1672	scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1652	scrollBar.size ());	1673	scrollBar.size ());
1653	want_refresh = 1;	1674	want_refresh = 1;
1654	scrollBar.show (1);	1675	scrollBar.show (1);
1655	}	1676	}
1656	break;	1677	break;
…		…
1684	#endif	1705	#endif
1685		1706
1686	refresh_check ();	1707	refresh_check ();
1687	}	1708	}
1688		1709
		1710	#if ENABLE_FRILLS
1689	void	1711	void
1690	rxvt_term::set_urgency (bool enable)	1712	rxvt_term::set_urgency (bool enable)
1691	{	1713	{
1692	if (enable == urgency_hint)	1714	if (enable == urgency_hint)
1693	return;	1715	return;
1694		1716
1695	if (XWMHints *h = XGetWMHints (dpy, parent[0]))	1717	if (XWMHints *h = XGetWMHints (dpy, parent))
1696	{	1718	{
1697	h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);	1719	h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1698	XSetWMHints (dpy, parent[0], h);	1720	XSetWMHints (dpy, parent, h);
1699	urgency_hint = enable;	1721	urgency_hint = enable;
		1722	XFree (h);
1700	}	1723	}
1701	}	1724	}
		1725	#endif
1702		1726
1703	void	1727	void
1704	rxvt_term::focus_in ()	1728	rxvt_term::focus_in ()
1705	{	1729	{
1706	if (!focus)	1730	if (!focus)
…		…
1709	want_refresh = 1;	1733	want_refresh = 1;
1710		1734
1711	#if USE_XIM	1735	#if USE_XIM
1712	if (Input_Context != NULL)	1736	if (Input_Context != NULL)
1713	{	1737	{
1714	IMSetPosition ();	1738	im_set_position ();
1715	XSetICFocus (Input_Context);	1739	XSetICFocus (Input_Context);
1716	}	1740	}
1717	#endif	1741	#endif
1718	#if CURSOR_BLINK	1742	#if CURSOR_BLINK
1719	if (option (Opt_cursorBlink))	1743	if (option (Opt_cursorBlink))
…		…
1810	* use the property to determine the pixmap. We use it later on.	1834	* use the property to determine the pixmap. We use it later on.
1811	*/	1835	*/
1812	if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]	1836	if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1813	|| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])	1837	|| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1814	{	1838	{
1815	bgPixmap.set_root_pixmap ();	1839	bg_set_root_pixmap ();
1816	update_background ();	1840	update_background ();
1817	}	1841	}
1818		1842
1819	break;	1843	break;
1820	}	1844	}
…		…
1859	/* save the xbutton state (for ButtonRelease) */	1883	/* save the xbutton state (for ButtonRelease) */
1860	MEvent.state = ev.state;	1884	MEvent.state = ev.state;
1861	#ifdef MOUSE_REPORT_DOUBLECLICK	1885	#ifdef MOUSE_REPORT_DOUBLECLICK
1862	if (ev.button == MEvent.button && clickintime)	1886	if (ev.button == MEvent.button && clickintime)
1863	{	1887	{
1864	/* same button, within alloted time */	1888	/* same button, within allowed time */
1865	MEvent.clicks++;	1889	MEvent.clicks++;
1866		1890
1867	if (MEvent.clicks > 1)	1891	if (MEvent.clicks > 1)
1868	{	1892	{
1869	/* only report double clicks */	1893	/* only report double clicks */
…		…
1950	if (scrollBar.upButton (ev.y))	1974	if (scrollBar.upButton (ev.y))
1951	direction = UP; /* up */	1975	direction = UP; /* up */
1952	else if (scrollBar.dnButton (ev.y))	1976	else if (scrollBar.dnButton (ev.y))
1953	direction = DN; /* down */	1977	direction = DN; /* down */
1954		1978
1955	scrollBar.state = STATE_IDLE;	1979	scrollBar.state = SB_STATE_IDLE;
1956	/*	1980	/*
1957	* Rxvt-style scrollbar:	1981	* Rxvt-style scrollbar:
1958	* move up if mouse is above slider	1982	* move up if mouse is above slider
1959	* move dn if mouse is below slider	1983	* move dn if mouse is below slider
1960	*	1984	*
…		…
1999	cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);	2023	cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2000	#endif	2024	#endif
2001	if (scr_page (direction, 1))	2025	if (scr_page (direction, 1))
2002	{	2026	{
2003	if (direction == UP)	2027	if (direction == UP)
2004	scrollBar.state = STATE_UP;	2028	scrollBar.state = SB_STATE_UP;
2005	else	2029	else
2006	scrollBar.state = STATE_DOWN;	2030	scrollBar.state = SB_STATE_DOWN;
2007	}	2031	}
2008	}	2032	}
2009	else	2033	else
2010	switch (ev.button)	2034	switch (ev.button)
2011	{	2035	{
2012	case Button2:	2036	case Button2:
2013	switch (scrollBar.align)	2037	switch (scrollBar.align)
2014	{	2038	{
2015	case R_SB_ALIGN_TOP:	2039	case SB_ALIGN_TOP:
2016	csrO = 0;	2040	csrO = 0;
2017	break;	2041	break;
2018	case R_SB_ALIGN_CENTRE:	2042	case SB_ALIGN_CENTRE:
2019	csrO = (scrollBar.bot - scrollBar.top) / 2;	2043	csrO = (scrollBar.bot - scrollBar.top) / 2;
2020	break;	2044	break;
2021	case R_SB_ALIGN_BOTTOM:	2045	case SB_ALIGN_BOTTOM:
2022	csrO = scrollBar.bot - scrollBar.top;	2046	csrO = scrollBar.bot - scrollBar.top;
2023	break;	2047	break;
2024	}	2048	}
2025		2049
2026	if (scrollBar.style == R_SB_XTERM	2050	if (scrollBar.style == SB_STYLE_XTERM
2027	|| scrollbar_above_slider (ev.y)	2051	|| scrollBar.above_slider (ev.y)
2028	|| scrollbar_below_slider (ev.y))	2052	|| scrollBar.below_slider (ev.y))
2029	scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());	2053	scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2030		2054
2031	scrollBar.state = STATE_MOTION;	2055	scrollBar.state = SB_STATE_MOTION;
2032	break;	2056	break;
2033		2057
2034	case Button1:	2058	case Button1:
2035	if (scrollBar.align == R_SB_ALIGN_CENTRE)	2059	if (scrollBar.align == SB_ALIGN_CENTRE)
2036	csrO = ev.y - scrollBar.top;	2060	csrO = ev.y - scrollBar.top;
2037	/* FALLTHROUGH */	2061	/* FALLTHROUGH */
2038		2062
2039	case Button3:	2063	case Button3:
2040	if (scrollBar.style != R_SB_XTERM)	2064	if (scrollBar.style != SB_STYLE_XTERM)
2041	{	2065	{
2042	if (scrollbar_above_slider (ev.y))	2066	if (scrollBar.above_slider (ev.y))
2043	# ifdef RXVT_SCROLL_FULL	2067	# ifdef RXVT_SCROLL_FULL
2044	scr_page (UP, nrow - 1);	2068	scr_page (UP, nrow - 1);
2045	# else	2069	# else
2046	scr_page (UP, nrow / 4);	2070	scr_page (UP, nrow / 4);
2047	# endif	2071	# endif
2048	else if (scrollbar_below_slider (ev.y))	2072	else if (scrollBar.below_slider (ev.y))
2049	# ifdef RXVT_SCROLL_FULL	2073	# ifdef RXVT_SCROLL_FULL
2050	scr_page (DN, nrow - 1);	2074	scr_page (DN, nrow - 1);
2051	# else	2075	# else
2052	scr_page (DN, nrow / 4);	2076	scr_page (DN, nrow / 4);
2053	# endif	2077	# endif
2054	else	2078	else
2055	scrollBar.state = STATE_MOTION;	2079	scrollBar.state = SB_STATE_MOTION;
2056	}	2080	}
2057	else	2081	else
2058	{	2082	{
2059	scr_page ((ev.button == Button1 ? DN : UP),	2083	scr_page ((ev.button == Button1 ? DN : UP),
2060	(nrow	2084	(nrow
2061	* scrollbar_position (ev.y)	2085	* scrollBar.position (ev.y)
2062	/ scrollBar.size ()));	2086	/ scrollBar.size ()));
2063	}	2087	}
2064		2088
2065	break;	2089	break;
2066	}	2090	}
…		…
2077		2101
2078	csrO = 0; /* reset csr Offset */	2102	csrO = 0; /* reset csr Offset */
2079	if (!bypass_keystate)	2103	if (!bypass_keystate)
2080	reportmode = !! (priv_modes & PrivMode_mouse_report);	2104	reportmode = !! (priv_modes & PrivMode_mouse_report);
2081		2105
2082	if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)	2106	if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2083	{	2107	{
2084	scrollBar.state = STATE_IDLE;	2108	scrollBar.state = SB_STATE_IDLE;
2085	scrollBar.show (0);	2109	scrollBar.show (0);
2086	}	2110	}
2087		2111
2088	#ifdef SELECTION_SCROLLING	2112	#ifdef SELECTION_SCROLLING
2089	sel_scroll_ev.stop();	2113	sel_scroll_ev.stop();
…		…
2140	selection_make (ev.time);	2164	selection_make (ev.time);
2141	break;	2165	break;
2142		2166
2143	case Button2:	2167	case Button2:
2144	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?	2168	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2145	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);	2169	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2146	break;	2170	break;
2147		2171
2148	#ifdef MOUSE_WHEEL	2172	#ifdef MOUSE_WHEEL
2149	case Button4:	2173	case Button4:
2150	case Button5:	2174	case Button5:
…		…
2192	wchar_t ch = NOCHAR;	2216	wchar_t ch = NOCHAR;
2193	char *seq_begin; // remember start of esc-sequence here	2217	char *seq_begin; // remember start of esc-sequence here
2194		2218
2195	for (;;)	2219	for (;;)
2196	{	2220	{
2197	if (expect_false (ch == NOCHAR))	2221	if (ecb_unlikely (ch == NOCHAR))
2198	{	2222	{
2199	seq_begin = cmdbuf_ptr;	2223	seq_begin = cmdbuf_ptr;
2200	ch = next_char ();	2224	ch = next_char ();
2201		2225
2202	if (ch == NOCHAR)	2226	if (ch == NOCHAR)
2203	break;	2227	break;
2204	}	2228	}
2205		2229
2206	if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))	2230	if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2207	{	2231	{
2208	if (expect_false (!seen_input))	2232	if (ecb_unlikely (!seen_input))
2209	{	2233	{
2210	seen_input = 1;	2234	seen_input = 1;
2211	// many badly-written programs (e.g. jed) contain a race condition:	2235	// many badly-written programs (e.g. jed) contain a race condition:
2212	// they first read the screensize and then install a SIGWINCH handler.	2236	// they first read the screensize and then install a SIGWINCH handler.
2213	// some window managers resize the window early, and these programs	2237	// some window managers resize the window early, and these programs
…		…
2226	wchar_t *str = buf;	2250	wchar_t *str = buf;
2227	wchar_t *eol = str + min (ncol, UBUFSIZ);	2251	wchar_t *eol = str + min (ncol, UBUFSIZ);
2228		2252
2229	for (;;)	2253	for (;;)
2230	{	2254	{
2231	if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))	2255	if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2232	break;	2256	break;
2233		2257
2234	*str++ = ch;	2258	*str++ = ch;
2235		2259
2236	if (expect_false (ch == C0_LF || str >= eol))	2260	if (ecb_unlikely (ch == C0_LF || str >= eol))
2237	{	2261	{
2238	if (ch == C0_LF)	2262	if (ch == C0_LF)
2239	nlines++;	2263	nlines++;
2240		2264
2241	refresh_count++;	2265	refresh_count++;
…		…
2319	rxvt_term::next_char () NOTHROW	2343	rxvt_term::next_char () NOTHROW
2320	{	2344	{
2321	while (cmdbuf_ptr < cmdbuf_endp)	2345	while (cmdbuf_ptr < cmdbuf_endp)
2322	{	2346	{
2323	// assume 7-bit to be ascii ALWAYS	2347	// assume 7-bit to be ascii ALWAYS
2324	if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))	2348	if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2325	return *cmdbuf_ptr++;	2349	return *cmdbuf_ptr++;
2326		2350
2327	wchar_t wc;	2351	wchar_t wc;
2328	size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);	2352	size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2329		2353
…		…
2334	break;	2358	break;
2335	}	2359	}
2336		2360
2337	if (len == (size_t)-1)	2361	if (len == (size_t)-1)
2338	{	2362	{
2339	mbrtowc (0, 0, 0, mbstate); // reset now undefined conversion state	2363	mbstate.reset (); // reset now undefined conversion state
2340	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through	2364	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2341	}	2365	}
2342		2366
2343	// assume wchar == unicode	2367	// assume wchar == unicode
2344	cmdbuf_ptr += len;	2368	cmdbuf_ptr += len;
…		…
2357	: NOCHAR;	2381	: NOCHAR;
2358	}	2382	}
2359		2383
2360	static class out_of_input out_of_input;	2384	static class out_of_input out_of_input;
2361		2385
2362	/* rxvt_cmd_getc () - Return next input character */
2363	/*
2364	* Return the next input character after first passing any keyboard input
2365	* to the command.
2366	*/
2367	wchar_t	2386	wchar_t
2368	rxvt_term::cmd_getc () THROW ((class out_of_input))	2387	rxvt_term::cmd_getc () THROW ((class out_of_input))
2369	{	2388	{
2370	wchar_t c = next_char ();	2389	wchar_t c = next_char ();
2371		2390
…		…
2464	pclose_printer (fd);	2483	pclose_printer (fd);
2465	}	2484	}
2466	#endif /* PRINTPIPE */	2485	#endif /* PRINTPIPE */
2467	/*}}} */	2486	/*}}} */
2468		2487
2469	/* *INDENT-OFF* */
2470	enum {	2488	enum {
2471	C1_40 = 0x40,	2489	C1_40 = 0x40,
2472	C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,	2490	C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2473	C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,	2491	C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2474	C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,	2492	C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2475	C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,	2493	C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2476	};	2494	};
2477	/* *INDENT-ON* */
2478		2495
2479	/*{{{ process non-printing single characters */	2496	/*{{{ process non-printing single characters */
2480	void	2497	void
2481	rxvt_term::process_nonprinting (unicode_t ch)	2498	rxvt_term::process_nonprinting (unicode_t ch)
2482	{	2499	{
…		…
2575	break;	2592	break;
2576	case 'Z': /* identify the terminal type */	2593	case 'Z': /* identify the terminal type */
2577	tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */	2594	tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2578	break;	2595	break;
2579	case '<': /* turn off VT52 mode */	2596	case '<': /* turn off VT52 mode */
2580	set_privmode (PrivMode_vt52, 0);	2597	priv_modes &= ~PrivMode_vt52;
2581	break;	2598	break;
2582	case 'F': /* use special graphics character set */	2599	case 'F': /* use special graphics character set */
2583	case 'G': /* use regular character set */	2600	case 'G': /* use regular character set */
2584	/* unimplemented */	2601	/* unimplemented */
2585	break;	2602	break;
…		…
2604	return;	2621	return;
2605	}	2622	}
2606		2623
2607	switch (ch)	2624	switch (ch)
2608	{	2625	{
2609	/* case 1: do_tek_mode (); break; */
2610	case '#':	2626	case '#':
2611	if (cmd_getc () == '8')	2627	if (cmd_getc () == '8')
2612	scr_E ();	2628	scr_E ();
2613	break;	2629	break;
2614	case '(':	2630	case '(':
…		…
2637	#if !ENABLE_MINIMAL	2653	#if !ENABLE_MINIMAL
2638	case '9':	2654	case '9':
2639	scr_forwardindex ();	2655	scr_forwardindex ();
2640	break;	2656	break;
2641	#endif	2657	#endif
		2658	// DECPAM/DECPNM
2642	case '=':	2659	case '=':
		2660	priv_modes |= PrivMode_aplKP;
		2661	break;
2643	case '>':	2662	case '>':
2644	set_privmode (PrivMode_aplKP, ch == '=');	2663	priv_modes &= ~PrivMode_aplKP;
2645	break;	2664	break;
2646		2665
2647	case C1_40:	2666	case C1_40:
2648	cmd_getc ();	2667	cmd_getc ();
2649	break;	2668	break;
…		…
2653		2672
2654	/* 8.3.87: NEXT LINE */	2673	/* 8.3.87: NEXT LINE */
2655	case C1_NEL: /* ESC E */	2674	case C1_NEL: /* ESC E */
2656	{	2675	{
2657	wchar_t nlcr[] = { C0_LF, C0_CR };	2676	wchar_t nlcr[] = { C0_LF, C0_CR };
2658	scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);	2677	scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2659	}	2678	}
2660	break;	2679	break;
2661		2680
2662	/* kidnapped escape sequence: Should be 8.3.48 */	2681	/* kidnapped escape sequence: Should be 8.3.48 */
2663	case C1_ESA: /* ESC G */	2682	case C1_ESA: /* ESC G */
2664	process_graphics ();	2683	// used by original rxvt for rob nations own graphics mode
		2684	if (cmd_getc () == 'Q')
		2685	tt_printf ("\033G0\012"); /* query graphics - no graphics */
2665	break;	2686	break;
2666		2687
2667	/* 8.3.63: CHARACTER TABULATION SET */	2688	/* 8.3.63: CHARACTER TABULATION SET */
2668	case C1_HTS: /* ESC H */	2689	case C1_HTS: /* ESC H */
2669	scr_set_tab (1);	2690	scr_set_tab (1);
…		…
2673	case C1_RI: /* ESC M */	2694	case C1_RI: /* ESC M */
2674	scr_index (DN);	2695	scr_index (DN);
2675	break;	2696	break;
2676		2697
2677	/* 8.3.142: SINGLE-SHIFT TWO */	2698	/* 8.3.142: SINGLE-SHIFT TWO */
2678	/*case C1_SS2: scr_single_shift (2); break; */	2699	/* case C1_SS2: break; */
2679		2700
2680	/* 8.3.143: SINGLE-SHIFT THREE */	2701	/* 8.3.143: SINGLE-SHIFT THREE */
2681	/*case C1_SS3: scr_single_shift (3); break; */	2702	/* case C1_SS3: break; */
2682		2703
2683	/* 8.3.27: DEVICE CONTROL STRING */	2704	/* 8.3.27: DEVICE CONTROL STRING */
2684	case C1_DCS: /* ESC P */	2705	case C1_DCS: /* ESC P */
2685	process_dcs_seq ();	2706	process_dcs_seq ();
2686	break;	2707	break;
…		…
2719	}	2740	}
2720	}	2741	}
2721	/*}}} */	2742	/*}}} */
2722		2743
2723	/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */	2744	/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2724	/* *INDENT-OFF* */
2725	enum {	2745	enum {
2726	CSI_ICH = 0x40,	2746	CSI_ICH = 0x40,
2727	CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,	2747	CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2728	CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,	2748	CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2729	CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,	2749	CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
…		…
2732	CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,	2752	CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2733	CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,	2753	CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2734	CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F	2754	CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2735	};	2755	};
2736		2756
2737	#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \	2757	#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2738	(((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \	2758	(((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2739	| ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))	2759	| ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2740	#define get_byte_array_bit(array, bit) \	2760	#define get_byte_array_bit(array, bit) \
2741	(!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7))))	2761	(!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2742		2762
2743	const unsigned char csi_defaults[] =	2763	static const unsigned char csi_defaults[] =
2744	{	2764	{
2745	make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */	2765	make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2746	make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */	2766	make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2747	make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */	2767	make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2748	make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */	2768	make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2749	make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */	2769	make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2750	make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */	2770	make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2751	make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */	2771	make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2752	make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */	2772	make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2753	};	2773	};
2754	/* *INDENT-ON* */
2755		2774
2756	void	2775	void
2757	rxvt_term::process_csi_seq ()	2776	rxvt_term::process_csi_seq ()
2758	{	2777	{
2759	unicode_t ch, priv, i;	2778	unicode_t ch, priv, i;
…		…
2837	{	2856	{
2838	/* DECSTR: soft terminal reset, used by our terminfo since 9.06 */	2857	/* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2839	scr_soft_reset ();	2858	scr_soft_reset ();
2840		2859
2841	static const int pm_h[] = { 7, 25 };	2860	static const int pm_h[] = { 7, 25 };
2842	static const int pm_l[] = { 1, 3, 4, 5, 6, 7, 9, 66, 1000, 1001, 1049 };	2861	static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2843		2862
2844	process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h);	2863	process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2845	process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l);	2864	process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2846	}	2865	}
2847	break;	2866	break;
2848	}	2867	}
2849		2868
2850	return;	2869	return;
…		…
2868	}	2887	}
2869	break;	2888	break;
2870	#endif	2889	#endif
2871		2890
2872	case CSI_CUU: /* 8.3.22: (1) CURSOR UP */	2891	case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2873	case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */	2892	case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2874	arg[0] = -arg[0];	2893	arg[0] = -arg[0];
2875	/* FALLTHROUGH */	2894	/* FALLTHROUGH */
2876	case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */	2895	case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2877	case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */	2896	case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2878	scr_gotorc (arg[0], 0, RELATIVE);	2897	scr_gotorc (arg[0], 0, RELATIVE);
2879	break;	2898	break;
2880		2899
2881	case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */	2900	case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2882	case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */	2901	case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
…		…
3069	}	3088	}
3070	}	3089	}
3071	/*}}} */	3090	/*}}} */
3072		3091
3073	#if !ENABLE_MINIMAL	3092	#if !ENABLE_MINIMAL
3074	/* ARGSUSED */
3075	void	3093	void
3076	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3094	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3077	{	3095	{
3078	int x, y;	3096	int x, y;
3079	XWindowAttributes wattr;	3097	XWindowAttributes wattr;
…		…
3088	{	3106	{
3089	/*	3107	/*
3090	* commands	3108	* commands
3091	*/	3109	*/
3092	case 1: /* deiconify window */	3110	case 1: /* deiconify window */
3093	XMapWindow (dpy, parent[0]);	3111	XMapWindow (dpy, parent);
3094	break;	3112	break;
3095	case 2: /* iconify window */	3113	case 2: /* iconify window */
3096	XIconifyWindow (dpy, parent[0], display->screen);	3114	XIconifyWindow (dpy, parent, display->screen);
3097	break;	3115	break;
3098	case 3: /* set position (pixels) */	3116	case 3: /* set position (pixels) */
3099	XMoveWindow (dpy, parent[0], args[1], args[2]);	3117	XMoveWindow (dpy, parent, args[1], args[2]);
3100	break;	3118	break;
3101	case 4: /* set size (pixels) */	3119	case 4: /* set size (pixels) */
3102	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3120	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3103	break;	3121	break;
3104	case 5: /* raise window */	3122	case 5: /* raise window */
3105	XRaiseWindow (dpy, parent[0]);	3123	XRaiseWindow (dpy, parent);
3106	break;	3124	break;
3107	case 6: /* lower window */	3125	case 6: /* lower window */
3108	XLowerWindow (dpy, parent[0]);	3126	XLowerWindow (dpy, parent);
3109	break;	3127	break;
3110	case 7: /* refresh window */	3128	case 7: /* refresh window */
3111	scr_touch (true);	3129	scr_touch (true);
3112	break;	3130	break;
3113	case 8: /* set size (chars) */	3131	case 8: /* set size (chars) */
…		…
3124		3142
3125	/*	3143	/*
3126	* reports - some output format copied from XTerm	3144	* reports - some output format copied from XTerm
3127	*/	3145	*/
3128	case 11: /* report window state */	3146	case 11: /* report window state */
3129	XGetWindowAttributes (dpy, parent[0], &wattr);	3147	XGetWindowAttributes (dpy, parent, &wattr);
3130	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3148	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3131	break;	3149	break;
3132	case 13: /* report window position */	3150	case 13: /* report window position */
3133	XGetWindowAttributes (dpy, parent[0], &wattr);	3151	XGetWindowAttributes (dpy, parent, &wattr);
3134	XTranslateCoordinates (dpy, parent[0], wattr.root,	3152	XTranslateCoordinates (dpy, parent, wattr.root,
3135	-wattr.border_width, -wattr.border_width,	3153	-wattr.border_width, -wattr.border_width,
3136	&x, &y, &wdummy);	3154	&x, &y, &wdummy);
3137	tt_printf ("\033[3;%d;%dt", x, y);	3155	tt_printf ("\033[3;%d;%dt", x, y);
3138	break;	3156	break;
3139	case 14: /* report window size (pixels) */	3157	case 14: /* report window size (pixels) */
3140	XGetWindowAttributes (dpy, parent[0], &wattr);	3158	XGetWindowAttributes (dpy, parent, &wattr);
3141	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3159	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3142	break;	3160	break;
3143	case 18: /* report text area size (chars) */	3161	case 18: /* report text area size (chars) */
3144	tt_printf ("\033[8;%d;%dt", nrow, ncol);	3162	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3145	break;	3163	break;
…		…
3147	tt_printf ("\033[9;%d;%dt", nrow, ncol);	3165	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3148	break;	3166	break;
3149	case 20: /* report icon label */	3167	case 20: /* report icon label */
3150	{	3168	{
3151	char *s;	3169	char *s;
3152	XGetIconName (dpy, parent[0], &s);	3170	XGetIconName (dpy, parent, &s);
3153	tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */	3171	tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3154	XFree (s);	3172	XFree (s);
3155	}	3173	}
3156	break;	3174	break;
3157	case 21: /* report window title */	3175	case 21: /* report window title */
3158	{	3176	{
3159	char *s;	3177	char *s;
3160	XFetchName (dpy, parent[0], &s);	3178	XFetchName (dpy, parent, &s);
3161	tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */	3179	tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3162	XFree (s);	3180	XFree (s);
3163	}	3181	}
3164	break;	3182	break;
3165	}	3183	}
…		…
3221	* process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'	3239	* process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3222	*/	3240	*/
3223	void	3241	void
3224	rxvt_term::process_dcs_seq ()	3242	rxvt_term::process_dcs_seq ()
3225	{	3243	{
3226	char *s;
3227	unicode_t eh;
3228
3229	/*	3244	/*
3230	* Not handled yet	3245	* Not handled yet
3231	*/	3246	*/
		3247
		3248	unicode_t eh;
3232	s = get_to_st (eh);	3249	char *s = get_to_st (eh);
3233	if (s)	3250	if (s)
3234	free (s);	3251	free (s);
3235		3252
3236	return;	3253	return;
3237	}	3254	}
…		…
3241	* process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'	3258	* process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3242	*/	3259	*/
3243	void	3260	void
3244	rxvt_term::process_osc_seq ()	3261	rxvt_term::process_osc_seq ()
3245	{	3262	{
3246	unicode_t ch, eh;
3247	int arg;	3263	int arg;
3248		3264
3249	ch = cmd_getc ();	3265	unicode_t ch = cmd_getc ();
3250	for (arg = 0; isdigit (ch); ch = cmd_getc ())	3266	for (arg = 0; isdigit (ch); ch = cmd_getc ())
3251	arg = arg * 10 + (ch - '0');	3267	arg = arg * 10 + (ch - '0');
3252		3268
3253	if (ch == ';')	3269	if (ch == ';')
3254	{	3270	{
		3271	unicode_t eh;
3255	char *s = get_to_st (eh);	3272	char *s = get_to_st (eh);
3256		3273
3257	if (s)	3274	if (s)
3258	{	3275	{
3259	process_xterm_seq (arg, s, eh);	3276	process_xterm_seq (arg, s, eh);
…		…
3283		3300
3284	/*	3301	/*
3285	* XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)	3302	* XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3286	*/	3303	*/
3287	void	3304	void
3288	rxvt_term::process_xterm_seq (int op, const char *str, char resp)	3305	rxvt_term::process_xterm_seq (int op, char *str, char resp)
3289	{	3306	{
3290	int color;	3307	int color;
3291	char *buf, *name;	3308	char *buf, *name;
3292	bool query = str[0] == '?' && !str[1];	3309	bool query = str[0] == '?' && !str[1];
3293	int saveop = op;	3310	int saveop = op;
…		…
3320	unsigned long bytes_after;	3337	unsigned long bytes_after;
3321	unsigned char *value = 0;	3338	unsigned char *value = 0;
3322	const char *str = "";	3339	const char *str = "";
3323		3340
3324	if (prop	3341	if (prop
3325	&& XGetWindowProperty (dpy, parent[0],	3342	&& XGetWindowProperty (dpy, parent,
3326	prop, 0, 1<<16, 0, AnyPropertyType,	3343	prop, 0, 1<<16, 0, AnyPropertyType,
3327	&actual_type, &actual_format,	3344	&actual_type, &actual_format,
3328	&nitems, &bytes_after, &value) == Success	3345	&nitems, &bytes_after, &value) == Success
3329	&& actual_type != None	3346	&& actual_type != None
3330	&& actual_format == 8)	3347	&& actual_format == 8)
…		…
3334		3351
3335	XFree (value);	3352	XFree (value);
3336	}	3353	}
3337	else	3354	else
3338	{	3355	{
3339	char *eq = strchr (str, '='); // constness lost, but verified to be ok	3356	char *eq = strchr (str, '=');
3340		3357
3341	if (eq)	3358	if (eq)
3342	{	3359	{
3343	*eq = 0;	3360	*eq = 0;
3344	set_utf8_property (display->atom (str), eq + 1);	3361	set_utf8_property (display->atom (str), eq + 1);
3345	}	3362	}
3346	else	3363	else
3347	XDeleteProperty (dpy, parent[0],	3364	XDeleteProperty (dpy, parent,
3348	display->atom (str));	3365	display->atom (str));
3349	}	3366	}
3350	break;	3367	break;
3351		3368
3352	case XTerm_Color:	3369	case XTerm_Color:
…		…
3384	process_color_seq (op, Color_pointer_fg, str, resp);	3401	process_color_seq (op, Color_pointer_fg, str, resp);
3385	break;	3402	break;
3386	case XTerm_Color_pointer_bg:	3403	case XTerm_Color_pointer_bg:
3387	process_color_seq (op, Color_pointer_bg, str, resp);	3404	process_color_seq (op, Color_pointer_bg, str, resp);
3388	break;	3405	break;
		3406	#ifdef OPTION_HC
		3407	case XTerm_Color_HC:
		3408	process_color_seq (op, Color_HC, str, resp);
		3409	break;
		3410	case XTerm_Color_HTC:
		3411	process_color_seq (op, Color_HTC, str, resp);
		3412	break;
		3413	#endif
3389	#ifndef NO_BOLD_UNDERLINE_REVERSE	3414	#ifndef NO_BOLD_UNDERLINE_REVERSE
3390	case XTerm_Color_RV:
3391	process_color_seq (op, Color_RV, str, resp);
3392	break;
3393	case Rxvt_Color_BD:
3394	case URxvt_Color_BD:	3415	case URxvt_Color_BD:
3395	process_color_seq (op, Color_BD, str, resp);	3416	process_color_seq (op, Color_BD, str, resp);
3396	break;	3417	break;
3397	case Rxvt_Color_UL:
3398	case URxvt_Color_UL:	3418	case URxvt_Color_UL:
3399	process_color_seq (op, Color_UL, str, resp);	3419	process_color_seq (op, Color_UL, str, resp);
3400	break;	3420	break;
3401	case URxvt_Color_IT:	3421	case URxvt_Color_IT:
3402	process_color_seq (op, Color_IT, str, resp);	3422	process_color_seq (op, Color_IT, str, resp);
3403	break;	3423	break;
3404	#endif	3424	#endif
		3425	case URxvt_Color_border:
		3426	process_color_seq (op, Color_border, str, resp);
		3427	break;
3405	#if ENABLE_TRANSPARENCY	3428	#if ENABLE_TRANSPARENCY
3406	case URxvt_Color_tint:	3429	case URxvt_Color_tint:
3407	process_color_seq (op, Color_tint, str, resp);	3430	process_color_seq (op, Color_tint, str, resp);
3408	{	3431	{
3409	bool changed = false;	3432	bool changed = false;
3410		3433
3411	if (ISSET_PIXCOLOR (Color_tint))	3434	if (ISSET_PIXCOLOR (Color_tint))
3412	changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);	3435	changed = bg_set_tint (pix_colors_focused [Color_tint]);
3413	else
3414	changed = bgPixmap.unset_tint ();
3415		3436
3416	if (changed)	3437	if (changed)
3417	update_background ();	3438	update_background ();
3418	}	3439	}
3419		3440
…		…
3424	case Rxvt_Pixmap:	3445	case Rxvt_Pixmap:
3425	if (!strcmp (str, "?"))	3446	if (!strcmp (str, "?"))
3426	{	3447	{
3427	char str[256];	3448	char str[256];
3428		3449
3429	sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */	3450	sprintf (str, "[%dx%d+%d+%d]",
3430	min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),	3451	min (h_scale, 32767), min (v_scale, 32767),
3431	min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));	3452	min (h_align, 32767), min (v_align, 32767));
3432	process_xterm_seq (XTerm_title, str, CHAR_ST);	3453	process_xterm_seq (XTerm_title, str, CHAR_ST);
3433	}	3454	}
3434	else	3455	else
3435	{	3456	{
3436	int changed = 0;	3457	bool changed = false;
3437		3458
3438	if (*str != ';')	3459	if (*str != ';')
3439	{	3460	{
3440	/* reset to default scaling :*/
3441	bgPixmap.unset_geometry ();
3442	if (bgPixmap.set_file (str)) /* change pixmap */	3461	if (bg_set_file (str)) /* change pixmap */
3443	changed++;	3462	changed = true;
3444	str = strchr (str, ';');
3445	if (str == NULL)
3446	bgPixmap.set_defaultGeometry ();
3447	}	3463	}
3448		3464	else
3449	while (str)
3450	{	3465	{
3451	str++;	3466	str++;
3452	if (bgPixmap.set_geometry (str))	3467	if (bg_set_geometry (str, true))
3453	changed++;	3468	changed = true;
3454	str = strchr (str, ';');
3455	}	3469	}
3456		3470
3457	if (changed)	3471	if (changed)
		3472	{
		3473	if (bg_window_position_sensitive ())
		3474	{
		3475	int x, y;
		3476	get_window_origin (x, y);
		3477	bg_set_position (x, y);
		3478	}
3458	update_background ();	3479	update_background ();
		3480	}
3459	}	3481	}
3460	break;	3482	break;
3461	#endif	3483	#endif
3462		3484
3463	case XTerm_logfile:	3485	case XTerm_logfile:
…		…
3566	{	3588	{
3567	if (mode == 'r')	3589	if (mode == 'r')
3568	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */	3590	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3569	else	3591	else
3570	state = (mode == 't') ? ! (priv_modes & bit) : mode;	3592	state = (mode == 't') ? ! (priv_modes & bit) : mode;
3571	set_privmode (bit, state);	3593
		3594	if (state)
		3595	priv_modes |= bit;
		3596	else
		3597	priv_modes &= ~bit;
3572	}	3598	}
3573		3599
3574	return state;	3600	return state;
3575	}	3601	}
3576		3602
3577	/* we're not using priv _yet_ */	3603	/* we're not using priv _yet_ */
3578	void	3604	void
3579	rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)	3605	rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3580	{	3606	{
3581	unsigned int i, j;	3607	unsigned int i, j;
3582	int state;	3608	int state;
3583		3609
3584	static const struct	3610	static const struct
3585	{	3611	{
3586	const int argval;	3612	const int argval;
3587	const unsigned long bit;	3613	const unsigned long bit;
3588	} argtopriv[] = {	3614	} argtopriv[] = {
3589	{ 1, PrivMode_aplCUR },	3615	{ 1, PrivMode_aplCUR }, // DECCKM
3590	{ 2, PrivMode_vt52 },	3616	{ 2, PrivMode_vt52 }, // DECANM
3591	{ 3, PrivMode_132 },	3617	{ 3, PrivMode_132 }, // DECCOLM
3592	{ 4, PrivMode_smoothScroll },	3618	{ 4, PrivMode_smoothScroll }, // DECSCLM
3593	{ 5, PrivMode_rVideo },	3619	{ 5, PrivMode_rVideo }, // DECSCNM
3594	{ 6, PrivMode_relOrigin },	3620	{ 6, PrivMode_relOrigin }, // DECOM
3595	{ 7, PrivMode_Autowrap },	3621	{ 7, PrivMode_Autowrap }, // DECAWM
3596	// 8, bi-directional support mode	3622	// 8, auto-repeat keys // DECARM
3597	{ 9, PrivMode_MouseX10 },	3623	{ 9, PrivMode_MouseX10 },
3598	// 18, 19 printing-related	3624	// 18 end FF to printer after print screen
		3625	// 19 Print screen prints full screen/scroll region
3599	{ 25, PrivMode_VisibleCursor },	3626	{ 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3600	#ifdef scrollBar_esc	3627	#ifdef scrollBar_esc
3601	{ scrollBar_esc, PrivMode_scrollBar },	3628	{ scrollBar_esc, PrivMode_scrollBar },
3602	#endif	3629	#endif
3603	{ 35, PrivMode_ShiftKeys }, // rxvt extension	3630	{ 35, PrivMode_ShiftKeys }, // rxvt extension
		3631	// 38, tektronix mode // DECTEK
3604	{ 40, PrivMode_132OK },	3632	{ 40, PrivMode_132OK },
3605	// 41 xterm more fixes NYI	3633	// 41 xterm more fixes NYI
3606	// 45 margin bell NYI	3634	// 45 margin bell NYI
3607	// 46 start logging	3635	// 46 start logging
3608	{ 47, PrivMode_Screen },	3636	{ 47, PrivMode_Screen },
3609	{ 66, PrivMode_aplKP },	3637	{ 66, PrivMode_aplKP }, // DECNKM
3610	#ifndef NO_BACKSPACE_KEY	3638	#ifndef NO_BACKSPACE_KEY
3611	{ 67, PrivMode_BackSpace },	3639	{ 67, PrivMode_BackSpace }, // DECBKM
3612	#endif	3640	#endif
3613	{ 1000, PrivMode_MouseX11 },	3641	{ 1000, PrivMode_MouseX11 },
3614	{ 1002, PrivMode_MouseBtnEvent },	3642	{ 1002, PrivMode_MouseBtnEvent },
3615	{ 1003, PrivMode_MouseAnyEvent },	3643	{ 1003, PrivMode_MouseAnyEvent },
		3644	#if ENABLE_FRILLS
		3645	{ 1005, PrivMode_ExtModeMouse },
		3646	#endif
3616	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension	3647	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension
3617	{ 1011, PrivMode_Keypress }, // rxvt extension	3648	{ 1011, PrivMode_Keypress }, // rxvt extension
		3649	#if ENABLE_FRILLS
		3650	{ 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
		3651	#endif
3618	// 1035 enable modifiers for alt, numlock NYI	3652	// 1035 enable modifiers for alt, numlock NYI
3619	// 1036 send ESC for meta keys NYI	3653	// 1036 send ESC for meta keys NYI
3620	// 1037 send DEL for keypad delete NYI	3654	// 1037 send DEL for keypad delete NYI
3621	{ 1047, PrivMode_Screen },	3655	{ 1047, PrivMode_Screen },
3622	// 1048 save and restore cursor	3656	// 1048 save and restore cursor, implemented in code
3623	{ 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */	3657	{ 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3624	// 1051, 1052, 1060, 1061 keyboard emulation NYI	3658	// 1051, 1052, 1060, 1061 keyboard emulation NYI
3625	{ 2004, PrivMode_BracketPaste },	3659	{ 2004, PrivMode_BracketPaste },
3626	};	3660	};
3627		3661
…		…
3637	for (i = 0; i < nargs; i++)	3671	for (i = 0; i < nargs; i++)
3638	{	3672	{
3639	state = -1;	3673	state = -1;
3640		3674
3641	/* basic handling */	3675	/* basic handling */
3642	for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++)	3676	for (j = 0; j < ecb_array_length (argtopriv); j++)
3643	if (argtopriv[j].argval == arg[i])	3677	if (argtopriv[j].argval == arg[i])
3644	{	3678	{
3645	state = privcases (mode, argtopriv[j].bit);	3679	state = privcases (mode, argtopriv[j].bit);
3646	break;	3680	break;
3647	}	3681	}
…		…
3655		3689
3656	scr_touch (true);	3690	scr_touch (true);
3657	break;	3691	break;
3658	#endif	3692	#endif
3659	case 1048: /* alternative cursor save */	3693	case 1048: /* alternative cursor save */
3660	case 1049:
3661	if (option (Opt_secondaryScreen))	3694	if (option (Opt_secondaryScreen))
3662	if (mode == 0)	3695	if (mode == 0)
3663	scr_cursor (RESTORE);	3696	scr_cursor (RESTORE);
3664	else if (mode == 1)	3697	else if (mode == 1)
3665	scr_cursor (SAVE);	3698	scr_cursor (SAVE);
…		…
3674	case 2: /* VT52 mode */	3707	case 2: /* VT52 mode */
3675	/* oddball mode. should be set regardless of set/reset	3708	/* oddball mode. should be set regardless of set/reset
3676	* parameter. Return from VT52 mode with an ESC < from	3709	* parameter. Return from VT52 mode with an ESC < from
3677	* within VT52 mode	3710	* within VT52 mode
3678	*/	3711	*/
3679	set_privmode (PrivMode_vt52, 1);	3712	priv_modes |= PrivMode_vt52;
3680	break;	3713	break;
3681	case 3: /* 80/132 */	3714	case 3: /* 80/132 */
3682	if (priv_modes & PrivMode_132OK)	3715	if (priv_modes & PrivMode_132OK)
3683	{
3684	scr_poweron ();
3685	set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);	3716	set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3686	}
3687	break;	3717	break;
3688	case 4: /* smooth scrolling */	3718	case 4: /* smooth scrolling */
3689	set_option (Opt_jumpScroll, !state);	3719	set_option (Opt_jumpScroll, !state);
3690	break;	3720	break;
3691	case 5: /* reverse video */	3721	case 5: /* reverse video */
…		…
3702	if (state) /* orthogonal */	3732	if (state) /* orthogonal */
3703	priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);	3733	priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3704	break;	3734	break;
3705	#ifdef scrollBar_esc	3735	#ifdef scrollBar_esc
3706	case scrollBar_esc:	3736	case scrollBar_esc:
3707	if (scrollBar.map (state))	3737	scrollBar.map (state);
3708	{
3709	resize_all_windows (0, 0, 0);	3738	resize_all_windows (0, 0, 0);
3710	scr_touch (true);	3739	scr_touch (true);
3711	}
3712	break;	3740	break;
3713	#endif	3741	#endif
3714	case 25: /* visible/invisible cursor */	3742	case 25: /* visible/invisible cursor */
3715	scr_cursor_visible (state);	3743	scr_cursor_visible (state);
3716	break;	3744	break;
…		…
3729	case 1003:	3757	case 1003:
3730	if (state)	3758	if (state)
3731	{	3759	{
3732	priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);	3760	priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3733	priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;	3761	priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
		3762	mouse_row = mouse_col = 0;
3734	vt_emask_mouse = PointerMotionMask;	3763	vt_emask_mouse = PointerMotionMask;
3735	}	3764	}
3736	else	3765	else
3737	vt_emask_mouse = NoEventMask;	3766	vt_emask_mouse = NoEventMask;
		3767
3738	vt_select_input ();	3768	vt_select_input ();
3739	break;	3769	break;
3740	case 1010: /* scroll to bottom on TTY output inhibit */	3770	case 1010: /* scroll to bottom on TTY output inhibit */
3741	set_option (Opt_scrollTtyOutput, !state);	3771	set_option (Opt_scrollTtyOutput, !state);
3742	break;	3772	break;
3743	case 1011: /* scroll to bottom on key press */	3773	case 1011: /* scroll to bottom on key press */
3744	set_option (Opt_scrollTtyKeypress, state);	3774	set_option (Opt_scrollTtyKeypress, state);
3745	break;	3775	break;
3746	case 1047: /* secondary screen w/ clearing last */	3776	case 1047: /* secondary screen w/ clearing last */
3747	if (option (Opt_secondaryScreen))	3777	if (option (Opt_secondaryScreen))
3748	if (current_screen != PRIMARY)	3778	if (!state)
3749	scr_erase_screen (2);	3779	scr_erase_screen (2);
		3780
3750	scr_change_screen (state);	3781	scr_change_screen (state);
3751	break;	3782	break;
3752	case 1049: /* secondary screen w/ clearing first */	3783	case 1049: /* secondary screen w/ clearing first */
		3784	if (option (Opt_secondaryScreen))
		3785	if (state)
		3786	scr_cursor (SAVE);
		3787
3753	scr_change_screen (state);	3788	scr_change_screen (state);
		3789
3754	if (option (Opt_secondaryScreen))	3790	if (option (Opt_secondaryScreen))
3755	if (current_screen != PRIMARY)	3791	if (state)
3756	scr_erase_screen (2);	3792	scr_erase_screen (2);
		3793	else
		3794	scr_cursor (RESTORE);
3757	break;	3795	break;
3758	default:	3796	default:
3759	break;	3797	break;
3760	}	3798	}
3761	}	3799	}
…		…
3914	}	3952	}
3915	}	3953	}
3916	}	3954	}
3917	/*}}} */	3955	/*}}} */
3918		3956
3919	/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3920	void
3921	rxvt_term::process_graphics ()
3922	{
3923	unicode_t ch, cmd = cmd_getc ();
3924
3925	if (cmd == 'Q')
3926	{
3927	/* query graphics */
3928	tt_printf ("\033G0\012"); /* no graphics */
3929	return;
3930	}
3931	/* swallow other graphics sequences until terminating ':' */
3932	do
3933	ch = cmd_getc ();
3934	while (ch != ':');
3935	}
3936	/*}}} */
3937
3938	/* ------------------------------------------------------------------------- */	3957	/* ------------------------------------------------------------------------- */
3939		3958
3940	/*	3959	/*
3941	* Send printf () formatted output to the command.	3960	* Send printf () formatted output to the command.
3942	* Only use for small amounts of data.	3961	* Only use for small amounts of data.
…		…
3955		3974
3956	/* ---------------------------------------------------------------------- */	3975	/* ---------------------------------------------------------------------- */
3957	/* Write data to the pty as typed by the user, pasted with the mouse,	3976	/* Write data to the pty as typed by the user, pasted with the mouse,
3958	* or generated by us in response to a query ESC sequence.	3977	* or generated by us in response to a query ESC sequence.
3959	*/	3978	*/
3960	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT	3979	static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3961		3980
3962	void	3981	void
3963	rxvt_term::tt_write (const char *data, unsigned int len)	3982	rxvt_term::tt_write (const char *data, unsigned int len)
3964	{	3983	{
3965	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))	3984	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
…		…
3970		3989
3971	if (v_buflen == 0)	3990	if (v_buflen == 0)
3972	{	3991	{
3973	ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));	3992	ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3974		3993
		3994	max_it (written, 0);
		3995
3975	if ((unsigned int)written == len)	3996	if (written == len)
3976	return;	3997	return;
3977		3998
3978	data += written;	3999	data += written;
3979	len -= written;	4000	len -= written;
3980	}	4001	}
3981		4002
3982	v_buffer = (char *)realloc (v_buffer, v_buflen + len);	4003	v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3983		4004
3984	memcpy (v_buffer + v_buflen, data, len);	4005	memcpy (v_buffer + v_buflen, data, len);
3985	v_buflen += len;	4006	v_buflen += len;
3986		4007
3987	pty_ev.set (ev::READ | ev::WRITE);	4008	pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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