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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.485 by sf-exg, Fri Apr 29 13:08:24 2011 UTC vs.
Revision 1.537 by sf-exg, Thu Mar 28 11:30:39 2013 UTC

…		…
4	*	4	*
5	* All portions of code are copyright by their respective author/s.	5	* All portions of code are copyright by their respective author/s.
6	* Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>	6	* Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7	* - original version	7	* - original version
8	* Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>	8	* Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
9	* - extensive modifications	9	* - extensive modifications
10	* Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com>	10	* Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com>
11	* - vt100 printing	11	* - vt100 printing
12	* Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu>	12	* Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu>
13	* - X11 mouse report mode and support for	13	* - X11 mouse report mode and support for
14	* DEC "private mode" save/restore functions.	14	* DEC "private mode" save/restore functions.
…		…
20	* Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es>	20	* Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es>
21	* - modification and cleanups for Solaris 2.x	21	* - modification and cleanups for Solaris 2.x
22	* and Linux 1.2.x	22	* and Linux 1.2.x
23	* Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>	23	* Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
24	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>	24	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
25	* - extensive modifications	25	* - extensive modifications
26	* Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>	26	* Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27	* Copyright (c) 2001 Marius Gedminas	27	* Copyright (c) 2001 Marius Gedminas
28	* - Ctrl/Mod4+Tab works like Meta+Tab (options)	28	* - Ctrl/Mod4+Tab works like Meta+Tab (options)
29	* Copyright (c) 2003 Rob McMullen <robm@flipturn.org>	29	* Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30	* Copyright (c) 2003-2011 Marc Lehmann <schmorp@schmorp.de>	30	* Copyright (c) 2003-2011 Marc Lehmann <schmorp@schmorp.de>
…		…
54		54
55	#ifdef KEYSYM_RESOURCE	55	#ifdef KEYSYM_RESOURCE
56	# include "keyboard.h"	56	# include "keyboard.h"
57	#endif	57	#endif
58		58
59	#include <csignal>	59	#include <signal.h>
60		60
61	#if LINUX_YIELD_HACK	61	#if LINUX_YIELD_HACK
62	# include <ctime>	62	# include <time.h>
63	#endif	63	#endif
64		64
65	/----------------------------------------------------------------------/	65	/----------------------------------------------------------------------/
66		66
67	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)	67	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
…		…
131	XK_KP_Space, 0x2422,	131	XK_KP_Space, 0x2422,
132	#endif	132	#endif
133	0,	133	0,
134	};	134	};
135		135
136	void	136	void ecb_cold
137	rxvt_term::iso14755_54 (int x, int y)	137	rxvt_term::iso14755_54 (int x, int y)
138	{	138	{
139	x = Pixel2Col (x);	139	x = Pixel2Col (x);
140	y = Pixel2Row (y);	140	y = Pixel2Row (y);
141		141
…		…
149		149
150	text_t t = l.t[x];	150	text_t t = l.t[x];
151		151
152	if (t != NOCHAR \|\| !x)	152	if (t != NOCHAR \|\| !x)
153	{	153	{
154	iso14755_51 (l.t[x], l.r[x], x, y);	154	iso14755_51 (l.t[x], l.r[x], x, y, view_start);
155	iso14755buf = ISO_14755_54;	155	iso14755buf = ISO_14755_54;
156	break;	156	break;
157	}	157	}
158		158
159	x--;	159	x--;
160	}	160	}
161	}	161	}
162		162
163	void	163	void ecb_cold
164	rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)	164	rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y, int y2)
165	{	165	{
166	rxvt_fontset *fs = FONTSET (r);	166	rxvt_fontset *fs = FONTSET (r);
167	wchar_t chr, alloc, ch2, **fname;	167	wchar_t chr, alloc, ch2, **fname;
168	int len;	168	int len;
169		169
…		…
181		181
182	alloc = 0;	182	alloc = 0;
183	chr = &ch2;	183	chr = &ch2;
184	len = 1;	184	len = 1;
185	}	185	}
		186
		187	char rowcol[40];
		188	snprintf (rowcol, sizeof rowcol, "col %d row %d @%d", x, y, y2);
186		189
187	char attr[80]; // plenty	190	char attr[80]; // plenty
188		191
189	sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",	192	sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
190	(int)r,	193	(int)r,
…		…
203	rxvt_font f = (fs)[fs->find_font_idx (chr[i])];	206	rxvt_font f = (fs)[fs->find_font_idx (chr[i])];
204	fname[i] = rxvt_utf8towcs (f->name);	207	fname[i] = rxvt_utf8towcs (f->name);
205	max_it (width, wcswidth (fname[i], wcslen (fname[i])));	208	max_it (width, wcswidth (fname[i], wcslen (fname[i])));
206	}	209	}
207		210
208	max_it (width, 8+5); // for char + hex
209	max_it (width, strlen (attr));	211	max_it (width, strlen (attr));
210		212
211	if (y >= 0)	213	if (y >= 0)
212	{	214	{
213	y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;	215	y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
214	x = 0;	216	x = 0;
215	}	217	}
216		218
217	scr_overlay_new (x, y, width, len * 2 + 1);	219	scr_overlay_new (x, y, width, len * 2 + 2);
		220
		221	scr_overlay_set (0, 0, rowcol);
218		222
219	r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));	223	r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
220		224
221	for (int y = 0; y < len; y++)	225	for (int y = 0; y < len; y++)
222	{	226	{
223	char buf[9];	227	char buf[9];
224		228
225	ch = *chr++;	229	ch = *chr++;
226		230
227	sprintf (buf, "%8x", ch);	231	sprintf (buf, "%8x", ch);
228	scr_overlay_set (0, y, buf);	232	scr_overlay_set (0, y + 1, buf);
229	scr_overlay_set (9, y, '=');	233	scr_overlay_set (9, y + 1, '=');
230	# if !UNICODE_3	234	# if !UNICODE_3
231	if (ch >= 0x10000)	235	if (ch >= 0x10000)
232	ch = 0xfffd;	236	ch = 0xfffd;
233	# endif	237	# endif
234	scr_overlay_set (11, y, ch, r);	238	scr_overlay_set (11, y + 1, ch, r);
235		239
236	if (WCWIDTH (ch) >= 2)	240	if (WCWIDTH (ch) >= 2)
237	scr_overlay_set (12, y, NOCHAR, r);	241	scr_overlay_set (12, y + 1, NOCHAR, r);
238	}	242	}
239		243
240	// {	244	// {
241	// char buf[4+4+3+1];	245	// char buf[4+4+3+1];
242	// snprintf (buf, sizeof (buf), "(%.4d\|%.4d)", x, y);	246	// snprintf (buf, sizeof (buf), "(%.4d\|%.4d)", x, y);
243	// scr_overlay_set (0, 0, buf);	247	// scr_overlay_set (0, 0, buf);
244	// }	248	// }
245	scr_overlay_set (0, len , attr);	249	scr_overlay_set (0, len + 1, attr);
246	for (int i = 0; i < len; i++)	250	for (int i = 0; i < len; i++)
247	{	251	{
248	scr_overlay_set (0, len + 1 + i, fname[i]);	252	scr_overlay_set (0, len + 2 + i, fname[i]);
249	free (fname[i]);	253	free (fname[i]);
250	}	254	}
251		255
252	# if ENABLE_COMBINING	256	# if ENABLE_COMBINING
253	if (alloc)	257	if (alloc)
254	delete [] alloc;	258	delete [] alloc;
255	# endif	259	# endif
256	}	260	}
257	#endif	261	#endif
258		262
259	void	263	void ecb_cold
260	rxvt_term::commit_iso14755 ()	264	rxvt_term::commit_iso14755 ()
261	{	265	{
262	wchar_t ch[2];
263
264	ch[0] = iso14755buf & ISO_14755_MASK;	266	wchar_t ch = iso14755buf & ISO_14755_MASK;
265	ch[1] = 0;
266		267
267	if (iso14755buf & ISO_14755_51)	268	if (iso14755buf & ISO_14755_51)
268	{	269	{
269	char mb[16];	270	char mb[MB_LEN_MAX];
270	int len;	271	int len;
271		272
272	// allow verbatim 0-bytes and control-bytes to be entered	273	// allow verbatim 0-bytes and control-bytes to be entered
273	if (ch[0] >= 0x20)	274	if (ch >= 0x20)
274	len = wcstombs (mb, ch, 16);	275	len = wctomb (mb, ch);
275	else	276	else
276	{	277	{
277	mb[0] = ch[0];	278	mb[0] = ch;
278	len = 1;	279	len = 1;
279	}	280	}
280		281
281	if (len > 0)	282	if (len > 0)
282	tt_write (mb, len);	283	tt_write (mb, len);
…		…
285	}	286	}
286		287
287	iso14755buf = 0;	288	iso14755buf = 0;
288	}	289	}
289		290
290	static int	291	static int ecb_cold
291	hex_keyval (XKeyEvent &ev)	292	hex_keyval (XKeyEvent &ev)
292	{	293	{
293	// check whether this event corresponds to a hex digit	294	// check whether this event corresponds to a hex digit
294	// if the modifiers had not been pressed.	295	// if the modifiers had not been pressed.
295	for (int index = 0; index < 8; index++)	296	for (int index = 0; index < 8; index++)
…		…
304		305
305	return -1;	306	return -1;
306	}	307	}
307	#endif	308	#endif
308		309
309	static inline KeySym	310	static inline KeySym ecb_cold
310	translate_keypad (KeySym keysym, bool kp)	311	translate_keypad (KeySym keysym, bool kp)
311	{	312	{
312	#ifdef XK_KP_Home	313	#ifdef XK_KP_Home
313	static const KeySym keypadtrans[] = {	314	static const KeySym keypadtrans[] = {
314	XK_KP_7, // XK_KP_Home	315	XK_KP_7, // XK_KP_Home
…		…
340	# endif	341	# endif
341	#endif	342	#endif
342	return keysym;	343	return keysym;
343	}	344	}
344		345
345	static inline int	346	static inline int ecb_cold
346	map_function_key (KeySym keysym)	347	map_function_key (KeySym keysym)
347	{	348	{
348	int param = 0;	349	int param = 0;
349		350
350	if (IN_RANGE_INC (keysym, XK_F1, XK_F35))	351	if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
…		…
399	break;	400	break;
400	}	401	}
401	return param;	402	return param;
402	}	403	}
403		404
404	void	405	void ecb_cold
405	rxvt_term::key_press (XKeyEvent &ev)	406	rxvt_term::key_press (XKeyEvent &ev)
406	{	407	{
407	int ctrl, meta, shft, len;	408	int ctrl, meta, shft, len;
408	KeySym keysym;	409	KeySym keysym;
409	int valid_keysym;	410	int valid_keysym;
…		…
424	ctrl = ev.state & ControlMask;	425	ctrl = ev.state & ControlMask;
425	meta = ev.state & ModMetaMask;	426	meta = ev.state & ModMetaMask;
426		427
427	kbuf[0] = 0;	428	kbuf[0] = 0;
428		429
429	#ifdef USE_XIM	430	#if USE_XIM
430	if (Input_Context)	431	if (Input_Context)
431	{	432	{
432	Status status_return;	433	Status status_return;
433		434
434	#if 0	435	#if 0
…		…
509	#endif	510	#endif
510	max_it (lnsppg, 1);	511	max_it (lnsppg, 1);
511		512
512	if (keysym == XK_Prior)	513	if (keysym == XK_Prior)
513	{	514	{
514	scr_page (UP, lnsppg);	515	scr_page (lnsppg);
515	return;	516	return;
516	}	517	}
517	else if (keysym == XK_Next)	518	else if (keysym == XK_Next)
518	{	519	{
519	scr_page (DN, lnsppg);	520	scr_page (-lnsppg);
520	return;	521	return;
521	}	522	}
522	}	523	}
523	#ifdef SCROLL_ON_UPDOWN_KEYS	524	#ifdef SCROLL_ON_UPDOWN_KEYS
524	if (IS_SCROLL_MOD)	525	if (IS_SCROLL_MOD)
525	{	526	{
526	if (keysym == XK_Up)	527	if (keysym == XK_Up)
527	{	528	{
528	scr_page (UP, 1);	529	scr_page (1);
529	return;	530	return;
530	}	531	}
531	else if (keysym == XK_Down)	532	else if (keysym == XK_Down)
532	{	533	{
533	scr_page (DN, 1);	534	scr_page (-1);
534	return;	535	return;
535	}	536	}
536	}	537	}
537	#endif	538	#endif
538	#ifdef SCROLL_ON_HOMEEND_KEYS	539	#ifdef SCROLL_ON_HOMEEND_KEYS
…		…
779	}	780	}
780		781
781	if (newlen)	782	if (newlen)
782	len = strlen (kbuf);	783	len = strlen (kbuf);
783		784
		785	if (len > 0)
		786	{
784	/*	787	/*
		788	* pass Shift/Control indicators for function keys ending with `~'
		789	*
		790	* eg,
		791	* Prior = "ESC[5~"
		792	* Shift+Prior = "ESC[5$"
		793	* Ctrl+Prior = "ESC[5^"
		794	* Ctrl+Shift+Prior = "ESC[5@"
		795	*/
		796	if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
		797	kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
		798
		799	/*
785	* Pass meta for all function keys, if 'meta' option set	800	* Pass meta for all function keys, if 'meta' option set
786	*/	801	*/
787	#ifdef META8_OPTION	802	#ifdef META8_OPTION
788	if (meta && (meta_char == 0x80) && len > 0)	803	if (meta && (meta_char == 0x80))
789	kbuf[len - 1] \|= 0x80;	804	kbuf[len - 1] \|= 0x80;
790	#endif	805	#endif
		806	}
791		807
792	}	808	}
793	else if (ctrl && keysym == XK_minus)	809	else if (ctrl && keysym == XK_minus)
794	{	810	{
795	len = 1;	811	len = 1;
…		…
829	{	845	{
830	view_start = 0;	846	view_start = 0;
831	want_refresh = 1;	847	want_refresh = 1;
832	}	848	}
833		849
834	/*
835	* these modifications only affect the static keybuffer
836	* pass Shift/Control indicators for function keys ending with `~'
837	*
838	* eg,
839	* Prior = "ESC[5~"
840	* Shift+Prior = "ESC[5$"
841	* Ctrl+Prior = "ESC[5^"
842	* Ctrl+Shift+Prior = "ESC[5@"
843	* Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
844	*/
845	if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
846	kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
847
848	/* escape prefix */	850	/* escape prefix */
849	if (meta	851	if (meta
850	#ifdef META8_OPTION	852	#ifdef META8_OPTION
851	&& meta_char == C0_ESC	853	&& meta_char == C0_ESC
852	#endif	854	#endif
…		…
857	}	859	}
858		860
859	tt_write (kbuf, (unsigned int)len);	861	tt_write (kbuf, (unsigned int)len);
860	}	862	}
861		863
862	void	864	void ecb_cold
863	rxvt_term::key_release (XKeyEvent &ev)	865	rxvt_term::key_release (XKeyEvent &ev)
864	{	866	{
865	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ISO_14755 \|\| ENABLE_PERL	867	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ISO_14755 \|\| ENABLE_PERL
866	KeySym keysym;	868	KeySym keysym;
867		869
…		…
939	void	941	void
940	rxvt_term::flush ()	942	rxvt_term::flush ()
941	{	943	{
942	flush_ev.stop ();	944	flush_ev.stop ();
943		945
944	#ifdef HAVE_BG_PIXMAP	946	#ifdef HAVE_IMG
945	if (bg_flags & BG_NEEDS_REFRESH)	947	if (bg_flags & BG_NEEDS_REFRESH)
946	{	948	{
947	bg_flags &= ~BG_NEEDS_REFRESH;	949	bg_flags &= ~BG_NEEDS_REFRESH;
948	scr_touch (false);	950	scr_touch (false);
949	}	951	}
…		…
989	while (row < end_row);	991	while (row < end_row);
990	}	992	}
991		993
992	scr_refresh ();	994	scr_refresh ();
993	scrollBar.show (1);	995	scrollBar.show (1);
994	#ifdef USE_XIM	996	#if USE_XIM
995	IMSendSpot ();	997	im_send_spot ();
996	#endif	998	#endif
997	}	999	}
998		1000
999	display->flush ();	1001	display->flush ();
1000	}	1002	}
…		…
1018	flush ();	1020	flush ();
1019	}	1021	}
1020		1022
1021	#ifdef CURSOR_BLINK	1023	#ifdef CURSOR_BLINK
1022	void	1024	void
		1025	rxvt_term::cursor_blink_reset ()
		1026	{
		1027	if (hidden_cursor)
		1028	{
		1029	hidden_cursor = 0;
		1030	want_refresh = 1;
		1031	}
		1032
		1033	if (option (Opt_cursorBlink))
		1034	cursor_blink_ev.again ();
		1035	else
		1036	cursor_blink_ev.stop ();
		1037	}
		1038
		1039	void
1023	rxvt_term::cursor_blink_cb (ev::timer &w, int revents)	1040	rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1024	{	1041	{
1025	hidden_cursor = !hidden_cursor;	1042	hidden_cursor = !hidden_cursor;
1026	want_refresh = 1;	1043	want_refresh = 1;
1027	refresh_check ();	1044	refresh_check ();
…		…
1045		1062
1046	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	1063	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1047	void	1064	void
1048	rxvt_term::cont_scroll_cb (ev::timer &w, int revents)	1065	rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1049	{	1066	{
1050	if ((scrollBar.state == STATE_UP \|\| scrollBar.state == STATE_DOWN)	1067	if ((scrollBar.state == SB_STATE_UP \|\| scrollBar.state == SB_STATE_DOWN)
1051	&& scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))	1068	&& scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1052	{	1069	{
1053	want_refresh = 1;	1070	want_refresh = 1;
1054	refresh_check ();	1071	refresh_check ();
1055	}	1072	}
1056	else	1073	else
…		…
1206	pty_write ();	1223	pty_write ();
1207		1224
1208	refresh_check ();	1225	refresh_check ();
1209	}	1226	}
1210		1227
1211	void	1228	void ecb_cold
1212	rxvt_term::pointer_unblank ()	1229	rxvt_term::pointer_unblank ()
1213	{	1230	{
1214	XDefineCursor (dpy, vt, TermWin_cursor);	1231	XDefineCursor (dpy, vt, TermWin_cursor);
1215	recolour_cursor ();	1232	recolour_cursor ();
1216		1233
…		…
1221	pointer_ev.start (pointerBlankDelay);	1238	pointer_ev.start (pointerBlankDelay);
1222	#endif	1239	#endif
1223	}	1240	}
1224		1241
1225	#ifdef POINTER_BLANK	1242	#ifdef POINTER_BLANK
1226	void	1243	void ecb_cold
1227	rxvt_term::pointer_blank ()	1244	rxvt_term::pointer_blank ()
1228	{	1245	{
1229	if (!option (Opt_pointerBlank))	1246	if (!option (Opt_pointerBlank))
1230	return;	1247	return;
1231		1248
…		…
1233	XFlush (dpy);	1250	XFlush (dpy);
1234		1251
1235	hidden_pointer = 1;	1252	hidden_pointer = 1;
1236	}	1253	}
1237		1254
1238	void	1255	void ecb_cold
1239	rxvt_term::pointer_cb (ev::timer &w, int revents)	1256	rxvt_term::pointer_cb (ev::timer &w, int revents)
1240	{	1257	{
1241	make_current ();	1258	make_current ();
1242		1259
1243	pointer_blank ();	1260	pointer_blank ();
…		…
1335	32 + x,	1352	32 + x,
1336	32 + y);	1353	32 + y);
1337	}	1354	}
1338		1355
1339	/{{{ process an X event /	1356	/{{{ process an X event /
1340	void	1357	void ecb_hot
1341	rxvt_term::x_cb (XEvent &ev)	1358	rxvt_term::x_cb (XEvent &ev)
1342	{	1359	{
1343	make_current ();	1360	make_current ();
1344		1361
1345	dLocal (Display *, dpy);	1362	dLocal (Display *, dpy);
…		…
1448	if (ev.xconfigure.window == parent)	1465	if (ev.xconfigure.window == parent)
1449	{	1466	{
1450	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))	1467	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1451	;	1468	;
1452		1469
		1470	bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
		1471
		1472	bool moved = false;
1453	#ifdef HAVE_BG_PIXMAP	1473	#ifdef HAVE_BG_PIXMAP
1454	bool moved = false;
1455	if (bg_window_position_sensitive ())	1474	if (bg_window_position_sensitive ())
1456	{	1475	{
		1476	want_position_change = true;
		1477	if (bg_img == 0)
		1478	moved = true;
		1479	}
		1480	#endif
		1481
		1482	if (want_position_change)
		1483	{
1457	int x, y;	1484	int x, y;
		1485
1458	if (ev.xconfigure.send_event)	1486	if (ev.xconfigure.send_event)
1459	{	1487	{
1460	x = ev.xconfigure.x;	1488	x = ev.xconfigure.x;
1461	y = ev.xconfigure.y;	1489	y = ev.xconfigure.y;
1462	}	1490	}
1463	else	1491	else
1464	get_window_origin (x, y);	1492	get_window_origin (x, y);
1465		1493
1466	if (bg_set_position (x, y)	1494	if (x != parent_x \|\| y != parent_y)
1467	\|\| !(bg_flags & BG_IS_VALID))	1495	{
		1496	parent_x = x;
		1497	parent_y = y;
		1498	HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1468	moved = true;	1499	moved = true;
		1500	}
1469	}	1501	}
1470	#endif
1471		1502
1472	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)	1503	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)
1473	{	1504	{
1474	seen_resize = 1;	1505	seen_resize = 1;
1475	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1506	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1476	}	1507	}
1477	else	1508	else
1478	{	1509	{
1479	#ifdef HAVE_BG_PIXMAP	1510	#ifdef HAVE_BG_PIXMAP
1480	if (moved)	1511	if (moved)
1481	{
1482	if (mapped)
1483	update_background ();	1512	update_background ();
1484	else
1485	bg_invalidate ();
1486	}
1487	#endif	1513	#endif
1488	}	1514	}
1489		1515
1490	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));	1516	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1491	}	1517	}
…		…
1503	selection_send (ev.xselectionrequest);	1529	selection_send (ev.xselectionrequest);
1504	break;	1530	break;
1505		1531
1506	case MapNotify:	1532	case MapNotify:
1507	#ifdef HAVE_BG_PIXMAP	1533	#ifdef HAVE_BG_PIXMAP
1508	/* This is needed specifically to fix the case of no window manager or a	1534	// This is needed at startup for the case of no window manager
1509	* non-reparenting window manager. In those cases we never get first	1535	// or a non-reparenting window manager and also because we
1510	* ConfigureNotify. Also that speeds startup under normal WM, by taking	1536	// defer bg image updates if the window is not mapped. The
1511	* care of multiplicity of ConfigureNotify events arriving while WM does	1537	// short delay is to optimize for multiple ConfigureNotify
1512	* reparenting.	1538	// events at startup when the window manager reparents the
1513	* We should not render background immediately, as there could be several	1539	// window, so as to perform the computation after we have
1514	* ConfigureNotify's to follow. Lets take care of all of them in one scoop	1540	// received all of them.
1515	* by scheduling background redraw as soon as we can, but giving a short	1541	if (bg_img == 0)
1516	* bit of time for ConfigureNotifies to arrive.
1517	* We should render background PRIOR to drawing any text, but AFTER all
1518	* of ConfigureNotifys for the best results.
1519	*/
1520	if (!(bg_flags & BG_IS_VALID))
1521	update_background_ev.start (0.025);	1542	update_background_ev.start (0.025);
1522	#endif	1543	#endif
1523	mapped = 1;	1544	mapped = 1;
1524	#ifdef TEXT_BLINK	1545	#ifdef TEXT_BLINK
1525	text_blink_ev.start ();	1546	text_blink_ev.start ();
…		…
1565	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))	1586	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1566	;	1587	;
1567		1588
1568	if (scrollBar.state && ev.xany.window == scrollBar.win)	1589	if (scrollBar.state && ev.xany.window == scrollBar.win)
1569	{	1590	{
1570	scrollBar.state = STATE_IDLE;	1591	scrollBar.state = SB_STATE_IDLE;
1571	scrollBar.show (0);	1592	scrollBar.show (0);
1572	}	1593	}
1573	}	1594	}
1574	break;	1595	break;
1575		1596
…		…
1641	dist = int_bwidth - ev.xbutton.y;	1662	dist = int_bwidth - ev.xbutton.y;
1642	}	1663	}
1643	else	1664	else
1644	{	1665	{
1645	scroll_selection_dir = DN;	1666	scroll_selection_dir = DN;
1646	dist = ev.xbutton.y - (int_bwidth + height);	1667	dist = ev.xbutton.y - (int_bwidth + vt_height);
1647	}	1668	}
1648		1669
1649	scroll_selection_lines = Pixel2Height (dist)	1670	scroll_selection_lines = Pixel2Height (dist)
1650	/ SELECTION_SCROLL_LINE_SPEEDUP	1671	/ SELECTION_SCROLL_LINE_SPEEDUP
1651	+ 1;	1672	+ 1;
…		…
1663	#ifdef MOUSE_THRESHOLD	1684	#ifdef MOUSE_THRESHOLD
1664	}	1685	}
1665	#endif	1686	#endif
1666	}	1687	}
1667	}	1688	}
1668	else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)	1689	else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1669	{	1690	{
1670	while (XCheckTypedWindowEvent (dpy, scrollBar.win,	1691	while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1671	MotionNotify, &ev))	1692	MotionNotify, &ev))
1672	;	1693	;
1673		1694
1674	XQueryPointer (dpy, scrollBar.win,	1695	XQueryPointer (dpy, scrollBar.win,
1675	&unused_root, &unused_child,	1696	&unused_root, &unused_child,
1676	&unused_root_x, &unused_root_y,	1697	&unused_root_x, &unused_root_y,
1677	&ev.xbutton.x, &ev.xbutton.y,	1698	&ev.xbutton.x, &ev.xbutton.y,
1678	&unused_mask);	1699	&unused_mask);
1679	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1700	scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1680	scrollBar.size ());	1701	scrollBar.size ());
1681	want_refresh = 1;	1702	want_refresh = 1;
1682	scrollBar.show (1);	1703	scrollBar.show (1);
1683	}	1704	}
1684	break;	1705	break;
1685	}	1706	}
1686		1707
1687	#if defined(CURSOR_BLINK)	1708	#if defined(CURSOR_BLINK)
1688	if (option (Opt_cursorBlink) && ev.type == KeyPress)	1709	if (ev.type == KeyPress)
1689	{
1690	if (hidden_cursor)
1691	{
1692	hidden_cursor = 0;
1693	want_refresh = 1;
1694	}
1695
1696	cursor_blink_ev.again ();	1710	cursor_blink_reset ();
1697	}
1698	#endif	1711	#endif
1699		1712
1700	#if defined(POINTER_BLANK)	1713	#if defined(POINTER_BLANK)
1701	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)	1714	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1702	{	1715	{
…		…
1713		1726
1714	refresh_check ();	1727	refresh_check ();
1715	}	1728	}
1716		1729
1717	#if ENABLE_FRILLS	1730	#if ENABLE_FRILLS
1718	void	1731	void ecb_cold
1719	rxvt_term::set_urgency (bool enable)	1732	rxvt_term::set_urgency (bool enable)
1720	{	1733	{
1721	if (enable == urgency_hint)	1734	if (enable == urgency_hint)
1722	return;	1735	return;
1723		1736
1724	if (XWMHints *h = XGetWMHints (dpy, parent))	1737	if (XWMHints *h = XGetWMHints (dpy, parent))
1725	{	1738	{
1726	h->flags = h->flags & ~XUrgencyHint \| (enable ? XUrgencyHint : 0);	1739	h->flags = h->flags & ~XUrgencyHint \| (enable ? XUrgencyHint : 0);
1727	XSetWMHints (dpy, parent, h);	1740	XSetWMHints (dpy, parent, h);
1728	urgency_hint = enable;	1741	urgency_hint = enable;
		1742	XFree (h);
1729	}	1743	}
1730	}	1744	}
1731	#endif	1745	#endif
1732		1746
1733	void	1747	void ecb_cold
1734	rxvt_term::focus_in ()	1748	rxvt_term::focus_in ()
1735	{	1749	{
1736	if (!focus)	1750	if (!focus)
1737	{	1751	{
1738	focus = 1;	1752	focus = 1;
1739	want_refresh = 1;	1753	want_refresh = 1;
1740		1754
1741	#if USE_XIM	1755	#if USE_XIM
1742	if (Input_Context != NULL)	1756	if (Input_Context != NULL)
1743	{	1757	{
1744	IMSetPosition ();	1758	im_set_position ();
1745	XSetICFocus (Input_Context);	1759	XSetICFocus (Input_Context);
1746	}	1760	}
1747	#endif	1761	#endif
1748	#if CURSOR_BLINK	1762	#if CURSOR_BLINK
1749	if (option (Opt_cursorBlink))	1763	if (option (Opt_cursorBlink))
…		…
1763		1777
1764	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));	1778	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1765	}	1779	}
1766	}	1780	}
1767		1781
1768	void	1782	void ecb_cold
1769	rxvt_term::focus_out ()	1783	rxvt_term::focus_out ()
1770	{	1784	{
1771	if (focus)	1785	if (focus)
1772	{	1786	{
1773	focus = 0;	1787	focus = 0;
…		…
1806		1820
1807	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));	1821	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1808	}	1822	}
1809	}	1823	}
1810		1824
1811	void	1825	void ecb_cold
1812	rxvt_term::update_fade_color (unsigned int idx)	1826	rxvt_term::update_fade_color (unsigned int idx)
1813	{	1827	{
1814	#if OFF_FOCUS_FADING	1828	#if OFF_FOCUS_FADING
1815	if (rs[Rs_fade])	1829	if (rs[Rs_fade])
1816	{	1830	{
…		…
1819	pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);	1833	pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1820	}	1834	}
1821	#endif	1835	#endif
1822	}	1836	}
1823		1837
1824	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	1838	#if BG_IMAGE_FROM_ROOT \|\| ENABLE_PERL
1825	void	1839	void ecb_hot
1826	rxvt_term::rootwin_cb (XEvent &ev)	1840	rxvt_term::rootwin_cb (XEvent &ev)
1827	{	1841	{
1828	make_current ();	1842	make_current ();
1829		1843
1830	if (SHOULD_INVOKE (HOOK_ROOT_EVENT)	1844	if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1831	&& HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))	1845	&& HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1832	return;	1846	return;
1833		1847
1834	# if ENABLE_TRANSPARENCY
1835	switch (ev.type)	1848	switch (ev.type)
1836	{	1849	{
1837	case PropertyNotify:	1850	case PropertyNotify:
1838	/*	1851	/*
1839	* if user used some Esetroot compatible prog to set the root bg,	1852	* if user used some Esetroot compatible prog to set the root bg,
1840	* use the property to determine the pixmap. We use it later on.	1853	* use the property to determine the pixmap. We use it later on.
1841	*/	1854	*/
1842	if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]	1855	if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1843	\|\| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])	1856	\|\| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1844	{	1857	{
1845	bg_set_root_pixmap ();	1858	#if BG_IMAGE_FROM_ROOT
		1859	if (option (Opt_transparent))
		1860	{
		1861	rxvt_img::new_from_root (this)->replace (root_img);
1846	update_background ();	1862	update_background ();
		1863	}
		1864	#endif
		1865	HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1847	}	1866	}
1848		1867
1849	break;	1868	break;
1850	}	1869	}
1851	# endif
1852		1870
1853	refresh_check ();	1871	refresh_check ();
1854	}	1872	}
1855	#endif	1873	#endif
1856		1874
…		…
1980	if (scrollBar.upButton (ev.y))	1998	if (scrollBar.upButton (ev.y))
1981	direction = UP; /* up */	1999	direction = UP; /* up */
1982	else if (scrollBar.dnButton (ev.y))	2000	else if (scrollBar.dnButton (ev.y))
1983	direction = DN; /* down */	2001	direction = DN; /* down */
1984		2002
1985	scrollBar.state = STATE_IDLE;	2003	scrollBar.state = SB_STATE_IDLE;
1986	/*	2004	/*
1987	* Rxvt-style scrollbar:	2005	* Rxvt-style scrollbar:
1988	* move up if mouse is above slider	2006	* move up if mouse is above slider
1989	* move dn if mouse is below slider	2007	* move dn if mouse is below slider
1990	*	2008	*
…		…
2029	cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);	2047	cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2030	#endif	2048	#endif
2031	if (scr_page (direction, 1))	2049	if (scr_page (direction, 1))
2032	{	2050	{
2033	if (direction == UP)	2051	if (direction == UP)
2034	scrollBar.state = STATE_UP;	2052	scrollBar.state = SB_STATE_UP;
2035	else	2053	else
2036	scrollBar.state = STATE_DOWN;	2054	scrollBar.state = SB_STATE_DOWN;
2037	}	2055	}
2038	}	2056	}
2039	else	2057	else
2040	switch (ev.button)	2058	switch (ev.button)
2041	{	2059	{
2042	case Button2:	2060	case Button2:
2043	switch (scrollBar.align)	2061	switch (scrollBar.align)
2044	{	2062	{
2045	case R_SB_ALIGN_TOP:	2063	case SB_ALIGN_TOP:
2046	csrO = 0;	2064	csrO = 0;
2047	break;	2065	break;
2048	case R_SB_ALIGN_CENTRE:	2066	case SB_ALIGN_CENTRE:
2049	csrO = (scrollBar.bot - scrollBar.top) / 2;	2067	csrO = (scrollBar.bot - scrollBar.top) / 2;
2050	break;	2068	break;
2051	case R_SB_ALIGN_BOTTOM:	2069	case SB_ALIGN_BOTTOM:
2052	csrO = scrollBar.bot - scrollBar.top;	2070	csrO = scrollBar.bot - scrollBar.top;
2053	break;	2071	break;
2054	}	2072	}
2055		2073
2056	if (scrollBar.style == R_SB_XTERM	2074	if (scrollBar.style == SB_STYLE_XTERM
2057	\|\| scrollbar_above_slider (ev.y)	2075	\|\| scrollBar.above_slider (ev.y)
2058	\|\| scrollbar_below_slider (ev.y))	2076	\|\| scrollBar.below_slider (ev.y))
2059	scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());	2077	scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2060		2078
2061	scrollBar.state = STATE_MOTION;	2079	scrollBar.state = SB_STATE_MOTION;
2062	break;	2080	break;
2063		2081
2064	case Button1:	2082	case Button1:
2065	if (scrollBar.align == R_SB_ALIGN_CENTRE)	2083	if (scrollBar.align == SB_ALIGN_CENTRE)
2066	csrO = ev.y - scrollBar.top;	2084	csrO = ev.y - scrollBar.top;
2067	/* FALLTHROUGH */	2085	/* FALLTHROUGH */
2068		2086
2069	case Button3:	2087	case Button3:
2070	if (scrollBar.style != R_SB_XTERM)	2088	if (scrollBar.style != SB_STYLE_XTERM)
2071	{	2089	{
2072	if (scrollbar_above_slider (ev.y))	2090	if (scrollBar.above_slider (ev.y))
2073	# ifdef RXVT_SCROLL_FULL	2091	# ifdef RXVT_SCROLL_FULL
2074	scr_page (UP, nrow - 1);	2092	scr_page (UP, nrow - 1);
2075	# else	2093	# else
2076	scr_page (UP, nrow / 4);	2094	scr_page (UP, nrow / 4);
2077	# endif	2095	# endif
2078	else if (scrollbar_below_slider (ev.y))	2096	else if (scrollBar.below_slider (ev.y))
2079	# ifdef RXVT_SCROLL_FULL	2097	# ifdef RXVT_SCROLL_FULL
2080	scr_page (DN, nrow - 1);	2098	scr_page (DN, nrow - 1);
2081	# else	2099	# else
2082	scr_page (DN, nrow / 4);	2100	scr_page (DN, nrow / 4);
2083	# endif	2101	# endif
2084	else	2102	else
2085	scrollBar.state = STATE_MOTION;	2103	scrollBar.state = SB_STATE_MOTION;
2086	}	2104	}
2087	else	2105	else
2088	{	2106	{
2089	scr_page ((ev.button == Button1 ? DN : UP),	2107	scr_page ((ev.button == Button1 ? DN : UP),
2090	(nrow	2108	(nrow
2091	* scrollbar_position (ev.y)	2109	* scrollBar.position (ev.y)
2092	/ scrollBar.size ()));	2110	/ scrollBar.size ()));
2093	}	2111	}
2094		2112
2095	break;	2113	break;
2096	}	2114	}
…		…
2107		2125
2108	csrO = 0; /* reset csr Offset */	2126	csrO = 0; /* reset csr Offset */
2109	if (!bypass_keystate)	2127	if (!bypass_keystate)
2110	reportmode = !! (priv_modes & PrivMode_mouse_report);	2128	reportmode = !! (priv_modes & PrivMode_mouse_report);
2111		2129
2112	if (scrollBar.state == STATE_UP \|\| scrollBar.state == STATE_DOWN)	2130	if (scrollBar.state == SB_STATE_UP \|\| scrollBar.state == SB_STATE_DOWN)
2113	{	2131	{
2114	scrollBar.state = STATE_IDLE;	2132	scrollBar.state = SB_STATE_IDLE;
2115	scrollBar.show (0);	2133	scrollBar.show (0);
2116	}	2134	}
2117		2135
2118	#ifdef SELECTION_SCROLLING	2136	#ifdef SELECTION_SCROLLING
2119	sel_scroll_ev.stop();	2137	sel_scroll_ev.stop();
…		…
2169	case Button3:	2187	case Button3:
2170	selection_make (ev.time);	2188	selection_make (ev.time);
2171	break;	2189	break;
2172		2190
2173	case Button2:	2191	case Button2:
2174	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?	2192	if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2175	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);	2193	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2176	break;	2194	break;
2177		2195
2178	#ifdef MOUSE_WHEEL	2196	#ifdef MOUSE_WHEEL
2179	case Button4:	2197	case Button4:
2180	case Button5:	2198	case Button5:
2181	{	2199	{
2182	int i;	2200	int lines;
2183	page_dirn v;	2201	page_dirn dirn;
2184		2202
2185	v = ev.button == Button4 ? UP : DN;	2203	dirn = ev.button == Button4 ? UP : DN;
2186		2204
2187	if (ev.state & ShiftMask)	2205	if (ev.state & ShiftMask)
2188	i = 1;	2206	lines = 1;
2189	else if (option (Opt_mouseWheelScrollPage))	2207	else if (option (Opt_mouseWheelScrollPage))
2190	i = nrow - 1;	2208	lines = nrow - 1;
2191	else	2209	else
2192	i = 5;	2210	lines = 5;
2193		2211
2194	# ifdef MOUSE_SLIP_WHEELING	2212	# ifdef MOUSE_SLIP_WHEELING
2195	if (ev.state & ControlMask)	2213	if (ev.state & ControlMask)
2196	{	2214	{
2197	mouse_slip_wheel_speed += v ? -1 : 1;	2215	mouse_slip_wheel_speed += dirn;
2198	if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;	2216	if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2199	if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;	2217	if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2200		2218
2201	if (!slip_wheel_ev.is_active ())	2219	if (!slip_wheel_ev.is_active ())
2202	slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);	2220	slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2203	}	2221	}
2204	else	2222	else
2205	# endif	2223	# endif
2206	{	2224	{
2207	scr_page (v, i);	2225	scr_page (dirn, lines);
2208	scrollBar.show (1);	2226	scrollBar.show (1);
2209	}	2227	}
2210	}	2228	}
2211	break;	2229	break;
2212	#endif	2230	#endif
…		…
2214	}	2232	}
2215	}	2233	}
2216		2234
2217	/}}} /	2235	/}}} /
2218		2236
2219	void	2237	void ecb_hot
2220	rxvt_term::cmd_parse ()	2238	rxvt_term::cmd_parse ()
2221	{	2239	{
2222	wchar_t ch = NOCHAR;	2240	wchar_t ch = NOCHAR;
2223	char *seq_begin; // remember start of esc-sequence here	2241	char *seq_begin; // remember start of esc-sequence here
2224		2242
2225	for (;;)	2243	for (;;)
2226	{	2244	{
2227	if (expect_false (ch == NOCHAR))	2245	if (ecb_unlikely (ch == NOCHAR))
2228	{	2246	{
2229	seq_begin = cmdbuf_ptr;	2247	seq_begin = cmdbuf_ptr;
2230	ch = next_char ();	2248	ch = next_char ();
2231		2249
2232	if (ch == NOCHAR)	2250	if (ch == NOCHAR)
2233	break;	2251	break;
2234	}	2252	}
2235		2253
2236	if (expect_true (!IS_CONTROL (ch) \|\| ch == C0_LF \|\| ch == C0_CR \|\| ch == C0_HT))	2254	if (ecb_likely (!IS_CONTROL (ch) \|\| ch == C0_LF \|\| ch == C0_CR \|\| ch == C0_HT))
2237	{	2255	{
2238	if (expect_false (!seen_input))	2256	if (ecb_unlikely (!seen_input))
2239	{	2257	{
2240	seen_input = 1;	2258	seen_input = 1;
2241	// many badly-written programs (e.g. jed) contain a race condition:	2259	// many badly-written programs (e.g. jed) contain a race condition:
2242	// they first read the screensize and then install a SIGWINCH handler.	2260	// they first read the screensize and then install a SIGWINCH handler.
2243	// some window managers resize the window early, and these programs	2261	// some window managers resize the window early, and these programs
…		…
2256	wchar_t *str = buf;	2274	wchar_t *str = buf;
2257	wchar_t *eol = str + min (ncol, UBUFSIZ);	2275	wchar_t *eol = str + min (ncol, UBUFSIZ);
2258		2276
2259	for (;;)	2277	for (;;)
2260	{	2278	{
2261	if (expect_false (ch == NOCHAR \|\| (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))	2279	if (ecb_unlikely (ch == NOCHAR \|\| (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2262	break;	2280	break;
2263		2281
2264	*str++ = ch;	2282	*str++ = ch;
2265		2283
2266	if (expect_false (ch == C0_LF \|\| str >= eol))	2284	if (ecb_unlikely (ch == C0_LF \|\| str >= eol))
2267	{	2285	{
2268	if (ch == C0_LF)	2286	if (ch == C0_LF)
2269	nlines++;	2287	nlines++;
2270		2288
2271	refresh_count++;	2289	refresh_count++;
…		…
2343	}	2361	}
2344	}	2362	}
2345	}	2363	}
2346		2364
2347	// read the next character	2365	// read the next character
2348	wchar_t	2366	wchar_t ecb_hot
2349	rxvt_term::next_char () NOTHROW	2367	rxvt_term::next_char () NOTHROW
2350	{	2368	{
2351	while (cmdbuf_ptr < cmdbuf_endp)	2369	while (cmdbuf_ptr < cmdbuf_endp)
2352	{	2370	{
2353	// assume 7-bit to be ascii ALWAYS	2371	// assume 7-bit to be ascii ALWAYS
2354	if (expect_true ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b))	2372	if (ecb_likely ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b))
2355	return *cmdbuf_ptr++;	2373	return *cmdbuf_ptr++;
2356		2374
2357	wchar_t wc;	2375	wchar_t wc;
2358	size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);	2376	size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2359		2377
…		…
2365	}	2383	}
2366		2384
2367	if (len == (size_t)-1)	2385	if (len == (size_t)-1)
2368	{	2386	{
2369	mbstate.reset (); // reset now undefined conversion state	2387	mbstate.reset (); // reset now undefined conversion state
		2388	// a -1 might indicate that a previous incomplete char is invalid (previous return -2)
		2389	// in which case we "erroneously" return the next byte which might be valid.
2370	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through	2390	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2371	}	2391	}
2372		2392
2373	// assume wchar == unicode	2393	// assume wchar == unicode
2374	cmdbuf_ptr += len;	2394	cmdbuf_ptr += len;
…		…
2377		2397
2378	return NOCHAR;	2398	return NOCHAR;
2379	}	2399	}
2380		2400
2381	// read the next octet	2401	// read the next octet
2382	uint32_t	2402	uint32_t ecb_hot
2383	rxvt_term::next_octet () NOTHROW	2403	rxvt_term::next_octet () NOTHROW
2384	{	2404	{
2385	return cmdbuf_ptr < cmdbuf_endp	2405	return cmdbuf_ptr < cmdbuf_endp
2386	? (unsigned char)*cmdbuf_ptr++	2406	? (unsigned char)*cmdbuf_ptr++
2387	: NOCHAR;	2407	: NOCHAR;
2388	}	2408	}
2389		2409
2390	static class out_of_input out_of_input;	2410	static class out_of_input out_of_input;
2391		2411
2392	wchar_t	2412	wchar_t ecb_hot
2393	rxvt_term::cmd_getc () THROW ((class out_of_input))	2413	rxvt_term::cmd_getc () THROW ((class out_of_input))
2394	{	2414	{
2395	wchar_t c = next_char ();	2415	wchar_t c = next_char ();
2396		2416
2397	if (c == NOCHAR)	2417	if (c == NOCHAR)
2398	throw out_of_input;	2418	throw out_of_input;
2399		2419
2400	return c;	2420	return c;
2401	}	2421	}
2402		2422
2403	uint32_t	2423	uint32_t ecb_hot
2404	rxvt_term::cmd_get8 () THROW ((class out_of_input))	2424	rxvt_term::cmd_get8 () THROW ((class out_of_input))
2405	{	2425	{
2406	uint32_t c = next_octet ();	2426	uint32_t c = next_octet ();
2407		2427
2408	if (c == NOCHAR)	2428	if (c == NOCHAR)
…		…
2412	}	2432	}
2413		2433
2414	/{{{ print pipe /	2434	/{{{ print pipe /
2415	/----------------------------------------------------------------------/	2435	/----------------------------------------------------------------------/
2416	#ifdef PRINTPIPE	2436	#ifdef PRINTPIPE
2417	FILE *	2437	FILE * ecb_cold
2418	rxvt_term::popen_printer ()	2438	rxvt_term::popen_printer ()
2419	{	2439	{
2420	FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");	2440	FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2421		2441
2422	if (stream == NULL)	2442	if (stream == NULL)
2423	rxvt_warn ("can't open printer pipe, not printing.\n");	2443	rxvt_warn ("can't open printer pipe, not printing.\n");
2424		2444
2425	return stream;	2445	return stream;
2426	}	2446	}
2427		2447
2428	int	2448	int ecb_cold
2429	rxvt_term::pclose_printer (FILE *stream)	2449	rxvt_term::pclose_printer (FILE *stream)
2430	{	2450	{
2431	fflush (stream);	2451	fflush (stream);
2432	return pclose (stream);	2452	return pclose (stream);
2433	}	2453	}
2434		2454
2435	/*	2455	/*
2436	* simulate attached vt100 printer	2456	* simulate attached vt100 printer
2437	*/	2457	*/
2438	void	2458	void ecb_cold
2439	rxvt_term::process_print_pipe ()	2459	rxvt_term::process_print_pipe ()
2440	{	2460	{
2441	FILE *fd = popen_printer ();	2461	FILE *fd = popen_printer ();
2442		2462
2443	if (!fd)	2463	if (!fd)
…		…
2498	C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,	2518	C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2499	C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,	2519	C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2500	};	2520	};
2501		2521
2502	/{{{ process non-printing single characters /	2522	/{{{ process non-printing single characters /
2503	void	2523	void ecb_hot
2504	rxvt_term::process_nonprinting (unicode_t ch)	2524	rxvt_term::process_nonprinting (unicode_t ch)
2505	{	2525	{
2506	switch (ch)	2526	switch (ch)
2507	{	2527	{
2508	case C0_ESC:	2528	case C0_ESC:
…		…
2554	}	2574	}
2555	/}}} /	2575	/}}} /
2556		2576
2557		2577
2558	/{{{ process VT52 escape sequences /	2578	/{{{ process VT52 escape sequences /
2559	void	2579	void ecb_cold
2560	rxvt_term::process_escape_vt52 (unicode_t ch)	2580	rxvt_term::process_escape_vt52 (unicode_t ch)
2561	{	2581	{
2562	int row, col;	2582	int row, col;
2563		2583
2564	switch (ch)	2584	switch (ch)
…		…
2598	break;	2618	break;
2599	case 'Z': /* identify the terminal type */	2619	case 'Z': /* identify the terminal type */
2600	tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */	2620	tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2601	break;	2621	break;
2602	case '<': /* turn off VT52 mode */	2622	case '<': /* turn off VT52 mode */
2603	set_privmode (PrivMode_vt52, 0);	2623	priv_modes &= ~PrivMode_vt52;
2604	break;	2624	break;
2605	case 'F': /* use special graphics character set */	2625	case 'F': /* use special graphics character set */
2606	case 'G': /* use regular character set */	2626	case 'G': /* use regular character set */
2607	/* unimplemented */	2627	/* unimplemented */
2608	break;	2628	break;
…		…
2614	}	2634	}
2615	/}}} /	2635	/}}} /
2616		2636
2617		2637
2618	/{{{ process escape sequences /	2638	/{{{ process escape sequences /
2619	void	2639	void ecb_hot
2620	rxvt_term::process_escape_seq ()	2640	rxvt_term::process_escape_seq ()
2621	{	2641	{
2622	unicode_t ch = cmd_getc ();	2642	unicode_t ch = cmd_getc ();
2623		2643
2624	if (priv_modes & PrivMode_vt52)	2644	if (priv_modes & PrivMode_vt52)
…		…
2627	return;	2647	return;
2628	}	2648	}
2629		2649
2630	switch (ch)	2650	switch (ch)
2631	{	2651	{
2632	/* case 1: do_tek_mode (); break; */
2633	case '#':	2652	case '#':
2634	if (cmd_getc () == '8')	2653	if (cmd_getc () == '8')
2635	scr_E ();	2654	scr_E ();
2636	break;	2655	break;
2637	case '(':	2656	case '(':
…		…
2660	#if !ENABLE_MINIMAL	2679	#if !ENABLE_MINIMAL
2661	case '9':	2680	case '9':
2662	scr_forwardindex ();	2681	scr_forwardindex ();
2663	break;	2682	break;
2664	#endif	2683	#endif
		2684	// DECPAM/DECPNM
2665	case '=':	2685	case '=':
		2686	priv_modes \|= PrivMode_aplKP;
		2687	break;
2666	case '>':	2688	case '>':
2667	set_privmode (PrivMode_aplKP, ch == '=');	2689	priv_modes &= ~PrivMode_aplKP;
2668	break;	2690	break;
2669		2691
2670	case C1_40:	2692	case C1_40:
2671	cmd_getc ();	2693	cmd_getc ();
2672	break;	2694	break;
…		…
2676		2698
2677	/* 8.3.87: NEXT LINE */	2699	/* 8.3.87: NEXT LINE */
2678	case C1_NEL: /* ESC E */	2700	case C1_NEL: /* ESC E */
2679	{	2701	{
2680	wchar_t nlcr[] = { C0_LF, C0_CR };	2702	wchar_t nlcr[] = { C0_LF, C0_CR };
2681	scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);	2703	scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2682	}	2704	}
2683	break;	2705	break;
2684		2706
2685	/* kidnapped escape sequence: Should be 8.3.48 */	2707	/* kidnapped escape sequence: Should be 8.3.48 */
2686	case C1_ESA: /* ESC G */	2708	case C1_ESA: /* ESC G */
…		…
2698	case C1_RI: /* ESC M */	2720	case C1_RI: /* ESC M */
2699	scr_index (DN);	2721	scr_index (DN);
2700	break;	2722	break;
2701		2723
2702	/* 8.3.142: SINGLE-SHIFT TWO */	2724	/* 8.3.142: SINGLE-SHIFT TWO */
2703	/case C1_SS2: scr_single_shift (2); break; /	2725	/* case C1_SS2: break; */
2704		2726
2705	/* 8.3.143: SINGLE-SHIFT THREE */	2727	/* 8.3.143: SINGLE-SHIFT THREE */
2706	/case C1_SS3: scr_single_shift (3); break; /	2728	/* case C1_SS3: break; */
2707		2729
2708	/* 8.3.27: DEVICE CONTROL STRING */	2730	/* 8.3.27: DEVICE CONTROL STRING */
2709	case C1_DCS: /* ESC P */	2731	case C1_DCS: /* ESC P */
2710	process_dcs_seq ();	2732	process_dcs_seq ();
2711	break;	2733	break;
…		…
2774	make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */	2796	make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2775	make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */	2797	make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2776	make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, \|, }, ~, */	2798	make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, \|, }, ~, */
2777	};	2799	};
2778		2800
2779	void	2801	void ecb_hot
2780	rxvt_term::process_csi_seq ()	2802	rxvt_term::process_csi_seq ()
2781	{	2803	{
2782	unicode_t ch, priv, i;	2804	unicode_t ch, priv, prev_ch, i;
2783	unsigned int nargs, p;	2805	unsigned int nargs, p;
2784	int n, ndef;	2806	int n, ndef;
2785	int arg[ESC_ARGS] = { };	2807	int arg[ESC_ARGS] = { };
2786		2808
2787	nargs = 0;	2809	nargs = 0;
…		…
2793	/* '<' '=' '>' '?' '!' */	2815	/* '<' '=' '>' '?' '!' */
2794	priv = ch;	2816	priv = ch;
2795	ch = cmd_getc ();	2817	ch = cmd_getc ();
2796	}	2818	}
2797		2819
		2820	prev_ch = 0;
2798	/* read any numerical arguments */	2821	/* read any numerical arguments */
2799	for (n = -1; ch < CSI_ICH; )	2822	for (n = -1; ch < CSI_ICH; )
2800	{	2823	{
2801	if (isdigit (ch))	2824	if (isdigit (ch))
2802	{	2825	{
…		…
2812	n = -1;	2835	n = -1;
2813	}	2836	}
2814	else if (IS_CONTROL (ch))	2837	else if (IS_CONTROL (ch))
2815	process_nonprinting (ch);	2838	process_nonprinting (ch);
2816		2839
		2840	prev_ch = ch;
2817	ch = cmd_getc ();	2841	ch = cmd_getc ();
2818	}	2842	}
2819		2843
2820	if (ch > CSI_7F)	2844	if (ch > CSI_7F)
2821	return;	2845	return;
…		…
2862	scr_soft_reset ();	2886	scr_soft_reset ();
2863		2887
2864	static const int pm_h[] = { 7, 25 };	2888	static const int pm_h[] = { 7, 25 };
2865	static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };	2889	static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2866		2890
2867	process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h);	2891	process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2868	process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l);	2892	process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2869	}	2893	}
2870	break;	2894	break;
2871	}	2895	}
2872		2896
2873	return;	2897	return;
…		…
2891	}	2915	}
2892	break;	2916	break;
2893	#endif	2917	#endif
2894		2918
2895	case CSI_CUU: /* 8.3.22: (1) CURSOR UP */	2919	case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2896	case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */	2920	case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2897	arg[0] = -arg[0];	2921	arg[0] = -arg[0];
2898	/* FALLTHROUGH */	2922	/* FALLTHROUGH */
2899	case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */	2923	case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2900	case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */	2924	case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2901	scr_gotorc (arg[0], 0, RELATIVE);	2925	scr_gotorc (arg[0], 0, RELATIVE);
2902	break;	2926	break;
2903		2927
2904	case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */	2928	case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2905	case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */	2929	case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
…		…
3055	scr_insert_mode (1);	3079	scr_insert_mode (1);
3056	else if (arg[0] == 20)	3080	else if (arg[0] == 20)
3057	priv_modes \|= PrivMode_LFNL;	3081	priv_modes \|= PrivMode_LFNL;
3058	break;	3082	break;
3059		3083
		3084	case CSI_71: // DESCUSR: set cursor style
		3085	if (prev_ch == ' ')
		3086	set_cursor_style (arg[0]);
		3087	break;
		3088
3060	/*	3089	/*
3061	* PRIVATE USE beyond this point. All CSI_7? sequences here	3090	* PRIVATE USE beyond this point. All CSI_7? sequences here
3062	*/	3091	*/
3063	case CSI_72: /* DECSTBM: set top and bottom margins */	3092	case CSI_72: /* DECSTBM: set top and bottom margins */
3064	if (nargs == 1)	3093	if (nargs == 1)
…		…
3138	break;	3167	break;
3139		3168
3140	//case 9: NYI, TODO, restore maximized window or maximize window	3169	//case 9: NYI, TODO, restore maximized window or maximize window
3141	default:	3170	default:
3142	if (args[0] >= 24) /* set height (chars) */	3171	if (args[0] >= 24) /* set height (chars) */
3143	set_widthheight ((unsigned int)width,	3172	set_widthheight ((unsigned int)vt_width,
3144	(unsigned int) (args[1] * fheight));	3173	(unsigned int) (args[1] * fheight));
3145	break;	3174	break;
3146		3175
3147	/*	3176	/*
3148	* reports - some output format copied from XTerm	3177	* reports - some output format copied from XTerm
…		…
3427	break;	3456	break;
3428	#endif	3457	#endif
3429	case URxvt_Color_border:	3458	case URxvt_Color_border:
3430	process_color_seq (op, Color_border, str, resp);	3459	process_color_seq (op, Color_border, str, resp);
3431	break;	3460	break;
3432	#if ENABLE_TRANSPARENCY	3461
		3462	#if BG_IMAGE_FROM_ROOT
3433	case URxvt_Color_tint:	3463	case URxvt_Color_tint:
3434	process_color_seq (op, Color_tint, str, resp);	3464	process_color_seq (op, Color_tint, str, resp);
3435	{	3465	{
3436	bool changed = false;	3466	bool changed = false;
3437		3467
3438	if (ISSET_PIXCOLOR (Color_tint))	3468	if (ISSET_PIXCOLOR (Color_tint))
3439	changed = bg_set_tint (pix_colors_focused [Color_tint]);	3469	changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3440		3470
3441	if (changed)	3471	if (changed)
3442	update_background ();	3472	update_background ();
3443	}	3473	}
3444		3474
…		…
3448	#if BG_IMAGE_FROM_FILE	3478	#if BG_IMAGE_FROM_FILE
3449	case Rxvt_Pixmap:	3479	case Rxvt_Pixmap:
3450	if (!strcmp (str, "?"))	3480	if (!strcmp (str, "?"))
3451	{	3481	{
3452	char str[256];	3482	char str[256];
		3483	int h_scale = fimage.h_scale;
		3484	int v_scale = fimage.v_scale;
		3485	int h_align = fimage.h_align;
		3486	int v_align = fimage.v_align;
3453		3487
3454	sprintf (str, "[%dx%d+%d+%d]",	3488	sprintf (str, "[%dx%d+%d+%d]",
3455	min (h_scale, 32767), min (v_scale, 32767),	3489	h_scale, v_scale,
3456	min (h_align, 32767), min (v_align, 32767));	3490	h_align, v_align);
3457	process_xterm_seq (XTerm_title, str, CHAR_ST);	3491	process_xterm_seq (XTerm_title, str, CHAR_ST);
3458	}	3492	}
3459	else	3493	else
3460	{	3494	{
3461	int changed = 0;	3495	bool changed = false;
3462		3496
3463	if (*str != ';')	3497	if (*str != ';')
3464	{	3498	{
3465	if (bg_set_file (str)) /* change pixmap */	3499	try
3466	{	3500	{
		3501	fimage.set_file_geometry (this, str);
3467	changed++;	3502	changed = true;
3468	str = strchr (str, ';');
3469	if (str == NULL)
3470	bg_set_default_geometry ();
3471	else	3503	}
3472	bg_set_geometry (str+1);	3504	catch (const class rxvt_failure_exception &e)
		3505	{
3473	}	3506	}
3474	}	3507	}
3475	else	3508	else
3476	{	3509	{
3477	str++;	3510	str++;
3478	if (bg_set_geometry (str, true))	3511	if (fimage.set_geometry (str, true))
3479	changed++;	3512	changed = true;
3480	}	3513	}
3481		3514
3482	if (changed)	3515	if (changed)
3483	{	3516	{
3484	if (bg_window_position_sensitive ())	3517	if (bg_window_position_sensitive ())
3485	{	3518	{
3486	int x, y;	3519	int x, y;
3487	get_window_origin (x, y);	3520	get_window_origin (x, y);
3488	bg_set_position (x, y);	3521	parent_x = x;
		3522	parent_y = y;
3489	}	3523	}
3490	update_background ();	3524	update_background ();
3491	}	3525	}
3492	}	3526	}
3493	break;	3527	break;
…		…
3583	* 's' = save	3617	* 's' = save
3584	* 'r' = restore	3618	* 'r' = restore
3585	* 't' = toggle	3619	* 't' = toggle
3586	* so no need for fancy checking	3620	* so no need for fancy checking
3587	*/	3621	*/
3588	int	3622	int ecb_cold
3589	rxvt_term::privcases (int mode, unsigned long bit)	3623	rxvt_term::privcases (int mode, unsigned long bit)
3590	{	3624	{
3591	int state;	3625	int state;
3592		3626
3593	if (mode == 's')	3627	if (mode == 's')
3594	{	3628	{
3595	SavedModes \|= (priv_modes & bit);	3629	if (priv_modes & bit)
		3630	SavedModes \|= bit;
		3631	else
		3632	SavedModes &= ~bit;
3596	return -1;	3633	return -1;
3597	}	3634	}
3598	else	3635	else
3599	{	3636	{
3600	if (mode == 'r')	3637	if (mode == 'r')
3601	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */	3638	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3602	else	3639	else
3603	state = (mode == 't') ? ! (priv_modes & bit) : mode;	3640	state = (mode == 't') ? ! (priv_modes & bit) : mode;
3604		3641
3605	set_privmode (bit, state);	3642	if (state)
		3643	priv_modes \|= bit;
		3644	else
		3645	priv_modes &= ~bit;
3606	}	3646	}
3607		3647
3608	return state;	3648	return state;
3609	}	3649	}
3610		3650
3611	/* we're not using priv _yet_ */	3651	/* we're not using priv _yet_ */
3612	void	3652	void
3613	rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)	3653	rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3614	{	3654	{
3615	unsigned int i, j;	3655	unsigned int i, j;
3616	int state;	3656	int state;
3617		3657
3618	static const struct	3658	static const struct
3619	{	3659	{
3620	const int argval;	3660	const int argval;
3621	const unsigned long bit;	3661	const unsigned long bit;
3622	} argtopriv[] = {	3662	} argtopriv[] = {
3623	{ 1, PrivMode_aplCUR }, // DECCKM	3663	{ 1, PrivMode_aplCUR }, // DECCKM
3624	{ 2, PrivMode_vt52 },	3664	{ 2, PrivMode_vt52 }, // DECANM
3625	{ 3, PrivMode_132 }, // DECCOLM	3665	{ 3, PrivMode_132 }, // DECCOLM
3626	{ 4, PrivMode_smoothScroll }, // DECSCLM	3666	{ 4, PrivMode_smoothScroll }, // DECSCLM
3627	{ 5, PrivMode_rVideo }, // DECSCNM	3667	{ 5, PrivMode_rVideo }, // DECSCNM
3628	{ 6, PrivMode_relOrigin }, // DECOM	3668	{ 6, PrivMode_relOrigin }, // DECOM
3629	{ 7, PrivMode_Autowrap }, // DECAWM	3669	{ 7, PrivMode_Autowrap }, // DECAWM
3630	// 8, auto-repeat keys // DECARM	3670	// 8, auto-repeat keys // DECARM
3631	{ 9, PrivMode_MouseX10 },	3671	{ 9, PrivMode_MouseX10 },
3632	// 18 end FF to printer after print screen	3672	// 18 end FF to printer after print screen
3633	// 19 Print screen prints full screen/scroll region	3673	// 19 Print screen prints full screen/scroll region
3634	{ 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis	3674	{ 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3635	#ifdef scrollBar_esc	3675	#ifdef scrollBar_esc
3636	{ scrollBar_esc, PrivMode_scrollBar },	3676	{ scrollBar_esc, PrivMode_scrollBar },
3637	#endif	3677	#endif
3638	{ 35, PrivMode_ShiftKeys }, // rxvt extension	3678	{ 35, PrivMode_ShiftKeys }, // rxvt extension
3639	// 38, tektronix mode // DECTEK	3679	// 38, tektronix mode // DECTEK
3640	{ 40, PrivMode_132OK },	3680	{ 40, PrivMode_132OK },
3641	// 41 xterm more fixes NYI	3681	// 41 xterm more fixes NYI
3642	// 45 margin bell NYI	3682	// 45 margin bell NYI
3643	// 46 start logging	3683	// 46 start logging
3644	{ 47, PrivMode_Screen },	3684	{ 47, PrivMode_Screen },
3645	{ 66, PrivMode_aplKP }, // DECPAM/DECPNM	3685	{ 66, PrivMode_aplKP }, // DECNKM
3646	#ifndef NO_BACKSPACE_KEY	3686	#ifndef NO_BACKSPACE_KEY
3647	{ 67, PrivMode_BackSpace }, // DECBKM	3687	{ 67, PrivMode_BackSpace }, // DECBKM
3648	#endif	3688	#endif
3649	{ 1000, PrivMode_MouseX11 },	3689	{ 1000, PrivMode_MouseX11 },
3650	{ 1002, PrivMode_MouseBtnEvent },	3690	{ 1002, PrivMode_MouseBtnEvent },
…		…
3679	for (i = 0; i < nargs; i++)	3719	for (i = 0; i < nargs; i++)
3680	{	3720	{
3681	state = -1;	3721	state = -1;
3682		3722
3683	/* basic handling */	3723	/* basic handling */
3684	for (j = 0; j < ARRAY_LENGTH(argtopriv); j++)	3724	for (j = 0; j < ecb_array_length (argtopriv); j++)
3685	if (argtopriv[j].argval == arg[i])	3725	if (argtopriv[j].argval == arg[i])
3686	{	3726	{
3687	state = privcases (mode, argtopriv[j].bit);	3727	state = privcases (mode, argtopriv[j].bit);
3688	break;	3728	break;
3689	}	3729	}
…		…
3715	case 2: /* VT52 mode */	3755	case 2: /* VT52 mode */
3716	/* oddball mode. should be set regardless of set/reset	3756	/* oddball mode. should be set regardless of set/reset
3717	* parameter. Return from VT52 mode with an ESC < from	3757	* parameter. Return from VT52 mode with an ESC < from
3718	* within VT52 mode	3758	* within VT52 mode
3719	*/	3759	*/
3720	set_privmode (PrivMode_vt52, 1);	3760	priv_modes \|= PrivMode_vt52;
3721	break;	3761	break;
3722	case 3: /* 80/132 */	3762	case 3: /* 80/132 */
3723	if (priv_modes & PrivMode_132OK)	3763	if (priv_modes & PrivMode_132OK)
3724	set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);	3764	set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3725	break;	3765	break;
…		…
3740	if (state) /* orthogonal */	3780	if (state) /* orthogonal */
3741	priv_modes &= ~(PrivMode_MouseX11\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);	3781	priv_modes &= ~(PrivMode_MouseX11\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);
3742	break;	3782	break;
3743	#ifdef scrollBar_esc	3783	#ifdef scrollBar_esc
3744	case scrollBar_esc:	3784	case scrollBar_esc:
3745	if (scrollBar.map (state))	3785	scrollBar.map (state);
3746	{
3747	resize_all_windows (0, 0, 0);	3786	resize_all_windows (0, 0, 0);
3748	scr_touch (true);	3787	scr_touch (true);
3749	}
3750	break;	3788	break;
3751	#endif	3789	#endif
3752	case 25: /* visible/invisible cursor */	3790	case 25: /* visible/invisible cursor */
3753	scr_cursor_visible (state);	3791	scr_cursor_visible (state);
3754	break;	3792	break;
…		…
3809	}	3847	}
3810	}	3848	}
3811	/}}} /	3849	/}}} /
3812		3850
3813	/{{{ process sgr sequences /	3851	/{{{ process sgr sequences /
3814	void	3852	void ecb_hot
3815	rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)	3853	rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3816	{	3854	{
3817	unsigned int i;	3855	unsigned int i;
3818	short rendset;	3856	short rendset;
3819	int rendstyle;	3857	int rendstyle;
…		…
3960	break;	3998	break;
3961	#endif	3999	#endif
3962	}	4000	}
3963	}	4001	}
3964	}	4002	}
		4003
		4004	void
		4005	rxvt_term::set_cursor_style (int style)
		4006	{
		4007	if (!IN_RANGE_INC (style, 0, 4))
		4008	return;
		4009
		4010	set_option (Opt_cursorUnderline, style >= 3);
		4011
		4012	#ifdef CURSOR_BLINK
		4013	set_option (Opt_cursorBlink, !style \|\| (style & 1));
		4014	cursor_blink_reset ();
		4015	#endif
		4016
		4017	want_refresh = 1;
		4018	}
3965	/}}} /	4019	/}}} /
3966		4020
3967	/* ------------------------------------------------------------------------- */	4021	/* ------------------------------------------------------------------------- */
3968		4022
3969	/*	4023	/*

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.485 by sf-exg, Fri Apr 29 13:08:24 2011 UTC vs. Revision 1.537 by sf-exg, Thu Mar 28 11:30:39 2013 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.485 by sf-exg, Fri Apr 29 13:08:24 2011 UTC vs.
Revision 1.537 by sf-exg, Thu Mar 28 11:30:39 2013 UTC