[ViewVC] Diff of: cvs/rxvt-unicode/src/command.C

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.220 by root, Sat Dec 31 18:19:06 2005 UTC vs.
Revision 1.271 by root, Wed Jan 18 17:49:46 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
…		…
141	\|\| !IN_RANGE_EXC (y, 0, nrow))	147	\|\| !IN_RANGE_EXC (y, 0, nrow))
142	return;	148	return;
143		149
144	for (;;)	150	for (;;)
145	{	151	{
146	const line_t &l = ROW(y - view_start);	152	const line_t &l = ROW(y + view_start);
147		153
148	text_t t = l.t[x];	154	text_t t = l.t[x];
149		155
150	if (t != NOCHAR \|\| !x)	156	if (t != NOCHAR \|\| !x)
151	{	157	{
…		…
262	mb[0] = ch[0];	268	mb[0] = ch[0];
263	len = 1;	269	len = 1;
264	}	270	}
265		271
266	if (len > 0)	272	if (len > 0)
267	tt_write ((unsigned char *)mb, len);	273	tt_write (mb, len);
268	else	274	else
269	scr_bell ();	275	scr_bell ();
270	}	276	}
271		277
272	iso14755buf = 0;	278	iso14755buf = 0;
…		…
300	KeySym keysym;	306	KeySym keysym;
301	#ifdef DEBUG_CMD	307	#ifdef DEBUG_CMD
302	static int debug_key = 1; /* accessible by a debugger only */	308	static int debug_key = 1; /* accessible by a debugger only */
303	#endif	309	#endif
304	int valid_keysym;	310	int valid_keysym;
305	unsigned char kbuf[KBUFSZ];	311	char kbuf[KBUFSZ];
306		312
307	/*	313	/*
308	* 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
309	* escape sequence to toggle the Keypad.	315	* escape sequence to toggle the Keypad.
310	*	316	*
…		…
328	Status status_return;	334	Status status_return;
329		335
330	#if 0	336	#if 0
331	#ifdef X_HAVE_UTF8_STRING	337	#ifdef X_HAVE_UTF8_STRING
332	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
333	len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf,	339	len = Xutf8LookupString (Input_Context, &ev, kbuf,
334	KBUFSZ, &keysym, &status_return);	340	KBUFSZ, &keysym, &status_return);
335	else	341	else
336	#endif	342	#endif
337	#endif	343	#endif
338	{	344	{
…		…
375	\|\| status_return == XLookupBoth;	381	\|\| status_return == XLookupBoth;
376	}	382	}
377	else	383	else
378	#endif	384	#endif
379	{	385	{
380	len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose);	386	len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
381	valid_keysym = keysym != NoSymbol;	387	valid_keysym = keysym != NoSymbol;
382	}	388	}
383		389
384	if (valid_keysym)	390	if (valid_keysym)
385	{	391	{
…		…
437	scr_move_to (0, 1);	443	scr_move_to (0, 1);
438	return;	444	return;
439	}	445	}
440	else if (keysym == XK_End)	446	else if (keysym == XK_End)
441	{	447	{
442	scr_move_to (1, 0);	448	scr_move_to (1, 1);
443	return;	449	return;
444	}	450	}
445	}	451	}
446	#endif	452	#endif
447	}	453	}
…		…
849	{	855	{
850	#ifdef META8_OPTION	856	#ifdef META8_OPTION
851	/* set 8-bit on */	857	/* set 8-bit on */
852	if (meta && (meta_char == 0x80))	858	if (meta && (meta_char == 0x80))
853	{	859	{
854	unsigned char *ch;	860	char *ch;
855		861
856	for (ch = kbuf; ch < kbuf + len; ch++)	862	for (ch = kbuf; ch < kbuf + len; ch++)
857	*ch \|= 0x80;	863	*ch \|= 0x80;
858		864
859	meta = 0;	865	meta = 0;
860	}	866	}
861	#endif	867	#endif
862	/* nil */ ;	868	/* nil */ ;
863	}	869	}
864	}	870	}
		871
		872	if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
		873	return;
865		874
866	if (len <= 0)	875	if (len <= 0)
867	return; /* not mapped */	876	return; /* not mapped */
868		877
869	if (OPTION (Opt_scrollTtyKeypress))	878	if (OPTION (Opt_scrollTtyKeypress))
…		…
892	#ifdef META8_OPTION	901	#ifdef META8_OPTION
893	&& meta_char == C0_ESC	902	&& meta_char == C0_ESC
894	#endif	903	#endif
895	)	904	)
896	{	905	{
897	const unsigned char ch = C0_ESC;	906	const char ch = C0_ESC;
898	tt_write (&ch, 1);	907	tt_write (&ch, 1);
899	}	908	}
900		909
901	#if defined(DEBUG_CMD)	910	#if defined(DEBUG_CMD)
902	/* Display keyboard buffer contents */	911	/* Display keyboard buffer contents */
…		…
910	#endif /* DEBUG_CMD */	919	#endif /* DEBUG_CMD */
911	tt_write (kbuf, (unsigned int)len);	920	tt_write (kbuf, (unsigned int)len);
912	}	921	}
913	/}}} /	922	/}}} /
914		923
915	#if MENUBAR_MAX \|\| defined (KEYSYM_RESOURCE)	924	#if defined (KEYSYM_RESOURCE)
916	/{{{ rxvt_cmd_write (), rxvt_cmd_getc () /
917	/* attempt to `write' count to the input buffer */
918	unsigned int	925	unsigned int
919	rxvt_term::cmd_write (const unsigned char *str, unsigned int count)	926	rxvt_term::cmd_write (const char *str, unsigned int count)
920	{	927	{
921	unsigned int n, s;	928	unsigned int n, s;
922		929
923	n = cmdbuf_ptr - cmdbuf_base;	930	n = cmdbuf_ptr - cmdbuf_base;
924	s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;	931	s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
…		…
961	}	968	}
962	#endif	969	#endif
963		970
964	if (want_refresh)	971	if (want_refresh)
965	{	972	{
		973	if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
		974	{
		975	int row = view_start;
		976	int end_row = row + nrow;
		977
		978	while (row > top_row && ROW (row - 1).is_longer ())
		979	--row;
		980
		981	do
		982	{
		983	int start_row = row;
		984	line_t *l;
		985
		986	do
		987	{
		988	l = &ROW (row++);
		989
		990	if (!(l->f & LINE_FILTERED))
		991	{
		992	// line not filtered, mark it as filtered
		993	l->f \|= LINE_FILTERED;
		994	while (l->is_longer ())
		995	{
		996	l = &ROW (row++);
		997	l->f \|= LINE_FILTERED;
		998	}
		999
		1000	// and filter it
		1001	HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
		1002
		1003	break;
		1004	}
		1005	}
		1006	while (l->is_longer () && row < end_row);
		1007	}
		1008	while (row < end_row);
		1009	}
		1010
966	scr_refresh (refresh_type);	1011	scr_refresh ();
967	scrollbar_show (1);	1012	scrollbar_show (1);
968	#ifdef USE_XIM	1013	#ifdef USE_XIM
969	IMSendSpot ();	1014	IMSendSpot ();
970	#endif	1015	#endif
971	}	1016	}
…		…
974	}	1019	}
975		1020
976	void	1021	void
977	rxvt_term::check_cb (check_watcher &w)	1022	rxvt_term::check_cb (check_watcher &w)
978	{	1023	{
979	SET_R (this);	1024	make_current ();
980	SET_LOCALE (locale);
981		1025
982	display->flush ();	1026	display->flush ();
983		1027
984	if (want_refresh && !flush_ev.active)	1028	if (want_refresh && !flush_ev.active)
985	flush_ev.start (NOW + 0.01);	1029	flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
986	}	1030	}
987		1031
988	void	1032	void
989	rxvt_term::flush_cb (time_watcher &w)	1033	rxvt_term::flush_cb (time_watcher &w)
990	{	1034	{
991	SET_R (this);	1035	make_current ();
992	SET_LOCALE (locale);
993		1036
994	refresh_limit = 1;	1037	refresh_limit = 1;
995	refresh_count = 0;	1038	refresh_count = 0;
996	flush ();	1039	flush ();
997	}	1040	}
…		…
1025	rxvt_term::cont_scroll_cb (time_watcher &w)	1068	rxvt_term::cont_scroll_cb (time_watcher &w)
1026	{	1069	{
1027	if ((scrollbar_isUp() \|\| scrollbar_isDn()) &&	1070	if ((scrollbar_isUp() \|\| scrollbar_isDn()) &&
1028	scr_page (scrollbar_isUp() ? UP : DN, 1))	1071	scr_page (scrollbar_isUp() ? UP : DN, 1))
1029	{	1072	{
1030	refresh_type \|= SMOOTH_REFRESH;
1031	want_refresh = 1;	1073	want_refresh = 1;
1032	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1074	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1033	}	1075	}
1034	}	1076	}
1035	#endif	1077	#endif
…		…
1039	rxvt_term::sel_scroll_cb (time_watcher &w)	1081	rxvt_term::sel_scroll_cb (time_watcher &w)
1040	{	1082	{
1041	if (scr_page (scroll_selection_dir, scroll_selection_lines))	1083	if (scr_page (scroll_selection_dir, scroll_selection_lines))
1042	{	1084	{
1043	selection_extend (selection_save_x, selection_save_y, selection_save_state);	1085	selection_extend (selection_save_x, selection_save_y, selection_save_state);
1044	refresh_type \|= SMOOTH_REFRESH;
1045	want_refresh = 1;	1086	want_refresh = 1;
1046	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1087	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1047	}	1088	}
1048	}	1089	}
1049	#endif	1090	#endif
…		…
1054	{	1095	{
1055	if (mouse_slip_wheel_speed == 0	1096	if (mouse_slip_wheel_speed == 0
1056	\|\| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)	1097	\|\| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1057	: scr_page (UP, mouse_slip_wheel_speed))	1098	: scr_page (UP, mouse_slip_wheel_speed))
1058	{	1099	{
1059	if (view_start == nsaved \|\|	1100	if (view_start == top_row \|\| view_start == 0)
1060	view_start == 0)
1061	mouse_slip_wheel_speed = 0;	1101	mouse_slip_wheel_speed = 0;
1062		1102
1063	refresh_type \|= SMOOTH_REFRESH;
1064	want_refresh = 1;	1103	want_refresh = 1;
1065	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1104	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1066	}	1105	}
1067	}	1106	}
1068	#endif	1107	#endif
1069		1108
		1109	#if HAVE_SCHED_YIELD
		1110	static struct event_handler
		1111	{
		1112	check_watcher cw_yield;
		1113
		1114	void yield (check_watcher &w)
		1115	{
		1116	sched_yield ();
		1117	w.stop ();
		1118	}
		1119
		1120	event_handler ()
		1121	: cw_yield (this, &event_handler::yield)
		1122	{
		1123	}
		1124	} event_handler;
		1125	#endif
		1126
1070	bool	1127	bool
1071	rxvt_term::pty_fill ()	1128	rxvt_term::pty_fill ()
1072	{	1129	{
1073	ssize_t n = cmdbuf_endp - cmdbuf_ptr;	1130	ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1074		1131
1075	if (CBUFSIZ == n)	1132	if (CBUFSIZ == n)
1076	{	1133	{
1077	rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n");	1134	rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1078	n = 0;	1135	n = 0;
1079	}	1136	}
1080		1137
1081	memmove (cmdbuf_base, cmdbuf_ptr, n);	1138	memmove (cmdbuf_base, cmdbuf_ptr, n);
1082	cmdbuf_ptr = cmdbuf_base;	1139	cmdbuf_ptr = cmdbuf_base;
1083	cmdbuf_endp = cmdbuf_ptr + n;	1140	cmdbuf_endp = cmdbuf_ptr + n;
1084		1141
1085	n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);	1142	ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1086		1143
1087	if (n > 0)	1144	if (r > 0)
1088	{	1145	{
1089	cmdbuf_endp += n;	1146	cmdbuf_endp += r;
1090	return true;	1147	return true;
1091	}	1148	}
1092	else if ((n < 0 && errno != EAGAIN && errno != EINTR) \|\| n == 0)	1149	else if (r < 0 && (errno == EAGAIN \|\| errno == EINTR))
		1150	{
		1151	#if HAVE_SCHED_YIELD
		1152	if (display->is_local)
		1153	event_handler.cw_yield.start ();
		1154	#endif
		1155	}
		1156	else
1093	{	1157	{
1094	pty_ev.stop ();	1158	pty_ev.stop ();
1095		1159
1096	if (!OPTION (Opt_hold))	1160	if (!OPTION (Opt_hold))
1097	destroy ();	1161	destroy ();
…		…
1101	}	1165	}
1102		1166
1103	void	1167	void
1104	rxvt_term::pty_cb (io_watcher &w, short revents)	1168	rxvt_term::pty_cb (io_watcher &w, short revents)
1105	{	1169	{
1106	SET_R (this);	1170	make_current ();
1107	SET_LOCALE (locale);
1108		1171
1109	if (revents & EVENT_READ)	1172	if (revents & EVENT_READ)
1110	// loop, but don't allow a single term to monopolize us	1173	// loop, but don't allow a single term to monopolize us
1111	while (pty_fill ())	1174	while (pty_fill ())
1112	if (cmd_parse ())	1175	if (cmd_parse ())
…		…
1132		1195
1133	#ifdef POINTER_BLANK	1196	#ifdef POINTER_BLANK
1134	void	1197	void
1135	rxvt_term::pointer_blank ()	1198	rxvt_term::pointer_blank ()
1136	{	1199	{
1137	if (! OPTION (Opt_pointerBlank))	1200	if (!OPTION (Opt_pointerBlank))
1138	return;	1201	return;
1139		1202
1140	XDefineCursor (display->display, vt, display->blank_cursor);	1203	XDefineCursor (display->display, vt, display->blank_cursor);
1141	XFlush (display->display);	1204	XFlush (display->display);
1142		1205
…		…
1144	}	1207	}
1145		1208
1146	void	1209	void
1147	rxvt_term::pointer_cb (time_watcher &w)	1210	rxvt_term::pointer_cb (time_watcher &w)
1148	{	1211	{
1149	SET_R (this);	1212	make_current ();
1150	SET_LOCALE (locale);
1151		1213
1152	pointer_blank ();	1214	pointer_blank ();
1153	}	1215	}
1154	#endif	1216	#endif
1155		1217
…		…
1234		1296
1235	/{{{ process an X event /	1297	/{{{ process an X event /
1236	void	1298	void
1237	rxvt_term::x_cb (XEvent &ev)	1299	rxvt_term::x_cb (XEvent &ev)
1238	{	1300	{
		1301	make_current ();
		1302
1239	dDisp;	1303	dDisp;
1240		1304
1241	SET_R (this);	1305	if (ev.xany.window == vt
1242	SET_LOCALE (locale);	1306	&& SHOULD_INVOKE (HOOK_X_EVENT)
		1307	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
		1308	return;
1243		1309
1244	#if defined(CURSOR_BLINK)	1310	// for XQueryPointer
1245	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1246	{
1247	if (hidden_cursor)
1248	{
1249	hidden_cursor = 0;
1250	want_refresh = 1;
1251	}
1252
1253	cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1254	}
1255	#endif
1256
1257	#if defined(POINTER_BLANK)
1258	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1259	{
1260	if (ev.type == MotionNotify
1261	\|\| ev.type == ButtonPress
1262	\|\| ev.type == ButtonRelease)
1263	if (hidden_pointer)
1264	pointer_unblank ();
1265
1266	if (ev.type == KeyPress && hidden_pointer == 0)
1267	pointer_blank ();
1268	}
1269	#endif
1270
1271	Window unused_root, unused_child;	1311	Window unused_root, unused_child;
1272	int unused_root_x, unused_root_y;	1312	int unused_root_x, unused_root_y;
1273	unsigned int unused_mask;	1313	unsigned int unused_mask;
1274		1314
1275	switch (ev.type)	1315	switch (ev.type)
…		…
1282		1322
1283	break;	1323	break;
1284		1324
1285	case KeyRelease:	1325	case KeyRelease:
1286	{	1326	{
1287	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ISO_14755	1327	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ISO_14755 \|\| ENABLE_PERL
1288	KeySym ks;	1328	KeySym keysym;
1289		1329
1290	ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/	1330	keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1291	#endif	1331	#endif
1292		1332
1293	#if ENABLE_FRILLS \|\| ISO_14755	1333	#if ENABLE_FRILLS \|\| ISO_14755
1294	// ISO 14755 support	1334	// ISO 14755 support
1295	if (iso14755buf)	1335	if (iso14755buf)
…		…
1300	# endif	1340	# endif
1301	# if ISO_14755	1341	# if ISO_14755
1302	// iso14755 part 5.2 handling: release time	1342	// iso14755 part 5.2 handling: release time
1303	// first: controls	1343	// first: controls
1304	if ((ev.xkey.state & ControlMask)	1344	if ((ev.xkey.state & ControlMask)
1305	&& ((ks >= 0x40 && ks <= 0x5f)	1345	&& ((keysym >= 0x40 && keysym <= 0x5f)
1306	\|\| (ks >= 0x61 && ks <= 0x7f)))	1346	\|\| (keysym >= 0x61 && keysym <= 0x7f)))
1307	{	1347	{
1308	iso14755buf = ISO_14755_51 \| 0x2400 \| (ks & 0x1f);	1348	iso14755buf = ISO_14755_51 \| 0x2400 \| (keysym & 0x1f);
1309	commit_iso14755 ();	1349	commit_iso14755 ();
1310	return; // case-break;	1350	goto skip_switch;
1311	}	1351	}
1312		1352
1313	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)	1353	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1314	if (i[0] == ks)	1354	if (i[0] == keysym)
1315	{	1355	{
1316	iso14755buf = ISO_14755_51 \| i[1];	1356	iso14755buf = ISO_14755_51 \| i[1];
1317	commit_iso14755 ();	1357	commit_iso14755 ();
1318	return; // case-break;	1358	goto skip_switch;
1319	}	1359	}
1320		1360
1321	scr_bell ();	1361	scr_bell ();
1322	# endif	1362	# endif
1323	iso14755buf = 0;	1363	iso14755buf = 0;
…		…
1342	else	1382	else
1343	iso14755buf = 0;	1383	iso14755buf = 0;
1344	}	1384	}
1345	#endif	1385	#endif
1346		1386
		1387	if (ev.xany.window == vt
		1388	&& HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
		1389	break;
		1390
1347	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	1391	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1348	if (!(ev.xkey.state & ControlMask))	1392	if (!(ev.xkey.state & ControlMask))
1349	slip_wheel_ev.stop ();	1393	slip_wheel_ev.stop ();
1350	else if (ks == XK_Control_L \|\| ks == XK_Control_R)	1394	else if (keysym == XK_Control_L \|\| keysym == XK_Control_R)
1351	mouse_slip_wheel_speed = 0;	1395	mouse_slip_wheel_speed = 0;
1352	#endif	1396	#endif
1353	break;	1397	break;
1354	}	1398	}
1355		1399
…		…
1458	{	1502	{
1459	seen_resize = 1;	1503	seen_resize = 1;
1460	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1504	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1461	}	1505	}
1462		1506
		1507	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
		1508
1463	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */	1509	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1464	if (OPTION (Opt_transparent))	1510	if (OPTION (Opt_transparent))
1465	check_our_parents ();	1511	check_our_parents ();
1466	#endif	1512	#endif
1467	}	1513	}
…		…
1485		1531
1486	case SelectionRequest:	1532	case SelectionRequest:
1487	selection_send (ev.xselectionrequest);	1533	selection_send (ev.xselectionrequest);
1488	break;	1534	break;
1489		1535
		1536	case MapNotify:
		1537	mapped = 1;
		1538	#ifdef TEXT_BLINK
		1539	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
		1540	#endif
		1541	HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
		1542	break;
		1543
1490	case UnmapNotify:	1544	case UnmapNotify:
1491	mapped = 0;	1545	mapped = 0;
1492	#ifdef TEXT_BLINK	1546	#ifdef TEXT_BLINK
1493	text_blink_ev.stop ();	1547	text_blink_ev.stop ();
1494	#endif	1548	#endif
1495	break;	1549	HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1496
1497	case MapNotify:
1498	mapped = 1;
1499	#ifdef TEXT_BLINK
1500	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1501	#endif
1502	break;	1550	break;
1503		1551
1504	#ifdef TRANSPARENT	1552	#ifdef TRANSPARENT
1505	case ReparentNotify:	1553	case ReparentNotify:
1506	rootwin_cb (ev);	1554	rootwin_cb (ev);
…		…
1520		1568
1521	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))	1569	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1522	scr_expose (ev.xexpose.x, ev.xexpose.y,	1570	scr_expose (ev.xexpose.x, ev.xexpose.y,
1523	ev.xexpose.width, ev.xexpose.height, False);	1571	ev.xexpose.width, ev.xexpose.height, False);
1524		1572
1525	scr_refresh (refresh_type);	1573	want_refresh = 1;
1526	}	1574	}
1527	else	1575	else
1528	{	1576	{
1529	XEvent unused_event;	1577	XEvent unused_event;
1530		1578
…		…
1536	if (isScrollbarWindow (ev.xany.window))	1584	if (isScrollbarWindow (ev.xany.window))
1537	{	1585	{
1538	scrollBar.setIdle ();	1586	scrollBar.setIdle ();
1539	scrollbar_show (0);	1587	scrollbar_show (0);
1540	}	1588	}
1541	#ifdef MENUBAR
1542	if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1543	menubar_expose ();
1544	#endif
1545		1589
1546	#ifdef TRANSPARENT	1590	#ifdef TRANSPARENT
1547	if (am_transparent && ev.xany.window == parent[0])	1591	if (am_transparent && ev.xany.window == parent[0])
1548	XClearWindow (disp, ev.xany.window);	1592	XClearWindow (disp, ev.xany.window);
1549	#endif	1593	#endif
…		…
1553	case MotionNotify:	1597	case MotionNotify:
1554	#ifdef POINTER_BLANK	1598	#ifdef POINTER_BLANK
1555	if (hidden_pointer)	1599	if (hidden_pointer)
1556	pointer_unblank ();	1600	pointer_unblank ();
1557	#endif	1601	#endif
1558	#if MENUBAR
1559	if (isMenuBarWindow (ev.xany.window))
1560	{
1561	menubar_control (ev.xbutton);
1562	break;
1563	}
1564	#endif
1565	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)	1602	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1566	break;	1603	break;
1567		1604
1568	if (ev.xany.window == vt)	1605	if (ev.xany.window == vt)
1569	{	1606	{
		1607	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
		1608	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
		1609	; // nop
1570	if (ev.xbutton.state & (Button1Mask \| Button3Mask))	1610	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))
1571	{	1611	{
1572	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))	1612	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1573	;	1613	;
1574		1614
1575	XQueryPointer (disp, vt,	1615	XQueryPointer (disp, vt,
…		…
1655	&unused_root_x, &unused_root_y,	1695	&unused_root_x, &unused_root_y,
1656	&ev.xbutton.x, &ev.xbutton.y,	1696	&ev.xbutton.x, &ev.xbutton.y,
1657	&unused_mask);	1697	&unused_mask);
1658	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1698	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1659	scrollbar_size ());	1699	scrollbar_size ());
1660	scr_refresh (refresh_type);	1700	want_refresh = 1;
1661	refresh_limit = 0;	1701	refresh_limit = 0;
1662	scrollbar_show (1);	1702	scrollbar_show (1);
1663	}	1703	}
1664	break;	1704	break;
1665	}	1705	}
		1706
		1707	skip_switch: ;
		1708
		1709	#if defined(CURSOR_BLINK)
		1710	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
		1711	{
		1712	if (hidden_cursor)
		1713	{
		1714	hidden_cursor = 0;
		1715	want_refresh = 1;
		1716	}
		1717
		1718	cursor_blink_ev.start (NOW + BLINK_INTERVAL);
		1719	}
		1720	#endif
		1721
		1722	#if defined(POINTER_BLANK)
		1723	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
		1724	{
		1725	if (ev.type == MotionNotify
		1726	\|\| ev.type == ButtonPress
		1727	\|\| ev.type == ButtonRelease)
		1728	if (hidden_pointer)
		1729	pointer_unblank ();
		1730
		1731	if (ev.type == KeyPress && hidden_pointer == 0)
		1732	pointer_blank ();
		1733	}
		1734	#endif
1666	}	1735	}
1667		1736
1668	void	1737	void
1669	rxvt_term::focus_in ()	1738	rxvt_term::focus_in ()
1670	{	1739	{
1671	if (!focus)	1740	if (!focus)
1672	{	1741	{
1673	focus = 1;	1742	focus = 1;
1674	want_refresh = 1;	1743	want_refresh = 1;
		1744
		1745	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
		1746
1675	#if USE_XIM	1747	#if USE_XIM
1676	if (Input_Context != NULL)	1748	if (Input_Context != NULL)
1677	{	1749	{
1678	IMSetStatusPosition ();	1750	IMSetStatusPosition ();
1679	XSetICFocus (Input_Context);	1751	XSetICFocus (Input_Context);
…		…
1699	if (focus)	1771	if (focus)
1700	{	1772	{
1701	focus = 0;	1773	focus = 0;
1702	want_refresh = 1;	1774	want_refresh = 1;
1703		1775
		1776	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
		1777
1704	#if ENABLE_FRILLS \|\| ISO_14755	1778	#if ENABLE_FRILLS \|\| ISO_14755
		1779	if (iso14755buf)
		1780	{
1705	iso14755buf = 0;	1781	iso14755buf = 0;
1706	#endif
1707	#if ENABLE_OVERLAY	1782	# if ENABLE_OVERLAY
1708	scr_overlay_off ();	1783	scr_overlay_off ();
		1784	# endif
		1785	}
1709	#endif	1786	#endif
1710	#if USE_XIM	1787	#if USE_XIM
1711	if (Input_Context != NULL)	1788	if (Input_Context != NULL)
1712	XUnsetICFocus (Input_Context);	1789	XUnsetICFocus (Input_Context);
1713	#endif	1790	#endif
…		…
1728		1805
1729	#if TRANSPARENT	1806	#if TRANSPARENT
1730	void	1807	void
1731	rxvt_term::rootwin_cb (XEvent &ev)	1808	rxvt_term::rootwin_cb (XEvent &ev)
1732	{	1809	{
1733	SET_R (this);	1810	make_current ();
1734	SET_LOCALE (locale);
1735		1811
1736	switch (ev.type)	1812	switch (ev.type)
1737	{	1813	{
1738	case PropertyNotify:	1814	case PropertyNotify:
1739	/*	1815	/*
…		…
1757	rxvt_term::button_press (XButtonEvent &ev)	1833	rxvt_term::button_press (XButtonEvent &ev)
1758	{	1834	{
1759	int reportmode = 0, clickintime;	1835	int reportmode = 0, clickintime;
1760		1836
1761	bypass_keystate = ev.state & (ModMetaMask \| ShiftMask);	1837	bypass_keystate = ev.state & (ModMetaMask \| ShiftMask);
		1838
1762	if (!bypass_keystate)	1839	if (!bypass_keystate)
1763	reportmode = !! (priv_modes & PrivMode_mouse_report);	1840	reportmode = !! (priv_modes & PrivMode_mouse_report);
1764		1841
1765	/*	1842	/*
1766	* VT window processing of button press	1843	* VT window processing of button press
…		…
1786	#ifdef MOUSE_REPORT_DOUBLECLICK	1863	#ifdef MOUSE_REPORT_DOUBLECLICK
1787	if (ev.button == MEvent.button && clickintime)	1864	if (ev.button == MEvent.button && clickintime)
1788	{	1865	{
1789	/* same button, within alloted time */	1866	/* same button, within alloted time */
1790	MEvent.clicks++;	1867	MEvent.clicks++;
		1868
1791	if (MEvent.clicks > 1)	1869	if (MEvent.clicks > 1)
1792	{	1870	{
1793	/* only report double clicks */	1871	/* only report double clicks */
1794	MEvent.clicks = 2;	1872	MEvent.clicks = 2;
1795	mouse_report (ev);	1873	mouse_report (ev);
…		…
1815	else	1893	else
1816	{	1894	{
1817	if (ev.button != MEvent.button)	1895	if (ev.button != MEvent.button)
1818	MEvent.clicks = 0;	1896	MEvent.clicks = 0;
1819		1897
		1898	if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1820	switch (ev.button)	1899	switch (ev.button)
1821	{	1900	{
1822	case Button1:	1901	case Button1:
1823	/* allow meta + click to select rectangular areas */	1902	/* allow meta + click to select rectangular areas */
1824	/* should be done in screen.C */	1903	/* should be done in screen.C */
1825	#if ENABLE_FRILLS	1904	#if ENABLE_FRILLS
1826	selection.rect = !!(ev.state & ModMetaMask);	1905	selection.rect = !!(ev.state & ModMetaMask);
1827	#else	1906	#else
1828	selection.rect = false;	1907	selection.rect = false;
1829	#endif	1908	#endif
1830		1909
1831	/* allow shift+left click to extend selection */	1910	/* allow shift+left click to extend selection */
1832	if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))	1911	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1833	{	1912	{
1834	if (MEvent.button == Button1 && clickintime)	1913	if (MEvent.button == Button1 && clickintime)
1835	selection_rotate (ev.x, ev.y);	1914	selection_rotate (ev.x, ev.y);
1836	else	1915	else
1837	selection_extend (ev.x, ev.y, 1);	1916	selection_extend (ev.x, ev.y, 1);
1838	}	1917	}
1839	else	1918	else
1840	{	1919	{
1841	if (MEvent.button == Button1 && clickintime)	1920	if (MEvent.button == Button1 && clickintime)
1842	MEvent.clicks++;	1921	MEvent.clicks++;
1843	else	1922	else
1844	MEvent.clicks = 1;	1923	MEvent.clicks = 1;
1845		1924
1846	selection_click (MEvent.clicks, ev.x, ev.y);	1925	selection_click (MEvent.clicks, ev.x, ev.y);
1847	}	1926	}
1848		1927
1849	MEvent.button = Button1;	1928	MEvent.button = Button1;
1850	break;	1929	break;
1851		1930
1852	case Button3:	1931	case Button3:
1853	if (MEvent.button == Button3 && clickintime)	1932	if (MEvent.button == Button3 && clickintime)
1854	selection_rotate (ev.x, ev.y);	1933	selection_rotate (ev.x, ev.y);
1855	else	1934	else
1856	selection_extend (ev.x, ev.y, 1);	1935	selection_extend (ev.x, ev.y, 1);
1857		1936
1858	MEvent.button = Button3;	1937	MEvent.button = Button3;
1859	break;	1938	break;
1860	}	1939	}
1861	}	1940	}
1862		1941
1863	MEvent.time = ev.time;	1942	MEvent.time = ev.time;
1864	return;	1943	return;
1865	}	1944	}
1866		1945
…		…
2002	}	2081	}
2003		2082
2004	break;	2083	break;
2005	}	2084	}
2006	}	2085	}
		2086
2007	return;	2087	return;
2008	}	2088	}
2009	#if MENUBAR
2010	/*
2011	* Menubar window processing of button press
2012	*/
2013	if (isMenuBarWindow (ev.window))
2014	menubar_control (ev);
2015	#endif
2016	}	2089	}
2017		2090
2018	void	2091	void
2019	rxvt_term::button_release (XButtonEvent &ev)	2092	rxvt_term::button_release (XButtonEvent &ev)
2020	{	2093	{
…		…
2026		2099
2027	if (scrollbar_isUpDn ())	2100	if (scrollbar_isUpDn ())
2028	{	2101	{
2029	scrollBar.setIdle ();	2102	scrollBar.setIdle ();
2030	scrollbar_show (0);	2103	scrollbar_show (0);
2031	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2032	refresh_type &= ~SMOOTH_REFRESH;
2033	#endif
2034	}	2104	}
2035		2105
2036	#ifdef SELECTION_SCROLLING	2106	#ifdef SELECTION_SCROLLING
2037	if (sel_scroll_ev.active)	2107	if (sel_scroll_ev.active)
2038	sel_scroll_ev.stop();	2108	sel_scroll_ev.stop();
…		…
2076	if (priv_modes & PrivMode_mouse_report	2146	if (priv_modes & PrivMode_mouse_report
2077	&& bypass_keystate	2147	&& bypass_keystate
2078	&& ev.button == Button1 && MEvent.clicks <= 1)	2148	&& ev.button == Button1 && MEvent.clicks <= 1)
2079	selection_extend (ev.x, ev.y, 0);	2149	selection_extend (ev.x, ev.y, 0);
2080		2150
		2151	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
		2152	return;
		2153
2081	switch (ev.button)	2154	switch (ev.button)
2082	{	2155	{
2083	case Button1:	2156	case Button1:
2084	case Button3:	2157	case Button3:
2085	selection_make (ev.time);	2158	selection_make (ev.time);
…		…
2116	slip_wheel_ev.start ();	2189	slip_wheel_ev.start ();
2117	}	2190	}
2118	else	2191	else
2119	{	2192	{
2120	# endif	2193	# endif
2121	# ifdef JUMP_MOUSE_WHEEL
2122	scr_page (v, i);	2194	scr_page (v, i);
2123	scr_refresh (SMOOTH_REFRESH);
2124	scrollbar_show (1);	2195	scrollbar_show (1);
2125	# else
2126	while (i--)
2127	{
2128	scr_page (v, 1);
2129	scr_refresh (SMOOTH_REFRESH);
2130	scrollbar_show (1);
2131	}
2132	# endif
2133	# ifdef MOUSE_SLIP_WHEELING	2196	# ifdef MOUSE_SLIP_WHEELING
2134	}	2197	}
2135	#endif	2198	# endif
2136	}	2199	}
2137	break;	2200	break;
2138	#endif	2201	#endif
2139	}	2202	}
2140	}	2203	}
2141	#ifdef MENUBAR
2142	else if (isMenuBarWindow (ev.window))
2143	menubar_control (ev);
2144	#endif
2145	}	2204	}
2146		2205
2147	#ifdef TRANSPARENT	2206	#ifdef TRANSPARENT
2148	#if TINTING	2207	#if TINTING
2149	/* taken from aterm-0.4.2 */	2208	/* taken from aterm-0.4.2 */
…		…
2629		2688
2630	bool	2689	bool
2631	rxvt_term::cmd_parse ()	2690	rxvt_term::cmd_parse ()
2632	{	2691	{
2633	bool flag = false;	2692	bool flag = false;
2634	unicode_t ch = NOCHAR;	2693	wchar_t ch = NOCHAR;
2635	unsigned char *seq_begin; // remember start of esc-sequence here	2694	char *seq_begin; // remember start of esc-sequence here
2636		2695
2637	for (;;)	2696	for (;;)
2638	{	2697	{
2639	if (ch == NOCHAR)	2698	if (ch == NOCHAR)
2640	{	2699	{
2641	seq_begin = cmdbuf_ptr;	2700	seq_begin = cmdbuf_ptr;
2642	ch = next_char ();	2701	ch = next_char ();
2643	}
2644		2702
2645	if (ch == NOCHAR) // TODO: improve	2703	if (ch == NOCHAR)
2646	break;	2704	break;
		2705	}
2647		2706
2648	if (!IS_CONTROL (ch) \|\| ch == C0_LF \|\| ch == C0_CR \|\| ch == C0_HT)	2707	if (!IS_CONTROL (ch) \|\| ch == C0_LF \|\| ch == C0_CR \|\| ch == C0_HT)
2649	{	2708	{
2650	if (!seen_input)	2709	if (!seen_input)
2651	{	2710	{
…		…
2660	if (seen_resize && cmd_pid)	2719	if (seen_resize && cmd_pid)
2661	kill (-cmd_pid, SIGWINCH);	2720	kill (-cmd_pid, SIGWINCH);
2662	}	2721	}
2663		2722
2664	/* Read a text string from the input buffer */	2723	/* Read a text string from the input buffer */
2665	unicode_t buf[UBUFSIZ];	2724	wchar_t buf[UBUFSIZ];
2666	bool refreshnow = false;	2725	bool refreshnow = false;
2667	int nlines = 0;	2726	int nlines = 0;
2668	unicode_t *str = buf;	2727	wchar_t *str = buf;
2669	unicode_t *eol = str + min (ncol, UBUFSIZ);	2728	wchar_t *eol = str + min (ncol, UBUFSIZ);
2670		2729
2671	for (;;)	2730	for (;;)
2672	{	2731	{
2673	if (ch == NOCHAR \|\| (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))	2732	if (ch == NOCHAR \|\| (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2674	break;	2733	break;
…		…
2684		2743
2685	if (!OPTION (Opt_jumpScroll)	2744	if (!OPTION (Opt_jumpScroll)
2686	\|\| (refresh_count >= refresh_limit * (nrow - 1)))	2745	\|\| (refresh_count >= refresh_limit * (nrow - 1)))
2687	{	2746	{
2688	refreshnow = true;	2747	refreshnow = true;
		2748	refresh_count = 0;
2689	ch = NOCHAR;	2749	ch = NOCHAR;
2690	break;	2750	break;
2691	}	2751	}
2692		2752
2693	// scr_add_lines only works for nlines <= nrow - 1.	2753	// scr_add_lines only works for nlines <= nrow - 1.
2694	if (nlines >= nrow - 1)	2754	if (nlines >= nrow - 1)
2695	{	2755	{
		2756	if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
		2757	&& HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2696	scr_add_lines (buf, nlines, str - buf);	2758	scr_add_lines (buf, str - buf, nlines);
		2759
2697	nlines = 0;	2760	nlines = 0;
2698	str = buf;	2761	str = buf;
2699	eol = str + min (ncol, UBUFSIZ);	2762	eol = str + min (ncol, UBUFSIZ);
2700	}	2763	}
2701		2764
…		…
2714		2777
2715	seq_begin = cmdbuf_ptr;	2778	seq_begin = cmdbuf_ptr;
2716	ch = next_char ();	2779	ch = next_char ();
2717	}	2780	}
2718		2781
		2782	if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
		2783	&& HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2719	scr_add_lines (buf, nlines, str - buf);	2784	scr_add_lines (buf, str - buf, nlines);
2720		2785
2721	/*	2786	/*
2722	* If there have been a lot of new lines, then update the screen	2787	* If there have been a lot of new lines, then update the screen
2723	* What the heck I'll cheat and only refresh less than every page-full.	2788	* What the heck I'll cheat and only refresh less than every page-full.
2724	* the number of pages between refreshes is refresh_limit, which	2789	* the number of pages between refreshes is refresh_limit, which
…		…
2729	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)	2794	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2730	refresh_limit++;	2795	refresh_limit++;
2731	else	2796	else
2732	{	2797	{
2733	flag = true;	2798	flag = true;
2734	scr_refresh (refresh_type);	2799	scr_refresh ();
		2800	want_refresh = 1;
2735	}	2801	}
2736	}	2802	}
2737		2803
2738	}	2804	}
2739	else	2805	else
…		…
2754	}	2820	}
2755		2821
2756	return flag;	2822	return flag;
2757	}	2823	}
2758		2824
2759	// read the next octet
2760	unicode_t
2761	rxvt_term::next_octet ()
2762	{
2763	return cmdbuf_ptr < cmdbuf_endp
2764	? *cmdbuf_ptr++
2765	: NOCHAR;
2766	}
2767
2768	// read the next character	2825	// read the next character
2769	unicode_t	2826	wchar_t
2770	rxvt_term::next_char ()	2827	rxvt_term::next_char ()
2771	{	2828	{
2772	while (cmdbuf_ptr < cmdbuf_endp)	2829	while (cmdbuf_ptr < cmdbuf_endp)
2773	{	2830	{
2774	// assume 7-bit to be ascii ALWAYS	2831	// assume 7-bit to be ascii ALWAYS
2775	if (cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b)	2832	if ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b)
2776	return *cmdbuf_ptr++;	2833	return *cmdbuf_ptr++;
2777		2834
2778	wchar_t wc;	2835	wchar_t wc;
2779	size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);	2836	size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2780		2837
2781	if (len == (size_t)-2)	2838	if (len == (size_t)-2)
2782	{	2839	{
2783	// the mbstate stores incomplete sequences. didn't know this :/	2840	// the mbstate stores incomplete sequences. didn't know this :/
2784	cmdbuf_ptr = cmdbuf_endp;	2841	cmdbuf_ptr = cmdbuf_endp;
2785	break;	2842	break;
2786	}	2843	}
2787		2844
2788	if (len == (size_t)-1)	2845	if (len == (size_t)-1)
2789	return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through	2846	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2790		2847
2791	// assume wchar == unicode	2848	// assume wchar == unicode
2792	cmdbuf_ptr += len;	2849	cmdbuf_ptr += len;
2793	return wc & UNICODE_MASK;	2850	return wc & UNICODE_MASK;
2794	}	2851	}
2795		2852
2796	return NOCHAR;	2853	return NOCHAR;
		2854	}
		2855
		2856	// read the next octet
		2857	uint32_t
		2858	rxvt_term::next_octet ()
		2859	{
		2860	return cmdbuf_ptr < cmdbuf_endp
		2861	? (unsigned char)*cmdbuf_ptr++
		2862	: NOCHAR;
2797	}	2863	}
2798		2864
2799	/* rxvt_cmd_getc () - Return next input character */	2865	/* rxvt_cmd_getc () - Return next input character */
2800	/*	2866	/*
2801	* Return the next input character after first passing any keyboard input	2867	* Return the next input character after first passing any keyboard input
2802	* to the command.	2868	* to the command.
2803	*/	2869	*/
2804	unicode_t	2870	wchar_t
2805	rxvt_term::cmd_getc ()	2871	rxvt_term::cmd_getc ()
2806	{	2872	{
2807	unicode_t c = next_char ();	2873	wchar_t c = next_char ();
2808		2874
2809	if (c == NOCHAR)	2875	if (c == NOCHAR)
2810	throw out_of_input;	2876	throw out_of_input;
2811		2877
2812	return c;	2878	return c;
2813	}	2879	}
2814		2880
2815	unicode_t	2881	uint32_t
2816	rxvt_term::cmd_get8 ()	2882	rxvt_term::cmd_get8 ()
2817	{	2883	{
2818	unicode_t c = next_octet ();	2884	uint32_t c = next_octet ();
2819		2885
2820	if (c == NOCHAR)	2886	if (c == NOCHAR)
2821	throw out_of_input;	2887	throw out_of_input;
2822		2888
2823	return c;	2889	return c;
…		…
2923	case C0_ESC:	2989	case C0_ESC:
2924	process_escape_seq ();	2990	process_escape_seq ();
2925	break;	2991	break;
2926	case C0_ENQ: /* terminal Status */	2992	case C0_ENQ: /* terminal Status */
2927	if (rs[Rs_answerbackstring])	2993	if (rs[Rs_answerbackstring])
2928	tt_write ((const unsigned char *)rs[Rs_answerbackstring],	2994	tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2929	(unsigned int)strlen (rs[Rs_answerbackstring]));
2930	else	2995	else
2931	tt_write ((unsigned char *)VT100_ANS,	2996	tt_write (VT100_ANS, strlen (VT100_ANS));
2932	(unsigned int)strlen (VT100_ANS));
2933	break;	2997	break;
2934	case C0_BEL: /* bell */	2998	case C0_BEL: /* bell */
2935	scr_bell ();	2999	scr_bell ();
2936	break;	3000	break;
2937	case C0_BS: /* backspace */	3001	case C0_BS: /* backspace */
…		…
3092	break;	3156	break;
3093		3157
3094	/* 8.3.87: NEXT LINE */	3158	/* 8.3.87: NEXT LINE */
3095	case C1_NEL: /* ESC E */	3159	case C1_NEL: /* ESC E */
3096	{	3160	{
3097	unicode_t nlcr[] = { C0_LF, C0_CR };	3161	wchar_t nlcr[] = { C0_LF, C0_CR };
3098	scr_add_lines (nlcr, 1, 2);	3162	scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3099	}	3163	}
3100	break;	3164	break;
3101		3165
3102	/* kidnapped escape sequence: Should be 8.3.48 */	3166	/* kidnapped escape sequence: Should be 8.3.48 */
3103	case C1_ESA: /* ESC G */	3167	case C1_ESA: /* ESC G */
…		…
3125	process_dcs_seq ();	3189	process_dcs_seq ();
3126	break;	3190	break;
3127		3191
3128	/* 8.3.110: SINGLE CHARACTER INTRODUCER */	3192	/* 8.3.110: SINGLE CHARACTER INTRODUCER */
3129	case C1_SCI: /* ESC Z */	3193	case C1_SCI: /* ESC Z */
3130	tt_write ((const unsigned char *)ESCZ_ANSWER,	3194	tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3131	(unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3132	break; /* steal obsolete ESC [ c */	3195	break; /* steal obsolete ESC [ c */
3133		3196
3134	/* 8.3.16: CONTROL SEQUENCE INTRODUCER */	3197	/* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3135	case C1_CSI: /* ESC [ */	3198	case C1_CSI: /* ESC [ */
3136	process_csi_seq ();	3199	process_csi_seq ();
…		…
3380	case CSI_SU: /* 8.3.148: (1) SCROLL UP */	3443	case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3381	scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);	3444	scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3382	break;	3445	break;
3383		3446
3384	case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */	3447	case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3385	tt_write ((const unsigned char *)VT100_ANS,	3448	tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3386	(unsigned int) (sizeof (VT100_ANS) - 1));
3387	break;	3449	break;
3388		3450
3389	case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */	3451	case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3390	process_sgr_mode (nargs, arg);	3452	process_sgr_mode (nargs, arg);
3391	break;	3453	break;
…		…
3593	/----------------------------------------------------------------------/	3655	/----------------------------------------------------------------------/
3594	/*	3656	/*
3595	* get input up until STRING TERMINATOR (or BEL)	3657	* get input up until STRING TERMINATOR (or BEL)
3596	* ends_how is terminator used. returned input must be free()'d	3658	* ends_how is terminator used. returned input must be free()'d
3597	*/	3659	*/
3598	unsigned char *	3660	char *
3599	rxvt_term::get_to_st (unicode_t &ends_how)	3661	rxvt_term::get_to_st (unicode_t &ends_how)
3600	{	3662	{
3601	unicode_t ch;	3663	unicode_t ch;
3602	bool seen_esc = false;	3664	bool seen_esc = false;
3603	unsigned int n = 0;	3665	unsigned int n = 0;
…		…
3636		3698
3637	string[n++] = '\0';	3699	string[n++] = '\0';
3638		3700
3639	ends_how = (ch == 0x5c ? C0_ESC : ch);	3701	ends_how = (ch == 0x5c ? C0_ESC : ch);
3640		3702
3641	return (unsigned char *)rxvt_wcstombs (string);	3703	return rxvt_wcstombs (string);
3642	}	3704	}
3643		3705
3644	/----------------------------------------------------------------------/	3706	/----------------------------------------------------------------------/
3645	/*	3707	/*
3646	* process DEVICE CONTROL STRING `ESC P ... (ST\|BEL)' or `0x90 ... (ST\|BEL)'	3708	* process DEVICE CONTROL STRING `ESC P ... (ST\|BEL)' or `0x90 ... (ST\|BEL)'
3647	*/	3709	*/
3648	void	3710	void
3649	rxvt_term::process_dcs_seq ()	3711	rxvt_term::process_dcs_seq ()
3650	{	3712	{
3651	unsigned char *s;	3713	char *s;
3652	unicode_t eh;	3714	unicode_t eh;
3653		3715
3654	/*	3716	/*
3655	* Not handled yet	3717	* Not handled yet
3656	*/	3718	*/
…		…
3675	for (arg = 0; isdigit (ch); ch = cmd_getc ())	3737	for (arg = 0; isdigit (ch); ch = cmd_getc ())
3676	arg = arg * 10 + (ch - '0');	3738	arg = arg * 10 + (ch - '0');
3677		3739
3678	if (ch == ';')	3740	if (ch == ';')
3679	{	3741	{
3680	unsigned char *s = get_to_st (eh);	3742	char *s = get_to_st (eh);
3681		3743
3682	if (s)	3744	if (s)
3683	{	3745	{
3684	process_xterm_seq (arg, (char *)s, eh);	3746	process_xterm_seq (arg, s, eh);
3685	free (s);	3747	free (s);
3686	}	3748	}
3687	}	3749	}
3688	}	3750	}
3689		3751
3690	void	3752	void
3691	rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)	3753	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3692	{	3754	{
3693	if (str[0] == '?' && !str[1])	3755	if (str[0] == '?' && !str[1])
3694	{	3756	{
3695	unsigned short r, g, b;	3757	unsigned short r, g, b;
3696	pix_colors_focused[color].get (display, r, g, b);	3758	pix_colors_focused[color].get (display, r, g, b);
…		…
3702		3764
3703	/*	3765	/*
3704	* XTerm escape sequences: ESC ] Ps;Pt (ST\|BEL)	3766	* XTerm escape sequences: ESC ] Ps;Pt (ST\|BEL)
3705	*/	3767	*/
3706	void	3768	void
3707	rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)	3769	rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3708	{	3770	{
3709	int changed = 0;
3710	int color;	3771	int color;
3711	char buf, name;	3772	char buf, name;
3712	bool query = str[0] == '?' && !str[1];	3773	bool query = str[0] == '?' && !str[1];
3713	int saveop = op;	3774	int saveop = op;
3714	dDisp;	3775	dDisp;
…		…
3769	{	3830	{
3770	if ((name = strchr (buf, ';')) == NULL)	3831	if ((name = strchr (buf, ';')) == NULL)
3771	break;	3832	break;
3772		3833
3773	*name++ = '\0';	3834	*name++ = '\0';
3774	color = atoi (buf);	3835	color = atoi (buf) + minCOLOR;
3775		3836
3776	if (color < 0 \|\| color >= TOTAL_COLORS)	3837	if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3777	break;	3838	break;
3778		3839
3779	if ((buf = strchr (name, ';')) != NULL)	3840	if ((buf = strchr (name, ';')) != NULL)
3780	*buf++ = '\0';	3841	*buf++ = '\0';
3781		3842
3782	if (name[0] == '?' && !name[1])	3843	if (name[0] == '?' && !name[1])
3783	{	3844	{
3784	unsigned short r, g, b;	3845	unsigned short r, g, b;
3785	pix_colors_focused[color + minCOLOR].get (display, r, g, b);	3846	pix_colors_focused[color].get (display, r, g, b);
3786	tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);	3847	tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3787	}	3848	}
3788	else	3849	else
3789	set_window_color (color + minCOLOR, name);	3850	set_window_color (color, name);
3790	}	3851	}
3791	break;	3852	break;
3792	case XTerm_Color00:	3853	case XTerm_Color00:
3793	process_color_seq (XTerm_Color00, Color_fg, str, resp);	3854	process_color_seq (XTerm_Color00, Color_fg, str, resp);
3794	break;	3855	break;
3795	case XTerm_Color01:	3856	case XTerm_Color01:
3796	process_color_seq (XTerm_Color00, Color_bg, str, resp);	3857	process_color_seq (XTerm_Color01, Color_bg, str, resp);
3797	break;	3858	break;
3798	#ifndef NO_CURSORCOLOR	3859	#ifndef NO_CURSORCOLOR
3799	case XTerm_Color_cursor:	3860	case XTerm_Color_cursor:
3800	process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);	3861	process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3801	break;	3862	break;
…		…
3805	break;	3866	break;
3806	case XTerm_Color_pointer_bg:	3867	case XTerm_Color_pointer_bg:
3807	process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);	3868	process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3808	break;	3869	break;
3809	#ifndef NO_BOLD_UNDERLINE_REVERSE	3870	#ifndef NO_BOLD_UNDERLINE_REVERSE
3810	case XTerm_Color_BD:
3811	process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3812	break;
3813	case XTerm_Color_UL:
3814	process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3815	break;
3816	case XTerm_Color_RV:	3871	case XTerm_Color_RV:
3817	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3872	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
		3873	break;
		3874	case Rxvt_Color_BD:
		3875	case URxvt_Color_BD:
		3876	process_color_seq (op, Color_BD, str, resp);
		3877	break;
		3878	case Rxvt_Color_UL:
		3879	case URxvt_Color_UL:
		3880	process_color_seq (op, Color_UL, str, resp);
3818	break;	3881	break;
3819	case URxvt_Color_IT:	3882	case URxvt_Color_IT:
3820	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);	3883	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3821	break;	3884	break;
3822	#endif	3885	#endif
…		…
3827	if (am_transparent)	3890	if (am_transparent)
3828	want_full_refresh = want_refresh = 1;	3891	want_full_refresh = want_refresh = 1;
3829	break;	3892	break;
3830	#endif	3893	#endif
3831		3894
3832	case XTerm_Pixmap:	3895	case Rxvt_Pixmap:
		3896	{
3833	if (*str != ';')	3897	if (*str != ';')
3834	{	3898	{
3835	#if XPM_BACKGROUND	3899	#if XPM_BACKGROUND
3836	scale_pixmap (""); /* reset to default scaling */	3900	scale_pixmap (""); /* reset to default scaling */
3837	set_bgPixmap (str); /* change pixmap */	3901	set_bgPixmap (str); /* change pixmap */
3838	#endif
3839	scr_touch (true);	3902	scr_touch (true);
		3903	#endif
3840	}	3904	}
		3905
		3906	int changed = 0;
		3907
3841	while ((str = strchr (str, ';')) != NULL)	3908	while ((str = strchr (str, ';')) != NULL)
3842	{	3909	{
3843	str++;	3910	str++;
3844	#if XPM_BACKGROUND	3911	#if XPM_BACKGROUND
3845	changed += scale_pixmap (str);	3912	changed += scale_pixmap (str);
3846	#endif	3913	#endif
3847	}	3914	}
3848		3915
3849	if (changed)	3916	if (changed)
3850	{	3917	{
3851	#ifdef XPM_BACKGROUND	3918	#ifdef XPM_BACKGROUND
3852	resize_pixmap ();	3919	resize_pixmap ();
3853	#endif
3854	scr_touch (true);	3920	scr_touch (true);
		3921	#endif
3855	}	3922	}
		3923	}
3856	break;	3924	break;
3857		3925
3858	case XTerm_restoreFG:	3926	case Rxvt_restoreFG:
3859	set_window_color (Color_fg, str);	3927	set_window_color (Color_fg, str);
3860	break;	3928	break;
3861	case XTerm_restoreBG:	3929	case Rxvt_restoreBG:
3862	set_window_color (Color_bg, str);	3930	set_window_color (Color_bg, str);
3863	break;	3931	break;
3864		3932
3865	case XTerm_logfile:	3933	case XTerm_logfile:
3866	// TODO, when secure mode?	3934	// TODO, when secure mode?
3867	break;	3935	break;
3868		3936
3869	#ifdef MENUBAR
3870	case URxvt_Menu:
3871	if (OPTION (Opt_insecure))
3872	menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3873	break;
3874	#endif
3875	#if 0	3937	#if 0
3876	case XTerm_dumpscreen: /* no error notices */	3938	case Rxvt_dumpscreen: /* no error notices */
3877	{	3939	{
3878	int fd;	3940	int fd;
3879	if ((fd = open (str, O_RDWR \| O_CREAT \| O_EXCL, 0600)) >= 0)	3941	if ((fd = open (str, O_RDWR \| O_CREAT \| O_EXCL, 0600)) >= 0)
3880	{	3942	{
3881	scr_dump (fd);	3943	scr_dump (fd);
…		…
3912	if (query)	3974	if (query)
3913	tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);	3975	tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3914	else	3976	else
3915	{	3977	{
3916	set_locale (str);	3978	set_locale (str);
3917	pty.set_utf8_mode (enc_utf8);	3979	pty->set_utf8_mode (enc_utf8);
3918	init_xlocale ();	3980	init_xlocale ();
3919	}	3981	}
3920	break;	3982	break;
3921		3983
3922	case URxvt_view_up:	3984	case URxvt_view_up:
3923	case URxvt_view_down:	3985	case URxvt_view_down:
		3986	{
3924	int lines = atoi (str);	3987	int lines = atoi (str);
3925		3988
3926	if (lines)	3989	if (lines)
3927	scr_page (op == URxvt_view_up ? UP : DN, lines);	3990	scr_page (op == URxvt_view_up ? UP : DN, lines);
3928	else	3991	else
3929	{
3930	scr_erase_savelines ();	3992	scr_erase_savelines ();
3931	}	3993	}
3932		3994
		3995	break;
		3996	#endif
		3997
		3998	#if ENABLE_PERL
		3999	case URxvt_perl:
		4000	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
		4001	; // no responses yet
3933	break;	4002	break;
3934	#endif	4003	#endif
3935	}	4004	}
3936	}	4005	}
3937	/----------------------------------------------------------------------/	4006	/----------------------------------------------------------------------/
…		…
3989	{ 5, PrivMode_rVideo },	4058	{ 5, PrivMode_rVideo },
3990	{ 6, PrivMode_relOrigin },	4059	{ 6, PrivMode_relOrigin },
3991	{ 7, PrivMode_Autowrap },	4060	{ 7, PrivMode_Autowrap },
3992	// 8, bi-directional support mode	4061	// 8, bi-directional support mode
3993	{ 9, PrivMode_MouseX10 },	4062	{ 9, PrivMode_MouseX10 },
3994	#ifdef menuBar_esc
3995	{ menuBar_esc, PrivMode_menuBar },
3996	#endif
3997	// 18, 19 printing-related	4063	// 18, 19 printing-related
3998	{ 25, PrivMode_VisibleCursor },	4064	{ 25, PrivMode_VisibleCursor },
3999	#ifdef scrollBar_esc	4065	#ifdef scrollBar_esc
4000	{ scrollBar_esc, PrivMode_scrollBar },	4066	{ scrollBar_esc, PrivMode_scrollBar },
4001	#endif	4067	#endif
…		…
4048	/* extra handling for values with state unkept */	4114	/* extra handling for values with state unkept */
4049	switch (arg[i])	4115	switch (arg[i])
4050	{	4116	{
4051	#if ENABLE_STYLES	4117	#if ENABLE_STYLES
4052	case 1021:	4118	case 1021:
4053	if (mode)	4119	set_option (Opt_intensityStyles, mode);
4054	SET_OPTION (Opt_intensityStyles);	4120
		4121	scr_touch (true);
4055	else	4122	break;
4056	CLR_OPTION (Opt_intensityStyles);
4057	#endif	4123	#endif
4058	case 1048: /* alternative cursor save */	4124	case 1048: /* alternative cursor save */
4059	case 1049:	4125	case 1049:
4060	if (OPTION (Opt_secondaryScreen))	4126	if (OPTION (Opt_secondaryScreen))
4061	if (mode == 0)	4127	if (mode == 0)
…		…
4080	case 3: /* 80/132 */	4146	case 3: /* 80/132 */
4081	if (priv_modes & PrivMode_132OK)	4147	if (priv_modes & PrivMode_132OK)
4082	set_widthheight (((state ? 132 : 80) * fwidth), height);	4148	set_widthheight (((state ? 132 : 80) * fwidth), height);
4083	break;	4149	break;
4084	case 4: /* smooth scrolling */	4150	case 4: /* smooth scrolling */
4085	if (!state)	4151	set_option (Opt_jumpScroll, !state);
4086	SET_OPTION (Opt_jumpScroll);
4087	else
4088	CLR_OPTION (Opt_jumpScroll);
4089	break;	4152	break;
4090	case 5: /* reverse video */	4153	case 5: /* reverse video */
4091	scr_rvideo_mode (state);	4154	scr_rvideo_mode (state);
4092	break;	4155	break;
4093	case 6: /* relative/absolute origins */	4156	case 6: /* relative/absolute origins */
…		…
4099	/* case 8: - auto repeat, can't do on a per window basis */	4162	/* case 8: - auto repeat, can't do on a per window basis */
4100	case 9: /* X10 mouse reporting */	4163	case 9: /* X10 mouse reporting */
4101	if (state) /* orthogonal */	4164	if (state) /* orthogonal */
4102	priv_modes &= ~PrivMode_MouseX11;	4165	priv_modes &= ~PrivMode_MouseX11;
4103	break;	4166	break;
4104	#ifdef menuBar_esc
4105	case menuBar_esc:
4106	#ifdef MENUBAR
4107	map_menuBar (state);
4108	#endif
4109	break;
4110	#endif
4111	#ifdef scrollBar_esc	4167	#ifdef scrollBar_esc
4112	case scrollBar_esc:	4168	case scrollBar_esc:
4113	if (scrollbar_mapping (state))	4169	if (scrollbar_mapping (state))
4114	{	4170	{
4115	resize_all_windows (0, 0, 0);	4171	resize_all_windows (0, 0, 0);
…		…
4134	#if 0	4190	#if 0
4135	case 1001:	4191	case 1001:
4136	break; /* X11 mouse highlighting */	4192	break; /* X11 mouse highlighting */
4137	#endif	4193	#endif
4138	case 1010: /* scroll to bottom on TTY output inhibit */	4194	case 1010: /* scroll to bottom on TTY output inhibit */
4139	if (!state)	4195	set_option (Opt_scrollTtyOutput, !state);
4140	SET_OPTION (Opt_scrollTtyOutput);
4141	else
4142	CLR_OPTION (Opt_scrollTtyOutput);
4143	break;	4196	break;
4144	case 1011: /* scroll to bottom on key press */	4197	case 1011: /* scroll to bottom on key press */
4145	if (state)	4198	set_option (Opt_scrollTtyKeypress, state);
4146	SET_OPTION (Opt_scrollTtyKeypress);
4147	else
4148	CLR_OPTION (Opt_scrollTtyKeypress);
4149	break;	4199	break;
4150	case 1047: /* secondary screen w/ clearing last */	4200	case 1047: /* secondary screen w/ clearing last */
4151	if (OPTION (Opt_secondaryScreen))	4201	if (OPTION (Opt_secondaryScreen))
4152	if (current_screen != PRIMARY)	4202	if (current_screen != PRIMARY)
4153	scr_erase_screen (2);	4203	scr_erase_screen (2);
…		…
4291	scr_color (Color_bg, Color_bg);	4341	scr_color (Color_bg, Color_bg);
4292	break;	4342	break;
4293		4343
4294	//case 50: // not variable spacing	4344	//case 50: // not variable spacing
4295		4345
4296	#ifndef NO_BRIGHTCOLOR	4346	#if ENABLE_FRILLS
4297	case 90:	4347	case 90:
4298	case 91: /* set bright fg color */	4348	case 91: /* set bright fg color */
4299	case 92:	4349	case 92:
4300	case 93:	4350	case 93:
4301	case 94:	4351	case 94:
…		…
4313	case 106:	4363	case 106:
4314	case 107:	4364	case 107:
4315	scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);	4365	scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4316	break;	4366	break;
4317	#endif	4367	#endif
4318
4319	}	4368	}
4320	}	4369	}
4321	}	4370	}
4322	/}}} /	4371	/}}} /
4323		4372
…		…
4347	*/	4396	*/
4348	void	4397	void
4349	rxvt_term::tt_printf (const char *fmt,...)	4398	rxvt_term::tt_printf (const char *fmt,...)
4350	{	4399	{
4351	va_list arg_ptr;	4400	va_list arg_ptr;
4352	unsigned char buf[256];	4401	char buf[256];
4353		4402
4354	va_start (arg_ptr, fmt);	4403	va_start (arg_ptr, fmt);
4355	vsnprintf ((char *)buf, 256, fmt, arg_ptr);	4404	vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4356	va_end (arg_ptr);	4405	va_end (arg_ptr);
4357	tt_write (buf, strlen (buf));	4406	tt_write (buf, strlen (buf));
…		…
4362	* or generated by us in response to a query ESC sequence.	4411	* or generated by us in response to a query ESC sequence.
4363	*/	4412	*/
4364	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT	4413	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4365		4414
4366	void	4415	void
4367	rxvt_term::tt_write (const unsigned char *data, unsigned int len)	4416	rxvt_term::tt_write (const char *data, unsigned int len)
4368	{	4417	{
		4418	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
		4419	return;
		4420
		4421	if (pty->pty < 0)
		4422	return;
		4423
4369	if (v_buflen == 0)	4424	if (v_buflen == 0)
4370	{	4425	{
4371	ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));	4426	ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4372		4427
4373	if ((unsigned int)written == len)	4428	if ((unsigned int)written == len)
4374	return;	4429	return;
4375		4430
4376	data += written;	4431	data += written;
4377	len -= written;	4432	len -= written;
4378	}	4433	}
4379		4434
4380	v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);	4435	v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4381		4436
4382	memcpy (v_buffer + v_buflen, data, len);	4437	memcpy (v_buffer + v_buflen, data, len);
4383	v_buflen += len;	4438	v_buflen += len;
4384		4439
4385	pty_ev.set (EVENT_READ \| EVENT_WRITE);	4440	pty_ev.set (EVENT_READ \| EVENT_WRITE);
4386	}	4441	}
4387		4442
4388	void rxvt_term::pty_write ()	4443	void rxvt_term::pty_write ()
4389	{	4444	{
4390	int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));	4445	int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4391		4446
4392	if (written > 0)	4447	if (written > 0)
4393	{	4448	{
4394	v_buflen -= written;	4449	v_buflen -= written;
4395		4450

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.220 by root, Sat Dec 31 18:19:06 2005 UTC vs. Revision 1.271 by root, Wed Jan 18 17:49:46 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.220 by root, Sat Dec 31 18:19:06 2005 UTC vs.
Revision 1.271 by root, Wed Jan 18 17:49:46 2006 UTC