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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.221 by root, Sat Dec 31 18:27:57 2005 UTC vs.
Revision 1.264 by root, Mon Jan 16 06:37:51 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 */
…		…
914		923
915	#if MENUBAR_MAX \|\| defined (KEYSYM_RESOURCE)	924	#if MENUBAR_MAX \|\| defined (KEYSYM_RESOURCE)
916	/{{{ rxvt_cmd_write (), rxvt_cmd_getc () /	925	/{{{ rxvt_cmd_write (), rxvt_cmd_getc () /
917	/* attempt to `write' count to the input buffer */	926	/* attempt to `write' count to the input buffer */
918	unsigned int	927	unsigned int
919	rxvt_term::cmd_write (const unsigned char *str, unsigned int count)	928	rxvt_term::cmd_write (const char *str, unsigned int count)
920	{	929	{
921	unsigned int n, s;	930	unsigned int n, s;
922		931
923	n = cmdbuf_ptr - cmdbuf_base;	932	n = cmdbuf_ptr - cmdbuf_base;
924	s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;	933	s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
…		…
961	}	970	}
962	#endif	971	#endif
963		972
964	if (want_refresh)	973	if (want_refresh)
965	{	974	{
		975	if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
		976	{
		977	int row = view_start;
		978	int end_row = row + nrow;
		979
		980	while (row > top_row && ROW (row - 1).is_longer ())
		981	--row;
		982
		983	do
		984	{
		985	int start_row = row;
		986	line_t *l;
		987
		988	do
		989	{
		990	l = &ROW (row++);
		991
		992	if (!(l->f & LINE_FILTERED))
		993	{
		994	// line not filtered, mark it as filtered
		995	l->f \|= LINE_FILTERED;
		996	while (l->is_longer ())
		997	{
		998	l = &ROW (row++);
		999	l->f \|= LINE_FILTERED;
		1000	}
		1001
		1002	// and filter it
		1003	HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
		1004
		1005	break;
		1006	}
		1007	}
		1008	while (l->is_longer () && row < end_row);
		1009	}
		1010	while (row < end_row);
		1011	}
		1012
966	scr_refresh (refresh_type);	1013	scr_refresh (refresh_type);
967	scrollbar_show (1);	1014	scrollbar_show (1);
968	#ifdef USE_XIM	1015	#ifdef USE_XIM
969	IMSendSpot ();	1016	IMSendSpot ();
970	#endif	1017	#endif
…		…
974	}	1021	}
975		1022
976	void	1023	void
977	rxvt_term::check_cb (check_watcher &w)	1024	rxvt_term::check_cb (check_watcher &w)
978	{	1025	{
979	SET_R (this);	1026	make_current ();
980	SET_LOCALE (locale);
981		1027
982	display->flush ();	1028	display->flush ();
983		1029
984	if (want_refresh && !flush_ev.active)	1030	if (want_refresh && !flush_ev.active)
985	flush_ev.start (NOW + 0.01);	1031	flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
986	}	1032	}
987		1033
988	void	1034	void
989	rxvt_term::flush_cb (time_watcher &w)	1035	rxvt_term::flush_cb (time_watcher &w)
990	{	1036	{
991	SET_R (this);	1037	make_current ();
992	SET_LOCALE (locale);
993		1038
994	refresh_limit = 1;	1039	refresh_limit = 1;
995	refresh_count = 0;	1040	refresh_count = 0;
996	flush ();	1041	flush ();
997	}	1042	}
…		…
1054	{	1099	{
1055	if (mouse_slip_wheel_speed == 0	1100	if (mouse_slip_wheel_speed == 0
1056	\|\| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)	1101	\|\| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1057	: scr_page (UP, mouse_slip_wheel_speed))	1102	: scr_page (UP, mouse_slip_wheel_speed))
1058	{	1103	{
1059	if (view_start == nsaved \|\|	1104	if (view_start == top_row \|\| view_start == 0)
1060	view_start == 0)
1061	mouse_slip_wheel_speed = 0;	1105	mouse_slip_wheel_speed = 0;
1062		1106
1063	refresh_type \|= SMOOTH_REFRESH;	1107	refresh_type \|= SMOOTH_REFRESH;
1064	want_refresh = 1;	1108	want_refresh = 1;
1065	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1109	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1066	}	1110	}
1067	}	1111	}
1068	#endif	1112	#endif
1069		1113
		1114	#if HAVE_SCHED_YIELD
		1115	static struct event_handler
		1116	{
		1117	check_watcher cw_yield;
		1118
		1119	void yield (check_watcher &w)
		1120	{
		1121	sched_yield ();
		1122	w.stop ();
		1123	}
		1124
		1125	event_handler ()
		1126	: cw_yield (this, &event_handler::yield)
		1127	{
		1128	}
		1129	} event_handler;
		1130	#endif
		1131
1070	bool	1132	bool
1071	rxvt_term::pty_fill ()	1133	rxvt_term::pty_fill ()
1072	{	1134	{
1073	ssize_t n = cmdbuf_endp - cmdbuf_ptr;	1135	ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1074		1136
1075	if (CBUFSIZ == n)	1137	if (CBUFSIZ == n)
1076	{	1138	{
1077	rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n");	1139	rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1078	n = 0;	1140	n = 0;
1079	}	1141	}
1080		1142
1081	memmove (cmdbuf_base, cmdbuf_ptr, n);	1143	memmove (cmdbuf_base, cmdbuf_ptr, n);
1082	cmdbuf_ptr = cmdbuf_base;	1144	cmdbuf_ptr = cmdbuf_base;
1083	cmdbuf_endp = cmdbuf_ptr + n;	1145	cmdbuf_endp = cmdbuf_ptr + n;
1084		1146
1085	n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);	1147	ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
1086		1148
1087	if (n > 0)	1149	if (r > 0)
1088	{	1150	{
1089	cmdbuf_endp += n;	1151	cmdbuf_endp += r;
1090	return true;	1152	return true;
1091	}	1153	}
1092	else if ((n < 0 && errno != EAGAIN && errno != EINTR) \|\| n == 0)	1154	else if (r < 0 && (errno == EAGAIN \|\| errno == EINTR))
		1155	{
		1156	#if HAVE_SCHED_YIELD
		1157	if (display->is_local)
		1158	event_handler.cw_yield.start ();
		1159	#endif
		1160	}
		1161	else
1093	{	1162	{
1094	pty_ev.stop ();	1163	pty_ev.stop ();
1095		1164
1096	if (!OPTION (Opt_hold))	1165	if (!OPTION (Opt_hold))
1097	destroy ();	1166	destroy ();
…		…
1101	}	1170	}
1102		1171
1103	void	1172	void
1104	rxvt_term::pty_cb (io_watcher &w, short revents)	1173	rxvt_term::pty_cb (io_watcher &w, short revents)
1105	{	1174	{
1106	SET_R (this);	1175	make_current ();
1107	SET_LOCALE (locale);
1108		1176
1109	if (revents & EVENT_READ)	1177	if (revents & EVENT_READ)
1110	// loop, but don't allow a single term to monopolize us	1178	// loop, but don't allow a single term to monopolize us
1111	while (pty_fill ())	1179	while (pty_fill ())
1112	if (cmd_parse ())	1180	if (cmd_parse ())
…		…
1132		1200
1133	#ifdef POINTER_BLANK	1201	#ifdef POINTER_BLANK
1134	void	1202	void
1135	rxvt_term::pointer_blank ()	1203	rxvt_term::pointer_blank ()
1136	{	1204	{
1137	if (! OPTION (Opt_pointerBlank))	1205	if (!OPTION (Opt_pointerBlank))
1138	return;	1206	return;
1139		1207
1140	XDefineCursor (display->display, vt, display->blank_cursor);	1208	XDefineCursor (display->display, vt, display->blank_cursor);
1141	XFlush (display->display);	1209	XFlush (display->display);
1142		1210
…		…
1144	}	1212	}
1145		1213
1146	void	1214	void
1147	rxvt_term::pointer_cb (time_watcher &w)	1215	rxvt_term::pointer_cb (time_watcher &w)
1148	{	1216	{
1149	SET_R (this);	1217	make_current ();
1150	SET_LOCALE (locale);
1151		1218
1152	pointer_blank ();	1219	pointer_blank ();
1153	}	1220	}
1154	#endif	1221	#endif
1155		1222
…		…
1234		1301
1235	/{{{ process an X event /	1302	/{{{ process an X event /
1236	void	1303	void
1237	rxvt_term::x_cb (XEvent &ev)	1304	rxvt_term::x_cb (XEvent &ev)
1238	{	1305	{
		1306	make_current ();
		1307
1239	dDisp;	1308	dDisp;
1240		1309
1241	SET_R (this);	1310	if (ev.xany.window == vt
1242	SET_LOCALE (locale);	1311	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
		1312	return;
1243		1313
1244	#if defined(CURSOR_BLINK)	1314	// 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;	1315	Window unused_root, unused_child;
1272	int unused_root_x, unused_root_y;	1316	int unused_root_x, unused_root_y;
1273	unsigned int unused_mask;	1317	unsigned int unused_mask;
1274		1318
1275	switch (ev.type)	1319	switch (ev.type)
…		…
1282		1326
1283	break;	1327	break;
1284		1328
1285	case KeyRelease:	1329	case KeyRelease:
1286	{	1330	{
1287	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ISO_14755	1331	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ISO_14755 \|\| ENABLE_PERL
1288	KeySym ks;	1332	KeySym keysym;
1289		1333
1290	ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/	1334	keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1291	#endif	1335	#endif
1292		1336
1293	#if ENABLE_FRILLS \|\| ISO_14755	1337	#if ENABLE_FRILLS \|\| ISO_14755
1294	// ISO 14755 support	1338	// ISO 14755 support
1295	if (iso14755buf)	1339	if (iso14755buf)
…		…
1300	# endif	1344	# endif
1301	# if ISO_14755	1345	# if ISO_14755
1302	// iso14755 part 5.2 handling: release time	1346	// iso14755 part 5.2 handling: release time
1303	// first: controls	1347	// first: controls
1304	if ((ev.xkey.state & ControlMask)	1348	if ((ev.xkey.state & ControlMask)
1305	&& ((ks >= 0x40 && ks <= 0x5f)	1349	&& ((keysym >= 0x40 && keysym <= 0x5f)
1306	\|\| (ks >= 0x61 && ks <= 0x7f)))	1350	\|\| (keysym >= 0x61 && keysym <= 0x7f)))
1307	{	1351	{
1308	iso14755buf = ISO_14755_51 \| 0x2400 \| (ks & 0x1f);	1352	iso14755buf = ISO_14755_51 \| 0x2400 \| (keysym & 0x1f);
1309	commit_iso14755 ();	1353	commit_iso14755 ();
1310	return; // case-break;	1354	goto skip_switch;
1311	}	1355	}
1312		1356
1313	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)	1357	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1314	if (i[0] == ks)	1358	if (i[0] == keysym)
1315	{	1359	{
1316	iso14755buf = ISO_14755_51 \| i[1];	1360	iso14755buf = ISO_14755_51 \| i[1];
1317	commit_iso14755 ();	1361	commit_iso14755 ();
1318	return; // case-break;	1362	goto skip_switch;
1319	}	1363	}
1320		1364
1321	scr_bell ();	1365	scr_bell ();
1322	# endif	1366	# endif
1323	iso14755buf = 0;	1367	iso14755buf = 0;
…		…
1342	else	1386	else
1343	iso14755buf = 0;	1387	iso14755buf = 0;
1344	}	1388	}
1345	#endif	1389	#endif
1346		1390
		1391	if (ev.xany.window == vt
		1392	&& HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
		1393	break;
		1394
1347	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	1395	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1348	if (!(ev.xkey.state & ControlMask))	1396	if (!(ev.xkey.state & ControlMask))
1349	slip_wheel_ev.stop ();	1397	slip_wheel_ev.stop ();
1350	else if (ks == XK_Control_L \|\| ks == XK_Control_R)	1398	else if (keysym == XK_Control_L \|\| keysym == XK_Control_R)
1351	mouse_slip_wheel_speed = 0;	1399	mouse_slip_wheel_speed = 0;
1352	#endif	1400	#endif
1353	break;	1401	break;
1354	}	1402	}
1355		1403
…		…
1485		1533
1486	case SelectionRequest:	1534	case SelectionRequest:
1487	selection_send (ev.xselectionrequest);	1535	selection_send (ev.xselectionrequest);
1488	break;	1536	break;
1489		1537
		1538	case MapNotify:
		1539	mapped = 1;
		1540	#ifdef TEXT_BLINK
		1541	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
		1542	#endif
		1543	HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
		1544	break;
		1545
1490	case UnmapNotify:	1546	case UnmapNotify:
1491	mapped = 0;	1547	mapped = 0;
1492	#ifdef TEXT_BLINK	1548	#ifdef TEXT_BLINK
1493	text_blink_ev.stop ();	1549	text_blink_ev.stop ();
1494	#endif	1550	#endif
1495	break;	1551	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;	1552	break;
1503		1553
1504	#ifdef TRANSPARENT	1554	#ifdef TRANSPARENT
1505	case ReparentNotify:	1555	case ReparentNotify:
1506	rootwin_cb (ev);	1556	rootwin_cb (ev);
…		…
1520		1570
1521	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))	1571	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1522	scr_expose (ev.xexpose.x, ev.xexpose.y,	1572	scr_expose (ev.xexpose.x, ev.xexpose.y,
1523	ev.xexpose.width, ev.xexpose.height, False);	1573	ev.xexpose.width, ev.xexpose.height, False);
1524		1574
1525	scr_refresh (refresh_type);	1575	want_refresh = 1;
1526	}	1576	}
1527	else	1577	else
1528	{	1578	{
1529	XEvent unused_event;	1579	XEvent unused_event;
1530		1580
…		…
1565	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)	1615	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1566	break;	1616	break;
1567		1617
1568	if (ev.xany.window == vt)	1618	if (ev.xany.window == vt)
1569	{	1619	{
		1620	if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
		1621	; // nop
1570	if (ev.xbutton.state & (Button1Mask \| Button3Mask))	1622	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))
1571	{	1623	{
1572	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))	1624	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1573	;	1625	;
1574		1626
1575	XQueryPointer (disp, vt,	1627	XQueryPointer (disp, vt,
…		…
1655	&unused_root_x, &unused_root_y,	1707	&unused_root_x, &unused_root_y,
1656	&ev.xbutton.x, &ev.xbutton.y,	1708	&ev.xbutton.x, &ev.xbutton.y,
1657	&unused_mask);	1709	&unused_mask);
1658	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1710	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1659	scrollbar_size ());	1711	scrollbar_size ());
1660	scr_refresh (refresh_type);	1712	want_refresh = 1;
1661	refresh_limit = 0;	1713	refresh_limit = 0;
1662	scrollbar_show (1);	1714	scrollbar_show (1);
1663	}	1715	}
1664	break;	1716	break;
1665	}	1717	}
		1718
		1719	skip_switch: ;
		1720
		1721	#if defined(CURSOR_BLINK)
		1722	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
		1723	{
		1724	if (hidden_cursor)
		1725	{
		1726	hidden_cursor = 0;
		1727	want_refresh = 1;
		1728	}
		1729
		1730	cursor_blink_ev.start (NOW + BLINK_INTERVAL);
		1731	}
		1732	#endif
		1733
		1734	#if defined(POINTER_BLANK)
		1735	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
		1736	{
		1737	if (ev.type == MotionNotify
		1738	\|\| ev.type == ButtonPress
		1739	\|\| ev.type == ButtonRelease)
		1740	if (hidden_pointer)
		1741	pointer_unblank ();
		1742
		1743	if (ev.type == KeyPress && hidden_pointer == 0)
		1744	pointer_blank ();
		1745	}
		1746	#endif
1666	}	1747	}
1667		1748
1668	void	1749	void
1669	rxvt_term::focus_in ()	1750	rxvt_term::focus_in ()
1670	{	1751	{
1671	if (!focus)	1752	if (!focus)
1672	{	1753	{
1673	focus = 1;	1754	focus = 1;
1674	want_refresh = 1;	1755	want_refresh = 1;
		1756
		1757	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
		1758
1675	#if USE_XIM	1759	#if USE_XIM
1676	if (Input_Context != NULL)	1760	if (Input_Context != NULL)
1677	{	1761	{
1678	IMSetStatusPosition ();	1762	IMSetStatusPosition ();
1679	XSetICFocus (Input_Context);	1763	XSetICFocus (Input_Context);
…		…
1699	if (focus)	1783	if (focus)
1700	{	1784	{
1701	focus = 0;	1785	focus = 0;
1702	want_refresh = 1;	1786	want_refresh = 1;
1703		1787
		1788	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
		1789
1704	#if ENABLE_FRILLS \|\| ISO_14755	1790	#if ENABLE_FRILLS \|\| ISO_14755
		1791	if (iso14755buf)
		1792	{
1705	iso14755buf = 0;	1793	iso14755buf = 0;
1706	#endif
1707	#if ENABLE_OVERLAY	1794	# if ENABLE_OVERLAY
1708	scr_overlay_off ();	1795	scr_overlay_off ();
		1796	# endif
		1797	}
1709	#endif	1798	#endif
1710	#if USE_XIM	1799	#if USE_XIM
1711	if (Input_Context != NULL)	1800	if (Input_Context != NULL)
1712	XUnsetICFocus (Input_Context);	1801	XUnsetICFocus (Input_Context);
1713	#endif	1802	#endif
…		…
1728		1817
1729	#if TRANSPARENT	1818	#if TRANSPARENT
1730	void	1819	void
1731	rxvt_term::rootwin_cb (XEvent &ev)	1820	rxvt_term::rootwin_cb (XEvent &ev)
1732	{	1821	{
1733	SET_R (this);	1822	make_current ();
1734	SET_LOCALE (locale);
1735		1823
1736	switch (ev.type)	1824	switch (ev.type)
1737	{	1825	{
1738	case PropertyNotify:	1826	case PropertyNotify:
1739	/*	1827	/*
…		…
1757	rxvt_term::button_press (XButtonEvent &ev)	1845	rxvt_term::button_press (XButtonEvent &ev)
1758	{	1846	{
1759	int reportmode = 0, clickintime;	1847	int reportmode = 0, clickintime;
1760		1848
1761	bypass_keystate = ev.state & (ModMetaMask \| ShiftMask);	1849	bypass_keystate = ev.state & (ModMetaMask \| ShiftMask);
		1850
1762	if (!bypass_keystate)	1851	if (!bypass_keystate)
1763	reportmode = !! (priv_modes & PrivMode_mouse_report);	1852	reportmode = !! (priv_modes & PrivMode_mouse_report);
1764		1853
1765	/*	1854	/*
1766	* VT window processing of button press	1855	* VT window processing of button press
…		…
1786	#ifdef MOUSE_REPORT_DOUBLECLICK	1875	#ifdef MOUSE_REPORT_DOUBLECLICK
1787	if (ev.button == MEvent.button && clickintime)	1876	if (ev.button == MEvent.button && clickintime)
1788	{	1877	{
1789	/* same button, within alloted time */	1878	/* same button, within alloted time */
1790	MEvent.clicks++;	1879	MEvent.clicks++;
		1880
1791	if (MEvent.clicks > 1)	1881	if (MEvent.clicks > 1)
1792	{	1882	{
1793	/* only report double clicks */	1883	/* only report double clicks */
1794	MEvent.clicks = 2;	1884	MEvent.clicks = 2;
1795	mouse_report (ev);	1885	mouse_report (ev);
…		…
1815	else	1905	else
1816	{	1906	{
1817	if (ev.button != MEvent.button)	1907	if (ev.button != MEvent.button)
1818	MEvent.clicks = 0;	1908	MEvent.clicks = 0;
1819		1909
		1910	if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1820	switch (ev.button)	1911	switch (ev.button)
1821	{	1912	{
1822	case Button1:	1913	case Button1:
1823	/* allow meta + click to select rectangular areas */	1914	/* allow meta + click to select rectangular areas */
1824	/* should be done in screen.C */	1915	/* should be done in screen.C */
1825	#if ENABLE_FRILLS	1916	#if ENABLE_FRILLS
1826	selection.rect = !!(ev.state & ModMetaMask);	1917	selection.rect = !!(ev.state & ModMetaMask);
1827	#else	1918	#else
1828	selection.rect = false;	1919	selection.rect = false;
1829	#endif	1920	#endif
1830		1921
1831	/* allow shift+left click to extend selection */	1922	/* allow shift+left click to extend selection */
1832	if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))	1923	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1833	{	1924	{
1834	if (MEvent.button == Button1 && clickintime)	1925	if (MEvent.button == Button1 && clickintime)
1835	selection_rotate (ev.x, ev.y);	1926	selection_rotate (ev.x, ev.y);
1836	else	1927	else
1837	selection_extend (ev.x, ev.y, 1);	1928	selection_extend (ev.x, ev.y, 1);
1838	}	1929	}
1839	else	1930	else
1840	{	1931	{
1841	if (MEvent.button == Button1 && clickintime)	1932	if (MEvent.button == Button1 && clickintime)
1842	MEvent.clicks++;	1933	MEvent.clicks++;
1843	else	1934	else
1844	MEvent.clicks = 1;	1935	MEvent.clicks = 1;
1845		1936
1846	selection_click (MEvent.clicks, ev.x, ev.y);	1937	selection_click (MEvent.clicks, ev.x, ev.y);
1847	}	1938	}
1848		1939
1849	MEvent.button = Button1;	1940	MEvent.button = Button1;
1850	break;	1941	break;
1851		1942
1852	case Button3:	1943	case Button3:
1853	if (MEvent.button == Button3 && clickintime)	1944	if (MEvent.button == Button3 && clickintime)
1854	selection_rotate (ev.x, ev.y);	1945	selection_rotate (ev.x, ev.y);
1855	else	1946	else
1856	selection_extend (ev.x, ev.y, 1);	1947	selection_extend (ev.x, ev.y, 1);
1857		1948
1858	MEvent.button = Button3;	1949	MEvent.button = Button3;
1859	break;	1950	break;
1860	}	1951	}
1861	}	1952	}
1862		1953
1863	MEvent.time = ev.time;	1954	MEvent.time = ev.time;
1864	return;	1955	return;
1865	}	1956	}
1866		1957
…		…
2002	}	2093	}
2003		2094
2004	break;	2095	break;
2005	}	2096	}
2006	}	2097	}
		2098
2007	return;	2099	return;
2008	}	2100	}
		2101
2009	#if MENUBAR	2102	#if MENUBAR
2010	/*	2103	/*
2011	* Menubar window processing of button press	2104	* Menubar window processing of button press
2012	*/	2105	*/
2013	if (isMenuBarWindow (ev.window))	2106	if (isMenuBarWindow (ev.window))
…		…
2076	if (priv_modes & PrivMode_mouse_report	2169	if (priv_modes & PrivMode_mouse_report
2077	&& bypass_keystate	2170	&& bypass_keystate
2078	&& ev.button == Button1 && MEvent.clicks <= 1)	2171	&& ev.button == Button1 && MEvent.clicks <= 1)
2079	selection_extend (ev.x, ev.y, 0);	2172	selection_extend (ev.x, ev.y, 0);
2080		2173
		2174	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
		2175	return;
		2176
2081	switch (ev.button)	2177	switch (ev.button)
2082	{	2178	{
2083	case Button1:	2179	case Button1:
2084	case Button3:	2180	case Button3:
2085	selection_make (ev.time);	2181	selection_make (ev.time);
…		…
2116	slip_wheel_ev.start ();	2212	slip_wheel_ev.start ();
2117	}	2213	}
2118	else	2214	else
2119	{	2215	{
2120	# endif	2216	# endif
2121	# ifdef JUMP_MOUSE_WHEEL
2122	scr_page (v, i);	2217	scr_page (v, i);
2123	scr_refresh (SMOOTH_REFRESH);
2124	scrollbar_show (1);	2218	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	2219	# ifdef MOUSE_SLIP_WHEELING
2134	}	2220	}
2135	#endif	2221	# endif
2136	}	2222	}
2137	break;	2223	break;
2138	#endif	2224	#endif
2139	}	2225	}
2140	}	2226	}
…		…
2629		2715
2630	bool	2716	bool
2631	rxvt_term::cmd_parse ()	2717	rxvt_term::cmd_parse ()
2632	{	2718	{
2633	bool flag = false;	2719	bool flag = false;
2634	unicode_t ch = NOCHAR;	2720	wchar_t ch = NOCHAR;
2635	unsigned char *seq_begin; // remember start of esc-sequence here	2721	char *seq_begin; // remember start of esc-sequence here
2636		2722
2637	for (;;)	2723	for (;;)
2638	{	2724	{
2639	if (ch == NOCHAR)	2725	if (ch == NOCHAR)
2640	{	2726	{
2641	seq_begin = cmdbuf_ptr;	2727	seq_begin = cmdbuf_ptr;
2642	ch = next_char ();	2728	ch = next_char ();
2643	}
2644		2729
2645	if (ch == NOCHAR) // TODO: improve	2730	if (ch == NOCHAR)
2646	break;	2731	break;
		2732	}
2647		2733
2648	if (!IS_CONTROL (ch) \|\| ch == C0_LF \|\| ch == C0_CR \|\| ch == C0_HT)	2734	if (!IS_CONTROL (ch) \|\| ch == C0_LF \|\| ch == C0_CR \|\| ch == C0_HT)
2649	{	2735	{
2650	if (!seen_input)	2736	if (!seen_input)
2651	{	2737	{
…		…
2660	if (seen_resize && cmd_pid)	2746	if (seen_resize && cmd_pid)
2661	kill (-cmd_pid, SIGWINCH);	2747	kill (-cmd_pid, SIGWINCH);
2662	}	2748	}
2663		2749
2664	/* Read a text string from the input buffer */	2750	/* Read a text string from the input buffer */
2665	unicode_t buf[UBUFSIZ];	2751	wchar_t buf[UBUFSIZ];
2666	bool refreshnow = false;	2752	bool refreshnow = false;
2667	int nlines = 0;	2753	int nlines = 0;
2668	unicode_t *str = buf;	2754	wchar_t *str = buf;
2669	unicode_t *eol = str + min (ncol, UBUFSIZ);	2755	wchar_t *eol = str + min (ncol, UBUFSIZ);
2670		2756
2671	for (;;)	2757	for (;;)
2672	{	2758	{
2673	if (ch == NOCHAR \|\| (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))	2759	if (ch == NOCHAR \|\| (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2674	break;	2760	break;
…		…
2684		2770
2685	if (!OPTION (Opt_jumpScroll)	2771	if (!OPTION (Opt_jumpScroll)
2686	\|\| (refresh_count >= refresh_limit * (nrow - 1)))	2772	\|\| (refresh_count >= refresh_limit * (nrow - 1)))
2687	{	2773	{
2688	refreshnow = true;	2774	refreshnow = true;
		2775	refresh_count = 0;
2689	ch = NOCHAR;	2776	ch = NOCHAR;
2690	break;	2777	break;
2691	}	2778	}
2692		2779
2693	// scr_add_lines only works for nlines <= nrow - 1.	2780	// scr_add_lines only works for nlines <= nrow - 1.
2694	if (nlines >= nrow - 1)	2781	if (nlines >= nrow - 1)
2695	{	2782	{
		2783	if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2696	scr_add_lines (buf, nlines, str - buf);	2784	scr_add_lines (buf, str - buf, nlines);
		2785
2697	nlines = 0;	2786	nlines = 0;
2698	str = buf;	2787	str = buf;
2699	eol = str + min (ncol, UBUFSIZ);	2788	eol = str + min (ncol, UBUFSIZ);
2700	}	2789	}
2701		2790
…		…
2714		2803
2715	seq_begin = cmdbuf_ptr;	2804	seq_begin = cmdbuf_ptr;
2716	ch = next_char ();	2805	ch = next_char ();
2717	}	2806	}
2718		2807
		2808	if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2719	scr_add_lines (buf, nlines, str - buf);	2809	scr_add_lines (buf, str - buf, nlines);
2720		2810
2721	/*	2811	/*
2722	* If there have been a lot of new lines, then update the screen	2812	* 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.	2813	* 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	2814	* the number of pages between refreshes is refresh_limit, which
…		…
2730	refresh_limit++;	2820	refresh_limit++;
2731	else	2821	else
2732	{	2822	{
2733	flag = true;	2823	flag = true;
2734	scr_refresh (refresh_type);	2824	scr_refresh (refresh_type);
		2825	want_refresh = 1;
2735	}	2826	}
2736	}	2827	}
2737		2828
2738	}	2829	}
2739	else	2830	else
…		…
2754	}	2845	}
2755		2846
2756	return flag;	2847	return flag;
2757	}	2848	}
2758		2849
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	2850	// read the next character
2769	unicode_t	2851	wchar_t
2770	rxvt_term::next_char ()	2852	rxvt_term::next_char ()
2771	{	2853	{
2772	while (cmdbuf_ptr < cmdbuf_endp)	2854	while (cmdbuf_ptr < cmdbuf_endp)
2773	{	2855	{
2774	// assume 7-bit to be ascii ALWAYS	2856	// assume 7-bit to be ascii ALWAYS
2775	if (cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b)	2857	if ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b)
2776	return *cmdbuf_ptr++;	2858	return *cmdbuf_ptr++;
2777		2859
2778	wchar_t wc;	2860	wchar_t wc;
2779	size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);	2861	size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2780		2862
2781	if (len == (size_t)-2)	2863	if (len == (size_t)-2)
2782	{	2864	{
2783	// the mbstate stores incomplete sequences. didn't know this :/	2865	// the mbstate stores incomplete sequences. didn't know this :/
2784	cmdbuf_ptr = cmdbuf_endp;	2866	cmdbuf_ptr = cmdbuf_endp;
2785	break;	2867	break;
2786	}	2868	}
2787		2869
2788	if (len == (size_t)-1)	2870	if (len == (size_t)-1)
2789	return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through	2871	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2790		2872
2791	// assume wchar == unicode	2873	// assume wchar == unicode
2792	cmdbuf_ptr += len;	2874	cmdbuf_ptr += len;
2793	return wc & UNICODE_MASK;	2875	return wc & UNICODE_MASK;
2794	}	2876	}
2795		2877
2796	return NOCHAR;	2878	return NOCHAR;
		2879	}
		2880
		2881	// read the next octet
		2882	uint32_t
		2883	rxvt_term::next_octet ()
		2884	{
		2885	return cmdbuf_ptr < cmdbuf_endp
		2886	? (unsigned char)*cmdbuf_ptr++
		2887	: NOCHAR;
2797	}	2888	}
2798		2889
2799	/* rxvt_cmd_getc () - Return next input character */	2890	/* rxvt_cmd_getc () - Return next input character */
2800	/*	2891	/*
2801	* Return the next input character after first passing any keyboard input	2892	* Return the next input character after first passing any keyboard input
2802	* to the command.	2893	* to the command.
2803	*/	2894	*/
2804	unicode_t	2895	wchar_t
2805	rxvt_term::cmd_getc ()	2896	rxvt_term::cmd_getc ()
2806	{	2897	{
2807	unicode_t c = next_char ();	2898	wchar_t c = next_char ();
2808		2899
2809	if (c == NOCHAR)	2900	if (c == NOCHAR)
2810	throw out_of_input;	2901	throw out_of_input;
2811		2902
2812	return c;	2903	return c;
2813	}	2904	}
2814		2905
2815	unicode_t	2906	uint32_t
2816	rxvt_term::cmd_get8 ()	2907	rxvt_term::cmd_get8 ()
2817	{	2908	{
2818	unicode_t c = next_octet ();	2909	uint32_t c = next_octet ();
2819		2910
2820	if (c == NOCHAR)	2911	if (c == NOCHAR)
2821	throw out_of_input;	2912	throw out_of_input;
2822		2913
2823	return c;	2914	return c;
…		…
2923	case C0_ESC:	3014	case C0_ESC:
2924	process_escape_seq ();	3015	process_escape_seq ();
2925	break;	3016	break;
2926	case C0_ENQ: /* terminal Status */	3017	case C0_ENQ: /* terminal Status */
2927	if (rs[Rs_answerbackstring])	3018	if (rs[Rs_answerbackstring])
2928	tt_write ((const unsigned char *)rs[Rs_answerbackstring],	3019	tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2929	(unsigned int)strlen (rs[Rs_answerbackstring]));
2930	else	3020	else
2931	tt_write ((unsigned char *)VT100_ANS,	3021	tt_write (VT100_ANS, strlen (VT100_ANS));
2932	(unsigned int)strlen (VT100_ANS));
2933	break;	3022	break;
2934	case C0_BEL: /* bell */	3023	case C0_BEL: /* bell */
2935	scr_bell ();	3024	scr_bell ();
2936	break;	3025	break;
2937	case C0_BS: /* backspace */	3026	case C0_BS: /* backspace */
…		…
3092	break;	3181	break;
3093		3182
3094	/* 8.3.87: NEXT LINE */	3183	/* 8.3.87: NEXT LINE */
3095	case C1_NEL: /* ESC E */	3184	case C1_NEL: /* ESC E */
3096	{	3185	{
3097	unicode_t nlcr[] = { C0_LF, C0_CR };	3186	wchar_t nlcr[] = { C0_LF, C0_CR };
3098	scr_add_lines (nlcr, 1, 2);	3187	scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3099	}	3188	}
3100	break;	3189	break;
3101		3190
3102	/* kidnapped escape sequence: Should be 8.3.48 */	3191	/* kidnapped escape sequence: Should be 8.3.48 */
3103	case C1_ESA: /* ESC G */	3192	case C1_ESA: /* ESC G */
…		…
3125	process_dcs_seq ();	3214	process_dcs_seq ();
3126	break;	3215	break;
3127		3216
3128	/* 8.3.110: SINGLE CHARACTER INTRODUCER */	3217	/* 8.3.110: SINGLE CHARACTER INTRODUCER */
3129	case C1_SCI: /* ESC Z */	3218	case C1_SCI: /* ESC Z */
3130	tt_write ((const unsigned char *)ESCZ_ANSWER,	3219	tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3131	(unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3132	break; /* steal obsolete ESC [ c */	3220	break; /* steal obsolete ESC [ c */
3133		3221
3134	/* 8.3.16: CONTROL SEQUENCE INTRODUCER */	3222	/* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3135	case C1_CSI: /* ESC [ */	3223	case C1_CSI: /* ESC [ */
3136	process_csi_seq ();	3224	process_csi_seq ();
…		…
3380	case CSI_SU: /* 8.3.148: (1) SCROLL UP */	3468	case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3381	scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);	3469	scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3382	break;	3470	break;
3383		3471
3384	case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */	3472	case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3385	tt_write ((const unsigned char *)VT100_ANS,	3473	tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3386	(unsigned int) (sizeof (VT100_ANS) - 1));
3387	break;	3474	break;
3388		3475
3389	case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */	3476	case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3390	process_sgr_mode (nargs, arg);	3477	process_sgr_mode (nargs, arg);
3391	break;	3478	break;
…		…
3593	/----------------------------------------------------------------------/	3680	/----------------------------------------------------------------------/
3594	/*	3681	/*
3595	* get input up until STRING TERMINATOR (or BEL)	3682	* get input up until STRING TERMINATOR (or BEL)
3596	* ends_how is terminator used. returned input must be free()'d	3683	* ends_how is terminator used. returned input must be free()'d
3597	*/	3684	*/
3598	unsigned char *	3685	char *
3599	rxvt_term::get_to_st (unicode_t &ends_how)	3686	rxvt_term::get_to_st (unicode_t &ends_how)
3600	{	3687	{
3601	unicode_t ch;	3688	unicode_t ch;
3602	bool seen_esc = false;	3689	bool seen_esc = false;
3603	unsigned int n = 0;	3690	unsigned int n = 0;
…		…
3636		3723
3637	string[n++] = '\0';	3724	string[n++] = '\0';
3638		3725
3639	ends_how = (ch == 0x5c ? C0_ESC : ch);	3726	ends_how = (ch == 0x5c ? C0_ESC : ch);
3640		3727
3641	return (unsigned char *)rxvt_wcstombs (string);	3728	return rxvt_wcstombs (string);
3642	}	3729	}
3643		3730
3644	/----------------------------------------------------------------------/	3731	/----------------------------------------------------------------------/
3645	/*	3732	/*
3646	* process DEVICE CONTROL STRING `ESC P ... (ST\|BEL)' or `0x90 ... (ST\|BEL)'	3733	* process DEVICE CONTROL STRING `ESC P ... (ST\|BEL)' or `0x90 ... (ST\|BEL)'
3647	*/	3734	*/
3648	void	3735	void
3649	rxvt_term::process_dcs_seq ()	3736	rxvt_term::process_dcs_seq ()
3650	{	3737	{
3651	unsigned char *s;	3738	char *s;
3652	unicode_t eh;	3739	unicode_t eh;
3653		3740
3654	/*	3741	/*
3655	* Not handled yet	3742	* Not handled yet
3656	*/	3743	*/
…		…
3675	for (arg = 0; isdigit (ch); ch = cmd_getc ())	3762	for (arg = 0; isdigit (ch); ch = cmd_getc ())
3676	arg = arg * 10 + (ch - '0');	3763	arg = arg * 10 + (ch - '0');
3677		3764
3678	if (ch == ';')	3765	if (ch == ';')
3679	{	3766	{
3680	unsigned char *s = get_to_st (eh);	3767	char *s = get_to_st (eh);
3681		3768
3682	if (s)	3769	if (s)
3683	{	3770	{
3684	process_xterm_seq (arg, (char *)s, eh);	3771	process_xterm_seq (arg, s, eh);
3685	free (s);	3772	free (s);
3686	}	3773	}
3687	}	3774	}
3688	}	3775	}
3689		3776
3690	void	3777	void
3691	rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)	3778	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3692	{	3779	{
3693	if (str[0] == '?' && !str[1])	3780	if (str[0] == '?' && !str[1])
3694	{	3781	{
3695	unsigned short r, g, b;	3782	unsigned short r, g, b;
3696	pix_colors_focused[color].get (display, r, g, b);	3783	pix_colors_focused[color].get (display, r, g, b);
…		…
3702		3789
3703	/*	3790	/*
3704	* XTerm escape sequences: ESC ] Ps;Pt (ST\|BEL)	3791	* XTerm escape sequences: ESC ] Ps;Pt (ST\|BEL)
3705	*/	3792	*/
3706	void	3793	void
3707	rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)	3794	rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3708	{	3795	{
3709	int changed = 0;	3796	int changed = 0;
3710	int color;	3797	int color;
3711	char buf, name;	3798	char buf, name;
3712	bool query = str[0] == '?' && !str[1];	3799	bool query = str[0] == '?' && !str[1];
…		…
3769	{	3856	{
3770	if ((name = strchr (buf, ';')) == NULL)	3857	if ((name = strchr (buf, ';')) == NULL)
3771	break;	3858	break;
3772		3859
3773	*name++ = '\0';	3860	*name++ = '\0';
3774	color = atoi (buf);	3861	color = atoi (buf) + minCOLOR;
3775		3862
3776	if (color < 0 \|\| color >= TOTAL_COLORS)	3863	if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3777	break;	3864	break;
3778		3865
3779	if ((buf = strchr (name, ';')) != NULL)	3866	if ((buf = strchr (name, ';')) != NULL)
3780	*buf++ = '\0';	3867	*buf++ = '\0';
3781		3868
3782	if (name[0] == '?' && !name[1])	3869	if (name[0] == '?' && !name[1])
3783	{	3870	{
3784	unsigned short r, g, b;	3871	unsigned short r, g, b;
3785	pix_colors_focused[color + minCOLOR].get (display, r, g, b);	3872	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);	3873	tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3787	}	3874	}
3788	else	3875	else
3789	set_window_color (color + minCOLOR, name);	3876	set_window_color (color, name);
3790	}	3877	}
3791	break;	3878	break;
3792	case XTerm_Color00:	3879	case XTerm_Color00:
3793	process_color_seq (XTerm_Color00, Color_fg, str, resp);	3880	process_color_seq (XTerm_Color00, Color_fg, str, resp);
3794	break;	3881	break;
3795	case XTerm_Color01:	3882	case XTerm_Color01:
3796	process_color_seq (XTerm_Color00, Color_bg, str, resp);	3883	process_color_seq (XTerm_Color01, Color_bg, str, resp);
3797	break;	3884	break;
3798	#ifndef NO_CURSORCOLOR	3885	#ifndef NO_CURSORCOLOR
3799	case XTerm_Color_cursor:	3886	case XTerm_Color_cursor:
3800	process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);	3887	process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3801	break;	3888	break;
…		…
3805	break;	3892	break;
3806	case XTerm_Color_pointer_bg:	3893	case XTerm_Color_pointer_bg:
3807	process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);	3894	process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3808	break;	3895	break;
3809	#ifndef NO_BOLD_UNDERLINE_REVERSE	3896	#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:	3897	case XTerm_Color_RV:
3817	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3898	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
		3899	break;
		3900	case Rxvt_Color_BD:
		3901	case URxvt_Color_BD:
		3902	process_color_seq (op, Color_BD, str, resp);
		3903	break;
		3904	case Rxvt_Color_UL:
		3905	case URxvt_Color_UL:
		3906	process_color_seq (op, Color_UL, str, resp);
3818	break;	3907	break;
3819	case URxvt_Color_IT:	3908	case URxvt_Color_IT:
3820	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);	3909	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3821	break;	3910	break;
3822	#endif	3911	#endif
…		…
3827	if (am_transparent)	3916	if (am_transparent)
3828	want_full_refresh = want_refresh = 1;	3917	want_full_refresh = want_refresh = 1;
3829	break;	3918	break;
3830	#endif	3919	#endif
3831		3920
3832	case XTerm_Pixmap:	3921	case Rxvt_Pixmap:
3833	if (*str != ';')	3922	if (*str != ';')
3834	{	3923	{
3835	#if XPM_BACKGROUND	3924	#if XPM_BACKGROUND
3836	scale_pixmap (""); /* reset to default scaling */	3925	scale_pixmap (""); /* reset to default scaling */
3837	set_bgPixmap (str); /* change pixmap */	3926	set_bgPixmap (str); /* change pixmap */
3838	#endif
3839	scr_touch (true);	3927	scr_touch (true);
		3928	#endif
3840	}	3929	}
		3930
3841	while ((str = strchr (str, ';')) != NULL)	3931	while ((str = strchr (str, ';')) != NULL)
3842	{	3932	{
3843	str++;	3933	str++;
3844	#if XPM_BACKGROUND	3934	#if XPM_BACKGROUND
3845	changed += scale_pixmap (str);	3935	changed += scale_pixmap (str);
…		…
3848		3938
3849	if (changed)	3939	if (changed)
3850	{	3940	{
3851	#ifdef XPM_BACKGROUND	3941	#ifdef XPM_BACKGROUND
3852	resize_pixmap ();	3942	resize_pixmap ();
3853	#endif
3854	scr_touch (true);	3943	scr_touch (true);
		3944	#endif
3855	}	3945	}
3856	break;	3946	break;
3857		3947
3858	case XTerm_restoreFG:	3948	case Rxvt_restoreFG:
3859	set_window_color (Color_fg, str);	3949	set_window_color (Color_fg, str);
3860	break;	3950	break;
3861	case XTerm_restoreBG:	3951	case Rxvt_restoreBG:
3862	set_window_color (Color_bg, str);	3952	set_window_color (Color_bg, str);
3863	break;	3953	break;
3864		3954
3865	case XTerm_logfile:	3955	case XTerm_logfile:
3866	// TODO, when secure mode?	3956	// TODO, when secure mode?
…		…
3871	if (OPTION (Opt_insecure))	3961	if (OPTION (Opt_insecure))
3872	menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked	3962	menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3873	break;	3963	break;
3874	#endif	3964	#endif
3875	#if 0	3965	#if 0
3876	case XTerm_dumpscreen: /* no error notices */	3966	case Rxvt_dumpscreen: /* no error notices */
3877	{	3967	{
3878	int fd;	3968	int fd;
3879	if ((fd = open (str, O_RDWR \| O_CREAT \| O_EXCL, 0600)) >= 0)	3969	if ((fd = open (str, O_RDWR \| O_CREAT \| O_EXCL, 0600)) >= 0)
3880	{	3970	{
3881	scr_dump (fd);	3971	scr_dump (fd);
…		…
3919	}	4009	}
3920	break;	4010	break;
3921		4011
3922	case URxvt_view_up:	4012	case URxvt_view_up:
3923	case URxvt_view_down:	4013	case URxvt_view_down:
		4014	{
3924	int lines = atoi (str);	4015	int lines = atoi (str);
3925		4016
3926	if (lines)	4017	if (lines)
3927	scr_page (op == URxvt_view_up ? UP : DN, lines);	4018	scr_page (op == URxvt_view_up ? UP : DN, lines);
3928	else	4019	else
3929	{
3930	scr_erase_savelines ();	4020	scr_erase_savelines ();
3931	}	4021	}
3932		4022
		4023	break;
		4024	#endif
		4025
		4026	#if ENABLE_PERL
		4027	case URxvt_perl:
		4028	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
		4029	; // no responses yet
3933	break;	4030	break;
3934	#endif	4031	#endif
3935	}	4032	}
3936	}	4033	}
3937	/----------------------------------------------------------------------/	4034	/----------------------------------------------------------------------/
…		…
4048	/* extra handling for values with state unkept */	4145	/* extra handling for values with state unkept */
4049	switch (arg[i])	4146	switch (arg[i])
4050	{	4147	{
4051	#if ENABLE_STYLES	4148	#if ENABLE_STYLES
4052	case 1021:	4149	case 1021:
4053	if (mode)	4150	set_option (Opt_intensityStyles, mode);
4054	SET_OPTION (Opt_intensityStyles);	4151
		4152	scr_touch (true);
4055	else	4153	break;
4056	CLR_OPTION (Opt_intensityStyles);
4057	#endif	4154	#endif
4058	case 1048: /* alternative cursor save */	4155	case 1048: /* alternative cursor save */
4059	case 1049:	4156	case 1049:
4060	if (OPTION (Opt_secondaryScreen))	4157	if (OPTION (Opt_secondaryScreen))
4061	if (mode == 0)	4158	if (mode == 0)
…		…
4080	case 3: /* 80/132 */	4177	case 3: /* 80/132 */
4081	if (priv_modes & PrivMode_132OK)	4178	if (priv_modes & PrivMode_132OK)
4082	set_widthheight (((state ? 132 : 80) * fwidth), height);	4179	set_widthheight (((state ? 132 : 80) * fwidth), height);
4083	break;	4180	break;
4084	case 4: /* smooth scrolling */	4181	case 4: /* smooth scrolling */
4085	if (!state)	4182	set_option (Opt_jumpScroll, !state);
4086	SET_OPTION (Opt_jumpScroll);
4087	else
4088	CLR_OPTION (Opt_jumpScroll);
4089	break;	4183	break;
4090	case 5: /* reverse video */	4184	case 5: /* reverse video */
4091	scr_rvideo_mode (state);	4185	scr_rvideo_mode (state);
4092	break;	4186	break;
4093	case 6: /* relative/absolute origins */	4187	case 6: /* relative/absolute origins */
…		…
4134	#if 0	4228	#if 0
4135	case 1001:	4229	case 1001:
4136	break; /* X11 mouse highlighting */	4230	break; /* X11 mouse highlighting */
4137	#endif	4231	#endif
4138	case 1010: /* scroll to bottom on TTY output inhibit */	4232	case 1010: /* scroll to bottom on TTY output inhibit */
4139	if (!state)	4233	set_option (Opt_scrollTtyOutput, !state);
4140	SET_OPTION (Opt_scrollTtyOutput);
4141	else
4142	CLR_OPTION (Opt_scrollTtyOutput);
4143	break;	4234	break;
4144	case 1011: /* scroll to bottom on key press */	4235	case 1011: /* scroll to bottom on key press */
4145	if (state)	4236	set_option (Opt_scrollTtyKeypress, state);
4146	SET_OPTION (Opt_scrollTtyKeypress);
4147	else
4148	CLR_OPTION (Opt_scrollTtyKeypress);
4149	break;	4237	break;
4150	case 1047: /* secondary screen w/ clearing last */	4238	case 1047: /* secondary screen w/ clearing last */
4151	if (OPTION (Opt_secondaryScreen))	4239	if (OPTION (Opt_secondaryScreen))
4152	if (current_screen != PRIMARY)	4240	if (current_screen != PRIMARY)
4153	scr_erase_screen (2);	4241	scr_erase_screen (2);
…		…
4291	scr_color (Color_bg, Color_bg);	4379	scr_color (Color_bg, Color_bg);
4292	break;	4380	break;
4293		4381
4294	//case 50: // not variable spacing	4382	//case 50: // not variable spacing
4295		4383
4296	#ifndef NO_BRIGHTCOLOR	4384	#if ENABLE_FRILLS
4297	case 90:	4385	case 90:
4298	case 91: /* set bright fg color */	4386	case 91: /* set bright fg color */
4299	case 92:	4387	case 92:
4300	case 93:	4388	case 93:
4301	case 94:	4389	case 94:
…		…
4346	*/	4434	*/
4347	void	4435	void
4348	rxvt_term::tt_printf (const char *fmt,...)	4436	rxvt_term::tt_printf (const char *fmt,...)
4349	{	4437	{
4350	va_list arg_ptr;	4438	va_list arg_ptr;
4351	unsigned char buf[256];	4439	char buf[256];
4352		4440
4353	va_start (arg_ptr, fmt);	4441	va_start (arg_ptr, fmt);
4354	vsnprintf ((char *)buf, 256, fmt, arg_ptr);	4442	vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4355	va_end (arg_ptr);	4443	va_end (arg_ptr);
4356	tt_write (buf, strlen (buf));	4444	tt_write (buf, strlen (buf));
…		…
4361	* or generated by us in response to a query ESC sequence.	4449	* or generated by us in response to a query ESC sequence.
4362	*/	4450	*/
4363	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT	4451	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4364		4452
4365	void	4453	void
4366	rxvt_term::tt_write (const unsigned char *data, unsigned int len)	4454	rxvt_term::tt_write (const char *data, unsigned int len)
4367	{	4455	{
		4456	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
		4457	return;
		4458
		4459	if (pty.pty < 0)
		4460	return;
		4461
4368	if (v_buflen == 0)	4462	if (v_buflen == 0)
4369	{	4463	{
4370	ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));	4464	ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4371		4465
4372	if ((unsigned int)written == len)	4466	if ((unsigned int)written == len)
…		…
4374		4468
4375	data += written;	4469	data += written;
4376	len -= written;	4470	len -= written;
4377	}	4471	}
4378		4472
4379	v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);	4473	v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4380		4474
4381	memcpy (v_buffer + v_buflen, data, len);	4475	memcpy (v_buffer + v_buflen, data, len);
4382	v_buflen += len;	4476	v_buflen += len;
4383		4477
4384	pty_ev.set (EVENT_READ \| EVENT_WRITE);	4478	pty_ev.set (EVENT_READ \| EVENT_WRITE);

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.221 by root, Sat Dec 31 18:27:57 2005 UTC vs. Revision 1.264 by root, Mon Jan 16 06:37:51 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.221 by root, Sat Dec 31 18:27:57 2005 UTC vs.
Revision 1.264 by root, Mon Jan 16 06:37:51 2006 UTC