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.199 by root, Sun Feb 20 02:00:43 2005 UTC vs.
Revision 1.243 by root, Fri Jan 6 05:43:36 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-2005 Marc Lehmann <pcg@goof.com>	30	* Copyright (c) 2003-2006 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
…		…
135	rxvt_term::iso14755_54 (int x, int y)	141	rxvt_term::iso14755_54 (int x, int y)
136	{	142	{
137	x = Pixel2Col (x);	143	x = Pixel2Col (x);
138	y = Pixel2Row (y);	144	y = Pixel2Row (y);
139		145
140	if (x < 0 || x >= TermWin.ncol	146	if (!IN_RANGE_EXC (x, 0, ncol)
141	|| y < 0 || y >= TermWin.nrow)	147	|| !IN_RANGE_EXC (y, 0, nrow))
142	return;	148	return;
143		149
144	for (;;)	150	for (;;)
145	{	151	{
146	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];
147		155
148	if (t != NOCHAR || !x)	156	if (t != NOCHAR || !x)
149	{	157	{
150	iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x],	158	iso14755_51 (l.t[x], l.r[x], x, y);
151	screen.rend[y + TermWin.saveLines - TermWin.view_start][x]);
152	iso14755buf = ISO_14755_54;	159	iso14755buf = ISO_14755_54;
153	break;	160	break;
154	}	161	}
155		162
156	x--;	163	x--;
157	}	164	}
158
159	}	165	}
160	#endif
161		166
162	#if ENABLE_OVERLAY
163	void	167	void
164	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)
165	{	169	{
166	rxvt_fontset *fs = FONTSET (r);	170	rxvt_fontset *fs = FONTSET (r);
167	rxvt_font *f = (*fs)[fs->find_font (ch)];	171	rxvt_font *f = (*fs)[fs->find_font (ch)];
168	wchar_t *chr, *alloc, ch2;	172	wchar_t *chr, *alloc, ch2, *fname;
169	int len;	173	int len;
170		174
		175	fname = rxvt_utf8towcs (f->name);
		176
171	#if ENABLE_COMBINING	177	# if ENABLE_COMBINING
172	if (IS_COMPOSE (ch))	178	if (IS_COMPOSE (ch))
173	{	179	{
174	len = rxvt_composite.expand (ch, 0);	180	len = rxvt_composite.expand (ch, 0);
175	alloc = chr = new wchar_t[len];	181	alloc = chr = new wchar_t[len];
176	rxvt_composite.expand (ch, chr);	182	rxvt_composite.expand (ch, chr);
177	}	183	}
178	else	184	else
179	#endif	185	# endif
180	{	186	{
181	ch2 = ch;	187	ch2 = ch;
182		188
183	alloc = 0;	189	alloc = 0;
184	chr = &ch2;	190	chr = &ch2;
185	len = 1;	191	len = 1;
186	}	192	}
187		193
188	int width = strlen (f->name);	194	char attr[80]; // plenty
189		195
190	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);
191		218
192	r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));	219	r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
193		220
194	for (int y = 0; y < len; y++)	221	for (int y = 0; y < len; y++)
195	{	222	{
…		…
198	ch = *chr++;	225	ch = *chr++;
199		226
200	sprintf (buf, "%8x", ch);	227	sprintf (buf, "%8x", ch);
201	scr_overlay_set (0, y, buf);	228	scr_overlay_set (0, y, buf);
202	scr_overlay_set (9, y, '=');	229	scr_overlay_set (9, y, '=');
203	#if !UNICODE3	230	# if !UNICODE3
204	if (ch >= 0x10000)	231	if (ch >= 0x10000)
205	ch = 0xfffd;	232	ch = 0xfffd;
206	#endif	233	# endif
207	scr_overlay_set (11, y, ch, r);	234	scr_overlay_set (11, y, ch, r);
208	scr_overlay_set (12, y, NOCHAR, r);	235	scr_overlay_set (12, y, NOCHAR, r);
209	}	236	}
210		237
		238	scr_overlay_set (0, len , attr);
211	scr_overlay_set (0, len, f->name);	239	scr_overlay_set (0, len + 1, fname);
212		240
		241	free (fname);
		242
213	#if ENABLE_COMBINING	243	# if ENABLE_COMBINING
214	if (alloc)	244	if (alloc)
215	delete [] alloc;	245	delete [] alloc;
216	#endif	246	# endif
217	}	247	}
218	#endif	248	#endif
219		249
220	void	250	void
221	rxvt_term::commit_iso14755 ()	251	rxvt_term::commit_iso14755 ()
…		…
238	mb[0] = ch[0];	268	mb[0] = ch[0];
239	len = 1;	269	len = 1;
240	}	270	}
241		271
242	if (len > 0)	272	if (len > 0)
243	tt_write ((unsigned char *)mb, len);	273	tt_write (mb, len);
244	else	274	else
245	scr_bell ();	275	scr_bell ();
246	}	276	}
247		277
248	iso14755buf = 0;	278	iso14755buf = 0;
…		…
276	KeySym keysym;	306	KeySym keysym;
277	#ifdef DEBUG_CMD	307	#ifdef DEBUG_CMD
278	static int debug_key = 1; /* accessible by a debugger only */	308	static int debug_key = 1; /* accessible by a debugger only */
279	#endif	309	#endif
280	int valid_keysym;	310	int valid_keysym;
281	unsigned char kbuf[KBUFSZ];	311	char kbuf[KBUFSZ];
282		312
283	/*	313	/*
284	* 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
285	* escape sequence to toggle the Keypad.	315	* escape sequence to toggle the Keypad.
286	*	316	*
…		…
304	Status status_return;	334	Status status_return;
305		335
306	#if 0	336	#if 0
307	#ifdef X_HAVE_UTF8_STRING	337	#ifdef X_HAVE_UTF8_STRING
308	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
309	len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf,	339	len = Xutf8LookupString (Input_Context, &ev, kbuf,
310	KBUFSZ, &keysym, &status_return);	340	KBUFSZ, &keysym, &status_return);
311	else	341	else
312	#endif	342	#endif
313	#endif	343	#endif
314	{	344	{
…		…
316		346
317	// the XOpenIM manpage lies about hardcoding the locale	347	// the XOpenIM manpage lies about hardcoding the locale
318	// at the point of XOpenIM, so temporarily switch locales	348	// at the point of XOpenIM, so temporarily switch locales
319	if (rs[Rs_imLocale])	349	if (rs[Rs_imLocale])
320	SET_LOCALE (rs[Rs_imLocale]);	350	SET_LOCALE (rs[Rs_imLocale]);
		351
321	// assume wchar_t == unicode or better	352	// assume wchar_t == unicode or better
322	len = XwcLookupString (Input_Context, &ev, wkbuf,	353	len = XwcLookupString (Input_Context, &ev, wkbuf,
323	KBUFSZ, &keysym, &status_return);	354	KBUFSZ, &keysym, &status_return);
		355
324	if (rs[Rs_imLocale])	356	if (rs[Rs_imLocale])
325	SET_LOCALE (locale);	357	SET_LOCALE (locale);
326		358
327	if (status_return == XLookupChars	359	if (status_return == XLookupChars
328	|| status_return == XLookupBoth)	360	|| status_return == XLookupBoth)
…		…
349	|| status_return == XLookupBoth;	381	|| status_return == XLookupBoth;
350	}	382	}
351	else	383	else
352	#endif	384	#endif
353	{	385	{
354	len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose);	386	len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
355	valid_keysym = keysym != NoSymbol;	387	valid_keysym = keysym != NoSymbol;
356	}	388	}
357		389
358	if (valid_keysym)	390	if (valid_keysym)
359	{	391	{
360	#ifdef KEYSYM_RESOURCE	392	#ifdef KEYSYM_RESOURCE
361	if (keyboard->dispatch (this, keysym, ev.state))	393	if (keyboard->dispatch (this, keysym, ev.state))
362	return;	394	return;
363	#endif	395	#endif
364		396
365	if (TermWin.saveLines)	397	if (saveLines)
366	{	398	{
367	#ifdef UNSHIFTED_SCROLLKEYS	399	#ifdef UNSHIFTED_SCROLLKEYS
368	if (!ctrl && !meta)	400	if (!ctrl && !meta)
369	#else	401	#else
370	if (IS_SCROLL_MOD)	402	if (IS_SCROLL_MOD)
371	#endif	403	#endif
372	{	404	{
373	int lnsppg;	405	int lnsppg;
374		406
375	#ifdef PAGING_CONTEXT_LINES	407	#ifdef PAGING_CONTEXT_LINES
376	lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES;	408	lnsppg = nrow - PAGING_CONTEXT_LINES;
377	#else	409	#else
378	lnsppg = TermWin.nrow * 4 / 5;	410	lnsppg = nrow * 4 / 5;
379	#endif	411	#endif
380	if (keysym == XK_Prior)	412	if (keysym == XK_Prior)
381	{	413	{
382	scr_page (UP, lnsppg);	414	scr_page (UP, lnsppg);
383	return;	415	return;
…		…
823	{	855	{
824	#ifdef META8_OPTION	856	#ifdef META8_OPTION
825	/* set 8-bit on */	857	/* set 8-bit on */
826	if (meta && (meta_char == 0x80))	858	if (meta && (meta_char == 0x80))
827	{	859	{
828	unsigned char *ch;	860	char *ch;
829		861
830	for (ch = kbuf; ch < kbuf + len; ch++)	862	for (ch = kbuf; ch < kbuf + len; ch++)
831	*ch |= 0x80;	863	*ch |= 0x80;
832		864
833	meta = 0;	865	meta = 0;
…		…
835	#endif	867	#endif
836	/* nil */ ;	868	/* nil */ ;
837	}	869	}
838	}	870	}
839		871
		872	if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_STRING_LEN, kbuf, len, DT_END)))
		873	return;
		874
840	if (len <= 0)	875	if (len <= 0)
841	return; /* not mapped */	876	return; /* not mapped */
842		877
843	if (options & Opt_scrollTtyKeypress)	878	if (OPTION (Opt_scrollTtyKeypress))
844	if (TermWin.view_start)	879	if (view_start)
845	{	880	{
846	TermWin.view_start = 0;	881	view_start = 0;
847	want_refresh = 1;	882	want_refresh = 1;
848	}	883	}
849		884
850	/*	885	/*
851	* these modifications only affect the static keybuffer	886	* these modifications only affect the static keybuffer
…		…
866	#ifdef META8_OPTION	901	#ifdef META8_OPTION
867	&& meta_char == C0_ESC	902	&& meta_char == C0_ESC
868	#endif	903	#endif
869	)	904	)
870	{	905	{
871	const unsigned char ch = C0_ESC;	906	const char ch = C0_ESC;
872	tt_write (&ch, 1);	907	tt_write (&ch, 1);
873	}	908	}
874		909
875	#if defined(DEBUG_CMD)	910	#if defined(DEBUG_CMD)
876	/* Display keyboard buffer contents */	911	/* Display keyboard buffer contents */
…		…
888		923
889	#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)	924	#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
890	/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */	925	/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
891	/* attempt to `write' count to the input buffer */	926	/* attempt to `write' count to the input buffer */
892	unsigned int	927	unsigned int
893	rxvt_term::cmd_write (const unsigned char *str, unsigned int count)	928	rxvt_term::cmd_write (const char *str, unsigned int count)
894	{	929	{
895	unsigned int n, s;	930	unsigned int n, s;
896		931
897	n = cmdbuf_ptr - cmdbuf_base;	932	n = cmdbuf_ptr - cmdbuf_base;
898	s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;	933	s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
…		…
935	}	970	}
936	#endif	971	#endif
937		972
938	if (want_refresh)	973	if (want_refresh)
939	{	974	{
		975	if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
		976	{
		977	int row = -view_start;
		978
		979	while (row > -nsaved && ROW (row - 1).is_longer ())
		980	--row;
		981
		982	while (row < -view_start + nrow)
		983	{
		984	int start_row = row;
		985	line_t *l;
		986
		987	do
		988	{
		989	l = &ROW (row);
		990
		991	if (!(l->f & LINE_FILTERED))
		992	{
		993	// line not filtered, mark it as filtered
		994	l->f |= LINE_FILTERED;
		995	while (l->is_longer ())
		996	{
		997	l = &ROW (++row);
		998	l->f |= LINE_FILTERED;
		999	}
		1000
		1001	// and filter it
		1002	HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
		1003
		1004	break;
		1005	}
		1006	}
		1007	while (l->is_longer ());
		1008
		1009	row++;
		1010	}
		1011
		1012	}
		1013
940	scr_refresh (refresh_type);	1014	scr_refresh (refresh_type);
941	scrollbar_show (1);	1015	scrollbar_show (1);
942	#ifdef USE_XIM	1016	#ifdef USE_XIM
943	IMSendSpot ();	1017	IMSendSpot ();
944	#endif	1018	#endif
…		…
954	SET_LOCALE (locale);	1028	SET_LOCALE (locale);
955		1029
956	display->flush ();	1030	display->flush ();
957		1031
958	if (want_refresh && !flush_ev.active)	1032	if (want_refresh && !flush_ev.active)
959	flush_ev.start (NOW + 0.01);	1033	flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
960	}	1034	}
961		1035
962	void	1036	void
963	rxvt_term::flush_cb (time_watcher &w)	1037	rxvt_term::flush_cb (time_watcher &w)
964	{	1038	{
…		…
1028	{	1102	{
1029	if (mouse_slip_wheel_speed == 0	1103	if (mouse_slip_wheel_speed == 0
1030	|| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)	1104	|| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1031	: scr_page (UP, mouse_slip_wheel_speed))	1105	: scr_page (UP, mouse_slip_wheel_speed))
1032	{	1106	{
1033	if (TermWin.view_start == TermWin.nscrolled ||	1107	if (view_start == nsaved ||
1034	TermWin.view_start == 0)	1108	view_start == 0)
1035	mouse_slip_wheel_speed = 0;	1109	mouse_slip_wheel_speed = 0;
1036		1110
1037	refresh_type |= SMOOTH_REFRESH;	1111	refresh_type |= SMOOTH_REFRESH;
1038	want_refresh = 1;	1112	want_refresh = 1;
1039	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1113	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1040	}	1114	}
1041	}	1115	}
1042	#endif	1116	#endif
1043		1117
		1118	#if HAVE_SCHED_YIELD
		1119	static struct event_handler
		1120	{
		1121	check_watcher cw_yield;
		1122
		1123	void yield (check_watcher &w)
		1124	{
		1125	sched_yield ();
		1126	w.stop ();
		1127	}
		1128
		1129	event_handler ()
		1130	: cw_yield (this, &event_handler::yield)
		1131	{
		1132	}
		1133	} event_handler;
		1134	#endif
		1135
1044	bool	1136	bool
1045	rxvt_term::pty_fill ()	1137	rxvt_term::pty_fill ()
1046	{	1138	{
1047	ssize_t n = cmdbuf_endp - cmdbuf_ptr;	1139	ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1048		1140
1049	if (CBUFSIZ == n)	1141	if (CBUFSIZ == n)
1050	{	1142	{
1051	rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n");	1143	rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1052	n = 0;	1144	n = 0;
1053	}	1145	}
1054		1146
1055	memmove (cmdbuf_base, cmdbuf_ptr, n);	1147	memmove (cmdbuf_base, cmdbuf_ptr, n);
1056	cmdbuf_ptr = cmdbuf_base;	1148	cmdbuf_ptr = cmdbuf_base;
1057	cmdbuf_endp = cmdbuf_ptr + n;	1149	cmdbuf_endp = cmdbuf_ptr + n;
1058		1150
1059	n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);	1151	ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
1060		1152
1061	if (n > 0)	1153	if (r > 0)
1062	{	1154	{
1063	cmdbuf_endp += n;	1155	cmdbuf_endp += r;
1064	return true;	1156	return true;
1065	}	1157	}
1066	else if (n < 0 && errno != EAGAIN)	1158	else if (r < 0 && (errno == EAGAIN || errno == EINTR))
		1159	{
		1160	#if HAVE_SCHED_YIELD
		1161	if (display->is_local)
		1162	event_handler.cw_yield.start ();
		1163	#endif
		1164	}
		1165	else
		1166	{
		1167	pty_ev.stop ();
		1168
		1169	if (!OPTION (Opt_hold))
1067	destroy ();	1170	destroy ();
		1171	}
1068		1172
1069	return false;	1173	return false;
1070	}	1174	}
1071		1175
1072	void	1176	void
…		…
1086	}	1190	}
1087		1191
1088	void	1192	void
1089	rxvt_term::pointer_unblank ()	1193	rxvt_term::pointer_unblank ()
1090	{	1194	{
1091	XDefineCursor (display->display, TermWin.vt, TermWin_cursor);	1195	XDefineCursor (display->display, vt, TermWin_cursor);
1092	recolour_cursor ();	1196	recolour_cursor ();
1093		1197
1094	#ifdef POINTER_BLANK	1198	#ifdef POINTER_BLANK
1095	hidden_pointer = 0;	1199	hidden_pointer = 0;
1096		1200
1097	if (options & Opt_pointerBlank)	1201	if (OPTION (Opt_pointerBlank))
1098	pointer_ev.start (NOW + pointerBlankDelay);	1202	pointer_ev.start (NOW + pointerBlankDelay);
1099	#endif	1203	#endif
1100	}	1204	}
1101		1205
1102	#ifdef POINTER_BLANK	1206	#ifdef POINTER_BLANK
1103	void	1207	void
1104	rxvt_term::pointer_blank ()	1208	rxvt_term::pointer_blank ()
1105	{	1209	{
1106	if (! (options & Opt_pointerBlank))	1210	if (!OPTION (Opt_pointerBlank))
1107	return;	1211	return;
1108		1212
1109	XDefineCursor (display->display, TermWin.vt, display->blank_cursor);	1213	XDefineCursor (display->display, vt, display->blank_cursor);
1110	XFlush (display->display);	1214	XFlush (display->display);
1111		1215
1112	hidden_pointer = 1;	1216	hidden_pointer = 1;
1113	}	1217	}
1114		1218
…		…
1209		1313
1210	SET_R (this);	1314	SET_R (this);
1211	SET_LOCALE (locale);	1315	SET_LOCALE (locale);
1212		1316
1213	#if defined(CURSOR_BLINK)	1317	#if defined(CURSOR_BLINK)
1214	if ((options & Opt_cursorBlink) && ev.type == KeyPress)	1318	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1215	{	1319	{
1216	if (hidden_cursor)	1320	if (hidden_cursor)
1217	{	1321	{
1218	hidden_cursor = 0;	1322	hidden_cursor = 0;
1219	want_refresh = 1;	1323	want_refresh = 1;
…		…
1222	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1326	cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1223	}	1327	}
1224	#endif	1328	#endif
1225		1329
1226	#if defined(POINTER_BLANK)	1330	#if defined(POINTER_BLANK)
1227	if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)	1331	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1228	{	1332	{
1229	if (ev.type == MotionNotify	1333	if (ev.type == MotionNotify
1230	|| ev.type == ButtonPress	1334	|| ev.type == ButtonPress
1231	|| ev.type == ButtonRelease)	1335	|| ev.type == ButtonRelease)
1232	if (hidden_pointer)	1336	if (hidden_pointer)
…		…
1311	else	1415	else
1312	iso14755buf = 0;	1416	iso14755buf = 0;
1313	}	1417	}
1314	#endif	1418	#endif
1315		1419
		1420	if (ev.xany.window == vt && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_END)))
		1421	break;
		1422
1316	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	1423	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1317	if (!(ev.xkey.state & ControlMask))	1424	if (!(ev.xkey.state & ControlMask))
1318	slip_wheel_ev.stop ();	1425	slip_wheel_ev.stop ();
1319	else if (ks == XK_Control_L || ks == XK_Control_R)	1426	else if (ks == XK_Control_L || ks == XK_Control_R)
1320	mouse_slip_wheel_speed = 0;	1427	mouse_slip_wheel_speed = 0;
…		…
1330	button_release (ev.xbutton);	1437	button_release (ev.xbutton);
1331	break;	1438	break;
1332		1439
1333	case ClientMessage:	1440	case ClientMessage:
1334	if (ev.xclient.format == 32	1441	if (ev.xclient.format == 32
1335	&& ev.xclient.message_type == xa[XA_WM_PROTOCOLS]	1442	&& ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
		1443	{
1336	&& ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])	1444	if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1337	destroy ();	1445	destroy ();
		1446	#if ENABLE_EWMH
		1447	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
		1448	XSendEvent (disp, ev.xclient.window = display->root,
		1449	False, SubstructureRedirectMask | SubstructureNotifyMask,
		1450	&ev);
		1451	#endif
		1452	}
1338	#if ENABLE_XEMBED	1453	#if ENABLE_XEMBED
1339	else if (ev.xclient.format == 32	1454	else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1340	&& ev.xclient.message_type == xa[XA_XEMBED])
1341	{	1455	{
1342	if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)	1456	if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1343	focus_in ();	1457	focus_in ();
1344	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)	1458	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1345	focus_out ();	1459	focus_out ();
…		…
1409	case FocusOut:	1523	case FocusOut:
1410	focus_out ();	1524	focus_out ();
1411	break;	1525	break;
1412		1526
1413	case ConfigureNotify:	1527	case ConfigureNotify:
1414	if (ev.xconfigure.window == TermWin.parent[0])	1528	if (ev.xconfigure.window == parent[0])
1415	{	1529	{
1416	int height, width;
1417
1418	do
1419	{ /* Wrap lots of configures into one */
1420	width = ev.xconfigure.width;
1421	height = ev.xconfigure.height;
1422	D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1423	}
1424	while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev));	1530	while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
		1531	;
1425		1532
1426	if (szHint.width != width || szHint.height != height)	1533	if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1427	{	1534	{
1428	seen_resize = 1;	1535	seen_resize = 1;
1429	resize_all_windows (width, height, 1);	1536	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1430	}	1537	}
1431		1538
1432	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */	1539	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1433	if (options & Opt_transparent)	1540	if (OPTION (Opt_transparent))
1434	check_our_parents ();	1541	check_our_parents ();
1435	#endif	1542	#endif
1436	}	1543	}
1437	break;	1544	break;
1438		1545
…		…
1455	case SelectionRequest:	1562	case SelectionRequest:
1456	selection_send (ev.xselectionrequest);	1563	selection_send (ev.xselectionrequest);
1457	break;	1564	break;
1458		1565
1459	case UnmapNotify:	1566	case UnmapNotify:
1460	TermWin.mapped = 0;	1567	mapped = 0;
1461	#ifdef TEXT_BLINK	1568	#ifdef TEXT_BLINK
1462	text_blink_ev.stop ();	1569	text_blink_ev.stop ();
1463	#endif	1570	#endif
1464	break;	1571	break;
1465		1572
1466	case MapNotify:	1573	case MapNotify:
1467	TermWin.mapped = 1;	1574	mapped = 1;
1468	#ifdef TEXT_BLINK	1575	#ifdef TEXT_BLINK
1469	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);	1576	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1470	#endif	1577	#endif
1471	break;	1578	break;
1472		1579
…		…
1476	break;	1583	break;
1477	#endif /* TRANSPARENT */	1584	#endif /* TRANSPARENT */
1478		1585
1479	case GraphicsExpose:	1586	case GraphicsExpose:
1480	case Expose:	1587	case Expose:
1481	if (ev.xany.window == TermWin.vt)	1588	if (ev.xany.window == vt)
1482	{	1589	{
1483	do	1590	do
1484	scr_expose (ev.xexpose.x, ev.xexpose.y,	1591	scr_expose (ev.xexpose.x, ev.xexpose.y,
1485	ev.xexpose.width, ev.xexpose.height, False);	1592	ev.xexpose.width, ev.xexpose.height, False);
1486	while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev));	1593	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1487		1594
1488	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1595	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1489		1596
1490	while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev))	1597	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1491	scr_expose (ev.xexpose.x, ev.xexpose.y,	1598	scr_expose (ev.xexpose.x, ev.xexpose.y,
1492	ev.xexpose.width, ev.xexpose.height, False);	1599	ev.xexpose.width, ev.xexpose.height, False);
1493		1600
1494	scr_refresh (refresh_type);	1601	scr_refresh (refresh_type);
1495	}	1602	}
…		…
1511	if (menubar_visible () && isMenuBarWindow (ev.xany.window))	1618	if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1512	menubar_expose ();	1619	menubar_expose ();
1513	#endif	1620	#endif
1514		1621
1515	#ifdef TRANSPARENT	1622	#ifdef TRANSPARENT
1516	if (am_transparent && ev.xany.window == TermWin.parent[0])	1623	if (am_transparent && ev.xany.window == parent[0])
1517	XClearWindow (disp, ev.xany.window);	1624	XClearWindow (disp, ev.xany.window);
1518	#endif	1625	#endif
1519	}	1626	}
1520	break;	1627	break;
1521		1628
…		…
1532	}	1639	}
1533	#endif	1640	#endif
1534	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)	1641	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1535	break;	1642	break;
1536		1643
1537	if (ev.xany.window == TermWin.vt)	1644	if (ev.xany.window == vt)
1538	{	1645	{
		1646	if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
		1647	; // nop
1539	if (ev.xbutton.state & (Button1Mask | Button3Mask))	1648	else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1540	{	1649	{
1541	while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev))	1650	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1542	;	1651	;
1543		1652
1544	XQueryPointer (disp, TermWin.vt,	1653	XQueryPointer (disp, vt,
1545	&unused_root, &unused_child,	1654	&unused_root, &unused_child,
1546	&unused_root_x, &unused_root_y,	1655	&unused_root_x, &unused_root_y,
1547	&ev.xbutton.x, &ev.xbutton.y,	1656	&ev.xbutton.x, &ev.xbutton.y,
1548	&ev.xbutton.state);	1657	&ev.xbutton.state);
1549	#ifdef MOUSE_THRESHOLD	1658	#ifdef MOUSE_THRESHOLD
…		…
1561	#endif	1670	#endif
1562	selection_extend (ev.xbutton.x, ev.xbutton.y,	1671	selection_extend (ev.xbutton.x, ev.xbutton.y,
1563	ev.xbutton.state & Button3Mask ? 2 : 0);	1672	ev.xbutton.state & Button3Mask ? 2 : 0);
1564		1673
1565	#ifdef SELECTION_SCROLLING	1674	#ifdef SELECTION_SCROLLING
1566	if (ev.xbutton.y < TermWin.int_bwidth	1675	if (ev.xbutton.y < int_bwidth
1567	|| Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))	1676	|| Pixel2Row (ev.xbutton.y) > (nrow-1))
1568	{	1677	{
1569	int dist;	1678	int dist;
1570		1679
1571	/* don't clobber the current delay if we are	1680	/* don't clobber the current delay if we are
1572	* already in the middle of scrolling.	1681	* already in the middle of scrolling.
…		…
1580	selection_save_x = ev.xbutton.x;	1689	selection_save_x = ev.xbutton.x;
1581	selection_save_y = ev.xbutton.y;	1690	selection_save_y = ev.xbutton.y;
1582	selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;	1691	selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1583		1692
1584	/* calc number of lines to scroll */	1693	/* calc number of lines to scroll */
1585	if (ev.xbutton.y < TermWin.int_bwidth)	1694	if (ev.xbutton.y < int_bwidth)
1586	{	1695	{
1587	scroll_selection_dir = UP;	1696	scroll_selection_dir = UP;
1588	dist = TermWin.int_bwidth - ev.xbutton.y;	1697	dist = int_bwidth - ev.xbutton.y;
1589	}	1698	}
1590	else	1699	else
1591	{	1700	{
1592	scroll_selection_dir = DN;	1701	scroll_selection_dir = DN;
1593	dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height);	1702	dist = ev.xbutton.y - (int_bwidth + height);
1594	}	1703	}
1595		1704
1596	scroll_selection_lines = Pixel2Height (dist)	1705	scroll_selection_lines = Pixel2Height (dist)
1597	/ SELECTION_SCROLL_LINE_SPEEDUP	1706	/ SELECTION_SCROLL_LINE_SPEEDUP
1598	+ 1;	1707	+ 1;
1599	MIN_IT (scroll_selection_lines,	1708	min_it (scroll_selection_lines,
1600	SELECTION_SCROLL_MAX_LINES);	1709	SELECTION_SCROLL_MAX_LINES);
1601	}	1710	}
1602	else	1711	else
1603	{	1712	{
1604	/* we are within the text window, so we	1713	/* we are within the text window, so we
…		…
1635	}	1744	}
1636		1745
1637	void	1746	void
1638	rxvt_term::focus_in ()	1747	rxvt_term::focus_in ()
1639	{	1748	{
1640	if (!TermWin.focus)	1749	if (!focus)
1641	{	1750	{
1642	TermWin.focus = 1;	1751	focus = 1;
1643	want_refresh = 1;	1752	want_refresh = 1;
		1753
		1754	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
		1755
1644	#ifdef USE_XIM	1756	#if USE_XIM
1645	if (Input_Context != NULL)	1757	if (Input_Context != NULL)
1646	{	1758	{
1647	IMSetStatusPosition ();	1759	IMSetStatusPosition ();
1648	XSetICFocus (Input_Context);	1760	XSetICFocus (Input_Context);
1649	}	1761	}
1650	#endif	1762	#endif
1651	#ifdef CURSOR_BLINK	1763	#if CURSOR_BLINK
1652	if (options & Opt_cursorBlink)	1764	if (OPTION (Opt_cursorBlink))
1653	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1765	cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1654	#endif	1766	#endif
1655	#ifdef OFF_FOCUS_FADING	1767	#if OFF_FOCUS_FADING
1656	if (rs[Rs_fade])	1768	if (rs[Rs_fade])
1657	{	1769	{
1658	pix_colors = pix_colors_focused;	1770	pix_colors = pix_colors_focused;
1659	scr_recolour ();	1771	scr_recolour ();
1660	}	1772	}
…		…
1663	}	1775	}
1664		1776
1665	void	1777	void
1666	rxvt_term::focus_out ()	1778	rxvt_term::focus_out ()
1667	{	1779	{
1668	if (TermWin.focus)	1780	if (focus)
1669	{	1781	{
1670	TermWin.focus = 0;	1782	focus = 0;
1671	want_refresh = 1;	1783	want_refresh = 1;
1672		1784
		1785	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
		1786
1673	#if ENABLE_FRILLS || ISO_14755	1787	#if ENABLE_FRILLS || ISO_14755
		1788	if (iso14755buf)
		1789	{
1674	iso14755buf = 0;	1790	iso14755buf = 0;
1675	#endif
1676	#if ENABLE_OVERLAY	1791	# if ENABLE_OVERLAY
1677	scr_overlay_off ();	1792	scr_overlay_off ();
1678	#endif	1793	# endif
		1794	}
		1795	#endif
1679	#ifdef USE_XIM	1796	#if USE_XIM
1680	if (Input_Context != NULL)	1797	if (Input_Context != NULL)
1681	XUnsetICFocus (Input_Context);	1798	XUnsetICFocus (Input_Context);
1682	#endif	1799	#endif
1683	#ifdef CURSOR_BLINK	1800	#if CURSOR_BLINK
1684	if (options & Opt_cursorBlink)	1801	if (OPTION (Opt_cursorBlink))
1685	cursor_blink_ev.stop ();	1802	cursor_blink_ev.stop ();
1686	hidden_cursor = 0;	1803	hidden_cursor = 0;
1687	#endif	1804	#endif
1688	#ifdef OFF_FOCUS_FADING	1805	#if OFF_FOCUS_FADING
1689	if (rs[Rs_fade])	1806	if (rs[Rs_fade])
1690	{	1807	{
1691	pix_colors = pix_colors_unfocused;	1808	pix_colors = pix_colors_unfocused;
1692	scr_recolour ();	1809	scr_recolour ();
1693	}	1810	}
…		…
1713	&& ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])	1830	&& ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1714	return;	1831	return;
1715		1832
1716	/* FALLTHROUGH */	1833	/* FALLTHROUGH */
1717	case ReparentNotify:	1834	case ReparentNotify:
1718	if ((options & Opt_transparent) && check_our_parents () && am_transparent)	1835	if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1719	want_refresh = want_full_refresh = 1;	1836	want_refresh = want_full_refresh = 1;
1720	break;	1837	break;
1721	}	1838	}
1722	}	1839	}
1723	#endif	1840	#endif
…		…
1726	rxvt_term::button_press (XButtonEvent &ev)	1843	rxvt_term::button_press (XButtonEvent &ev)
1727	{	1844	{
1728	int reportmode = 0, clickintime;	1845	int reportmode = 0, clickintime;
1729		1846
1730	bypass_keystate = ev.state & (ModMetaMask | ShiftMask);	1847	bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
		1848
1731	if (!bypass_keystate)	1849	if (!bypass_keystate)
1732	reportmode = !! (priv_modes & PrivMode_mouse_report);	1850	reportmode = !! (priv_modes & PrivMode_mouse_report);
1733		1851
1734	/*	1852	/*
1735	* VT window processing of button press	1853	* VT window processing of button press
1736	*/	1854	*/
1737	if (ev.window == TermWin.vt)	1855	if (ev.window == vt)
1738	{	1856	{
1739	#if ISO_14755	1857	#if ISO_14755
1740	// 5.4	1858	// 5.4
1741	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))	1859	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1742	{	1860	{
…		…
1755	#ifdef MOUSE_REPORT_DOUBLECLICK	1873	#ifdef MOUSE_REPORT_DOUBLECLICK
1756	if (ev.button == MEvent.button && clickintime)	1874	if (ev.button == MEvent.button && clickintime)
1757	{	1875	{
1758	/* same button, within alloted time */	1876	/* same button, within alloted time */
1759	MEvent.clicks++;	1877	MEvent.clicks++;
		1878
1760	if (MEvent.clicks > 1)	1879	if (MEvent.clicks > 1)
1761	{	1880	{
1762	/* only report double clicks */	1881	/* only report double clicks */
1763	MEvent.clicks = 2;	1882	MEvent.clicks = 2;
1764	mouse_report (ev);	1883	mouse_report (ev);
…		…
1784	else	1903	else
1785	{	1904	{
1786	if (ev.button != MEvent.button)	1905	if (ev.button != MEvent.button)
1787	MEvent.clicks = 0;	1906	MEvent.clicks = 0;
1788		1907
		1908	if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1789	switch (ev.button)	1909	switch (ev.button)
1790	{	1910	{
1791	case Button1:	1911	case Button1:
1792	/* allow meta + click to select rectangular areas */	1912	/* allow meta + click to select rectangular areas */
1793	/* should be done in screen.C */	1913	/* should be done in screen.C */
1794	#if ENABLE_FRILLS	1914	#if ENABLE_FRILLS
1795	selection.rect = !!(ev.state & ModMetaMask);	1915	selection.rect = !!(ev.state & ModMetaMask);
1796	#else	1916	#else
1797	selection.rect = false;	1917	selection.rect = false;
1798	#endif	1918	#endif
1799		1919
1800	/* allow shift+left click to extend selection */	1920	/* allow shift+left click to extend selection */
1801	if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))	1921	if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1802	{	1922	{
1803	if (MEvent.button == Button1 && clickintime)	1923	if (MEvent.button == Button1 && clickintime)
1804	selection_rotate (ev.x, ev.y);	1924	selection_rotate (ev.x, ev.y);
1805	else	1925	else
1806	selection_extend (ev.x, ev.y, 1);	1926	selection_extend (ev.x, ev.y, 1);
1807	}	1927	}
1808	else	1928	else
1809	{	1929	{
1810	if (MEvent.button == Button1 && clickintime)	1930	if (MEvent.button == Button1 && clickintime)
1811	MEvent.clicks++;	1931	MEvent.clicks++;
1812	else	1932	else
1813	MEvent.clicks = 1;	1933	MEvent.clicks = 1;
1814		1934
1815	selection_click (MEvent.clicks, ev.x, ev.y);	1935	selection_click (MEvent.clicks, ev.x, ev.y);
1816	}	1936	}
1817		1937
1818	MEvent.button = Button1;	1938	MEvent.button = Button1;
1819	break;	1939	break;
1820		1940
1821	case Button3:	1941	case Button3:
1822	if (MEvent.button == Button3 && clickintime)	1942	if (MEvent.button == Button3 && clickintime)
1823	selection_rotate (ev.x, ev.y);	1943	selection_rotate (ev.x, ev.y);
1824	else	1944	else
1825	selection_extend (ev.x, ev.y, 1);	1945	selection_extend (ev.x, ev.y, 1);
1826		1946
1827	MEvent.button = Button3;	1947	MEvent.button = Button3;
1828	break;	1948	break;
1829	}	1949	}
1830	}	1950	}
1831		1951
1832	MEvent.time = ev.time;	1952	MEvent.time = ev.time;
1833	return;	1953	return;
1834	}	1954	}
1835		1955
…		…
1947	case Button3:	2067	case Button3:
1948	if (scrollBar.style != R_SB_XTERM)	2068	if (scrollBar.style != R_SB_XTERM)
1949	{	2069	{
1950	if (scrollbar_above_slider (ev.y))	2070	if (scrollbar_above_slider (ev.y))
1951	# ifdef RXVT_SCROLL_FULL	2071	# ifdef RXVT_SCROLL_FULL
1952	scr_page (UP, TermWin.nrow - 1);	2072	scr_page (UP, nrow - 1);
1953	# else	2073	# else
1954	scr_page (UP, TermWin.nrow / 4);	2074	scr_page (UP, nrow / 4);
1955	# endif	2075	# endif
1956	else if (scrollbar_below_slider (ev.y))	2076	else if (scrollbar_below_slider (ev.y))
1957	# ifdef RXVT_SCROLL_FULL	2077	# ifdef RXVT_SCROLL_FULL
1958	scr_page (DN, TermWin.nrow - 1);	2078	scr_page (DN, nrow - 1);
1959	# else	2079	# else
1960	scr_page (DN, TermWin.nrow / 4);	2080	scr_page (DN, nrow / 4);
1961	# endif	2081	# endif
1962	else	2082	else
1963	scrollBar.setMotion ();	2083	scrollBar.setMotion ();
1964	}	2084	}
1965	else	2085	else
1966	{	2086	{
1967	scr_page ((ev.button == Button1 ? DN : UP),	2087	scr_page ((ev.button == Button1 ? DN : UP),
1968	(TermWin.nrow	2088	(nrow
1969	* scrollbar_position (ev.y)	2089	* scrollbar_position (ev.y)
1970	/ scrollbar_size ()));	2090	/ scrollbar_size ()));
1971	}	2091	}
1972		2092
1973	break;	2093	break;
1974	}	2094	}
1975	}	2095	}
		2096
1976	return;	2097	return;
1977	}	2098	}
		2099
1978	#if MENUBAR	2100	#if MENUBAR
1979	/*	2101	/*
1980	* Menubar window processing of button press	2102	* Menubar window processing of button press
1981	*/	2103	*/
1982	if (isMenuBarWindow (ev.window))	2104	if (isMenuBarWindow (ev.window))
…		…
2005	#ifdef SELECTION_SCROLLING	2127	#ifdef SELECTION_SCROLLING
2006	if (sel_scroll_ev.active)	2128	if (sel_scroll_ev.active)
2007	sel_scroll_ev.stop();	2129	sel_scroll_ev.stop();
2008	#endif	2130	#endif
2009		2131
2010	if (ev.window == TermWin.vt)	2132	if (ev.window == vt)
2011	{	2133	{
2012	#if ISO_14755	2134	#if ISO_14755
2013	// 5.4	2135	// 5.4
2014	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))	2136	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2015	return;	2137	return;
…		…
2045	if (priv_modes & PrivMode_mouse_report	2167	if (priv_modes & PrivMode_mouse_report
2046	&& bypass_keystate	2168	&& bypass_keystate
2047	&& ev.button == Button1 && MEvent.clicks <= 1)	2169	&& ev.button == Button1 && MEvent.clicks <= 1)
2048	selection_extend (ev.x, ev.y, 0);	2170	selection_extend (ev.x, ev.y, 0);
2049		2171
		2172	if (!HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
		2173	return;
		2174
2050	switch (ev.button)	2175	switch (ev.button)
2051	{	2176	{
2052	case Button1:	2177	case Button1:
2053	case Button3:	2178	case Button3:
2054	selection_make (ev.time);	2179	selection_make (ev.time);
…		…
2065		2190
2066	v = ev.button == Button4 ? UP : DN;	2191	v = ev.button == Button4 ? UP : DN;
2067		2192
2068	if (ev.state & ShiftMask)	2193	if (ev.state & ShiftMask)
2069	i = 1;	2194	i = 1;
2070	else if (options & Opt_mouseWheelScrollPage)	2195	else if (OPTION (Opt_mouseWheelScrollPage))
2071	i = TermWin.nrow - 1;	2196	i = nrow - 1;
2072	else	2197	else
2073	i = 5;	2198	i = 5;
2074		2199
2075	# ifdef MOUSE_SLIP_WHEELING	2200	# ifdef MOUSE_SLIP_WHEELING
2076	if (ev.state & ControlMask)	2201	if (ev.state & ControlMask)
2077	{	2202	{
2078	mouse_slip_wheel_speed += v ? -1 : 1;	2203	mouse_slip_wheel_speed += v ? -1 : 1;
2079	if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow;	2204	if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2080	if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow;	2205	if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2081		2206
2082	if (slip_wheel_ev.at < NOW)	2207	if (slip_wheel_ev.at < NOW)
2083	slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;	2208	slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2084		2209
2085	slip_wheel_ev.start ();	2210	slip_wheel_ev.start ();
…		…
2361	XWindowAttributes wattr, wrootattr;	2486	XWindowAttributes wattr, wrootattr;
2362	dDisp;	2487	dDisp;
2363		2488
2364	pchanged = 0;	2489	pchanged = 0;
2365		2490
2366	if (!(options & Opt_transparent))	2491	if (!OPTION (Opt_transparent))
2367	return pchanged; /* Don't try any more */	2492	return pchanged; /* Don't try any more */
2368		2493
2369	XGetWindowAttributes (disp, display->root, &wrootattr);	2494	XGetWindowAttributes (disp, display->root, &wrootattr);
2370	rootdepth = wrootattr.depth;	2495	rootdepth = wrootattr.depth;
2371		2496
2372	XGetWindowAttributes (disp, TermWin.parent[0], &wattr);	2497	XGetWindowAttributes (disp, parent[0], &wattr);
2373		2498
2374	if (rootdepth != wattr.depth)	2499	if (rootdepth != wattr.depth)
2375	{	2500	{
2376	if (am_transparent)	2501	if (am_transparent)
2377	{	2502	{
2378	pchanged = 1;	2503	pchanged = 1;
2379	XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);	2504	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2380	am_transparent = am_pixmap_trans = 0;	2505	am_transparent = am_pixmap_trans = 0;
2381	}	2506	}
2382		2507
2383	return pchanged; /* Don't try any more */	2508	return pchanged; /* Don't try any more */
2384	}	2509	}
…		…
2425	Window cr;	2550	Window cr;
2426	XImage *image;	2551	XImage *image;
2427	GC gc;	2552	GC gc;
2428	XGCValues gcvalue;	2553	XGCValues gcvalue;
2429		2554
2430	XTranslateCoordinates (disp, TermWin.parent[0], display->root,	2555	XTranslateCoordinates (disp, parent[0], display->root,
2431	0, 0, &sx, &sy, &cr);	2556	0, 0, &sx, &sy, &cr);
2432	nw = (unsigned int)szHint.width;	2557	nw = (unsigned int)szHint.width;
2433	nh = (unsigned int)szHint.height;	2558	nh = (unsigned int)szHint.height;
2434	nx = ny = 0;	2559	nx = ny = 0;
2435		2560
…		…
2445	nh += sy;	2570	nh += sy;
2446	ny = -sy;	2571	ny = -sy;
2447	sy = 0;	2572	sy = 0;
2448	}	2573	}
2449		2574
2450	MIN_IT (nw, (unsigned int) (wrootattr.width - sx));	2575	min_it (nw, (unsigned int) (wrootattr.width - sx));
2451	MIN_IT (nh, (unsigned int) (wrootattr.height - sy));	2576	min_it (nh, (unsigned int) (wrootattr.height - sy));
2452		2577
2453	XSync (disp, False);	2578	XSync (disp, False);
2454	allowedxerror = -1;	2579	allowedxerror = -1;
2455	image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);	2580	image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2456		2581
…		…
2461	if (image == NULL)	2586	if (image == NULL)
2462	{	2587	{
2463	if (am_transparent && am_pixmap_trans)	2588	if (am_transparent && am_pixmap_trans)
2464	{	2589	{
2465	pchanged = 1;	2590	pchanged = 1;
2466	if (TermWin.pixmap != None)	2591	if (pixmap != None)
2467	{	2592	{
2468	XFreePixmap (disp, TermWin.pixmap);	2593	XFreePixmap (disp, pixmap);
2469	TermWin.pixmap = None;	2594	pixmap = None;
2470	}	2595	}
2471	}	2596	}
2472		2597
2473	am_pixmap_trans = 0;	2598	am_pixmap_trans = 0;
2474	}	2599	}
2475	else	2600	else
2476	{	2601	{
2477	if (TermWin.pixmap != None)	2602	if (pixmap != None)
2478	XFreePixmap (disp, TermWin.pixmap);	2603	XFreePixmap (disp, pixmap);
2479		2604
2480	#if TINTING	2605	#if TINTING
2481	if (ISSET_PIXCOLOR (Color_tint))	2606	if (ISSET_PIXCOLOR (Color_tint))
2482	{	2607	{
2483	unsigned short rm, gm, bm;	2608	unsigned short rm, gm, bm;
…		…
2487		2612
2488	ShadeXImage (display, image, shade, rm, gm, bm);	2613	ShadeXImage (display, image, shade, rm, gm, bm);
2489	}	2614	}
2490	#endif	2615	#endif
2491		2616
2492	TermWin.pixmap = XCreatePixmap (disp, TermWin.vt,	2617	pixmap = XCreatePixmap (disp, vt,
2493	szHint.width, szHint.height, image->depth);	2618	szHint.width, szHint.height, image->depth);
2494	gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue);	2619	gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2495	XPutImage (disp, TermWin.pixmap, gc, image, 0, 0,	2620	XPutImage (disp, pixmap, gc, image, 0, 0,
2496	nx, ny, image->width, image->height);	2621	nx, ny, image->width, image->height);
2497	XFreeGC (disp, gc);	2622	XFreeGC (disp, gc);
2498	XDestroyImage (image);	2623	XDestroyImage (image);
2499	XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap);	2624	XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2500	XClearWindow (disp, TermWin.parent[0]);	2625	XClearWindow (disp, parent[0]);
2501		2626
2502	if (!am_transparent || !am_pixmap_trans)	2627	if (!am_transparent || !am_pixmap_trans)
2503	pchanged = 1;	2628	pchanged = 1;
2504		2629
2505	am_transparent = am_pixmap_trans = 1;	2630	am_transparent = am_pixmap_trans = 1;
2506	}	2631	}
2507	}	2632	}
2508		2633
2509	if (am_pixmap_trans)	2634	if (am_pixmap_trans)
2510	XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);	2635	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2511	else	2636	else
2512	{	2637	{
2513	unsigned int n;	2638	unsigned int n;
2514	/*	2639	/*
2515	* InheritPixmap transparency	2640	* InheritPixmap transparency
2516	*/	2641	*/
2517	for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)	2642	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2518	{	2643	{
2519	oldp = TermWin.parent[i];	2644	oldp = parent[i];
2520	XQueryTree (disp, TermWin.parent[i - 1], &root,	2645	XQueryTree (disp, parent[i - 1], &root,
2521	&TermWin.parent[i], &list, &n);	2646	&parent[i], &list, &n);
2522	XFree (list);	2647	XFree (list);
2523		2648
2524	if (TermWin.parent[i] == display->root)	2649	if (parent[i] == display->root)
2525	{	2650	{
2526	if (oldp != None)	2651	if (oldp != None)
2527	pchanged = 1;	2652	pchanged = 1;
2528		2653
2529	break;	2654	break;
2530	}	2655	}
2531		2656
2532	if (oldp != TermWin.parent[i])	2657	if (oldp != parent[i])
2533	pchanged = 1;	2658	pchanged = 1;
2534	}	2659	}
2535		2660
2536	n = 0;	2661	n = 0;
2537		2662
2538	if (pchanged)	2663	if (pchanged)
2539	{	2664	{
2540	for (; n < (unsigned int)i; n++)	2665	for (; n < (unsigned int)i; n++)
2541	{	2666	{
2542	XGetWindowAttributes (disp, TermWin.parent[n], &wattr);	2667	XGetWindowAttributes (disp, parent[n], &wattr);
2543	if (wattr.depth != rootdepth || wattr.c_class == InputOnly)	2668	if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2544	{	2669	{
2545	n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;	2670	n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2546	break;	2671	break;
2547	}	2672	}
2548	}	2673	}
2549	}	2674	}
2550		2675
2551	if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))	2676	if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2552	{	2677	{
2553	XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]);	2678	XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2554	XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);	2679	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2555	am_transparent = 0;	2680	am_transparent = 0;
2556	/* XXX: also turn off Opt_transparent? */	2681	/* XXX: also turn off Opt_transparent? */
2557	}	2682	}
2558	else	2683	else
2559	{	2684	{
…		…
2562	* needed for fvwm2.2.2 (and before?) */	2687	* needed for fvwm2.2.2 (and before?) */
2563	sleep (1);	2688	sleep (1);
2564	#endif	2689	#endif
2565	for (n = 0; n < (unsigned int)i; n++)	2690	for (n = 0; n < (unsigned int)i; n++)
2566	{	2691	{
2567	XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative);	2692	XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2568	XClearWindow (disp, TermWin.parent[n]);	2693	XClearWindow (disp, parent[n]);
2569	}	2694	}
2570		2695
2571	XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);	2696	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2572	am_transparent = 1;	2697	am_transparent = 1;
2573	}	2698	}
2574		2699
2575	for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)	2700	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2576	TermWin.parent[i] = None;	2701	parent[i] = None;
2577	}	2702	}
2578		2703
2579	if (scrollBar.win)	2704	if (scrollBar.win)
2580	{	2705	{
2581	XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);	2706	XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
…		…
2599	bool	2724	bool
2600	rxvt_term::cmd_parse ()	2725	rxvt_term::cmd_parse ()
2601	{	2726	{
2602	bool flag = false;	2727	bool flag = false;
2603	unicode_t ch = NOCHAR;	2728	unicode_t ch = NOCHAR;
2604	unsigned char *seq_begin; // remember start of esc-sequence here	2729	char *seq_begin; // remember start of esc-sequence here
2605		2730
2606	for (;;)	2731	for (;;)
2607	{	2732	{
2608	if (ch == NOCHAR)	2733	if (ch == NOCHAR)
2609	{	2734	{
2610	seq_begin = cmdbuf_ptr;	2735	seq_begin = cmdbuf_ptr;
2611	ch = next_char ();	2736	ch = next_char ();
2612	}
2613		2737
2614	if (ch == NOCHAR) // TODO: improve	2738	if (ch == NOCHAR)
2615	break;	2739	break;
		2740	}
2616		2741
2617	if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)	2742	if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2618	{	2743	{
2619	if (!seen_input)	2744	if (!seen_input)
2620	{	2745	{
…		…
2633	/* Read a text string from the input buffer */	2758	/* Read a text string from the input buffer */
2634	unicode_t buf[UBUFSIZ];	2759	unicode_t buf[UBUFSIZ];
2635	bool refreshnow = false;	2760	bool refreshnow = false;
2636	int nlines = 0;	2761	int nlines = 0;
2637	unicode_t *str = buf;	2762	unicode_t *str = buf;
		2763	unicode_t *eol = str + min (ncol, UBUFSIZ);
2638		2764
2639	for (;;)	2765	for (;;)
2640	{	2766	{
2641	if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))	2767	if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2642	break;	2768	break;
2643		2769
2644	*str++ = ch;	2770	*str++ = ch;
2645		2771
2646	if (ch == C0_LF)	2772	if (ch == C0_LF || str >= eol)
2647	{	2773	{
		2774	if (ch == C0_LF)
2648	nlines++;	2775	nlines++;
		2776
2649	refresh_count++;	2777	refresh_count++;
2650		2778
2651	if (!(options & Opt_jumpScroll)	2779	if (!OPTION (Opt_jumpScroll)
2652	|| (refresh_count >= refresh_limit * (TermWin.nrow - 1)))	2780	|| (refresh_count >= refresh_limit * (nrow - 1)))
2653	{	2781	{
2654	refreshnow = true;	2782	refreshnow = true;
		2783	refresh_count = 0;
2655	ch = NOCHAR;	2784	ch = NOCHAR;
2656	break;	2785	break;
2657	}	2786	}
2658		2787
2659	// scr_add_lines only works for nlines <= TermWin.nrow - 1.	2788	// scr_add_lines only works for nlines <= nrow - 1.
2660	if (nlines >= TermWin.nrow - 1)	2789	if (nlines >= nrow - 1)
2661	{	2790	{
		2791	if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END)))
2662	scr_add_lines (buf, nlines, str - buf);	2792	scr_add_lines (buf, nlines, str - buf);
		2793
2663	nlines = 0;	2794	nlines = 0;
2664	str = buf;	2795	str = buf;
		2796	eol = str + min (ncol, UBUFSIZ);
2665	}	2797	}
2666	}
2667		2798
2668	if (str >= buf + UBUFSIZ)	2799	if (str >= eol)
2669	{	2800	{
		2801	if (eol >= buf + UBUFSIZ)
		2802	{
2670	ch = NOCHAR;	2803	ch = NOCHAR;
2671	break;	2804	break;
		2805	}
		2806	else
		2807	eol = min (eol + ncol, buf + UBUFSIZ);
		2808	}
		2809
2672	}	2810	}
2673		2811
2674	seq_begin = cmdbuf_ptr;	2812	seq_begin = cmdbuf_ptr;
2675	ch = next_char ();	2813	ch = next_char ();
2676	}	2814	}
2677		2815
		2816	if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END)))
2678	scr_add_lines (buf, nlines, str - buf);	2817	scr_add_lines (buf, nlines, str - buf);
2679		2818
2680	/*	2819	/*
2681	* If there have been a lot of new lines, then update the screen	2820	* If there have been a lot of new lines, then update the screen
2682	* What the heck I'll cheat and only refresh less than every page-full.	2821	* What the heck I'll cheat and only refresh less than every page-full.
2683	* the number of pages between refreshes is refresh_limit, which	2822	* the number of pages between refreshes is refresh_limit, which
2684	* is incremented here because we must be doing flat-out scrolling.	2823	* is incremented here because we must be doing flat-out scrolling.
2685	*/	2824	*/
2686	if (refreshnow)	2825	if (refreshnow)
2687	{	2826	{
2688	if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)	2827	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2689	refresh_limit++;	2828	refresh_limit++;
2690	else	2829	else
2691	{	2830	{
2692	flag = true;	2831	flag = true;
2693	scr_refresh (refresh_type);	2832	scr_refresh (refresh_type);
		2833	flush_ev.stop ();
2694	}	2834	}
2695	}	2835	}
2696		2836
2697	}	2837	}
2698	else	2838	else
…		…
2729	rxvt_term::next_char ()	2869	rxvt_term::next_char ()
2730	{	2870	{
2731	while (cmdbuf_ptr < cmdbuf_endp)	2871	while (cmdbuf_ptr < cmdbuf_endp)
2732	{	2872	{
2733	// assume 7-bit to be ascii ALWAYS	2873	// assume 7-bit to be ascii ALWAYS
2734	if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)	2874	if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2735	return *cmdbuf_ptr++;	2875	return *cmdbuf_ptr++;
2736		2876
2737	wchar_t wc;	2877	wchar_t wc;
2738	size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);	2878	size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2739		2879
2740	if (len == (size_t)-2)	2880	if (len == (size_t)-2)
2741	{	2881	{
2742	// the mbstate stores incomplete sequences. didn't know this :/	2882	// the mbstate stores incomplete sequences. didn't know this :/
2743	cmdbuf_ptr = cmdbuf_endp;	2883	cmdbuf_ptr = cmdbuf_endp;
…		…
2882	case C0_ESC:	3022	case C0_ESC:
2883	process_escape_seq ();	3023	process_escape_seq ();
2884	break;	3024	break;
2885	case C0_ENQ: /* terminal Status */	3025	case C0_ENQ: /* terminal Status */
2886	if (rs[Rs_answerbackstring])	3026	if (rs[Rs_answerbackstring])
2887	tt_write ((const unsigned char *)rs[Rs_answerbackstring],	3027	tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2888	(unsigned int)strlen (rs[Rs_answerbackstring]));
2889	else	3028	else
2890	tt_write ((unsigned char *)VT100_ANS,	3029	tt_write (VT100_ANS, strlen (VT100_ANS));
2891	(unsigned int)strlen (VT100_ANS));
2892	break;	3030	break;
2893	case C0_BEL: /* bell */	3031	case C0_BEL: /* bell */
2894	scr_bell ();	3032	scr_bell ();
2895	break;	3033	break;
2896	case C0_BS: /* backspace */	3034	case C0_BS: /* backspace */
…		…
3084	process_dcs_seq ();	3222	process_dcs_seq ();
3085	break;	3223	break;
3086		3224
3087	/* 8.3.110: SINGLE CHARACTER INTRODUCER */	3225	/* 8.3.110: SINGLE CHARACTER INTRODUCER */
3088	case C1_SCI: /* ESC Z */	3226	case C1_SCI: /* ESC Z */
3089	tt_write ((const unsigned char *)ESCZ_ANSWER,	3227	tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3090	(unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3091	break; /* steal obsolete ESC [ c */	3228	break; /* steal obsolete ESC [ c */
3092		3229
3093	/* 8.3.16: CONTROL SEQUENCE INTRODUCER */	3230	/* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3094	case C1_CSI: /* ESC [ */	3231	case C1_CSI: /* ESC [ */
3095	process_csi_seq ();	3232	process_csi_seq ();
…		…
3335		3472
3336	case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */	3473	case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3337	arg[0] = -arg[0];	3474	arg[0] = -arg[0];
3338	/* FALLTHROUGH */	3475	/* FALLTHROUGH */
3339	case CSI_SU: /* 8.3.148: (1) SCROLL UP */	3476	case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3340	scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);	3477	scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3341	break;	3478	break;
3342		3479
3343	case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */	3480	case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3344	tt_write ((const unsigned char *)VT100_ANS,	3481	tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3345	(unsigned int) (sizeof (VT100_ANS) - 1));
3346	break;	3482	break;
3347		3483
3348	case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */	3484	case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3349	process_sgr_mode (nargs, arg);	3485	process_sgr_mode (nargs, arg);
3350	break;	3486	break;
…		…
3357	break;	3493	break;
3358	case 6: /* CPR requested */	3494	case 6: /* CPR requested */
3359	scr_report_position ();	3495	scr_report_position ();
3360	break;	3496	break;
3361	case 7: /* unofficial extension */	3497	case 7: /* unofficial extension */
3362	if (options & Opt_insecure)	3498	if (OPTION (Opt_insecure))
3363	tt_printf ("%-.250s\012", rs[Rs_display_name]);	3499	tt_printf ("%-.250s\012", rs[Rs_display_name]);
3364	break;	3500	break;
3365	case 8: /* unofficial extension */	3501	case 8: /* unofficial extension */
3366	process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);	3502	process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3367	break;	3503	break;
…		…
3470	{	3606	{
3471	/*	3607	/*
3472	* commands	3608	* commands
3473	*/	3609	*/
3474	case 1: /* deiconify window */	3610	case 1: /* deiconify window */
3475	XMapWindow (disp, TermWin.parent[0]);	3611	XMapWindow (disp, parent[0]);
3476	break;	3612	break;
3477	case 2: /* iconify window */	3613	case 2: /* iconify window */
3478	XIconifyWindow (disp, TermWin.parent[0], display->screen);	3614	XIconifyWindow (disp, parent[0], display->screen);
3479	break;	3615	break;
3480	case 3: /* set position (pixels) */	3616	case 3: /* set position (pixels) */
3481	XMoveWindow (disp, TermWin.parent[0], args[1], args[2]);	3617	XMoveWindow (disp, parent[0], args[1], args[2]);
3482	break;	3618	break;
3483	case 4: /* set size (pixels) */	3619	case 4: /* set size (pixels) */
3484	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3620	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3485	break;	3621	break;
3486	case 5: /* raise window */	3622	case 5: /* raise window */
3487	XRaiseWindow (disp, TermWin.parent[0]);	3623	XRaiseWindow (disp, parent[0]);
3488	break;	3624	break;
3489	case 6: /* lower window */	3625	case 6: /* lower window */
3490	XLowerWindow (disp, TermWin.parent[0]);	3626	XLowerWindow (disp, parent[0]);
3491	break;	3627	break;
3492	case 7: /* refresh window */	3628	case 7: /* refresh window */
3493	scr_touch (true);	3629	scr_touch (true);
3494	break;	3630	break;
3495	case 8: /* set size (chars) */	3631	case 8: /* set size (chars) */
3496	set_widthheight ((unsigned int) (args[2] * TermWin.fwidth),	3632	set_widthheight ((unsigned int) (args[2] * fwidth),
3497	(unsigned int) (args[1] * TermWin.fheight));	3633	(unsigned int) (args[1] * fheight));
3498	break;	3634	break;
3499		3635
3500	//case 9: NYI, TODO, restore maximized window or maximize window	3636	//case 9: NYI, TODO, restore maximized window or maximize window
3501	default:	3637	default:
3502	if (args[0] >= 24) /* set height (chars) */	3638	if (args[0] >= 24) /* set height (chars) */
3503	set_widthheight ((unsigned int)TermWin.width,	3639	set_widthheight ((unsigned int)width,
3504	(unsigned int) (args[1] * TermWin.fheight));	3640	(unsigned int) (args[1] * fheight));
3505	break;	3641	break;
3506		3642
3507		3643
3508	/*	3644	/*
3509	* reports - some output format copied from XTerm	3645	* reports - some output format copied from XTerm
3510	*/	3646	*/
3511	case 11: /* report window state */	3647	case 11: /* report window state */
3512	XGetWindowAttributes (disp, TermWin.parent[0], &wattr);	3648	XGetWindowAttributes (disp, parent[0], &wattr);
3513	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3649	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3514	break;	3650	break;
3515	case 13: /* report window position */	3651	case 13: /* report window position */
3516	XGetWindowAttributes (disp, TermWin.parent[0], &wattr);	3652	XGetWindowAttributes (disp, parent[0], &wattr);
3517	XTranslateCoordinates (disp, TermWin.parent[0], wattr.root,	3653	XTranslateCoordinates (disp, parent[0], wattr.root,
3518	-wattr.border_width, -wattr.border_width,	3654	-wattr.border_width, -wattr.border_width,
3519	&x, &y, &wdummy);	3655	&x, &y, &wdummy);
3520	tt_printf ("\033[3;%d;%dt", x, y);	3656	tt_printf ("\033[3;%d;%dt", x, y);
3521	break;	3657	break;
3522	case 14: /* report window size (pixels) */	3658	case 14: /* report window size (pixels) */
3523	XGetWindowAttributes (disp, TermWin.parent[0], &wattr);	3659	XGetWindowAttributes (disp, parent[0], &wattr);
3524	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3660	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3525	break;	3661	break;
3526	case 18: /* report text area size (chars) */	3662	case 18: /* report text area size (chars) */
3527	tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);	3663	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3528	break;	3664	break;
3529	case 19: /* report window size (chars) */	3665	case 19: /* report window size (chars) */
3530	tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);	3666	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3531	break;	3667	break;
3532	case 20: /* report icon label */	3668	case 20: /* report icon label */
3533	{	3669	{
3534	char *s;	3670	char *s;
3535	XGetIconName (disp, TermWin.parent[0], &s);	3671	XGetIconName (disp, parent[0], &s);
3536	tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */	3672	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3537	XFree (s);	3673	XFree (s);
3538	}	3674	}
3539	break;	3675	break;
3540	case 21: /* report window title */	3676	case 21: /* report window title */
3541	{	3677	{
3542	char *s;	3678	char *s;
3543	XFetchName (disp, TermWin.parent[0], &s);	3679	XFetchName (disp, parent[0], &s);
3544	tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */	3680	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3545	XFree (s);	3681	XFree (s);
3546	}	3682	}
3547	break;	3683	break;
3548	}	3684	}
3549	}	3685	}
…		…
3552	/*----------------------------------------------------------------------*/	3688	/*----------------------------------------------------------------------*/
3553	/*	3689	/*
3554	* get input up until STRING TERMINATOR (or BEL)	3690	* get input up until STRING TERMINATOR (or BEL)
3555	* ends_how is terminator used. returned input must be free()'d	3691	* ends_how is terminator used. returned input must be free()'d
3556	*/	3692	*/
3557	unsigned char *	3693	char *
3558	rxvt_term::get_to_st (unicode_t &ends_how)	3694	rxvt_term::get_to_st (unicode_t &ends_how)
3559	{	3695	{
3560	unicode_t ch;	3696	unicode_t ch;
3561	bool seen_esc = false;	3697	bool seen_esc = false;
3562	unsigned int n = 0;	3698	unsigned int n = 0;
…		…
3581	else if (ch < 0x20)	3717	else if (ch < 0x20)
3582	return NULL; /* other control character - exit */	3718	return NULL; /* other control character - exit */
3583		3719
3584	seen_esc = false;	3720	seen_esc = false;
3585		3721
3586	if (n >= sizeof (string) - 1)	3722	if (n >= STRING_MAX - 1)
3587	// stop at some sane length	3723	// stop at some sane length
3588	return NULL;	3724	return NULL;
3589		3725
3590	if (ch == C0_SYN)	3726	if (ch == C0_SYN)
3591	string[n++] = cmd_get8 ();	3727	string[n++] = cmd_get8 ();
…		…
3595		3731
3596	string[n++] = '\0';	3732	string[n++] = '\0';
3597		3733
3598	ends_how = (ch == 0x5c ? C0_ESC : ch);	3734	ends_how = (ch == 0x5c ? C0_ESC : ch);
3599		3735
3600	return (unsigned char *)rxvt_wcstombs (string);	3736	return rxvt_wcstombs (string);
3601	}	3737	}
3602		3738
3603	/*----------------------------------------------------------------------*/	3739	/*----------------------------------------------------------------------*/
3604	/*	3740	/*
3605	* process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'	3741	* process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3606	*/	3742	*/
3607	void	3743	void
3608	rxvt_term::process_dcs_seq ()	3744	rxvt_term::process_dcs_seq ()
3609	{	3745	{
3610	unsigned char *s;	3746	char *s;
3611	unicode_t eh;	3747	unicode_t eh;
3612		3748
3613	/*	3749	/*
3614	* Not handled yet	3750	* Not handled yet
3615	*/	3751	*/
…		…
3634	for (arg = 0; isdigit (ch); ch = cmd_getc ())	3770	for (arg = 0; isdigit (ch); ch = cmd_getc ())
3635	arg = arg * 10 + (ch - '0');	3771	arg = arg * 10 + (ch - '0');
3636		3772
3637	if (ch == ';')	3773	if (ch == ';')
3638	{	3774	{
3639	unsigned char *s = get_to_st (eh);	3775	char *s = get_to_st (eh);
3640		3776
3641	if (s)	3777	if (s)
3642	{	3778	{
3643	process_xterm_seq (arg, (char *)s, eh);	3779	process_xterm_seq (arg, s, eh);
3644	free (s);	3780	free (s);
3645	}	3781	}
3646	}	3782	}
3647	}	3783	}
3648		3784
3649	void	3785	void
3650	rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)	3786	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3651	{	3787	{
3652	if (str[0] == '?' && !str[1])	3788	if (str[0] == '?' && !str[1])
3653	{	3789	{
3654	unsigned short r, g, b;	3790	unsigned short r, g, b;
3655	pix_colors_focused[color].get (display, r, g, b);	3791	pix_colors_focused[color].get (display, r, g, b);
…		…
3659	set_window_color (color, str);	3795	set_window_color (color, str);
3660	}	3796	}
3661		3797
3662	/*	3798	/*
3663	* XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)	3799	* XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3664	* 0 = change iconName/title
3665	* 1 = change iconName
3666	* 2 = change title
3667	* 4 = change color
3668	* 10 = change fg color
3669	* 11 = change bg color
3670	* 12 = change text color
3671	* 13 = change mouse foreground color
3672	* 17 = change highlight character colour
3673	* 18 = change bold character color
3674	* 19 = change underlined character color
3675	* 46 = change logfile (not implemented)
3676	* 50 = change font
3677	*
3678	* rxvt extensions:
3679	* 20 = bg pixmap
3680	* 39 = change default fg color
3681	* 49 = change default bg color
3682	* 55 = dump scrollback buffer and all of screen
3683	* 701 = change locale
3684	* 702 = find font
3685	* 703 = menu
3686	*/	3800	*/
3687	void	3801	void
3688	rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)	3802	rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3689	{	3803	{
3690	int changed = 0;	3804	int changed = 0;
3691	int color;	3805	int color;
3692	char *buf, *name;	3806	char *buf, *name;
3693	bool query = str[0] == '?' && !str[1];	3807	bool query = str[0] == '?' && !str[1];
…		…
3716	unsigned long bytes_after;	3830	unsigned long bytes_after;
3717	unsigned char *value = 0;	3831	unsigned char *value = 0;
3718	const char *str = "";	3832	const char *str = "";
3719		3833
3720	if (prop	3834	if (prop
3721	&& XGetWindowProperty (disp, TermWin.parent[0],	3835	&& XGetWindowProperty (disp, parent[0],
3722	prop, 0, 1<<16, 0, AnyPropertyType,	3836	prop, 0, 1<<16, 0, AnyPropertyType,
3723	&actual_type, &actual_format,	3837	&actual_type, &actual_format,
3724	&nitems, &bytes_after, &value) == Success	3838	&nitems, &bytes_after, &value) == Success
3725	&& actual_type != None	3839	&& actual_type != None
3726	&& actual_format == 8)	3840	&& actual_format == 8)
…		…
3738	{	3852	{
3739	*eq = 0;	3853	*eq = 0;
3740	set_utf8_property (display->atom (str), eq + 1);	3854	set_utf8_property (display->atom (str), eq + 1);
3741	}	3855	}
3742	else	3856	else
3743	XDeleteProperty (disp, TermWin.parent[0],	3857	XDeleteProperty (disp, parent[0],
3744	display->atom (str));	3858	display->atom (str));
3745	}	3859	}
3746	break;	3860	break;
3747		3861
3748	case XTerm_Color:	3862	case XTerm_Color:
…		…
3789	break;	3903	break;
3790	#ifndef NO_BOLD_UNDERLINE_REVERSE	3904	#ifndef NO_BOLD_UNDERLINE_REVERSE
3791	case XTerm_Color_BD:	3905	case XTerm_Color_BD:
3792	process_color_seq (XTerm_Color_BD, Color_BD, str, resp);	3906	process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3793	break;	3907	break;
3794	case XTerm_Color_IT:
3795	process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3796	break;
3797	case XTerm_Color_UL:	3908	case XTerm_Color_UL:
3798	process_color_seq (XTerm_Color_UL, Color_UL, str, resp);	3909	process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3799	break;	3910	break;
3800	case XTerm_Color_RV:	3911	case XTerm_Color_RV:
3801	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3912	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3802	break;	3913	break;
		3914	case URxvt_Color_IT:
		3915	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
		3916	break;
3803	#endif	3917	#endif
3804	#if TRANSPARENT && TINTING	3918	#if TRANSPARENT && TINTING
3805	case XTerm_Color_tint:	3919	case URxvt_Color_tint:
3806	process_color_seq (XTerm_Color_tint, Color_tint, str, resp);	3920	process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3807	check_our_parents ();	3921	check_our_parents ();
3808	if (am_transparent)	3922	if (am_transparent)
3809	want_full_refresh = want_refresh = 1;	3923	want_full_refresh = want_refresh = 1;
3810	break;	3924	break;
3811	#endif	3925	#endif
…		…
3845		3959
3846	case XTerm_logfile:	3960	case XTerm_logfile:
3847	// TODO, when secure mode?	3961	// TODO, when secure mode?
3848	break;	3962	break;
3849		3963
		3964	#ifdef MENUBAR
		3965	case URxvt_Menu:
		3966	if (OPTION (Opt_insecure))
		3967	menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
		3968	break;
		3969	#endif
		3970	#if 0
		3971	case XTerm_dumpscreen: /* no error notices */
		3972	{
		3973	int fd;
		3974	if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
		3975	{
		3976	scr_dump (fd);
		3977	close (fd);
		3978	}
		3979	}
		3980	break;
		3981	#endif
3850	case XTerm_font:	3982	case XTerm_font:
3851	op = URxvt_font;	3983	op = URxvt_font;
3852	case URxvt_font:	3984	case URxvt_font:
3853	#if ENABLE_STYLES	3985	#if ENABLE_STYLES
3854	case URxvt_boldFont:	3986	case URxvt_boldFont:
3855	case URxvt_italicFont:	3987	case URxvt_italicFont:
3856	case URxvt_boldItalicFont:	3988	case URxvt_boldItalicFont:
3857	#endif	3989	#endif
3858	if (query)	3990	if (query)
3859	tt_printf ("\33]%d;%-.250s%c", saveop,	3991	tt_printf ("\33]%d;%-.250s%c", saveop,
3860	(options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc	3992	OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3861	? TermWin.fontset[op - URxvt_font]->fontdesc : "",	3993	? fontset[op - URxvt_font]->fontdesc : "",
3862	resp);	3994	resp);
3863	else	3995	else
3864	{	3996	{
3865	const char *&res = rs[Rs_font + (op - URxvt_font)];	3997	const char *&res = rs[Rs_font + (op - URxvt_font)];
3866		3998
…		…
3869	set_fonts ();	4001	set_fonts ();
3870	}	4002	}
3871	break;	4003	break;
3872		4004
3873	#if ENABLE_FRILLS	4005	#if ENABLE_FRILLS
3874	case XTerm_locale:	4006	case URxvt_locale:
3875	if (query)	4007	if (query)
3876	tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);	4008	tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3877	else	4009	else
3878	{	4010	{
3879	set_locale (str);	4011	set_locale (str);
3880	pty.set_utf8_mode (enc_utf8);	4012	pty.set_utf8_mode (enc_utf8);
3881	init_xlocale ();	4013	init_xlocale ();
3882	}	4014	}
3883	break;	4015	break;
3884	#endif
3885		4016
3886	#ifdef MENUBAR	4017	case URxvt_view_up:
3887	case XTerm_Menu:	4018	case URxvt_view_down:
3888	if (options & Opt_insecure)	4019	{
3889	menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked	4020	int lines = atoi (str);
		4021
		4022	if (lines)
		4023	scr_page (op == URxvt_view_up ? UP : DN, lines);
		4024	else
		4025	scr_erase_savelines ();
		4026	}
		4027
3890	break;	4028	break;
3891	#endif	4029	#endif
3892	#if 0	4030
3893	case XTerm_dumpscreen: /* no error notices */	4031	#if ENABLE_PERL
3894	{	4032	case URxvt_perl:
3895	int fd;	4033	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END)))
3896	if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)	4034	; // no responses yet
3897	{
3898	scr_dump (fd);
3899	close (fd);
3900	}
3901	}
3902	break;	4035	break;
3903	#endif	4036	#endif
3904	}	4037	}
3905	}	4038	}
3906	/*----------------------------------------------------------------------*/	4039	/*----------------------------------------------------------------------*/
…		…
4015	}	4148	}
4016		4149
4017	/* extra handling for values with state unkept */	4150	/* extra handling for values with state unkept */
4018	switch (arg[i])	4151	switch (arg[i])
4019	{	4152	{
		4153	#if ENABLE_STYLES
		4154	case 1021:
		4155	if (mode)
		4156	SET_OPTION (Opt_intensityStyles);
		4157	else
		4158	CLR_OPTION (Opt_intensityStyles);
		4159
		4160	scr_touch (true);
		4161	break;
		4162	#endif
4020	case 1048: /* alternative cursor save */	4163	case 1048: /* alternative cursor save */
4021	case 1049:	4164	case 1049:
4022	if (options & Opt_secondaryScreen)	4165	if (OPTION (Opt_secondaryScreen))
4023	if (mode == 0)	4166	if (mode == 0)
4024	scr_cursor (RESTORE);	4167	scr_cursor (RESTORE);
4025	else if (mode == 1)	4168	else if (mode == 1)
4026	scr_cursor (SAVE);	4169	scr_cursor (SAVE);
4027	break;	4170	break;
…		…
4039	*/	4182	*/
4040	PrivMode (1, PrivMode_vt52);	4183	PrivMode (1, PrivMode_vt52);
4041	break;	4184	break;
4042	case 3: /* 80/132 */	4185	case 3: /* 80/132 */
4043	if (priv_modes & PrivMode_132OK)	4186	if (priv_modes & PrivMode_132OK)
4044	set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);	4187	set_widthheight (((state ? 132 : 80) * fwidth), height);
4045	break;	4188	break;
4046	case 4: /* smooth scrolling */	4189	case 4: /* smooth scrolling */
4047	if (state)	4190	if (!state)
4048	options &= ~Opt_jumpScroll;	4191	SET_OPTION (Opt_jumpScroll);
4049	else	4192	else
4050	options |= Opt_jumpScroll;	4193	CLR_OPTION (Opt_jumpScroll);
4051	break;	4194	break;
4052	case 5: /* reverse video */	4195	case 5: /* reverse video */
4053	scr_rvideo_mode (state);	4196	scr_rvideo_mode (state);
4054	break;	4197	break;
4055	case 6: /* relative/absolute origins */	4198	case 6: /* relative/absolute origins */
…		…
4096	#if 0	4239	#if 0
4097	case 1001:	4240	case 1001:
4098	break; /* X11 mouse highlighting */	4241	break; /* X11 mouse highlighting */
4099	#endif	4242	#endif
4100	case 1010: /* scroll to bottom on TTY output inhibit */	4243	case 1010: /* scroll to bottom on TTY output inhibit */
4101	if (state)	4244	if (!state)
4102	options &= ~Opt_scrollTtyOutput;	4245	SET_OPTION (Opt_scrollTtyOutput);
4103	else	4246	else
4104	options |= Opt_scrollTtyOutput;	4247	CLR_OPTION (Opt_scrollTtyOutput);
4105	break;	4248	break;
4106	case 1011: /* scroll to bottom on key press */	4249	case 1011: /* scroll to bottom on key press */
4107	if (state)	4250	if (state)
4108	options |= Opt_scrollTtyKeypress;	4251	SET_OPTION (Opt_scrollTtyKeypress);
4109	else	4252	else
4110	options &= ~Opt_scrollTtyKeypress;	4253	CLR_OPTION (Opt_scrollTtyKeypress);
4111	break;	4254	break;
4112	case 1047: /* secondary screen w/ clearing last */	4255	case 1047: /* secondary screen w/ clearing last */
4113	if (options & Opt_secondaryScreen)	4256	if (OPTION (Opt_secondaryScreen))
4114	if (current_screen != PRIMARY)	4257	if (current_screen != PRIMARY)
4115	scr_erase_screen (2);	4258	scr_erase_screen (2);
4116	scr_change_screen (state);	4259	scr_change_screen (state);
4117	break;	4260	break;
4118	case 1049: /* secondary screen w/ clearing first */	4261	case 1049: /* secondary screen w/ clearing first */
4119	scr_change_screen (state);	4262	scr_change_screen (state);
4120	if (options & Opt_secondaryScreen)	4263	if (OPTION (Opt_secondaryScreen))
4121	if (current_screen != PRIMARY)	4264	if (current_screen != PRIMARY)
4122	scr_erase_screen (2);	4265	scr_erase_screen (2);
4123	break;	4266	break;
4124	default:	4267	default:
4125	break;	4268	break;
…		…
4253	scr_color (Color_bg, Color_bg);	4396	scr_color (Color_bg, Color_bg);
4254	break;	4397	break;
4255		4398
4256	//case 50: // not variable spacing	4399	//case 50: // not variable spacing
4257		4400
4258	#ifndef NO_BRIGHTCOLOR	4401	#if ENABLE_FRILLS
4259	case 90:	4402	case 90:
4260	case 91: /* set bright fg color */	4403	case 91: /* set bright fg color */
4261	case 92:	4404	case 92:
4262	case 93:	4405	case 93:
4263	case 94:	4406	case 94:
…		…
4275	case 106:	4418	case 106:
4276	case 107:	4419	case 107:
4277	scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);	4420	scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4278	break;	4421	break;
4279	#endif	4422	#endif
4280
4281	}	4423	}
4282	}	4424	}
4283	}	4425	}
4284	/*}}} */	4426	/*}}} */
4285		4427
…		…
4309	*/	4451	*/
4310	void	4452	void
4311	rxvt_term::tt_printf (const char *fmt,...)	4453	rxvt_term::tt_printf (const char *fmt,...)
4312	{	4454	{
4313	va_list arg_ptr;	4455	va_list arg_ptr;
4314	unsigned char buf[256];	4456	char buf[256];
4315		4457
4316	va_start (arg_ptr, fmt);	4458	va_start (arg_ptr, fmt);
4317	vsnprintf ((char *)buf, 256, fmt, arg_ptr);	4459	vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4318	va_end (arg_ptr);	4460	va_end (arg_ptr);
4319	tt_write (buf, strlen (buf));	4461	tt_write (buf, strlen (buf));
…		…
4324	* or generated by us in response to a query ESC sequence.	4466	* or generated by us in response to a query ESC sequence.
4325	*/	4467	*/
4326	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT	4468	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4327		4469
4328	void	4470	void
4329	rxvt_term::tt_write (const unsigned char *data, unsigned int len)	4471	rxvt_term::tt_write (const char *data, unsigned int len)
4330	{	4472	{
		4473	if (pty.pty < 0)
		4474	return;
		4475
4331	if (v_buflen == 0)	4476	if (v_buflen == 0)
4332	{	4477	{
4333	ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));	4478	ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4334		4479
4335	if ((unsigned int)written == len)	4480	if ((unsigned int)written == len)
…		…
4337		4482
4338	data += written;	4483	data += written;
4339	len -= written;	4484	len -= written;
4340	}	4485	}
4341		4486
4342	v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);	4487	v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4343		4488
4344	memcpy (v_buffer + v_buflen, data, len);	4489	memcpy (v_buffer + v_buflen, data, len);
4345	v_buflen += len;	4490	v_buflen += len;
4346		4491
4347	pty_ev.set (EVENT_READ | EVENT_WRITE);	4492	pty_ev.set (EVENT_READ | EVENT_WRITE);
…		…
4366	}	4511	}
4367		4512
4368	memmove (v_buffer, v_buffer + written, v_buflen);	4513	memmove (v_buffer, v_buffer + written, v_buflen);
4369	}	4514	}
4370	else if (written != -1 || (errno != EAGAIN && errno != EINTR))	4515	else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4371	// original code just ignores this...	4516	pty_ev.set (EVENT_READ);
4372	destroy ();
4373	}	4517	}
4374		4518
4375	/*----------------------- end-of-file (C source) -----------------------*/	4519	/*----------------------- end-of-file (C source) -----------------------*/
4376		4520

Diff Legend

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