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

Diff Legend

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