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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.481 by root, Thu Mar 24 17:34:28 2011 UTC vs.
Revision 1.529 by sf-exg, Sun Dec 30 15:05:19 2012 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
…		…
569	selection_request (ev.time);	570	selection_request (ev.time);
570	return;	571	return;
571	#if TODO	572	#if TODO
572	/* rxvt extras */	573	/* rxvt extras */
573	case XK_KP_Add: /* Shift+KP_Add = bigger font */	574	case XK_KP_Add: /* Shift+KP_Add = bigger font */
574	change_font (FONT_UP);
575	return;	575	return;
576	case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */	576	case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
577	change_font (FONT_DN);
578	return;	577	return;
579	#endif	578	#endif
580	}	579	}
581	}	580	}
582	}	581	}
…		…
781	}	780	}
782		781
783	if (newlen)	782	if (newlen)
784	len = strlen (kbuf);	783	len = strlen (kbuf);
785		784
		785	if (len > 0)
		786	{
786	/*	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	/*
787	* Pass meta for all function keys, if 'meta' option set	800	* Pass meta for all function keys, if 'meta' option set
788	*/	801	*/
789	#ifdef META8_OPTION	802	#ifdef META8_OPTION
790	if (meta && (meta_char == 0x80) && len > 0)	803	if (meta && (meta_char == 0x80))
791	kbuf[len - 1] \|= 0x80;	804	kbuf[len - 1] \|= 0x80;
792	#endif	805	#endif
		806	}
793		807
794	}	808	}
795	else if (ctrl && keysym == XK_minus)	809	else if (ctrl && keysym == XK_minus)
796	{	810	{
797	len = 1;	811	len = 1;
…		…
831	{	845	{
832	view_start = 0;	846	view_start = 0;
833	want_refresh = 1;	847	want_refresh = 1;
834	}	848	}
835		849
836	/*
837	* these modifications only affect the static keybuffer
838	* pass Shift/Control indicators for function keys ending with `~'
839	*
840	* eg,
841	* Prior = "ESC[5~"
842	* Shift+Prior = "ESC[5$"
843	* Ctrl+Prior = "ESC[5^"
844	* Ctrl+Shift+Prior = "ESC[5@"
845	* Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
846	*/
847	if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
848	kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
849
850	/* escape prefix */	850	/* escape prefix */
851	if (meta	851	if (meta
852	#ifdef META8_OPTION	852	#ifdef META8_OPTION
853	&& meta_char == C0_ESC	853	&& meta_char == C0_ESC
854	#endif	854	#endif
…		…
859	}	859	}
860		860
861	tt_write (kbuf, (unsigned int)len);	861	tt_write (kbuf, (unsigned int)len);
862	}	862	}
863		863
864	void	864	void ecb_cold
865	rxvt_term::key_release (XKeyEvent &ev)	865	rxvt_term::key_release (XKeyEvent &ev)
866	{	866	{
867	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ISO_14755 \|\| ENABLE_PERL	867	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ISO_14755 \|\| ENABLE_PERL
868	KeySym keysym;	868	KeySym keysym;
869		869
…		…
941	void	941	void
942	rxvt_term::flush ()	942	rxvt_term::flush ()
943	{	943	{
944	flush_ev.stop ();	944	flush_ev.stop ();
945		945
946	#ifdef HAVE_BG_PIXMAP	946	#ifdef HAVE_IMG
947	if (bg_flags & BG_NEEDS_REFRESH)	947	if (bg_flags & BG_NEEDS_REFRESH)
948	{	948	{
949	bg_flags &= ~BG_NEEDS_REFRESH;	949	bg_flags &= ~BG_NEEDS_REFRESH;
950	scr_touch (false);	950	scr_touch (false);
951	}	951	}
…		…
991	while (row < end_row);	991	while (row < end_row);
992	}	992	}
993		993
994	scr_refresh ();	994	scr_refresh ();
995	scrollBar.show (1);	995	scrollBar.show (1);
996	#ifdef USE_XIM	996	#if USE_XIM
997	IMSendSpot ();	997	im_send_spot ();
998	#endif	998	#endif
999	}	999	}
1000		1000
1001	display->flush ();	1001	display->flush ();
1002	}	1002	}
…		…
1020	flush ();	1020	flush ();
1021	}	1021	}
1022		1022
1023	#ifdef CURSOR_BLINK	1023	#ifdef CURSOR_BLINK
1024	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
1025	rxvt_term::cursor_blink_cb (ev::timer &w, int revents)	1040	rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1026	{	1041	{
1027	hidden_cursor = !hidden_cursor;	1042	hidden_cursor = !hidden_cursor;
1028	want_refresh = 1;	1043	want_refresh = 1;
1029	refresh_check ();	1044	refresh_check ();
…		…
1047		1062
1048	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	1063	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1049	void	1064	void
1050	rxvt_term::cont_scroll_cb (ev::timer &w, int revents)	1065	rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1051	{	1066	{
1052	if ((scrollBar.state == STATE_UP \|\| scrollBar.state == STATE_DOWN)	1067	if ((scrollBar.state == SB_STATE_UP \|\| scrollBar.state == SB_STATE_DOWN)
1053	&& scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))	1068	&& scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1054	{	1069	{
1055	want_refresh = 1;	1070	want_refresh = 1;
1056	refresh_check ();	1071	refresh_check ();
1057	}	1072	}
1058	else	1073	else
…		…
1208	pty_write ();	1223	pty_write ();
1209		1224
1210	refresh_check ();	1225	refresh_check ();
1211	}	1226	}
1212		1227
1213	void	1228	void ecb_cold
1214	rxvt_term::pointer_unblank ()	1229	rxvt_term::pointer_unblank ()
1215	{	1230	{
1216	XDefineCursor (dpy, vt, TermWin_cursor);	1231	XDefineCursor (dpy, vt, TermWin_cursor);
1217	recolour_cursor ();	1232	recolour_cursor ();
1218		1233
…		…
1223	pointer_ev.start (pointerBlankDelay);	1238	pointer_ev.start (pointerBlankDelay);
1224	#endif	1239	#endif
1225	}	1240	}
1226		1241
1227	#ifdef POINTER_BLANK	1242	#ifdef POINTER_BLANK
1228	void	1243	void ecb_cold
1229	rxvt_term::pointer_blank ()	1244	rxvt_term::pointer_blank ()
1230	{	1245	{
1231	if (!option (Opt_pointerBlank))	1246	if (!option (Opt_pointerBlank))
1232	return;	1247	return;
1233		1248
…		…
1235	XFlush (dpy);	1250	XFlush (dpy);
1236		1251
1237	hidden_pointer = 1;	1252	hidden_pointer = 1;
1238	}	1253	}
1239		1254
1240	void	1255	void ecb_cold
1241	rxvt_term::pointer_cb (ev::timer &w, int revents)	1256	rxvt_term::pointer_cb (ev::timer &w, int revents)
1242	{	1257	{
1243	make_current ();	1258	make_current ();
1244		1259
1245	pointer_blank ();	1260	pointer_blank ();
…		…
1337	32 + x,	1352	32 + x,
1338	32 + y);	1353	32 + y);
1339	}	1354	}
1340		1355
1341	/{{{ process an X event /	1356	/{{{ process an X event /
1342	void	1357	void ecb_hot
1343	rxvt_term::x_cb (XEvent &ev)	1358	rxvt_term::x_cb (XEvent &ev)
1344	{	1359	{
1345	make_current ();	1360	make_current ();
1346		1361
1347	dLocal (Display *, dpy);	1362	dLocal (Display *, dpy);
…		…
1445	&& ev.xfocus.mode != NotifyGrab)	1460	&& ev.xfocus.mode != NotifyGrab)
1446	focus_out ();	1461	focus_out ();
1447	break;	1462	break;
1448		1463
1449	case ConfigureNotify:	1464	case ConfigureNotify:
1450	if (ev.xconfigure.window == parent[0])	1465	if (ev.xconfigure.window == parent)
1451	{	1466	{
1452	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))	1467	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1453	;	1468	;
1454		1469
		1470	bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
		1471
		1472	bool moved = false;
1455	#ifdef HAVE_BG_PIXMAP	1473	#ifdef HAVE_BG_PIXMAP
1456	bool moved = false;
1457	if (bg_window_position_sensitive ())	1474	if (bg_window_position_sensitive ())
1458	{	1475	{
		1476	want_position_change = true;
		1477	if (!(bg_flags & BG_IS_VALID))
		1478	moved = true;
		1479	}
		1480	#endif
		1481
		1482	if (want_position_change)
		1483	{
1459	int x, y;	1484	int x, y;
		1485
1460	if (ev.xconfigure.send_event)	1486	if (ev.xconfigure.send_event)
1461	{	1487	{
1462	x = ev.xconfigure.x;	1488	x = ev.xconfigure.x;
1463	y = ev.xconfigure.y;	1489	y = ev.xconfigure.y;
1464	}	1490	}
1465	else	1491	else
1466	get_window_origin (x, y);	1492	get_window_origin (x, y);
1467		1493
1468	if (bg_set_position (x, y)	1494	if (x != parent_x \|\| y != parent_y)
1469	\|\| !(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));
1470	moved = true;	1499	moved = true;
		1500	}
1471	}	1501	}
1472	#endif
1473		1502
1474	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)	1503	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)
1475	{	1504	{
1476	seen_resize = 1;	1505	seen_resize = 1;
1477	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1506	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1478	}	1507	}
1479	else	1508	else
1480	{	1509	{
1481	#ifdef HAVE_BG_PIXMAP	1510	#ifdef HAVE_BG_PIXMAP
1482	if (moved)	1511	if (moved)
1483	{
1484	if (mapped)
1485	update_background ();	1512	update_background ();
1486	else
1487	bg_invalidate ();
1488	}
1489	#endif	1513	#endif
1490	}	1514	}
1491		1515
1492	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));	1516	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1493	}	1517	}
…		…
1505	selection_send (ev.xselectionrequest);	1529	selection_send (ev.xselectionrequest);
1506	break;	1530	break;
1507		1531
1508	case MapNotify:	1532	case MapNotify:
1509	#ifdef HAVE_BG_PIXMAP	1533	#ifdef HAVE_BG_PIXMAP
1510	/* 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
1511	* non-reparenting window manager. In those cases we never get first	1535	// or a non-reparenting window manager and also because we
1512	* ConfigureNotify. Also that speeds startup under normal WM, by taking	1536	// defer bg image updates if the window is not mapped. The
1513	* care of multiplicity of ConfigureNotify events arriving while WM does	1537	// short delay is to optimize for multiple ConfigureNotify
1514	* reparenting.	1538	// events at startup when the window manager reparents the
1515	* We should not render background immediately, as there could be several	1539	// window, so as to perform the computation after we have
1516	* ConfigureNotify's to follow. Lets take care of all of them in one scoop	1540	// received all of them.
1517	* by scheduling background redraw as soon as we can, but giving a short
1518	* bit of time for ConfigureNotifies to arrive.
1519	* We should render background PRIOR to drawing any text, but AFTER all
1520	* of ConfigureNotifys for the best results.
1521	*/
1522	if (!(bg_flags & BG_IS_VALID))	1541	if (!(bg_flags & BG_IS_VALID))
1523	update_background_ev.start (0.025);	1542	update_background_ev.start (0.025);
1524	#endif	1543	#endif
1525	mapped = 1;	1544	mapped = 1;
1526	#ifdef TEXT_BLINK	1545	#ifdef TEXT_BLINK
…		…
1567	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))	1586	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1568	;	1587	;
1569		1588
1570	if (scrollBar.state && ev.xany.window == scrollBar.win)	1589	if (scrollBar.state && ev.xany.window == scrollBar.win)
1571	{	1590	{
1572	scrollBar.state = STATE_IDLE;	1591	scrollBar.state = SB_STATE_IDLE;
1573	scrollBar.show (0);	1592	scrollBar.show (0);
1574	}	1593	}
1575	}	1594	}
1576	break;	1595	break;
1577		1596
…		…
1643	dist = int_bwidth - ev.xbutton.y;	1662	dist = int_bwidth - ev.xbutton.y;
1644	}	1663	}
1645	else	1664	else
1646	{	1665	{
1647	scroll_selection_dir = DN;	1666	scroll_selection_dir = DN;
1648	dist = ev.xbutton.y - (int_bwidth + height);	1667	dist = ev.xbutton.y - (int_bwidth + vt_height);
1649	}	1668	}
1650		1669
1651	scroll_selection_lines = Pixel2Height (dist)	1670	scroll_selection_lines = Pixel2Height (dist)
1652	/ SELECTION_SCROLL_LINE_SPEEDUP	1671	/ SELECTION_SCROLL_LINE_SPEEDUP
1653	+ 1;	1672	+ 1;
…		…
1665	#ifdef MOUSE_THRESHOLD	1684	#ifdef MOUSE_THRESHOLD
1666	}	1685	}
1667	#endif	1686	#endif
1668	}	1687	}
1669	}	1688	}
1670	else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)	1689	else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1671	{	1690	{
1672	while (XCheckTypedWindowEvent (dpy, scrollBar.win,	1691	while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1673	MotionNotify, &ev))	1692	MotionNotify, &ev))
1674	;	1693	;
1675		1694
1676	XQueryPointer (dpy, scrollBar.win,	1695	XQueryPointer (dpy, scrollBar.win,
1677	&unused_root, &unused_child,	1696	&unused_root, &unused_child,
1678	&unused_root_x, &unused_root_y,	1697	&unused_root_x, &unused_root_y,
1679	&ev.xbutton.x, &ev.xbutton.y,	1698	&ev.xbutton.x, &ev.xbutton.y,
1680	&unused_mask);	1699	&unused_mask);
1681	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1700	scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1682	scrollBar.size ());	1701	scrollBar.size ());
1683	want_refresh = 1;	1702	want_refresh = 1;
1684	scrollBar.show (1);	1703	scrollBar.show (1);
1685	}	1704	}
1686	break;	1705	break;
1687	}	1706	}
1688		1707
1689	#if defined(CURSOR_BLINK)	1708	#if defined(CURSOR_BLINK)
1690	if (option (Opt_cursorBlink) && ev.type == KeyPress)	1709	if (ev.type == KeyPress)
1691	{
1692	if (hidden_cursor)
1693	{
1694	hidden_cursor = 0;
1695	want_refresh = 1;
1696	}
1697
1698	cursor_blink_ev.again ();	1710	cursor_blink_reset ();
1699	}
1700	#endif	1711	#endif
1701		1712
1702	#if defined(POINTER_BLANK)	1713	#if defined(POINTER_BLANK)
1703	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)	1714	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1704	{	1715	{
…		…
1715		1726
1716	refresh_check ();	1727	refresh_check ();
1717	}	1728	}
1718		1729
1719	#if ENABLE_FRILLS	1730	#if ENABLE_FRILLS
1720	void	1731	void ecb_cold
1721	rxvt_term::set_urgency (bool enable)	1732	rxvt_term::set_urgency (bool enable)
1722	{	1733	{
1723	if (enable == urgency_hint)	1734	if (enable == urgency_hint)
1724	return;	1735	return;
1725		1736
1726	if (XWMHints *h = XGetWMHints (dpy, parent[0]))	1737	if (XWMHints *h = XGetWMHints (dpy, parent))
1727	{	1738	{
1728	h->flags = h->flags & ~XUrgencyHint \| (enable ? XUrgencyHint : 0);	1739	h->flags = h->flags & ~XUrgencyHint \| (enable ? XUrgencyHint : 0);
1729	XSetWMHints (dpy, parent[0], h);	1740	XSetWMHints (dpy, parent, h);
1730	urgency_hint = enable;	1741	urgency_hint = enable;
		1742	XFree (h);
1731	}	1743	}
1732	}	1744	}
1733	#endif	1745	#endif
1734		1746
1735	void	1747	void ecb_cold
1736	rxvt_term::focus_in ()	1748	rxvt_term::focus_in ()
1737	{	1749	{
1738	if (!focus)	1750	if (!focus)
1739	{	1751	{
1740	focus = 1;	1752	focus = 1;
1741	want_refresh = 1;	1753	want_refresh = 1;
1742		1754
1743	#if USE_XIM	1755	#if USE_XIM
1744	if (Input_Context != NULL)	1756	if (Input_Context != NULL)
1745	{	1757	{
1746	IMSetPosition ();	1758	im_set_position ();
1747	XSetICFocus (Input_Context);	1759	XSetICFocus (Input_Context);
1748	}	1760	}
1749	#endif	1761	#endif
1750	#if CURSOR_BLINK	1762	#if CURSOR_BLINK
1751	if (option (Opt_cursorBlink))	1763	if (option (Opt_cursorBlink))
…		…
1765		1777
1766	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));	1778	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1767	}	1779	}
1768	}	1780	}
1769		1781
1770	void	1782	void ecb_cold
1771	rxvt_term::focus_out ()	1783	rxvt_term::focus_out ()
1772	{	1784	{
1773	if (focus)	1785	if (focus)
1774	{	1786	{
1775	focus = 0;	1787	focus = 0;
…		…
1808		1820
1809	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));	1821	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1810	}	1822	}
1811	}	1823	}
1812		1824
1813	void	1825	void ecb_cold
1814	rxvt_term::update_fade_color (unsigned int idx)	1826	rxvt_term::update_fade_color (unsigned int idx)
1815	{	1827	{
1816	#if OFF_FOCUS_FADING	1828	#if OFF_FOCUS_FADING
1817	if (rs[Rs_fade])	1829	if (rs[Rs_fade])
1818	{	1830	{
…		…
1821	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);
1822	}	1834	}
1823	#endif	1835	#endif
1824	}	1836	}
1825		1837
1826	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	1838	#if BG_IMAGE_FROM_ROOT \|\| ENABLE_PERL
1827	void	1839	void ecb_hot
1828	rxvt_term::rootwin_cb (XEvent &ev)	1840	rxvt_term::rootwin_cb (XEvent &ev)
1829	{	1841	{
1830	make_current ();	1842	make_current ();
1831		1843
1832	if (SHOULD_INVOKE (HOOK_ROOT_EVENT)	1844	if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1833	&& HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))	1845	&& HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1834	return;	1846	return;
1835		1847
1836	# if ENABLE_TRANSPARENCY
1837	switch (ev.type)	1848	switch (ev.type)
1838	{	1849	{
1839	case PropertyNotify:	1850	case PropertyNotify:
1840	/*	1851	/*
1841	* 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,
1842	* 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.
1843	*/	1854	*/
1844	if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]	1855	if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1845	\|\| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])	1856	\|\| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1846	{	1857	{
		1858	#if BG_IMAGE_FROM_ROOT
1847	bg_set_root_pixmap ();	1859	bg_set_root_pixmap ();
1848	update_background ();	1860	update_background ();
		1861	#endif
		1862	#if ENABLE_PERL
		1863	HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
		1864	#endif
1849	}	1865	}
1850		1866
1851	break;	1867	break;
1852	}	1868	}
1853	# endif
1854		1869
1855	refresh_check ();	1870	refresh_check ();
1856	}	1871	}
1857	#endif	1872	#endif
1858		1873
…		…
1982	if (scrollBar.upButton (ev.y))	1997	if (scrollBar.upButton (ev.y))
1983	direction = UP; /* up */	1998	direction = UP; /* up */
1984	else if (scrollBar.dnButton (ev.y))	1999	else if (scrollBar.dnButton (ev.y))
1985	direction = DN; /* down */	2000	direction = DN; /* down */
1986		2001
1987	scrollBar.state = STATE_IDLE;	2002	scrollBar.state = SB_STATE_IDLE;
1988	/*	2003	/*
1989	* Rxvt-style scrollbar:	2004	* Rxvt-style scrollbar:
1990	* move up if mouse is above slider	2005	* move up if mouse is above slider
1991	* move dn if mouse is below slider	2006	* move dn if mouse is below slider
1992	*	2007	*
…		…
2031	cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);	2046	cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2032	#endif	2047	#endif
2033	if (scr_page (direction, 1))	2048	if (scr_page (direction, 1))
2034	{	2049	{
2035	if (direction == UP)	2050	if (direction == UP)
2036	scrollBar.state = STATE_UP;	2051	scrollBar.state = SB_STATE_UP;
2037	else	2052	else
2038	scrollBar.state = STATE_DOWN;	2053	scrollBar.state = SB_STATE_DOWN;
2039	}	2054	}
2040	}	2055	}
2041	else	2056	else
2042	switch (ev.button)	2057	switch (ev.button)
2043	{	2058	{
2044	case Button2:	2059	case Button2:
2045	switch (scrollBar.align)	2060	switch (scrollBar.align)
2046	{	2061	{
2047	case R_SB_ALIGN_TOP:	2062	case SB_ALIGN_TOP:
2048	csrO = 0;	2063	csrO = 0;
2049	break;	2064	break;
2050	case R_SB_ALIGN_CENTRE:	2065	case SB_ALIGN_CENTRE:
2051	csrO = (scrollBar.bot - scrollBar.top) / 2;	2066	csrO = (scrollBar.bot - scrollBar.top) / 2;
2052	break;	2067	break;
2053	case R_SB_ALIGN_BOTTOM:	2068	case SB_ALIGN_BOTTOM:
2054	csrO = scrollBar.bot - scrollBar.top;	2069	csrO = scrollBar.bot - scrollBar.top;
2055	break;	2070	break;
2056	}	2071	}
2057		2072
2058	if (scrollBar.style == R_SB_XTERM	2073	if (scrollBar.style == SB_STYLE_XTERM
2059	\|\| scrollbar_above_slider (ev.y)	2074	\|\| scrollBar.above_slider (ev.y)
2060	\|\| scrollbar_below_slider (ev.y))	2075	\|\| scrollBar.below_slider (ev.y))
2061	scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());	2076	scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2062		2077
2063	scrollBar.state = STATE_MOTION;	2078	scrollBar.state = SB_STATE_MOTION;
2064	break;	2079	break;
2065		2080
2066	case Button1:	2081	case Button1:
2067	if (scrollBar.align == R_SB_ALIGN_CENTRE)	2082	if (scrollBar.align == SB_ALIGN_CENTRE)
2068	csrO = ev.y - scrollBar.top;	2083	csrO = ev.y - scrollBar.top;
2069	/* FALLTHROUGH */	2084	/* FALLTHROUGH */
2070		2085
2071	case Button3:	2086	case Button3:
2072	if (scrollBar.style != R_SB_XTERM)	2087	if (scrollBar.style != SB_STYLE_XTERM)
2073	{	2088	{
2074	if (scrollbar_above_slider (ev.y))	2089	if (scrollBar.above_slider (ev.y))
2075	# ifdef RXVT_SCROLL_FULL	2090	# ifdef RXVT_SCROLL_FULL
2076	scr_page (UP, nrow - 1);	2091	scr_page (UP, nrow - 1);
2077	# else	2092	# else
2078	scr_page (UP, nrow / 4);	2093	scr_page (UP, nrow / 4);
2079	# endif	2094	# endif
2080	else if (scrollbar_below_slider (ev.y))	2095	else if (scrollBar.below_slider (ev.y))
2081	# ifdef RXVT_SCROLL_FULL	2096	# ifdef RXVT_SCROLL_FULL
2082	scr_page (DN, nrow - 1);	2097	scr_page (DN, nrow - 1);
2083	# else	2098	# else
2084	scr_page (DN, nrow / 4);	2099	scr_page (DN, nrow / 4);
2085	# endif	2100	# endif
2086	else	2101	else
2087	scrollBar.state = STATE_MOTION;	2102	scrollBar.state = SB_STATE_MOTION;
2088	}	2103	}
2089	else	2104	else
2090	{	2105	{
2091	scr_page ((ev.button == Button1 ? DN : UP),	2106	scr_page ((ev.button == Button1 ? DN : UP),
2092	(nrow	2107	(nrow
2093	* scrollbar_position (ev.y)	2108	* scrollBar.position (ev.y)
2094	/ scrollBar.size ()));	2109	/ scrollBar.size ()));
2095	}	2110	}
2096		2111
2097	break;	2112	break;
2098	}	2113	}
…		…
2109		2124
2110	csrO = 0; /* reset csr Offset */	2125	csrO = 0; /* reset csr Offset */
2111	if (!bypass_keystate)	2126	if (!bypass_keystate)
2112	reportmode = !! (priv_modes & PrivMode_mouse_report);	2127	reportmode = !! (priv_modes & PrivMode_mouse_report);
2113		2128
2114	if (scrollBar.state == STATE_UP \|\| scrollBar.state == STATE_DOWN)	2129	if (scrollBar.state == SB_STATE_UP \|\| scrollBar.state == SB_STATE_DOWN)
2115	{	2130	{
2116	scrollBar.state = STATE_IDLE;	2131	scrollBar.state = SB_STATE_IDLE;
2117	scrollBar.show (0);	2132	scrollBar.show (0);
2118	}	2133	}
2119		2134
2120	#ifdef SELECTION_SCROLLING	2135	#ifdef SELECTION_SCROLLING
2121	sel_scroll_ev.stop();	2136	sel_scroll_ev.stop();
…		…
2171	case Button3:	2186	case Button3:
2172	selection_make (ev.time);	2187	selection_make (ev.time);
2173	break;	2188	break;
2174		2189
2175	case Button2:	2190	case Button2:
2176	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?	2191	if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2177	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);	2192	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2178	break;	2193	break;
2179		2194
2180	#ifdef MOUSE_WHEEL	2195	#ifdef MOUSE_WHEEL
2181	case Button4:	2196	case Button4:
…		…
2216	}	2231	}
2217	}	2232	}
2218		2233
2219	/}}} /	2234	/}}} /
2220		2235
2221	void	2236	void ecb_hot
2222	rxvt_term::cmd_parse ()	2237	rxvt_term::cmd_parse ()
2223	{	2238	{
2224	wchar_t ch = NOCHAR;	2239	wchar_t ch = NOCHAR;
2225	char *seq_begin; // remember start of esc-sequence here	2240	char *seq_begin; // remember start of esc-sequence here
2226		2241
2227	for (;;)	2242	for (;;)
2228	{	2243	{
2229	if (expect_false (ch == NOCHAR))	2244	if (ecb_unlikely (ch == NOCHAR))
2230	{	2245	{
2231	seq_begin = cmdbuf_ptr;	2246	seq_begin = cmdbuf_ptr;
2232	ch = next_char ();	2247	ch = next_char ();
2233		2248
2234	if (ch == NOCHAR)	2249	if (ch == NOCHAR)
2235	break;	2250	break;
2236	}	2251	}
2237		2252
2238	if (expect_true (!IS_CONTROL (ch) \|\| ch == C0_LF \|\| ch == C0_CR \|\| ch == C0_HT))	2253	if (ecb_likely (!IS_CONTROL (ch) \|\| ch == C0_LF \|\| ch == C0_CR \|\| ch == C0_HT))
2239	{	2254	{
2240	if (expect_false (!seen_input))	2255	if (ecb_unlikely (!seen_input))
2241	{	2256	{
2242	seen_input = 1;	2257	seen_input = 1;
2243	// many badly-written programs (e.g. jed) contain a race condition:	2258	// many badly-written programs (e.g. jed) contain a race condition:
2244	// they first read the screensize and then install a SIGWINCH handler.	2259	// they first read the screensize and then install a SIGWINCH handler.
2245	// some window managers resize the window early, and these programs	2260	// some window managers resize the window early, and these programs
…		…
2258	wchar_t *str = buf;	2273	wchar_t *str = buf;
2259	wchar_t *eol = str + min (ncol, UBUFSIZ);	2274	wchar_t *eol = str + min (ncol, UBUFSIZ);
2260		2275
2261	for (;;)	2276	for (;;)
2262	{	2277	{
2263	if (expect_false (ch == NOCHAR \|\| (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))	2278	if (ecb_unlikely (ch == NOCHAR \|\| (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2264	break;	2279	break;
2265		2280
2266	*str++ = ch;	2281	*str++ = ch;
2267		2282
2268	if (expect_false (ch == C0_LF \|\| str >= eol))	2283	if (ecb_unlikely (ch == C0_LF \|\| str >= eol))
2269	{	2284	{
2270	if (ch == C0_LF)	2285	if (ch == C0_LF)
2271	nlines++;	2286	nlines++;
2272		2287
2273	refresh_count++;	2288	refresh_count++;
…		…
2345	}	2360	}
2346	}	2361	}
2347	}	2362	}
2348		2363
2349	// read the next character	2364	// read the next character
2350	wchar_t	2365	wchar_t ecb_hot
2351	rxvt_term::next_char () NOTHROW	2366	rxvt_term::next_char () NOTHROW
2352	{	2367	{
2353	while (cmdbuf_ptr < cmdbuf_endp)	2368	while (cmdbuf_ptr < cmdbuf_endp)
2354	{	2369	{
2355	// assume 7-bit to be ascii ALWAYS	2370	// assume 7-bit to be ascii ALWAYS
2356	if (expect_true ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b))	2371	if (ecb_likely ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b))
2357	return *cmdbuf_ptr++;	2372	return *cmdbuf_ptr++;
2358		2373
2359	wchar_t wc;	2374	wchar_t wc;
2360	size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);	2375	size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2361		2376
…		…
2367	}	2382	}
2368		2383
2369	if (len == (size_t)-1)	2384	if (len == (size_t)-1)
2370	{	2385	{
2371	mbstate.reset (); // reset now undefined conversion state	2386	mbstate.reset (); // reset now undefined conversion state
		2387	// a -1 might indicate that a previous incomplete char is invalid (previous return -2)
		2388	// in which case we "erroneously" return the next byte which might be valid.
2372	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through	2389	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2373	}	2390	}
2374		2391
2375	// assume wchar == unicode	2392	// assume wchar == unicode
2376	cmdbuf_ptr += len;	2393	cmdbuf_ptr += len;
…		…
2379		2396
2380	return NOCHAR;	2397	return NOCHAR;
2381	}	2398	}
2382		2399
2383	// read the next octet	2400	// read the next octet
2384	uint32_t	2401	uint32_t ecb_hot
2385	rxvt_term::next_octet () NOTHROW	2402	rxvt_term::next_octet () NOTHROW
2386	{	2403	{
2387	return cmdbuf_ptr < cmdbuf_endp	2404	return cmdbuf_ptr < cmdbuf_endp
2388	? (unsigned char)*cmdbuf_ptr++	2405	? (unsigned char)*cmdbuf_ptr++
2389	: NOCHAR;	2406	: NOCHAR;
2390	}	2407	}
2391		2408
2392	static class out_of_input out_of_input;	2409	static class out_of_input out_of_input;
2393		2410
2394	/* rxvt_cmd_getc () - Return next input character */	2411	wchar_t ecb_hot
2395	/*
2396	* Return the next input character after first passing any keyboard input
2397	* to the command.
2398	*/
2399	wchar_t
2400	rxvt_term::cmd_getc () THROW ((class out_of_input))	2412	rxvt_term::cmd_getc () THROW ((class out_of_input))
2401	{	2413	{
2402	wchar_t c = next_char ();	2414	wchar_t c = next_char ();
2403		2415
2404	if (c == NOCHAR)	2416	if (c == NOCHAR)
2405	throw out_of_input;	2417	throw out_of_input;
2406		2418
2407	return c;	2419	return c;
2408	}	2420	}
2409		2421
2410	uint32_t	2422	uint32_t ecb_hot
2411	rxvt_term::cmd_get8 () THROW ((class out_of_input))	2423	rxvt_term::cmd_get8 () THROW ((class out_of_input))
2412	{	2424	{
2413	uint32_t c = next_octet ();	2425	uint32_t c = next_octet ();
2414		2426
2415	if (c == NOCHAR)	2427	if (c == NOCHAR)
…		…
2419	}	2431	}
2420		2432
2421	/{{{ print pipe /	2433	/{{{ print pipe /
2422	/----------------------------------------------------------------------/	2434	/----------------------------------------------------------------------/
2423	#ifdef PRINTPIPE	2435	#ifdef PRINTPIPE
2424	FILE *	2436	FILE * ecb_cold
2425	rxvt_term::popen_printer ()	2437	rxvt_term::popen_printer ()
2426	{	2438	{
2427	FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");	2439	FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2428		2440
2429	if (stream == NULL)	2441	if (stream == NULL)
2430	rxvt_warn ("can't open printer pipe, not printing.\n");	2442	rxvt_warn ("can't open printer pipe, not printing.\n");
2431		2443
2432	return stream;	2444	return stream;
2433	}	2445	}
2434		2446
2435	int	2447	int ecb_cold
2436	rxvt_term::pclose_printer (FILE *stream)	2448	rxvt_term::pclose_printer (FILE *stream)
2437	{	2449	{
2438	fflush (stream);	2450	fflush (stream);
2439	return pclose (stream);	2451	return pclose (stream);
2440	}	2452	}
2441		2453
2442	/*	2454	/*
2443	* simulate attached vt100 printer	2455	* simulate attached vt100 printer
2444	*/	2456	*/
2445	void	2457	void ecb_cold
2446	rxvt_term::process_print_pipe ()	2458	rxvt_term::process_print_pipe ()
2447	{	2459	{
2448	FILE *fd = popen_printer ();	2460	FILE *fd = popen_printer ();
2449		2461
2450	if (!fd)	2462	if (!fd)
…		…
2496	pclose_printer (fd);	2508	pclose_printer (fd);
2497	}	2509	}
2498	#endif /* PRINTPIPE */	2510	#endif /* PRINTPIPE */
2499	/}}} /	2511	/}}} /
2500		2512
2501	/* INDENT-OFF */
2502	enum {	2513	enum {
2503	C1_40 = 0x40,	2514	C1_40 = 0x40,
2504	C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,	2515	C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2505	C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,	2516	C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2506	C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,	2517	C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2507	C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,	2518	C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2508	};	2519	};
2509	/* INDENT-ON */
2510		2520
2511	/{{{ process non-printing single characters /	2521	/{{{ process non-printing single characters /
2512	void	2522	void ecb_hot
2513	rxvt_term::process_nonprinting (unicode_t ch)	2523	rxvt_term::process_nonprinting (unicode_t ch)
2514	{	2524	{
2515	switch (ch)	2525	switch (ch)
2516	{	2526	{
2517	case C0_ESC:	2527	case C0_ESC:
…		…
2563	}	2573	}
2564	/}}} /	2574	/}}} /
2565		2575
2566		2576
2567	/{{{ process VT52 escape sequences /	2577	/{{{ process VT52 escape sequences /
2568	void	2578	void ecb_cold
2569	rxvt_term::process_escape_vt52 (unicode_t ch)	2579	rxvt_term::process_escape_vt52 (unicode_t ch)
2570	{	2580	{
2571	int row, col;	2581	int row, col;
2572		2582
2573	switch (ch)	2583	switch (ch)
…		…
2607	break;	2617	break;
2608	case 'Z': /* identify the terminal type */	2618	case 'Z': /* identify the terminal type */
2609	tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */	2619	tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2610	break;	2620	break;
2611	case '<': /* turn off VT52 mode */	2621	case '<': /* turn off VT52 mode */
2612	set_privmode (PrivMode_vt52, 0);	2622	priv_modes &= ~PrivMode_vt52;
2613	break;	2623	break;
2614	case 'F': /* use special graphics character set */	2624	case 'F': /* use special graphics character set */
2615	case 'G': /* use regular character set */	2625	case 'G': /* use regular character set */
2616	/* unimplemented */	2626	/* unimplemented */
2617	break;	2627	break;
…		…
2623	}	2633	}
2624	/}}} /	2634	/}}} /
2625		2635
2626		2636
2627	/{{{ process escape sequences /	2637	/{{{ process escape sequences /
2628	void	2638	void ecb_hot
2629	rxvt_term::process_escape_seq ()	2639	rxvt_term::process_escape_seq ()
2630	{	2640	{
2631	unicode_t ch = cmd_getc ();	2641	unicode_t ch = cmd_getc ();
2632		2642
2633	if (priv_modes & PrivMode_vt52)	2643	if (priv_modes & PrivMode_vt52)
…		…
2636	return;	2646	return;
2637	}	2647	}
2638		2648
2639	switch (ch)	2649	switch (ch)
2640	{	2650	{
2641	/* case 1: do_tek_mode (); break; */
2642	case '#':	2651	case '#':
2643	if (cmd_getc () == '8')	2652	if (cmd_getc () == '8')
2644	scr_E ();	2653	scr_E ();
2645	break;	2654	break;
2646	case '(':	2655	case '(':
…		…
2669	#if !ENABLE_MINIMAL	2678	#if !ENABLE_MINIMAL
2670	case '9':	2679	case '9':
2671	scr_forwardindex ();	2680	scr_forwardindex ();
2672	break;	2681	break;
2673	#endif	2682	#endif
		2683	// DECPAM/DECPNM
2674	case '=':	2684	case '=':
		2685	priv_modes \|= PrivMode_aplKP;
		2686	break;
2675	case '>':	2687	case '>':
2676	set_privmode (PrivMode_aplKP, ch == '=');	2688	priv_modes &= ~PrivMode_aplKP;
2677	break;	2689	break;
2678		2690
2679	case C1_40:	2691	case C1_40:
2680	cmd_getc ();	2692	cmd_getc ();
2681	break;	2693	break;
…		…
2685		2697
2686	/* 8.3.87: NEXT LINE */	2698	/* 8.3.87: NEXT LINE */
2687	case C1_NEL: /* ESC E */	2699	case C1_NEL: /* ESC E */
2688	{	2700	{
2689	wchar_t nlcr[] = { C0_LF, C0_CR };	2701	wchar_t nlcr[] = { C0_LF, C0_CR };
2690	scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);	2702	scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2691	}	2703	}
2692	break;	2704	break;
2693		2705
2694	/* kidnapped escape sequence: Should be 8.3.48 */	2706	/* kidnapped escape sequence: Should be 8.3.48 */
2695	case C1_ESA: /* ESC G */	2707	case C1_ESA: /* ESC G */
…		…
2707	case C1_RI: /* ESC M */	2719	case C1_RI: /* ESC M */
2708	scr_index (DN);	2720	scr_index (DN);
2709	break;	2721	break;
2710		2722
2711	/* 8.3.142: SINGLE-SHIFT TWO */	2723	/* 8.3.142: SINGLE-SHIFT TWO */
2712	/case C1_SS2: scr_single_shift (2); break; /	2724	/* case C1_SS2: break; */
2713		2725
2714	/* 8.3.143: SINGLE-SHIFT THREE */	2726	/* 8.3.143: SINGLE-SHIFT THREE */
2715	/case C1_SS3: scr_single_shift (3); break; /	2727	/* case C1_SS3: break; */
2716		2728
2717	/* 8.3.27: DEVICE CONTROL STRING */	2729	/* 8.3.27: DEVICE CONTROL STRING */
2718	case C1_DCS: /* ESC P */	2730	case C1_DCS: /* ESC P */
2719	process_dcs_seq ();	2731	process_dcs_seq ();
2720	break;	2732	break;
…		…
2753	}	2765	}
2754	}	2766	}
2755	/}}} /	2767	/}}} /
2756		2768
2757	/{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' /	2769	/{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' /
2758	/* INDENT-OFF */
2759	enum {	2770	enum {
2760	CSI_ICH = 0x40,	2771	CSI_ICH = 0x40,
2761	CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,	2772	CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2762	CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,	2773	CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2763	CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,	2774	CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
…		…
2783	make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */	2794	make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2784	make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */	2795	make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2785	make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */	2796	make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2786	make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, \|, }, ~, */	2797	make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, \|, }, ~, */
2787	};	2798	};
2788	/* INDENT-ON */
2789		2799
2790	void	2800	void ecb_hot
2791	rxvt_term::process_csi_seq ()	2801	rxvt_term::process_csi_seq ()
2792	{	2802	{
2793	unicode_t ch, priv, i;	2803	unicode_t ch, priv, i;
2794	unsigned int nargs, p;	2804	unsigned int nargs, p;
2795	int n, ndef;	2805	int n, ndef;
…		…
2873	scr_soft_reset ();	2883	scr_soft_reset ();
2874		2884
2875	static const int pm_h[] = { 7, 25 };	2885	static const int pm_h[] = { 7, 25 };
2876	static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };	2886	static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2877		2887
2878	process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h);	2888	process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2879	process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l);	2889	process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2880	}	2890	}
2881	break;	2891	break;
2882	}	2892	}
2883		2893
2884	return;	2894	return;
…		…
2902	}	2912	}
2903	break;	2913	break;
2904	#endif	2914	#endif
2905		2915
2906	case CSI_CUU: /* 8.3.22: (1) CURSOR UP */	2916	case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2907	case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */	2917	case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2908	arg[0] = -arg[0];	2918	arg[0] = -arg[0];
2909	/* FALLTHROUGH */	2919	/* FALLTHROUGH */
2910	case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */	2920	case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2911	case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */	2921	case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2912	scr_gotorc (arg[0], 0, RELATIVE);	2922	scr_gotorc (arg[0], 0, RELATIVE);
2913	break;	2923	break;
2914		2924
2915	case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */	2925	case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2916	case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */	2926	case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
…		…
3103	}	3113	}
3104	}	3114	}
3105	/}}} /	3115	/}}} /
3106		3116
3107	#if !ENABLE_MINIMAL	3117	#if !ENABLE_MINIMAL
3108	/* ARGSUSED */
3109	void	3118	void
3110	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3119	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3111	{	3120	{
3112	int x, y;	3121	int x, y;
3113	XWindowAttributes wattr;	3122	XWindowAttributes wattr;
…		…
3122	{	3131	{
3123	/*	3132	/*
3124	* commands	3133	* commands
3125	*/	3134	*/
3126	case 1: /* deiconify window */	3135	case 1: /* deiconify window */
3127	XMapWindow (dpy, parent[0]);	3136	XMapWindow (dpy, parent);
3128	break;	3137	break;
3129	case 2: /* iconify window */	3138	case 2: /* iconify window */
3130	XIconifyWindow (dpy, parent[0], display->screen);	3139	XIconifyWindow (dpy, parent, display->screen);
3131	break;	3140	break;
3132	case 3: /* set position (pixels) */	3141	case 3: /* set position (pixels) */
3133	XMoveWindow (dpy, parent[0], args[1], args[2]);	3142	XMoveWindow (dpy, parent, args[1], args[2]);
3134	break;	3143	break;
3135	case 4: /* set size (pixels) */	3144	case 4: /* set size (pixels) */
3136	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3145	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3137	break;	3146	break;
3138	case 5: /* raise window */	3147	case 5: /* raise window */
3139	XRaiseWindow (dpy, parent[0]);	3148	XRaiseWindow (dpy, parent);
3140	break;	3149	break;
3141	case 6: /* lower window */	3150	case 6: /* lower window */
3142	XLowerWindow (dpy, parent[0]);	3151	XLowerWindow (dpy, parent);
3143	break;	3152	break;
3144	case 7: /* refresh window */	3153	case 7: /* refresh window */
3145	scr_touch (true);	3154	scr_touch (true);
3146	break;	3155	break;
3147	case 8: /* set size (chars) */	3156	case 8: /* set size (chars) */
…		…
3150	break;	3159	break;
3151		3160
3152	//case 9: NYI, TODO, restore maximized window or maximize window	3161	//case 9: NYI, TODO, restore maximized window or maximize window
3153	default:	3162	default:
3154	if (args[0] >= 24) /* set height (chars) */	3163	if (args[0] >= 24) /* set height (chars) */
3155	set_widthheight ((unsigned int)width,	3164	set_widthheight ((unsigned int)vt_width,
3156	(unsigned int) (args[1] * fheight));	3165	(unsigned int) (args[1] * fheight));
3157	break;	3166	break;
3158		3167
3159	/*	3168	/*
3160	* reports - some output format copied from XTerm	3169	* reports - some output format copied from XTerm
3161	*/	3170	*/
3162	case 11: /* report window state */	3171	case 11: /* report window state */
3163	XGetWindowAttributes (dpy, parent[0], &wattr);	3172	XGetWindowAttributes (dpy, parent, &wattr);
3164	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3173	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3165	break;	3174	break;
3166	case 13: /* report window position */	3175	case 13: /* report window position */
3167	XGetWindowAttributes (dpy, parent[0], &wattr);	3176	XGetWindowAttributes (dpy, parent, &wattr);
3168	XTranslateCoordinates (dpy, parent[0], wattr.root,	3177	XTranslateCoordinates (dpy, parent, wattr.root,
3169	-wattr.border_width, -wattr.border_width,	3178	-wattr.border_width, -wattr.border_width,
3170	&x, &y, &wdummy);	3179	&x, &y, &wdummy);
3171	tt_printf ("\033[3;%d;%dt", x, y);	3180	tt_printf ("\033[3;%d;%dt", x, y);
3172	break;	3181	break;
3173	case 14: /* report window size (pixels) */	3182	case 14: /* report window size (pixels) */
3174	XGetWindowAttributes (dpy, parent[0], &wattr);	3183	XGetWindowAttributes (dpy, parent, &wattr);
3175	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3184	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3176	break;	3185	break;
3177	case 18: /* report text area size (chars) */	3186	case 18: /* report text area size (chars) */
3178	tt_printf ("\033[8;%d;%dt", nrow, ncol);	3187	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3179	break;	3188	break;
…		…
3181	tt_printf ("\033[9;%d;%dt", nrow, ncol);	3190	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3182	break;	3191	break;
3183	case 20: /* report icon label */	3192	case 20: /* report icon label */
3184	{	3193	{
3185	char *s;	3194	char *s;
3186	XGetIconName (dpy, parent[0], &s);	3195	XGetIconName (dpy, parent, &s);
3187	tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */	3196	tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3188	XFree (s);	3197	XFree (s);
3189	}	3198	}
3190	break;	3199	break;
3191	case 21: /* report window title */	3200	case 21: /* report window title */
3192	{	3201	{
3193	char *s;	3202	char *s;
3194	XFetchName (dpy, parent[0], &s);	3203	XFetchName (dpy, parent, &s);
3195	tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */	3204	tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3196	XFree (s);	3205	XFree (s);
3197	}	3206	}
3198	break;	3207	break;
3199	}	3208	}
…		…
3353	unsigned long bytes_after;	3362	unsigned long bytes_after;
3354	unsigned char *value = 0;	3363	unsigned char *value = 0;
3355	const char *str = "";	3364	const char *str = "";
3356		3365
3357	if (prop	3366	if (prop
3358	&& XGetWindowProperty (dpy, parent[0],	3367	&& XGetWindowProperty (dpy, parent,
3359	prop, 0, 1<<16, 0, AnyPropertyType,	3368	prop, 0, 1<<16, 0, AnyPropertyType,
3360	&actual_type, &actual_format,	3369	&actual_type, &actual_format,
3361	&nitems, &bytes_after, &value) == Success	3370	&nitems, &bytes_after, &value) == Success
3362	&& actual_type != None	3371	&& actual_type != None
3363	&& actual_format == 8)	3372	&& actual_format == 8)
…		…
3375	{	3384	{
3376	*eq = 0;	3385	*eq = 0;
3377	set_utf8_property (display->atom (str), eq + 1);	3386	set_utf8_property (display->atom (str), eq + 1);
3378	}	3387	}
3379	else	3388	else
3380	XDeleteProperty (dpy, parent[0],	3389	XDeleteProperty (dpy, parent,
3381	display->atom (str));	3390	display->atom (str));
3382	}	3391	}
3383	break;	3392	break;
3384		3393
3385	case XTerm_Color:	3394	case XTerm_Color:
…		…
3439	break;	3448	break;
3440	#endif	3449	#endif
3441	case URxvt_Color_border:	3450	case URxvt_Color_border:
3442	process_color_seq (op, Color_border, str, resp);	3451	process_color_seq (op, Color_border, str, resp);
3443	break;	3452	break;
3444	#if ENABLE_TRANSPARENCY	3453
		3454	#if BG_IMAGE_FROM_ROOT
3445	case URxvt_Color_tint:	3455	case URxvt_Color_tint:
3446	process_color_seq (op, Color_tint, str, resp);	3456	process_color_seq (op, Color_tint, str, resp);
3447	{	3457	{
3448	bool changed = false;	3458	bool changed = false;
3449		3459
3450	if (ISSET_PIXCOLOR (Color_tint))	3460	if (ISSET_PIXCOLOR (Color_tint))
3451	changed = bg_set_tint (pix_colors_focused [Color_tint]);	3461	changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3452		3462
3453	if (changed)	3463	if (changed)
3454	update_background ();	3464	update_background ();
3455	}	3465	}
3456		3466
…		…
3460	#if BG_IMAGE_FROM_FILE	3470	#if BG_IMAGE_FROM_FILE
3461	case Rxvt_Pixmap:	3471	case Rxvt_Pixmap:
3462	if (!strcmp (str, "?"))	3472	if (!strcmp (str, "?"))
3463	{	3473	{
3464	char str[256];	3474	char str[256];
		3475	int h_scale = fimage.h_scale;
		3476	int v_scale = fimage.v_scale;
		3477	int h_align = fimage.h_align;
		3478	int v_align = fimage.v_align;
3465		3479
3466	sprintf (str, "[%dx%d+%d+%d]",	3480	sprintf (str, "[%dx%d+%d+%d]",
3467	min (h_scale, 32767), min (v_scale, 32767),	3481	h_scale, v_scale,
3468	min (h_align, 32767), min (v_align, 32767));	3482	h_align, v_align);
3469	process_xterm_seq (XTerm_title, str, CHAR_ST);	3483	process_xterm_seq (XTerm_title, str, CHAR_ST);
3470	}	3484	}
3471	else	3485	else
3472	{	3486	{
3473	int changed = 0;	3487	bool changed = false;
3474		3488
3475	if (*str != ';')	3489	if (*str != ';')
3476	{	3490	{
3477	if (bg_set_file (str)) /* change pixmap */	3491	try
3478	{	3492	{
		3493	fimage.set_file_geometry (this, str);
3479	changed++;	3494	changed = true;
3480	str = strchr (str, ';');
3481	if (str == NULL)
3482	bg_set_default_geometry ();
3483	else	3495	}
3484	bg_set_geometry (str+1);	3496	catch (const class rxvt_failure_exception &e)
		3497	{
3485	}	3498	}
3486	}	3499	}
3487	else	3500	else
3488	{	3501	{
3489	str++;	3502	str++;
3490	if (bg_set_geometry (str, true))	3503	if (fimage.set_geometry (str, true))
3491	changed++;	3504	changed = true;
3492	}	3505	}
3493		3506
3494	if (changed)	3507	if (changed)
3495	{	3508	{
3496	if (bg_window_position_sensitive ())	3509	if (bg_window_position_sensitive ())
3497	{	3510	{
3498	int x, y;	3511	int x, y;
3499	get_window_origin (x, y);	3512	get_window_origin (x, y);
3500	bg_set_position (x, y);	3513	parent_x = x;
		3514	parent_y = y;
3501	}	3515	}
3502	update_background ();	3516	update_background ();
3503	}	3517	}
3504	}	3518	}
3505	break;	3519	break;
…		…
3595	* 's' = save	3609	* 's' = save
3596	* 'r' = restore	3610	* 'r' = restore
3597	* 't' = toggle	3611	* 't' = toggle
3598	* so no need for fancy checking	3612	* so no need for fancy checking
3599	*/	3613	*/
3600	int	3614	int ecb_cold
3601	rxvt_term::privcases (int mode, unsigned long bit)	3615	rxvt_term::privcases (int mode, unsigned long bit)
3602	{	3616	{
3603	int state;	3617	int state;
3604		3618
3605	if (mode == 's')	3619	if (mode == 's')
3606	{	3620	{
3607	SavedModes \|= (priv_modes & bit);	3621	if (priv_modes & bit)
		3622	SavedModes \|= bit;
		3623	else
		3624	SavedModes &= ~bit;
3608	return -1;	3625	return -1;
3609	}	3626	}
3610	else	3627	else
3611	{	3628	{
3612	if (mode == 'r')	3629	if (mode == 'r')
3613	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */	3630	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3614	else	3631	else
3615	state = (mode == 't') ? ! (priv_modes & bit) : mode;	3632	state = (mode == 't') ? ! (priv_modes & bit) : mode;
3616		3633
3617	set_privmode (bit, state);	3634	if (state)
		3635	priv_modes \|= bit;
		3636	else
		3637	priv_modes &= ~bit;
3618	}	3638	}
3619		3639
3620	return state;	3640	return state;
3621	}	3641	}
3622		3642
3623	/* we're not using priv _yet_ */	3643	/* we're not using priv _yet_ */
3624	void	3644	void
3625	rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)	3645	rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3626	{	3646	{
3627	unsigned int i, j;	3647	unsigned int i, j;
3628	int state;	3648	int state;
3629		3649
3630	static const struct	3650	static const struct
3631	{	3651	{
3632	const int argval;	3652	const int argval;
3633	const unsigned long bit;	3653	const unsigned long bit;
3634	} argtopriv[] = {	3654	} argtopriv[] = {
3635	{ 1, PrivMode_aplCUR }, // DECCKM	3655	{ 1, PrivMode_aplCUR }, // DECCKM
3636	{ 2, PrivMode_vt52 },	3656	{ 2, PrivMode_vt52 }, // DECANM
3637	{ 3, PrivMode_132 }, // DECCOLM	3657	{ 3, PrivMode_132 }, // DECCOLM
3638	{ 4, PrivMode_smoothScroll }, // DECSCLM	3658	{ 4, PrivMode_smoothScroll }, // DECSCLM
3639	{ 5, PrivMode_rVideo }, // DECSCNM	3659	{ 5, PrivMode_rVideo }, // DECSCNM
3640	{ 6, PrivMode_relOrigin }, // DECOM	3660	{ 6, PrivMode_relOrigin }, // DECOM
3641	{ 7, PrivMode_Autowrap }, // DECAWM	3661	{ 7, PrivMode_Autowrap }, // DECAWM
3642	// 8, auto-repeat keys // DECARM	3662	// 8, auto-repeat keys // DECARM
3643	{ 9, PrivMode_MouseX10 },	3663	{ 9, PrivMode_MouseX10 },
3644	// 18 end FF to printer after print screen	3664	// 18 end FF to printer after print screen
3645	// 19 Print screen prints full screen/scroll region	3665	// 19 Print screen prints full screen/scroll region
3646	{ 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis	3666	{ 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3647	#ifdef scrollBar_esc	3667	#ifdef scrollBar_esc
3648	{ scrollBar_esc, PrivMode_scrollBar },	3668	{ scrollBar_esc, PrivMode_scrollBar },
3649	#endif	3669	#endif
3650	{ 35, PrivMode_ShiftKeys }, // rxvt extension	3670	{ 35, PrivMode_ShiftKeys }, // rxvt extension
3651	// 38, tektronix mode // DECTEK	3671	// 38, tektronix mode // DECTEK
3652	{ 40, PrivMode_132OK },	3672	{ 40, PrivMode_132OK },
3653	// 41 xterm more fixes NYI	3673	// 41 xterm more fixes NYI
3654	// 45 margin bell NYI	3674	// 45 margin bell NYI
3655	// 46 start logging	3675	// 46 start logging
3656	{ 47, PrivMode_Screen },	3676	{ 47, PrivMode_Screen },
3657	{ 66, PrivMode_aplKP }, // DECPAM/DECPNM	3677	{ 66, PrivMode_aplKP }, // DECNKM
3658	#ifndef NO_BACKSPACE_KEY	3678	#ifndef NO_BACKSPACE_KEY
3659	{ 67, PrivMode_BackSpace }, // DECBKM	3679	{ 67, PrivMode_BackSpace }, // DECBKM
3660	#endif	3680	#endif
3661	{ 1000, PrivMode_MouseX11 },	3681	{ 1000, PrivMode_MouseX11 },
3662	{ 1002, PrivMode_MouseBtnEvent },	3682	{ 1002, PrivMode_MouseBtnEvent },
…		…
3691	for (i = 0; i < nargs; i++)	3711	for (i = 0; i < nargs; i++)
3692	{	3712	{
3693	state = -1;	3713	state = -1;
3694		3714
3695	/* basic handling */	3715	/* basic handling */
3696	for (j = 0; j < ARRAY_LENGTH(argtopriv); j++)	3716	for (j = 0; j < ecb_array_length (argtopriv); j++)
3697	if (argtopriv[j].argval == arg[i])	3717	if (argtopriv[j].argval == arg[i])
3698	{	3718	{
3699	state = privcases (mode, argtopriv[j].bit);	3719	state = privcases (mode, argtopriv[j].bit);
3700	break;	3720	break;
3701	}	3721	}
…		…
3727	case 2: /* VT52 mode */	3747	case 2: /* VT52 mode */
3728	/* oddball mode. should be set regardless of set/reset	3748	/* oddball mode. should be set regardless of set/reset
3729	* parameter. Return from VT52 mode with an ESC < from	3749	* parameter. Return from VT52 mode with an ESC < from
3730	* within VT52 mode	3750	* within VT52 mode
3731	*/	3751	*/
3732	set_privmode (PrivMode_vt52, 1);	3752	priv_modes \|= PrivMode_vt52;
3733	break;	3753	break;
3734	case 3: /* 80/132 */	3754	case 3: /* 80/132 */
3735	if (priv_modes & PrivMode_132OK)	3755	if (priv_modes & PrivMode_132OK)
3736	set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);	3756	set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3737	break;	3757	break;
…		…
3752	if (state) /* orthogonal */	3772	if (state) /* orthogonal */
3753	priv_modes &= ~(PrivMode_MouseX11\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);	3773	priv_modes &= ~(PrivMode_MouseX11\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);
3754	break;	3774	break;
3755	#ifdef scrollBar_esc	3775	#ifdef scrollBar_esc
3756	case scrollBar_esc:	3776	case scrollBar_esc:
3757	if (scrollBar.map (state))	3777	scrollBar.map (state);
3758	{
3759	resize_all_windows (0, 0, 0);	3778	resize_all_windows (0, 0, 0);
3760	scr_touch (true);	3779	scr_touch (true);
3761	}
3762	break;	3780	break;
3763	#endif	3781	#endif
3764	case 25: /* visible/invisible cursor */	3782	case 25: /* visible/invisible cursor */
3765	scr_cursor_visible (state);	3783	scr_cursor_visible (state);
3766	break;	3784	break;
…		…
3821	}	3839	}
3822	}	3840	}
3823	/}}} /	3841	/}}} /
3824		3842
3825	/{{{ process sgr sequences /	3843	/{{{ process sgr sequences /
3826	void	3844	void ecb_hot
3827	rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)	3845	rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3828	{	3846	{
3829	unsigned int i;	3847	unsigned int i;
3830	short rendset;	3848	short rendset;
3831	int rendstyle;	3849	int rendstyle;

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.481 by root, Thu Mar 24 17:34:28 2011 UTC vs. Revision 1.529 by sf-exg, Sun Dec 30 15:05:19 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.481 by root, Thu Mar 24 17:34:28 2011 UTC vs.
Revision 1.529 by sf-exg, Sun Dec 30 15:05:19 2012 UTC