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

Diff Legend

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