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.194 by root, Mon Feb 14 10:44:50 2005 UTC vs.
Revision 1.239 by root, Fri Jan 6 03:02: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"
		53
		54	#if HAVE_SCHED_YIELD
		55	#undef HAVE_SCHED_YIELD // disabled for the time being
		56	//# include <sched.h>
		57	#endif
52		58
53	#ifdef KEYSYM_RESOURCE	59	#ifdef KEYSYM_RESOURCE
54	# include "keyboard.h"	60	# include "keyboard.h"
55	#endif	61	#endif
56		62
…		…
117	XK_Escape, 0x238b,	123	XK_Escape, 0x238b,
118	XK_Undo, 0x238c,	124	XK_Undo, 0x238c,
119	XK_Print, 0x2399,	125	XK_Print, 0x2399,
120		126
121	XK_space, 0x2423,	127	XK_space, 0x2423,
		128
		129	#ifdef XK_KP_Begin
		130	XK_KP_Prior, 0x21de,
		131	XK_KP_Next, 0x21df,
		132	XK_KP_Begin, 0x2320,
		133	XK_KP_Insert, 0x2380,
		134	XK_KP_Delete, 0x2326,
122	XK_KP_Space, 0x2422,	135	XK_KP_Space, 0x2422,
		136	#endif
123	0,	137	0,
124	};	138	};
125		139
126	void	140	void
127	rxvt_term::iso14755_54 (int x, int y)	141	rxvt_term::iso14755_54 (int x, int y)
128	{	142	{
129	x = Pixel2Col (x);	143	x = Pixel2Col (x);
130	y = Pixel2Row (y);	144	y = Pixel2Row (y);
131		145
132	if (x < 0 || x >= TermWin.ncol	146	if (!IN_RANGE_EXC (x, 0, ncol)
133	|| y < 0 || y >= TermWin.nrow)	147	|| !IN_RANGE_EXC (y, 0, nrow))
134	return;	148	return;
135		149
136	for (;;)	150	for (;;)
137	{	151	{
138	text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x];	152	const line_t &l = ROW(y - view_start);
		153
		154	text_t t = l.t[x];
139		155
140	if (t != NOCHAR || !x)	156	if (t != NOCHAR || !x)
141	{	157	{
142	iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x],	158	iso14755_51 (l.t[x], l.r[x], x, y);
143	screen.rend[y + TermWin.saveLines - TermWin.view_start][x]);
144	iso14755buf = ISO_14755_54;	159	iso14755buf = ISO_14755_54;
145	break;	160	break;
146	}	161	}
147		162
148	x--;	163	x--;
149	}	164	}
150
151	}	165	}
152	#endif
153		166
154	#if ENABLE_OVERLAY
155	void	167	void
156	rxvt_term::iso14755_51 (unicode_t ch, rend_t r)	168	rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
157	{	169	{
158	rxvt_fontset *fs = FONTSET (r);	170	rxvt_fontset *fs = FONTSET (r);
159	rxvt_font *f = (*fs)[fs->find_font (ch)];	171	rxvt_font *f = (*fs)[fs->find_font (ch)];
160	wchar_t *chr, *alloc, ch2;	172	wchar_t *chr, *alloc, ch2, *fname;
161	int len;	173	int len;
162		174
		175	fname = rxvt_utf8towcs (f->name);
		176
163	#if ENABLE_COMBINING	177	# if ENABLE_COMBINING
164	if (IS_COMPOSE (ch))	178	if (IS_COMPOSE (ch))
165	{	179	{
166	len = rxvt_composite.expand (ch, 0);	180	len = rxvt_composite.expand (ch, 0);
167	alloc = chr = new wchar_t[len];	181	alloc = chr = new wchar_t[len];
168	rxvt_composite.expand (ch, chr);	182	rxvt_composite.expand (ch, chr);
169	}	183	}
170	else	184	else
171	#endif	185	# endif
172	{	186	{
173	ch2 = ch;	187	ch2 = ch;
174		188
175	alloc = 0;	189	alloc = 0;
176	chr = &ch2;	190	chr = &ch2;
177	len = 1;	191	len = 1;
178	}	192	}
179		193
180	int width = strlen (f->name);	194	char attr[80]; // plenty
181		195
182	scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1);	196	sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
		197	(int)r,
		198	fgcolor_of (r), bgcolor_of (r),
		199	r & RS_Bold ? " bold" : "",
		200	r & RS_Italic ? " italic" : "",
		201	r & RS_Blink ? " blink" : "",
		202	r & RS_RVid ? " rvid" : "",
		203	r & RS_Uline ? " uline" : "",
		204	r & RS_Careful ? " careful" : "");
		205
		206	int width = wcswidth (fname, wcslen (fname));
		207
		208	max_it (width, 8+5); // for char + hey
		209	max_it (width, strlen (attr));
		210
		211	if (y >= 0)
		212	{
		213	y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
		214	x = 0;
		215	}
		216
		217	scr_overlay_new (x, y, width, len + 2);
183		218
184	r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));	219	r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
185		220
186	for (int y = 0; y < len; y++)	221	for (int y = 0; y < len; y++)
187	{	222	{
…		…
190	ch = *chr++;	225	ch = *chr++;
191		226
192	sprintf (buf, "%8x", ch);	227	sprintf (buf, "%8x", ch);
193	scr_overlay_set (0, y, buf);	228	scr_overlay_set (0, y, buf);
194	scr_overlay_set (9, y, '=');	229	scr_overlay_set (9, y, '=');
195	#if !UNICODE3	230	# if !UNICODE3
196	if (ch >= 0x10000)	231	if (ch >= 0x10000)
197	ch = 0xfffd;	232	ch = 0xfffd;
198	#endif	233	# endif
199	scr_overlay_set (11, y, ch, r);	234	scr_overlay_set (11, y, ch, r);
200	scr_overlay_set (12, y, NOCHAR, r);	235	scr_overlay_set (12, y, NOCHAR, r);
201	}	236	}
202		237
		238	scr_overlay_set (0, len , attr);
203	scr_overlay_set (0, len, f->name);	239	scr_overlay_set (0, len + 1, fname);
204		240
		241	free (fname);
		242
205	#if ENABLE_COMBINING	243	# if ENABLE_COMBINING
206	if (alloc)	244	if (alloc)
207	delete [] alloc;	245	delete [] alloc;
208	#endif	246	# endif
209	}	247	}
210	#endif	248	#endif
211		249
212	void	250	void
213	rxvt_term::commit_iso14755 ()	251	rxvt_term::commit_iso14755 ()
…		…
230	mb[0] = ch[0];	268	mb[0] = ch[0];
231	len = 1;	269	len = 1;
232	}	270	}
233		271
234	if (len > 0)	272	if (len > 0)
235	tt_write ((unsigned char *)mb, len);	273	tt_write (mb, len);
236	else	274	else
237	scr_bell ();	275	scr_bell ();
238	}	276	}
239		277
240	iso14755buf = 0;	278	iso14755buf = 0;
…		…
268	KeySym keysym;	306	KeySym keysym;
269	#ifdef DEBUG_CMD	307	#ifdef DEBUG_CMD
270	static int debug_key = 1; /* accessible by a debugger only */	308	static int debug_key = 1; /* accessible by a debugger only */
271	#endif	309	#endif
272	int valid_keysym;	310	int valid_keysym;
273	unsigned char kbuf[KBUFSZ];	311	char kbuf[KBUFSZ];
274		312
275	/*	313	/*
276	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an	314	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
277	* escape sequence to toggle the Keypad.	315	* escape sequence to toggle the Keypad.
278	*	316	*
279	* Always permit `shift' to override the current setting	317	* Always permit `shift' to override the current setting
280	*/	318	*/
281	shft = (ev.state & ShiftMask);	319	shft = ev.state & ShiftMask;
282	ctrl = (ev.state & ControlMask);	320	ctrl = ev.state & ControlMask;
283	meta = (ev.state & ModMetaMask);	321	meta = ev.state & ModMetaMask;
284		322
285	if (numlock_state || (ev.state & ModNumLockMask))	323	if (numlock_state || (ev.state & ModNumLockMask))
286	{	324	{
287	numlock_state = (ev.state & ModNumLockMask);	325	numlock_state = (ev.state & ModNumLockMask);
288	PrivMode ((!numlock_state), PrivMode_aplKP);	326	PrivMode ((!numlock_state), PrivMode_aplKP);
…		…
296	Status status_return;	334	Status status_return;
297		335
298	#if 0	336	#if 0
299	#ifdef X_HAVE_UTF8_STRING	337	#ifdef X_HAVE_UTF8_STRING
300	if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful	338	if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
301	len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf,	339	len = Xutf8LookupString (Input_Context, &ev, kbuf,
302	KBUFSZ, &keysym, &status_return);	340	KBUFSZ, &keysym, &status_return);
303	else	341	else
304	#endif	342	#endif
305	#endif	343	#endif
306	{	344	{
…		…
308		346
309	// the XOpenIM manpage lies about hardcoding the locale	347	// the XOpenIM manpage lies about hardcoding the locale
310	// at the point of XOpenIM, so temporarily switch locales	348	// at the point of XOpenIM, so temporarily switch locales
311	if (rs[Rs_imLocale])	349	if (rs[Rs_imLocale])
312	SET_LOCALE (rs[Rs_imLocale]);	350	SET_LOCALE (rs[Rs_imLocale]);
		351
313	// assume wchar_t == unicode or better	352	// assume wchar_t == unicode or better
314	len = XwcLookupString (Input_Context, &ev, wkbuf,	353	len = XwcLookupString (Input_Context, &ev, wkbuf,
315	KBUFSZ, &keysym, &status_return);	354	KBUFSZ, &keysym, &status_return);
		355
316	if (rs[Rs_imLocale])	356	if (rs[Rs_imLocale])
317	SET_LOCALE (locale);	357	SET_LOCALE (locale);
318		358
319	if (status_return == XLookupChars	359	if (status_return == XLookupChars
320	|| status_return == XLookupBoth)	360	|| status_return == XLookupBoth)
…		…
341	|| status_return == XLookupBoth;	381	|| status_return == XLookupBoth;
342	}	382	}
343	else	383	else
344	#endif	384	#endif
345	{	385	{
346	len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose);	386	len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
347	valid_keysym = keysym != NoSymbol;	387	valid_keysym = keysym != NoSymbol;
348	}	388	}
349		389
350	if (valid_keysym)	390	if (valid_keysym)
351	{	391	{
352	#ifdef KEYSYM_RESOURCE	392	#ifdef KEYSYM_RESOURCE
353	if (keyboard->dispatch (this, keysym, ev.state))	393	if (keyboard->dispatch (this, keysym, ev.state))
354	return;	394	return;
355	#endif	395	#endif
356		396
357	if (TermWin.saveLines)	397	if (saveLines)
358	{	398	{
359	#ifdef UNSHIFTED_SCROLLKEYS	399	#ifdef UNSHIFTED_SCROLLKEYS
360	if (!ctrl && !meta)	400	if (!ctrl && !meta)
361	#else	401	#else
362	if (IS_SCROLL_MOD)	402	if (IS_SCROLL_MOD)
363	#endif	403	#endif
364	{	404	{
365	int lnsppg;	405	int lnsppg;
366		406
367	#ifdef PAGING_CONTEXT_LINES	407	#ifdef PAGING_CONTEXT_LINES
368	lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES;	408	lnsppg = nrow - PAGING_CONTEXT_LINES;
369	#else	409	#else
370	lnsppg = TermWin.nrow * 4 / 5;	410	lnsppg = nrow * 4 / 5;
371	#endif	411	#endif
372	if (keysym == XK_Prior)	412	if (keysym == XK_Prior)
373	{	413	{
374	scr_page (UP, lnsppg);	414	scr_page (UP, lnsppg);
375	return;	415	return;
…		…
512	else	552	else
513	strcpy (kbuf, key_backspace);	553	strcpy (kbuf, key_backspace);
514	break;	554	break;
515	#endif	555	#endif
516	#ifndef NO_DELETE_KEY	556	#ifndef NO_DELETE_KEY
		557	# ifdef XK_KP_Prior
		558	case XK_KP_Delete:
		559	/* allow shift to override */
		560	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
		561	{
		562	strcpy (kbuf, "\033On");
		563	break;
		564	}
		565	/* FALLTHROUGH */
		566	# endif
517	case XK_Delete:	567	case XK_Delete:
518	strcpy (kbuf, key_delete);	568	strcpy (kbuf, key_delete);
519	break;	569	break;
520	#endif	570	#endif
521	case XK_Tab:	571	case XK_Tab:
…		…
624	#ifdef XK_KP_Begin	674	#ifdef XK_KP_Begin
625	case XK_KP_Begin:	675	case XK_KP_Begin:
626	strcpy (kbuf, "\033Ou");	676	strcpy (kbuf, "\033Ou");
627	break;	677	break;
628		678
629	case XK_KP_Insert:
630	strcpy (kbuf, "\033Op");
631	break;
632
633	case XK_KP_Delete:
634	strcpy (kbuf, "\033On");
635	break;
636	#endif	679	#endif
637	case XK_KP_F1: /* "\033OP" */	680	case XK_KP_F1: /* "\033OP" */
638	case XK_KP_F2: /* "\033OQ" */	681	case XK_KP_F2: /* "\033OQ" */
639	case XK_KP_F3: /* "\033OR" */	682	case XK_KP_F3: /* "\033OR" */
640	case XK_KP_F4: /* "\033OS" */	683	case XK_KP_F4: /* "\033OS" */
…		…
672	break;	715	break;
673		716
674	case XK_Find:	717	case XK_Find:
675	strcpy (kbuf, "\033[1~");	718	strcpy (kbuf, "\033[1~");
676	break;	719	break;
		720
		721	#ifdef XK_KP_End
		722	case XK_KP_Insert:
		723	/* allow shift to override */
		724	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
		725	{
		726	strcpy (kbuf, "\033Op");
		727	break;
		728	}
		729	/* FALLTHROUGH */
		730	#endif
677	case XK_Insert:	731	case XK_Insert:
678	strcpy (kbuf, "\033[2~");	732	strcpy (kbuf, "\033[2~");
679	break;	733	break;
680	#ifdef DXK_Remove /* support for DEC remove like key */	734	#ifdef DXK_Remove /* support for DEC remove like key */
681	case DXK_Remove:	735	case DXK_Remove:
…		…
801	{	855	{
802	#ifdef META8_OPTION	856	#ifdef META8_OPTION
803	/* set 8-bit on */	857	/* set 8-bit on */
804	if (meta && (meta_char == 0x80))	858	if (meta && (meta_char == 0x80))
805	{	859	{
806	unsigned char *ch;	860	char *ch;
807		861
808	for (ch = kbuf; ch < kbuf + len; ch++)	862	for (ch = kbuf; ch < kbuf + len; ch++)
809	*ch |= 0x80;	863	*ch |= 0x80;
810		864
811	meta = 0;	865	meta = 0;
…		…
816	}	870	}
817		871
818	if (len <= 0)	872	if (len <= 0)
819	return; /* not mapped */	873	return; /* not mapped */
820		874
821	if (options & Opt_scrollTtyKeypress)	875	if (OPTION (Opt_scrollTtyKeypress))
822	if (TermWin.view_start)	876	if (view_start)
823	{	877	{
824	TermWin.view_start = 0;	878	view_start = 0;
825	want_refresh = 1;	879	want_refresh = 1;
826	}	880	}
827		881
828	/*	882	/*
829	* these modifications only affect the static keybuffer	883	* these modifications only affect the static keybuffer
…		…
844	#ifdef META8_OPTION	898	#ifdef META8_OPTION
845	&& meta_char == C0_ESC	899	&& meta_char == C0_ESC
846	#endif	900	#endif
847	)	901	)
848	{	902	{
849	const unsigned char ch = C0_ESC;	903	const char ch = C0_ESC;
850	tt_write (&ch, 1);	904	tt_write (&ch, 1);
851	}	905	}
852		906
853	#if defined(DEBUG_CMD)	907	#if defined(DEBUG_CMD)
854	/* Display keyboard buffer contents */	908	/* Display keyboard buffer contents */
…		…
866		920
867	#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)	921	#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
868	/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */	922	/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
869	/* attempt to `write' count to the input buffer */	923	/* attempt to `write' count to the input buffer */
870	unsigned int	924	unsigned int
871	rxvt_term::cmd_write (const unsigned char *str, unsigned int count)	925	rxvt_term::cmd_write (const char *str, unsigned int count)
872	{	926	{
873	unsigned int n, s;	927	unsigned int n, s;
874		928
875	n = cmdbuf_ptr - cmdbuf_base;	929	n = cmdbuf_ptr - cmdbuf_base;
876	s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;	930	s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
…		…
913	}	967	}
914	#endif	968	#endif
915		969
916	if (want_refresh)	970	if (want_refresh)
917	{	971	{
		972	if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
		973	{
		974	int row = -view_start;
		975
		976	while (row > -nsaved && ROW (row - 1).is_longer ())
		977	--row;
		978
		979	while (row < -view_start + nrow)
		980	{
		981	int start_row = row;
		982	line_t *l;
		983
		984	do
		985	{
		986	l = &ROW (row);
		987
		988	if (!(l->f & LINE_FILTERED))
		989	{
		990	// line not filtered, mark it as filtered
		991	l->f |= LINE_FILTERED;
		992	while (l->is_longer ())
		993	{
		994	l = &ROW (++row);
		995	l->f |= LINE_FILTERED;
		996	}
		997
		998	// and filter it
		999	HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
		1000
		1001	break;
		1002	}
		1003	}
		1004	while (l->is_longer ());
		1005
		1006	row++;
		1007	}
		1008
		1009	}
		1010
918	scr_refresh (refresh_type);	1011	scr_refresh (refresh_type);
919	scrollbar_show (1);	1012	scrollbar_show (1);
920	#ifdef USE_XIM	1013	#ifdef USE_XIM
921	IMSendSpot ();	1014	IMSendSpot ();
922	#endif	1015	#endif
…		…
932	SET_LOCALE (locale);	1025	SET_LOCALE (locale);
933		1026
934	display->flush ();	1027	display->flush ();
935		1028
936	if (want_refresh && !flush_ev.active)	1029	if (want_refresh && !flush_ev.active)
937	flush_ev.start (NOW + 0.01);	1030	flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
938	}	1031	}
939		1032
940	void	1033	void
941	rxvt_term::flush_cb (time_watcher &w)	1034	rxvt_term::flush_cb (time_watcher &w)
942	{	1035	{
…		…
1006	{	1099	{
1007	if (mouse_slip_wheel_speed == 0	1100	if (mouse_slip_wheel_speed == 0
1008	|| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)	1101	|| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1009	: scr_page (UP, mouse_slip_wheel_speed))	1102	: scr_page (UP, mouse_slip_wheel_speed))
1010	{	1103	{
1011	if (TermWin.view_start == TermWin.nscrolled ||	1104	if (view_start == nsaved ||
1012	TermWin.view_start == 0)	1105	view_start == 0)
1013	mouse_slip_wheel_speed = 0;	1106	mouse_slip_wheel_speed = 0;
1014		1107
1015	refresh_type |= SMOOTH_REFRESH;	1108	refresh_type |= SMOOTH_REFRESH;
1016	want_refresh = 1;	1109	want_refresh = 1;
1017	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1110	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1018	}	1111	}
1019	}	1112	}
1020	#endif	1113	#endif
1021		1114
		1115	#if HAVE_SCHED_YIELD
		1116	static struct event_handler
		1117	{
		1118	check_watcher cw_yield;
		1119
		1120	void yield (check_watcher &w)
		1121	{
		1122	sched_yield ();
		1123	w.stop ();
		1124	}
		1125
		1126	event_handler ()
		1127	: cw_yield (this, &event_handler::yield)
		1128	{
		1129	}
		1130	} event_handler;
		1131	#endif
		1132
1022	bool	1133	bool
1023	rxvt_term::pty_fill ()	1134	rxvt_term::pty_fill ()
1024	{	1135	{
1025	ssize_t n = cmdbuf_endp - cmdbuf_ptr;	1136	ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1026		1137
1027	if (CBUFSIZ == n)	1138	if (CBUFSIZ == n)
1028	{	1139	{
1029	rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n");	1140	rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1030	n = 0;	1141	n = 0;
1031	}	1142	}
1032		1143
1033	memmove (cmdbuf_base, cmdbuf_ptr, n);	1144	memmove (cmdbuf_base, cmdbuf_ptr, n);
1034	cmdbuf_ptr = cmdbuf_base;	1145	cmdbuf_ptr = cmdbuf_base;
1035	cmdbuf_endp = cmdbuf_ptr + n;	1146	cmdbuf_endp = cmdbuf_ptr + n;
1036		1147
1037	n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);	1148	ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
1038		1149
1039	if (n > 0)	1150	if (r > 0)
1040	{	1151	{
1041	cmdbuf_endp += n;	1152	cmdbuf_endp += r;
1042	return true;	1153	return true;
1043	}	1154	}
1044	else if (n < 0 && errno != EAGAIN)	1155	else if (r < 0 && (errno == EAGAIN || errno == EINTR))
		1156	{
		1157	#if HAVE_SCHED_YIELD
		1158	if (display->is_local)
		1159	event_handler.cw_yield.start ();
		1160	#endif
		1161	}
		1162	else
		1163	{
		1164	pty_ev.stop ();
		1165
		1166	if (!OPTION (Opt_hold))
1045	destroy ();	1167	destroy ();
		1168	}
1046		1169
1047	return false;	1170	return false;
1048	}	1171	}
1049		1172
1050	void	1173	void
…		…
1064	}	1187	}
1065		1188
1066	void	1189	void
1067	rxvt_term::pointer_unblank ()	1190	rxvt_term::pointer_unblank ()
1068	{	1191	{
1069	XDefineCursor (display->display, TermWin.vt, TermWin_cursor);	1192	XDefineCursor (display->display, vt, TermWin_cursor);
1070	recolour_cursor ();	1193	recolour_cursor ();
1071		1194
1072	#ifdef POINTER_BLANK	1195	#ifdef POINTER_BLANK
1073	hidden_pointer = 0;	1196	hidden_pointer = 0;
1074		1197
1075	if (options & Opt_pointerBlank)	1198	if (OPTION (Opt_pointerBlank))
1076	pointer_ev.start (NOW + pointerBlankDelay);	1199	pointer_ev.start (NOW + pointerBlankDelay);
1077	#endif	1200	#endif
1078	}	1201	}
1079		1202
1080	#ifdef POINTER_BLANK	1203	#ifdef POINTER_BLANK
1081	void	1204	void
1082	rxvt_term::pointer_blank ()	1205	rxvt_term::pointer_blank ()
1083	{	1206	{
1084	if (! (options & Opt_pointerBlank))	1207	if (! OPTION (Opt_pointerBlank))
1085	return;	1208	return;
1086		1209
1087	XDefineCursor (display->display, TermWin.vt, display->blank_cursor);	1210	XDefineCursor (display->display, vt, display->blank_cursor);
1088	XFlush (display->display);	1211	XFlush (display->display);
1089		1212
1090	hidden_pointer = 1;	1213	hidden_pointer = 1;
1091	}	1214	}
1092		1215
…		…
1187		1310
1188	SET_R (this);	1311	SET_R (this);
1189	SET_LOCALE (locale);	1312	SET_LOCALE (locale);
1190		1313
1191	#if defined(CURSOR_BLINK)	1314	#if defined(CURSOR_BLINK)
1192	if ((options & Opt_cursorBlink) && ev.type == KeyPress)	1315	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1193	{	1316	{
1194	if (hidden_cursor)	1317	if (hidden_cursor)
1195	{	1318	{
1196	hidden_cursor = 0;	1319	hidden_cursor = 0;
1197	want_refresh = 1;	1320	want_refresh = 1;
…		…
1200	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1323	cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1201	}	1324	}
1202	#endif	1325	#endif
1203		1326
1204	#if defined(POINTER_BLANK)	1327	#if defined(POINTER_BLANK)
1205	if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)	1328	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1206	{	1329	{
1207	if (ev.type == MotionNotify	1330	if (ev.type == MotionNotify
1208	|| ev.type == ButtonPress	1331	|| ev.type == ButtonPress
1209	|| ev.type == ButtonRelease)	1332	|| ev.type == ButtonRelease)
1210	if (hidden_pointer)	1333	if (hidden_pointer)
…		…
1308	button_release (ev.xbutton);	1431	button_release (ev.xbutton);
1309	break;	1432	break;
1310		1433
1311	case ClientMessage:	1434	case ClientMessage:
1312	if (ev.xclient.format == 32	1435	if (ev.xclient.format == 32
		1436	&& ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
		1437	{
1313	&& (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW])	1438	if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1314	destroy ();	1439	destroy ();
		1440	#if ENABLE_EWMH
		1441	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
		1442	XSendEvent (disp, ev.xclient.window = display->root,
		1443	False, SubstructureRedirectMask | SubstructureNotifyMask,
		1444	&ev);
		1445	#endif
		1446	}
		1447	#if ENABLE_XEMBED
		1448	else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
		1449	{
		1450	if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
		1451	focus_in ();
		1452	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
		1453	focus_out ();
		1454	}
		1455	#endif
1315	#ifdef OFFIX_DND	1456	#ifdef OFFIX_DND
1316	/* OffiX Dnd (drag 'n' drop) protocol */	1457	/* OffiX Dnd (drag 'n' drop) protocol */
1317	else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]	1458	else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1318	&& (ev.xclient.data.l[0] == DndFile	1459	&& (ev.xclient.data.l[0] == DndFile
1319	|| ev.xclient.data.l[0] == DndDir	1460	|| ev.xclient.data.l[0] == DndDir
1320	|| ev.xclient.data.l[0] == DndLink))	1461	|| ev.xclient.data.l[0] == DndLink))
1321	{	1462	{
1322	/* Get Dnd data */	1463	/* Get Dnd data */
1323	Atom ActualType;	1464	Atom ActualType;
1324	int ActualFormat;	1465	int ActualFormat;
1325	unsigned char *data;	1466	unsigned char *data;
…		…
1368	break;	1509	break;
1369	}	1510	}
1370	break;	1511	break;
1371		1512
1372	case FocusIn:	1513	case FocusIn:
1373	if (!TermWin.focus)	1514	focus_in ();
		1515	break;
		1516
		1517	case FocusOut:
		1518	focus_out ();
		1519	break;
		1520
		1521	case ConfigureNotify:
		1522	if (ev.xconfigure.window == parent[0])
1374	{	1523	{
1375	TermWin.focus = 1;
1376	want_refresh = 1;
1377	#ifdef USE_XIM
1378	if (Input_Context != NULL)
1379	{
1380	IMSetStatusPosition ();
1381	XSetICFocus (Input_Context);
1382	}
1383	#endif
1384	#ifdef CURSOR_BLINK
1385	if (options & Opt_cursorBlink)
1386	cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1387	#endif
1388	#ifdef OFF_FOCUS_FADING
1389	if (rs[Rs_fade])
1390	{
1391	pix_colors = pix_colors_focused;
1392	scr_recolour ();
1393	}
1394	#endif
1395
1396	}
1397	break;
1398
1399	case FocusOut:
1400	if (TermWin.focus)
1401	{
1402	TermWin.focus = 0;
1403	want_refresh = 1;
1404
1405	#if ENABLE_FRILLS || ISO_14755
1406	iso14755buf = 0;
1407	#endif
1408	#if ENABLE_OVERLAY
1409	scr_overlay_off ();
1410	#endif
1411	#ifdef USE_XIM
1412	if (Input_Context != NULL)
1413	XUnsetICFocus (Input_Context);
1414	#endif
1415	#ifdef CURSOR_BLINK
1416	if (options & Opt_cursorBlink)
1417	cursor_blink_ev.stop ();
1418	hidden_cursor = 0;
1419	#endif
1420	#ifdef OFF_FOCUS_FADING
1421	if (rs[Rs_fade])
1422	{
1423	pix_colors = pix_colors_unfocused;
1424	scr_recolour ();
1425	}
1426	#endif
1427	}
1428	break;
1429
1430	case ConfigureNotify:
1431	if (ev.xconfigure.window == TermWin.parent[0])
1432	{
1433	int height, width;
1434
1435	do
1436	{ /* Wrap lots of configures into one */
1437	width = ev.xconfigure.width;
1438	height = ev.xconfigure.height;
1439	D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1440	}
1441	while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev));	1524	while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
		1525	;
1442		1526
1443	if (szHint.width != width || szHint.height != height)	1527	if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1444	{	1528	{
1445	seen_resize = 1;	1529	seen_resize = 1;
1446	resize_all_windows (width, height, 1);	1530	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1447	}	1531	}
1448		1532
1449	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */	1533	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1450	if (options & Opt_transparent)	1534	if (OPTION (Opt_transparent))
1451	check_our_parents ();	1535	check_our_parents ();
1452	#endif	1536	#endif
1453	}	1537	}
1454	break;	1538	break;
1455		1539
…		…
1472	case SelectionRequest:	1556	case SelectionRequest:
1473	selection_send (ev.xselectionrequest);	1557	selection_send (ev.xselectionrequest);
1474	break;	1558	break;
1475		1559
1476	case UnmapNotify:	1560	case UnmapNotify:
1477	TermWin.mapped = 0;	1561	mapped = 0;
1478	#ifdef TEXT_BLINK	1562	#ifdef TEXT_BLINK
1479	text_blink_ev.stop ();	1563	text_blink_ev.stop ();
1480	#endif	1564	#endif
1481	break;	1565	break;
1482		1566
1483	case MapNotify:	1567	case MapNotify:
1484	TermWin.mapped = 1;	1568	mapped = 1;
1485	#ifdef TEXT_BLINK	1569	#ifdef TEXT_BLINK
1486	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);	1570	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1487	#endif	1571	#endif
1488	break;	1572	break;
1489		1573
…		…
1493	break;	1577	break;
1494	#endif /* TRANSPARENT */	1578	#endif /* TRANSPARENT */
1495		1579
1496	case GraphicsExpose:	1580	case GraphicsExpose:
1497	case Expose:	1581	case Expose:
1498	if (ev.xany.window == TermWin.vt)	1582	if (ev.xany.window == vt)
1499	{	1583	{
1500	do	1584	do
1501	scr_expose (ev.xexpose.x, ev.xexpose.y,	1585	scr_expose (ev.xexpose.x, ev.xexpose.y,
1502	ev.xexpose.width, ev.xexpose.height, False);	1586	ev.xexpose.width, ev.xexpose.height, False);
1503	while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev));	1587	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1504		1588
1505	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1589	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1506		1590
1507	while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev))	1591	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1508	scr_expose (ev.xexpose.x, ev.xexpose.y,	1592	scr_expose (ev.xexpose.x, ev.xexpose.y,
1509	ev.xexpose.width, ev.xexpose.height, False);	1593	ev.xexpose.width, ev.xexpose.height, False);
1510		1594
1511	scr_refresh (refresh_type);	1595	scr_refresh (refresh_type);
1512	}	1596	}
…		…
1528	if (menubar_visible () && isMenuBarWindow (ev.xany.window))	1612	if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1529	menubar_expose ();	1613	menubar_expose ();
1530	#endif	1614	#endif
1531		1615
1532	#ifdef TRANSPARENT	1616	#ifdef TRANSPARENT
1533	if (am_transparent && ev.xany.window == TermWin.parent[0])	1617	if (am_transparent && ev.xany.window == parent[0])
1534	XClearWindow (disp, ev.xany.window);	1618	XClearWindow (disp, ev.xany.window);
1535	#endif	1619	#endif
1536	}	1620	}
1537	break;	1621	break;
1538		1622
…		…
1549	}	1633	}
1550	#endif	1634	#endif
1551	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)	1635	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1552	break;	1636	break;
1553		1637
1554	if (ev.xany.window == TermWin.vt)	1638	if (ev.xany.window == vt)
1555	{	1639	{
1556	if (ev.xbutton.state & (Button1Mask | Button3Mask))	1640	if (ev.xbutton.state & (Button1Mask | Button3Mask))
1557	{	1641	{
1558	while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev))	1642	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1559	;	1643	;
1560		1644
1561	XQueryPointer (disp, TermWin.vt,	1645	XQueryPointer (disp, vt,
1562	&unused_root, &unused_child,	1646	&unused_root, &unused_child,
1563	&unused_root_x, &unused_root_y,	1647	&unused_root_x, &unused_root_y,
1564	&ev.xbutton.x, &ev.xbutton.y,	1648	&ev.xbutton.x, &ev.xbutton.y,
1565	&ev.xbutton.state);	1649	&ev.xbutton.state);
1566	#ifdef MOUSE_THRESHOLD	1650	#ifdef MOUSE_THRESHOLD
…		…
1578	#endif	1662	#endif
1579	selection_extend (ev.xbutton.x, ev.xbutton.y,	1663	selection_extend (ev.xbutton.x, ev.xbutton.y,
1580	ev.xbutton.state & Button3Mask ? 2 : 0);	1664	ev.xbutton.state & Button3Mask ? 2 : 0);
1581		1665
1582	#ifdef SELECTION_SCROLLING	1666	#ifdef SELECTION_SCROLLING
1583	if (ev.xbutton.y < TermWin.int_bwidth	1667	if (ev.xbutton.y < int_bwidth
1584	|| Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))	1668	|| Pixel2Row (ev.xbutton.y) > (nrow-1))
1585	{	1669	{
1586	int dist;	1670	int dist;
1587		1671
1588	/* don't clobber the current delay if we are	1672	/* don't clobber the current delay if we are
1589	* already in the middle of scrolling.	1673	* already in the middle of scrolling.
…		…
1597	selection_save_x = ev.xbutton.x;	1681	selection_save_x = ev.xbutton.x;
1598	selection_save_y = ev.xbutton.y;	1682	selection_save_y = ev.xbutton.y;
1599	selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;	1683	selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1600		1684
1601	/* calc number of lines to scroll */	1685	/* calc number of lines to scroll */
1602	if (ev.xbutton.y < TermWin.int_bwidth)	1686	if (ev.xbutton.y < int_bwidth)
1603	{	1687	{
1604	scroll_selection_dir = UP;	1688	scroll_selection_dir = UP;
1605	dist = TermWin.int_bwidth - ev.xbutton.y;	1689	dist = int_bwidth - ev.xbutton.y;
1606	}	1690	}
1607	else	1691	else
1608	{	1692	{
1609	scroll_selection_dir = DN;	1693	scroll_selection_dir = DN;
1610	dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height);	1694	dist = ev.xbutton.y - (int_bwidth + height);
1611	}	1695	}
1612		1696
1613	scroll_selection_lines = Pixel2Height (dist)	1697	scroll_selection_lines = Pixel2Height (dist)
1614	/ SELECTION_SCROLL_LINE_SPEEDUP	1698	/ SELECTION_SCROLL_LINE_SPEEDUP
1615	+ 1;	1699	+ 1;
1616	MIN_IT (scroll_selection_lines,	1700	min_it (scroll_selection_lines,
1617	SELECTION_SCROLL_MAX_LINES);	1701	SELECTION_SCROLL_MAX_LINES);
1618	}	1702	}
1619	else	1703	else
1620	{	1704	{
1621	/* we are within the text window, so we	1705	/* we are within the text window, so we
…		…
1649	}	1733	}
1650	break;	1734	break;
1651	}	1735	}
1652	}	1736	}
1653		1737
		1738	void
		1739	rxvt_term::focus_in ()
		1740	{
		1741	if (!focus)
		1742	{
		1743	focus = 1;
		1744	want_refresh = 1;
		1745
		1746	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
		1747
		1748	#if USE_XIM
		1749	if (Input_Context != NULL)
		1750	{
		1751	IMSetStatusPosition ();
		1752	XSetICFocus (Input_Context);
		1753	}
		1754	#endif
		1755	#if CURSOR_BLINK
		1756	if (OPTION (Opt_cursorBlink))
		1757	cursor_blink_ev.start (NOW + BLINK_INTERVAL);
		1758	#endif
		1759	#if OFF_FOCUS_FADING
		1760	if (rs[Rs_fade])
		1761	{
		1762	pix_colors = pix_colors_focused;
		1763	scr_recolour ();
		1764	}
		1765	#endif
		1766	}
		1767	}
		1768
		1769	void
		1770	rxvt_term::focus_out ()
		1771	{
		1772	if (focus)
		1773	{
		1774	focus = 0;
		1775	want_refresh = 1;
		1776
		1777	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
		1778
		1779	#if ENABLE_FRILLS || ISO_14755
		1780	if (iso14755buf)
		1781	{
		1782	iso14755buf = 0;
		1783	# if ENABLE_OVERLAY
		1784	scr_overlay_off ();
		1785	# endif
		1786	}
		1787	#endif
		1788	#if USE_XIM
		1789	if (Input_Context != NULL)
		1790	XUnsetICFocus (Input_Context);
		1791	#endif
		1792	#if CURSOR_BLINK
		1793	if (OPTION (Opt_cursorBlink))
		1794	cursor_blink_ev.stop ();
		1795	hidden_cursor = 0;
		1796	#endif
		1797	#if OFF_FOCUS_FADING
		1798	if (rs[Rs_fade])
		1799	{
		1800	pix_colors = pix_colors_unfocused;
		1801	scr_recolour ();
		1802	}
		1803	#endif
		1804	}
		1805	}
		1806
1654	#if TRANSPARENT	1807	#if TRANSPARENT
1655	void	1808	void
1656	rxvt_term::rootwin_cb (XEvent &ev)	1809	rxvt_term::rootwin_cb (XEvent &ev)
1657	{	1810	{
1658	SET_R (this);	1811	SET_R (this);
…		…
1669	&& ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])	1822	&& ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1670	return;	1823	return;
1671		1824
1672	/* FALLTHROUGH */	1825	/* FALLTHROUGH */
1673	case ReparentNotify:	1826	case ReparentNotify:
1674	if ((options & Opt_transparent) && check_our_parents () && am_transparent)	1827	if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1675	want_refresh = want_full_refresh = 1;	1828	want_refresh = want_full_refresh = 1;
1676	break;	1829	break;
1677	}	1830	}
1678	}	1831	}
1679	#endif	1832	#endif
…		…
1682	rxvt_term::button_press (XButtonEvent &ev)	1835	rxvt_term::button_press (XButtonEvent &ev)
1683	{	1836	{
1684	int reportmode = 0, clickintime;	1837	int reportmode = 0, clickintime;
1685		1838
1686	bypass_keystate = ev.state & (ModMetaMask | ShiftMask);	1839	bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
		1840
1687	if (!bypass_keystate)	1841	if (!bypass_keystate)
1688	reportmode = !! (priv_modes & PrivMode_mouse_report);	1842	reportmode = !! (priv_modes & PrivMode_mouse_report);
1689		1843
1690	/*	1844	/*
1691	* VT window processing of button press	1845	* VT window processing of button press
1692	*/	1846	*/
1693	if (ev.window == TermWin.vt)	1847	if (ev.window == vt)
1694	{	1848	{
1695	#if ISO_14755	1849	#if ISO_14755
1696	// 5.4	1850	// 5.4
1697	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))	1851	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1698	{	1852	{
…		…
1740	else	1894	else
1741	{	1895	{
1742	if (ev.button != MEvent.button)	1896	if (ev.button != MEvent.button)
1743	MEvent.clicks = 0;	1897	MEvent.clicks = 0;
1744		1898
		1899	if (!HOOK_INVOKE ((this, HOOK_MOUSE_CLICK, DT_XEVENT, &ev, DT_END)))
1745	switch (ev.button)	1900	switch (ev.button)
1746	{	1901	{
1747	case Button1:	1902	case Button1:
1748	/* allow meta + click to select rectangular areas */	1903	/* allow meta + click to select rectangular areas */
1749	/* should be done in screen.C */	1904	/* should be done in screen.C */
1750	#if ENABLE_FRILLS	1905	#if ENABLE_FRILLS
1751	selection.rect = !!(ev.state & ModMetaMask);	1906	selection.rect = !!(ev.state & ModMetaMask);
1752	#else	1907	#else
1753	selection.rect = false;	1908	selection.rect = false;
1754	#endif	1909	#endif
1755		1910
1756	/* allow shift+left click to extend selection */	1911	/* allow shift+left click to extend selection */
1757	if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))	1912	if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1758	{	1913	{
1759	if (MEvent.button == Button1 && clickintime)	1914	if (MEvent.button == Button1 && clickintime)
1760	selection_rotate (ev.x, ev.y);	1915	selection_rotate (ev.x, ev.y);
1761	else	1916	else
1762	selection_extend (ev.x, ev.y, 1);	1917	selection_extend (ev.x, ev.y, 1);
1763	}	1918	}
1764	else	1919	else
1765	{	1920	{
1766	if (MEvent.button == Button1 && clickintime)	1921	if (MEvent.button == Button1 && clickintime)
1767	MEvent.clicks++;	1922	MEvent.clicks++;
1768	else	1923	else
1769	MEvent.clicks = 1;	1924	MEvent.clicks = 1;
1770		1925
1771	selection_click (MEvent.clicks, ev.x, ev.y);	1926	selection_click (MEvent.clicks, ev.x, ev.y);
1772	}	1927	}
1773		1928
1774	MEvent.button = Button1;	1929	MEvent.button = Button1;
1775	break;	1930	break;
1776		1931
1777	case Button3:	1932	case Button3:
1778	if (MEvent.button == Button3 && clickintime)	1933	if (MEvent.button == Button3 && clickintime)
1779	selection_rotate (ev.x, ev.y);	1934	selection_rotate (ev.x, ev.y);
1780	else	1935	else
1781	selection_extend (ev.x, ev.y, 1);	1936	selection_extend (ev.x, ev.y, 1);
1782		1937
1783	MEvent.button = Button3;	1938	MEvent.button = Button3;
1784	break;	1939	break;
1785	}	1940	}
1786	}	1941	}
1787		1942
1788	MEvent.time = ev.time;	1943	MEvent.time = ev.time;
1789	return;	1944	return;
1790	}	1945	}
1791		1946
…		…
1903	case Button3:	2058	case Button3:
1904	if (scrollBar.style != R_SB_XTERM)	2059	if (scrollBar.style != R_SB_XTERM)
1905	{	2060	{
1906	if (scrollbar_above_slider (ev.y))	2061	if (scrollbar_above_slider (ev.y))
1907	# ifdef RXVT_SCROLL_FULL	2062	# ifdef RXVT_SCROLL_FULL
1908	scr_page (UP, TermWin.nrow - 1);	2063	scr_page (UP, nrow - 1);
1909	# else	2064	# else
1910	scr_page (UP, TermWin.nrow / 4);	2065	scr_page (UP, nrow / 4);
1911	# endif	2066	# endif
1912	else if (scrollbar_below_slider (ev.y))	2067	else if (scrollbar_below_slider (ev.y))
1913	# ifdef RXVT_SCROLL_FULL	2068	# ifdef RXVT_SCROLL_FULL
1914	scr_page (DN, TermWin.nrow - 1);	2069	scr_page (DN, nrow - 1);
1915	# else	2070	# else
1916	scr_page (DN, TermWin.nrow / 4);	2071	scr_page (DN, nrow / 4);
1917	# endif	2072	# endif
1918	else	2073	else
1919	scrollBar.setMotion ();	2074	scrollBar.setMotion ();
1920	}	2075	}
1921	else	2076	else
1922	{	2077	{
1923	scr_page ((ev.button == Button1 ? DN : UP),	2078	scr_page ((ev.button == Button1 ? DN : UP),
1924	(TermWin.nrow	2079	(nrow
1925	* scrollbar_position (ev.y)	2080	* scrollbar_position (ev.y)
1926	/ scrollbar_size ()));	2081	/ scrollbar_size ()));
1927	}	2082	}
1928		2083
1929	break;	2084	break;
…		…
1961	#ifdef SELECTION_SCROLLING	2116	#ifdef SELECTION_SCROLLING
1962	if (sel_scroll_ev.active)	2117	if (sel_scroll_ev.active)
1963	sel_scroll_ev.stop();	2118	sel_scroll_ev.stop();
1964	#endif	2119	#endif
1965		2120
1966	if (ev.window == TermWin.vt)	2121	if (ev.window == vt)
1967	{	2122	{
1968	#if ISO_14755	2123	#if ISO_14755
1969	// 5.4	2124	// 5.4
1970	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))	2125	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1971	return;	2126	return;
…		…
2021		2176
2022	v = ev.button == Button4 ? UP : DN;	2177	v = ev.button == Button4 ? UP : DN;
2023		2178
2024	if (ev.state & ShiftMask)	2179	if (ev.state & ShiftMask)
2025	i = 1;	2180	i = 1;
2026	else if (options & Opt_mouseWheelScrollPage)	2181	else if (OPTION (Opt_mouseWheelScrollPage))
2027	i = TermWin.nrow - 1;	2182	i = nrow - 1;
2028	else	2183	else
2029	i = 5;	2184	i = 5;
2030		2185
2031	# ifdef MOUSE_SLIP_WHEELING	2186	# ifdef MOUSE_SLIP_WHEELING
2032	if (ev.state & ControlMask)	2187	if (ev.state & ControlMask)
2033	{	2188	{
2034	mouse_slip_wheel_speed += v ? -1 : 1;	2189	mouse_slip_wheel_speed += v ? -1 : 1;
2035	if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow;	2190	if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2036	if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow;	2191	if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2037		2192
2038	if (slip_wheel_ev.at < NOW)	2193	if (slip_wheel_ev.at < NOW)
2039	slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;	2194	slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2040		2195
2041	slip_wheel_ev.start ();	2196	slip_wheel_ev.start ();
…		…
2317	XWindowAttributes wattr, wrootattr;	2472	XWindowAttributes wattr, wrootattr;
2318	dDisp;	2473	dDisp;
2319		2474
2320	pchanged = 0;	2475	pchanged = 0;
2321		2476
2322	if (!(options & Opt_transparent))	2477	if (!OPTION (Opt_transparent))
2323	return pchanged; /* Don't try any more */	2478	return pchanged; /* Don't try any more */
2324		2479
2325	XGetWindowAttributes (disp, display->root, &wrootattr);	2480	XGetWindowAttributes (disp, display->root, &wrootattr);
2326	rootdepth = wrootattr.depth;	2481	rootdepth = wrootattr.depth;
2327		2482
2328	XGetWindowAttributes (disp, TermWin.parent[0], &wattr);	2483	XGetWindowAttributes (disp, parent[0], &wattr);
2329		2484
2330	if (rootdepth != wattr.depth)	2485	if (rootdepth != wattr.depth)
2331	{	2486	{
2332	if (am_transparent)	2487	if (am_transparent)
2333	{	2488	{
2334	pchanged = 1;	2489	pchanged = 1;
2335	XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);	2490	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2336	am_transparent = am_pixmap_trans = 0;	2491	am_transparent = am_pixmap_trans = 0;
2337	}	2492	}
2338		2493
2339	return pchanged; /* Don't try any more */	2494	return pchanged; /* Don't try any more */
2340	}	2495	}
…		…
2381	Window cr;	2536	Window cr;
2382	XImage *image;	2537	XImage *image;
2383	GC gc;	2538	GC gc;
2384	XGCValues gcvalue;	2539	XGCValues gcvalue;
2385		2540
2386	XTranslateCoordinates (disp, TermWin.parent[0], display->root,	2541	XTranslateCoordinates (disp, parent[0], display->root,
2387	0, 0, &sx, &sy, &cr);	2542	0, 0, &sx, &sy, &cr);
2388	nw = (unsigned int)szHint.width;	2543	nw = (unsigned int)szHint.width;
2389	nh = (unsigned int)szHint.height;	2544	nh = (unsigned int)szHint.height;
2390	nx = ny = 0;	2545	nx = ny = 0;
2391		2546
…		…
2401	nh += sy;	2556	nh += sy;
2402	ny = -sy;	2557	ny = -sy;
2403	sy = 0;	2558	sy = 0;
2404	}	2559	}
2405		2560
2406	MIN_IT (nw, (unsigned int) (wrootattr.width - sx));	2561	min_it (nw, (unsigned int) (wrootattr.width - sx));
2407	MIN_IT (nh, (unsigned int) (wrootattr.height - sy));	2562	min_it (nh, (unsigned int) (wrootattr.height - sy));
2408		2563
2409	XSync (disp, False);	2564	XSync (disp, False);
2410	allowedxerror = -1;	2565	allowedxerror = -1;
2411	image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);	2566	image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2412		2567
…		…
2417	if (image == NULL)	2572	if (image == NULL)
2418	{	2573	{
2419	if (am_transparent && am_pixmap_trans)	2574	if (am_transparent && am_pixmap_trans)
2420	{	2575	{
2421	pchanged = 1;	2576	pchanged = 1;
2422	if (TermWin.pixmap != None)	2577	if (pixmap != None)
2423	{	2578	{
2424	XFreePixmap (disp, TermWin.pixmap);	2579	XFreePixmap (disp, pixmap);
2425	TermWin.pixmap = None;	2580	pixmap = None;
2426	}	2581	}
2427	}	2582	}
2428		2583
2429	am_pixmap_trans = 0;	2584	am_pixmap_trans = 0;
2430	}	2585	}
2431	else	2586	else
2432	{	2587	{
2433	if (TermWin.pixmap != None)	2588	if (pixmap != None)
2434	XFreePixmap (disp, TermWin.pixmap);	2589	XFreePixmap (disp, pixmap);
2435		2590
2436	#if TINTING	2591	#if TINTING
2437	if (ISSET_PIXCOLOR (Color_tint))	2592	if (ISSET_PIXCOLOR (Color_tint))
2438	{	2593	{
2439	unsigned short rm, gm, bm;	2594	unsigned short rm, gm, bm;
…		…
2443		2598
2444	ShadeXImage (display, image, shade, rm, gm, bm);	2599	ShadeXImage (display, image, shade, rm, gm, bm);
2445	}	2600	}
2446	#endif	2601	#endif
2447		2602
2448	TermWin.pixmap = XCreatePixmap (disp, TermWin.vt,	2603	pixmap = XCreatePixmap (disp, vt,
2449	szHint.width, szHint.height, image->depth);	2604	szHint.width, szHint.height, image->depth);
2450	gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue);	2605	gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2451	XPutImage (disp, TermWin.pixmap, gc, image, 0, 0,	2606	XPutImage (disp, pixmap, gc, image, 0, 0,
2452	nx, ny, image->width, image->height);	2607	nx, ny, image->width, image->height);
2453	XFreeGC (disp, gc);	2608	XFreeGC (disp, gc);
2454	XDestroyImage (image);	2609	XDestroyImage (image);
2455	XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap);	2610	XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2456	XClearWindow (disp, TermWin.parent[0]);	2611	XClearWindow (disp, parent[0]);
2457		2612
2458	if (!am_transparent || !am_pixmap_trans)	2613	if (!am_transparent || !am_pixmap_trans)
2459	pchanged = 1;	2614	pchanged = 1;
2460		2615
2461	am_transparent = am_pixmap_trans = 1;	2616	am_transparent = am_pixmap_trans = 1;
2462	}	2617	}
2463	}	2618	}
2464		2619
2465	if (am_pixmap_trans)	2620	if (am_pixmap_trans)
2466	XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);	2621	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2467	else	2622	else
2468	{	2623	{
2469	unsigned int n;	2624	unsigned int n;
2470	/*	2625	/*
2471	* InheritPixmap transparency	2626	* InheritPixmap transparency
2472	*/	2627	*/
2473	for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)	2628	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2474	{	2629	{
2475	oldp = TermWin.parent[i];	2630	oldp = parent[i];
2476	XQueryTree (disp, TermWin.parent[i - 1], &root,	2631	XQueryTree (disp, parent[i - 1], &root,
2477	&TermWin.parent[i], &list, &n);	2632	&parent[i], &list, &n);
2478	XFree (list);	2633	XFree (list);
2479		2634
2480	if (TermWin.parent[i] == display->root)	2635	if (parent[i] == display->root)
2481	{	2636	{
2482	if (oldp != None)	2637	if (oldp != None)
2483	pchanged = 1;	2638	pchanged = 1;
2484		2639
2485	break;	2640	break;
2486	}	2641	}
2487		2642
2488	if (oldp != TermWin.parent[i])	2643	if (oldp != parent[i])
2489	pchanged = 1;	2644	pchanged = 1;
2490	}	2645	}
2491		2646
2492	n = 0;	2647	n = 0;
2493		2648
2494	if (pchanged)	2649	if (pchanged)
2495	{	2650	{
2496	for (; n < (unsigned int)i; n++)	2651	for (; n < (unsigned int)i; n++)
2497	{	2652	{
2498	XGetWindowAttributes (disp, TermWin.parent[n], &wattr);	2653	XGetWindowAttributes (disp, parent[n], &wattr);
2499	if (wattr.depth != rootdepth || wattr.c_class == InputOnly)	2654	if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2500	{	2655	{
2501	n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;	2656	n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2502	break;	2657	break;
2503	}	2658	}
2504	}	2659	}
2505	}	2660	}
2506		2661
2507	if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))	2662	if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2508	{	2663	{
2509	XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]);	2664	XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2510	XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);	2665	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2511	am_transparent = 0;	2666	am_transparent = 0;
2512	/* XXX: also turn off Opt_transparent? */	2667	/* XXX: also turn off Opt_transparent? */
2513	}	2668	}
2514	else	2669	else
2515	{	2670	{
…		…
2518	* needed for fvwm2.2.2 (and before?) */	2673	* needed for fvwm2.2.2 (and before?) */
2519	sleep (1);	2674	sleep (1);
2520	#endif	2675	#endif
2521	for (n = 0; n < (unsigned int)i; n++)	2676	for (n = 0; n < (unsigned int)i; n++)
2522	{	2677	{
2523	XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative);	2678	XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2524	XClearWindow (disp, TermWin.parent[n]);	2679	XClearWindow (disp, parent[n]);
2525	}	2680	}
2526		2681
2527	XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);	2682	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2528	am_transparent = 1;	2683	am_transparent = 1;
2529	}	2684	}
2530		2685
2531	for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)	2686	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2532	TermWin.parent[i] = None;	2687	parent[i] = None;
2533	}	2688	}
2534		2689
2535	if (scrollBar.win)	2690	if (scrollBar.win)
2536	{	2691	{
2537	XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);	2692	XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
…		…
2555	bool	2710	bool
2556	rxvt_term::cmd_parse ()	2711	rxvt_term::cmd_parse ()
2557	{	2712	{
2558	bool flag = false;	2713	bool flag = false;
2559	unicode_t ch = NOCHAR;	2714	unicode_t ch = NOCHAR;
2560	unsigned char *seq_begin; // remember start of esc-sequence here	2715	char *seq_begin; // remember start of esc-sequence here
2561		2716
2562	for (;;)	2717	for (;;)
2563	{	2718	{
2564	if (ch == NOCHAR)	2719	if (ch == NOCHAR)
2565	{	2720	{
2566	seq_begin = cmdbuf_ptr;	2721	seq_begin = cmdbuf_ptr;
2567	ch = next_char ();	2722	ch = next_char ();
2568	}
2569		2723
2570	if (ch == NOCHAR) // TODO: improve	2724	if (ch == NOCHAR)
2571	break;	2725	break;
		2726	}
2572		2727
2573	if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)	2728	if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2574	{	2729	{
2575	if (!seen_input)	2730	if (!seen_input)
2576	{	2731	{
…		…
2580	// some window managers resize the window early, and these programs	2735	// some window managers resize the window early, and these programs
2581	// then sometimes get the size wrong.	2736	// then sometimes get the size wrong.
2582	// unfortunately other programs are even more buggy and dislike	2737	// unfortunately other programs are even more buggy and dislike
2583	// being sent SIGWINCH, so only do it when we were in fact being	2738	// being sent SIGWINCH, so only do it when we were in fact being
2584	// resized.	2739	// resized.
2585	if (seen_resize)	2740	if (seen_resize && cmd_pid)
2586	kill (-cmd_pid, SIGWINCH);	2741	kill (-cmd_pid, SIGWINCH);
2587	}	2742	}
2588		2743
2589	/* Read a text string from the input buffer */	2744	/* Read a text string from the input buffer */
2590	unicode_t buf[UBUFSIZ];	2745	unicode_t buf[UBUFSIZ];
2591	bool refreshnow = false;	2746	bool refreshnow = false;
2592	int nlines = 0;	2747	int nlines = 0;
2593	unicode_t *str = buf;	2748	unicode_t *str = buf;
		2749	unicode_t *eol = str + min (ncol, UBUFSIZ);
2594		2750
2595	for (;;)	2751	for (;;)
2596	{	2752	{
2597	if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))	2753	if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2598	break;	2754	break;
2599		2755
2600	*str++ = ch;	2756	*str++ = ch;
2601		2757
2602	if (ch == C0_LF)	2758	if (ch == C0_LF || str >= eol)
2603	{	2759	{
		2760	if (ch == C0_LF)
2604	nlines++;	2761	nlines++;
		2762
2605	refresh_count++;	2763	refresh_count++;
2606		2764
2607	if (!(options & Opt_jumpScroll)	2765	if (!OPTION (Opt_jumpScroll)
2608	|| (refresh_count >= refresh_limit * (TermWin.nrow - 1)))	2766	|| (refresh_count >= refresh_limit * (nrow - 1)))
2609	{	2767	{
2610	refreshnow = true;	2768	refreshnow = true;
		2769	refresh_count = 0;
2611	ch = NOCHAR;	2770	ch = NOCHAR;
2612	break;	2771	break;
2613	}	2772	}
2614		2773
2615	// scr_add_lines only works for nlines <= TermWin.nrow - 1.	2774	// scr_add_lines only works for nlines <= nrow - 1.
2616	if (nlines >= TermWin.nrow - 1)	2775	if (nlines >= nrow - 1)
2617	{	2776	{
		2777	if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END)))
2618	scr_add_lines (buf, nlines, str - buf);	2778	scr_add_lines (buf, nlines, str - buf);
		2779
2619	nlines = 0;	2780	nlines = 0;
2620	str = buf;	2781	str = buf;
		2782	eol = str + min (ncol, UBUFSIZ);
2621	}	2783	}
2622	}
2623		2784
2624	if (str >= buf + UBUFSIZ)	2785	if (str >= eol)
2625	{	2786	{
		2787	if (eol >= buf + UBUFSIZ)
		2788	{
2626	ch = NOCHAR;	2789	ch = NOCHAR;
2627	break;	2790	break;
		2791	}
		2792	else
		2793	eol = min (eol + ncol, buf + UBUFSIZ);
		2794	}
		2795
2628	}	2796	}
2629		2797
2630	seq_begin = cmdbuf_ptr;	2798	seq_begin = cmdbuf_ptr;
2631	ch = next_char ();	2799	ch = next_char ();
2632	}	2800	}
2633		2801
		2802	if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END)))
2634	scr_add_lines (buf, nlines, str - buf);	2803	scr_add_lines (buf, nlines, str - buf);
2635		2804
2636	/*	2805	/*
2637	* If there have been a lot of new lines, then update the screen	2806	* If there have been a lot of new lines, then update the screen
2638	* What the heck I'll cheat and only refresh less than every page-full.	2807	* What the heck I'll cheat and only refresh less than every page-full.
2639	* the number of pages between refreshes is refresh_limit, which	2808	* the number of pages between refreshes is refresh_limit, which
2640	* is incremented here because we must be doing flat-out scrolling.	2809	* is incremented here because we must be doing flat-out scrolling.
2641	*/	2810	*/
2642	if (refreshnow)	2811	if (refreshnow)
2643	{	2812	{
2644	if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)	2813	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2645	refresh_limit++;	2814	refresh_limit++;
2646	else	2815	else
2647	{	2816	{
2648	flag = true;	2817	flag = true;
2649	scr_refresh (refresh_type);	2818	scr_refresh (refresh_type);
		2819	flush_ev.stop ();
2650	}	2820	}
2651	}	2821	}
2652		2822
2653	}	2823	}
2654	else	2824	else
…		…
2685	rxvt_term::next_char ()	2855	rxvt_term::next_char ()
2686	{	2856	{
2687	while (cmdbuf_ptr < cmdbuf_endp)	2857	while (cmdbuf_ptr < cmdbuf_endp)
2688	{	2858	{
2689	// assume 7-bit to be ascii ALWAYS	2859	// assume 7-bit to be ascii ALWAYS
2690	if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)	2860	if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2691	return *cmdbuf_ptr++;	2861	return *cmdbuf_ptr++;
2692		2862
2693	wchar_t wc;	2863	wchar_t wc;
2694	size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);	2864	size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2695		2865
2696	if (len == (size_t)-2)	2866	if (len == (size_t)-2)
2697	{	2867	{
2698	// the mbstate stores incomplete sequences. didn't know this :/	2868	// the mbstate stores incomplete sequences. didn't know this :/
2699	cmdbuf_ptr = cmdbuf_endp;	2869	cmdbuf_ptr = cmdbuf_endp;
…		…
2838	case C0_ESC:	3008	case C0_ESC:
2839	process_escape_seq ();	3009	process_escape_seq ();
2840	break;	3010	break;
2841	case C0_ENQ: /* terminal Status */	3011	case C0_ENQ: /* terminal Status */
2842	if (rs[Rs_answerbackstring])	3012	if (rs[Rs_answerbackstring])
2843	tt_write ((const unsigned char *)rs[Rs_answerbackstring],	3013	tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2844	(unsigned int)strlen (rs[Rs_answerbackstring]));
2845	else	3014	else
2846	tt_write ((unsigned char *)VT100_ANS,	3015	tt_write (VT100_ANS, strlen (VT100_ANS));
2847	(unsigned int)strlen (VT100_ANS));
2848	break;	3016	break;
2849	case C0_BEL: /* bell */	3017	case C0_BEL: /* bell */
2850	scr_bell ();	3018	scr_bell ();
2851	break;	3019	break;
2852	case C0_BS: /* backspace */	3020	case C0_BS: /* backspace */
…		…
3040	process_dcs_seq ();	3208	process_dcs_seq ();
3041	break;	3209	break;
3042		3210
3043	/* 8.3.110: SINGLE CHARACTER INTRODUCER */	3211	/* 8.3.110: SINGLE CHARACTER INTRODUCER */
3044	case C1_SCI: /* ESC Z */	3212	case C1_SCI: /* ESC Z */
3045	tt_write ((const unsigned char *)ESCZ_ANSWER,	3213	tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3046	(unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3047	break; /* steal obsolete ESC [ c */	3214	break; /* steal obsolete ESC [ c */
3048		3215
3049	/* 8.3.16: CONTROL SEQUENCE INTRODUCER */	3216	/* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3050	case C1_CSI: /* ESC [ */	3217	case C1_CSI: /* ESC [ */
3051	process_csi_seq ();	3218	process_csi_seq ();
…		…
3291		3458
3292	case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */	3459	case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3293	arg[0] = -arg[0];	3460	arg[0] = -arg[0];
3294	/* FALLTHROUGH */	3461	/* FALLTHROUGH */
3295	case CSI_SU: /* 8.3.148: (1) SCROLL UP */	3462	case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3296	scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);	3463	scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3297	break;	3464	break;
3298		3465
3299	case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */	3466	case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3300	tt_write ((const unsigned char *)VT100_ANS,	3467	tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3301	(unsigned int) (sizeof (VT100_ANS) - 1));
3302	break;	3468	break;
3303		3469
3304	case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */	3470	case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3305	process_sgr_mode (nargs, arg);	3471	process_sgr_mode (nargs, arg);
3306	break;	3472	break;
…		…
3313	break;	3479	break;
3314	case 6: /* CPR requested */	3480	case 6: /* CPR requested */
3315	scr_report_position ();	3481	scr_report_position ();
3316	break;	3482	break;
3317	case 7: /* unofficial extension */	3483	case 7: /* unofficial extension */
3318	if (options & Opt_insecure)	3484	if (OPTION (Opt_insecure))
3319	tt_printf ("%-.250s\012", rs[Rs_display_name]);	3485	tt_printf ("%-.250s\012", rs[Rs_display_name]);
3320	break;	3486	break;
3321	case 8: /* unofficial extension */	3487	case 8: /* unofficial extension */
3322	process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);	3488	process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3323	break;	3489	break;
…		…
3426	{	3592	{
3427	/*	3593	/*
3428	* commands	3594	* commands
3429	*/	3595	*/
3430	case 1: /* deiconify window */	3596	case 1: /* deiconify window */
3431	XMapWindow (disp, TermWin.parent[0]);	3597	XMapWindow (disp, parent[0]);
3432	break;	3598	break;
3433	case 2: /* iconify window */	3599	case 2: /* iconify window */
3434	XIconifyWindow (disp, TermWin.parent[0], display->screen);	3600	XIconifyWindow (disp, parent[0], display->screen);
3435	break;	3601	break;
3436	case 3: /* set position (pixels) */	3602	case 3: /* set position (pixels) */
3437	XMoveWindow (disp, TermWin.parent[0], args[1], args[2]);	3603	XMoveWindow (disp, parent[0], args[1], args[2]);
3438	break;	3604	break;
3439	case 4: /* set size (pixels) */	3605	case 4: /* set size (pixels) */
3440	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3606	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3441	break;	3607	break;
3442	case 5: /* raise window */	3608	case 5: /* raise window */
3443	XRaiseWindow (disp, TermWin.parent[0]);	3609	XRaiseWindow (disp, parent[0]);
3444	break;	3610	break;
3445	case 6: /* lower window */	3611	case 6: /* lower window */
3446	XLowerWindow (disp, TermWin.parent[0]);	3612	XLowerWindow (disp, parent[0]);
3447	break;	3613	break;
3448	case 7: /* refresh window */	3614	case 7: /* refresh window */
3449	scr_touch (true);	3615	scr_touch (true);
3450	break;	3616	break;
3451	case 8: /* set size (chars) */	3617	case 8: /* set size (chars) */
3452	set_widthheight ((unsigned int) (args[2] * TermWin.fwidth),	3618	set_widthheight ((unsigned int) (args[2] * fwidth),
3453	(unsigned int) (args[1] * TermWin.fheight));	3619	(unsigned int) (args[1] * fheight));
3454	break;	3620	break;
3455		3621
3456	//case 9: NYI, TODO, restore maximized window or maximize window	3622	//case 9: NYI, TODO, restore maximized window or maximize window
3457	default:	3623	default:
3458	if (args[0] >= 24) /* set height (chars) */	3624	if (args[0] >= 24) /* set height (chars) */
3459	set_widthheight ((unsigned int)TermWin.width,	3625	set_widthheight ((unsigned int)width,
3460	(unsigned int) (args[1] * TermWin.fheight));	3626	(unsigned int) (args[1] * fheight));
3461	break;	3627	break;
3462		3628
3463		3629
3464	/*	3630	/*
3465	* reports - some output format copied from XTerm	3631	* reports - some output format copied from XTerm
3466	*/	3632	*/
3467	case 11: /* report window state */	3633	case 11: /* report window state */
3468	XGetWindowAttributes (disp, TermWin.parent[0], &wattr);	3634	XGetWindowAttributes (disp, parent[0], &wattr);
3469	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3635	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3470	break;	3636	break;
3471	case 13: /* report window position */	3637	case 13: /* report window position */
3472	XGetWindowAttributes (disp, TermWin.parent[0], &wattr);	3638	XGetWindowAttributes (disp, parent[0], &wattr);
3473	XTranslateCoordinates (disp, TermWin.parent[0], wattr.root,	3639	XTranslateCoordinates (disp, parent[0], wattr.root,
3474	-wattr.border_width, -wattr.border_width,	3640	-wattr.border_width, -wattr.border_width,
3475	&x, &y, &wdummy);	3641	&x, &y, &wdummy);
3476	tt_printf ("\033[3;%d;%dt", x, y);	3642	tt_printf ("\033[3;%d;%dt", x, y);
3477	break;	3643	break;
3478	case 14: /* report window size (pixels) */	3644	case 14: /* report window size (pixels) */
3479	XGetWindowAttributes (disp, TermWin.parent[0], &wattr);	3645	XGetWindowAttributes (disp, parent[0], &wattr);
3480	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3646	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3481	break;	3647	break;
3482	case 18: /* report text area size (chars) */	3648	case 18: /* report text area size (chars) */
3483	tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);	3649	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3484	break;	3650	break;
3485	case 19: /* report window size (chars) */	3651	case 19: /* report window size (chars) */
3486	tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);	3652	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3487	break;	3653	break;
3488	case 20: /* report icon label */	3654	case 20: /* report icon label */
3489	{	3655	{
3490	char *s;	3656	char *s;
3491	XGetIconName (disp, TermWin.parent[0], &s);	3657	XGetIconName (disp, parent[0], &s);
3492	tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */	3658	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3493	XFree (s);	3659	XFree (s);
3494	}	3660	}
3495	break;	3661	break;
3496	case 21: /* report window title */	3662	case 21: /* report window title */
3497	{	3663	{
3498	char *s;	3664	char *s;
3499	XFetchName (disp, TermWin.parent[0], &s);	3665	XFetchName (disp, parent[0], &s);
3500	tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */	3666	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3501	XFree (s);	3667	XFree (s);
3502	}	3668	}
3503	break;	3669	break;
3504	}	3670	}
3505	}	3671	}
…		…
3508	/*----------------------------------------------------------------------*/	3674	/*----------------------------------------------------------------------*/
3509	/*	3675	/*
3510	* get input up until STRING TERMINATOR (or BEL)	3676	* get input up until STRING TERMINATOR (or BEL)
3511	* ends_how is terminator used. returned input must be free()'d	3677	* ends_how is terminator used. returned input must be free()'d
3512	*/	3678	*/
3513	unsigned char *	3679	char *
3514	rxvt_term::get_to_st (unicode_t &ends_how)	3680	rxvt_term::get_to_st (unicode_t &ends_how)
3515	{	3681	{
3516	unicode_t ch;	3682	unicode_t ch;
3517	bool seen_esc = false;	3683	bool seen_esc = false;
3518	unsigned int n = 0;	3684	unsigned int n = 0;
…		…
3537	else if (ch < 0x20)	3703	else if (ch < 0x20)
3538	return NULL; /* other control character - exit */	3704	return NULL; /* other control character - exit */
3539		3705
3540	seen_esc = false;	3706	seen_esc = false;
3541		3707
3542	if (n >= sizeof (string) - 1)	3708	if (n >= STRING_MAX - 1)
3543	// stop at some sane length	3709	// stop at some sane length
3544	return NULL;	3710	return NULL;
3545		3711
3546	if (ch == C0_SYN)	3712	if (ch == C0_SYN)
3547	string[n++] = cmd_get8 ();	3713	string[n++] = cmd_get8 ();
…		…
3551		3717
3552	string[n++] = '\0';	3718	string[n++] = '\0';
3553		3719
3554	ends_how = (ch == 0x5c ? C0_ESC : ch);	3720	ends_how = (ch == 0x5c ? C0_ESC : ch);
3555		3721
3556	return (unsigned char *)rxvt_wcstombs (string);	3722	return rxvt_wcstombs (string);
3557	}	3723	}
3558		3724
3559	/*----------------------------------------------------------------------*/	3725	/*----------------------------------------------------------------------*/
3560	/*	3726	/*
3561	* process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'	3727	* process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3562	*/	3728	*/
3563	void	3729	void
3564	rxvt_term::process_dcs_seq ()	3730	rxvt_term::process_dcs_seq ()
3565	{	3731	{
3566	unsigned char *s;	3732	char *s;
3567	unicode_t eh;	3733	unicode_t eh;
3568		3734
3569	/*	3735	/*
3570	* Not handled yet	3736	* Not handled yet
3571	*/	3737	*/
…		…
3590	for (arg = 0; isdigit (ch); ch = cmd_getc ())	3756	for (arg = 0; isdigit (ch); ch = cmd_getc ())
3591	arg = arg * 10 + (ch - '0');	3757	arg = arg * 10 + (ch - '0');
3592		3758
3593	if (ch == ';')	3759	if (ch == ';')
3594	{	3760	{
3595	unsigned char *s = get_to_st (eh);	3761	char *s = get_to_st (eh);
3596		3762
3597	if (s)	3763	if (s)
3598	{	3764	{
3599	process_xterm_seq (arg, (char *)s, eh);	3765	process_xterm_seq (arg, s, eh);
3600	free (s);	3766	free (s);
3601	}	3767	}
3602	}	3768	}
3603	}	3769	}
3604		3770
3605	void	3771	void
3606	rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)	3772	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3607	{	3773	{
3608	if (str[0] == '?' && !str[1])	3774	if (str[0] == '?' && !str[1])
3609	{	3775	{
3610	unsigned short r, g, b;	3776	unsigned short r, g, b;
3611	pix_colors_focused[color].get (display, r, g, b);	3777	pix_colors_focused[color].get (display, r, g, b);
…		…
3615	set_window_color (color, str);	3781	set_window_color (color, str);
3616	}	3782	}
3617		3783
3618	/*	3784	/*
3619	* XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)	3785	* XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3620	* 0 = change iconName/title
3621	* 1 = change iconName
3622	* 2 = change title
3623	* 4 = change color
3624	* 10 = change fg color
3625	* 11 = change bg color
3626	* 12 = change text color
3627	* 13 = change mouse foreground color
3628	* 17 = change highlight character colour
3629	* 18 = change bold character color
3630	* 19 = change underlined character color
3631	* 46 = change logfile (not implemented)
3632	* 50 = change font
3633	*
3634	* rxvt extensions:
3635	* 20 = bg pixmap
3636	* 39 = change default fg color
3637	* 49 = change default bg color
3638	* 55 = dump scrollback buffer and all of screen
3639	* 701 = change locale
3640	* 702 = find font
3641	* 703 = menu
3642	*/	3786	*/
3643	void	3787	void
3644	rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)	3788	rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3645	{	3789	{
3646	int changed = 0;	3790	int changed = 0;
3647	int color;	3791	int color;
3648	char *buf, *name;	3792	char *buf, *name;
3649	bool query = str[0] == '?' && !str[1];	3793	bool query = str[0] == '?' && !str[1];
…		…
3672	unsigned long bytes_after;	3816	unsigned long bytes_after;
3673	unsigned char *value = 0;	3817	unsigned char *value = 0;
3674	const char *str = "";	3818	const char *str = "";
3675		3819
3676	if (prop	3820	if (prop
3677	&& XGetWindowProperty (disp, TermWin.parent[0],	3821	&& XGetWindowProperty (disp, parent[0],
3678	prop, 0, 1<<16, 0, AnyPropertyType,	3822	prop, 0, 1<<16, 0, AnyPropertyType,
3679	&actual_type, &actual_format,	3823	&actual_type, &actual_format,
3680	&nitems, &bytes_after, &value) == Success	3824	&nitems, &bytes_after, &value) == Success
3681	&& actual_type != None	3825	&& actual_type != None
3682	&& actual_format == 8)	3826	&& actual_format == 8)
…		…
3694	{	3838	{
3695	*eq = 0;	3839	*eq = 0;
3696	set_utf8_property (display->atom (str), eq + 1);	3840	set_utf8_property (display->atom (str), eq + 1);
3697	}	3841	}
3698	else	3842	else
3699	XDeleteProperty (disp, TermWin.parent[0],	3843	XDeleteProperty (disp, parent[0],
3700	display->atom (str));	3844	display->atom (str));
3701	}	3845	}
3702	break;	3846	break;
3703		3847
3704	case XTerm_Color:	3848	case XTerm_Color:
…		…
3745	break;	3889	break;
3746	#ifndef NO_BOLD_UNDERLINE_REVERSE	3890	#ifndef NO_BOLD_UNDERLINE_REVERSE
3747	case XTerm_Color_BD:	3891	case XTerm_Color_BD:
3748	process_color_seq (XTerm_Color_BD, Color_BD, str, resp);	3892	process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3749	break;	3893	break;
3750	case XTerm_Color_IT:
3751	process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3752	break;
3753	case XTerm_Color_UL:	3894	case XTerm_Color_UL:
3754	process_color_seq (XTerm_Color_UL, Color_UL, str, resp);	3895	process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3755	break;	3896	break;
3756	case XTerm_Color_RV:	3897	case XTerm_Color_RV:
3757	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3898	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3758	break;	3899	break;
		3900	case URxvt_Color_IT:
		3901	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
		3902	break;
3759	#endif	3903	#endif
3760	#if TRANSPARENT && TINTING	3904	#if TRANSPARENT && TINTING
3761	case XTerm_Color_tint:	3905	case URxvt_Color_tint:
3762	process_color_seq (XTerm_Color_tint, Color_tint, str, resp);	3906	process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3763	check_our_parents ();	3907	check_our_parents ();
3764	if (am_transparent)	3908	if (am_transparent)
3765	want_full_refresh = want_refresh = 1;	3909	want_full_refresh = want_refresh = 1;
3766	break;	3910	break;
3767	#endif	3911	#endif
…		…
3801		3945
3802	case XTerm_logfile:	3946	case XTerm_logfile:
3803	// TODO, when secure mode?	3947	// TODO, when secure mode?
3804	break;	3948	break;
3805		3949
		3950	#ifdef MENUBAR
		3951	case URxvt_Menu:
		3952	if (OPTION (Opt_insecure))
		3953	menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
		3954	break;
		3955	#endif
		3956	#if 0
		3957	case XTerm_dumpscreen: /* no error notices */
		3958	{
		3959	int fd;
		3960	if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
		3961	{
		3962	scr_dump (fd);
		3963	close (fd);
		3964	}
		3965	}
		3966	break;
		3967	#endif
3806	case XTerm_font:	3968	case XTerm_font:
3807	op = URxvt_font;	3969	op = URxvt_font;
3808	case URxvt_font:	3970	case URxvt_font:
3809	#if ENABLE_STYLES	3971	#if ENABLE_STYLES
3810	case URxvt_boldFont:	3972	case URxvt_boldFont:
3811	case URxvt_italicFont:	3973	case URxvt_italicFont:
3812	case URxvt_boldItalicFont:	3974	case URxvt_boldItalicFont:
3813	#endif	3975	#endif
3814	if (query)	3976	if (query)
3815	tt_printf ("\33]%d;%-.250s%c", saveop,	3977	tt_printf ("\33]%d;%-.250s%c", saveop,
3816	(options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc	3978	OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3817	? TermWin.fontset[op - URxvt_font]->fontdesc : "",	3979	? fontset[op - URxvt_font]->fontdesc : "",
3818	resp);	3980	resp);
3819	else	3981	else
3820	{	3982	{
3821	const char *&res = rs[Rs_font + (op - URxvt_font)];	3983	const char *&res = rs[Rs_font + (op - URxvt_font)];
3822		3984
…		…
3825	set_fonts ();	3987	set_fonts ();
3826	}	3988	}
3827	break;	3989	break;
3828		3990
3829	#if ENABLE_FRILLS	3991	#if ENABLE_FRILLS
3830	case XTerm_locale:	3992	case URxvt_locale:
3831	if (query)	3993	if (query)
3832	tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);	3994	tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3833	else	3995	else
3834	{	3996	{
3835	set_locale (str);	3997	set_locale (str);
3836	pty.set_utf8_mode (enc_utf8);	3998	pty.set_utf8_mode (enc_utf8);
3837	# ifdef USE_XIM
3838	im_cb ();	3999	init_xlocale ();
3839	# endif
3840	}	4000	}
3841	break;	4001	break;
3842	#endif
3843		4002
3844	#ifdef MENUBAR	4003	case URxvt_view_up:
3845	case XTerm_Menu:	4004	case URxvt_view_down:
3846	if (options & Opt_insecure)	4005	{
3847	menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked	4006	int lines = atoi (str);
		4007
		4008	if (lines)
		4009	scr_page (op == URxvt_view_up ? UP : DN, lines);
		4010	else
		4011	scr_erase_savelines ();
		4012	}
		4013
3848	break;	4014	break;
3849	#endif	4015	#endif
3850	#if 0	4016
3851	case XTerm_dumpscreen: /* no error notices */	4017	#if ENABLE_PERL
3852	{	4018	case URxvt_perl:
3853	int fd;	4019	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END)))
3854	if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)	4020	; // no responses yet
3855	{
3856	scr_dump (fd);
3857	close (fd);
3858	}
3859	}
3860	break;	4021	break;
3861	#endif	4022	#endif
3862	}	4023	}
3863	}	4024	}
3864	/*----------------------------------------------------------------------*/	4025	/*----------------------------------------------------------------------*/
…		…
3973	}	4134	}
3974		4135
3975	/* extra handling for values with state unkept */	4136	/* extra handling for values with state unkept */
3976	switch (arg[i])	4137	switch (arg[i])
3977	{	4138	{
		4139	#if ENABLE_STYLES
		4140	case 1021:
		4141	if (mode)
		4142	SET_OPTION (Opt_intensityStyles);
		4143	else
		4144	CLR_OPTION (Opt_intensityStyles);
		4145
		4146	scr_touch (true);
		4147	break;
		4148	#endif
3978	case 1048: /* alternative cursor save */	4149	case 1048: /* alternative cursor save */
3979	case 1049:	4150	case 1049:
3980	if (options & Opt_secondaryScreen)	4151	if (OPTION (Opt_secondaryScreen))
3981	if (mode == 0)	4152	if (mode == 0)
3982	scr_cursor (RESTORE);	4153	scr_cursor (RESTORE);
3983	else if (mode == 1)	4154	else if (mode == 1)
3984	scr_cursor (SAVE);	4155	scr_cursor (SAVE);
3985	break;	4156	break;
…		…
3997	*/	4168	*/
3998	PrivMode (1, PrivMode_vt52);	4169	PrivMode (1, PrivMode_vt52);
3999	break;	4170	break;
4000	case 3: /* 80/132 */	4171	case 3: /* 80/132 */
4001	if (priv_modes & PrivMode_132OK)	4172	if (priv_modes & PrivMode_132OK)
4002	set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);	4173	set_widthheight (((state ? 132 : 80) * fwidth), height);
4003	break;	4174	break;
4004	case 4: /* smooth scrolling */	4175	case 4: /* smooth scrolling */
4005	if (state)	4176	if (!state)
4006	options &= ~Opt_jumpScroll;	4177	SET_OPTION (Opt_jumpScroll);
4007	else	4178	else
4008	options |= Opt_jumpScroll;	4179	CLR_OPTION (Opt_jumpScroll);
4009	break;	4180	break;
4010	case 5: /* reverse video */	4181	case 5: /* reverse video */
4011	scr_rvideo_mode (state);	4182	scr_rvideo_mode (state);
4012	break;	4183	break;
4013	case 6: /* relative/absolute origins */	4184	case 6: /* relative/absolute origins */
…		…
4054	#if 0	4225	#if 0
4055	case 1001:	4226	case 1001:
4056	break; /* X11 mouse highlighting */	4227	break; /* X11 mouse highlighting */
4057	#endif	4228	#endif
4058	case 1010: /* scroll to bottom on TTY output inhibit */	4229	case 1010: /* scroll to bottom on TTY output inhibit */
4059	if (state)	4230	if (!state)
4060	options &= ~Opt_scrollTtyOutput;	4231	SET_OPTION (Opt_scrollTtyOutput);
4061	else	4232	else
4062	options |= Opt_scrollTtyOutput;	4233	CLR_OPTION (Opt_scrollTtyOutput);
4063	break;	4234	break;
4064	case 1011: /* scroll to bottom on key press */	4235	case 1011: /* scroll to bottom on key press */
4065	if (state)	4236	if (state)
4066	options |= Opt_scrollTtyKeypress;	4237	SET_OPTION (Opt_scrollTtyKeypress);
4067	else	4238	else
4068	options &= ~Opt_scrollTtyKeypress;	4239	CLR_OPTION (Opt_scrollTtyKeypress);
4069	break;	4240	break;
4070	case 1047: /* secondary screen w/ clearing last */	4241	case 1047: /* secondary screen w/ clearing last */
4071	if (options & Opt_secondaryScreen)	4242	if (OPTION (Opt_secondaryScreen))
4072	if (current_screen != PRIMARY)	4243	if (current_screen != PRIMARY)
4073	scr_erase_screen (2);	4244	scr_erase_screen (2);
4074	scr_change_screen (state);	4245	scr_change_screen (state);
4075	break;	4246	break;
4076	case 1049: /* secondary screen w/ clearing first */	4247	case 1049: /* secondary screen w/ clearing first */
4077	scr_change_screen (state);	4248	scr_change_screen (state);
4078	if (options & Opt_secondaryScreen)	4249	if (OPTION (Opt_secondaryScreen))
4079	if (current_screen != PRIMARY)	4250	if (current_screen != PRIMARY)
4080	scr_erase_screen (2);	4251	scr_erase_screen (2);
4081	break;	4252	break;
4082	default:	4253	default:
4083	break;	4254	break;
…		…
4211	scr_color (Color_bg, Color_bg);	4382	scr_color (Color_bg, Color_bg);
4212	break;	4383	break;
4213		4384
4214	//case 50: // not variable spacing	4385	//case 50: // not variable spacing
4215		4386
4216	#ifndef NO_BRIGHTCOLOR	4387	#if ENABLE_FRILLS
4217	case 90:	4388	case 90:
4218	case 91: /* set bright fg color */	4389	case 91: /* set bright fg color */
4219	case 92:	4390	case 92:
4220	case 93:	4391	case 93:
4221	case 94:	4392	case 94:
…		…
4233	case 106:	4404	case 106:
4234	case 107:	4405	case 107:
4235	scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);	4406	scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4236	break;	4407	break;
4237	#endif	4408	#endif
4238
4239	}	4409	}
4240	}	4410	}
4241	}	4411	}
4242	/*}}} */	4412	/*}}} */
4243		4413
…		…
4267	*/	4437	*/
4268	void	4438	void
4269	rxvt_term::tt_printf (const char *fmt,...)	4439	rxvt_term::tt_printf (const char *fmt,...)
4270	{	4440	{
4271	va_list arg_ptr;	4441	va_list arg_ptr;
4272	unsigned char buf[256];	4442	char buf[256];
4273		4443
4274	va_start (arg_ptr, fmt);	4444	va_start (arg_ptr, fmt);
4275	vsnprintf ((char *)buf, 256, fmt, arg_ptr);	4445	vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4276	va_end (arg_ptr);	4446	va_end (arg_ptr);
4277	tt_write (buf, strlen (buf));	4447	tt_write (buf, strlen (buf));
…		…
4282	* or generated by us in response to a query ESC sequence.	4452	* or generated by us in response to a query ESC sequence.
4283	*/	4453	*/
4284	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT	4454	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4285		4455
4286	void	4456	void
4287	rxvt_term::tt_write (const unsigned char *data, unsigned int len)	4457	rxvt_term::tt_write (const char *data, unsigned int len)
4288	{	4458	{
		4459	if (pty.pty < 0)
		4460	return;
		4461
4289	if (v_buflen == 0)	4462	if (v_buflen == 0)
4290	{	4463	{
4291	ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));	4464	ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4292		4465
4293	if ((unsigned int)written == len)	4466	if ((unsigned int)written == len)
…		…
4295		4468
4296	data += written;	4469	data += written;
4297	len -= written;	4470	len -= written;
4298	}	4471	}
4299		4472
4300	v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);	4473	v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4301		4474
4302	memcpy (v_buffer + v_buflen, data, len);	4475	memcpy (v_buffer + v_buflen, data, len);
4303	v_buflen += len;	4476	v_buflen += len;
4304		4477
4305	pty_ev.set (EVENT_READ | EVENT_WRITE);	4478	pty_ev.set (EVENT_READ | EVENT_WRITE);
…		…
4324	}	4497	}
4325		4498
4326	memmove (v_buffer, v_buffer + written, v_buflen);	4499	memmove (v_buffer, v_buffer + written, v_buflen);
4327	}	4500	}
4328	else if (written != -1 || (errno != EAGAIN && errno != EINTR))	4501	else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4329	// original code just ignores this...	4502	pty_ev.set (EVENT_READ);
4330	destroy ();
4331	}	4503	}
4332		4504
4333	/*----------------------- end-of-file (C source) -----------------------*/	4505	/*----------------------- end-of-file (C source) -----------------------*/
4334		4506

Diff Legend

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