ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/rxvt-unicode/src/command.C

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.485 by sf-exg, Fri Apr 29 13:08:24 2011 UTC vs.
Revision 1.543 by sf-exg, Sat Apr 26 14:07:36 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-2014 Marc Lehmann <schmorp@schmorp.de>
31	* Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>	31	* Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
32	*	32	*
33	* This program is free software; you can redistribute it and/or modify	33	* This program is free software; you can redistribute it and/or modify
34	* it under the terms of the GNU General Public License as published by	34	* it under the terms of the GNU General Public License as published by
35	* the Free Software Foundation; either version 2 of the License, or	35	* the Free Software Foundation; either version 2 of the License, or
…		…
54		54
55	#ifdef KEYSYM_RESOURCE	55	#ifdef KEYSYM_RESOURCE
56	# include "keyboard.h"	56	# include "keyboard.h"
57	#endif	57	#endif
58		58
59	#include <csignal>	59	#include <signal.h>
60		60
61	#if LINUX_YIELD_HACK	61	#if LINUX_YIELD_HACK
62	# include <ctime>	62	# include <time.h>
63	#endif	63	#endif
64		64
65	/*----------------------------------------------------------------------*/	65	/*----------------------------------------------------------------------*/
66		66
67	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)	67	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
…		…
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	static inline wchar_t *
		406	rxvt_wcsdup (const wchar_t *str, int len)
		407	{
		408	wchar_t *r = (wchar_t *)rxvt_malloc ((len + 1) * sizeof (wchar_t));
		409	memcpy (r, str, len * sizeof (wchar_t));
		410	r[len] = 0;
		411	return r;
		412	}
		413
		414	void ecb_cold
405	rxvt_term::key_press (XKeyEvent &ev)	415	rxvt_term::key_press (XKeyEvent &ev)
406	{	416	{
407	int ctrl, meta, shft, len;	417	int ctrl, meta, shft, len;
408	KeySym keysym;	418	KeySym keysym;
409	int valid_keysym;	419	int valid_keysym;
…		…
424	ctrl = ev.state & ControlMask;	434	ctrl = ev.state & ControlMask;
425	meta = ev.state & ModMetaMask;	435	meta = ev.state & ModMetaMask;
426		436
427	kbuf[0] = 0;	437	kbuf[0] = 0;
428		438
429	#ifdef USE_XIM	439	#if USE_XIM
430	if (Input_Context)	440	if (Input_Context)
431	{	441	{
432	Status status_return;	442	Status status_return;
433		443
434	#if 0	444	#if 0
…		…
509	#endif	519	#endif
510	max_it (lnsppg, 1);	520	max_it (lnsppg, 1);
511		521
512	if (keysym == XK_Prior)	522	if (keysym == XK_Prior)
513	{	523	{
514	scr_page (UP, lnsppg);	524	scr_page (lnsppg);
515	return;	525	return;
516	}	526	}
517	else if (keysym == XK_Next)	527	else if (keysym == XK_Next)
518	{	528	{
519	scr_page (DN, lnsppg);	529	scr_page (-lnsppg);
520	return;	530	return;
521	}	531	}
522	}	532	}
523	#ifdef SCROLL_ON_UPDOWN_KEYS	533	#ifdef SCROLL_ON_UPDOWN_KEYS
524	if (IS_SCROLL_MOD)	534	if (IS_SCROLL_MOD)
525	{	535	{
526	if (keysym == XK_Up)	536	if (keysym == XK_Up)
527	{	537	{
528	scr_page (UP, 1);	538	scr_page (1);
529	return;	539	return;
530	}	540	}
531	else if (keysym == XK_Down)	541	else if (keysym == XK_Down)
532	{	542	{
533	scr_page (DN, 1);	543	scr_page (-1);
534	return;	544	return;
535	}	545	}
536	}	546	}
537	#endif	547	#endif
538	#ifdef SCROLL_ON_HOMEEND_KEYS	548	#ifdef SCROLL_ON_HOMEEND_KEYS
539	if (IS_SCROLL_MOD)	549	if (IS_SCROLL_MOD)
540	{	550	{
541	if (keysym == XK_Home)	551	if (keysym == XK_Home)
542	{	552	{
543	scr_move_to (0, 1);	553	scr_changeview (top_row);
544	return;	554	return;
545	}	555	}
546	else if (keysym == XK_End)	556	else if (keysym == XK_End)
547	{	557	{
548	scr_move_to (1, 1);	558	scr_changeview (0);
549	return;	559	return;
550	}	560	}
551	}	561	}
552	#endif	562	#endif
553	}	563	}
…		…
575	case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */	585	case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
576	return;	586	return;
577	#endif	587	#endif
578	}	588	}
579	}	589	}
		590	}
		591
		592	if (ctrl && meta && (keysym == XK_c || keysym == XK_v))
		593	{
		594	if (keysym == XK_v)
		595	selection_request (ev.time, Sel_Clipboard);
		596	else if (selection.len > 0)
		597	{
		598	free (selection.clip_text);
		599	selection.clip_text = rxvt_wcsdup (selection.text, selection.len);
		600	selection.clip_len = selection.len;
		601	selection_grab (CurrentTime, true);
		602	}
		603
		604	return;
580	}	605	}
581		606
582	#if ENABLE_FRILLS || ISO_14755	607	#if ENABLE_FRILLS || ISO_14755
583	// ISO 14755 support	608	// ISO 14755 support
584	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))	609	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
…		…
779	}	804	}
780		805
781	if (newlen)	806	if (newlen)
782	len = strlen (kbuf);	807	len = strlen (kbuf);
783		808
		809	if (len > 0)
		810	{
784	/*	811	/*
		812	* pass Shift/Control indicators for function keys ending with `~'
		813	*
		814	* eg,
		815	* Prior = "ESC[5~"
		816	* Shift+Prior = "ESC[5$"
		817	* Ctrl+Prior = "ESC[5^"
		818	* Ctrl+Shift+Prior = "ESC[5@"
		819	*/
		820	if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
		821	kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
		822
		823	/*
785	* Pass meta for all function keys, if 'meta' option set	824	* Pass meta for all function keys, if 'meta' option set
786	*/	825	*/
787	#ifdef META8_OPTION	826	#ifdef META8_OPTION
788	if (meta && (meta_char == 0x80) && len > 0)	827	if (meta && (meta_char == 0x80))
789	kbuf[len - 1] |= 0x80;	828	kbuf[len - 1] |= 0x80;
790	#endif	829	#endif
		830	}
791		831
792	}	832	}
793	else if (ctrl && keysym == XK_minus)	833	else if (ctrl && keysym == XK_minus)
794	{	834	{
795	len = 1;	835	len = 1;
…		…
829	{	869	{
830	view_start = 0;	870	view_start = 0;
831	want_refresh = 1;	871	want_refresh = 1;
832	}	872	}
833		873
834	/*
835	* these modifications only affect the static keybuffer
836	* pass Shift/Control indicators for function keys ending with `~'
837	*
838	* eg,
839	* Prior = "ESC[5~"
840	* Shift+Prior = "ESC[5$"
841	* Ctrl+Prior = "ESC[5^"
842	* Ctrl+Shift+Prior = "ESC[5@"
843	* Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
844	*/
845	if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
846	kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
847
848	/* escape prefix */	874	/* escape prefix */
849	if (meta	875	if (meta
850	#ifdef META8_OPTION	876	#ifdef META8_OPTION
851	&& meta_char == C0_ESC	877	&& meta_char == C0_ESC
852	#endif	878	#endif
…		…
857	}	883	}
858		884
859	tt_write (kbuf, (unsigned int)len);	885	tt_write (kbuf, (unsigned int)len);
860	}	886	}
861		887
862	void	888	void ecb_cold
863	rxvt_term::key_release (XKeyEvent &ev)	889	rxvt_term::key_release (XKeyEvent &ev)
864	{	890	{
865	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL	891	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
866	KeySym keysym;	892	KeySym keysym;
867		893
…		…
939	void	965	void
940	rxvt_term::flush ()	966	rxvt_term::flush ()
941	{	967	{
942	flush_ev.stop ();	968	flush_ev.stop ();
943		969
944	#ifdef HAVE_BG_PIXMAP	970	#ifdef HAVE_IMG
945	if (bg_flags & BG_NEEDS_REFRESH)	971	if (bg_flags & BG_NEEDS_REFRESH)
946	{	972	{
947	bg_flags &= ~BG_NEEDS_REFRESH;	973	bg_flags &= ~BG_NEEDS_REFRESH;
948	scr_touch (false);	974	scr_touch (false);
949	}	975	}
…		…
989	while (row < end_row);	1015	while (row < end_row);
990	}	1016	}
991		1017
992	scr_refresh ();	1018	scr_refresh ();
993	scrollBar.show (1);	1019	scrollBar.show (1);
994	#ifdef USE_XIM	1020	#if USE_XIM
995	IMSendSpot ();	1021	im_send_spot ();
996	#endif	1022	#endif
997	}	1023	}
998		1024
999	display->flush ();	1025	display->flush ();
1000	}	1026	}
…		…
1018	flush ();	1044	flush ();
1019	}	1045	}
1020		1046
1021	#ifdef CURSOR_BLINK	1047	#ifdef CURSOR_BLINK
1022	void	1048	void
		1049	rxvt_term::cursor_blink_reset ()
		1050	{
		1051	if (hidden_cursor)
		1052	{
		1053	hidden_cursor = 0;
		1054	want_refresh = 1;
		1055	}
		1056
		1057	if (option (Opt_cursorBlink))
		1058	cursor_blink_ev.again ();
		1059	else
		1060	cursor_blink_ev.stop ();
		1061	}
		1062
		1063	void
1023	rxvt_term::cursor_blink_cb (ev::timer &w, int revents)	1064	rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1024	{	1065	{
1025	hidden_cursor = !hidden_cursor;	1066	hidden_cursor = !hidden_cursor;
1026	want_refresh = 1;	1067	want_refresh = 1;
1027	refresh_check ();	1068	refresh_check ();
…		…
1045		1086
1046	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	1087	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1047	void	1088	void
1048	rxvt_term::cont_scroll_cb (ev::timer &w, int revents)	1089	rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1049	{	1090	{
1050	if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)	1091	if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1051	&& scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))	1092	&& scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1052	{	1093	{
1053	want_refresh = 1;	1094	want_refresh = 1;
1054	refresh_check ();	1095	refresh_check ();
1055	}	1096	}
1056	else	1097	else
…		…
1060		1101
1061	#ifdef SELECTION_SCROLLING	1102	#ifdef SELECTION_SCROLLING
1062	void	1103	void
1063	rxvt_term::sel_scroll_cb (ev::timer &w, int revents)	1104	rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1064	{	1105	{
1065	if (scr_page (scroll_selection_dir, scroll_selection_lines))	1106	if (scr_page (scroll_selection_lines))
1066	{	1107	{
1067	selection_extend (selection_save_x, selection_save_y, selection_save_state);	1108	selection_extend (selection_save_x, selection_save_y, selection_save_state);
1068	want_refresh = 1;	1109	want_refresh = 1;
1069	refresh_check ();	1110	refresh_check ();
1070	}	1111	}
…		…
1075		1116
1076	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	1117	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1077	void	1118	void
1078	rxvt_term::slip_wheel_cb (ev::timer &w, int revents)	1119	rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1079	{	1120	{
1080	if (scr_changeview (view_start - mouse_slip_wheel_speed))	1121	if (scr_page (mouse_slip_wheel_speed))
1081	{	1122	{
1082	want_refresh = 1;	1123	want_refresh = 1;
1083	refresh_check ();	1124	refresh_check ();
1084	}	1125	}
1085		1126
…		…
1206	pty_write ();	1247	pty_write ();
1207		1248
1208	refresh_check ();	1249	refresh_check ();
1209	}	1250	}
1210		1251
1211	void	1252	void ecb_cold
1212	rxvt_term::pointer_unblank ()	1253	rxvt_term::pointer_unblank ()
1213	{	1254	{
1214	XDefineCursor (dpy, vt, TermWin_cursor);	1255	XDefineCursor (dpy, vt, TermWin_cursor);
1215	recolour_cursor ();	1256	recolour_cursor ();
1216		1257
…		…
1221	pointer_ev.start (pointerBlankDelay);	1262	pointer_ev.start (pointerBlankDelay);
1222	#endif	1263	#endif
1223	}	1264	}
1224		1265
1225	#ifdef POINTER_BLANK	1266	#ifdef POINTER_BLANK
1226	void	1267	void ecb_cold
1227	rxvt_term::pointer_blank ()	1268	rxvt_term::pointer_blank ()
1228	{	1269	{
1229	if (!option (Opt_pointerBlank))	1270	if (!option (Opt_pointerBlank))
1230	return;	1271	return;
1231		1272
…		…
1233	XFlush (dpy);	1274	XFlush (dpy);
1234		1275
1235	hidden_pointer = 1;	1276	hidden_pointer = 1;
1236	}	1277	}
1237		1278
1238	void	1279	void ecb_cold
1239	rxvt_term::pointer_cb (ev::timer &w, int revents)	1280	rxvt_term::pointer_cb (ev::timer &w, int revents)
1240	{	1281	{
1241	make_current ();	1282	make_current ();
1242		1283
1243	pointer_blank ();	1284	pointer_blank ();
…		…
1335	32 + x,	1376	32 + x,
1336	32 + y);	1377	32 + y);
1337	}	1378	}
1338		1379
1339	/*{{{ process an X event */	1380	/*{{{ process an X event */
1340	void	1381	void ecb_hot
1341	rxvt_term::x_cb (XEvent &ev)	1382	rxvt_term::x_cb (XEvent &ev)
1342	{	1383	{
1343	make_current ();	1384	make_current ();
1344		1385
1345	dLocal (Display *, dpy);	1386	dLocal (Display *, dpy);
…		…
1448	if (ev.xconfigure.window == parent)	1489	if (ev.xconfigure.window == parent)
1449	{	1490	{
1450	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))	1491	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1451	;	1492	;
1452		1493
		1494	bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
		1495
		1496	bool moved = false;
1453	#ifdef HAVE_BG_PIXMAP	1497	#ifdef HAVE_BG_PIXMAP
1454	bool moved = false;
1455	if (bg_window_position_sensitive ())	1498	if (bg_window_position_sensitive ())
1456	{	1499	{
		1500	want_position_change = true;
		1501	if (bg_img == 0)
		1502	moved = true;
		1503	}
		1504	#endif
		1505
		1506	if (want_position_change)
		1507	{
1457	int x, y;	1508	int x, y;
		1509
1458	if (ev.xconfigure.send_event)	1510	if (ev.xconfigure.send_event)
1459	{	1511	{
1460	x = ev.xconfigure.x;	1512	x = ev.xconfigure.x;
1461	y = ev.xconfigure.y;	1513	y = ev.xconfigure.y;
1462	}	1514	}
1463	else	1515	else
1464	get_window_origin (x, y);	1516	get_window_origin (x, y);
1465		1517
1466	if (bg_set_position (x, y)	1518	if (x != parent_x || y != parent_y)
1467	|| !(bg_flags & BG_IS_VALID))	1519	{
		1520	parent_x = x;
		1521	parent_y = y;
		1522	HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1468	moved = true;	1523	moved = true;
		1524	}
1469	}	1525	}
1470	#endif
1471		1526
1472	if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)	1527	if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1473	{	1528	{
1474	seen_resize = 1;	1529	seen_resize = 1;
1475	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1530	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1476	}	1531	}
1477	else	1532	else
1478	{	1533	{
1479	#ifdef HAVE_BG_PIXMAP	1534	#ifdef HAVE_BG_PIXMAP
1480	if (moved)	1535	if (moved)
1481	{
1482	if (mapped)
1483	update_background ();	1536	update_background ();
1484	else
1485	bg_invalidate ();
1486	}
1487	#endif	1537	#endif
1488	}	1538	}
1489		1539
1490	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));	1540	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1491	}	1541	}
…		…
1503	selection_send (ev.xselectionrequest);	1553	selection_send (ev.xselectionrequest);
1504	break;	1554	break;
1505		1555
1506	case MapNotify:	1556	case MapNotify:
1507	#ifdef HAVE_BG_PIXMAP	1557	#ifdef HAVE_BG_PIXMAP
1508	/* This is needed specifically to fix the case of no window manager or a	1558	// This is needed at startup for the case of no window manager
1509	* non-reparenting window manager. In those cases we never get first	1559	// or a non-reparenting window manager and also because we
1510	* ConfigureNotify. Also that speeds startup under normal WM, by taking	1560	// defer bg image updates if the window is not mapped. The
1511	* care of multiplicity of ConfigureNotify events arriving while WM does	1561	// short delay is to optimize for multiple ConfigureNotify
1512	* reparenting.	1562	// events at startup when the window manager reparents the
1513	* We should not render background immediately, as there could be several	1563	// window, so as to perform the computation after we have
1514	* ConfigureNotify's to follow. Lets take care of all of them in one scoop	1564	// received all of them.
1515	* by scheduling background redraw as soon as we can, but giving a short	1565	if (bg_img == 0)
1516	* bit of time for ConfigureNotifies to arrive.
1517	* We should render background PRIOR to drawing any text, but AFTER all
1518	* of ConfigureNotifys for the best results.
1519	*/
1520	if (!(bg_flags & BG_IS_VALID))
1521	update_background_ev.start (0.025);	1566	update_background_ev.start (0.025);
1522	#endif	1567	#endif
1523	mapped = 1;	1568	mapped = 1;
1524	#ifdef TEXT_BLINK	1569	#ifdef TEXT_BLINK
1525	text_blink_ev.start ();	1570	text_blink_ev.start ();
…		…
1565	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))	1610	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1566	;	1611	;
1567		1612
1568	if (scrollBar.state && ev.xany.window == scrollBar.win)	1613	if (scrollBar.state && ev.xany.window == scrollBar.win)
1569	{	1614	{
1570	scrollBar.state = STATE_IDLE;	1615	scrollBar.state = SB_STATE_IDLE;
1571	scrollBar.show (0);	1616	scrollBar.show (0);
1572	}	1617	}
1573	}	1618	}
1574	break;	1619	break;
1575		1620
…		…
1617		1662
1618	#ifdef SELECTION_SCROLLING	1663	#ifdef SELECTION_SCROLLING
1619	if (ev.xbutton.y < int_bwidth	1664	if (ev.xbutton.y < int_bwidth
1620	|| Pixel2Row (ev.xbutton.y) > (nrow-1))	1665	|| Pixel2Row (ev.xbutton.y) > (nrow-1))
1621	{	1666	{
		1667	page_dirn scroll_selection_dir;
1622	int dist;	1668	int dist;
1623		1669
1624	/* don't clobber the current delay if we are	1670	/* don't clobber the current delay if we are
1625	* already in the middle of scrolling.	1671	* already in the middle of scrolling.
1626	*/	1672	*/
…		…
1641	dist = int_bwidth - ev.xbutton.y;	1687	dist = int_bwidth - ev.xbutton.y;
1642	}	1688	}
1643	else	1689	else
1644	{	1690	{
1645	scroll_selection_dir = DN;	1691	scroll_selection_dir = DN;
1646	dist = ev.xbutton.y - (int_bwidth + height);	1692	dist = ev.xbutton.y - (int_bwidth + vt_height);
1647	}	1693	}
1648		1694
1649	scroll_selection_lines = Pixel2Height (dist)	1695	scroll_selection_lines = Pixel2Height (dist)
1650	/ SELECTION_SCROLL_LINE_SPEEDUP	1696	/ SELECTION_SCROLL_LINE_SPEEDUP
1651	+ 1;	1697	+ 1;
1652	min_it (scroll_selection_lines,	1698	min_it (scroll_selection_lines,
1653	SELECTION_SCROLL_MAX_LINES);	1699	SELECTION_SCROLL_MAX_LINES);
		1700	scroll_selection_lines *= scroll_selection_dir;
1654	}	1701	}
1655	else	1702	else
1656	{	1703	{
1657	/* we are within the text window, so we	1704	/* we are within the text window, so we
1658	* shouldn't be scrolling	1705	* shouldn't be scrolling
…		…
1663	#ifdef MOUSE_THRESHOLD	1710	#ifdef MOUSE_THRESHOLD
1664	}	1711	}
1665	#endif	1712	#endif
1666	}	1713	}
1667	}	1714	}
1668	else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)	1715	else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1669	{	1716	{
1670	while (XCheckTypedWindowEvent (dpy, scrollBar.win,	1717	while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1671	MotionNotify, &ev))	1718	MotionNotify, &ev))
1672	;	1719	;
1673		1720
1674	XQueryPointer (dpy, scrollBar.win,	1721	XQueryPointer (dpy, scrollBar.win,
1675	&unused_root, &unused_child,	1722	&unused_root, &unused_child,
1676	&unused_root_x, &unused_root_y,	1723	&unused_root_x, &unused_root_y,
1677	&ev.xbutton.x, &ev.xbutton.y,	1724	&ev.xbutton.x, &ev.xbutton.y,
1678	&unused_mask);	1725	&unused_mask);
1679	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1726	scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1680	scrollBar.size ());	1727	scrollBar.size ());
1681	want_refresh = 1;	1728	want_refresh = 1;
1682	scrollBar.show (1);	1729	scrollBar.show (1);
1683	}	1730	}
1684	break;	1731	break;
1685	}	1732	}
1686		1733
1687	#if defined(CURSOR_BLINK)	1734	#if defined(CURSOR_BLINK)
1688	if (option (Opt_cursorBlink) && ev.type == KeyPress)	1735	if (ev.type == KeyPress)
1689	{
1690	if (hidden_cursor)
1691	{
1692	hidden_cursor = 0;
1693	want_refresh = 1;
1694	}
1695
1696	cursor_blink_ev.again ();	1736	cursor_blink_reset ();
1697	}
1698	#endif	1737	#endif
1699		1738
1700	#if defined(POINTER_BLANK)	1739	#if defined(POINTER_BLANK)
1701	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)	1740	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1702	{	1741	{
…		…
1713		1752
1714	refresh_check ();	1753	refresh_check ();
1715	}	1754	}
1716		1755
1717	#if ENABLE_FRILLS	1756	#if ENABLE_FRILLS
1718	void	1757	void ecb_cold
1719	rxvt_term::set_urgency (bool enable)	1758	rxvt_term::set_urgency (bool enable)
1720	{	1759	{
1721	if (enable == urgency_hint)	1760	if (enable == urgency_hint)
1722	return;	1761	return;
1723		1762
1724	if (XWMHints *h = XGetWMHints (dpy, parent))	1763	if (XWMHints *h = XGetWMHints (dpy, parent))
1725	{	1764	{
1726	h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);	1765	h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1727	XSetWMHints (dpy, parent, h);	1766	XSetWMHints (dpy, parent, h);
1728	urgency_hint = enable;	1767	urgency_hint = enable;
		1768	XFree (h);
1729	}	1769	}
1730	}	1770	}
1731	#endif	1771	#endif
1732		1772
1733	void	1773	void ecb_cold
1734	rxvt_term::focus_in ()	1774	rxvt_term::focus_in ()
1735	{	1775	{
1736	if (!focus)	1776	if (!focus)
1737	{	1777	{
1738	focus = 1;	1778	focus = 1;
1739	want_refresh = 1;	1779	want_refresh = 1;
1740		1780
1741	#if USE_XIM	1781	#if USE_XIM
1742	if (Input_Context != NULL)	1782	if (Input_Context != NULL)
1743	{	1783	{
1744	IMSetPosition ();	1784	im_set_position ();
1745	XSetICFocus (Input_Context);	1785	XSetICFocus (Input_Context);
1746	}	1786	}
1747	#endif	1787	#endif
1748	#if CURSOR_BLINK	1788	#if CURSOR_BLINK
1749	if (option (Opt_cursorBlink))	1789	if (option (Opt_cursorBlink))
…		…
1763		1803
1764	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));	1804	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1765	}	1805	}
1766	}	1806	}
1767		1807
1768	void	1808	void ecb_cold
1769	rxvt_term::focus_out ()	1809	rxvt_term::focus_out ()
1770	{	1810	{
1771	if (focus)	1811	if (focus)
1772	{	1812	{
1773	focus = 0;	1813	focus = 0;
…		…
1806		1846
1807	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));	1847	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1808	}	1848	}
1809	}	1849	}
1810		1850
1811	void	1851	void ecb_cold
1812	rxvt_term::update_fade_color (unsigned int idx)	1852	rxvt_term::update_fade_color (unsigned int idx)
1813	{	1853	{
1814	#if OFF_FOCUS_FADING	1854	#if OFF_FOCUS_FADING
1815	if (rs[Rs_fade])	1855	if (rs[Rs_fade])
1816	{	1856	{
…		…
1819	pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);	1859	pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1820	}	1860	}
1821	#endif	1861	#endif
1822	}	1862	}
1823		1863
1824	#if ENABLE_TRANSPARENCY || ENABLE_PERL	1864	#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1825	void	1865	void ecb_hot
1826	rxvt_term::rootwin_cb (XEvent &ev)	1866	rxvt_term::rootwin_cb (XEvent &ev)
1827	{	1867	{
1828	make_current ();	1868	make_current ();
1829		1869
1830	if (SHOULD_INVOKE (HOOK_ROOT_EVENT)	1870	if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1831	&& HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))	1871	&& HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1832	return;	1872	return;
1833		1873
1834	# if ENABLE_TRANSPARENCY
1835	switch (ev.type)	1874	switch (ev.type)
1836	{	1875	{
1837	case PropertyNotify:	1876	case PropertyNotify:
1838	/*	1877	/*
1839	* if user used some Esetroot compatible prog to set the root bg,	1878	* if user used some Esetroot compatible prog to set the root bg,
1840	* use the property to determine the pixmap. We use it later on.	1879	* use the property to determine the pixmap. We use it later on.
1841	*/	1880	*/
1842	if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]	1881	if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1843	|| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])	1882	|| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1844	{	1883	{
1845	bg_set_root_pixmap ();	1884	#if BG_IMAGE_FROM_ROOT
		1885	if (option (Opt_transparent))
		1886	{
		1887	rxvt_img::new_from_root (this)->replace (root_img);
1846	update_background ();	1888	update_background ();
		1889	}
		1890	#endif
		1891	HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1847	}	1892	}
1848		1893
1849	break;	1894	break;
1850	}	1895	}
1851	# endif
1852		1896
1853	refresh_check ();	1897	refresh_check ();
1854	}	1898	}
1855	#endif	1899	#endif
1856		1900
…		…
1980	if (scrollBar.upButton (ev.y))	2024	if (scrollBar.upButton (ev.y))
1981	direction = UP; /* up */	2025	direction = UP; /* up */
1982	else if (scrollBar.dnButton (ev.y))	2026	else if (scrollBar.dnButton (ev.y))
1983	direction = DN; /* down */	2027	direction = DN; /* down */
1984		2028
1985	scrollBar.state = STATE_IDLE;	2029	scrollBar.state = SB_STATE_IDLE;
1986	/*	2030	/*
1987	* Rxvt-style scrollbar:	2031	* Rxvt-style scrollbar:
1988	* move up if mouse is above slider	2032	* move up if mouse is above slider
1989	* move dn if mouse is below slider	2033	* move dn if mouse is below slider
1990	*	2034	*
…		…
2029	cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);	2073	cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2030	#endif	2074	#endif
2031	if (scr_page (direction, 1))	2075	if (scr_page (direction, 1))
2032	{	2076	{
2033	if (direction == UP)	2077	if (direction == UP)
2034	scrollBar.state = STATE_UP;	2078	scrollBar.state = SB_STATE_UP;
2035	else	2079	else
2036	scrollBar.state = STATE_DOWN;	2080	scrollBar.state = SB_STATE_DOWN;
2037	}	2081	}
2038	}	2082	}
2039	else	2083	else
2040	switch (ev.button)	2084	switch (ev.button)
2041	{	2085	{
2042	case Button2:	2086	case Button2:
2043	switch (scrollBar.align)	2087	switch (scrollBar.align)
2044	{	2088	{
2045	case R_SB_ALIGN_TOP:	2089	case SB_ALIGN_TOP:
2046	csrO = 0;	2090	csrO = 0;
2047	break;	2091	break;
2048	case R_SB_ALIGN_CENTRE:	2092	case SB_ALIGN_CENTRE:
2049	csrO = (scrollBar.bot - scrollBar.top) / 2;	2093	csrO = (scrollBar.bot - scrollBar.top) / 2;
2050	break;	2094	break;
2051	case R_SB_ALIGN_BOTTOM:	2095	case SB_ALIGN_BOTTOM:
2052	csrO = scrollBar.bot - scrollBar.top;	2096	csrO = scrollBar.bot - scrollBar.top;
2053	break;	2097	break;
2054	}	2098	}
2055		2099
2056	if (scrollBar.style == R_SB_XTERM	2100	if (scrollBar.style == SB_STYLE_XTERM
2057	|| scrollbar_above_slider (ev.y)	2101	|| scrollBar.above_slider (ev.y)
2058	|| scrollbar_below_slider (ev.y))	2102	|| scrollBar.below_slider (ev.y))
2059	scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());	2103	scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2060		2104
2061	scrollBar.state = STATE_MOTION;	2105	scrollBar.state = SB_STATE_MOTION;
2062	break;	2106	break;
2063		2107
2064	case Button1:	2108	case Button1:
2065	if (scrollBar.align == R_SB_ALIGN_CENTRE)	2109	if (scrollBar.align == SB_ALIGN_CENTRE)
2066	csrO = ev.y - scrollBar.top;	2110	csrO = ev.y - scrollBar.top;
2067	/* FALLTHROUGH */	2111	/* FALLTHROUGH */
2068		2112
2069	case Button3:	2113	case Button3:
2070	if (scrollBar.style != R_SB_XTERM)	2114	if (scrollBar.style != SB_STYLE_XTERM)
2071	{	2115	{
2072	if (scrollbar_above_slider (ev.y))	2116	if (scrollBar.above_slider (ev.y))
2073	# ifdef RXVT_SCROLL_FULL	2117	# ifdef RXVT_SCROLL_FULL
2074	scr_page (UP, nrow - 1);	2118	scr_page (UP, nrow - 1);
2075	# else	2119	# else
2076	scr_page (UP, nrow / 4);	2120	scr_page (UP, nrow / 4);
2077	# endif	2121	# endif
2078	else if (scrollbar_below_slider (ev.y))	2122	else if (scrollBar.below_slider (ev.y))
2079	# ifdef RXVT_SCROLL_FULL	2123	# ifdef RXVT_SCROLL_FULL
2080	scr_page (DN, nrow - 1);	2124	scr_page (DN, nrow - 1);
2081	# else	2125	# else
2082	scr_page (DN, nrow / 4);	2126	scr_page (DN, nrow / 4);
2083	# endif	2127	# endif
2084	else	2128	else
2085	scrollBar.state = STATE_MOTION;	2129	scrollBar.state = SB_STATE_MOTION;
2086	}	2130	}
2087	else	2131	else
2088	{	2132	{
2089	scr_page ((ev.button == Button1 ? DN : UP),	2133	scr_page ((ev.button == Button1 ? DN : UP),
2090	(nrow	2134	(nrow
2091	* scrollbar_position (ev.y)	2135	* scrollBar.position (ev.y)
2092	/ scrollBar.size ()));	2136	/ scrollBar.size ()));
2093	}	2137	}
2094		2138
2095	break;	2139	break;
2096	}	2140	}
…		…
2107		2151
2108	csrO = 0; /* reset csr Offset */	2152	csrO = 0; /* reset csr Offset */
2109	if (!bypass_keystate)	2153	if (!bypass_keystate)
2110	reportmode = !! (priv_modes & PrivMode_mouse_report);	2154	reportmode = !! (priv_modes & PrivMode_mouse_report);
2111		2155
2112	if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)	2156	if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2113	{	2157	{
2114	scrollBar.state = STATE_IDLE;	2158	scrollBar.state = SB_STATE_IDLE;
2115	scrollBar.show (0);	2159	scrollBar.show (0);
2116	}	2160	}
2117		2161
2118	#ifdef SELECTION_SCROLLING	2162	#ifdef SELECTION_SCROLLING
2119	sel_scroll_ev.stop();	2163	sel_scroll_ev.stop();
…		…
2169	case Button3:	2213	case Button3:
2170	selection_make (ev.time);	2214	selection_make (ev.time);
2171	break;	2215	break;
2172		2216
2173	case Button2:	2217	case Button2:
2174	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?	2218	if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2175	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);	2219	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2176	break;	2220	break;
2177		2221
2178	#ifdef MOUSE_WHEEL	2222	#ifdef MOUSE_WHEEL
2179	case Button4:	2223	case Button4:
2180	case Button5:	2224	case Button5:
2181	{	2225	{
2182	int i;	2226	int lines;
2183	page_dirn v;	2227	page_dirn dirn;
2184		2228
2185	v = ev.button == Button4 ? UP : DN;	2229	dirn = ev.button == Button4 ? UP : DN;
2186		2230
2187	if (ev.state & ShiftMask)	2231	if (ev.state & ShiftMask)
2188	i = 1;	2232	lines = 1;
2189	else if (option (Opt_mouseWheelScrollPage))	2233	else if (option (Opt_mouseWheelScrollPage))
2190	i = nrow - 1;	2234	lines = nrow - 1;
2191	else	2235	else
2192	i = 5;	2236	lines = 5;
2193		2237
2194	# ifdef MOUSE_SLIP_WHEELING	2238	# ifdef MOUSE_SLIP_WHEELING
2195	if (ev.state & ControlMask)	2239	if (ev.state & ControlMask)
2196	{	2240	{
2197	mouse_slip_wheel_speed += v ? -1 : 1;	2241	mouse_slip_wheel_speed += dirn;
2198	if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;	2242	clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2199	if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2200		2243
2201	if (!slip_wheel_ev.is_active ())	2244	if (!slip_wheel_ev.is_active ())
2202	slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);	2245	slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2203	}	2246	}
2204	else	2247	else
2205	# endif	2248	# endif
2206	{	2249	{
2207	scr_page (v, i);	2250	scr_page (dirn, lines);
2208	scrollBar.show (1);	2251	scrollBar.show (1);
2209	}	2252	}
2210	}	2253	}
2211	break;	2254	break;
2212	#endif	2255	#endif
…		…
2214	}	2257	}
2215	}	2258	}
2216		2259
2217	/*}}} */	2260	/*}}} */
2218		2261
2219	void	2262	void ecb_hot
2220	rxvt_term::cmd_parse ()	2263	rxvt_term::cmd_parse ()
2221	{	2264	{
2222	wchar_t ch = NOCHAR;	2265	wchar_t ch = NOCHAR;
2223	char *seq_begin; // remember start of esc-sequence here	2266	char *seq_begin; // remember start of esc-sequence here
2224		2267
2225	for (;;)	2268	for (;;)
2226	{	2269	{
2227	if (expect_false (ch == NOCHAR))	2270	if (ecb_unlikely (ch == NOCHAR))
2228	{	2271	{
2229	seq_begin = cmdbuf_ptr;	2272	seq_begin = cmdbuf_ptr;
2230	ch = next_char ();	2273	ch = next_char ();
2231		2274
2232	if (ch == NOCHAR)	2275	if (ch == NOCHAR)
2233	break;	2276	break;
2234	}	2277	}
2235		2278
2236	if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))	2279	if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2237	{	2280	{
2238	if (expect_false (!seen_input))	2281	if (ecb_unlikely (!seen_input))
2239	{	2282	{
2240	seen_input = 1;	2283	seen_input = 1;
2241	// many badly-written programs (e.g. jed) contain a race condition:	2284	// many badly-written programs (e.g. jed) contain a race condition:
2242	// they first read the screensize and then install a SIGWINCH handler.	2285	// they first read the screensize and then install a SIGWINCH handler.
2243	// some window managers resize the window early, and these programs	2286	// some window managers resize the window early, and these programs
…		…
2256	wchar_t *str = buf;	2299	wchar_t *str = buf;
2257	wchar_t *eol = str + min (ncol, UBUFSIZ);	2300	wchar_t *eol = str + min (ncol, UBUFSIZ);
2258		2301
2259	for (;;)	2302	for (;;)
2260	{	2303	{
2261	if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))	2304	if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2262	break;	2305	break;
2263		2306
2264	*str++ = ch;	2307	*str++ = ch;
2265		2308
2266	if (expect_false (ch == C0_LF || str >= eol))	2309	if (ecb_unlikely (ch == C0_LF || str >= eol))
2267	{	2310	{
2268	if (ch == C0_LF)	2311	if (ch == C0_LF)
2269	nlines++;	2312	nlines++;
2270		2313
2271	refresh_count++;	2314	refresh_count++;
…		…
2343	}	2386	}
2344	}	2387	}
2345	}	2388	}
2346		2389
2347	// read the next character	2390	// read the next character
2348	wchar_t	2391	wchar_t ecb_hot
2349	rxvt_term::next_char () NOTHROW	2392	rxvt_term::next_char () NOTHROW
2350	{	2393	{
2351	while (cmdbuf_ptr < cmdbuf_endp)	2394	while (cmdbuf_ptr < cmdbuf_endp)
2352	{	2395	{
2353	// assume 7-bit to be ascii ALWAYS	2396	// assume 7-bit to be ascii ALWAYS
2354	if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))	2397	if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2355	return *cmdbuf_ptr++;	2398	return *cmdbuf_ptr++;
2356		2399
2357	wchar_t wc;	2400	wchar_t wc;
2358	size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);	2401	size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2359		2402
…		…
2365	}	2408	}
2366		2409
2367	if (len == (size_t)-1)	2410	if (len == (size_t)-1)
2368	{	2411	{
2369	mbstate.reset (); // reset now undefined conversion state	2412	mbstate.reset (); // reset now undefined conversion state
		2413	// a -1 might indicate that a previous incomplete char is invalid (previous return -2)
		2414	// in which case we "erroneously" return the next byte which might be valid.
2370	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through	2415	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2371	}	2416	}
2372		2417
2373	// assume wchar == unicode	2418	// assume wchar == unicode
2374	cmdbuf_ptr += len;	2419	cmdbuf_ptr += len;
…		…
2377		2422
2378	return NOCHAR;	2423	return NOCHAR;
2379	}	2424	}
2380		2425
2381	// read the next octet	2426	// read the next octet
2382	uint32_t	2427	uint32_t ecb_hot
2383	rxvt_term::next_octet () NOTHROW	2428	rxvt_term::next_octet () NOTHROW
2384	{	2429	{
2385	return cmdbuf_ptr < cmdbuf_endp	2430	return cmdbuf_ptr < cmdbuf_endp
2386	? (unsigned char)*cmdbuf_ptr++	2431	? (unsigned char)*cmdbuf_ptr++
2387	: NOCHAR;	2432	: NOCHAR;
2388	}	2433	}
2389		2434
2390	static class out_of_input out_of_input;	2435	static class out_of_input out_of_input;
2391		2436
2392	wchar_t	2437	wchar_t ecb_hot
2393	rxvt_term::cmd_getc () THROW ((class out_of_input))	2438	rxvt_term::cmd_getc () THROW ((class out_of_input))
2394	{	2439	{
2395	wchar_t c = next_char ();	2440	wchar_t c = next_char ();
2396		2441
2397	if (c == NOCHAR)	2442	if (c == NOCHAR)
2398	throw out_of_input;	2443	throw out_of_input;
2399		2444
2400	return c;	2445	return c;
2401	}	2446	}
2402		2447
2403	uint32_t	2448	uint32_t ecb_hot
2404	rxvt_term::cmd_get8 () THROW ((class out_of_input))	2449	rxvt_term::cmd_get8 () THROW ((class out_of_input))
2405	{	2450	{
2406	uint32_t c = next_octet ();	2451	uint32_t c = next_octet ();
2407		2452
2408	if (c == NOCHAR)	2453	if (c == NOCHAR)
…		…
2412	}	2457	}
2413		2458
2414	/*{{{ print pipe */	2459	/*{{{ print pipe */
2415	/*----------------------------------------------------------------------*/	2460	/*----------------------------------------------------------------------*/
2416	#ifdef PRINTPIPE	2461	#ifdef PRINTPIPE
2417	FILE *	2462	FILE * ecb_cold
2418	rxvt_term::popen_printer ()	2463	rxvt_term::popen_printer ()
2419	{	2464	{
2420	FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");	2465	FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2421		2466
2422	if (stream == NULL)	2467	if (stream == NULL)
2423	rxvt_warn ("can't open printer pipe, not printing.\n");	2468	rxvt_warn ("can't open printer pipe, not printing.\n");
2424		2469
2425	return stream;	2470	return stream;
2426	}	2471	}
2427		2472
2428	int	2473	int ecb_cold
2429	rxvt_term::pclose_printer (FILE *stream)	2474	rxvt_term::pclose_printer (FILE *stream)
2430	{	2475	{
2431	fflush (stream);	2476	fflush (stream);
2432	return pclose (stream);	2477	return pclose (stream);
2433	}	2478	}
2434		2479
2435	/*	2480	/*
2436	* simulate attached vt100 printer	2481	* simulate attached vt100 printer
2437	*/	2482	*/
2438	void	2483	void ecb_cold
2439	rxvt_term::process_print_pipe ()	2484	rxvt_term::process_print_pipe ()
2440	{	2485	{
2441	FILE *fd = popen_printer ();	2486	FILE *fd = popen_printer ();
2442		2487
2443	if (!fd)	2488	if (!fd)
…		…
2498	C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,	2543	C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2499	C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,	2544	C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2500	};	2545	};
2501		2546
2502	/*{{{ process non-printing single characters */	2547	/*{{{ process non-printing single characters */
2503	void	2548	void ecb_hot
2504	rxvt_term::process_nonprinting (unicode_t ch)	2549	rxvt_term::process_nonprinting (unicode_t ch)
2505	{	2550	{
2506	switch (ch)	2551	switch (ch)
2507	{	2552	{
2508	case C0_ESC:	2553	case C0_ESC:
…		…
2554	}	2599	}
2555	/*}}} */	2600	/*}}} */
2556		2601
2557		2602
2558	/*{{{ process VT52 escape sequences */	2603	/*{{{ process VT52 escape sequences */
2559	void	2604	void ecb_cold
2560	rxvt_term::process_escape_vt52 (unicode_t ch)	2605	rxvt_term::process_escape_vt52 (unicode_t ch)
2561	{	2606	{
2562	int row, col;	2607	int row, col;
2563		2608
2564	switch (ch)	2609	switch (ch)
…		…
2598	break;	2643	break;
2599	case 'Z': /* identify the terminal type */	2644	case 'Z': /* identify the terminal type */
2600	tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */	2645	tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2601	break;	2646	break;
2602	case '<': /* turn off VT52 mode */	2647	case '<': /* turn off VT52 mode */
2603	set_privmode (PrivMode_vt52, 0);	2648	priv_modes &= ~PrivMode_vt52;
2604	break;	2649	break;
2605	case 'F': /* use special graphics character set */	2650	case 'F': /* use special graphics character set */
2606	case 'G': /* use regular character set */	2651	case 'G': /* use regular character set */
2607	/* unimplemented */	2652	/* unimplemented */
2608	break;	2653	break;
…		…
2614	}	2659	}
2615	/*}}} */	2660	/*}}} */
2616		2661
2617		2662
2618	/*{{{ process escape sequences */	2663	/*{{{ process escape sequences */
2619	void	2664	void ecb_hot
2620	rxvt_term::process_escape_seq ()	2665	rxvt_term::process_escape_seq ()
2621	{	2666	{
2622	unicode_t ch = cmd_getc ();	2667	unicode_t ch = cmd_getc ();
2623		2668
2624	if (priv_modes & PrivMode_vt52)	2669	if (priv_modes & PrivMode_vt52)
…		…
2627	return;	2672	return;
2628	}	2673	}
2629		2674
2630	switch (ch)	2675	switch (ch)
2631	{	2676	{
2632	/* case 1: do_tek_mode (); break; */
2633	case '#':	2677	case '#':
2634	if (cmd_getc () == '8')	2678	if (cmd_getc () == '8')
2635	scr_E ();	2679	scr_E ();
2636	break;	2680	break;
2637	case '(':	2681	case '(':
…		…
2660	#if !ENABLE_MINIMAL	2704	#if !ENABLE_MINIMAL
2661	case '9':	2705	case '9':
2662	scr_forwardindex ();	2706	scr_forwardindex ();
2663	break;	2707	break;
2664	#endif	2708	#endif
		2709	// DECPAM/DECPNM
2665	case '=':	2710	case '=':
		2711	priv_modes |= PrivMode_aplKP;
		2712	break;
2666	case '>':	2713	case '>':
2667	set_privmode (PrivMode_aplKP, ch == '=');	2714	priv_modes &= ~PrivMode_aplKP;
2668	break;	2715	break;
2669		2716
2670	case C1_40:	2717	case C1_40:
2671	cmd_getc ();	2718	cmd_getc ();
2672	break;	2719	break;
…		…
2676		2723
2677	/* 8.3.87: NEXT LINE */	2724	/* 8.3.87: NEXT LINE */
2678	case C1_NEL: /* ESC E */	2725	case C1_NEL: /* ESC E */
2679	{	2726	{
2680	wchar_t nlcr[] = { C0_LF, C0_CR };	2727	wchar_t nlcr[] = { C0_LF, C0_CR };
2681	scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);	2728	scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2682	}	2729	}
2683	break;	2730	break;
2684		2731
2685	/* kidnapped escape sequence: Should be 8.3.48 */	2732	/* kidnapped escape sequence: Should be 8.3.48 */
2686	case C1_ESA: /* ESC G */	2733	case C1_ESA: /* ESC G */
…		…
2698	case C1_RI: /* ESC M */	2745	case C1_RI: /* ESC M */
2699	scr_index (DN);	2746	scr_index (DN);
2700	break;	2747	break;
2701		2748
2702	/* 8.3.142: SINGLE-SHIFT TWO */	2749	/* 8.3.142: SINGLE-SHIFT TWO */
2703	/*case C1_SS2: scr_single_shift (2); break; */	2750	/* case C1_SS2: break; */
2704		2751
2705	/* 8.3.143: SINGLE-SHIFT THREE */	2752	/* 8.3.143: SINGLE-SHIFT THREE */
2706	/*case C1_SS3: scr_single_shift (3); break; */	2753	/* case C1_SS3: break; */
2707		2754
2708	/* 8.3.27: DEVICE CONTROL STRING */	2755	/* 8.3.27: DEVICE CONTROL STRING */
2709	case C1_DCS: /* ESC P */	2756	case C1_DCS: /* ESC P */
2710	process_dcs_seq ();	2757	process_dcs_seq ();
2711	break;	2758	break;
…		…
2774	make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */	2821	make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2775	make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */	2822	make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2776	make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */	2823	make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2777	};	2824	};
2778		2825
2779	void	2826	void ecb_hot
2780	rxvt_term::process_csi_seq ()	2827	rxvt_term::process_csi_seq ()
2781	{	2828	{
2782	unicode_t ch, priv, i;	2829	unicode_t ch, priv, prev_ch, i;
2783	unsigned int nargs, p;	2830	unsigned int nargs, p;
2784	int n, ndef;	2831	int n, ndef;
2785	int arg[ESC_ARGS] = { };	2832	int arg[ESC_ARGS] = { };
2786		2833
2787	nargs = 0;	2834	nargs = 0;
…		…
2793	/* '<' '=' '>' '?' '!' */	2840	/* '<' '=' '>' '?' '!' */
2794	priv = ch;	2841	priv = ch;
2795	ch = cmd_getc ();	2842	ch = cmd_getc ();
2796	}	2843	}
2797		2844
		2845	prev_ch = 0;
2798	/* read any numerical arguments */	2846	/* read any numerical arguments */
2799	for (n = -1; ch < CSI_ICH; )	2847	for (n = -1; ch < CSI_ICH; )
2800	{	2848	{
2801	if (isdigit (ch))	2849	if (isdigit (ch))
2802	{	2850	{
…		…
2812	n = -1;	2860	n = -1;
2813	}	2861	}
2814	else if (IS_CONTROL (ch))	2862	else if (IS_CONTROL (ch))
2815	process_nonprinting (ch);	2863	process_nonprinting (ch);
2816		2864
		2865	prev_ch = ch;
2817	ch = cmd_getc ();	2866	ch = cmd_getc ();
2818	}	2867	}
2819		2868
2820	if (ch > CSI_7F)	2869	if (ch > CSI_7F)
2821	return;	2870	return;
…		…
2862	scr_soft_reset ();	2911	scr_soft_reset ();
2863		2912
2864	static const int pm_h[] = { 7, 25 };	2913	static const int pm_h[] = { 7, 25 };
2865	static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };	2914	static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2866		2915
2867	process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h);	2916	process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2868	process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l);	2917	process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2869	}	2918	}
2870	break;	2919	break;
2871	}	2920	}
2872		2921
2873	return;	2922	return;
…		…
2891	}	2940	}
2892	break;	2941	break;
2893	#endif	2942	#endif
2894		2943
2895	case CSI_CUU: /* 8.3.22: (1) CURSOR UP */	2944	case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2896	case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */	2945	case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2897	arg[0] = -arg[0];	2946	arg[0] = -arg[0];
2898	/* FALLTHROUGH */	2947	/* FALLTHROUGH */
2899	case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */	2948	case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2900	case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */	2949	case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2901	scr_gotorc (arg[0], 0, RELATIVE);	2950	scr_gotorc (arg[0], 0, RELATIVE);
2902	break;	2951	break;
2903		2952
2904	case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */	2953	case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2905	case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */	2954	case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
…		…
3055	scr_insert_mode (1);	3104	scr_insert_mode (1);
3056	else if (arg[0] == 20)	3105	else if (arg[0] == 20)
3057	priv_modes |= PrivMode_LFNL;	3106	priv_modes |= PrivMode_LFNL;
3058	break;	3107	break;
3059		3108
		3109	case CSI_71: // DESCUSR: set cursor style
		3110	if (prev_ch == ' ')
		3111	set_cursor_style (arg[0]);
		3112	break;
		3113
3060	/*	3114	/*
3061	* PRIVATE USE beyond this point. All CSI_7? sequences here	3115	* PRIVATE USE beyond this point. All CSI_7? sequences here
3062	*/	3116	*/
3063	case CSI_72: /* DECSTBM: set top and bottom margins */	3117	case CSI_72: /* DECSTBM: set top and bottom margins */
3064	if (nargs == 1)	3118	if (nargs == 1)
…		…
3138	break;	3192	break;
3139		3193
3140	//case 9: NYI, TODO, restore maximized window or maximize window	3194	//case 9: NYI, TODO, restore maximized window or maximize window
3141	default:	3195	default:
3142	if (args[0] >= 24) /* set height (chars) */	3196	if (args[0] >= 24) /* set height (chars) */
3143	set_widthheight ((unsigned int)width,	3197	set_widthheight ((unsigned int)vt_width,
3144	(unsigned int) (args[1] * fheight));	3198	(unsigned int) (args[1] * fheight));
3145	break;	3199	break;
3146		3200
3147	/*	3201	/*
3148	* reports - some output format copied from XTerm	3202	* reports - some output format copied from XTerm
…		…
3197	rxvt_term::get_to_st (unicode_t &ends_how)	3251	rxvt_term::get_to_st (unicode_t &ends_how)
3198	{	3252	{
3199	unicode_t ch;	3253	unicode_t ch;
3200	bool seen_esc = false;	3254	bool seen_esc = false;
3201	unsigned int n = 0;	3255	unsigned int n = 0;
3202	wchar_t string[STRING_MAX];	3256	wchar_t string[CBUFSIZ];
3203		3257
3204	while ((ch = cmd_getc ()) != NOCHAR)	3258	while ((ch = cmd_getc ()) != NOCHAR)
3205	{	3259	{
3206	if (seen_esc)	3260	if (seen_esc)
3207	{	3261	{
…		…
3222	else if (ch < 0x20)	3276	else if (ch < 0x20)
3223	return NULL; /* other control character - exit */	3277	return NULL; /* other control character - exit */
3224		3278
3225	seen_esc = false;	3279	seen_esc = false;
3226		3280
3227	if (n >= STRING_MAX - 1)	3281	if (n >= sizeof (string) - 1)
3228	// stop at some sane length	3282	// stop at some sane length
3229	return NULL;	3283	return NULL;
3230		3284
3231	string[n++] = ch;	3285	string[n++] = ch;
3232	}	3286	}
…		…
3349	&nitems, &bytes_after, &value) == Success	3403	&nitems, &bytes_after, &value) == Success
3350	&& actual_type != None	3404	&& actual_type != None
3351	&& actual_format == 8)	3405	&& actual_format == 8)
3352	str = (const char *)(value);	3406	str = (const char *)(value);
3353		3407
3354	tt_printf ("\033]%d;%s%c", op, str, resp);	3408	tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
3355		3409
3356	XFree (value);	3410	XFree (value);
3357	}	3411	}
3358	else	3412	else
3359	{	3413	{
…		…
3427	break;	3481	break;
3428	#endif	3482	#endif
3429	case URxvt_Color_border:	3483	case URxvt_Color_border:
3430	process_color_seq (op, Color_border, str, resp);	3484	process_color_seq (op, Color_border, str, resp);
3431	break;	3485	break;
3432	#if ENABLE_TRANSPARENCY	3486
		3487	#if BG_IMAGE_FROM_ROOT
3433	case URxvt_Color_tint:	3488	case URxvt_Color_tint:
3434	process_color_seq (op, Color_tint, str, resp);	3489	process_color_seq (op, Color_tint, str, resp);
3435	{	3490	{
3436	bool changed = false;	3491	bool changed = false;
3437		3492
3438	if (ISSET_PIXCOLOR (Color_tint))	3493	if (ISSET_PIXCOLOR (Color_tint))
3439	changed = bg_set_tint (pix_colors_focused [Color_tint]);	3494	changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3440		3495
3441	if (changed)	3496	if (changed)
3442	update_background ();	3497	update_background ();
3443	}	3498	}
3444		3499
…		…
3448	#if BG_IMAGE_FROM_FILE	3503	#if BG_IMAGE_FROM_FILE
3449	case Rxvt_Pixmap:	3504	case Rxvt_Pixmap:
3450	if (!strcmp (str, "?"))	3505	if (!strcmp (str, "?"))
3451	{	3506	{
3452	char str[256];	3507	char str[256];
		3508	int h_scale = fimage.h_scale;
		3509	int v_scale = fimage.v_scale;
		3510	int h_align = fimage.h_align;
		3511	int v_align = fimage.v_align;
3453		3512
3454	sprintf (str, "[%dx%d+%d+%d]",	3513	sprintf (str, "[%dx%d+%d+%d]",
3455	min (h_scale, 32767), min (v_scale, 32767),	3514	h_scale, v_scale,
3456	min (h_align, 32767), min (v_align, 32767));	3515	h_align, v_align);
3457	process_xterm_seq (XTerm_title, str, CHAR_ST);	3516	process_xterm_seq (XTerm_title, str, CHAR_ST);
3458	}	3517	}
3459	else	3518	else
3460	{	3519	{
3461	int changed = 0;	3520	bool changed = false;
3462		3521
3463	if (*str != ';')	3522	if (*str != ';')
3464	{	3523	{
3465	if (bg_set_file (str)) /* change pixmap */	3524	try
3466	{	3525	{
		3526	fimage.set_file_geometry (this, str);
3467	changed++;	3527	changed = true;
3468	str = strchr (str, ';');
3469	if (str == NULL)
3470	bg_set_default_geometry ();
3471	else	3528	}
3472	bg_set_geometry (str+1);	3529	catch (const class rxvt_failure_exception &e)
		3530	{
3473	}	3531	}
3474	}	3532	}
3475	else	3533	else
3476	{	3534	{
3477	str++;	3535	str++;
3478	if (bg_set_geometry (str, true))	3536	if (fimage.set_geometry (str, true))
3479	changed++;	3537	changed = true;
3480	}	3538	}
3481		3539
3482	if (changed)	3540	if (changed)
3483	{	3541	{
3484	if (bg_window_position_sensitive ())	3542	if (bg_window_position_sensitive ())
3485	{	3543	{
3486	int x, y;	3544	int x, y;
3487	get_window_origin (x, y);	3545	get_window_origin (x, y);
3488	bg_set_position (x, y);	3546	parent_x = x;
		3547	parent_y = y;
3489	}	3548	}
3490	update_background ();	3549	update_background ();
3491	}	3550	}
3492	}	3551	}
3493	break;	3552	break;
…		…
3583	* 's' = save	3642	* 's' = save
3584	* 'r' = restore	3643	* 'r' = restore
3585	* 't' = toggle	3644	* 't' = toggle
3586	* so no need for fancy checking	3645	* so no need for fancy checking
3587	*/	3646	*/
3588	int	3647	int ecb_cold
3589	rxvt_term::privcases (int mode, unsigned long bit)	3648	rxvt_term::privcases (int mode, unsigned long bit)
3590	{	3649	{
3591	int state;	3650	int state;
3592		3651
3593	if (mode == 's')	3652	if (mode == 's')
3594	{	3653	{
3595	SavedModes |= (priv_modes & bit);	3654	if (priv_modes & bit)
		3655	SavedModes |= bit;
		3656	else
		3657	SavedModes &= ~bit;
3596	return -1;	3658	return -1;
3597	}	3659	}
3598	else	3660	else
3599	{	3661	{
3600	if (mode == 'r')	3662	if (mode == 'r')
3601	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */	3663	state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3602	else	3664	else
3603	state = (mode == 't') ? ! (priv_modes & bit) : mode;	3665	state = (mode == 't') ? ! (priv_modes & bit) : mode;
3604		3666
3605	set_privmode (bit, state);	3667	if (state)
		3668	priv_modes |= bit;
		3669	else
		3670	priv_modes &= ~bit;
3606	}	3671	}
3607		3672
3608	return state;	3673	return state;
3609	}	3674	}
3610		3675
3611	/* we're not using priv _yet_ */	3676	/* we're not using priv _yet_ */
3612	void	3677	void
3613	rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)	3678	rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3614	{	3679	{
3615	unsigned int i, j;	3680	unsigned int i, j;
3616	int state;	3681	int state;
3617		3682
3618	static const struct	3683	static const struct
3619	{	3684	{
3620	const int argval;	3685	const int argval;
3621	const unsigned long bit;	3686	const unsigned long bit;
3622	} argtopriv[] = {	3687	} argtopriv[] = {
3623	{ 1, PrivMode_aplCUR }, // DECCKM	3688	{ 1, PrivMode_aplCUR }, // DECCKM
3624	{ 2, PrivMode_vt52 },	3689	{ 2, PrivMode_vt52 }, // DECANM
3625	{ 3, PrivMode_132 }, // DECCOLM	3690	{ 3, PrivMode_132 }, // DECCOLM
3626	{ 4, PrivMode_smoothScroll }, // DECSCLM	3691	{ 4, PrivMode_smoothScroll }, // DECSCLM
3627	{ 5, PrivMode_rVideo }, // DECSCNM	3692	{ 5, PrivMode_rVideo }, // DECSCNM
3628	{ 6, PrivMode_relOrigin }, // DECOM	3693	{ 6, PrivMode_relOrigin }, // DECOM
3629	{ 7, PrivMode_Autowrap }, // DECAWM	3694	{ 7, PrivMode_Autowrap }, // DECAWM
3630	// 8, auto-repeat keys // DECARM	3695	// 8, auto-repeat keys // DECARM
3631	{ 9, PrivMode_MouseX10 },	3696	{ 9, PrivMode_MouseX10 },
3632	// 18 end FF to printer after print screen	3697	// 18 end FF to printer after print screen
3633	// 19 Print screen prints full screen/scroll region	3698	// 19 Print screen prints full screen/scroll region
3634	{ 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis	3699	{ 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3635	#ifdef scrollBar_esc	3700	#ifdef scrollBar_esc
3636	{ scrollBar_esc, PrivMode_scrollBar },	3701	{ scrollBar_esc, PrivMode_scrollBar },
3637	#endif	3702	#endif
3638	{ 35, PrivMode_ShiftKeys }, // rxvt extension	3703	{ 35, PrivMode_ShiftKeys }, // rxvt extension
3639	// 38, tektronix mode // DECTEK	3704	// 38, tektronix mode // DECTEK
3640	{ 40, PrivMode_132OK },	3705	{ 40, PrivMode_132OK },
3641	// 41 xterm more fixes NYI	3706	// 41 xterm more fixes NYI
3642	// 45 margin bell NYI	3707	// 45 margin bell NYI
3643	// 46 start logging	3708	// 46 start logging
3644	{ 47, PrivMode_Screen },	3709	{ 47, PrivMode_Screen },
3645	{ 66, PrivMode_aplKP }, // DECPAM/DECPNM	3710	{ 66, PrivMode_aplKP }, // DECNKM
3646	#ifndef NO_BACKSPACE_KEY	3711	#ifndef NO_BACKSPACE_KEY
3647	{ 67, PrivMode_BackSpace }, // DECBKM	3712	{ 67, PrivMode_BackSpace }, // DECBKM
3648	#endif	3713	#endif
3649	{ 1000, PrivMode_MouseX11 },	3714	{ 1000, PrivMode_MouseX11 },
3650	{ 1002, PrivMode_MouseBtnEvent },	3715	{ 1002, PrivMode_MouseBtnEvent },
…		…
3679	for (i = 0; i < nargs; i++)	3744	for (i = 0; i < nargs; i++)
3680	{	3745	{
3681	state = -1;	3746	state = -1;
3682		3747
3683	/* basic handling */	3748	/* basic handling */
3684	for (j = 0; j < ARRAY_LENGTH(argtopriv); j++)	3749	for (j = 0; j < ecb_array_length (argtopriv); j++)
3685	if (argtopriv[j].argval == arg[i])	3750	if (argtopriv[j].argval == arg[i])
3686	{	3751	{
3687	state = privcases (mode, argtopriv[j].bit);	3752	state = privcases (mode, argtopriv[j].bit);
3688	break;	3753	break;
3689	}	3754	}
…		…
3715	case 2: /* VT52 mode */	3780	case 2: /* VT52 mode */
3716	/* oddball mode. should be set regardless of set/reset	3781	/* oddball mode. should be set regardless of set/reset
3717	* parameter. Return from VT52 mode with an ESC < from	3782	* parameter. Return from VT52 mode with an ESC < from
3718	* within VT52 mode	3783	* within VT52 mode
3719	*/	3784	*/
3720	set_privmode (PrivMode_vt52, 1);	3785	priv_modes |= PrivMode_vt52;
3721	break;	3786	break;
3722	case 3: /* 80/132 */	3787	case 3: /* 80/132 */
3723	if (priv_modes & PrivMode_132OK)	3788	if (priv_modes & PrivMode_132OK)
3724	set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);	3789	set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3725	break;	3790	break;
…		…
3740	if (state) /* orthogonal */	3805	if (state) /* orthogonal */
3741	priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);	3806	priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3742	break;	3807	break;
3743	#ifdef scrollBar_esc	3808	#ifdef scrollBar_esc
3744	case scrollBar_esc:	3809	case scrollBar_esc:
3745	if (scrollBar.map (state))	3810	scrollBar.map (state);
3746	{
3747	resize_all_windows (0, 0, 0);	3811	resize_all_windows (0, 0, 0);
3748	scr_touch (true);	3812	scr_touch (true);
3749	}
3750	break;	3813	break;
3751	#endif	3814	#endif
3752	case 25: /* visible/invisible cursor */	3815	case 25: /* visible/invisible cursor */
3753	scr_cursor_visible (state);	3816	scr_cursor_visible (state);
3754	break;	3817	break;
…		…
3809	}	3872	}
3810	}	3873	}
3811	/*}}} */	3874	/*}}} */
3812		3875
3813	/*{{{ process sgr sequences */	3876	/*{{{ process sgr sequences */
3814	void	3877	void ecb_hot
3815	rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)	3878	rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3816	{	3879	{
3817	unsigned int i;	3880	unsigned int i;
3818	short rendset;	3881	short rendset;
3819	int rendstyle;	3882	int rendstyle;
…		…
3960	break;	4023	break;
3961	#endif	4024	#endif
3962	}	4025	}
3963	}	4026	}
3964	}	4027	}
		4028
		4029	void
		4030	rxvt_term::set_cursor_style (int style)
		4031	{
		4032	if (!IN_RANGE_INC (style, 0, 4))
		4033	return;
		4034
		4035	set_option (Opt_cursorUnderline, style >= 3);
		4036
		4037	#ifdef CURSOR_BLINK
		4038	set_option (Opt_cursorBlink, !style || (style & 1));
		4039	cursor_blink_reset ();
		4040	#endif
		4041
		4042	want_refresh = 1;
		4043	}
3965	/*}}} */	4044	/*}}} */
3966		4045
3967	/* ------------------------------------------------------------------------- */	4046	/* ------------------------------------------------------------------------- */
3968		4047
3969	/*	4048	/*

Diff Legend

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