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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.492 by sf-exg, Sun Aug 21 20:13:58 2011 UTC vs.
Revision 1.541 by root, Thu Feb 20 18:59:13 2014 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 = iso14755buf & ISO_14755_MASK;	266	wchar_t ch = iso14755buf & ISO_14755_MASK;
263		267
264	if (iso14755buf & ISO_14755_51)	268	if (iso14755buf & ISO_14755_51)
…		…
282	}	286	}
283		287
284	iso14755buf = 0;	288	iso14755buf = 0;
285	}	289	}
286		290
287	static int	291	static int ecb_cold
288	hex_keyval (XKeyEvent &ev)	292	hex_keyval (XKeyEvent &ev)
289	{	293	{
290	// check whether this event corresponds to a hex digit	294	// check whether this event corresponds to a hex digit
291	// if the modifiers had not been pressed.	295	// if the modifiers had not been pressed.
292	for (int index = 0; index < 8; index++)	296	for (int index = 0; index < 8; index++)
…		…
301		305
302	return -1;	306	return -1;
303	}	307	}
304	#endif	308	#endif
305		309
306	static inline KeySym	310	static inline KeySym ecb_cold
307	translate_keypad (KeySym keysym, bool kp)	311	translate_keypad (KeySym keysym, bool kp)
308	{	312	{
309	#ifdef XK_KP_Home	313	#ifdef XK_KP_Home
310	static const KeySym keypadtrans[] = {	314	static const KeySym keypadtrans[] = {
311	XK_KP_7, // XK_KP_Home	315	XK_KP_7, // XK_KP_Home
…		…
337	# endif	341	# endif
338	#endif	342	#endif
339	return keysym;	343	return keysym;
340	}	344	}
341		345
342	static inline int	346	static inline int ecb_cold
343	map_function_key (KeySym keysym)	347	map_function_key (KeySym keysym)
344	{	348	{
345	int param = 0;	349	int param = 0;
346		350
347	if (IN_RANGE_INC (keysym, XK_F1, XK_F35))	351	if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
…		…
396	break;	400	break;
397	}	401	}
398	return param;	402	return param;
399	}	403	}
400		404
401	void	405	void ecb_cold
402	rxvt_term::key_press (XKeyEvent &ev)	406	rxvt_term::key_press (XKeyEvent &ev)
403	{	407	{
404	int ctrl, meta, shft, len;	408	int ctrl, meta, shft, len;
405	KeySym keysym;	409	KeySym keysym;
406	int valid_keysym;	410	int valid_keysym;
…		…
421	ctrl = ev.state & ControlMask;	425	ctrl = ev.state & ControlMask;
422	meta = ev.state & ModMetaMask;	426	meta = ev.state & ModMetaMask;
423		427
424	kbuf[0] = 0;	428	kbuf[0] = 0;
425		429
426	#ifdef USE_XIM	430	#if USE_XIM
427	if (Input_Context)	431	if (Input_Context)
428	{	432	{
429	Status status_return;	433	Status status_return;
430		434
431	#if 0	435	#if 0
…		…
506	#endif	510	#endif
507	max_it (lnsppg, 1);	511	max_it (lnsppg, 1);
508		512
509	if (keysym == XK_Prior)	513	if (keysym == XK_Prior)
510	{	514	{
511	scr_page (UP, lnsppg);	515	scr_page (lnsppg);
512	return;	516	return;
513	}	517	}
514	else if (keysym == XK_Next)	518	else if (keysym == XK_Next)
515	{	519	{
516	scr_page (DN, lnsppg);	520	scr_page (-lnsppg);
517	return;	521	return;
518	}	522	}
519	}	523	}
520	#ifdef SCROLL_ON_UPDOWN_KEYS	524	#ifdef SCROLL_ON_UPDOWN_KEYS
521	if (IS_SCROLL_MOD)	525	if (IS_SCROLL_MOD)
522	{	526	{
523	if (keysym == XK_Up)	527	if (keysym == XK_Up)
524	{	528	{
525	scr_page (UP, 1);	529	scr_page (1);
526	return;	530	return;
527	}	531	}
528	else if (keysym == XK_Down)	532	else if (keysym == XK_Down)
529	{	533	{
530	scr_page (DN, 1);	534	scr_page (-1);
531	return;	535	return;
532	}	536	}
533	}	537	}
534	#endif	538	#endif
535	#ifdef SCROLL_ON_HOMEEND_KEYS	539	#ifdef SCROLL_ON_HOMEEND_KEYS
536	if (IS_SCROLL_MOD)	540	if (IS_SCROLL_MOD)
537	{	541	{
538	if (keysym == XK_Home)	542	if (keysym == XK_Home)
539	{	543	{
540	scr_move_to (0, 1);	544	scr_changeview (top_row);
541	return;	545	return;
542	}	546	}
543	else if (keysym == XK_End)	547	else if (keysym == XK_End)
544	{	548	{
545	scr_move_to (1, 1);	549	scr_changeview (0);
546	return;	550	return;
547	}	551	}
548	}	552	}
549	#endif	553	#endif
550	}	554	}
…		…
776	}	780	}
777		781
778	if (newlen)	782	if (newlen)
779	len = strlen (kbuf);	783	len = strlen (kbuf);
780		784
		785	if (len > 0)
		786	{
781	/*	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	/*
782	* Pass meta for all function keys, if 'meta' option set	800	* Pass meta for all function keys, if 'meta' option set
783	*/	801	*/
784	#ifdef META8_OPTION	802	#ifdef META8_OPTION
785	if (meta && (meta_char == 0x80) && len > 0)	803	if (meta && (meta_char == 0x80))
786	kbuf[len - 1] \|= 0x80;	804	kbuf[len - 1] \|= 0x80;
787	#endif	805	#endif
		806	}
788		807
789	}	808	}
790	else if (ctrl && keysym == XK_minus)	809	else if (ctrl && keysym == XK_minus)
791	{	810	{
792	len = 1;	811	len = 1;
…		…
826	{	845	{
827	view_start = 0;	846	view_start = 0;
828	want_refresh = 1;	847	want_refresh = 1;
829	}	848	}
830		849
831	/*
832	* these modifications only affect the static keybuffer
833	* pass Shift/Control indicators for function keys ending with `~'
834	*
835	* eg,
836	* Prior = "ESC[5~"
837	* Shift+Prior = "ESC[5$"
838	* Ctrl+Prior = "ESC[5^"
839	* Ctrl+Shift+Prior = "ESC[5@"
840	* Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
841	*/
842	if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
843	kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
844
845	/* escape prefix */	850	/* escape prefix */
846	if (meta	851	if (meta
847	#ifdef META8_OPTION	852	#ifdef META8_OPTION
848	&& meta_char == C0_ESC	853	&& meta_char == C0_ESC
849	#endif	854	#endif
…		…
854	}	859	}
855		860
856	tt_write (kbuf, (unsigned int)len);	861	tt_write (kbuf, (unsigned int)len);
857	}	862	}
858		863
859	void	864	void ecb_cold
860	rxvt_term::key_release (XKeyEvent &ev)	865	rxvt_term::key_release (XKeyEvent &ev)
861	{	866	{
862	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ISO_14755 \|\| ENABLE_PERL	867	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ISO_14755 \|\| ENABLE_PERL
863	KeySym keysym;	868	KeySym keysym;
864		869
…		…
936	void	941	void
937	rxvt_term::flush ()	942	rxvt_term::flush ()
938	{	943	{
939	flush_ev.stop ();	944	flush_ev.stop ();
940		945
941	#ifdef HAVE_BG_PIXMAP	946	#ifdef HAVE_IMG
942	if (bg_flags & BG_NEEDS_REFRESH)	947	if (bg_flags & BG_NEEDS_REFRESH)
943	{	948	{
944	bg_flags &= ~BG_NEEDS_REFRESH;	949	bg_flags &= ~BG_NEEDS_REFRESH;
945	scr_touch (false);	950	scr_touch (false);
946	}	951	}
…		…
986	while (row < end_row);	991	while (row < end_row);
987	}	992	}
988		993
989	scr_refresh ();	994	scr_refresh ();
990	scrollBar.show (1);	995	scrollBar.show (1);
991	#ifdef USE_XIM	996	#if USE_XIM
992	im_send_spot ();	997	im_send_spot ();
993	#endif	998	#endif
994	}	999	}
995		1000
996	display->flush ();	1001	display->flush ();
…		…
1015	flush ();	1020	flush ();
1016	}	1021	}
1017		1022
1018	#ifdef CURSOR_BLINK	1023	#ifdef CURSOR_BLINK
1019	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
1020	rxvt_term::cursor_blink_cb (ev::timer &w, int revents)	1040	rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1021	{	1041	{
1022	hidden_cursor = !hidden_cursor;	1042	hidden_cursor = !hidden_cursor;
1023	want_refresh = 1;	1043	want_refresh = 1;
1024	refresh_check ();	1044	refresh_check ();
…		…
1042		1062
1043	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	1063	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1044	void	1064	void
1045	rxvt_term::cont_scroll_cb (ev::timer &w, int revents)	1065	rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1046	{	1066	{
1047	if ((scrollBar.state == STATE_UP \|\| scrollBar.state == STATE_DOWN)	1067	if ((scrollBar.state == SB_STATE_UP \|\| scrollBar.state == SB_STATE_DOWN)
1048	&& scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))	1068	&& scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1049	{	1069	{
1050	want_refresh = 1;	1070	want_refresh = 1;
1051	refresh_check ();	1071	refresh_check ();
1052	}	1072	}
1053	else	1073	else
…		…
1057		1077
1058	#ifdef SELECTION_SCROLLING	1078	#ifdef SELECTION_SCROLLING
1059	void	1079	void
1060	rxvt_term::sel_scroll_cb (ev::timer &w, int revents)	1080	rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1061	{	1081	{
1062	if (scr_page (scroll_selection_dir, scroll_selection_lines))	1082	if (scr_page (scroll_selection_lines))
1063	{	1083	{
1064	selection_extend (selection_save_x, selection_save_y, selection_save_state);	1084	selection_extend (selection_save_x, selection_save_y, selection_save_state);
1065	want_refresh = 1;	1085	want_refresh = 1;
1066	refresh_check ();	1086	refresh_check ();
1067	}	1087	}
…		…
1072		1092
1073	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	1093	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1074	void	1094	void
1075	rxvt_term::slip_wheel_cb (ev::timer &w, int revents)	1095	rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1076	{	1096	{
1077	if (scr_changeview (view_start - mouse_slip_wheel_speed))	1097	if (scr_page (mouse_slip_wheel_speed))
1078	{	1098	{
1079	want_refresh = 1;	1099	want_refresh = 1;
1080	refresh_check ();	1100	refresh_check ();
1081	}	1101	}
1082		1102
…		…
1203	pty_write ();	1223	pty_write ();
1204		1224
1205	refresh_check ();	1225	refresh_check ();
1206	}	1226	}
1207		1227
1208	void	1228	void ecb_cold
1209	rxvt_term::pointer_unblank ()	1229	rxvt_term::pointer_unblank ()
1210	{	1230	{
1211	XDefineCursor (dpy, vt, TermWin_cursor);	1231	XDefineCursor (dpy, vt, TermWin_cursor);
1212	recolour_cursor ();	1232	recolour_cursor ();
1213		1233
…		…
1218	pointer_ev.start (pointerBlankDelay);	1238	pointer_ev.start (pointerBlankDelay);
1219	#endif	1239	#endif
1220	}	1240	}
1221		1241
1222	#ifdef POINTER_BLANK	1242	#ifdef POINTER_BLANK
1223	void	1243	void ecb_cold
1224	rxvt_term::pointer_blank ()	1244	rxvt_term::pointer_blank ()
1225	{	1245	{
1226	if (!option (Opt_pointerBlank))	1246	if (!option (Opt_pointerBlank))
1227	return;	1247	return;
1228		1248
…		…
1230	XFlush (dpy);	1250	XFlush (dpy);
1231		1251
1232	hidden_pointer = 1;	1252	hidden_pointer = 1;
1233	}	1253	}
1234		1254
1235	void	1255	void ecb_cold
1236	rxvt_term::pointer_cb (ev::timer &w, int revents)	1256	rxvt_term::pointer_cb (ev::timer &w, int revents)
1237	{	1257	{
1238	make_current ();	1258	make_current ();
1239		1259
1240	pointer_blank ();	1260	pointer_blank ();
…		…
1332	32 + x,	1352	32 + x,
1333	32 + y);	1353	32 + y);
1334	}	1354	}
1335		1355
1336	/{{{ process an X event /	1356	/{{{ process an X event /
1337	void	1357	void ecb_hot
1338	rxvt_term::x_cb (XEvent &ev)	1358	rxvt_term::x_cb (XEvent &ev)
1339	{	1359	{
1340	make_current ();	1360	make_current ();
1341		1361
1342	dLocal (Display *, dpy);	1362	dLocal (Display *, dpy);
…		…
1445	if (ev.xconfigure.window == parent)	1465	if (ev.xconfigure.window == parent)
1446	{	1466	{
1447	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))	1467	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1448	;	1468	;
1449		1469
		1470	bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
		1471
		1472	bool moved = false;
1450	#ifdef HAVE_BG_PIXMAP	1473	#ifdef HAVE_BG_PIXMAP
1451	bool moved = false;
1452	if (bg_window_position_sensitive ())	1474	if (bg_window_position_sensitive ())
1453	{	1475	{
		1476	want_position_change = true;
		1477	if (bg_img == 0)
		1478	moved = true;
		1479	}
		1480	#endif
		1481
		1482	if (want_position_change)
		1483	{
1454	int x, y;	1484	int x, y;
		1485
1455	if (ev.xconfigure.send_event)	1486	if (ev.xconfigure.send_event)
1456	{	1487	{
1457	x = ev.xconfigure.x;	1488	x = ev.xconfigure.x;
1458	y = ev.xconfigure.y;	1489	y = ev.xconfigure.y;
1459	}	1490	}
1460	else	1491	else
1461	get_window_origin (x, y);	1492	get_window_origin (x, y);
1462		1493
1463	if (bg_set_position (x, y)	1494	if (x != parent_x \|\| y != parent_y)
1464	\|\| !(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));
1465	moved = true;	1499	moved = true;
		1500	}
1466	}	1501	}
1467	#endif
1468		1502
1469	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)	1503	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)
1470	{	1504	{
1471	seen_resize = 1;	1505	seen_resize = 1;
1472	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1506	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
…		…
1495	selection_send (ev.xselectionrequest);	1529	selection_send (ev.xselectionrequest);
1496	break;	1530	break;
1497		1531
1498	case MapNotify:	1532	case MapNotify:
1499	#ifdef HAVE_BG_PIXMAP	1533	#ifdef HAVE_BG_PIXMAP
1500	/* 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
1501	* non-reparenting window manager. In those cases we never get first	1535	// or a non-reparenting window manager and also because we
1502	* ConfigureNotify. Also that speeds startup under normal WM, by taking	1536	// defer bg image updates if the window is not mapped. The
1503	* care of multiplicity of ConfigureNotify events arriving while WM does	1537	// short delay is to optimize for multiple ConfigureNotify
1504	* reparenting.	1538	// events at startup when the window manager reparents the
1505	* We should not render background immediately, as there could be several	1539	// window, so as to perform the computation after we have
1506	* ConfigureNotify's to follow. Lets take care of all of them in one scoop	1540	// received all of them.
1507	* by scheduling background redraw as soon as we can, but giving a short	1541	if (bg_img == 0)
1508	* bit of time for ConfigureNotifies to arrive.
1509	* We should render background PRIOR to drawing any text, but AFTER all
1510	* of ConfigureNotifys for the best results.
1511	*/
1512	if (!(bg_flags & BG_IS_VALID))
1513	update_background_ev.start (0.025);	1542	update_background_ev.start (0.025);
1514	#endif	1543	#endif
1515	mapped = 1;	1544	mapped = 1;
1516	#ifdef TEXT_BLINK	1545	#ifdef TEXT_BLINK
1517	text_blink_ev.start ();	1546	text_blink_ev.start ();
…		…
1557	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))	1586	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1558	;	1587	;
1559		1588
1560	if (scrollBar.state && ev.xany.window == scrollBar.win)	1589	if (scrollBar.state && ev.xany.window == scrollBar.win)
1561	{	1590	{
1562	scrollBar.state = STATE_IDLE;	1591	scrollBar.state = SB_STATE_IDLE;
1563	scrollBar.show (0);	1592	scrollBar.show (0);
1564	}	1593	}
1565	}	1594	}
1566	break;	1595	break;
1567		1596
…		…
1609		1638
1610	#ifdef SELECTION_SCROLLING	1639	#ifdef SELECTION_SCROLLING
1611	if (ev.xbutton.y < int_bwidth	1640	if (ev.xbutton.y < int_bwidth
1612	\|\| Pixel2Row (ev.xbutton.y) > (nrow-1))	1641	\|\| Pixel2Row (ev.xbutton.y) > (nrow-1))
1613	{	1642	{
		1643	page_dirn scroll_selection_dir;
1614	int dist;	1644	int dist;
1615		1645
1616	/* don't clobber the current delay if we are	1646	/* don't clobber the current delay if we are
1617	* already in the middle of scrolling.	1647	* already in the middle of scrolling.
1618	*/	1648	*/
…		…
1633	dist = int_bwidth - ev.xbutton.y;	1663	dist = int_bwidth - ev.xbutton.y;
1634	}	1664	}
1635	else	1665	else
1636	{	1666	{
1637	scroll_selection_dir = DN;	1667	scroll_selection_dir = DN;
1638	dist = ev.xbutton.y - (int_bwidth + height);	1668	dist = ev.xbutton.y - (int_bwidth + vt_height);
1639	}	1669	}
1640		1670
1641	scroll_selection_lines = Pixel2Height (dist)	1671	scroll_selection_lines = Pixel2Height (dist)
1642	/ SELECTION_SCROLL_LINE_SPEEDUP	1672	/ SELECTION_SCROLL_LINE_SPEEDUP
1643	+ 1;	1673	+ 1;
1644	min_it (scroll_selection_lines,	1674	min_it (scroll_selection_lines,
1645	SELECTION_SCROLL_MAX_LINES);	1675	SELECTION_SCROLL_MAX_LINES);
		1676	scroll_selection_lines *= scroll_selection_dir;
1646	}	1677	}
1647	else	1678	else
1648	{	1679	{
1649	/* we are within the text window, so we	1680	/* we are within the text window, so we
1650	* shouldn't be scrolling	1681	* shouldn't be scrolling
…		…
1655	#ifdef MOUSE_THRESHOLD	1686	#ifdef MOUSE_THRESHOLD
1656	}	1687	}
1657	#endif	1688	#endif
1658	}	1689	}
1659	}	1690	}
1660	else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)	1691	else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1661	{	1692	{
1662	while (XCheckTypedWindowEvent (dpy, scrollBar.win,	1693	while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1663	MotionNotify, &ev))	1694	MotionNotify, &ev))
1664	;	1695	;
1665		1696
1666	XQueryPointer (dpy, scrollBar.win,	1697	XQueryPointer (dpy, scrollBar.win,
1667	&unused_root, &unused_child,	1698	&unused_root, &unused_child,
1668	&unused_root_x, &unused_root_y,	1699	&unused_root_x, &unused_root_y,
1669	&ev.xbutton.x, &ev.xbutton.y,	1700	&ev.xbutton.x, &ev.xbutton.y,
1670	&unused_mask);	1701	&unused_mask);
1671	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1702	scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1672	scrollBar.size ());	1703	scrollBar.size ());
1673	want_refresh = 1;	1704	want_refresh = 1;
1674	scrollBar.show (1);	1705	scrollBar.show (1);
1675	}	1706	}
1676	break;	1707	break;
1677	}	1708	}
1678		1709
1679	#if defined(CURSOR_BLINK)	1710	#if defined(CURSOR_BLINK)
1680	if (option (Opt_cursorBlink) && ev.type == KeyPress)	1711	if (ev.type == KeyPress)
1681	{
1682	if (hidden_cursor)
1683	{
1684	hidden_cursor = 0;
1685	want_refresh = 1;
1686	}
1687
1688	cursor_blink_ev.again ();	1712	cursor_blink_reset ();
1689	}
1690	#endif	1713	#endif
1691		1714
1692	#if defined(POINTER_BLANK)	1715	#if defined(POINTER_BLANK)
1693	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)	1716	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1694	{	1717	{
…		…
1705		1728
1706	refresh_check ();	1729	refresh_check ();
1707	}	1730	}
1708		1731
1709	#if ENABLE_FRILLS	1732	#if ENABLE_FRILLS
1710	void	1733	void ecb_cold
1711	rxvt_term::set_urgency (bool enable)	1734	rxvt_term::set_urgency (bool enable)
1712	{	1735	{
1713	if (enable == urgency_hint)	1736	if (enable == urgency_hint)
1714	return;	1737	return;
1715		1738
1716	if (XWMHints *h = XGetWMHints (dpy, parent))	1739	if (XWMHints *h = XGetWMHints (dpy, parent))
1717	{	1740	{
1718	h->flags = h->flags & ~XUrgencyHint \| (enable ? XUrgencyHint : 0);	1741	h->flags = h->flags & ~XUrgencyHint \| (enable ? XUrgencyHint : 0);
1719	XSetWMHints (dpy, parent, h);	1742	XSetWMHints (dpy, parent, h);
1720	urgency_hint = enable;	1743	urgency_hint = enable;
		1744	XFree (h);
1721	}	1745	}
1722	}	1746	}
1723	#endif	1747	#endif
1724		1748
1725	void	1749	void ecb_cold
1726	rxvt_term::focus_in ()	1750	rxvt_term::focus_in ()
1727	{	1751	{
1728	if (!focus)	1752	if (!focus)
1729	{	1753	{
1730	focus = 1;	1754	focus = 1;
…		…
1755		1779
1756	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));	1780	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1757	}	1781	}
1758	}	1782	}
1759		1783
1760	void	1784	void ecb_cold
1761	rxvt_term::focus_out ()	1785	rxvt_term::focus_out ()
1762	{	1786	{
1763	if (focus)	1787	if (focus)
1764	{	1788	{
1765	focus = 0;	1789	focus = 0;
…		…
1798		1822
1799	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));	1823	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1800	}	1824	}
1801	}	1825	}
1802		1826
1803	void	1827	void ecb_cold
1804	rxvt_term::update_fade_color (unsigned int idx)	1828	rxvt_term::update_fade_color (unsigned int idx)
1805	{	1829	{
1806	#if OFF_FOCUS_FADING	1830	#if OFF_FOCUS_FADING
1807	if (rs[Rs_fade])	1831	if (rs[Rs_fade])
1808	{	1832	{
…		…
1811	pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);	1835	pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1812	}	1836	}
1813	#endif	1837	#endif
1814	}	1838	}
1815		1839
1816	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	1840	#if BG_IMAGE_FROM_ROOT \|\| ENABLE_PERL
1817	void	1841	void ecb_hot
1818	rxvt_term::rootwin_cb (XEvent &ev)	1842	rxvt_term::rootwin_cb (XEvent &ev)
1819	{	1843	{
1820	make_current ();	1844	make_current ();
1821		1845
1822	if (SHOULD_INVOKE (HOOK_ROOT_EVENT)	1846	if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1823	&& HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))	1847	&& HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1824	return;	1848	return;
1825		1849
1826	# if ENABLE_TRANSPARENCY
1827	switch (ev.type)	1850	switch (ev.type)
1828	{	1851	{
1829	case PropertyNotify:	1852	case PropertyNotify:
1830	/*	1853	/*
1831	* if user used some Esetroot compatible prog to set the root bg,	1854	* if user used some Esetroot compatible prog to set the root bg,
1832	* use the property to determine the pixmap. We use it later on.	1855	* use the property to determine the pixmap. We use it later on.
1833	*/	1856	*/
1834	if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]	1857	if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1835	\|\| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])	1858	\|\| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1836	{	1859	{
1837	bg_set_root_pixmap ();	1860	#if BG_IMAGE_FROM_ROOT
		1861	if (option (Opt_transparent))
		1862	{
		1863	rxvt_img::new_from_root (this)->replace (root_img);
1838	update_background ();	1864	update_background ();
		1865	}
		1866	#endif
		1867	HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1839	}	1868	}
1840		1869
1841	break;	1870	break;
1842	}	1871	}
1843	# endif
1844		1872
1845	refresh_check ();	1873	refresh_check ();
1846	}	1874	}
1847	#endif	1875	#endif
1848		1876
…		…
1972	if (scrollBar.upButton (ev.y))	2000	if (scrollBar.upButton (ev.y))
1973	direction = UP; /* up */	2001	direction = UP; /* up */
1974	else if (scrollBar.dnButton (ev.y))	2002	else if (scrollBar.dnButton (ev.y))
1975	direction = DN; /* down */	2003	direction = DN; /* down */
1976		2004
1977	scrollBar.state = STATE_IDLE;	2005	scrollBar.state = SB_STATE_IDLE;
1978	/*	2006	/*
1979	* Rxvt-style scrollbar:	2007	* Rxvt-style scrollbar:
1980	* move up if mouse is above slider	2008	* move up if mouse is above slider
1981	* move dn if mouse is below slider	2009	* move dn if mouse is below slider
1982	*	2010	*
…		…
2021	cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);	2049	cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2022	#endif	2050	#endif
2023	if (scr_page (direction, 1))	2051	if (scr_page (direction, 1))
2024	{	2052	{
2025	if (direction == UP)	2053	if (direction == UP)
2026	scrollBar.state = STATE_UP;	2054	scrollBar.state = SB_STATE_UP;
2027	else	2055	else
2028	scrollBar.state = STATE_DOWN;	2056	scrollBar.state = SB_STATE_DOWN;
2029	}	2057	}
2030	}	2058	}
2031	else	2059	else
2032	switch (ev.button)	2060	switch (ev.button)
2033	{	2061	{
2034	case Button2:	2062	case Button2:
2035	switch (scrollBar.align)	2063	switch (scrollBar.align)
2036	{	2064	{
2037	case R_SB_ALIGN_TOP:	2065	case SB_ALIGN_TOP:
2038	csrO = 0;	2066	csrO = 0;
2039	break;	2067	break;
2040	case R_SB_ALIGN_CENTRE:	2068	case SB_ALIGN_CENTRE:
2041	csrO = (scrollBar.bot - scrollBar.top) / 2;	2069	csrO = (scrollBar.bot - scrollBar.top) / 2;
2042	break;	2070	break;
2043	case R_SB_ALIGN_BOTTOM:	2071	case SB_ALIGN_BOTTOM:
2044	csrO = scrollBar.bot - scrollBar.top;	2072	csrO = scrollBar.bot - scrollBar.top;
2045	break;	2073	break;
2046	}	2074	}
2047		2075
2048	if (scrollBar.style == R_SB_XTERM	2076	if (scrollBar.style == SB_STYLE_XTERM
2049	\|\| scrollbar_above_slider (ev.y)	2077	\|\| scrollBar.above_slider (ev.y)
2050	\|\| scrollbar_below_slider (ev.y))	2078	\|\| scrollBar.below_slider (ev.y))
2051	scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());	2079	scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2052		2080
2053	scrollBar.state = STATE_MOTION;	2081	scrollBar.state = SB_STATE_MOTION;
2054	break;	2082	break;
2055		2083
2056	case Button1:	2084	case Button1:
2057	if (scrollBar.align == R_SB_ALIGN_CENTRE)	2085	if (scrollBar.align == SB_ALIGN_CENTRE)
2058	csrO = ev.y - scrollBar.top;	2086	csrO = ev.y - scrollBar.top;
2059	/* FALLTHROUGH */	2087	/* FALLTHROUGH */
2060		2088
2061	case Button3:	2089	case Button3:
2062	if (scrollBar.style != R_SB_XTERM)	2090	if (scrollBar.style != SB_STYLE_XTERM)
2063	{	2091	{
2064	if (scrollbar_above_slider (ev.y))	2092	if (scrollBar.above_slider (ev.y))
2065	# ifdef RXVT_SCROLL_FULL	2093	# ifdef RXVT_SCROLL_FULL
2066	scr_page (UP, nrow - 1);	2094	scr_page (UP, nrow - 1);
2067	# else	2095	# else
2068	scr_page (UP, nrow / 4);	2096	scr_page (UP, nrow / 4);
2069	# endif	2097	# endif
2070	else if (scrollbar_below_slider (ev.y))	2098	else if (scrollBar.below_slider (ev.y))
2071	# ifdef RXVT_SCROLL_FULL	2099	# ifdef RXVT_SCROLL_FULL
2072	scr_page (DN, nrow - 1);	2100	scr_page (DN, nrow - 1);
2073	# else	2101	# else
2074	scr_page (DN, nrow / 4);	2102	scr_page (DN, nrow / 4);
2075	# endif	2103	# endif
2076	else	2104	else
2077	scrollBar.state = STATE_MOTION;	2105	scrollBar.state = SB_STATE_MOTION;
2078	}	2106	}
2079	else	2107	else
2080	{	2108	{
2081	scr_page ((ev.button == Button1 ? DN : UP),	2109	scr_page ((ev.button == Button1 ? DN : UP),
2082	(nrow	2110	(nrow
2083	* scrollbar_position (ev.y)	2111	* scrollBar.position (ev.y)
2084	/ scrollBar.size ()));	2112	/ scrollBar.size ()));
2085	}	2113	}
2086		2114
2087	break;	2115	break;
2088	}	2116	}
…		…
2099		2127
2100	csrO = 0; /* reset csr Offset */	2128	csrO = 0; /* reset csr Offset */
2101	if (!bypass_keystate)	2129	if (!bypass_keystate)
2102	reportmode = !! (priv_modes & PrivMode_mouse_report);	2130	reportmode = !! (priv_modes & PrivMode_mouse_report);
2103		2131
2104	if (scrollBar.state == STATE_UP \|\| scrollBar.state == STATE_DOWN)	2132	if (scrollBar.state == SB_STATE_UP \|\| scrollBar.state == SB_STATE_DOWN)
2105	{	2133	{
2106	scrollBar.state = STATE_IDLE;	2134	scrollBar.state = SB_STATE_IDLE;
2107	scrollBar.show (0);	2135	scrollBar.show (0);
2108	}	2136	}
2109		2137
2110	#ifdef SELECTION_SCROLLING	2138	#ifdef SELECTION_SCROLLING
2111	sel_scroll_ev.stop();	2139	sel_scroll_ev.stop();
…		…
2161	case Button3:	2189	case Button3:
2162	selection_make (ev.time);	2190	selection_make (ev.time);
2163	break;	2191	break;
2164		2192
2165	case Button2:	2193	case Button2:
2166	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?	2194	if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2167	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);	2195	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2168	break;	2196	break;
2169		2197
2170	#ifdef MOUSE_WHEEL	2198	#ifdef MOUSE_WHEEL
2171	case Button4:	2199	case Button4:
2172	case Button5:	2200	case Button5:
2173	{	2201	{
2174	int i;	2202	int lines;
2175	page_dirn v;	2203	page_dirn dirn;
2176		2204
2177	v = ev.button == Button4 ? UP : DN;	2205	dirn = ev.button == Button4 ? UP : DN;
2178		2206
2179	if (ev.state & ShiftMask)	2207	if (ev.state & ShiftMask)
2180	i = 1;	2208	lines = 1;
2181	else if (option (Opt_mouseWheelScrollPage))	2209	else if (option (Opt_mouseWheelScrollPage))
2182	i = nrow - 1;	2210	lines = nrow - 1;
2183	else	2211	else
2184	i = 5;	2212	lines = 5;
2185		2213
2186	# ifdef MOUSE_SLIP_WHEELING	2214	# ifdef MOUSE_SLIP_WHEELING
2187	if (ev.state & ControlMask)	2215	if (ev.state & ControlMask)
2188	{	2216	{
2189	mouse_slip_wheel_speed += v ? -1 : 1;	2217	mouse_slip_wheel_speed += dirn;
2190	if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;	2218	clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2191	if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2192		2219
2193	if (!slip_wheel_ev.is_active ())	2220	if (!slip_wheel_ev.is_active ())
2194	slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);	2221	slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2195	}	2222	}
2196	else	2223	else
2197	# endif	2224	# endif
2198	{	2225	{
2199	scr_page (v, i);	2226	scr_page (dirn, lines);
2200	scrollBar.show (1);	2227	scrollBar.show (1);
2201	}	2228	}
2202	}	2229	}
2203	break;	2230	break;
2204	#endif	2231	#endif
…		…
2206	}	2233	}
2207	}	2234	}
2208		2235
2209	/}}} /	2236	/}}} /
2210		2237
2211	void	2238	void ecb_hot
2212	rxvt_term::cmd_parse ()	2239	rxvt_term::cmd_parse ()
2213	{	2240	{
2214	wchar_t ch = NOCHAR;	2241	wchar_t ch = NOCHAR;
2215	char *seq_begin; // remember start of esc-sequence here	2242	char *seq_begin; // remember start of esc-sequence here
2216		2243
…		…
2335	}	2362	}
2336	}	2363	}
2337	}	2364	}
2338		2365
2339	// read the next character	2366	// read the next character
2340	wchar_t	2367	wchar_t ecb_hot
2341	rxvt_term::next_char () NOTHROW	2368	rxvt_term::next_char () NOTHROW
2342	{	2369	{
2343	while (cmdbuf_ptr < cmdbuf_endp)	2370	while (cmdbuf_ptr < cmdbuf_endp)
2344	{	2371	{
2345	// assume 7-bit to be ascii ALWAYS	2372	// assume 7-bit to be ascii ALWAYS
…		…
2357	}	2384	}
2358		2385
2359	if (len == (size_t)-1)	2386	if (len == (size_t)-1)
2360	{	2387	{
2361	mbstate.reset (); // reset now undefined conversion state	2388	mbstate.reset (); // reset now undefined conversion state
		2389	// a -1 might indicate that a previous incomplete char is invalid (previous return -2)
		2390	// in which case we "erroneously" return the next byte which might be valid.
2362	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through	2391	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2363	}	2392	}
2364		2393
2365	// assume wchar == unicode	2394	// assume wchar == unicode
2366	cmdbuf_ptr += len;	2395	cmdbuf_ptr += len;
…		…
2369		2398
2370	return NOCHAR;	2399	return NOCHAR;
2371	}	2400	}
2372		2401
2373	// read the next octet	2402	// read the next octet
2374	uint32_t	2403	uint32_t ecb_hot
2375	rxvt_term::next_octet () NOTHROW	2404	rxvt_term::next_octet () NOTHROW
2376	{	2405	{
2377	return cmdbuf_ptr < cmdbuf_endp	2406	return cmdbuf_ptr < cmdbuf_endp
2378	? (unsigned char)*cmdbuf_ptr++	2407	? (unsigned char)*cmdbuf_ptr++
2379	: NOCHAR;	2408	: NOCHAR;
2380	}	2409	}
2381		2410
2382	static class out_of_input out_of_input;	2411	static class out_of_input out_of_input;
2383		2412
2384	wchar_t	2413	wchar_t ecb_hot
2385	rxvt_term::cmd_getc () THROW ((class out_of_input))	2414	rxvt_term::cmd_getc () THROW ((class out_of_input))
2386	{	2415	{
2387	wchar_t c = next_char ();	2416	wchar_t c = next_char ();
2388		2417
2389	if (c == NOCHAR)	2418	if (c == NOCHAR)
2390	throw out_of_input;	2419	throw out_of_input;
2391		2420
2392	return c;	2421	return c;
2393	}	2422	}
2394		2423
2395	uint32_t	2424	uint32_t ecb_hot
2396	rxvt_term::cmd_get8 () THROW ((class out_of_input))	2425	rxvt_term::cmd_get8 () THROW ((class out_of_input))
2397	{	2426	{
2398	uint32_t c = next_octet ();	2427	uint32_t c = next_octet ();
2399		2428
2400	if (c == NOCHAR)	2429	if (c == NOCHAR)
…		…
2404	}	2433	}
2405		2434
2406	/{{{ print pipe /	2435	/{{{ print pipe /
2407	/----------------------------------------------------------------------/	2436	/----------------------------------------------------------------------/
2408	#ifdef PRINTPIPE	2437	#ifdef PRINTPIPE
2409	FILE *	2438	FILE * ecb_cold
2410	rxvt_term::popen_printer ()	2439	rxvt_term::popen_printer ()
2411	{	2440	{
2412	FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");	2441	FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2413		2442
2414	if (stream == NULL)	2443	if (stream == NULL)
2415	rxvt_warn ("can't open printer pipe, not printing.\n");	2444	rxvt_warn ("can't open printer pipe, not printing.\n");
2416		2445
2417	return stream;	2446	return stream;
2418	}	2447	}
2419		2448
2420	int	2449	int ecb_cold
2421	rxvt_term::pclose_printer (FILE *stream)	2450	rxvt_term::pclose_printer (FILE *stream)
2422	{	2451	{
2423	fflush (stream);	2452	fflush (stream);
2424	return pclose (stream);	2453	return pclose (stream);
2425	}	2454	}
2426		2455
2427	/*	2456	/*
2428	* simulate attached vt100 printer	2457	* simulate attached vt100 printer
2429	*/	2458	*/
2430	void	2459	void ecb_cold
2431	rxvt_term::process_print_pipe ()	2460	rxvt_term::process_print_pipe ()
2432	{	2461	{
2433	FILE *fd = popen_printer ();	2462	FILE *fd = popen_printer ();
2434		2463
2435	if (!fd)	2464	if (!fd)
…		…
2490	C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,	2519	C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2491	C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,	2520	C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2492	};	2521	};
2493		2522
2494	/{{{ process non-printing single characters /	2523	/{{{ process non-printing single characters /
2495	void	2524	void ecb_hot
2496	rxvt_term::process_nonprinting (unicode_t ch)	2525	rxvt_term::process_nonprinting (unicode_t ch)
2497	{	2526	{
2498	switch (ch)	2527	switch (ch)
2499	{	2528	{
2500	case C0_ESC:	2529	case C0_ESC:
…		…
2546	}	2575	}
2547	/}}} /	2576	/}}} /
2548		2577
2549		2578
2550	/{{{ process VT52 escape sequences /	2579	/{{{ process VT52 escape sequences /
2551	void	2580	void ecb_cold
2552	rxvt_term::process_escape_vt52 (unicode_t ch)	2581	rxvt_term::process_escape_vt52 (unicode_t ch)
2553	{	2582	{
2554	int row, col;	2583	int row, col;
2555		2584
2556	switch (ch)	2585	switch (ch)
…		…
2590	break;	2619	break;
2591	case 'Z': /* identify the terminal type */	2620	case 'Z': /* identify the terminal type */
2592	tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */	2621	tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2593	break;	2622	break;
2594	case '<': /* turn off VT52 mode */	2623	case '<': /* turn off VT52 mode */
2595	set_privmode (PrivMode_vt52, 0);	2624	priv_modes &= ~PrivMode_vt52;
2596	break;	2625	break;
2597	case 'F': /* use special graphics character set */	2626	case 'F': /* use special graphics character set */
2598	case 'G': /* use regular character set */	2627	case 'G': /* use regular character set */
2599	/* unimplemented */	2628	/* unimplemented */
2600	break;	2629	break;
…		…
2606	}	2635	}
2607	/}}} /	2636	/}}} /
2608		2637
2609		2638
2610	/{{{ process escape sequences /	2639	/{{{ process escape sequences /
2611	void	2640	void ecb_hot
2612	rxvt_term::process_escape_seq ()	2641	rxvt_term::process_escape_seq ()
2613	{	2642	{
2614	unicode_t ch = cmd_getc ();	2643	unicode_t ch = cmd_getc ();
2615		2644
2616	if (priv_modes & PrivMode_vt52)	2645	if (priv_modes & PrivMode_vt52)
…		…
2653	scr_forwardindex ();	2682	scr_forwardindex ();
2654	break;	2683	break;
2655	#endif	2684	#endif
2656	// DECPAM/DECPNM	2685	// DECPAM/DECPNM
2657	case '=':	2686	case '=':
		2687	priv_modes \|= PrivMode_aplKP;
		2688	break;
2658	case '>':	2689	case '>':
2659	set_privmode (PrivMode_aplKP, ch == '=');	2690	priv_modes &= ~PrivMode_aplKP;
2660	break;	2691	break;
2661		2692
2662	case C1_40:	2693	case C1_40:
2663	cmd_getc ();	2694	cmd_getc ();
2664	break;	2695	break;
…		…
2766	make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */	2797	make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2767	make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */	2798	make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2768	make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, \|, }, ~, */	2799	make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, \|, }, ~, */
2769	};	2800	};
2770		2801
2771	void	2802	void ecb_hot
2772	rxvt_term::process_csi_seq ()	2803	rxvt_term::process_csi_seq ()
2773	{	2804	{
2774	unicode_t ch, priv, i;	2805	unicode_t ch, priv, prev_ch, i;
2775	unsigned int nargs, p;	2806	unsigned int nargs, p;
2776	int n, ndef;	2807	int n, ndef;
2777	int arg[ESC_ARGS] = { };	2808	int arg[ESC_ARGS] = { };
2778		2809
2779	nargs = 0;	2810	nargs = 0;
…		…
2785	/* '<' '=' '>' '?' '!' */	2816	/* '<' '=' '>' '?' '!' */
2786	priv = ch;	2817	priv = ch;
2787	ch = cmd_getc ();	2818	ch = cmd_getc ();
2788	}	2819	}
2789		2820
		2821	prev_ch = 0;
2790	/* read any numerical arguments */	2822	/* read any numerical arguments */
2791	for (n = -1; ch < CSI_ICH; )	2823	for (n = -1; ch < CSI_ICH; )
2792	{	2824	{
2793	if (isdigit (ch))	2825	if (isdigit (ch))
2794	{	2826	{
…		…
2804	n = -1;	2836	n = -1;
2805	}	2837	}
2806	else if (IS_CONTROL (ch))	2838	else if (IS_CONTROL (ch))
2807	process_nonprinting (ch);	2839	process_nonprinting (ch);
2808		2840
		2841	prev_ch = ch;
2809	ch = cmd_getc ();	2842	ch = cmd_getc ();
2810	}	2843	}
2811		2844
2812	if (ch > CSI_7F)	2845	if (ch > CSI_7F)
2813	return;	2846	return;
…		…
2883	}	2916	}
2884	break;	2917	break;
2885	#endif	2918	#endif
2886		2919
2887	case CSI_CUU: /* 8.3.22: (1) CURSOR UP */	2920	case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2888	case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */	2921	case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2889	arg[0] = -arg[0];	2922	arg[0] = -arg[0];
2890	/* FALLTHROUGH */	2923	/* FALLTHROUGH */
2891	case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */	2924	case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2892	case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */	2925	case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2893	scr_gotorc (arg[0], 0, RELATIVE);	2926	scr_gotorc (arg[0], 0, RELATIVE);
2894	break;	2927	break;
2895		2928
2896	case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */	2929	case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2897	case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */	2930	case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
…		…
3047	scr_insert_mode (1);	3080	scr_insert_mode (1);
3048	else if (arg[0] == 20)	3081	else if (arg[0] == 20)
3049	priv_modes \|= PrivMode_LFNL;	3082	priv_modes \|= PrivMode_LFNL;
3050	break;	3083	break;
3051		3084
		3085	case CSI_71: // DESCUSR: set cursor style
		3086	if (prev_ch == ' ')
		3087	set_cursor_style (arg[0]);
		3088	break;
		3089
3052	/*	3090	/*
3053	* PRIVATE USE beyond this point. All CSI_7? sequences here	3091	* PRIVATE USE beyond this point. All CSI_7? sequences here
3054	*/	3092	*/
3055	case CSI_72: /* DECSTBM: set top and bottom margins */	3093	case CSI_72: /* DECSTBM: set top and bottom margins */
3056	if (nargs == 1)	3094	if (nargs == 1)
…		…
3130	break;	3168	break;
3131		3169
3132	//case 9: NYI, TODO, restore maximized window or maximize window	3170	//case 9: NYI, TODO, restore maximized window or maximize window
3133	default:	3171	default:
3134	if (args[0] >= 24) /* set height (chars) */	3172	if (args[0] >= 24) /* set height (chars) */
3135	set_widthheight ((unsigned int)width,	3173	set_widthheight ((unsigned int)vt_width,
3136	(unsigned int) (args[1] * fheight));	3174	(unsigned int) (args[1] * fheight));
3137	break;	3175	break;
3138		3176
3139	/*	3177	/*
3140	* reports - some output format copied from XTerm	3178	* reports - some output format copied from XTerm
…		…
3189	rxvt_term::get_to_st (unicode_t &ends_how)	3227	rxvt_term::get_to_st (unicode_t &ends_how)
3190	{	3228	{
3191	unicode_t ch;	3229	unicode_t ch;
3192	bool seen_esc = false;	3230	bool seen_esc = false;
3193	unsigned int n = 0;	3231	unsigned int n = 0;
3194	wchar_t string[STRING_MAX];	3232	wchar_t string[CBUFSIZ];
3195		3233
3196	while ((ch = cmd_getc ()) != NOCHAR)	3234	while ((ch = cmd_getc ()) != NOCHAR)
3197	{	3235	{
3198	if (seen_esc)	3236	if (seen_esc)
3199	{	3237	{
…		…
3214	else if (ch < 0x20)	3252	else if (ch < 0x20)
3215	return NULL; /* other control character - exit */	3253	return NULL; /* other control character - exit */
3216		3254
3217	seen_esc = false;	3255	seen_esc = false;
3218		3256
3219	if (n >= STRING_MAX - 1)	3257	if (n >= sizeof (string) - 1)
3220	// stop at some sane length	3258	// stop at some sane length
3221	return NULL;	3259	return NULL;
3222		3260
3223	string[n++] = ch;	3261	string[n++] = ch;
3224	}	3262	}
…		…
3419	break;	3457	break;
3420	#endif	3458	#endif
3421	case URxvt_Color_border:	3459	case URxvt_Color_border:
3422	process_color_seq (op, Color_border, str, resp);	3460	process_color_seq (op, Color_border, str, resp);
3423	break;	3461	break;
3424	#if ENABLE_TRANSPARENCY	3462
		3463	#if BG_IMAGE_FROM_ROOT
3425	case URxvt_Color_tint:	3464	case URxvt_Color_tint:
3426	process_color_seq (op, Color_tint, str, resp);	3465	process_color_seq (op, Color_tint, str, resp);
3427	{	3466	{
3428	bool changed = false;	3467	bool changed = false;
3429		3468
3430	if (ISSET_PIXCOLOR (Color_tint))	3469	if (ISSET_PIXCOLOR (Color_tint))
3431	changed = bg_set_tint (pix_colors_focused [Color_tint]);	3470	changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3432		3471
3433	if (changed)	3472	if (changed)
3434	update_background ();	3473	update_background ();
3435	}	3474	}
3436		3475
…		…
3440	#if BG_IMAGE_FROM_FILE	3479	#if BG_IMAGE_FROM_FILE
3441	case Rxvt_Pixmap:	3480	case Rxvt_Pixmap:
3442	if (!strcmp (str, "?"))	3481	if (!strcmp (str, "?"))
3443	{	3482	{
3444	char str[256];	3483	char str[256];
		3484	int h_scale = fimage.h_scale;
		3485	int v_scale = fimage.v_scale;
		3486	int h_align = fimage.h_align;
		3487	int v_align = fimage.v_align;
3445		3488
3446	sprintf (str, "[%dx%d+%d+%d]",	3489	sprintf (str, "[%dx%d+%d+%d]",
3447	min (h_scale, 32767), min (v_scale, 32767),	3490	h_scale, v_scale,
3448	min (h_align, 32767), min (v_align, 32767));	3491	h_align, v_align);
3449	process_xterm_seq (XTerm_title, str, CHAR_ST);	3492	process_xterm_seq (XTerm_title, str, CHAR_ST);
3450	}	3493	}
3451	else	3494	else
3452	{	3495	{
3453	int changed = 0;	3496	bool changed = false;
3454		3497
3455	if (*str != ';')	3498	if (*str != ';')
3456	{	3499	{
3457	if (bg_set_file (str)) /* change pixmap */	3500	try
3458	{	3501	{
		3502	fimage.set_file_geometry (this, str);
3459	changed++;	3503	changed = true;
		3504	}
		3505	catch (const class rxvt_failure_exception &e)
		3506	{
3460	}	3507	}
3461	}	3508	}
3462	else	3509	else
3463	{	3510	{
3464	str++;	3511	str++;
3465	if (bg_set_geometry (str, true))	3512	if (fimage.set_geometry (str, true))
3466	changed++;	3513	changed = true;
3467	}	3514	}
3468		3515
3469	if (changed)	3516	if (changed)
3470	{	3517	{
3471	if (bg_window_position_sensitive ())	3518	if (bg_window_position_sensitive ())
3472	{	3519	{
3473	int x, y;	3520	int x, y;
3474	get_window_origin (x, y);	3521	get_window_origin (x, y);
3475	bg_set_position (x, y);	3522	parent_x = x;
		3523	parent_y = y;
3476	}	3524	}
3477	update_background ();	3525	update_background ();
3478	}	3526	}
3479	}	3527	}
3480	break;	3528	break;
…		…
3570	* 's' = save	3618	* 's' = save
3571	* 'r' = restore	3619	* 'r' = restore
3572	* 't' = toggle	3620	* 't' = toggle
3573	* so no need for fancy checking	3621	* so no need for fancy checking
3574	*/	3622	*/
3575	int	3623	int ecb_cold
3576	rxvt_term::privcases (int mode, unsigned long bit)	3624	rxvt_term::privcases (int mode, unsigned long bit)
3577	{	3625	{
3578	int state;	3626	int state;
3579		3627
3580	if (mode == 's')	3628	if (mode == 's')
3581	{	3629	{
3582	SavedModes \|= (priv_modes & bit);	3630	if (priv_modes & bit)
		3631	SavedModes \|= bit;
		3632	else
		3633	SavedModes &= ~bit;
3583	return -1;	3634	return -1;
3584	}	3635	}
3585	else	3636	else
3586	{	3637	{
3587	if (mode == 'r')	3638	if (mode == 'r')
3588	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */	3639	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3589	else	3640	else
3590	state = (mode == 't') ? ! (priv_modes & bit) : mode;	3641	state = (mode == 't') ? ! (priv_modes & bit) : mode;
3591		3642
3592	set_privmode (bit, state);	3643	if (state)
		3644	priv_modes \|= bit;
		3645	else
		3646	priv_modes &= ~bit;
3593	}	3647	}
3594		3648
3595	return state;	3649	return state;
3596	}	3650	}
3597		3651
…		…
3702	case 2: /* VT52 mode */	3756	case 2: /* VT52 mode */
3703	/* oddball mode. should be set regardless of set/reset	3757	/* oddball mode. should be set regardless of set/reset
3704	* parameter. Return from VT52 mode with an ESC < from	3758	* parameter. Return from VT52 mode with an ESC < from
3705	* within VT52 mode	3759	* within VT52 mode
3706	*/	3760	*/
3707	set_privmode (PrivMode_vt52, 1);	3761	priv_modes \|= PrivMode_vt52;
3708	break;	3762	break;
3709	case 3: /* 80/132 */	3763	case 3: /* 80/132 */
3710	if (priv_modes & PrivMode_132OK)	3764	if (priv_modes & PrivMode_132OK)
3711	set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);	3765	set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3712	break;	3766	break;
…		…
3727	if (state) /* orthogonal */	3781	if (state) /* orthogonal */
3728	priv_modes &= ~(PrivMode_MouseX11\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);	3782	priv_modes &= ~(PrivMode_MouseX11\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);
3729	break;	3783	break;
3730	#ifdef scrollBar_esc	3784	#ifdef scrollBar_esc
3731	case scrollBar_esc:	3785	case scrollBar_esc:
3732	if (scrollBar.map (state))	3786	scrollBar.map (state);
3733	{
3734	resize_all_windows (0, 0, 0);	3787	resize_all_windows (0, 0, 0);
3735	scr_touch (true);	3788	scr_touch (true);
3736	}
3737	break;	3789	break;
3738	#endif	3790	#endif
3739	case 25: /* visible/invisible cursor */	3791	case 25: /* visible/invisible cursor */
3740	scr_cursor_visible (state);	3792	scr_cursor_visible (state);
3741	break;	3793	break;
…		…
3796	}	3848	}
3797	}	3849	}
3798	/}}} /	3850	/}}} /
3799		3851
3800	/{{{ process sgr sequences /	3852	/{{{ process sgr sequences /
3801	void	3853	void ecb_hot
3802	rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)	3854	rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3803	{	3855	{
3804	unsigned int i;	3856	unsigned int i;
3805	short rendset;	3857	short rendset;
3806	int rendstyle;	3858	int rendstyle;
…		…
3947	break;	3999	break;
3948	#endif	4000	#endif
3949	}	4001	}
3950	}	4002	}
3951	}	4003	}
		4004
		4005	void
		4006	rxvt_term::set_cursor_style (int style)
		4007	{
		4008	if (!IN_RANGE_INC (style, 0, 4))
		4009	return;
		4010
		4011	set_option (Opt_cursorUnderline, style >= 3);
		4012
		4013	#ifdef CURSOR_BLINK
		4014	set_option (Opt_cursorBlink, !style \|\| (style & 1));
		4015	cursor_blink_reset ();
		4016	#endif
		4017
		4018	want_refresh = 1;
		4019	}
3952	/}}} /	4020	/}}} /
3953		4021
3954	/* ------------------------------------------------------------------------- */	4022	/* ------------------------------------------------------------------------- */
3955		4023
3956	/*	4024	/*

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.492 by sf-exg, Sun Aug 21 20:13:58 2011 UTC vs. Revision 1.541 by root, Thu Feb 20 18:59:13 2014 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.492 by sf-exg, Sun Aug 21 20:13:58 2011 UTC vs.
Revision 1.541 by root, Thu Feb 20 18:59:13 2014 UTC