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.183 by root, Tue Dec 21 06:43:00 2004 UTC vs.
Revision 1.231 by root, Wed Jan 4 00:13:22 2006 UTC

…		…
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-2004 Marc Lehmann <pcg@goof.com>	30	* Copyright (c) 2003-2005 Marc Lehmann <pcg@goof.com>
31	*	31	*
32	* This program is free software; you can redistribute it and/or modify	32	* This program is free software; you can redistribute it and/or modify
33	* it under the terms of the GNU General Public License as published by	33	* it under the terms of the GNU General Public License as published by
34	* the Free Software Foundation; either version 2 of the License, or	34	* the Free Software Foundation; either version 2 of the License, or
35	* (at your option) any later version.	35	* (at your option) any later version.
…		…
43	* along with this program; if not, write to the Free Software	43	* along with this program; if not, write to the Free Software
44	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	44	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
45	*----------------------------------------------------------------------*/	45	*----------------------------------------------------------------------*/
46		46
47	/*{{{ includes: */	47	/*{{{ includes: */
48	#include "../config.h" /* NECESSARY */	48	#include "../config.h"
49	#include "rxvt.h" /* NECESSARY */	49	#include "rxvt.h"
		50	#include "rxvtperl.h"
50	#include "version.h"	51	#include "version.h"
51	#include "command.h"	52	#include "command.h"
52		53
53	#include <cwchar>	54	#if HAVE_SCHED_YIELD
		55	# include <sched.h>
		56	#endif
		57
		58	#ifdef KEYSYM_RESOURCE
		59	# include "keyboard.h"
		60	#endif
		61
54	#include <csignal>	62	#include <csignal>
55		63
56	/*----------------------------------------------------------------------*/	64	/*----------------------------------------------------------------------*/
57		65
58	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)	66	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
…		…
114	XK_Escape, 0x238b,	122	XK_Escape, 0x238b,
115	XK_Undo, 0x238c,	123	XK_Undo, 0x238c,
116	XK_Print, 0x2399,	124	XK_Print, 0x2399,
117		125
118	XK_space, 0x2423,	126	XK_space, 0x2423,
		127
		128	#ifdef XK_KP_Begin
		129	XK_KP_Prior, 0x21de,
		130	XK_KP_Next, 0x21df,
		131	XK_KP_Begin, 0x2320,
		132	XK_KP_Insert, 0x2380,
		133	XK_KP_Delete, 0x2326,
119	XK_KP_Space, 0x2422,	134	XK_KP_Space, 0x2422,
		135	#endif
120	0,	136	0,
121	};	137	};
122		138
123	void	139	void
124	rxvt_term::iso14755_54 (int x, int y)	140	rxvt_term::iso14755_54 (int x, int y)
125	{	141	{
126	x = Pixel2Col (x);	142	x = Pixel2Col (x);
127	y = Pixel2Row (y);	143	y = Pixel2Row (y);
128		144
129	if (x < 0 || x >= TermWin.ncol	145	if (!IN_RANGE_EXC (x, 0, ncol)
130	|| y < 0 || y >= TermWin.nrow)	146	|| !IN_RANGE_EXC (y, 0, nrow))
131	return;	147	return;
132		148
133	for (;;)	149	for (;;)
134	{	150	{
135	text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x];	151	const line_t &l = ROW(y - view_start);
		152
		153	text_t t = l.t[x];
136		154
137	if (t != NOCHAR || !x)	155	if (t != NOCHAR || !x)
138	{	156	{
139	iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x],	157	iso14755_51 (l.t[x], l.r[x], x, y);
140	screen.rend[y + TermWin.saveLines - TermWin.view_start][x]);
141	iso14755buf = ISO_14755_54;	158	iso14755buf = ISO_14755_54;
142	break;	159	break;
143	}	160	}
144		161
145	x--;	162	x--;
146	}	163	}
147
148	}	164	}
149	#endif
150		165
151	#if ENABLE_OVERLAY
152	void	166	void
153	rxvt_term::iso14755_51 (unicode_t ch, rend_t r)	167	rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
154	{	168	{
155	rxvt_fontset *fs = FONTSET (r);	169	rxvt_fontset *fs = FONTSET (r);
156	rxvt_font *f = (*fs)[fs->find_font (ch)];	170	rxvt_font *f = (*fs)[fs->find_font (ch)];
157	wchar_t *chr, *alloc, ch2;	171	wchar_t *chr, *alloc, ch2, *fname;
158	int len;	172	int len;
159		173
		174	fname = rxvt_utf8towcs (f->name);
		175
160	#if ENABLE_COMBINING	176	# if ENABLE_COMBINING
161	if (IS_COMPOSE (ch))	177	if (IS_COMPOSE (ch))
162	{	178	{
163	len = rxvt_composite.expand (ch, 0);	179	len = rxvt_composite.expand (ch, 0);
164	alloc = chr = new wchar_t[len];	180	alloc = chr = new wchar_t[len];
165	rxvt_composite.expand (ch, chr);	181	rxvt_composite.expand (ch, chr);
166	}	182	}
167	else	183	else
168	#endif	184	# endif
169	{	185	{
170	ch2 = ch;	186	ch2 = ch;
171		187
172	alloc = 0;	188	alloc = 0;
173	chr = &ch2;	189	chr = &ch2;
174	len = 1;	190	len = 1;
175	}	191	}
176		192
177	int width = strlen (f->name);	193	char attr[80]; // plenty
178		194
179	scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1);	195	sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
		196	(int)r,
		197	fgcolor_of (r), bgcolor_of (r),
		198	r & RS_Bold ? " bold" : "",
		199	r & RS_Italic ? " italic" : "",
		200	r & RS_Blink ? " blink" : "",
		201	r & RS_RVid ? " rvid" : "",
		202	r & RS_Uline ? " uline" : "",
		203	r & RS_Careful ? " careful" : "");
		204
		205	int width = wcswidth (fname, wcslen (fname));
		206
		207	max_it (width, 8+5); // for char + hey
		208	max_it (width, strlen (attr));
		209
		210	if (y >= 0)
		211	{
		212	y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
		213	x = 0;
		214	}
		215
		216	scr_overlay_new (x, y, width, len + 2);
180		217
181	r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));	218	r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
182		219
183	for (int y = 0; y < len; y++)	220	for (int y = 0; y < len; y++)
184	{	221	{
…		…
187	ch = *chr++;	224	ch = *chr++;
188		225
189	sprintf (buf, "%8x", ch);	226	sprintf (buf, "%8x", ch);
190	scr_overlay_set (0, y, buf);	227	scr_overlay_set (0, y, buf);
191	scr_overlay_set (9, y, '=');	228	scr_overlay_set (9, y, '=');
192	#if !UNICODE3	229	# if !UNICODE3
193	if (ch >= 0x10000)	230	if (ch >= 0x10000)
194	ch = 0xfffd;	231	ch = 0xfffd;
195	#endif	232	# endif
196	scr_overlay_set (11, y, ch, r);	233	scr_overlay_set (11, y, ch, r);
197	scr_overlay_set (12, y, NOCHAR, r);	234	scr_overlay_set (12, y, NOCHAR, r);
198	}	235	}
199		236
		237	scr_overlay_set (0, len , attr);
200	scr_overlay_set (0, len, f->name);	238	scr_overlay_set (0, len + 1, fname);
201		239
		240	free (fname);
		241
202	#if ENABLE_COMBINING	242	# if ENABLE_COMBINING
203	if (alloc)	243	if (alloc)
204	delete [] alloc;	244	delete [] alloc;
205	#endif	245	# endif
206	}	246	}
207	#endif	247	#endif
208		248
209	void	249	void
210	rxvt_term::commit_iso14755 ()	250	rxvt_term::commit_iso14755 ()
…		…
273	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an	313	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
274	* escape sequence to toggle the Keypad.	314	* escape sequence to toggle the Keypad.
275	*	315	*
276	* Always permit `shift' to override the current setting	316	* Always permit `shift' to override the current setting
277	*/	317	*/
278	shft = (ev.state & ShiftMask);	318	shft = ev.state & ShiftMask;
279	ctrl = (ev.state & ControlMask);	319	ctrl = ev.state & ControlMask;
280	meta = (ev.state & ModMetaMask);	320	meta = ev.state & ModMetaMask;
281		321
282	if (numlock_state || (ev.state & ModNumLockMask))	322	if (numlock_state || (ev.state & ModNumLockMask))
283	{	323	{
284	numlock_state = (ev.state & ModNumLockMask);	324	numlock_state = (ev.state & ModNumLockMask);
285	PrivMode ((!numlock_state), PrivMode_aplKP);	325	PrivMode ((!numlock_state), PrivMode_aplKP);
…		…
305		345
306	// the XOpenIM manpage lies about hardcoding the locale	346	// the XOpenIM manpage lies about hardcoding the locale
307	// at the point of XOpenIM, so temporarily switch locales	347	// at the point of XOpenIM, so temporarily switch locales
308	if (rs[Rs_imLocale])	348	if (rs[Rs_imLocale])
309	SET_LOCALE (rs[Rs_imLocale]);	349	SET_LOCALE (rs[Rs_imLocale]);
		350
310	// assume wchar_t == unicode or better	351	// assume wchar_t == unicode or better
311	len = XwcLookupString (Input_Context, &ev, wkbuf,	352	len = XwcLookupString (Input_Context, &ev, wkbuf,
312	KBUFSZ, &keysym, &status_return);	353	KBUFSZ, &keysym, &status_return);
		354
313	if (rs[Rs_imLocale])	355	if (rs[Rs_imLocale])
314	SET_LOCALE (locale);	356	SET_LOCALE (locale);
315		357
316	if (status_return == XLookupChars	358	if (status_return == XLookupChars
317	|| status_return == XLookupBoth)	359	|| status_return == XLookupBoth)
…		…
344	valid_keysym = keysym != NoSymbol;	386	valid_keysym = keysym != NoSymbol;
345	}	387	}
346		388
347	if (valid_keysym)	389	if (valid_keysym)
348	{	390	{
		391	#ifdef KEYSYM_RESOURCE
		392	if (keyboard->dispatch (this, keysym, ev.state))
		393	return;
		394	#endif
		395
349	if (TermWin.saveLines)	396	if (saveLines)
350	{	397	{
351	#ifdef UNSHIFTED_SCROLLKEYS	398	#ifdef UNSHIFTED_SCROLLKEYS
352	if (!ctrl && !meta)	399	if (!ctrl && !meta)
353	#else	400	#else
354	if (IS_SCROLL_MOD)	401	if (IS_SCROLL_MOD)
355	#endif	402	#endif
356	{	403	{
357	int lnsppg;	404	int lnsppg;
358		405
359	#ifdef PAGING_CONTEXT_LINES	406	#ifdef PAGING_CONTEXT_LINES
360	lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES;	407	lnsppg = nrow - PAGING_CONTEXT_LINES;
361	#else	408	#else
362	lnsppg = TermWin.nrow * 4 / 5;	409	lnsppg = nrow * 4 / 5;
363	#endif	410	#endif
364	if (keysym == XK_Prior)	411	if (keysym == XK_Prior)
365	{	412	{
366	scr_page (UP, lnsppg);	413	scr_page (UP, lnsppg);
367	return;	414	return;
…		…
487	}	534	}
488	#endif	535	#endif
489		536
490	if (keysym >= 0xFF00 && keysym <= 0xFFFF)	537	if (keysym >= 0xFF00 && keysym <= 0xFFFF)
491	{	538	{
492	#ifdef KEYSYM_RESOURCE
493	if (!(shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
494	{
495	unsigned int l;
496	const unsigned char *kbuf0;
497
498	kbuf0 = (Keysym_map[keysym & 0xFF]);
499	l = (unsigned int)*kbuf0++;
500
501	/* escape prefix */
502	if (meta
503	# ifdef META8_OPTION
504	&& meta_char == C0_ESC
505	# endif
506	)
507	{
508	const unsigned char ch = C0_ESC;
509	tt_write (&ch, 1);
510	}
511
512	tt_write (kbuf0, l);
513	return;
514	}
515	else
516	#endif
517	{	539	{
518	newlen = 1;	540	newlen = 1;
519	switch (keysym)	541	switch (keysym)
520	{	542	{
521	#ifndef NO_BACKSPACE_KEY	543	#ifndef NO_BACKSPACE_KEY
…		…
529	else	551	else
530	strcpy (kbuf, key_backspace);	552	strcpy (kbuf, key_backspace);
531	break;	553	break;
532	#endif	554	#endif
533	#ifndef NO_DELETE_KEY	555	#ifndef NO_DELETE_KEY
		556	# ifdef XK_KP_Prior
		557	case XK_KP_Delete:
		558	/* allow shift to override */
		559	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
		560	{
		561	strcpy (kbuf, "\033On");
		562	break;
		563	}
		564	/* FALLTHROUGH */
		565	# endif
534	case XK_Delete:	566	case XK_Delete:
535	strcpy (kbuf, key_delete);	567	strcpy (kbuf, key_delete);
536	break;	568	break;
537	#endif	569	#endif
538	case XK_Tab:	570	case XK_Tab:
…		…
641	#ifdef XK_KP_Begin	673	#ifdef XK_KP_Begin
642	case XK_KP_Begin:	674	case XK_KP_Begin:
643	strcpy (kbuf, "\033Ou");	675	strcpy (kbuf, "\033Ou");
644	break;	676	break;
645		677
646	case XK_KP_Insert:
647	strcpy (kbuf, "\033Op");
648	break;
649
650	case XK_KP_Delete:
651	strcpy (kbuf, "\033On");
652	break;
653	#endif	678	#endif
654	case XK_KP_F1: /* "\033OP" */	679	case XK_KP_F1: /* "\033OP" */
655	case XK_KP_F2: /* "\033OQ" */	680	case XK_KP_F2: /* "\033OQ" */
656	case XK_KP_F3: /* "\033OR" */	681	case XK_KP_F3: /* "\033OR" */
657	case XK_KP_F4: /* "\033OS" */	682	case XK_KP_F4: /* "\033OS" */
…		…
689	break;	714	break;
690		715
691	case XK_Find:	716	case XK_Find:
692	strcpy (kbuf, "\033[1~");	717	strcpy (kbuf, "\033[1~");
693	break;	718	break;
		719
		720	#ifdef XK_KP_End
		721	case XK_KP_Insert:
		722	/* allow shift to override */
		723	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
		724	{
		725	strcpy (kbuf, "\033Op");
		726	break;
		727	}
		728	/* FALLTHROUGH */
		729	#endif
694	case XK_Insert:	730	case XK_Insert:
695	strcpy (kbuf, "\033[2~");	731	strcpy (kbuf, "\033[2~");
696	break;	732	break;
697	#ifdef DXK_Remove /* support for DEC remove like key */	733	#ifdef DXK_Remove /* support for DEC remove like key */
698	case DXK_Remove:	734	case DXK_Remove:
…		…
785	case XK_F35: /* "\033[49~" */	821	case XK_F35: /* "\033[49~" */
786	FKEY (31, XK_F17);	822	FKEY (31, XK_F17);
787	break;	823	break;
788	#undef FKEY	824	#undef FKEY
789	default:	825	default:
790	if (len == 0	826	newlen = 0;
791	&& (keysym & 0xfff0) != 0xff70	827	break;
792	&& (keysym & 0xfff0) != 0xffe0)
793	/* generate a keycode for every remaining keypress */
794	sprintf ((char *)kbuf, "\033[%x;%xA", (unsigned char)ev.state, (unsigned short)keysym);
795	}	828	}
796		829
797	if (newlen)	830	if (newlen)
798	len = strlen (kbuf);	831	len = strlen (kbuf);
799	}	832	}
…		…
815	else if (keysym == XK_ISO_Left_Tab)	848	else if (keysym == XK_ISO_Left_Tab)
816	{	849	{
817	strcpy (kbuf, "\033[Z");	850	strcpy (kbuf, "\033[Z");
818	len = 3;	851	len = 3;
819	}	852	}
820	else if (len == 0
821	&& (keysym & 0xffe0) != 0xfe00
822	&& (keysym < 0xfe50 || keysym > 0xfe6f))
823	{
824	/* generate a keycode for every remaining keypress */
825	len = sprintf ((char *)kbuf, "\033[%x;%xA", (unsigned char)ev.state, (unsigned short)keysym);
826	}
827	else	853	else
828	{	854	{
829	#ifdef META8_OPTION	855	#ifdef META8_OPTION
830	/* set 8-bit on */	856	/* set 8-bit on */
831	if (meta && (meta_char == 0x80))	857	if (meta && (meta_char == 0x80))
…		…
843	}	869	}
844		870
845	if (len <= 0)	871	if (len <= 0)
846	return; /* not mapped */	872	return; /* not mapped */
847		873
848	if (options & Opt_scrollTtyKeypress)	874	if (OPTION (Opt_scrollTtyKeypress))
849	if (TermWin.view_start)	875	if (view_start)
850	{	876	{
851	TermWin.view_start = 0;	877	view_start = 0;
852	want_refresh = 1;	878	want_refresh = 1;
853	}	879	}
854		880
855	/*	881	/*
856	* these modifications only affect the static keybuffer	882	* these modifications only affect the static keybuffer
…		…
889	#endif /* DEBUG_CMD */	915	#endif /* DEBUG_CMD */
890	tt_write (kbuf, (unsigned int)len);	916	tt_write (kbuf, (unsigned int)len);
891	}	917	}
892	/*}}} */	918	/*}}} */
893		919
894	#if (MENUBAR_MAX)	920	#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
895	/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */	921	/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
896	/* attempt to `write' count to the input buffer */	922	/* attempt to `write' count to the input buffer */
897	unsigned int	923	unsigned int
898	rxvt_term::cmd_write (const unsigned char *str, unsigned int count)	924	rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
899	{	925	{
…		…
922		948
923	cmd_parse ();	949	cmd_parse ();
924		950
925	return 0;	951	return 0;
926	}	952	}
927	#endif /* MENUBAR_MAX */	953	#endif
928		954
929	void	955	void
930	rxvt_term::flush ()	956	rxvt_term::flush ()
931	{	957	{
932	flush_ev.stop ();	958	flush_ev.stop ();
…		…
959	SET_LOCALE (locale);	985	SET_LOCALE (locale);
960		986
961	display->flush ();	987	display->flush ();
962		988
963	if (want_refresh && !flush_ev.active)	989	if (want_refresh && !flush_ev.active)
964	flush_ev.start (NOW + 0.01);	990	flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
965	}	991	}
966		992
967	void	993	void
968	rxvt_term::flush_cb (time_watcher &w)	994	rxvt_term::flush_cb (time_watcher &w)
969	{	995	{
…		…
1033	{	1059	{
1034	if (mouse_slip_wheel_speed == 0	1060	if (mouse_slip_wheel_speed == 0
1035	|| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)	1061	|| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1036	: scr_page (UP, mouse_slip_wheel_speed))	1062	: scr_page (UP, mouse_slip_wheel_speed))
1037	{	1063	{
		1064	if (view_start == nsaved ||
		1065	view_start == 0)
		1066	mouse_slip_wheel_speed = 0;
		1067
1038	refresh_type |= SMOOTH_REFRESH;	1068	refresh_type |= SMOOTH_REFRESH;
1039	want_refresh = 1;	1069	want_refresh = 1;
1040	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1070	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1041	}	1071	}
1042	}	1072	}
1043	#endif	1073	#endif
1044		1074
		1075	#if HAVE_SCHED_YIELD
		1076	static struct event_handler
		1077	{
		1078	check_watcher cw_yield;
		1079
		1080	void yield (check_watcher &w)
		1081	{
		1082	sched_yield ();
		1083	w.stop ();
		1084	}
		1085
		1086	event_handler ()
		1087	: cw_yield (this, &event_handler::yield)
		1088	{
		1089	}
		1090	} event_handler;
		1091	#endif
		1092
1045	bool	1093	bool
1046	rxvt_term::pty_fill ()	1094	rxvt_term::pty_fill ()
1047	{	1095	{
1048	ssize_t n = cmdbuf_endp - cmdbuf_ptr;	1096	ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1049		1097
…		…
1055		1103
1056	memmove (cmdbuf_base, cmdbuf_ptr, n);	1104	memmove (cmdbuf_base, cmdbuf_ptr, n);
1057	cmdbuf_ptr = cmdbuf_base;	1105	cmdbuf_ptr = cmdbuf_base;
1058	cmdbuf_endp = cmdbuf_ptr + n;	1106	cmdbuf_endp = cmdbuf_ptr + n;
1059		1107
1060	n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);	1108	ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
1061		1109
1062	if (n > 0)	1110	if (r > 0)
1063	{	1111	{
1064	cmdbuf_endp += n;	1112	cmdbuf_endp += r;
1065	return true;	1113	return true;
1066	}	1114	}
1067	else if (n < 0 && errno != EAGAIN)	1115	else if (r < 0 && (errno == EAGAIN || errno == EINTR))
		1116	{
		1117	#if HAVE_SCHED_YIELD
		1118	if (display->is_local)
		1119	event_handler.cw_yield.start ();
		1120	#endif
		1121	}
		1122	else
		1123	{
		1124	pty_ev.stop ();
		1125
		1126	if (!OPTION (Opt_hold))
1068	destroy ();	1127	destroy ();
		1128	}
1069		1129
1070	return false;	1130	return false;
1071	}	1131	}
1072		1132
1073	void	1133	void
…		…
1087	}	1147	}
1088		1148
1089	void	1149	void
1090	rxvt_term::pointer_unblank ()	1150	rxvt_term::pointer_unblank ()
1091	{	1151	{
1092	XDefineCursor (display->display, TermWin.vt, TermWin_cursor);	1152	XDefineCursor (display->display, vt, TermWin_cursor);
1093	recolour_cursor ();	1153	recolour_cursor ();
1094		1154
1095	#ifdef POINTER_BLANK	1155	#ifdef POINTER_BLANK
1096	hidden_pointer = 0;	1156	hidden_pointer = 0;
1097		1157
1098	if (options & Opt_pointerBlank)	1158	if (OPTION (Opt_pointerBlank))
1099	pointer_ev.start (NOW + pointerBlankDelay);	1159	pointer_ev.start (NOW + pointerBlankDelay);
1100	#endif	1160	#endif
1101	}	1161	}
1102		1162
1103	#ifdef POINTER_BLANK	1163	#ifdef POINTER_BLANK
1104	void	1164	void
1105	rxvt_term::pointer_blank ()	1165	rxvt_term::pointer_blank ()
1106	{	1166	{
1107	if (! (options & Opt_pointerBlank))	1167	if (! OPTION (Opt_pointerBlank))
1108	return;	1168	return;
1109		1169
1110	XDefineCursor (display->display, TermWin.vt, blank_cursor);	1170	XDefineCursor (display->display, vt, display->blank_cursor);
1111	XFlush (display->display);	1171	XFlush (display->display);
1112		1172
1113	hidden_pointer = 1;	1173	hidden_pointer = 1;
1114	}	1174	}
1115		1175
…		…
1204		1264
1205	/*{{{ process an X event */	1265	/*{{{ process an X event */
1206	void	1266	void
1207	rxvt_term::x_cb (XEvent &ev)	1267	rxvt_term::x_cb (XEvent &ev)
1208	{	1268	{
		1269	dDisp;
		1270
1209	SET_R (this);	1271	SET_R (this);
1210	SET_LOCALE (locale);	1272	SET_LOCALE (locale);
1211		1273
1212	#if defined(CURSOR_BLINK)	1274	#if defined(CURSOR_BLINK)
1213	if ((options & Opt_cursorBlink) && ev.type == KeyPress)	1275	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1214	{	1276	{
1215	if (hidden_cursor)	1277	if (hidden_cursor)
1216	{	1278	{
1217	hidden_cursor = 0;	1279	hidden_cursor = 0;
1218	want_refresh = 1;	1280	want_refresh = 1;
…		…
1221	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1283	cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1222	}	1284	}
1223	#endif	1285	#endif
1224		1286
1225	#if defined(POINTER_BLANK)	1287	#if defined(POINTER_BLANK)
1226	if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)	1288	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1227	{	1289	{
1228	if (ev.type == MotionNotify	1290	if (ev.type == MotionNotify
1229	|| ev.type == ButtonPress	1291	|| ev.type == ButtonPress
1230	|| ev.type == ButtonRelease)	1292	|| ev.type == ButtonRelease)
1231	if (hidden_pointer)	1293	if (hidden_pointer)
…		…
1329	button_release (ev.xbutton);	1391	button_release (ev.xbutton);
1330	break;	1392	break;
1331		1393
1332	case ClientMessage:	1394	case ClientMessage:
1333	if (ev.xclient.format == 32	1395	if (ev.xclient.format == 32
		1396	&& ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
		1397	{
1334	&& (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW])	1398	if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1335	destroy ();	1399	destroy ();
		1400	#if ENABLE_EWMH
		1401	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
		1402	XSendEvent (disp, ev.xclient.window = display->root,
		1403	False, SubstructureRedirectMask | SubstructureNotifyMask,
		1404	&ev);
		1405	#endif
		1406	}
		1407	#if ENABLE_XEMBED
		1408	else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
		1409	{
		1410	if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
		1411	focus_in ();
		1412	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
		1413	focus_out ();
		1414	}
		1415	#endif
1336	#ifdef OFFIX_DND	1416	#ifdef OFFIX_DND
1337	/* OffiX Dnd (drag 'n' drop) protocol */	1417	/* OffiX Dnd (drag 'n' drop) protocol */
1338	else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]	1418	else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1339	&& (ev.xclient.data.l[0] == DndFile	1419	&& (ev.xclient.data.l[0] == DndFile
1340	|| ev.xclient.data.l[0] == DndDir	1420	|| ev.xclient.data.l[0] == DndDir
1341	|| ev.xclient.data.l[0] == DndLink))	1421	|| ev.xclient.data.l[0] == DndLink))
1342	{	1422	{
1343	/* Get Dnd data */	1423	/* Get Dnd data */
1344	Atom ActualType;	1424	Atom ActualType;
1345	int ActualFormat;	1425	int ActualFormat;
1346	unsigned char *data;	1426	unsigned char *data;
1347	unsigned long Size, RemainingBytes;	1427	unsigned long Size, RemainingBytes;
1348		1428
1349	XGetWindowProperty (display->display, display->root,	1429	XGetWindowProperty (disp, display->root,
1350	xa[XA_DNDSELECTION],	1430	xa[XA_DNDSELECTION],
1351	0L, 1000000L,	1431	0L, 1000000L,
1352	False, AnyPropertyType,	1432	False, AnyPropertyType,
1353	&ActualType, &ActualFormat,	1433	&ActualType, &ActualFormat,
1354	&Size, &RemainingBytes,	1434	&Size, &RemainingBytes,
1355	&data);	1435	&data);
1356	set_string_property (XA_CUT_BUFFER0, data);	1436	set_string_property (XA_CUT_BUFFER0, data);
1357	XFree (data);	1437	XFree (data);
1358	selection_paste (display->root, XA_CUT_BUFFER0, true);	1438	selection_paste (display->root, XA_CUT_BUFFER0, true);
1359	XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);	1439	XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1360	}	1440	}
1361	#endif /* OFFIX_DND */	1441	#endif /* OFFIX_DND */
1362	break;	1442	break;
1363		1443
1364	case MappingNotify:	1444	case MappingNotify:
…		…
1389	break;	1469	break;
1390	}	1470	}
1391	break;	1471	break;
1392		1472
1393	case FocusIn:	1473	case FocusIn:
1394	if (!TermWin.focus)	1474	focus_in ();
		1475	break;
		1476
		1477	case FocusOut:
		1478	focus_out ();
		1479	break;
		1480
		1481	case ConfigureNotify:
		1482	if (ev.xconfigure.window == parent[0])
1395	{	1483	{
1396	TermWin.focus = 1;
1397	want_refresh = 1;
1398	#ifdef USE_XIM
1399	if (Input_Context != NULL)
1400	{
1401	IMSetStatusPosition ();
1402	XSetICFocus (Input_Context);
1403	}
1404	#endif
1405	#ifdef CURSOR_BLINK
1406	if (options & Opt_cursorBlink)
1407	cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1408	#endif
1409	#ifdef OFF_FOCUS_FADING
1410	if (rs[Rs_fade])
1411	{
1412	pix_colors = pix_colors_focused;
1413	scr_recolour ();
1414	}
1415	#endif
1416
1417	}
1418	break;
1419
1420	case FocusOut:
1421	if (TermWin.focus)
1422	{
1423	TermWin.focus = 0;
1424	want_refresh = 1;
1425
1426	#if ENABLE_FRILLS || ISO_14755
1427	iso14755buf = 0;
1428	#endif
1429	#if ENABLE_OVERLAY
1430	scr_overlay_off ();
1431	#endif
1432	#ifdef USE_XIM
1433	if (Input_Context != NULL)
1434	XUnsetICFocus (Input_Context);
1435	#endif
1436	#ifdef CURSOR_BLINK
1437	if (options & Opt_cursorBlink)
1438	cursor_blink_ev.stop ();
1439	hidden_cursor = 0;
1440	#endif
1441	#ifdef OFF_FOCUS_FADING
1442	if (rs[Rs_fade])
1443	{
1444	pix_colors = pix_colors_unfocused;
1445	scr_recolour ();
1446	}
1447	#endif
1448	}
1449	break;
1450
1451	case ConfigureNotify:
1452	if (ev.xconfigure.window == TermWin.parent[0])
1453	{
1454	int height, width;
1455
1456	do
1457	{ /* Wrap lots of configures into one */
1458	width = ev.xconfigure.width;
1459	height = ev.xconfigure.height;
1460	D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1461	}
1462	while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));	1484	while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
		1485	;
1463		1486
1464	if (szHint.width != width || szHint.height != height)	1487	if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1465	{	1488	{
1466	seen_resize = 1;	1489	seen_resize = 1;
1467	resize_all_windows (width, height, 1);	1490	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1468	}	1491	}
1469		1492
1470	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */	1493	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1471	if (options & Opt_transparent)	1494	if (OPTION (Opt_transparent))
1472	check_our_parents ();	1495	check_our_parents ();
1473	#endif	1496	#endif
1474	}	1497	}
1475	break;	1498	break;
1476		1499
…		…
1493	case SelectionRequest:	1516	case SelectionRequest:
1494	selection_send (ev.xselectionrequest);	1517	selection_send (ev.xselectionrequest);
1495	break;	1518	break;
1496		1519
1497	case UnmapNotify:	1520	case UnmapNotify:
1498	TermWin.mapped = 0;	1521	mapped = 0;
1499	#ifdef TEXT_BLINK	1522	#ifdef TEXT_BLINK
1500	text_blink_ev.stop ();	1523	text_blink_ev.stop ();
1501	#endif	1524	#endif
1502	break;	1525	break;
1503		1526
1504	case MapNotify:	1527	case MapNotify:
1505	TermWin.mapped = 1;	1528	mapped = 1;
1506	#ifdef TEXT_BLINK	1529	#ifdef TEXT_BLINK
1507	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);	1530	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1508	#endif	1531	#endif
1509	break;	1532	break;
1510		1533
…		…
1514	break;	1537	break;
1515	#endif /* TRANSPARENT */	1538	#endif /* TRANSPARENT */
1516		1539
1517	case GraphicsExpose:	1540	case GraphicsExpose:
1518	case Expose:	1541	case Expose:
1519	if (ev.xany.window == TermWin.vt)	1542	if (ev.xany.window == vt)
1520	{	1543	{
1521	do	1544	do
1522	scr_expose (ev.xexpose.x, ev.xexpose.y,	1545	scr_expose (ev.xexpose.x, ev.xexpose.y,
1523	ev.xexpose.width, ev.xexpose.height, False);	1546	ev.xexpose.width, ev.xexpose.height, False);
1524	while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev));	1547	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1525		1548
1526	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1549	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1527		1550
1528	while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev))	1551	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1529	scr_expose (ev.xexpose.x, ev.xexpose.y,	1552	scr_expose (ev.xexpose.x, ev.xexpose.y,
1530	ev.xexpose.width, ev.xexpose.height, False);	1553	ev.xexpose.width, ev.xexpose.height, False);
1531		1554
1532	scr_refresh (refresh_type);	1555	scr_refresh (refresh_type);
1533	}	1556	}
1534	else	1557	else
1535	{	1558	{
1536	XEvent unused_event;	1559	XEvent unused_event;
1537		1560
1538	while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event))	1561	while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1539	;	1562	;
1540	while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event))	1563	while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1541	;	1564	;
1542		1565
1543	if (isScrollbarWindow (ev.xany.window))	1566	if (isScrollbarWindow (ev.xany.window))
1544	{	1567	{
1545	scrollBar.setIdle ();	1568	scrollBar.setIdle ();
…		…
1549	if (menubar_visible () && isMenuBarWindow (ev.xany.window))	1572	if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1550	menubar_expose ();	1573	menubar_expose ();
1551	#endif	1574	#endif
1552		1575
1553	#ifdef TRANSPARENT	1576	#ifdef TRANSPARENT
1554	if (am_transparent && ev.xany.window == TermWin.parent[0])	1577	if (am_transparent && ev.xany.window == parent[0])
1555	XClearWindow (display->display, ev.xany.window);	1578	XClearWindow (disp, ev.xany.window);
1556	#endif	1579	#endif
1557	}	1580	}
1558	break;	1581	break;
1559		1582
1560	case MotionNotify:	1583	case MotionNotify:
…		…
1570	}	1593	}
1571	#endif	1594	#endif
1572	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)	1595	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1573	break;	1596	break;
1574		1597
1575	if (ev.xany.window == TermWin.vt)	1598	if (ev.xany.window == vt)
1576	{	1599	{
1577	if (ev.xbutton.state & (Button1Mask | Button3Mask))	1600	if (ev.xbutton.state & (Button1Mask | Button3Mask))
1578	{	1601	{
1579	while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))	1602	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1580	;	1603	;
1581		1604
1582	XQueryPointer (display->display, TermWin.vt,	1605	XQueryPointer (disp, vt,
1583	&unused_root, &unused_child,	1606	&unused_root, &unused_child,
1584	&unused_root_x, &unused_root_y,	1607	&unused_root_x, &unused_root_y,
1585	&ev.xbutton.x, &ev.xbutton.y,	1608	&ev.xbutton.x, &ev.xbutton.y,
1586	&ev.xbutton.state);	1609	&ev.xbutton.state);
1587	#ifdef MOUSE_THRESHOLD	1610	#ifdef MOUSE_THRESHOLD
…		…
1599	#endif	1622	#endif
1600	selection_extend (ev.xbutton.x, ev.xbutton.y,	1623	selection_extend (ev.xbutton.x, ev.xbutton.y,
1601	ev.xbutton.state & Button3Mask ? 2 : 0);	1624	ev.xbutton.state & Button3Mask ? 2 : 0);
1602		1625
1603	#ifdef SELECTION_SCROLLING	1626	#ifdef SELECTION_SCROLLING
1604	if (ev.xbutton.y < TermWin.int_bwidth	1627	if (ev.xbutton.y < int_bwidth
1605	|| Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))	1628	|| Pixel2Row (ev.xbutton.y) > (nrow-1))
1606	{	1629	{
1607	int dist;	1630	int dist;
1608		1631
1609	/* don't clobber the current delay if we are	1632	/* don't clobber the current delay if we are
1610	* already in the middle of scrolling.	1633	* already in the middle of scrolling.
…		…
1618	selection_save_x = ev.xbutton.x;	1641	selection_save_x = ev.xbutton.x;
1619	selection_save_y = ev.xbutton.y;	1642	selection_save_y = ev.xbutton.y;
1620	selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;	1643	selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1621		1644
1622	/* calc number of lines to scroll */	1645	/* calc number of lines to scroll */
1623	if (ev.xbutton.y < TermWin.int_bwidth)	1646	if (ev.xbutton.y < int_bwidth)
1624	{	1647	{
1625	scroll_selection_dir = UP;	1648	scroll_selection_dir = UP;
1626	dist = TermWin.int_bwidth - ev.xbutton.y;	1649	dist = int_bwidth - ev.xbutton.y;
1627	}	1650	}
1628	else	1651	else
1629	{	1652	{
1630	scroll_selection_dir = DN;	1653	scroll_selection_dir = DN;
1631	dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height);	1654	dist = ev.xbutton.y - (int_bwidth + height);
1632	}	1655	}
1633		1656
1634	scroll_selection_lines = Pixel2Height (dist)	1657	scroll_selection_lines = Pixel2Height (dist)
1635	/ SELECTION_SCROLL_LINE_SPEEDUP	1658	/ SELECTION_SCROLL_LINE_SPEEDUP
1636	+ 1;	1659	+ 1;
1637	MIN_IT (scroll_selection_lines,	1660	min_it (scroll_selection_lines,
1638	SELECTION_SCROLL_MAX_LINES);	1661	SELECTION_SCROLL_MAX_LINES);
1639	}	1662	}
1640	else	1663	else
1641	{	1664	{
1642	/* we are within the text window, so we	1665	/* we are within the text window, so we
…		…
1651	#endif	1674	#endif
1652	}	1675	}
1653	}	1676	}
1654	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1677	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1655	{	1678	{
1656	while (XCheckTypedWindowEvent (display->display, scrollBar.win,	1679	while (XCheckTypedWindowEvent (disp, scrollBar.win,
1657	MotionNotify, &ev))	1680	MotionNotify, &ev))
1658	;	1681	;
1659		1682
1660	XQueryPointer (display->display, scrollBar.win,	1683	XQueryPointer (disp, scrollBar.win,
1661	&unused_root, &unused_child,	1684	&unused_root, &unused_child,
1662	&unused_root_x, &unused_root_y,	1685	&unused_root_x, &unused_root_y,
1663	&ev.xbutton.x, &ev.xbutton.y,	1686	&ev.xbutton.x, &ev.xbutton.y,
1664	&unused_mask);	1687	&unused_mask);
1665	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1688	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
…		…
1670	}	1693	}
1671	break;	1694	break;
1672	}	1695	}
1673	}	1696	}
1674		1697
		1698	void
		1699	rxvt_term::focus_in ()
		1700	{
		1701	if (!focus)
		1702	{
		1703	focus = 1;
		1704	want_refresh = 1;
		1705
		1706	PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
		1707
		1708	#if USE_XIM
		1709	if (Input_Context != NULL)
		1710	{
		1711	IMSetStatusPosition ();
		1712	XSetICFocus (Input_Context);
		1713	}
		1714	#endif
		1715	#if CURSOR_BLINK
		1716	if (OPTION (Opt_cursorBlink))
		1717	cursor_blink_ev.start (NOW + BLINK_INTERVAL);
		1718	#endif
		1719	#if OFF_FOCUS_FADING
		1720	if (rs[Rs_fade])
		1721	{
		1722	pix_colors = pix_colors_focused;
		1723	scr_recolour ();
		1724	}
		1725	#endif
		1726	}
		1727	}
		1728
		1729	void
		1730	rxvt_term::focus_out ()
		1731	{
		1732	if (focus)
		1733	{
		1734	focus = 0;
		1735	want_refresh = 1;
		1736
		1737	PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
		1738
		1739	#if ENABLE_FRILLS || ISO_14755
		1740	if (iso14755buf)
		1741	{
		1742	iso14755buf = 0;
		1743	# if ENABLE_OVERLAY
		1744	scr_overlay_off ();
		1745	# endif
		1746	}
		1747	#endif
		1748	#if USE_XIM
		1749	if (Input_Context != NULL)
		1750	XUnsetICFocus (Input_Context);
		1751	#endif
		1752	#if CURSOR_BLINK
		1753	if (OPTION (Opt_cursorBlink))
		1754	cursor_blink_ev.stop ();
		1755	hidden_cursor = 0;
		1756	#endif
		1757	#if OFF_FOCUS_FADING
		1758	if (rs[Rs_fade])
		1759	{
		1760	pix_colors = pix_colors_unfocused;
		1761	scr_recolour ();
		1762	}
		1763	#endif
		1764	}
		1765	}
		1766
1675	#if TRANSPARENT	1767	#if TRANSPARENT
1676	void	1768	void
1677	rxvt_term::rootwin_cb (XEvent &ev)	1769	rxvt_term::rootwin_cb (XEvent &ev)
1678	{	1770	{
1679	SET_R (this);	1771	SET_R (this);
…		…
1690	&& ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])	1782	&& ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1691	return;	1783	return;
1692		1784
1693	/* FALLTHROUGH */	1785	/* FALLTHROUGH */
1694	case ReparentNotify:	1786	case ReparentNotify:
1695	if ((options & Opt_transparent) && check_our_parents () && am_transparent)	1787	if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1696	want_refresh = want_full_refresh = 1;	1788	want_refresh = want_full_refresh = 1;
1697	break;	1789	break;
1698	}	1790	}
1699	}	1791	}
1700	#endif	1792	#endif
…		…
1703	rxvt_term::button_press (XButtonEvent &ev)	1795	rxvt_term::button_press (XButtonEvent &ev)
1704	{	1796	{
1705	int reportmode = 0, clickintime;	1797	int reportmode = 0, clickintime;
1706		1798
1707	bypass_keystate = ev.state & (ModMetaMask | ShiftMask);	1799	bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
		1800
1708	if (!bypass_keystate)	1801	if (!bypass_keystate)
1709	reportmode = !! (priv_modes & PrivMode_mouse_report);	1802	reportmode = !! (priv_modes & PrivMode_mouse_report);
1710		1803
1711	/*	1804	/*
1712	* VT window processing of button press	1805	* VT window processing of button press
1713	*/	1806	*/
1714	if (ev.window == TermWin.vt)	1807	if (ev.window == vt)
1715	{	1808	{
1716	#if ISO_14755	1809	#if ISO_14755
1717	// 5.4	1810	// 5.4
1718	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))	1811	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1719	{	1812	{
…		…
1761	else	1854	else
1762	{	1855	{
1763	if (ev.button != MEvent.button)	1856	if (ev.button != MEvent.button)
1764	MEvent.clicks = 0;	1857	MEvent.clicks = 0;
1765		1858
		1859	if (!PERL_INVOKE ((this, HOOK_MOUSE_CLICK, DT_XEVENT, &ev, DT_END)))
1766	switch (ev.button)	1860	switch (ev.button)
1767	{	1861	{
1768	case Button1:	1862	case Button1:
1769	/* allow meta + click to select rectangular areas */	1863	/* allow meta + click to select rectangular areas */
1770	/* should be done in screen.C */	1864	/* should be done in screen.C */
1771	#if ENABLE_FRILLS	1865	#if ENABLE_FRILLS
1772	selection.rect = !! (ev.state & ModMetaMask);	1866	selection.rect = !!(ev.state & ModMetaMask);
1773	#else	1867	#else
1774	selection.rect = false;	1868	selection.rect = false;
1775	#endif	1869	#endif
1776		1870
1777	/* allow shift+left click to extend selection */	1871	/* allow shift+left click to extend selection */
1778	if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))	1872	if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1779	{	1873	{
1780	if (MEvent.button == Button1 && clickintime)	1874	if (MEvent.button == Button1 && clickintime)
1781	selection_rotate (ev.x, ev.y);	1875	selection_rotate (ev.x, ev.y);
1782	else	1876	else
1783	selection_extend (ev.x, ev.y, 1);	1877	selection_extend (ev.x, ev.y, 1);
1784	}	1878	}
1785	else	1879	else
1786	{	1880	{
1787	if (MEvent.button == Button1 && clickintime)	1881	if (MEvent.button == Button1 && clickintime)
1788	MEvent.clicks++;	1882	MEvent.clicks++;
1789	else	1883	else
1790	MEvent.clicks = 1;	1884	MEvent.clicks = 1;
1791		1885
1792	selection_click (MEvent.clicks, ev.x, ev.y);	1886	selection_click (MEvent.clicks, ev.x, ev.y);
1793	}	1887	}
1794		1888
1795	MEvent.button = Button1;	1889	MEvent.button = Button1;
1796	break;	1890	break;
1797		1891
1798	case Button3:	1892	case Button3:
1799	if (MEvent.button == Button3 && clickintime)	1893	if (MEvent.button == Button3 && clickintime)
1800	selection_rotate (ev.x, ev.y);	1894	selection_rotate (ev.x, ev.y);
1801	else	1895	else
1802	selection_extend (ev.x, ev.y, 1);	1896	selection_extend (ev.x, ev.y, 1);
1803		1897
1804	MEvent.button = Button3;	1898	MEvent.button = Button3;
1805	break;	1899	break;
1806	}	1900	}
1807	}	1901	}
1808		1902
1809	MEvent.time = ev.time;	1903	MEvent.time = ev.time;
1810	return;	1904	return;
1811	}	1905	}
1812		1906
…		…
1924	case Button3:	2018	case Button3:
1925	if (scrollBar.style != R_SB_XTERM)	2019	if (scrollBar.style != R_SB_XTERM)
1926	{	2020	{
1927	if (scrollbar_above_slider (ev.y))	2021	if (scrollbar_above_slider (ev.y))
1928	# ifdef RXVT_SCROLL_FULL	2022	# ifdef RXVT_SCROLL_FULL
1929	scr_page (UP, TermWin.nrow - 1);	2023	scr_page (UP, nrow - 1);
1930	# else	2024	# else
1931	scr_page (UP, TermWin.nrow / 4);	2025	scr_page (UP, nrow / 4);
1932	# endif	2026	# endif
1933	else if (scrollbar_below_slider (ev.y))	2027	else if (scrollbar_below_slider (ev.y))
1934	# ifdef RXVT_SCROLL_FULL	2028	# ifdef RXVT_SCROLL_FULL
1935	scr_page (DN, TermWin.nrow - 1);	2029	scr_page (DN, nrow - 1);
1936	# else	2030	# else
1937	scr_page (DN, TermWin.nrow / 4);	2031	scr_page (DN, nrow / 4);
1938	# endif	2032	# endif
1939	else	2033	else
1940	scrollBar.setMotion ();	2034	scrollBar.setMotion ();
1941	}	2035	}
1942	else	2036	else
1943	{	2037	{
1944	scr_page ((ev.button == Button1 ? DN : UP),	2038	scr_page ((ev.button == Button1 ? DN : UP),
1945	(TermWin.nrow	2039	(nrow
1946	* scrollbar_position (ev.y)	2040	* scrollbar_position (ev.y)
1947	/ scrollbar_size ()));	2041	/ scrollbar_size ()));
1948	}	2042	}
1949		2043
1950	break;	2044	break;
…		…
1982	#ifdef SELECTION_SCROLLING	2076	#ifdef SELECTION_SCROLLING
1983	if (sel_scroll_ev.active)	2077	if (sel_scroll_ev.active)
1984	sel_scroll_ev.stop();	2078	sel_scroll_ev.stop();
1985	#endif	2079	#endif
1986		2080
1987	if (ev.window == TermWin.vt)	2081	if (ev.window == vt)
1988	{	2082	{
1989	#if ISO_14755	2083	#if ISO_14755
1990	// 5.4	2084	// 5.4
1991	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))	2085	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1992	return;	2086	return;
…		…
2042		2136
2043	v = ev.button == Button4 ? UP : DN;	2137	v = ev.button == Button4 ? UP : DN;
2044		2138
2045	if (ev.state & ShiftMask)	2139	if (ev.state & ShiftMask)
2046	i = 1;	2140	i = 1;
2047	else if (options & Opt_mouseWheelScrollPage)	2141	else if (OPTION (Opt_mouseWheelScrollPage))
2048	i = TermWin.nrow - 1;	2142	i = nrow - 1;
2049	else	2143	else
2050	i = 5;	2144	i = 5;
2051		2145
2052	# ifdef MOUSE_SLIP_WHEELING	2146	# ifdef MOUSE_SLIP_WHEELING
2053	if (ev.state & ControlMask)	2147	if (ev.state & ControlMask)
2054	{	2148	{
2055	mouse_slip_wheel_speed += v ? -1 : 1;	2149	mouse_slip_wheel_speed += v ? -1 : 1;
2056	if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow;	2150	if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2057	if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow;	2151	if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2058		2152
2059	if (slip_wheel_ev.at < NOW)	2153	if (slip_wheel_ev.at < NOW)
2060	slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;	2154	slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2061		2155
2062	slip_wheel_ev.start ();	2156	slip_wheel_ev.start ();
…		…
2103	RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;	2197	RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2104	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;	2198	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2105	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;	2199	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2106	int i;	2200	int i;
2107		2201
2108	Visual* visual = display->visual;	2202	Visual *visual = display->visual;
2109		2203
2110	if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;	2204	if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2111		2205
2112	/* for convenience */	2206	/* for convenience */
2113	mask_r = visual->red_mask;	2207	mask_r = visual->red_mask;
…		…
2334	Atom atype;	2428	Atom atype;
2335	unsigned char *prop = NULL;	2429	unsigned char *prop = NULL;
2336	Window root, oldp, *list;	2430	Window root, oldp, *list;
2337	Pixmap rootpixmap = None;	2431	Pixmap rootpixmap = None;
2338	XWindowAttributes wattr, wrootattr;	2432	XWindowAttributes wattr, wrootattr;
		2433	dDisp;
2339		2434
2340	pchanged = 0;	2435	pchanged = 0;
2341		2436
2342	if (!(options & Opt_transparent))	2437	if (!OPTION (Opt_transparent))
2343	return pchanged; /* Don't try any more */	2438	return pchanged; /* Don't try any more */
2344		2439
2345	XGetWindowAttributes (display->display, display->root, &wrootattr);	2440	XGetWindowAttributes (disp, display->root, &wrootattr);
2346	rootdepth = wrootattr.depth;	2441	rootdepth = wrootattr.depth;
2347		2442
2348	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	2443	XGetWindowAttributes (disp, parent[0], &wattr);
2349		2444
2350	if (rootdepth != wattr.depth)	2445	if (rootdepth != wattr.depth)
2351	{	2446	{
2352	if (am_transparent)	2447	if (am_transparent)
2353	{	2448	{
2354	pchanged = 1;	2449	pchanged = 1;
2355	XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);	2450	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2356	am_transparent = am_pixmap_trans = 0;	2451	am_transparent = am_pixmap_trans = 0;
2357	}	2452	}
2358		2453
2359	return pchanged; /* Don't try any more */	2454	return pchanged; /* Don't try any more */
2360	}	2455	}
2361		2456
2362	/* Get all X ops out of the queue so that our information is up-to-date. */	2457	/* Get all X ops out of the queue so that our information is up-to-date. */
2363	XSync (display->display, False);	2458	XSync (disp, False);
2364		2459
2365	/*	2460	/*
2366	* Make the frame window set by the window manager have	2461	* Make the frame window set by the window manager have
2367	* the root background. Some window managers put multiple nested frame	2462	* the root background. Some window managers put multiple nested frame
2368	* windows for each client, so we have to take care about that.	2463	* windows for each client, so we have to take care about that.
2369	*/	2464	*/
2370	i = (xa[XA_XROOTPMAP_ID]	2465	i = (xa[XA_XROOTPMAP_ID]
2371	&& XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAP_ID],	2466	&& XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2372	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2467	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2373	&nitems, &bytes_after, &prop) == Success);	2468	&nitems, &bytes_after, &prop) == Success);
2374		2469
2375	if (!i || prop == NULL)	2470	if (!i || prop == NULL)
2376	i = (xa[XA_ESETROOT_PMAP_ID]	2471	i = (xa[XA_ESETROOT_PMAP_ID]
2377	&& XGetWindowProperty (display->display, display->root, xa[XA_ESETROOT_PMAP_ID],	2472	&& XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2378	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2473	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2379	&nitems, &bytes_after, &prop) == Success);	2474	&nitems, &bytes_after, &prop) == Success);
2380		2475
2381	if (!i || prop == NULL	2476	if (!i || prop == NULL
2382	#if TINTING	2477	#if TINTING
…		…
2401	Window cr;	2496	Window cr;
2402	XImage *image;	2497	XImage *image;
2403	GC gc;	2498	GC gc;
2404	XGCValues gcvalue;	2499	XGCValues gcvalue;
2405		2500
2406	XTranslateCoordinates (display->display, TermWin.parent[0], display->root,	2501	XTranslateCoordinates (disp, parent[0], display->root,
2407	0, 0, &sx, &sy, &cr);	2502	0, 0, &sx, &sy, &cr);
2408	nw = (unsigned int)szHint.width;	2503	nw = (unsigned int)szHint.width;
2409	nh = (unsigned int)szHint.height;	2504	nh = (unsigned int)szHint.height;
2410	nx = ny = 0;	2505	nx = ny = 0;
2411		2506
…		…
2421	nh += sy;	2516	nh += sy;
2422	ny = -sy;	2517	ny = -sy;
2423	sy = 0;	2518	sy = 0;
2424	}	2519	}
2425		2520
2426	MIN_IT (nw, (unsigned int) (wrootattr.width - sx));	2521	min_it (nw, (unsigned int) (wrootattr.width - sx));
2427	MIN_IT (nh, (unsigned int) (wrootattr.height - sy));	2522	min_it (nh, (unsigned int) (wrootattr.height - sy));
2428		2523
2429	XSync (display->display, False);	2524	XSync (disp, False);
2430	allowedxerror = -1;	2525	allowedxerror = -1;
2431	image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);	2526	image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2432		2527
2433	/* XXX: handle BadMatch - usually because we're outside the pixmap */	2528	/* XXX: handle BadMatch - usually because we're outside the pixmap */
2434	/* XXX: may need a delay here? */	2529	/* XXX: may need a delay here? */
2435	allowedxerror = 0;	2530	allowedxerror = 0;
2436		2531
2437	if (image == NULL)	2532	if (image == NULL)
2438	{	2533	{
2439	if (am_transparent && am_pixmap_trans)	2534	if (am_transparent && am_pixmap_trans)
2440	{	2535	{
2441	pchanged = 1;	2536	pchanged = 1;
2442	if (TermWin.pixmap != None)	2537	if (pixmap != None)
2443	{	2538	{
2444	XFreePixmap (display->display, TermWin.pixmap);	2539	XFreePixmap (disp, pixmap);
2445	TermWin.pixmap = None;	2540	pixmap = None;
2446	}	2541	}
2447	}	2542	}
2448		2543
2449	am_pixmap_trans = 0;	2544	am_pixmap_trans = 0;
2450	}	2545	}
2451	else	2546	else
2452	{	2547	{
2453	if (TermWin.pixmap != None)	2548	if (pixmap != None)
2454	XFreePixmap (display->display, TermWin.pixmap);	2549	XFreePixmap (disp, pixmap);
2455		2550
2456	#if TINTING	2551	#if TINTING
2457	if (ISSET_PIXCOLOR (Color_tint))	2552	if (ISSET_PIXCOLOR (Color_tint))
2458	{	2553	{
2459	unsigned short rm, gm, bm;	2554	unsigned short rm, gm, bm;
…		…
2463		2558
2464	ShadeXImage (display, image, shade, rm, gm, bm);	2559	ShadeXImage (display, image, shade, rm, gm, bm);
2465	}	2560	}
2466	#endif	2561	#endif
2467		2562
2468	TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,	2563	pixmap = XCreatePixmap (disp, vt,
2469	szHint.width, szHint.height, image->depth);	2564	szHint.width, szHint.height, image->depth);
2470	gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);	2565	gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2471	XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,	2566	XPutImage (disp, pixmap, gc, image, 0, 0,
2472	nx, ny, image->width, image->height);	2567	nx, ny, image->width, image->height);
2473	XFreeGC (display->display, gc);	2568	XFreeGC (disp, gc);
2474	XDestroyImage (image);	2569	XDestroyImage (image);
2475	XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap);	2570	XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2476	XClearWindow (display->display, TermWin.parent[0]);	2571	XClearWindow (disp, parent[0]);
2477		2572
2478	if (!am_transparent || !am_pixmap_trans)	2573	if (!am_transparent || !am_pixmap_trans)
2479	pchanged = 1;	2574	pchanged = 1;
2480		2575
2481	am_transparent = am_pixmap_trans = 1;	2576	am_transparent = am_pixmap_trans = 1;
2482	}	2577	}
2483	}	2578	}
2484		2579
2485	if (am_pixmap_trans)	2580	if (am_pixmap_trans)
2486	XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);	2581	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2487	else	2582	else
2488	{	2583	{
2489	unsigned int n;	2584	unsigned int n;
2490	/*	2585	/*
2491	* InheritPixmap transparency	2586	* InheritPixmap transparency
2492	*/	2587	*/
2493	for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)	2588	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2494	{	2589	{
2495	oldp = TermWin.parent[i];	2590	oldp = parent[i];
2496	XQueryTree (display->display, TermWin.parent[i - 1], &root,	2591	XQueryTree (disp, parent[i - 1], &root,
2497	&TermWin.parent[i], &list, &n);	2592	&parent[i], &list, &n);
2498	XFree (list);	2593	XFree (list);
2499		2594
2500	if (TermWin.parent[i] == display->root)	2595	if (parent[i] == display->root)
2501	{	2596	{
2502	if (oldp != None)	2597	if (oldp != None)
2503	pchanged = 1;	2598	pchanged = 1;
2504		2599
2505	break;	2600	break;
2506	}	2601	}
2507		2602
2508	if (oldp != TermWin.parent[i])	2603	if (oldp != parent[i])
2509	pchanged = 1;	2604	pchanged = 1;
2510	}	2605	}
2511		2606
2512	n = 0;	2607	n = 0;
2513		2608
2514	if (pchanged)	2609	if (pchanged)
2515	{	2610	{
2516	for (; n < (unsigned int)i; n++)	2611	for (; n < (unsigned int)i; n++)
2517	{	2612	{
2518	XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);	2613	XGetWindowAttributes (disp, parent[n], &wattr);
2519	if (wattr.depth != rootdepth || wattr.c_class == InputOnly)	2614	if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2520	{	2615	{
2521	n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;	2616	n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2522	break;	2617	break;
2523	}	2618	}
2524	}	2619	}
2525	}	2620	}
2526		2621
2527	if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))	2622	if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2528	{	2623	{
2529	XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]);	2624	XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2530	XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);	2625	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2531	am_transparent = 0;	2626	am_transparent = 0;
2532	/* XXX: also turn off Opt_transparent? */	2627	/* XXX: also turn off Opt_transparent? */
2533	}	2628	}
2534	else	2629	else
2535	{	2630	{
…		…
2538	* needed for fvwm2.2.2 (and before?) */	2633	* needed for fvwm2.2.2 (and before?) */
2539	sleep (1);	2634	sleep (1);
2540	#endif	2635	#endif
2541	for (n = 0; n < (unsigned int)i; n++)	2636	for (n = 0; n < (unsigned int)i; n++)
2542	{	2637	{
2543	XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);	2638	XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2544	XClearWindow (display->display, TermWin.parent[n]);	2639	XClearWindow (disp, parent[n]);
2545	}	2640	}
2546		2641
2547	XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);	2642	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2548	am_transparent = 1;	2643	am_transparent = 1;
2549	}	2644	}
2550		2645
2551	for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)	2646	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2552	TermWin.parent[i] = None;	2647	parent[i] = None;
2553	}	2648	}
2554		2649
2555	if (scrollBar.win)	2650	if (scrollBar.win)
2556	{	2651	{
2557	XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);	2652	XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2558	scrollBar.setIdle ();	2653	scrollBar.setIdle ();
2559	scrollbar_show (0);	2654	scrollbar_show (0);
2560	}	2655	}
2561		2656
2562	if (am_transparent)	2657	if (am_transparent)
…		…
2600	// some window managers resize the window early, and these programs	2695	// some window managers resize the window early, and these programs
2601	// then sometimes get the size wrong.	2696	// then sometimes get the size wrong.
2602	// unfortunately other programs are even more buggy and dislike	2697	// unfortunately other programs are even more buggy and dislike
2603	// being sent SIGWINCH, so only do it when we were in fact being	2698	// being sent SIGWINCH, so only do it when we were in fact being
2604	// resized.	2699	// resized.
2605	if (seen_resize)	2700	if (seen_resize && cmd_pid)
2606	kill (-cmd_pid, SIGWINCH);	2701	kill (-cmd_pid, SIGWINCH);
2607	}	2702	}
2608		2703
2609	/* Read a text string from the input buffer */	2704	/* Read a text string from the input buffer */
2610	unicode_t buf[UBUFSIZ];	2705	unicode_t buf[UBUFSIZ];
2611	bool refreshnow = false;	2706	bool refreshnow = false;
2612	int nlines = 0;	2707	int nlines = 0;
2613	unicode_t *str = buf;	2708	unicode_t *str = buf;
		2709	unicode_t *eol = str + min (ncol, UBUFSIZ);
2614		2710
2615	for (;;)	2711	for (;;)
2616	{	2712	{
2617	if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))	2713	if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2618	break;	2714	break;
2619		2715
2620	*str++ = ch;	2716	*str++ = ch;
2621		2717
2622	if (ch == C0_LF)	2718	if (ch == C0_LF || str >= eol)
2623	{	2719	{
		2720	if (ch == C0_LF)
2624	nlines++;	2721	nlines++;
		2722
2625	refresh_count++;	2723	refresh_count++;
2626		2724
2627	if (!(options & Opt_jumpScroll)	2725	if (!OPTION (Opt_jumpScroll)
2628	|| (refresh_count >= refresh_limit * (TermWin.nrow - 1)))	2726	|| (refresh_count >= refresh_limit * (nrow - 1)))
2629	{	2727	{
2630	refreshnow = true;	2728	refreshnow = true;
		2729	refresh_count = 0;
2631	ch = NOCHAR;	2730	ch = NOCHAR;
2632	break;	2731	break;
2633	}	2732	}
2634		2733
2635	// scr_add_lines only works for nlines <= TermWin.nrow - 1.	2734	// scr_add_lines only works for nlines <= nrow - 1.
2636	if (nlines >= TermWin.nrow - 1)	2735	if (nlines >= nrow - 1)
2637	{	2736	{
2638	scr_add_lines (buf, nlines, str - buf);	2737	scr_add_lines (buf, nlines, str - buf);
2639	nlines = 0;	2738	nlines = 0;
2640	str = buf;	2739	str = buf;
		2740	eol = str + min (ncol, UBUFSIZ);
2641	}	2741	}
2642	}
2643		2742
2644	if (str >= buf + UBUFSIZ)	2743	if (str >= eol)
2645	{	2744	{
		2745	if (eol >= buf + UBUFSIZ)
		2746	{
2646	ch = NOCHAR;	2747	ch = NOCHAR;
2647	break;	2748	break;
		2749	}
		2750	else
		2751	eol = min (eol + ncol, buf + UBUFSIZ);
		2752	}
		2753
2648	}	2754	}
2649		2755
2650	seq_begin = cmdbuf_ptr;	2756	seq_begin = cmdbuf_ptr;
2651	ch = next_char ();	2757	ch = next_char ();
2652	}	2758	}
…		…
2659	* the number of pages between refreshes is refresh_limit, which	2765	* the number of pages between refreshes is refresh_limit, which
2660	* is incremented here because we must be doing flat-out scrolling.	2766	* is incremented here because we must be doing flat-out scrolling.
2661	*/	2767	*/
2662	if (refreshnow)	2768	if (refreshnow)
2663	{	2769	{
2664	if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)	2770	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2665	refresh_limit++;	2771	refresh_limit++;
2666	else	2772	else
2667	{	2773	{
2668	flag = true;	2774	flag = true;
2669	scr_refresh (refresh_type);	2775	scr_refresh (refresh_type);
		2776	flush_ev.stop ();
2670	}	2777	}
2671	}	2778	}
2672		2779
2673	}	2780	}
2674	else	2781	else
…		…
3196	{	3303	{
3197	switch (priv)	3304	switch (priv)
3198	{	3305	{
3199	case '>':	3306	case '>':
3200	if (ch == CSI_DA) /* secondary device attributes */	3307	if (ch == CSI_DA) /* secondary device attributes */
3201	tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING);	3308	tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
3202	break;	3309	break;
3203	case '?':	3310	case '?':
3204	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')	3311	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3205	process_terminal_mode (ch, priv, nargs, arg);	3312	process_terminal_mode (ch, priv, nargs, arg);
3206	break;	3313	break;
…		…
3311		3418
3312	case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */	3419	case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3313	arg[0] = -arg[0];	3420	arg[0] = -arg[0];
3314	/* FALLTHROUGH */	3421	/* FALLTHROUGH */
3315	case CSI_SU: /* 8.3.148: (1) SCROLL UP */	3422	case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3316	scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);	3423	scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3317	break;	3424	break;
3318		3425
3319	case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */	3426	case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3320	tt_write ((const unsigned char *)VT100_ANS,	3427	tt_write ((const unsigned char *)VT100_ANS,
3321	(unsigned int) (sizeof (VT100_ANS) - 1));	3428	(unsigned int) (sizeof (VT100_ANS) - 1));
…		…
3333	break;	3440	break;
3334	case 6: /* CPR requested */	3441	case 6: /* CPR requested */
3335	scr_report_position ();	3442	scr_report_position ();
3336	break;	3443	break;
3337	case 7: /* unofficial extension */	3444	case 7: /* unofficial extension */
3338	if (options & Opt_insecure)	3445	if (OPTION (Opt_insecure))
3339	tt_printf ("%-.250s\012", rs[Rs_display_name]);	3446	tt_printf ("%-.250s\012", rs[Rs_display_name]);
3340	break;	3447	break;
3341	case 8: /* unofficial extension */	3448	case 8: /* unofficial extension */
3342	process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);	3449	process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3343	break;	3450	break;
…		…
3435	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3542	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3436	{	3543	{
3437	int x, y;	3544	int x, y;
3438	XWindowAttributes wattr;	3545	XWindowAttributes wattr;
3439	Window wdummy;	3546	Window wdummy;
		3547	dDisp;
3440		3548
3441	if (nargs == 0)	3549	if (nargs == 0)
3442	return;	3550	return;
3443		3551
3444	switch (args[0])	3552	switch (args[0])
3445	{	3553	{
3446	/*	3554	/*
3447	* commands	3555	* commands
3448	*/	3556	*/
3449	case 1: /* deiconify window */	3557	case 1: /* deiconify window */
3450	XMapWindow (display->display, TermWin.parent[0]);	3558	XMapWindow (disp, parent[0]);
3451	break;	3559	break;
3452	case 2: /* iconify window */	3560	case 2: /* iconify window */
3453	XIconifyWindow (display->display, TermWin.parent[0],	3561	XIconifyWindow (disp, parent[0], display->screen);
3454	DefaultScreen (display->display));
3455	break;	3562	break;
3456	case 3: /* set position (pixels) */	3563	case 3: /* set position (pixels) */
3457	XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]);	3564	XMoveWindow (disp, parent[0], args[1], args[2]);
3458	break;	3565	break;
3459	case 4: /* set size (pixels) */	3566	case 4: /* set size (pixels) */
3460	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3567	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3461	break;	3568	break;
3462	case 5: /* raise window */	3569	case 5: /* raise window */
3463	XRaiseWindow (display->display, TermWin.parent[0]);	3570	XRaiseWindow (disp, parent[0]);
3464	break;	3571	break;
3465	case 6: /* lower window */	3572	case 6: /* lower window */
3466	XLowerWindow (display->display, TermWin.parent[0]);	3573	XLowerWindow (disp, parent[0]);
3467	break;	3574	break;
3468	case 7: /* refresh window */	3575	case 7: /* refresh window */
3469	scr_touch (true);	3576	scr_touch (true);
3470	break;	3577	break;
3471	case 8: /* set size (chars) */	3578	case 8: /* set size (chars) */
3472	set_widthheight ((unsigned int) (args[2] * TermWin.fwidth),	3579	set_widthheight ((unsigned int) (args[2] * fwidth),
3473	(unsigned int) (args[1] * TermWin.fheight));	3580	(unsigned int) (args[1] * fheight));
3474	break;	3581	break;
3475		3582
3476	//case 9: NYI, TODO, restore maximized window or maximize window	3583	//case 9: NYI, TODO, restore maximized window or maximize window
3477	default:	3584	default:
3478	if (args[0] >= 24) /* set height (chars) */	3585	if (args[0] >= 24) /* set height (chars) */
3479	set_widthheight ((unsigned int)TermWin.width,	3586	set_widthheight ((unsigned int)width,
3480	(unsigned int) (args[1] * TermWin.fheight));	3587	(unsigned int) (args[1] * fheight));
3481	break;	3588	break;
3482		3589
3483		3590
3484	/*	3591	/*
3485	* reports - some output format copied from XTerm	3592	* reports - some output format copied from XTerm
3486	*/	3593	*/
3487	case 11: /* report window state */	3594	case 11: /* report window state */
3488	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	3595	XGetWindowAttributes (disp, parent[0], &wattr);
3489	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3596	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3490	break;	3597	break;
3491	case 13: /* report window position */	3598	case 13: /* report window position */
3492	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	3599	XGetWindowAttributes (disp, parent[0], &wattr);
3493	XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root,	3600	XTranslateCoordinates (disp, parent[0], wattr.root,
3494	-wattr.border_width, -wattr.border_width,	3601	-wattr.border_width, -wattr.border_width,
3495	&x, &y, &wdummy);	3602	&x, &y, &wdummy);
3496	tt_printf ("\033[3;%d;%dt", x, y);	3603	tt_printf ("\033[3;%d;%dt", x, y);
3497	break;	3604	break;
3498	case 14: /* report window size (pixels) */	3605	case 14: /* report window size (pixels) */
3499	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	3606	XGetWindowAttributes (disp, parent[0], &wattr);
3500	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3607	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3501	break;	3608	break;
3502	case 18: /* report text area size (chars) */	3609	case 18: /* report text area size (chars) */
3503	tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);	3610	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3504	break;	3611	break;
3505	case 19: /* report window size (chars) */	3612	case 19: /* report window size (chars) */
3506	tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);	3613	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3507	break;	3614	break;
3508	case 20: /* report icon label */	3615	case 20: /* report icon label */
3509	{	3616	{
3510	char *s;	3617	char *s;
3511	XGetIconName (display->display, TermWin.parent[0], &s);	3618	XGetIconName (disp, parent[0], &s);
3512	tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */	3619	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3513	XFree (s);	3620	XFree (s);
3514	}	3621	}
3515	break;	3622	break;
3516	case 21: /* report window title */	3623	case 21: /* report window title */
3517	{	3624	{
3518	char *s;	3625	char *s;
3519	XFetchName (display->display, TermWin.parent[0], &s);	3626	XFetchName (disp, parent[0], &s);
3520	tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */	3627	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3521	XFree (s);	3628	XFree (s);
3522	}	3629	}
3523	break;	3630	break;
3524	}	3631	}
3525	}	3632	}
…		…
3557	else if (ch < 0x20)	3664	else if (ch < 0x20)
3558	return NULL; /* other control character - exit */	3665	return NULL; /* other control character - exit */
3559		3666
3560	seen_esc = false;	3667	seen_esc = false;
3561		3668
3562	if (n >= sizeof (string) - 1)	3669	if (n >= STRING_MAX - 1)
3563	// stop at some sane length	3670	// stop at some sane length
3564	return NULL;	3671	return NULL;
3565		3672
3566	if (ch == C0_SYN)	3673	if (ch == C0_SYN)
3567	string[n++] = cmd_get8 ();	3674	string[n++] = cmd_get8 ();
…		…
3635	set_window_color (color, str);	3742	set_window_color (color, str);
3636	}	3743	}
3637		3744
3638	/*	3745	/*
3639	* XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)	3746	* XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3640	* 0 = change iconName/title
3641	* 1 = change iconName
3642	* 2 = change title
3643	* 4 = change color
3644	* 10 = change fg color
3645	* 11 = change bg color
3646	* 12 = change text color
3647	* 13 = change mouse foreground color
3648	* 17 = change highlight character colour
3649	* 18 = change bold character color
3650	* 19 = change underlined character color
3651	* 46 = change logfile (not implemented)
3652	* 50 = change font
3653	*
3654	* rxvt extensions:
3655	* 20 = bg pixmap
3656	* 39 = change default fg color
3657	* 49 = change default bg color
3658	* 55 = dump scrollback buffer and all of screen
3659	* 701 = change locale
3660	* 702 = find font
3661	* 703 = menu
3662	*/	3747	*/
3663	void	3748	void
3664	rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)	3749	rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
3665	{	3750	{
3666	int changed = 0;	3751	int changed = 0;
3667	int color;	3752	int color;
3668	char *buf, *name;	3753	char *buf, *name;
3669	bool query = str[0] == '?' && !str[1];	3754	bool query = str[0] == '?' && !str[1];
3670	int saveop = op;	3755	int saveop = op;
		3756	dDisp;
3671		3757
3672	assert (str != NULL);	3758	assert (str != NULL);
3673	switch (op)	3759	switch (op)
3674	{	3760	{
3675	case XTerm_name:	3761	case XTerm_name:
…		…
3691	unsigned long bytes_after;	3777	unsigned long bytes_after;
3692	unsigned char *value = 0;	3778	unsigned char *value = 0;
3693	const char *str = "";	3779	const char *str = "";
3694		3780
3695	if (prop	3781	if (prop
3696	&& XGetWindowProperty (display->display, TermWin.parent[0],	3782	&& XGetWindowProperty (disp, parent[0],
3697	prop, 0, 1<<16, 0, AnyPropertyType,	3783	prop, 0, 1<<16, 0, AnyPropertyType,
3698	&actual_type, &actual_format,	3784	&actual_type, &actual_format,
3699	&nitems, &bytes_after, &value) == Success	3785	&nitems, &bytes_after, &value) == Success
3700	&& actual_type != None	3786	&& actual_type != None
3701	&& actual_format == 8)	3787	&& actual_format == 8)
…		…
3713	{	3799	{
3714	*eq = 0;	3800	*eq = 0;
3715	set_utf8_property (display->atom (str), eq + 1);	3801	set_utf8_property (display->atom (str), eq + 1);
3716	}	3802	}
3717	else	3803	else
3718	XDeleteProperty (display->display, TermWin.parent[0],	3804	XDeleteProperty (disp, parent[0],
3719	display->atom (str));	3805	display->atom (str));
3720	}	3806	}
3721	break;	3807	break;
3722		3808
3723	case XTerm_Color:	3809	case XTerm_Color:
…		…
3764	break;	3850	break;
3765	#ifndef NO_BOLD_UNDERLINE_REVERSE	3851	#ifndef NO_BOLD_UNDERLINE_REVERSE
3766	case XTerm_Color_BD:	3852	case XTerm_Color_BD:
3767	process_color_seq (XTerm_Color_BD, Color_BD, str, resp);	3853	process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3768	break;	3854	break;
3769	case XTerm_Color_IT:
3770	process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3771	break;
3772	case XTerm_Color_UL:	3855	case XTerm_Color_UL:
3773	process_color_seq (XTerm_Color_UL, Color_UL, str, resp);	3856	process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3774	break;	3857	break;
3775	case XTerm_Color_RV:	3858	case XTerm_Color_RV:
3776	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3859	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3777	break;	3860	break;
		3861	case URxvt_Color_IT:
		3862	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
		3863	break;
3778	#endif	3864	#endif
3779	#if TRANSPARENT && TINTING	3865	#if TRANSPARENT && TINTING
3780	case XTerm_Color_tint:	3866	case URxvt_Color_tint:
3781	process_color_seq (XTerm_Color_tint, Color_tint, str, resp);	3867	process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3782	check_our_parents ();	3868	check_our_parents ();
3783	if (am_transparent)	3869	if (am_transparent)
3784	want_full_refresh = want_refresh = 1;	3870	want_full_refresh = want_refresh = 1;
3785	break;	3871	break;
3786	#endif	3872	#endif
…		…
3798	{	3884	{
3799	str++;	3885	str++;
3800	#if XPM_BACKGROUND	3886	#if XPM_BACKGROUND
3801	changed += scale_pixmap (str);	3887	changed += scale_pixmap (str);
3802	#endif	3888	#endif
3803
3804	}	3889	}
		3890
3805	if (changed)	3891	if (changed)
3806	{	3892	{
3807	#ifdef XPM_BACKGROUND	3893	#ifdef XPM_BACKGROUND
3808	resize_pixmap ();	3894	resize_pixmap ();
3809	#endif	3895	#endif
…		…
3820		3906
3821	case XTerm_logfile:	3907	case XTerm_logfile:
3822	// TODO, when secure mode?	3908	// TODO, when secure mode?
3823	break;	3909	break;
3824		3910
		3911	#ifdef MENUBAR
		3912	case URxvt_Menu:
		3913	if (OPTION (Opt_insecure))
		3914	menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
		3915	break;
		3916	#endif
		3917	#if 0
		3918	case XTerm_dumpscreen: /* no error notices */
		3919	{
		3920	int fd;
		3921	if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
		3922	{
		3923	scr_dump (fd);
		3924	close (fd);
		3925	}
		3926	}
		3927	break;
		3928	#endif
3825	case XTerm_font:	3929	case XTerm_font:
3826	op = URxvt_font;	3930	op = URxvt_font;
3827	case URxvt_font:	3931	case URxvt_font:
3828	#if ENABLE_STYLES	3932	#if ENABLE_STYLES
3829	case URxvt_boldFont:	3933	case URxvt_boldFont:
3830	case URxvt_italicFont:	3934	case URxvt_italicFont:
3831	case URxvt_boldItalicFont:	3935	case URxvt_boldItalicFont:
3832	#endif	3936	#endif
3833	if (query)	3937	if (query)
3834	tt_printf ("\33]%d;%-.250s%c", saveop,	3938	tt_printf ("\33]%d;%-.250s%c", saveop,
3835	(options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc	3939	OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3836	? TermWin.fontset[op - URxvt_font]->fontdesc : "",	3940	? fontset[op - URxvt_font]->fontdesc : "",
3837	resp);	3941	resp);
3838	else	3942	else
3839	{	3943	{
3840	const char *&res = rs[Rs_font + (op - URxvt_font)];	3944	const char *&res = rs[Rs_font + (op - URxvt_font)];
3841		3945
…		…
3844	set_fonts ();	3948	set_fonts ();
3845	}	3949	}
3846	break;	3950	break;
3847		3951
3848	#if ENABLE_FRILLS	3952	#if ENABLE_FRILLS
3849	case XTerm_locale:	3953	case URxvt_locale:
3850	if (query)	3954	if (query)
3851	tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);	3955	tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3852	else	3956	else
3853	{	3957	{
3854	set_locale (str);	3958	set_locale (str);
3855	# ifdef USE_XIM	3959	pty.set_utf8_mode (enc_utf8);
3856	im_cb ();	3960	init_xlocale ();
3857	# endif
3858	}	3961	}
3859	break;	3962	break;
3860	#endif
3861		3963
3862	#ifdef MENUBAR	3964	case URxvt_view_up:
3863	case XTerm_Menu:	3965	case URxvt_view_down:
3864	if (options & Opt_insecure)	3966	{
3865	menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked	3967	int lines = atoi (str);
		3968
		3969	if (lines)
		3970	scr_page (op == URxvt_view_up ? UP : DN, lines);
		3971	else
		3972	scr_erase_savelines ();
		3973	}
		3974
3866	break;	3975	break;
3867	#endif	3976	#endif
3868	#if 0	3977
3869	case XTerm_dumpscreen: /* no error notices */	3978	#if ENABLE_PERL
3870	{	3979	case URxvt_perl:
3871	int fd;	3980	if (PERL_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END)))
3872	if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)	3981	; // no responses yet
3873	{
3874	scr_dump (fd);
3875	close (fd);
3876	}
3877	}
3878	break;	3982	break;
3879	#endif	3983	#endif
3880	}	3984	}
3881	}	3985	}
3882	/*----------------------------------------------------------------------*/	3986	/*----------------------------------------------------------------------*/
…		…
3991	}	4095	}
3992		4096
3993	/* extra handling for values with state unkept */	4097	/* extra handling for values with state unkept */
3994	switch (arg[i])	4098	switch (arg[i])
3995	{	4099	{
		4100	#if ENABLE_STYLES
		4101	case 1021:
		4102	if (mode)
		4103	SET_OPTION (Opt_intensityStyles);
		4104	else
		4105	CLR_OPTION (Opt_intensityStyles);
		4106
		4107	scr_touch (true);
		4108	break;
		4109	#endif
3996	case 1048: /* alternative cursor save */	4110	case 1048: /* alternative cursor save */
3997	case 1049:	4111	case 1049:
3998	if (options & Opt_secondaryScreen)	4112	if (OPTION (Opt_secondaryScreen))
3999	if (mode == 0)	4113	if (mode == 0)
4000	scr_cursor (RESTORE);	4114	scr_cursor (RESTORE);
4001	else if (mode == 1)	4115	else if (mode == 1)
4002	scr_cursor (SAVE);	4116	scr_cursor (SAVE);
4003	break;	4117	break;
…		…
4015	*/	4129	*/
4016	PrivMode (1, PrivMode_vt52);	4130	PrivMode (1, PrivMode_vt52);
4017	break;	4131	break;
4018	case 3: /* 80/132 */	4132	case 3: /* 80/132 */
4019	if (priv_modes & PrivMode_132OK)	4133	if (priv_modes & PrivMode_132OK)
4020	set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);	4134	set_widthheight (((state ? 132 : 80) * fwidth), height);
4021	break;	4135	break;
4022	case 4: /* smooth scrolling */	4136	case 4: /* smooth scrolling */
4023	if (state)	4137	if (!state)
4024	options &= ~Opt_jumpScroll;	4138	SET_OPTION (Opt_jumpScroll);
4025	else	4139	else
4026	options |= Opt_jumpScroll;	4140	CLR_OPTION (Opt_jumpScroll);
4027	break;	4141	break;
4028	case 5: /* reverse video */	4142	case 5: /* reverse video */
4029	scr_rvideo_mode (state);	4143	scr_rvideo_mode (state);
4030	break;	4144	break;
4031	case 6: /* relative/absolute origins */	4145	case 6: /* relative/absolute origins */
…		…
4072	#if 0	4186	#if 0
4073	case 1001:	4187	case 1001:
4074	break; /* X11 mouse highlighting */	4188	break; /* X11 mouse highlighting */
4075	#endif	4189	#endif
4076	case 1010: /* scroll to bottom on TTY output inhibit */	4190	case 1010: /* scroll to bottom on TTY output inhibit */
4077	if (state)	4191	if (!state)
4078	options &= ~Opt_scrollTtyOutput;	4192	SET_OPTION (Opt_scrollTtyOutput);
4079	else	4193	else
4080	options |= Opt_scrollTtyOutput;	4194	CLR_OPTION (Opt_scrollTtyOutput);
4081	break;	4195	break;
4082	case 1011: /* scroll to bottom on key press */	4196	case 1011: /* scroll to bottom on key press */
4083	if (state)	4197	if (state)
4084	options |= Opt_scrollTtyKeypress;	4198	SET_OPTION (Opt_scrollTtyKeypress);
4085	else	4199	else
4086	options &= ~Opt_scrollTtyKeypress;	4200	CLR_OPTION (Opt_scrollTtyKeypress);
4087	break;	4201	break;
4088	case 1047: /* secondary screen w/ clearing last */	4202	case 1047: /* secondary screen w/ clearing last */
4089	if (options & Opt_secondaryScreen)	4203	if (OPTION (Opt_secondaryScreen))
4090	if (current_screen != PRIMARY)	4204	if (current_screen != PRIMARY)
4091	scr_erase_screen (2);	4205	scr_erase_screen (2);
4092	scr_change_screen (state);	4206	scr_change_screen (state);
4093	break;	4207	break;
4094	case 1049: /* secondary screen w/ clearing first */	4208	case 1049: /* secondary screen w/ clearing first */
4095	scr_change_screen (state);	4209	scr_change_screen (state);
4096	if (options & Opt_secondaryScreen)	4210	if (OPTION (Opt_secondaryScreen))
4097	if (current_screen != PRIMARY)	4211	if (current_screen != PRIMARY)
4098	scr_erase_screen (2);	4212	scr_erase_screen (2);
4099	break;	4213	break;
4100	default:	4214	default:
4101	break;	4215	break;
…		…
4251	case 106:	4365	case 106:
4252	case 107:	4366	case 107:
4253	scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);	4367	scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4254	break;	4368	break;
4255	#endif	4369	#endif
4256
4257	}	4370	}
4258	}	4371	}
4259	}	4372	}
4260	/*}}} */	4373	/*}}} */
4261		4374
…		…
4342	}	4455	}
4343		4456
4344	memmove (v_buffer, v_buffer + written, v_buflen);	4457	memmove (v_buffer, v_buffer + written, v_buflen);
4345	}	4458	}
4346	else if (written != -1 || (errno != EAGAIN && errno != EINTR))	4459	else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4347	// original code just ignores this...	4460	pty_ev.set (EVENT_READ);
4348	destroy ();
4349	}	4461	}
4350		4462
4351	/*----------------------- end-of-file (C source) -----------------------*/	4463	/*----------------------- end-of-file (C source) -----------------------*/
4352		4464

Diff Legend

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