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

Diff Legend

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