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.179 by root, Wed Dec 15 05:39:08 2004 UTC vs.
Revision 1.230 by root, Wed Jan 4 00:09:12 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
		54	#if HAVE_SCHED_YIELD
53	#include <wchar.h>	55	# include <sched.h>
		56	#endif
		57
		58	#ifdef KEYSYM_RESOURCE
		59	# include "keyboard.h"
		60	#endif
		61
54	#include <signal.h>	62	#include <csignal>
55		63
56	/*----------------------------------------------------------------------*/	64	/*----------------------------------------------------------------------*/
57		65
58	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)	66	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
59		67
…		…
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:
…		…
788	#undef FKEY	824	#undef FKEY
789	default:	825	default:
790	newlen = 0;	826	newlen = 0;
791	break;	827	break;
792	}	828	}
		829
793	if (newlen)	830	if (newlen)
794	len = strlen (kbuf);	831	len = strlen (kbuf);
795	}	832	}
796		833
797	/*	834	/*
…		…
806	else if (ctrl && keysym == XK_minus)	843	else if (ctrl && keysym == XK_minus)
807	{	844	{
808	len = 1;	845	len = 1;
809	kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */	846	kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
810	}	847	}
		848	else if (keysym == XK_ISO_Left_Tab)
		849	{
		850	strcpy (kbuf, "\033[Z");
		851	len = 3;
		852	}
811	else	853	else
812	{	854	{
813	#ifdef META8_OPTION	855	#ifdef META8_OPTION
814	/* set 8-bit on */	856	/* set 8-bit on */
815	if (meta && (meta_char == 0x80))	857	if (meta && (meta_char == 0x80))
…		…
827	}	869	}
828		870
829	if (len <= 0)	871	if (len <= 0)
830	return; /* not mapped */	872	return; /* not mapped */
831		873
832	if (options & Opt_scrollTtyKeypress)	874	if (OPTION (Opt_scrollTtyKeypress))
833	if (TermWin.view_start)	875	if (view_start)
834	{	876	{
835	TermWin.view_start = 0;	877	view_start = 0;
836	want_refresh = 1;	878	want_refresh = 1;
837	}	879	}
838		880
839	/*	881	/*
840	* these modifications only affect the static keybuffer	882	* these modifications only affect the static keybuffer
…		…
873	#endif /* DEBUG_CMD */	915	#endif /* DEBUG_CMD */
874	tt_write (kbuf, (unsigned int)len);	916	tt_write (kbuf, (unsigned int)len);
875	}	917	}
876	/*}}} */	918	/*}}} */
877		919
878	#if (MENUBAR_MAX)	920	#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
879	/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */	921	/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
880	/* attempt to `write' count to the input buffer */	922	/* attempt to `write' count to the input buffer */
881	unsigned int	923	unsigned int
882	rxvt_term::cmd_write (const unsigned char *str, unsigned int count)	924	rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
883	{	925	{
…		…
906		948
907	cmd_parse ();	949	cmd_parse ();
908		950
909	return 0;	951	return 0;
910	}	952	}
911	#endif /* MENUBAR_MAX */	953	#endif
912		954
913	void	955	void
914	rxvt_term::flush ()	956	rxvt_term::flush ()
915	{	957	{
916	flush_ev.stop ();	958	flush_ev.stop ();
…		…
943	SET_LOCALE (locale);	985	SET_LOCALE (locale);
944		986
945	display->flush ();	987	display->flush ();
946		988
947	if (want_refresh && !flush_ev.active)	989	if (want_refresh && !flush_ev.active)
948	flush_ev.start (NOW + 0.01);	990	flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
949	}	991	}
950		992
951	void	993	void
952	rxvt_term::flush_cb (time_watcher &w)	994	rxvt_term::flush_cb (time_watcher &w)
953	{	995	{
…		…
1017	{	1059	{
1018	if (mouse_slip_wheel_speed == 0	1060	if (mouse_slip_wheel_speed == 0
1019	|| 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)
1020	: scr_page (UP, mouse_slip_wheel_speed))	1062	: scr_page (UP, mouse_slip_wheel_speed))
1021	{	1063	{
		1064	if (view_start == nsaved ||
		1065	view_start == 0)
		1066	mouse_slip_wheel_speed = 0;
		1067
1022	refresh_type |= SMOOTH_REFRESH;	1068	refresh_type |= SMOOTH_REFRESH;
1023	want_refresh = 1;	1069	want_refresh = 1;
1024	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1070	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1025	}	1071	}
1026	}	1072	}
1027	#endif	1073	#endif
1028		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
1029	bool	1093	bool
1030	rxvt_term::pty_fill ()	1094	rxvt_term::pty_fill ()
1031	{	1095	{
1032	ssize_t n = cmdbuf_endp - cmdbuf_ptr;	1096	ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1033		1097
…		…
1039		1103
1040	memmove (cmdbuf_base, cmdbuf_ptr, n);	1104	memmove (cmdbuf_base, cmdbuf_ptr, n);
1041	cmdbuf_ptr = cmdbuf_base;	1105	cmdbuf_ptr = cmdbuf_base;
1042	cmdbuf_endp = cmdbuf_ptr + n;	1106	cmdbuf_endp = cmdbuf_ptr + n;
1043		1107
1044	n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);	1108	ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
1045		1109
1046	if (n > 0)	1110	if (r > 0)
1047	{	1111	{
1048	cmdbuf_endp += n;	1112	cmdbuf_endp += r;
1049	return true;	1113	return true;
1050	}	1114	}
1051	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))
1052	destroy ();	1127	destroy ();
		1128	}
1053		1129
1054	return false;	1130	return false;
1055	}	1131	}
1056		1132
1057	void	1133	void
…		…
1071	}	1147	}
1072		1148
1073	void	1149	void
1074	rxvt_term::pointer_unblank ()	1150	rxvt_term::pointer_unblank ()
1075	{	1151	{
1076	XDefineCursor (display->display, TermWin.vt, TermWin_cursor);	1152	XDefineCursor (display->display, vt, TermWin_cursor);
1077	recolour_cursor ();	1153	recolour_cursor ();
1078		1154
1079	#ifdef POINTER_BLANK	1155	#ifdef POINTER_BLANK
1080	hidden_pointer = 0;	1156	hidden_pointer = 0;
1081		1157
1082	if (options & Opt_pointerBlank)	1158	if (OPTION (Opt_pointerBlank))
1083	pointer_ev.start (NOW + pointerBlankDelay);	1159	pointer_ev.start (NOW + pointerBlankDelay);
1084	#endif	1160	#endif
1085	}	1161	}
1086		1162
1087	#ifdef POINTER_BLANK	1163	#ifdef POINTER_BLANK
1088	void	1164	void
1089	rxvt_term::pointer_blank ()	1165	rxvt_term::pointer_blank ()
1090	{	1166	{
1091	if (! (options & Opt_pointerBlank))	1167	if (! OPTION (Opt_pointerBlank))
1092	return;	1168	return;
1093		1169
1094	XDefineCursor (display->display, TermWin.vt, blank_cursor);	1170	XDefineCursor (display->display, vt, display->blank_cursor);
1095	XFlush (display->display);	1171	XFlush (display->display);
1096		1172
1097	hidden_pointer = 1;	1173	hidden_pointer = 1;
1098	}	1174	}
1099		1175
…		…
1188		1264
1189	/*{{{ process an X event */	1265	/*{{{ process an X event */
1190	void	1266	void
1191	rxvt_term::x_cb (XEvent &ev)	1267	rxvt_term::x_cb (XEvent &ev)
1192	{	1268	{
		1269	dDisp;
		1270
1193	SET_R (this);	1271	SET_R (this);
1194	SET_LOCALE (locale);	1272	SET_LOCALE (locale);
1195		1273
1196	#if defined(CURSOR_BLINK)	1274	#if defined(CURSOR_BLINK)
1197	if ((options & Opt_cursorBlink) && ev.type == KeyPress)	1275	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1198	{	1276	{
1199	if (hidden_cursor)	1277	if (hidden_cursor)
1200	{	1278	{
1201	hidden_cursor = 0;	1279	hidden_cursor = 0;
1202	want_refresh = 1;	1280	want_refresh = 1;
…		…
1205	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1283	cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1206	}	1284	}
1207	#endif	1285	#endif
1208		1286
1209	#if defined(POINTER_BLANK)	1287	#if defined(POINTER_BLANK)
1210	if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)	1288	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1211	{	1289	{
1212	if (ev.type == MotionNotify	1290	if (ev.type == MotionNotify
1213	|| ev.type == ButtonPress	1291	|| ev.type == ButtonPress
1214	|| ev.type == ButtonRelease)	1292	|| ev.type == ButtonRelease)
1215	if (hidden_pointer)	1293	if (hidden_pointer)
…		…
1313	button_release (ev.xbutton);	1391	button_release (ev.xbutton);
1314	break;	1392	break;
1315		1393
1316	case ClientMessage:	1394	case ClientMessage:
1317	if (ev.xclient.format == 32	1395	if (ev.xclient.format == 32
		1396	&& ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
		1397	{
1318	&& (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW])	1398	if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1319	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
1320	#ifdef OFFIX_DND	1416	#ifdef OFFIX_DND
1321	/* OffiX Dnd (drag 'n' drop) protocol */	1417	/* OffiX Dnd (drag 'n' drop) protocol */
1322	else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]	1418	else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1323	&& (ev.xclient.data.l[0] == DndFile	1419	&& (ev.xclient.data.l[0] == DndFile
1324	|| ev.xclient.data.l[0] == DndDir	1420	|| ev.xclient.data.l[0] == DndDir
1325	|| ev.xclient.data.l[0] == DndLink))	1421	|| ev.xclient.data.l[0] == DndLink))
1326	{	1422	{
1327	/* Get Dnd data */	1423	/* Get Dnd data */
1328	Atom ActualType;	1424	Atom ActualType;
1329	int ActualFormat;	1425	int ActualFormat;
1330	unsigned char *data;	1426	unsigned char *data;
1331	unsigned long Size, RemainingBytes;	1427	unsigned long Size, RemainingBytes;
1332		1428
1333	XGetWindowProperty (display->display, display->root,	1429	XGetWindowProperty (disp, display->root,
1334	xa[XA_DNDSELECTION],	1430	xa[XA_DNDSELECTION],
1335	0L, 1000000L,	1431	0L, 1000000L,
1336	False, AnyPropertyType,	1432	False, AnyPropertyType,
1337	&ActualType, &ActualFormat,	1433	&ActualType, &ActualFormat,
1338	&Size, &RemainingBytes,	1434	&Size, &RemainingBytes,
1339	&data);	1435	&data);
1340	set_string_property (XA_CUT_BUFFER0, data);	1436	set_string_property (XA_CUT_BUFFER0, data);
1341	XFree (data);	1437	XFree (data);
1342	selection_paste (display->root, XA_CUT_BUFFER0, true);	1438	selection_paste (display->root, XA_CUT_BUFFER0, true);
1343	XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);	1439	XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1344	}	1440	}
1345	#endif /* OFFIX_DND */	1441	#endif /* OFFIX_DND */
1346	break;	1442	break;
1347		1443
1348	case MappingNotify:	1444	case MappingNotify:
…		…
1373	break;	1469	break;
1374	}	1470	}
1375	break;	1471	break;
1376		1472
1377	case FocusIn:	1473	case FocusIn:
1378	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])
1379	{	1483	{
1380	TermWin.focus = 1;
1381	want_refresh = 1;
1382	#ifdef USE_XIM
1383	if (Input_Context != NULL)
1384	{
1385	IMSetStatusPosition ();
1386	XSetICFocus (Input_Context);
1387	}
1388	#endif
1389	#ifdef CURSOR_BLINK
1390	if (options & Opt_cursorBlink)
1391	cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1392	#endif
1393	#ifdef OFF_FOCUS_FADING
1394	if (rs[Rs_fade])
1395	{
1396	pix_colors = pix_colors_focused;
1397	scr_recolour ();
1398	}
1399	#endif
1400
1401	}
1402	break;
1403
1404	case FocusOut:
1405	if (TermWin.focus)
1406	{
1407	TermWin.focus = 0;
1408	want_refresh = 1;
1409
1410	#if ENABLE_FRILLS || ISO_14755
1411	iso14755buf = 0;
1412	#endif
1413	#if ENABLE_OVERLAY
1414	scr_overlay_off ();
1415	#endif
1416	#ifdef USE_XIM
1417	if (Input_Context != NULL)
1418	XUnsetICFocus (Input_Context);
1419	#endif
1420	#ifdef CURSOR_BLINK
1421	if (options & Opt_cursorBlink)
1422	cursor_blink_ev.stop ();
1423	hidden_cursor = 0;
1424	#endif
1425	#ifdef OFF_FOCUS_FADING
1426	if (rs[Rs_fade])
1427	{
1428	pix_colors = pix_colors_unfocused;
1429	scr_recolour ();
1430	}
1431	#endif
1432	}
1433	break;
1434
1435	case ConfigureNotify:
1436	if (ev.xconfigure.window == TermWin.parent[0])
1437	{
1438	int height, width;
1439
1440	do
1441	{ /* Wrap lots of configures into one */
1442	width = ev.xconfigure.width;
1443	height = ev.xconfigure.height;
1444	D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1445	}
1446	while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));	1484	while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
		1485	;
1447		1486
1448	if (szHint.width != width || szHint.height != height)	1487	if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1449	{	1488	{
1450	seen_resize = 1;	1489	seen_resize = 1;
1451	resize_all_windows (width, height, 1);	1490	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1452	}	1491	}
1453		1492
1454	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */	1493	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1455	if (options & Opt_transparent)	1494	if (OPTION (Opt_transparent))
1456	check_our_parents ();	1495	check_our_parents ();
1457	#endif	1496	#endif
1458	}	1497	}
1459	break;	1498	break;
1460		1499
…		…
1477	case SelectionRequest:	1516	case SelectionRequest:
1478	selection_send (ev.xselectionrequest);	1517	selection_send (ev.xselectionrequest);
1479	break;	1518	break;
1480		1519
1481	case UnmapNotify:	1520	case UnmapNotify:
1482	TermWin.mapped = 0;	1521	mapped = 0;
1483	#ifdef TEXT_BLINK	1522	#ifdef TEXT_BLINK
1484	text_blink_ev.stop ();	1523	text_blink_ev.stop ();
1485	#endif	1524	#endif
1486	break;	1525	break;
1487		1526
1488	case MapNotify:	1527	case MapNotify:
1489	TermWin.mapped = 1;	1528	mapped = 1;
1490	#ifdef TEXT_BLINK	1529	#ifdef TEXT_BLINK
1491	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);	1530	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1492	#endif	1531	#endif
1493	break;	1532	break;
1494		1533
…		…
1498	break;	1537	break;
1499	#endif /* TRANSPARENT */	1538	#endif /* TRANSPARENT */
1500		1539
1501	case GraphicsExpose:	1540	case GraphicsExpose:
1502	case Expose:	1541	case Expose:
1503	if (ev.xany.window == TermWin.vt)	1542	if (ev.xany.window == vt)
1504	{	1543	{
1505	do	1544	do
1506	scr_expose (ev.xexpose.x, ev.xexpose.y,	1545	scr_expose (ev.xexpose.x, ev.xexpose.y,
1507	ev.xexpose.width, ev.xexpose.height, False);	1546	ev.xexpose.width, ev.xexpose.height, False);
1508	while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev));	1547	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1509		1548
1510	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1549	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1511		1550
1512	while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev))	1551	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1513	scr_expose (ev.xexpose.x, ev.xexpose.y,	1552	scr_expose (ev.xexpose.x, ev.xexpose.y,
1514	ev.xexpose.width, ev.xexpose.height, False);	1553	ev.xexpose.width, ev.xexpose.height, False);
1515		1554
1516	scr_refresh (refresh_type);	1555	scr_refresh (refresh_type);
1517	}	1556	}
1518	else	1557	else
1519	{	1558	{
1520	XEvent unused_event;	1559	XEvent unused_event;
1521		1560
1522	while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event))	1561	while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1523	;	1562	;
1524	while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event))	1563	while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1525	;	1564	;
1526		1565
1527	if (isScrollbarWindow (ev.xany.window))	1566	if (isScrollbarWindow (ev.xany.window))
1528	{	1567	{
1529	scrollBar.setIdle ();	1568	scrollBar.setIdle ();
…		…
1533	if (menubar_visible () && isMenuBarWindow (ev.xany.window))	1572	if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1534	menubar_expose ();	1573	menubar_expose ();
1535	#endif	1574	#endif
1536		1575
1537	#ifdef TRANSPARENT	1576	#ifdef TRANSPARENT
1538	if (am_transparent && ev.xany.window == TermWin.parent[0])	1577	if (am_transparent && ev.xany.window == parent[0])
1539	XClearWindow (display->display, ev.xany.window);	1578	XClearWindow (disp, ev.xany.window);
1540	#endif	1579	#endif
1541	}	1580	}
1542	break;	1581	break;
1543		1582
1544	case MotionNotify:	1583	case MotionNotify:
…		…
1554	}	1593	}
1555	#endif	1594	#endif
1556	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)	1595	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1557	break;	1596	break;
1558		1597
1559	if (ev.xany.window == TermWin.vt)	1598	if (ev.xany.window == vt)
1560	{	1599	{
1561	if (ev.xbutton.state & (Button1Mask | Button3Mask))	1600	if (ev.xbutton.state & (Button1Mask | Button3Mask))
1562	{	1601	{
1563	while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))	1602	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1564	;	1603	;
1565		1604
1566	XQueryPointer (display->display, TermWin.vt,	1605	XQueryPointer (disp, vt,
1567	&unused_root, &unused_child,	1606	&unused_root, &unused_child,
1568	&unused_root_x, &unused_root_y,	1607	&unused_root_x, &unused_root_y,
1569	&ev.xbutton.x, &ev.xbutton.y,	1608	&ev.xbutton.x, &ev.xbutton.y,
1570	&ev.xbutton.state);	1609	&ev.xbutton.state);
1571	#ifdef MOUSE_THRESHOLD	1610	#ifdef MOUSE_THRESHOLD
…		…
1583	#endif	1622	#endif
1584	selection_extend (ev.xbutton.x, ev.xbutton.y,	1623	selection_extend (ev.xbutton.x, ev.xbutton.y,
1585	ev.xbutton.state & Button3Mask ? 2 : 0);	1624	ev.xbutton.state & Button3Mask ? 2 : 0);
1586		1625
1587	#ifdef SELECTION_SCROLLING	1626	#ifdef SELECTION_SCROLLING
1588	if (ev.xbutton.y < TermWin.int_bwidth	1627	if (ev.xbutton.y < int_bwidth
1589	|| Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))	1628	|| Pixel2Row (ev.xbutton.y) > (nrow-1))
1590	{	1629	{
1591	int dist;	1630	int dist;
1592		1631
1593	/* don't clobber the current delay if we are	1632	/* don't clobber the current delay if we are
1594	* already in the middle of scrolling.	1633	* already in the middle of scrolling.
…		…
1602	selection_save_x = ev.xbutton.x;	1641	selection_save_x = ev.xbutton.x;
1603	selection_save_y = ev.xbutton.y;	1642	selection_save_y = ev.xbutton.y;
1604	selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;	1643	selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1605		1644
1606	/* calc number of lines to scroll */	1645	/* calc number of lines to scroll */
1607	if (ev.xbutton.y < TermWin.int_bwidth)	1646	if (ev.xbutton.y < int_bwidth)
1608	{	1647	{
1609	scroll_selection_dir = UP;	1648	scroll_selection_dir = UP;
1610	dist = TermWin.int_bwidth - ev.xbutton.y;	1649	dist = int_bwidth - ev.xbutton.y;
1611	}	1650	}
1612	else	1651	else
1613	{	1652	{
1614	scroll_selection_dir = DN;	1653	scroll_selection_dir = DN;
1615	dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height);	1654	dist = ev.xbutton.y - (int_bwidth + height);
1616	}	1655	}
1617		1656
1618	scroll_selection_lines = Pixel2Height (dist)	1657	scroll_selection_lines = Pixel2Height (dist)
1619	/ SELECTION_SCROLL_LINE_SPEEDUP	1658	/ SELECTION_SCROLL_LINE_SPEEDUP
1620	+ 1;	1659	+ 1;
1621	MIN_IT (scroll_selection_lines,	1660	min_it (scroll_selection_lines,
1622	SELECTION_SCROLL_MAX_LINES);	1661	SELECTION_SCROLL_MAX_LINES);
1623	}	1662	}
1624	else	1663	else
1625	{	1664	{
1626	/* we are within the text window, so we	1665	/* we are within the text window, so we
…		…
1635	#endif	1674	#endif
1636	}	1675	}
1637	}	1676	}
1638	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1677	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1639	{	1678	{
1640	while (XCheckTypedWindowEvent (display->display, scrollBar.win,	1679	while (XCheckTypedWindowEvent (disp, scrollBar.win,
1641	MotionNotify, &ev))	1680	MotionNotify, &ev))
1642	;	1681	;
1643		1682
1644	XQueryPointer (display->display, scrollBar.win,	1683	XQueryPointer (disp, scrollBar.win,
1645	&unused_root, &unused_child,	1684	&unused_root, &unused_child,
1646	&unused_root_x, &unused_root_y,	1685	&unused_root_x, &unused_root_y,
1647	&ev.xbutton.x, &ev.xbutton.y,	1686	&ev.xbutton.x, &ev.xbutton.y,
1648	&unused_mask);	1687	&unused_mask);
1649	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1688	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
…		…
1654	}	1693	}
1655	break;	1694	break;
1656	}	1695	}
1657	}	1696	}
1658		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
1659	#if TRANSPARENT	1767	#if TRANSPARENT
1660	void	1768	void
1661	rxvt_term::rootwin_cb (XEvent &ev)	1769	rxvt_term::rootwin_cb (XEvent &ev)
1662	{	1770	{
1663	SET_R (this);	1771	SET_R (this);
…		…
1674	&& ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])	1782	&& ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1675	return;	1783	return;
1676		1784
1677	/* FALLTHROUGH */	1785	/* FALLTHROUGH */
1678	case ReparentNotify:	1786	case ReparentNotify:
1679	if ((options & Opt_transparent) && check_our_parents () && am_transparent)	1787	if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1680	want_refresh = want_full_refresh = 1;	1788	want_refresh = want_full_refresh = 1;
1681	break;	1789	break;
1682	}	1790	}
1683	}	1791	}
1684	#endif	1792	#endif
…		…
1687	rxvt_term::button_press (XButtonEvent &ev)	1795	rxvt_term::button_press (XButtonEvent &ev)
1688	{	1796	{
1689	int reportmode = 0, clickintime;	1797	int reportmode = 0, clickintime;
1690		1798
1691	bypass_keystate = ev.state & (ModMetaMask | ShiftMask);	1799	bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
		1800
1692	if (!bypass_keystate)	1801	if (!bypass_keystate)
1693	reportmode = !! (priv_modes & PrivMode_mouse_report);	1802	reportmode = !! (priv_modes & PrivMode_mouse_report);
1694		1803
1695	/*	1804	/*
1696	* VT window processing of button press	1805	* VT window processing of button press
1697	*/	1806	*/
1698	if (ev.window == TermWin.vt)	1807	if (ev.window == vt)
1699	{	1808	{
1700	#if ISO_14755	1809	#if ISO_14755
1701	// 5.4	1810	// 5.4
1702	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))	1811	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1703	{	1812	{
…		…
1745	else	1854	else
1746	{	1855	{
1747	if (ev.button != MEvent.button)	1856	if (ev.button != MEvent.button)
1748	MEvent.clicks = 0;	1857	MEvent.clicks = 0;
1749		1858
		1859	if (!PERL_INVOKE ((this, HOOK_MOUSE_CLICK, DT_XEVENT, &ev, DT_END)))
1750	switch (ev.button)	1860	switch (ev.button)
1751	{	1861	{
1752	case Button1:	1862	case Button1:
1753	/* allow meta + click to select rectangular areas */	1863	/* allow meta + click to select rectangular areas */
1754	/* should be done in screen.C */	1864	/* should be done in screen.C */
1755	#if ENABLE_FRILLS	1865	#if ENABLE_FRILLS
1756	selection.rect = !! (ev.state & ModMetaMask);	1866	selection.rect = !!(ev.state & ModMetaMask);
1757	#else	1867	#else
1758	selection.rect = false;	1868	selection.rect = false;
1759	#endif	1869	#endif
1760		1870
1761	/* allow shift+left click to extend selection */	1871	/* allow shift+left click to extend selection */
1762	if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))	1872	if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1763	{	1873	{
1764	if (MEvent.button == Button1 && clickintime)	1874	if (MEvent.button == Button1 && clickintime)
1765	selection_rotate (ev.x, ev.y);	1875	selection_rotate (ev.x, ev.y);
1766	else	1876	else
1767	selection_extend (ev.x, ev.y, 1);	1877	selection_extend (ev.x, ev.y, 1);
1768	}	1878	}
1769	else	1879	else
1770	{	1880	{
1771	if (MEvent.button == Button1 && clickintime)	1881	if (MEvent.button == Button1 && clickintime)
1772	MEvent.clicks++;	1882	MEvent.clicks++;
1773	else	1883	else
1774	MEvent.clicks = 1;	1884	MEvent.clicks = 1;
1775		1885
1776	selection_click (MEvent.clicks, ev.x, ev.y);	1886	selection_click (MEvent.clicks, ev.x, ev.y);
1777	}	1887	}
1778		1888
1779	MEvent.button = Button1;	1889	MEvent.button = Button1;
1780	break;	1890	break;
1781		1891
1782	case Button3:	1892	case Button3:
1783	if (MEvent.button == Button3 && clickintime)	1893	if (MEvent.button == Button3 && clickintime)
1784	selection_rotate (ev.x, ev.y);	1894	selection_rotate (ev.x, ev.y);
1785	else	1895	else
1786	selection_extend (ev.x, ev.y, 1);	1896	selection_extend (ev.x, ev.y, 1);
1787		1897
1788	MEvent.button = Button3;	1898	MEvent.button = Button3;
1789	break;	1899	break;
1790	}	1900	}
1791	}	1901	}
1792		1902
1793	MEvent.time = ev.time;	1903	MEvent.time = ev.time;
1794	return;	1904	return;
1795	}	1905	}
1796		1906
…		…
1908	case Button3:	2018	case Button3:
1909	if (scrollBar.style != R_SB_XTERM)	2019	if (scrollBar.style != R_SB_XTERM)
1910	{	2020	{
1911	if (scrollbar_above_slider (ev.y))	2021	if (scrollbar_above_slider (ev.y))
1912	# ifdef RXVT_SCROLL_FULL	2022	# ifdef RXVT_SCROLL_FULL
1913	scr_page (UP, TermWin.nrow - 1);	2023	scr_page (UP, nrow - 1);
1914	# else	2024	# else
1915	scr_page (UP, TermWin.nrow / 4);	2025	scr_page (UP, nrow / 4);
1916	# endif	2026	# endif
1917	else if (scrollbar_below_slider (ev.y))	2027	else if (scrollbar_below_slider (ev.y))
1918	# ifdef RXVT_SCROLL_FULL	2028	# ifdef RXVT_SCROLL_FULL
1919	scr_page (DN, TermWin.nrow - 1);	2029	scr_page (DN, nrow - 1);
1920	# else	2030	# else
1921	scr_page (DN, TermWin.nrow / 4);	2031	scr_page (DN, nrow / 4);
1922	# endif	2032	# endif
1923	else	2033	else
1924	scrollBar.setMotion ();	2034	scrollBar.setMotion ();
1925	}	2035	}
1926	else	2036	else
1927	{	2037	{
1928	scr_page ((ev.button == Button1 ? DN : UP),	2038	scr_page ((ev.button == Button1 ? DN : UP),
1929	(TermWin.nrow	2039	(nrow
1930	* scrollbar_position (ev.y)	2040	* scrollbar_position (ev.y)
1931	/ scrollbar_size ()));	2041	/ scrollbar_size ()));
1932	}	2042	}
1933		2043
1934	break;	2044	break;
…		…
1966	#ifdef SELECTION_SCROLLING	2076	#ifdef SELECTION_SCROLLING
1967	if (sel_scroll_ev.active)	2077	if (sel_scroll_ev.active)
1968	sel_scroll_ev.stop();	2078	sel_scroll_ev.stop();
1969	#endif	2079	#endif
1970		2080
1971	if (ev.window == TermWin.vt)	2081	if (ev.window == vt)
1972	{	2082	{
1973	#if ISO_14755	2083	#if ISO_14755
1974	// 5.4	2084	// 5.4
1975	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))	2085	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1976	return;	2086	return;
…		…
2026		2136
2027	v = ev.button == Button4 ? UP : DN;	2137	v = ev.button == Button4 ? UP : DN;
2028		2138
2029	if (ev.state & ShiftMask)	2139	if (ev.state & ShiftMask)
2030	i = 1;	2140	i = 1;
2031	else if (options & Opt_mouseWheelScrollPage)	2141	else if (OPTION (Opt_mouseWheelScrollPage))
2032	i = TermWin.nrow - 1;	2142	i = nrow - 1;
2033	else	2143	else
2034	i = 5;	2144	i = 5;
2035		2145
2036	# ifdef MOUSE_SLIP_WHEELING	2146	# ifdef MOUSE_SLIP_WHEELING
2037	if (ev.state & ControlMask)	2147	if (ev.state & ControlMask)
2038	{	2148	{
2039	mouse_slip_wheel_speed += v ? -1 : 1;	2149	mouse_slip_wheel_speed += v ? -1 : 1;
2040	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;
2041	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;
2042		2152
2043	if (slip_wheel_ev.at < NOW)	2153	if (slip_wheel_ev.at < NOW)
2044	slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;	2154	slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2045		2155
2046	slip_wheel_ev.start ();	2156	slip_wheel_ev.start ();
…		…
2087	RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;	2197	RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2088	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;	2198	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2089	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;	2199	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2090	int i;	2200	int i;
2091		2201
2092	Visual* visual = display->visual;	2202	Visual *visual = display->visual;
2093		2203
2094	if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;	2204	if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2095		2205
2096	/* for convenience */	2206	/* for convenience */
2097	mask_r = visual->red_mask;	2207	mask_r = visual->red_mask;
…		…
2318	Atom atype;	2428	Atom atype;
2319	unsigned char *prop = NULL;	2429	unsigned char *prop = NULL;
2320	Window root, oldp, *list;	2430	Window root, oldp, *list;
2321	Pixmap rootpixmap = None;	2431	Pixmap rootpixmap = None;
2322	XWindowAttributes wattr, wrootattr;	2432	XWindowAttributes wattr, wrootattr;
		2433	dDisp;
2323		2434
2324	pchanged = 0;	2435	pchanged = 0;
2325		2436
2326	if (!(options & Opt_transparent))	2437	if (!OPTION (Opt_transparent))
2327	return pchanged; /* Don't try any more */	2438	return pchanged; /* Don't try any more */
2328		2439
2329	XGetWindowAttributes (display->display, display->root, &wrootattr);	2440	XGetWindowAttributes (disp, display->root, &wrootattr);
2330	rootdepth = wrootattr.depth;	2441	rootdepth = wrootattr.depth;
2331		2442
2332	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	2443	XGetWindowAttributes (disp, parent[0], &wattr);
2333		2444
2334	if (rootdepth != wattr.depth)	2445	if (rootdepth != wattr.depth)
2335	{	2446	{
2336	if (am_transparent)	2447	if (am_transparent)
2337	{	2448	{
2338	pchanged = 1;	2449	pchanged = 1;
2339	XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);	2450	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2340	am_transparent = am_pixmap_trans = 0;	2451	am_transparent = am_pixmap_trans = 0;
2341	}	2452	}
2342		2453
2343	return pchanged; /* Don't try any more */	2454	return pchanged; /* Don't try any more */
2344	}	2455	}
2345		2456
2346	/* 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. */
2347	XSync (display->display, False);	2458	XSync (disp, False);
2348		2459
2349	/*	2460	/*
2350	* Make the frame window set by the window manager have	2461	* Make the frame window set by the window manager have
2351	* the root background. Some window managers put multiple nested frame	2462	* the root background. Some window managers put multiple nested frame
2352	* 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.
2353	*/	2464	*/
2354	i = (xa[XA_XROOTPMAP_ID]	2465	i = (xa[XA_XROOTPMAP_ID]
2355	&& XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAP_ID],	2466	&& XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2356	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2467	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2357	&nitems, &bytes_after, &prop) == Success);	2468	&nitems, &bytes_after, &prop) == Success);
2358		2469
2359	if (!i || prop == NULL)	2470	if (!i || prop == NULL)
2360	i = (xa[XA_ESETROOT_PMAP_ID]	2471	i = (xa[XA_ESETROOT_PMAP_ID]
2361	&& XGetWindowProperty (display->display, display->root, xa[XA_ESETROOT_PMAP_ID],	2472	&& XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2362	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2473	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2363	&nitems, &bytes_after, &prop) == Success);	2474	&nitems, &bytes_after, &prop) == Success);
2364		2475
2365	if (!i || prop == NULL	2476	if (!i || prop == NULL
2366	#if TINTING	2477	#if TINTING
…		…
2385	Window cr;	2496	Window cr;
2386	XImage *image;	2497	XImage *image;
2387	GC gc;	2498	GC gc;
2388	XGCValues gcvalue;	2499	XGCValues gcvalue;
2389		2500
2390	XTranslateCoordinates (display->display, TermWin.parent[0], display->root,	2501	XTranslateCoordinates (disp, parent[0], display->root,
2391	0, 0, &sx, &sy, &cr);	2502	0, 0, &sx, &sy, &cr);
2392	nw = (unsigned int)szHint.width;	2503	nw = (unsigned int)szHint.width;
2393	nh = (unsigned int)szHint.height;	2504	nh = (unsigned int)szHint.height;
2394	nx = ny = 0;	2505	nx = ny = 0;
2395		2506
…		…
2405	nh += sy;	2516	nh += sy;
2406	ny = -sy;	2517	ny = -sy;
2407	sy = 0;	2518	sy = 0;
2408	}	2519	}
2409		2520
2410	MIN_IT (nw, (unsigned int) (wrootattr.width - sx));	2521	min_it (nw, (unsigned int) (wrootattr.width - sx));
2411	MIN_IT (nh, (unsigned int) (wrootattr.height - sy));	2522	min_it (nh, (unsigned int) (wrootattr.height - sy));
2412		2523
2413	XSync (display->display, False);	2524	XSync (disp, False);
2414	allowedxerror = -1;	2525	allowedxerror = -1;
2415	image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);	2526	image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2416		2527
2417	/* XXX: handle BadMatch - usually because we're outside the pixmap */	2528	/* XXX: handle BadMatch - usually because we're outside the pixmap */
2418	/* XXX: may need a delay here? */	2529	/* XXX: may need a delay here? */
2419	allowedxerror = 0;	2530	allowedxerror = 0;
2420		2531
2421	if (image == NULL)	2532	if (image == NULL)
2422	{	2533	{
2423	if (am_transparent && am_pixmap_trans)	2534	if (am_transparent && am_pixmap_trans)
2424	{	2535	{
2425	pchanged = 1;	2536	pchanged = 1;
2426	if (TermWin.pixmap != None)	2537	if (pixmap != None)
2427	{	2538	{
2428	XFreePixmap (display->display, TermWin.pixmap);	2539	XFreePixmap (disp, pixmap);
2429	TermWin.pixmap = None;	2540	pixmap = None;
2430	}	2541	}
2431	}	2542	}
2432		2543
2433	am_pixmap_trans = 0;	2544	am_pixmap_trans = 0;
2434	}	2545	}
2435	else	2546	else
2436	{	2547	{
2437	if (TermWin.pixmap != None)	2548	if (pixmap != None)
2438	XFreePixmap (display->display, TermWin.pixmap);	2549	XFreePixmap (disp, pixmap);
2439		2550
2440	#if TINTING	2551	#if TINTING
2441	if (ISSET_PIXCOLOR (Color_tint))	2552	if (ISSET_PIXCOLOR (Color_tint))
2442	{	2553	{
2443	unsigned short rm, gm, bm;	2554	unsigned short rm, gm, bm;
…		…
2447		2558
2448	ShadeXImage (display, image, shade, rm, gm, bm);	2559	ShadeXImage (display, image, shade, rm, gm, bm);
2449	}	2560	}
2450	#endif	2561	#endif
2451		2562
2452	TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,	2563	pixmap = XCreatePixmap (disp, vt,
2453	szHint.width, szHint.height, image->depth);	2564	szHint.width, szHint.height, image->depth);
2454	gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);	2565	gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2455	XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,	2566	XPutImage (disp, pixmap, gc, image, 0, 0,
2456	nx, ny, image->width, image->height);	2567	nx, ny, image->width, image->height);
2457	XFreeGC (display->display, gc);	2568	XFreeGC (disp, gc);
2458	XDestroyImage (image);	2569	XDestroyImage (image);
2459	XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap);	2570	XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2460	XClearWindow (display->display, TermWin.parent[0]);	2571	XClearWindow (disp, parent[0]);
2461		2572
2462	if (!am_transparent || !am_pixmap_trans)	2573	if (!am_transparent || !am_pixmap_trans)
2463	pchanged = 1;	2574	pchanged = 1;
2464		2575
2465	am_transparent = am_pixmap_trans = 1;	2576	am_transparent = am_pixmap_trans = 1;
2466	}	2577	}
2467	}	2578	}
2468		2579
2469	if (am_pixmap_trans)	2580	if (am_pixmap_trans)
2470	XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);	2581	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2471	else	2582	else
2472	{	2583	{
2473	unsigned int n;	2584	unsigned int n;
2474	/*	2585	/*
2475	* InheritPixmap transparency	2586	* InheritPixmap transparency
2476	*/	2587	*/
2477	for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)	2588	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2478	{	2589	{
2479	oldp = TermWin.parent[i];	2590	oldp = parent[i];
2480	XQueryTree (display->display, TermWin.parent[i - 1], &root,	2591	XQueryTree (disp, parent[i - 1], &root,
2481	&TermWin.parent[i], &list, &n);	2592	&parent[i], &list, &n);
2482	XFree (list);	2593	XFree (list);
2483		2594
2484	if (TermWin.parent[i] == display->root)	2595	if (parent[i] == display->root)
2485	{	2596	{
2486	if (oldp != None)	2597	if (oldp != None)
2487	pchanged = 1;	2598	pchanged = 1;
2488		2599
2489	break;	2600	break;
2490	}	2601	}
2491		2602
2492	if (oldp != TermWin.parent[i])	2603	if (oldp != parent[i])
2493	pchanged = 1;	2604	pchanged = 1;
2494	}	2605	}
2495		2606
2496	n = 0;	2607	n = 0;
2497		2608
2498	if (pchanged)	2609	if (pchanged)
2499	{	2610	{
2500	for (; n < (unsigned int)i; n++)	2611	for (; n < (unsigned int)i; n++)
2501	{	2612	{
2502	XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);	2613	XGetWindowAttributes (disp, parent[n], &wattr);
2503	if (wattr.depth != rootdepth || wattr.c_class == InputOnly)	2614	if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2504	{	2615	{
2505	n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;	2616	n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2506	break;	2617	break;
2507	}	2618	}
2508	}	2619	}
2509	}	2620	}
2510		2621
2511	if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))	2622	if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2512	{	2623	{
2513	XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]);	2624	XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2514	XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);	2625	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2515	am_transparent = 0;	2626	am_transparent = 0;
2516	/* XXX: also turn off Opt_transparent? */	2627	/* XXX: also turn off Opt_transparent? */
2517	}	2628	}
2518	else	2629	else
2519	{	2630	{
…		…
2522	* needed for fvwm2.2.2 (and before?) */	2633	* needed for fvwm2.2.2 (and before?) */
2523	sleep (1);	2634	sleep (1);
2524	#endif	2635	#endif
2525	for (n = 0; n < (unsigned int)i; n++)	2636	for (n = 0; n < (unsigned int)i; n++)
2526	{	2637	{
2527	XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);	2638	XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2528	XClearWindow (display->display, TermWin.parent[n]);	2639	XClearWindow (disp, parent[n]);
2529	}	2640	}
2530		2641
2531	XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);	2642	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2532	am_transparent = 1;	2643	am_transparent = 1;
2533	}	2644	}
2534		2645
2535	for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)	2646	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2536	TermWin.parent[i] = None;	2647	parent[i] = None;
2537	}	2648	}
2538		2649
2539	if (scrollBar.win)	2650	if (scrollBar.win)
2540	{	2651	{
2541	XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);	2652	XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2542	scrollBar.setIdle ();	2653	scrollBar.setIdle ();
2543	scrollbar_show (0);	2654	scrollbar_show (0);
2544	}	2655	}
2545		2656
2546	if (am_transparent)	2657	if (am_transparent)
…		…
2584	// some window managers resize the window early, and these programs	2695	// some window managers resize the window early, and these programs
2585	// then sometimes get the size wrong.	2696	// then sometimes get the size wrong.
2586	// unfortunately other programs are even more buggy and dislike	2697	// unfortunately other programs are even more buggy and dislike
2587	// 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
2588	// resized.	2699	// resized.
2589	if (seen_resize)	2700	if (seen_resize && cmd_pid)
2590	kill (-cmd_pid, SIGWINCH);	2701	kill (-cmd_pid, SIGWINCH);
2591	}	2702	}
2592		2703
2593	/* Read a text string from the input buffer */	2704	/* Read a text string from the input buffer */
2594	unicode_t buf[UBUFSIZ];	2705	unicode_t buf[UBUFSIZ];
2595	bool refreshnow = false;	2706	bool refreshnow = false;
2596	int nlines = 0;	2707	int nlines = 0;
2597	unicode_t *str = buf;	2708	unicode_t *str = buf;
		2709	unicode_t *eol = str + min (ncol, UBUFSIZ);
2598		2710
2599	for (;;)	2711	for (;;)
2600	{	2712	{
2601	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))
2602	break;	2714	break;
2603		2715
2604	*str++ = ch;	2716	*str++ = ch;
2605		2717
2606	if (ch == C0_LF)	2718	if (ch == C0_LF || str >= eol)
2607	{	2719	{
		2720	if (ch == C0_LF)
2608	nlines++;	2721	nlines++;
		2722
2609	refresh_count++;	2723	refresh_count++;
2610		2724
2611	if (!(options & Opt_jumpScroll)	2725	if (!OPTION (Opt_jumpScroll)
2612	|| (refresh_count >= refresh_limit * (TermWin.nrow - 1)))	2726	|| (refresh_count >= refresh_limit * (nrow - 1)))
2613	{	2727	{
2614	refreshnow = true;	2728	refreshnow = true;
		2729	refresh_count = 0;
2615	ch = NOCHAR;	2730	ch = NOCHAR;
2616	break;	2731	break;
2617	}	2732	}
2618		2733
2619	// scr_add_lines only works for nlines <= TermWin.nrow - 1.	2734	// scr_add_lines only works for nlines <= nrow - 1.
2620	if (nlines >= TermWin.nrow - 1)	2735	if (nlines >= nrow - 1)
2621	{	2736	{
2622	scr_add_lines (buf, nlines, str - buf);	2737	scr_add_lines (buf, nlines, str - buf);
2623	nlines = 0;	2738	nlines = 0;
2624	str = buf;	2739	str = buf;
		2740	eol = str + min (ncol, UBUFSIZ);
2625	}	2741	}
2626	}
2627		2742
2628	if (str >= buf + UBUFSIZ)	2743	if (str >= eol)
2629	{	2744	{
		2745	if (eol >= buf + UBUFSIZ)
		2746	{
2630	ch = NOCHAR;	2747	ch = NOCHAR;
2631	break;	2748	break;
		2749	}
		2750	else
		2751	eol = min (eol + ncol, buf + UBUFSIZ);
		2752	}
		2753
2632	}	2754	}
2633		2755
2634	seq_begin = cmdbuf_ptr;	2756	seq_begin = cmdbuf_ptr;
2635	ch = next_char ();	2757	ch = next_char ();
2636	}	2758	}
…		…
2643	* the number of pages between refreshes is refresh_limit, which	2765	* the number of pages between refreshes is refresh_limit, which
2644	* is incremented here because we must be doing flat-out scrolling.	2766	* is incremented here because we must be doing flat-out scrolling.
2645	*/	2767	*/
2646	if (refreshnow)	2768	if (refreshnow)
2647	{	2769	{
2648	if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)	2770	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2649	refresh_limit++;	2771	refresh_limit++;
2650	else	2772	else
2651	{	2773	{
2652	flag = true;	2774	flag = true;
2653	scr_refresh (refresh_type);	2775	scr_refresh (refresh_type);
		2776	flush_ev.stop ();
2654	}	2777	}
2655	}	2778	}
2656		2779
2657	}	2780	}
2658	else	2781	else
…		…
2707	if (len == (size_t)-1)	2830	if (len == (size_t)-1)
2708	return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through	2831	return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2709		2832
2710	// assume wchar == unicode	2833	// assume wchar == unicode
2711	cmdbuf_ptr += len;	2834	cmdbuf_ptr += len;
2712	return wc;	2835	return wc & UNICODE_MASK;
2713	}	2836	}
2714		2837
2715	return NOCHAR;	2838	return NOCHAR;
2716	}	2839	}
2717		2840
…		…
3180	{	3303	{
3181	switch (priv)	3304	switch (priv)
3182	{	3305	{
3183	case '>':	3306	case '>':
3184	if (ch == CSI_DA) /* secondary device attributes */	3307	if (ch == CSI_DA) /* secondary device attributes */
3185	tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING);	3308	tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
3186	break;	3309	break;
3187	case '?':	3310	case '?':
3188	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')	3311	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3189	process_terminal_mode (ch, priv, nargs, arg);	3312	process_terminal_mode (ch, priv, nargs, arg);
3190	break;	3313	break;
…		…
3295		3418
3296	case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */	3419	case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3297	arg[0] = -arg[0];	3420	arg[0] = -arg[0];
3298	/* FALLTHROUGH */	3421	/* FALLTHROUGH */
3299	case CSI_SU: /* 8.3.148: (1) SCROLL UP */	3422	case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3300	scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);	3423	scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3301	break;	3424	break;
3302		3425
3303	case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */	3426	case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3304	tt_write ((const unsigned char *)VT100_ANS,	3427	tt_write ((const unsigned char *)VT100_ANS,
3305	(unsigned int) (sizeof (VT100_ANS) - 1));	3428	(unsigned int) (sizeof (VT100_ANS) - 1));
…		…
3317	break;	3440	break;
3318	case 6: /* CPR requested */	3441	case 6: /* CPR requested */
3319	scr_report_position ();	3442	scr_report_position ();
3320	break;	3443	break;
3321	case 7: /* unofficial extension */	3444	case 7: /* unofficial extension */
3322	if (options & Opt_insecure)	3445	if (OPTION (Opt_insecure))
3323	tt_printf ("%-.250s\012", rs[Rs_display_name]);	3446	tt_printf ("%-.250s\012", rs[Rs_display_name]);
3324	break;	3447	break;
3325	case 8: /* unofficial extension */	3448	case 8: /* unofficial extension */
3326	process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);	3449	process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3327	break;	3450	break;
…		…
3419	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3542	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3420	{	3543	{
3421	int x, y;	3544	int x, y;
3422	XWindowAttributes wattr;	3545	XWindowAttributes wattr;
3423	Window wdummy;	3546	Window wdummy;
		3547	dDisp;
3424		3548
3425	if (nargs == 0)	3549	if (nargs == 0)
3426	return;	3550	return;
3427		3551
3428	switch (args[0])	3552	switch (args[0])
3429	{	3553	{
3430	/*	3554	/*
3431	* commands	3555	* commands
3432	*/	3556	*/
3433	case 1: /* deiconify window */	3557	case 1: /* deiconify window */
3434	XMapWindow (display->display, TermWin.parent[0]);	3558	XMapWindow (disp, parent[0]);
3435	break;	3559	break;
3436	case 2: /* iconify window */	3560	case 2: /* iconify window */
3437	XIconifyWindow (display->display, TermWin.parent[0],	3561	XIconifyWindow (disp, parent[0], display->screen);
3438	DefaultScreen (display->display));
3439	break;	3562	break;
3440	case 3: /* set position (pixels) */	3563	case 3: /* set position (pixels) */
3441	XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]);	3564	XMoveWindow (disp, parent[0], args[1], args[2]);
3442	break;	3565	break;
3443	case 4: /* set size (pixels) */	3566	case 4: /* set size (pixels) */
3444	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3567	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3445	break;	3568	break;
3446	case 5: /* raise window */	3569	case 5: /* raise window */
3447	XRaiseWindow (display->display, TermWin.parent[0]);	3570	XRaiseWindow (disp, parent[0]);
3448	break;	3571	break;
3449	case 6: /* lower window */	3572	case 6: /* lower window */
3450	XLowerWindow (display->display, TermWin.parent[0]);	3573	XLowerWindow (disp, parent[0]);
3451	break;	3574	break;
3452	case 7: /* refresh window */	3575	case 7: /* refresh window */
3453	scr_touch (true);	3576	scr_touch (true);
3454	break;	3577	break;
3455	case 8: /* set size (chars) */	3578	case 8: /* set size (chars) */
3456	set_widthheight ((unsigned int) (args[2] * TermWin.fwidth),	3579	set_widthheight ((unsigned int) (args[2] * fwidth),
3457	(unsigned int) (args[1] * TermWin.fheight));	3580	(unsigned int) (args[1] * fheight));
3458	break;	3581	break;
3459		3582
3460	//case 9: NYI, TODO, restore maximized window or maximize window	3583	//case 9: NYI, TODO, restore maximized window or maximize window
3461	default:	3584	default:
3462	if (args[0] >= 24) /* set height (chars) */	3585	if (args[0] >= 24) /* set height (chars) */
3463	set_widthheight ((unsigned int)TermWin.width,	3586	set_widthheight ((unsigned int)width,
3464	(unsigned int) (args[1] * TermWin.fheight));	3587	(unsigned int) (args[1] * fheight));
3465	break;	3588	break;
3466		3589
3467		3590
3468	/*	3591	/*
3469	* reports - some output format copied from XTerm	3592	* reports - some output format copied from XTerm
3470	*/	3593	*/
3471	case 11: /* report window state */	3594	case 11: /* report window state */
3472	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	3595	XGetWindowAttributes (disp, parent[0], &wattr);
3473	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3596	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3474	break;	3597	break;
3475	case 13: /* report window position */	3598	case 13: /* report window position */
3476	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	3599	XGetWindowAttributes (disp, parent[0], &wattr);
3477	XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root,	3600	XTranslateCoordinates (disp, parent[0], wattr.root,
3478	-wattr.border_width, -wattr.border_width,	3601	-wattr.border_width, -wattr.border_width,
3479	&x, &y, &wdummy);	3602	&x, &y, &wdummy);
3480	tt_printf ("\033[3;%d;%dt", x, y);	3603	tt_printf ("\033[3;%d;%dt", x, y);
3481	break;	3604	break;
3482	case 14: /* report window size (pixels) */	3605	case 14: /* report window size (pixels) */
3483	XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);	3606	XGetWindowAttributes (disp, parent[0], &wattr);
3484	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3607	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3485	break;	3608	break;
3486	case 18: /* report text area size (chars) */	3609	case 18: /* report text area size (chars) */
3487	tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);	3610	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3488	break;	3611	break;
3489	case 19: /* report window size (chars) */	3612	case 19: /* report window size (chars) */
3490	tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);	3613	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3491	break;	3614	break;
3492	case 20: /* report icon label */	3615	case 20: /* report icon label */
3493	{	3616	{
3494	char *s;	3617	char *s;
3495	XGetIconName (display->display, TermWin.parent[0], &s);	3618	XGetIconName (disp, parent[0], &s);
3496	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 */
3497	XFree (s);	3620	XFree (s);
3498	}	3621	}
3499	break;	3622	break;
3500	case 21: /* report window title */	3623	case 21: /* report window title */
3501	{	3624	{
3502	char *s;	3625	char *s;
3503	XFetchName (display->display, TermWin.parent[0], &s);	3626	XFetchName (disp, parent[0], &s);
3504	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 */
3505	XFree (s);	3628	XFree (s);
3506	}	3629	}
3507	break;	3630	break;
3508	}	3631	}
3509	}	3632	}
…		…
3541	else if (ch < 0x20)	3664	else if (ch < 0x20)
3542	return NULL; /* other control character - exit */	3665	return NULL; /* other control character - exit */
3543		3666
3544	seen_esc = false;	3667	seen_esc = false;
3545		3668
3546	if (n >= sizeof (string) - 1)	3669	if (n >= STRING_MAX - 1)
3547	// stop at some sane length	3670	// stop at some sane length
3548	return NULL;	3671	return NULL;
3549		3672
3550	if (ch == C0_SYN)	3673	if (ch == C0_SYN)
3551	string[n++] = cmd_get8 ();	3674	string[n++] = cmd_get8 ();
…		…
3619	set_window_color (color, str);	3742	set_window_color (color, str);
3620	}	3743	}
3621		3744
3622	/*	3745	/*
3623	* XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)	3746	* XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3624	* 0 = change iconName/title
3625	* 1 = change iconName
3626	* 2 = change title
3627	* 4 = change color
3628	* 10 = change fg color
3629	* 11 = change bg color
3630	* 12 = change text color
3631	* 13 = change mouse foreground color
3632	* 17 = change highlight character colour
3633	* 18 = change bold character color
3634	* 19 = change underlined character color
3635	* 46 = change logfile (not implemented)
3636	* 50 = change font
3637	*
3638	* rxvt extensions:
3639	* 20 = bg pixmap
3640	* 39 = change default fg color
3641	* 49 = change default bg color
3642	* 55 = dump scrollback buffer and all of screen
3643	* 701 = change locale
3644	* 702 = find font
3645	* 703 = menu
3646	*/	3747	*/
3647	void	3748	void
3648	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)
3649	{	3750	{
3650	int changed = 0;	3751	int changed = 0;
3651	int color;	3752	int color;
3652	char *buf, *name;	3753	char *buf, *name;
3653	bool query = str[0] == '?' && !str[1];	3754	bool query = str[0] == '?' && !str[1];
3654	int saveop = op;	3755	int saveop = op;
		3756	dDisp;
3655		3757
3656	assert (str != NULL);	3758	assert (str != NULL);
3657	switch (op)	3759	switch (op)
3658	{	3760	{
3659	case XTerm_name:	3761	case XTerm_name:
…		…
3675	unsigned long bytes_after;	3777	unsigned long bytes_after;
3676	unsigned char *value = 0;	3778	unsigned char *value = 0;
3677	const char *str = "";	3779	const char *str = "";
3678		3780
3679	if (prop	3781	if (prop
3680	&& XGetWindowProperty (display->display, TermWin.parent[0],	3782	&& XGetWindowProperty (disp, parent[0],
3681	prop, 0, 1<<16, 0, AnyPropertyType,	3783	prop, 0, 1<<16, 0, AnyPropertyType,
3682	&actual_type, &actual_format,	3784	&actual_type, &actual_format,
3683	&nitems, &bytes_after, &value) == Success	3785	&nitems, &bytes_after, &value) == Success
3684	&& actual_type != None	3786	&& actual_type != None
3685	&& actual_format == 8)	3787	&& actual_format == 8)
…		…
3697	{	3799	{
3698	*eq = 0;	3800	*eq = 0;
3699	set_utf8_property (display->atom (str), eq + 1);	3801	set_utf8_property (display->atom (str), eq + 1);
3700	}	3802	}
3701	else	3803	else
3702	XDeleteProperty (display->display, TermWin.parent[0],	3804	XDeleteProperty (disp, parent[0],
3703	display->atom (str));	3805	display->atom (str));
3704	}	3806	}
3705	break;	3807	break;
3706		3808
3707	case XTerm_Color:	3809	case XTerm_Color:
…		…
3748	break;	3850	break;
3749	#ifndef NO_BOLD_UNDERLINE_REVERSE	3851	#ifndef NO_BOLD_UNDERLINE_REVERSE
3750	case XTerm_Color_BD:	3852	case XTerm_Color_BD:
3751	process_color_seq (XTerm_Color_BD, Color_BD, str, resp);	3853	process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3752	break;	3854	break;
3753	case XTerm_Color_IT:
3754	process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3755	break;
3756	case XTerm_Color_UL:	3855	case XTerm_Color_UL:
3757	process_color_seq (XTerm_Color_UL, Color_UL, str, resp);	3856	process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3758	break;	3857	break;
3759	case XTerm_Color_RV:	3858	case XTerm_Color_RV:
3760	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3859	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3761	break;	3860	break;
		3861	case URxvt_Color_IT:
		3862	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
		3863	break;
3762	#endif	3864	#endif
3763	#if TRANSPARENT && TINTING	3865	#if TRANSPARENT && TINTING
3764	case XTerm_Color_tint:	3866	case URxvt_Color_tint:
3765	process_color_seq (XTerm_Color_tint, Color_tint, str, resp);	3867	process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3766	check_our_parents ();	3868	check_our_parents ();
3767	if (am_transparent)	3869	if (am_transparent)
3768	want_full_refresh = want_refresh = 1;	3870	want_full_refresh = want_refresh = 1;
3769	break;	3871	break;
3770	#endif	3872	#endif
…		…
3782	{	3884	{
3783	str++;	3885	str++;
3784	#if XPM_BACKGROUND	3886	#if XPM_BACKGROUND
3785	changed += scale_pixmap (str);	3887	changed += scale_pixmap (str);
3786	#endif	3888	#endif
3787
3788	}	3889	}
		3890
3789	if (changed)	3891	if (changed)
3790	{	3892	{
3791	#ifdef XPM_BACKGROUND	3893	#ifdef XPM_BACKGROUND
3792	resize_pixmap ();	3894	resize_pixmap ();
3793	#endif	3895	#endif
…		…
3804		3906
3805	case XTerm_logfile:	3907	case XTerm_logfile:
3806	// TODO, when secure mode?	3908	// TODO, when secure mode?
3807	break;	3909	break;
3808		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
3809	case XTerm_font:	3929	case XTerm_font:
3810	op = URxvt_font;	3930	op = URxvt_font;
3811	case URxvt_font:	3931	case URxvt_font:
3812	#if ENABLE_STYLES	3932	#if ENABLE_STYLES
3813	case URxvt_boldFont:	3933	case URxvt_boldFont:
3814	case URxvt_italicFont:	3934	case URxvt_italicFont:
3815	case URxvt_boldItalicFont:	3935	case URxvt_boldItalicFont:
3816	#endif	3936	#endif
3817	if (query)	3937	if (query)
3818	tt_printf ("\33]%d;%-.250s%c", saveop,	3938	tt_printf ("\33]%d;%-.250s%c", saveop,
3819	(options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc	3939	OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3820	? TermWin.fontset[op - URxvt_font]->fontdesc : "",	3940	? fontset[op - URxvt_font]->fontdesc : "",
3821	resp);	3941	resp);
3822	else	3942	else
3823	{	3943	{
3824	const char *&res = rs[Rs_font + (op - URxvt_font)];	3944	const char *&res = rs[Rs_font + (op - URxvt_font)];
3825		3945
…		…
3828	set_fonts ();	3948	set_fonts ();
3829	}	3949	}
3830	break;	3950	break;
3831		3951
3832	#if ENABLE_FRILLS	3952	#if ENABLE_FRILLS
3833	case XTerm_locale:	3953	case URxvt_locale:
3834	if (query)	3954	if (query)
3835	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);
3836	else	3956	else
3837	{	3957	{
3838	set_locale (str);	3958	set_locale (str);
3839	# ifdef USE_XIM	3959	pty.set_utf8_mode (enc_utf8);
3840	im_cb ();	3960	init_xlocale ();
3841	# endif
3842	}	3961	}
3843	break;	3962	break;
3844	#endif
3845		3963
3846	#ifdef MENUBAR	3964	case URxvt_view_up:
3847	case XTerm_Menu:	3965	case URxvt_view_down:
3848	if (options & Opt_insecure)	3966	int lines = atoi (str);
3849	menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked	3967
		3968	if (lines)
		3969	scr_page (op == URxvt_view_up ? UP : DN, lines);
		3970	else
		3971	scr_erase_savelines ();
		3972
3850	break;	3973	break;
3851	#endif	3974	#endif
3852	#if 0	3975
3853	case XTerm_dumpscreen: /* no error notices */	3976	#if ENABLE_PERL
3854	{	3977	case URxvt_perl:
3855	int fd;	3978	if (PERL_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END)))
3856	if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)	3979	; // no responses yet
3857	{
3858	scr_dump (fd);
3859	close (fd);
3860	}
3861	}
3862	break;	3980	break;
		3981
3863	#endif	3982	#endif
		3983
3864	}	3984	}
3865	}	3985	}
3866	/*----------------------------------------------------------------------*/	3986	/*----------------------------------------------------------------------*/
3867		3987
3868	/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */	3988	/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
…		…
3975	}	4095	}
3976		4096
3977	/* extra handling for values with state unkept */	4097	/* extra handling for values with state unkept */
3978	switch (arg[i])	4098	switch (arg[i])
3979	{	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
3980	case 1048: /* alternative cursor save */	4110	case 1048: /* alternative cursor save */
3981	case 1049:	4111	case 1049:
3982	if (options & Opt_secondaryScreen)	4112	if (OPTION (Opt_secondaryScreen))
3983	if (mode == 0)	4113	if (mode == 0)
3984	scr_cursor (RESTORE);	4114	scr_cursor (RESTORE);
3985	else if (mode == 1)	4115	else if (mode == 1)
3986	scr_cursor (SAVE);	4116	scr_cursor (SAVE);
3987	break;	4117	break;
…		…
3999	*/	4129	*/
4000	PrivMode (1, PrivMode_vt52);	4130	PrivMode (1, PrivMode_vt52);
4001	break;	4131	break;
4002	case 3: /* 80/132 */	4132	case 3: /* 80/132 */
4003	if (priv_modes & PrivMode_132OK)	4133	if (priv_modes & PrivMode_132OK)
4004	set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);	4134	set_widthheight (((state ? 132 : 80) * fwidth), height);
4005	break;	4135	break;
4006	case 4: /* smooth scrolling */	4136	case 4: /* smooth scrolling */
4007	if (state)	4137	if (!state)
4008	options &= ~Opt_jumpScroll;	4138	SET_OPTION (Opt_jumpScroll);
4009	else	4139	else
4010	options |= Opt_jumpScroll;	4140	CLR_OPTION (Opt_jumpScroll);
4011	break;	4141	break;
4012	case 5: /* reverse video */	4142	case 5: /* reverse video */
4013	scr_rvideo_mode (state);	4143	scr_rvideo_mode (state);
4014	break;	4144	break;
4015	case 6: /* relative/absolute origins */	4145	case 6: /* relative/absolute origins */
…		…
4056	#if 0	4186	#if 0
4057	case 1001:	4187	case 1001:
4058	break; /* X11 mouse highlighting */	4188	break; /* X11 mouse highlighting */
4059	#endif	4189	#endif
4060	case 1010: /* scroll to bottom on TTY output inhibit */	4190	case 1010: /* scroll to bottom on TTY output inhibit */
4061	if (state)	4191	if (!state)
4062	options &= ~Opt_scrollTtyOutput;	4192	SET_OPTION (Opt_scrollTtyOutput);
4063	else	4193	else
4064	options |= Opt_scrollTtyOutput;	4194	CLR_OPTION (Opt_scrollTtyOutput);
4065	break;	4195	break;
4066	case 1011: /* scroll to bottom on key press */	4196	case 1011: /* scroll to bottom on key press */
4067	if (state)	4197	if (state)
4068	options |= Opt_scrollTtyKeypress;	4198	SET_OPTION (Opt_scrollTtyKeypress);
4069	else	4199	else
4070	options &= ~Opt_scrollTtyKeypress;	4200	CLR_OPTION (Opt_scrollTtyKeypress);
4071	break;	4201	break;
4072	case 1047: /* secondary screen w/ clearing last */	4202	case 1047: /* secondary screen w/ clearing last */
4073	if (options & Opt_secondaryScreen)	4203	if (OPTION (Opt_secondaryScreen))
4074	if (current_screen != PRIMARY)	4204	if (current_screen != PRIMARY)
4075	scr_erase_screen (2);	4205	scr_erase_screen (2);
4076	scr_change_screen (state);	4206	scr_change_screen (state);
4077	break;	4207	break;
4078	case 1049: /* secondary screen w/ clearing first */	4208	case 1049: /* secondary screen w/ clearing first */
4079	scr_change_screen (state);	4209	scr_change_screen (state);
4080	if (options & Opt_secondaryScreen)	4210	if (OPTION (Opt_secondaryScreen))
4081	if (current_screen != PRIMARY)	4211	if (current_screen != PRIMARY)
4082	scr_erase_screen (2);	4212	scr_erase_screen (2);
4083	break;	4213	break;
4084	default:	4214	default:
4085	break;	4215	break;
…		…
4235	case 106:	4365	case 106:
4236	case 107:	4366	case 107:
4237	scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);	4367	scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4238	break;	4368	break;
4239	#endif	4369	#endif
4240
4241	}	4370	}
4242	}	4371	}
4243	}	4372	}
4244	/*}}} */	4373	/*}}} */
4245		4374
…		…
4326	}	4455	}
4327		4456
4328	memmove (v_buffer, v_buffer + written, v_buflen);	4457	memmove (v_buffer, v_buffer + written, v_buflen);
4329	}	4458	}
4330	else if (written != -1 || (errno != EAGAIN && errno != EINTR))	4459	else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4331	// original code just ignores this...	4460	pty_ev.set (EVENT_READ);
4332	destroy ();
4333	}	4461	}
4334		4462
4335	/*----------------------- end-of-file (C source) -----------------------*/	4463	/*----------------------- end-of-file (C source) -----------------------*/
4336		4464

Diff Legend

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