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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.237 by root, Fri Jan 6 01:16:58 2006 UTC vs.
Revision 1.283 by root, Tue Jan 24 19:40:12 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.
…		…
64		64
65	/----------------------------------------------------------------------/	65	/----------------------------------------------------------------------/
66		66
67	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)	67	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68		68
69	// exception thrown when the command parser runs out of input data
70	class out_of_input { } out_of_input;
71
72	#if ENABLE_FRILLS \|\| ISO_14755	69	#if ENABLE_FRILLS \|\| ISO_14755
73		70
74	#define ISO_14755_STARTED 0x80000000UL	71	#define ISO_14755_STARTED 0x80000000UL
75	#define ISO_14755_51 0x40000000UL // basic (section 5.1)	72	#define ISO_14755_51 0x40000000UL // basic (section 5.1)
76	#define ISO_14755_52 0x20000000UL // keycap (section 5.2)	73	#define ISO_14755_52 0x20000000UL // keycap (section 5.2)
…		…
147	\|\| !IN_RANGE_EXC (y, 0, nrow))	144	\|\| !IN_RANGE_EXC (y, 0, nrow))
148	return;	145	return;
149		146
150	for (;;)	147	for (;;)
151	{	148	{
152	const line_t &l = ROW(y - view_start);	149	const line_t &l = ROW(y + view_start);
153		150
154	text_t t = l.t[x];	151	text_t t = l.t[x];
155		152
156	if (t != NOCHAR \|\| !x)	153	if (t != NOCHAR \|\| !x)
157	{	154	{
…		…
302	rxvt_term::lookup_key (XKeyEvent &ev)	299	rxvt_term::lookup_key (XKeyEvent &ev)
303	{	300	{
304	int ctrl, meta, shft, len;	301	int ctrl, meta, shft, len;
305	unsigned int newlen;	302	unsigned int newlen;
306	KeySym keysym;	303	KeySym keysym;
307	#ifdef DEBUG_CMD
308	static int debug_key = 1; /* accessible by a debugger only */
309	#endif
310	int valid_keysym;	304	int valid_keysym;
311	char kbuf[KBUFSZ];	305	char kbuf[KBUFSZ];
312		306
313	/*	307	/*
314	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an	308	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
…		…
443	scr_move_to (0, 1);	437	scr_move_to (0, 1);
444	return;	438	return;
445	}	439	}
446	else if (keysym == XK_End)	440	else if (keysym == XK_End)
447	{	441	{
448	scr_move_to (1, 0);	442	scr_move_to (1, 1);
449	return;	443	return;
450	}	444	}
451	}	445	}
452	#endif	446	#endif
453	}	447	}
…		…
464	{	458	{
465	switch (keysym)	459	switch (keysym)
466	{	460	{
467	/* normal XTerm key bindings */	461	/* normal XTerm key bindings */
468	case XK_Insert: /* Shift+Insert = paste mouse selection */	462	case XK_Insert: /* Shift+Insert = paste mouse selection */
469	selection_request (ev.time, 0, 0);	463	selection_request (ev.time);
470	return;	464	return;
471	#if TODO	465	#if TODO
472	/* rxvt extras */	466	/* rxvt extras */
473	case XK_KP_Add: /* Shift+KP_Add = bigger font */	467	case XK_KP_Add: /* Shift+KP_Add = bigger font */
474	change_font (FONT_UP);	468	change_font (FONT_UP);
…		…
867	#endif	861	#endif
868	/* nil */ ;	862	/* nil */ ;
869	}	863	}
870	}	864	}
871		865
		866	if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
		867	return;
		868
872	if (len <= 0)	869	if (len <= 0)
873	return; /* not mapped */	870	return; /* not mapped */
874		871
875	if (OPTION (Opt_scrollTtyKeypress))	872	if (OPTION (Opt_scrollTtyKeypress))
876	if (view_start)	873	if (view_start)
…		…
902	{	899	{
903	const char ch = C0_ESC;	900	const char ch = C0_ESC;
904	tt_write (&ch, 1);	901	tt_write (&ch, 1);
905	}	902	}
906		903
907	#if defined(DEBUG_CMD)
908	/* Display keyboard buffer contents */
909	unsigned char *p;
910	int i;
911
912	fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
913	for (i = 0, p = kbuf; i < len; i++, p++)
914	fprintf (stderr, (p >= ' ' && p < '\177' ? "%c" : "\\%03o"), *p);
915	fprintf (stderr, "'\n");
916	#endif /* DEBUG_CMD */
917	tt_write (kbuf, (unsigned int)len);	904	tt_write (kbuf, (unsigned int)len);
918	}	905	}
919	/}}} /	906	/}}} /
920		907
921	#if MENUBAR_MAX \|\| defined (KEYSYM_RESOURCE)	908	#if defined (KEYSYM_RESOURCE)
922	/{{{ rxvt_cmd_write (), rxvt_cmd_getc () /
923	/* attempt to `write' count to the input buffer */
924	unsigned int	909	unsigned int
925	rxvt_term::cmd_write (const char *str, unsigned int count)	910	rxvt_term::cmd_write (const char *str, unsigned int count)
926	{	911	{
927	unsigned int n, s;	912	unsigned int n, s;
928		913
…		…
969		954
970	if (want_refresh)	955	if (want_refresh)
971	{	956	{
972	if (SHOULD_INVOKE (HOOK_LINE_UPDATE))	957	if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
973	{	958	{
974	int row = -view_start;	959	int row = view_start;
		960	int end_row = row + nrow;
975		961
976	while (row > -nsaved && ROW (row - 1).is_longer ())	962	while (row > top_row && ROW (row - 1).is_longer ())
977	--row;	963	--row;
978		964
979	while (row < -view_start + nrow)	965	do
980	{	966	{
981	int start_row = row;	967	int start_row = row;
982	line_t *l;	968	line_t *l;
983		969
984	do	970	do
985	{	971	{
986	l = &ROW (row);	972	l = &ROW (row++);
987		973
988	if (!(l->f & LINE_FILTERED))	974	if (!(l->f & LINE_FILTERED))
989	{	975	{
990	// line not filtered, mark it as filtered	976	// line not filtered, mark it as filtered
991	l->f \|= LINE_FILTERED;	977	l->f \|= LINE_FILTERED;
992	while (l->is_longer ())	978	while (l->is_longer ())
993	{	979	{
994	l = &ROW (++row);	980	l = &ROW (row++);
995	l->f \|= LINE_FILTERED;	981	l->f \|= LINE_FILTERED;
996	}	982	}
997		983
998	// and filter it	984	// and filter it
999	HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));	985	HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1000		986
1001	break;	987	break;
1002	}	988	}
1003	}	989	}
1004	while (l->is_longer ());	990	while (l->is_longer () && row < end_row);
1005
1006	row++;
1007	}	991	}
		992	while (row < end_row);
1008		993	}
1009	}
1010		994
1011	scr_refresh (refresh_type);	995	scr_refresh ();
1012	scrollbar_show (1);	996	scrollbar_show (1);
1013	#ifdef USE_XIM	997	#ifdef USE_XIM
1014	IMSendSpot ();	998	IMSendSpot ();
1015	#endif	999	#endif
1016	}	1000	}
…		…
1019	}	1003	}
1020		1004
1021	void	1005	void
1022	rxvt_term::check_cb (check_watcher &w)	1006	rxvt_term::check_cb (check_watcher &w)
1023	{	1007	{
1024	SET_R (this);	1008	make_current ();
1025	SET_LOCALE (locale);
1026		1009
1027	display->flush ();	1010	display->flush ();
1028		1011
1029	if (want_refresh && !flush_ev.active)	1012	if (want_refresh && !flush_ev.active)
1030	flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally	1013	flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1031	}	1014	}
1032		1015
1033	void	1016	void
1034	rxvt_term::flush_cb (time_watcher &w)	1017	rxvt_term::flush_cb (time_watcher &w)
1035	{	1018	{
1036	SET_R (this);	1019	make_current ();
1037	SET_LOCALE (locale);
1038		1020
1039	refresh_limit = 1;	1021	refresh_limit = 1;
1040	refresh_count = 0;	1022	refresh_count = 0;
1041	flush ();	1023	flush ();
1042	}	1024	}
…		…
1046	rxvt_term::cursor_blink_cb (time_watcher &w)	1028	rxvt_term::cursor_blink_cb (time_watcher &w)
1047	{	1029	{
1048	hidden_cursor = !hidden_cursor;	1030	hidden_cursor = !hidden_cursor;
1049	want_refresh = 1;	1031	want_refresh = 1;
1050		1032
1051	w.start (w.at + BLINK_INTERVAL);	1033	w.start (w.at + CURSOR_BLINK_INTERVAL);
1052	}	1034	}
1053	#endif	1035	#endif
1054		1036
1055	#ifdef TEXT_BLINK	1037	#ifdef TEXT_BLINK
1056	void	1038	void
…		…
1070	rxvt_term::cont_scroll_cb (time_watcher &w)	1052	rxvt_term::cont_scroll_cb (time_watcher &w)
1071	{	1053	{
1072	if ((scrollbar_isUp() \|\| scrollbar_isDn()) &&	1054	if ((scrollbar_isUp() \|\| scrollbar_isDn()) &&
1073	scr_page (scrollbar_isUp() ? UP : DN, 1))	1055	scr_page (scrollbar_isUp() ? UP : DN, 1))
1074	{	1056	{
1075	refresh_type \|= SMOOTH_REFRESH;
1076	want_refresh = 1;	1057	want_refresh = 1;
1077	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1058	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1078	}	1059	}
1079	}	1060	}
1080	#endif	1061	#endif
…		…
1084	rxvt_term::sel_scroll_cb (time_watcher &w)	1065	rxvt_term::sel_scroll_cb (time_watcher &w)
1085	{	1066	{
1086	if (scr_page (scroll_selection_dir, scroll_selection_lines))	1067	if (scr_page (scroll_selection_dir, scroll_selection_lines))
1087	{	1068	{
1088	selection_extend (selection_save_x, selection_save_y, selection_save_state);	1069	selection_extend (selection_save_x, selection_save_y, selection_save_state);
1089	refresh_type \|= SMOOTH_REFRESH;
1090	want_refresh = 1;	1070	want_refresh = 1;
1091	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1071	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1092	}	1072	}
1093	}	1073	}
1094	#endif	1074	#endif
…		…
1099	{	1079	{
1100	if (mouse_slip_wheel_speed == 0	1080	if (mouse_slip_wheel_speed == 0
1101	\|\| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)	1081	\|\| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1102	: scr_page (UP, mouse_slip_wheel_speed))	1082	: scr_page (UP, mouse_slip_wheel_speed))
1103	{	1083	{
1104	if (view_start == nsaved \|\|	1084	if (view_start == top_row \|\| view_start == 0)
1105	view_start == 0)
1106	mouse_slip_wheel_speed = 0;	1085	mouse_slip_wheel_speed = 0;
1107		1086
1108	refresh_type \|= SMOOTH_REFRESH;
1109	want_refresh = 1;	1087	want_refresh = 1;
1110	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1088	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1111	}	1089	}
1112	}	1090	}
1113	#endif	1091	#endif
…		…
1143		1121
1144	memmove (cmdbuf_base, cmdbuf_ptr, n);	1122	memmove (cmdbuf_base, cmdbuf_ptr, n);
1145	cmdbuf_ptr = cmdbuf_base;	1123	cmdbuf_ptr = cmdbuf_base;
1146	cmdbuf_endp = cmdbuf_ptr + n;	1124	cmdbuf_endp = cmdbuf_ptr + n;
1147		1125
1148	ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);	1126	ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1149		1127
1150	if (r > 0)	1128	if (r > 0)
1151	{	1129	{
1152	cmdbuf_endp += r;	1130	cmdbuf_endp += r;
1153	return true;	1131	return true;
…		…
1171	}	1149	}
1172		1150
1173	void	1151	void
1174	rxvt_term::pty_cb (io_watcher &w, short revents)	1152	rxvt_term::pty_cb (io_watcher &w, short revents)
1175	{	1153	{
1176	SET_R (this);	1154	make_current ();
1177	SET_LOCALE (locale);
1178		1155
1179	if (revents & EVENT_READ)	1156	if (revents & EVENT_READ)
1180	// loop, but don't allow a single term to monopolize us	1157	// loop, but don't allow a single term to monopolize us
1181	while (pty_fill ())	1158	while (pty_fill ())
1182	if (cmd_parse ())	1159	if (cmd_parse ())
…		…
1202		1179
1203	#ifdef POINTER_BLANK	1180	#ifdef POINTER_BLANK
1204	void	1181	void
1205	rxvt_term::pointer_blank ()	1182	rxvt_term::pointer_blank ()
1206	{	1183	{
1207	if (! OPTION (Opt_pointerBlank))	1184	if (!OPTION (Opt_pointerBlank))
1208	return;	1185	return;
1209		1186
1210	XDefineCursor (display->display, vt, display->blank_cursor);	1187	XDefineCursor (display->display, vt, display->blank_cursor);
1211	XFlush (display->display);	1188	XFlush (display->display);
1212		1189
…		…
1214	}	1191	}
1215		1192
1216	void	1193	void
1217	rxvt_term::pointer_cb (time_watcher &w)	1194	rxvt_term::pointer_cb (time_watcher &w)
1218	{	1195	{
1219	SET_R (this);	1196	make_current ();
1220	SET_LOCALE (locale);
1221		1197
1222	pointer_blank ();	1198	pointer_blank ();
1223	}	1199	}
1224	#endif	1200	#endif
1225		1201
…		…
1304		1280
1305	/{{{ process an X event /	1281	/{{{ process an X event /
1306	void	1282	void
1307	rxvt_term::x_cb (XEvent &ev)	1283	rxvt_term::x_cb (XEvent &ev)
1308	{	1284	{
		1285	make_current ();
		1286
1309	dDisp;	1287	dDisp;
1310		1288
1311	SET_R (this);	1289	if (ev.xany.window == vt
1312	SET_LOCALE (locale);	1290	&& SHOULD_INVOKE (HOOK_X_EVENT)
		1291	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
		1292	return;
1313		1293
1314	#if defined(CURSOR_BLINK)	1294	// for XQueryPointer
1315	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1316	{
1317	if (hidden_cursor)
1318	{
1319	hidden_cursor = 0;
1320	want_refresh = 1;
1321	}
1322
1323	cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1324	}
1325	#endif
1326
1327	#if defined(POINTER_BLANK)
1328	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1329	{
1330	if (ev.type == MotionNotify
1331	\|\| ev.type == ButtonPress
1332	\|\| ev.type == ButtonRelease)
1333	if (hidden_pointer)
1334	pointer_unblank ();
1335
1336	if (ev.type == KeyPress && hidden_pointer == 0)
1337	pointer_blank ();
1338	}
1339	#endif
1340
1341	Window unused_root, unused_child;	1295	Window unused_root, unused_child;
1342	int unused_root_x, unused_root_y;	1296	int unused_root_x, unused_root_y;
1343	unsigned int unused_mask;	1297	unsigned int unused_mask;
1344		1298
1345	switch (ev.type)	1299	switch (ev.type)
…		…
1352		1306
1353	break;	1307	break;
1354		1308
1355	case KeyRelease:	1309	case KeyRelease:
1356	{	1310	{
1357	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ISO_14755	1311	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ISO_14755 \|\| ENABLE_PERL
1358	KeySym ks;	1312	KeySym keysym;
1359		1313
1360	ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/	1314	keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1361	#endif	1315	#endif
1362		1316
1363	#if ENABLE_FRILLS \|\| ISO_14755	1317	#if ENABLE_FRILLS \|\| ISO_14755
1364	// ISO 14755 support	1318	// ISO 14755 support
1365	if (iso14755buf)	1319	if (iso14755buf)
…		…
1370	# endif	1324	# endif
1371	# if ISO_14755	1325	# if ISO_14755
1372	// iso14755 part 5.2 handling: release time	1326	// iso14755 part 5.2 handling: release time
1373	// first: controls	1327	// first: controls
1374	if ((ev.xkey.state & ControlMask)	1328	if ((ev.xkey.state & ControlMask)
1375	&& ((ks >= 0x40 && ks <= 0x5f)	1329	&& ((keysym >= 0x40 && keysym <= 0x5f)
1376	\|\| (ks >= 0x61 && ks <= 0x7f)))	1330	\|\| (keysym >= 0x61 && keysym <= 0x7f)))
1377	{	1331	{
1378	iso14755buf = ISO_14755_51 \| 0x2400 \| (ks & 0x1f);	1332	iso14755buf = ISO_14755_51 \| 0x2400 \| (keysym & 0x1f);
1379	commit_iso14755 ();	1333	commit_iso14755 ();
1380	return; // case-break;	1334	goto skip_switch;
1381	}	1335	}
1382		1336
1383	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)	1337	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1384	if (i[0] == ks)	1338	if (i[0] == keysym)
1385	{	1339	{
1386	iso14755buf = ISO_14755_51 \| i[1];	1340	iso14755buf = ISO_14755_51 \| i[1];
1387	commit_iso14755 ();	1341	commit_iso14755 ();
1388	return; // case-break;	1342	goto skip_switch;
1389	}	1343	}
1390		1344
1391	scr_bell ();	1345	scr_bell ();
1392	# endif	1346	# endif
1393	iso14755buf = 0;	1347	iso14755buf = 0;
…		…
1412	else	1366	else
1413	iso14755buf = 0;	1367	iso14755buf = 0;
1414	}	1368	}
1415	#endif	1369	#endif
1416		1370
		1371	if (ev.xany.window == vt
		1372	&& HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
		1373	break;
		1374
1417	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	1375	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1418	if (!(ev.xkey.state & ControlMask))	1376	if (!(ev.xkey.state & ControlMask))
1419	slip_wheel_ev.stop ();	1377	slip_wheel_ev.stop ();
1420	else if (ks == XK_Control_L \|\| ks == XK_Control_R)	1378	else if (keysym == XK_Control_L \|\| keysym == XK_Control_R)
1421	mouse_slip_wheel_speed = 0;	1379	mouse_slip_wheel_speed = 0;
1422	#endif	1380	#endif
1423	break;	1381	break;
1424	}	1382	}
1425		1383
…		…
1431	button_release (ev.xbutton);	1389	button_release (ev.xbutton);
1432	break;	1390	break;
1433		1391
1434	case ClientMessage:	1392	case ClientMessage:
1435	if (ev.xclient.format == 32	1393	if (ev.xclient.format == 32
1436	&& ev.xclient.message_type == xa[XA_WM_PROTOCOLS])	1394	&& !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1437	{	1395	{
		1396	if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
		1397	{
		1398	if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
		1399	{
1438	if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])	1400	if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
		1401	{
		1402	if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1439	destroy ();	1403	destroy ();
		1404	}
1440	#if ENABLE_EWMH	1405	#if ENABLE_EWMH
1441	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])	1406	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1442	XSendEvent (disp, ev.xclient.window = display->root,	1407	XSendEvent (disp, ev.xclient.window = display->root,
1443	False, SubstructureRedirectMask \| SubstructureNotifyMask,	1408	False, SubstructureRedirectMask \| SubstructureNotifyMask,
1444	&ev);	1409	&ev);
		1410	#endif
		1411	}
		1412	}
		1413	#if ENABLE_XEMBED
		1414	else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
		1415	{
		1416	if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
		1417	focus_in ();
		1418	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
		1419	focus_out ();
		1420	}
1445	#endif	1421	#endif
1446	}	1422	}
1447	#if ENABLE_XEMBED
1448	else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1449	{
1450	if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1451	focus_in ();
1452	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1453	focus_out ();
1454	}
1455	#endif
1456	#ifdef OFFIX_DND
1457	/* OffiX Dnd (drag 'n' drop) protocol */
1458	else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1459	&& (ev.xclient.data.l[0] == DndFile
1460	\|\| ev.xclient.data.l[0] == DndDir
1461	\|\| ev.xclient.data.l[0] == DndLink))
1462	{
1463	/* Get Dnd data */
1464	Atom ActualType;
1465	int ActualFormat;
1466	unsigned char *data;
1467	unsigned long Size, RemainingBytes;
1468
1469	XGetWindowProperty (disp, display->root,
1470	xa[XA_DNDSELECTION],
1471	0L, 1000000L,
1472	False, AnyPropertyType,
1473	&ActualType, &ActualFormat,
1474	&Size, &RemainingBytes,
1475	&data);
1476	set_string_property (XA_CUT_BUFFER0, data);
1477	XFree (data);
1478	selection_paste (display->root, XA_CUT_BUFFER0, true);
1479	XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1480	}
1481	#endif /* OFFIX_DND */
1482	break;	1423	break;
1483		1424
1484	case MappingNotify:	1425	case MappingNotify:
1485	XRefreshKeyboardMapping (&ev.xmapping);	1426	XRefreshKeyboardMapping (&ev.xmapping);
1486	break;	1427	break;
…		…
1528	{	1469	{
1529	seen_resize = 1;	1470	seen_resize = 1;
1530	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1471	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1531	}	1472	}
1532		1473
		1474	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
		1475
1533	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */	1476	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1534	if (OPTION (Opt_transparent))	1477	if (OPTION (Opt_transparent))
1535	check_our_parents ();	1478	check_our_parents ();
1536	#endif	1479	#endif
1537	}	1480	}
1538	break;	1481	break;
1539		1482
1540	case PropertyNotify:	1483	case PropertyNotify:
		1484	if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1541	if (ev.xproperty.atom == xa[XA_VT_SELECTION]	1485	if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1542	&& ev.xproperty.state == PropertyNewValue)	1486	&& ev.xproperty.state == PropertyNewValue)
1543	selection_property (ev.xproperty.window, ev.xproperty.atom);	1487	selection_property (ev.xproperty.window, ev.xproperty.atom);
1544		1488
1545	break;	1489	break;
1546		1490
1547	case SelectionClear:	1491	case SelectionClear:
1548	selection_clear ();	1492	selection_clear ();
…		…
1553	selection_paste (ev.xselection.requestor, ev.xselection.property, true);	1497	selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1554	break;	1498	break;
1555		1499
1556	case SelectionRequest:	1500	case SelectionRequest:
1557	selection_send (ev.xselectionrequest);	1501	selection_send (ev.xselectionrequest);
		1502	break;
		1503
		1504	case MapNotify:
		1505	mapped = 1;
		1506	#ifdef TEXT_BLINK
		1507	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
		1508	#endif
		1509	HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1558	break;	1510	break;
1559		1511
1560	case UnmapNotify:	1512	case UnmapNotify:
1561	mapped = 0;	1513	mapped = 0;
1562	#ifdef TEXT_BLINK	1514	#ifdef TEXT_BLINK
1563	text_blink_ev.stop ();	1515	text_blink_ev.stop ();
1564	#endif	1516	#endif
1565	break;	1517	HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1566
1567	case MapNotify:
1568	mapped = 1;
1569	#ifdef TEXT_BLINK
1570	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1571	#endif
1572	break;	1518	break;
1573		1519
1574	#ifdef TRANSPARENT	1520	#ifdef TRANSPARENT
1575	case ReparentNotify:	1521	case ReparentNotify:
1576	rootwin_cb (ev);	1522	rootwin_cb (ev);
…		…
1590		1536
1591	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))	1537	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1592	scr_expose (ev.xexpose.x, ev.xexpose.y,	1538	scr_expose (ev.xexpose.x, ev.xexpose.y,
1593	ev.xexpose.width, ev.xexpose.height, False);	1539	ev.xexpose.width, ev.xexpose.height, False);
1594		1540
1595	scr_refresh (refresh_type);	1541	want_refresh = 1;
1596	}	1542	}
1597	else	1543	else
1598	{	1544	{
1599	XEvent unused_event;	1545	XEvent unused_event;
1600		1546
…		…
1606	if (isScrollbarWindow (ev.xany.window))	1552	if (isScrollbarWindow (ev.xany.window))
1607	{	1553	{
1608	scrollBar.setIdle ();	1554	scrollBar.setIdle ();
1609	scrollbar_show (0);	1555	scrollbar_show (0);
1610	}	1556	}
1611	#ifdef MENUBAR
1612	if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1613	menubar_expose ();
1614	#endif
1615		1557
1616	#ifdef TRANSPARENT	1558	#ifdef TRANSPARENT
1617	if (am_transparent && ev.xany.window == parent[0])	1559	if (am_transparent && ev.xany.window == parent[0])
1618	XClearWindow (disp, ev.xany.window);	1560	XClearWindow (disp, ev.xany.window);
1619	#endif	1561	#endif
…		…
1623	case MotionNotify:	1565	case MotionNotify:
1624	#ifdef POINTER_BLANK	1566	#ifdef POINTER_BLANK
1625	if (hidden_pointer)	1567	if (hidden_pointer)
1626	pointer_unblank ();	1568	pointer_unblank ();
1627	#endif	1569	#endif
1628	#if MENUBAR
1629	if (isMenuBarWindow (ev.xany.window))
1630	{
1631	menubar_control (ev.xbutton);
1632	break;
1633	}
1634	#endif
1635	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)	1570	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1636	break;	1571	break;
1637		1572
1638	if (ev.xany.window == vt)	1573	if (ev.xany.window == vt)
1639	{	1574	{
		1575	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
		1576	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
		1577	; // nop
1640	if (ev.xbutton.state & (Button1Mask \| Button3Mask))	1578	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))
1641	{	1579	{
1642	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))	1580	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1643	;	1581	;
1644		1582
1645	XQueryPointer (disp, vt,	1583	XQueryPointer (disp, vt,
…		…
1725	&unused_root_x, &unused_root_y,	1663	&unused_root_x, &unused_root_y,
1726	&ev.xbutton.x, &ev.xbutton.y,	1664	&ev.xbutton.x, &ev.xbutton.y,
1727	&unused_mask);	1665	&unused_mask);
1728	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1666	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1729	scrollbar_size ());	1667	scrollbar_size ());
1730	scr_refresh (refresh_type);	1668	want_refresh = 1;
1731	refresh_limit = 0;	1669	refresh_limit = 0;
1732	scrollbar_show (1);	1670	scrollbar_show (1);
1733	}	1671	}
1734	break;	1672	break;
1735	}	1673	}
		1674
		1675	skip_switch: ;
		1676
		1677	#if defined(CURSOR_BLINK)
		1678	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
		1679	{
		1680	if (hidden_cursor)
		1681	{
		1682	hidden_cursor = 0;
		1683	want_refresh = 1;
		1684	}
		1685
		1686	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
		1687	}
		1688	#endif
		1689
		1690	#if defined(POINTER_BLANK)
		1691	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
		1692	{
		1693	if (ev.type == MotionNotify
		1694	\|\| ev.type == ButtonPress
		1695	\|\| ev.type == ButtonRelease)
		1696	if (hidden_pointer)
		1697	pointer_unblank ();
		1698
		1699	if (ev.type == KeyPress && hidden_pointer == 0)
		1700	pointer_blank ();
		1701	}
		1702	#endif
1736	}	1703	}
1737		1704
1738	void	1705	void
1739	rxvt_term::focus_in ()	1706	rxvt_term::focus_in ()
1740	{	1707	{
…		…
1752	XSetICFocus (Input_Context);	1719	XSetICFocus (Input_Context);
1753	}	1720	}
1754	#endif	1721	#endif
1755	#if CURSOR_BLINK	1722	#if CURSOR_BLINK
1756	if (OPTION (Opt_cursorBlink))	1723	if (OPTION (Opt_cursorBlink))
1757	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1724	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1758	#endif	1725	#endif
1759	#if OFF_FOCUS_FADING	1726	#if OFF_FOCUS_FADING
1760	if (rs[Rs_fade])	1727	if (rs[Rs_fade])
1761	{	1728	{
1762	pix_colors = pix_colors_focused;	1729	pix_colors = pix_colors_focused;
…		…
1806		1773
1807	#if TRANSPARENT	1774	#if TRANSPARENT
1808	void	1775	void
1809	rxvt_term::rootwin_cb (XEvent &ev)	1776	rxvt_term::rootwin_cb (XEvent &ev)
1810	{	1777	{
1811	SET_R (this);	1778	make_current ();
1812	SET_LOCALE (locale);
1813		1779
1814	switch (ev.type)	1780	switch (ev.type)
1815	{	1781	{
1816	case PropertyNotify:	1782	case PropertyNotify:
1817	/*	1783	/*
…		…
1844	/*	1810	/*
1845	* VT window processing of button press	1811	* VT window processing of button press
1846	*/	1812	*/
1847	if (ev.window == vt)	1813	if (ev.window == vt)
1848	{	1814	{
		1815	if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
		1816	return;
		1817
1849	#if ISO_14755	1818	#if ISO_14755
1850	// 5.4	1819	// 5.4
1851	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))	1820	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))
1852	{	1821	{
1853	iso14755_54 (ev.x, ev.y);	1822	iso14755_54 (ev.x, ev.y);
…		…
1865	#ifdef MOUSE_REPORT_DOUBLECLICK	1834	#ifdef MOUSE_REPORT_DOUBLECLICK
1866	if (ev.button == MEvent.button && clickintime)	1835	if (ev.button == MEvent.button && clickintime)
1867	{	1836	{
1868	/* same button, within alloted time */	1837	/* same button, within alloted time */
1869	MEvent.clicks++;	1838	MEvent.clicks++;
		1839
1870	if (MEvent.clicks > 1)	1840	if (MEvent.clicks > 1)
1871	{	1841	{
1872	/* only report double clicks */	1842	/* only report double clicks */
1873	MEvent.clicks = 2;	1843	MEvent.clicks = 2;
1874	mouse_report (ev);	1844	mouse_report (ev);
…		…
1894	else	1864	else
1895	{	1865	{
1896	if (ev.button != MEvent.button)	1866	if (ev.button != MEvent.button)
1897	MEvent.clicks = 0;	1867	MEvent.clicks = 0;
1898		1868
1899	if (!HOOK_INVOKE ((this, HOOK_MOUSE_CLICK, DT_XEVENT, &ev, DT_END)))
1900	switch (ev.button)	1869	switch (ev.button)
1901	{	1870	{
1902	case Button1:	1871	case Button1:
1903	/* allow meta + click to select rectangular areas */	1872	/* allow meta + click to select rectangular areas */
1904	/* should be done in screen.C */	1873	/* should be done in screen.C */
1905	#if ENABLE_FRILLS	1874	#if ENABLE_FRILLS
1906	selection.rect = !!(ev.state & ModMetaMask);	1875	selection.rect = !!(ev.state & ModMetaMask);
1907	#else	1876	#else
1908	selection.rect = false;	1877	selection.rect = false;
1909	#endif	1878	#endif
1910		1879
1911	/* allow shift+left click to extend selection */	1880	/* allow shift+left click to extend selection */
1912	if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))	1881	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1913	{	1882	{
1914	if (MEvent.button == Button1 && clickintime)	1883	if (MEvent.button == Button1 && clickintime)
1915	selection_rotate (ev.x, ev.y);	1884	selection_rotate (ev.x, ev.y);
1916	else	1885	else
1917	selection_extend (ev.x, ev.y, 1);	1886	selection_extend (ev.x, ev.y, 1);
1918	}	1887	}
1919	else	1888	else
1920	{	1889	{
1921	if (MEvent.button == Button1 && clickintime)	1890	if (MEvent.button == Button1 && clickintime)
1922	MEvent.clicks++;	1891	MEvent.clicks++;
1923	else	1892	else
1924	MEvent.clicks = 1;	1893	MEvent.clicks = 1;
1925		1894
1926	selection_click (MEvent.clicks, ev.x, ev.y);	1895	selection_click (MEvent.clicks, ev.x, ev.y);
1927	}	1896	}
1928		1897
1929	MEvent.button = Button1;	1898	MEvent.button = Button1;
1930	break;	1899	break;
1931		1900
1932	case Button3:	1901	case Button3:
1933	if (MEvent.button == Button3 && clickintime)	1902	if (MEvent.button == Button3 && clickintime)
1934	selection_rotate (ev.x, ev.y);	1903	selection_rotate (ev.x, ev.y);
1935	else	1904	else
1936	selection_extend (ev.x, ev.y, 1);	1905	selection_extend (ev.x, ev.y, 1);
1937		1906
1938	MEvent.button = Button3;	1907	MEvent.button = Button3;
1939	break;	1908	break;
1940	}	1909	}
1941	}	1910	}
1942		1911
1943	MEvent.time = ev.time;	1912	MEvent.time = ev.time;
1944	return;	1913	return;
1945	}	1914	}
1946		1915
…		…
2082	}	2051	}
2083		2052
2084	break;	2053	break;
2085	}	2054	}
2086	}	2055	}
		2056
2087	return;	2057	return;
2088	}	2058	}
2089	#if MENUBAR
2090	/*
2091	* Menubar window processing of button press
2092	*/
2093	if (isMenuBarWindow (ev.window))
2094	menubar_control (ev);
2095	#endif
2096	}	2059	}
2097		2060
2098	void	2061	void
2099	rxvt_term::button_release (XButtonEvent &ev)	2062	rxvt_term::button_release (XButtonEvent &ev)
2100	{	2063	{
…		…
2106		2069
2107	if (scrollbar_isUpDn ())	2070	if (scrollbar_isUpDn ())
2108	{	2071	{
2109	scrollBar.setIdle ();	2072	scrollBar.setIdle ();
2110	scrollbar_show (0);	2073	scrollbar_show (0);
2111	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2112	refresh_type &= ~SMOOTH_REFRESH;
2113	#endif
2114	}	2074	}
2115		2075
2116	#ifdef SELECTION_SCROLLING	2076	#ifdef SELECTION_SCROLLING
2117	if (sel_scroll_ev.active)	2077	if (sel_scroll_ev.active)
2118	sel_scroll_ev.stop();	2078	sel_scroll_ev.stop();
2119	#endif	2079	#endif
2120		2080
2121	if (ev.window == vt)	2081	if (ev.window == vt)
2122	{	2082	{
		2083	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
		2084	return;
		2085
2123	#if ISO_14755	2086	#if ISO_14755
2124	// 5.4	2087	// 5.4
2125	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))	2088	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))
2126	return;	2089	return;
2127	#endif	2090	#endif
		2091
2128	if (reportmode)	2092	if (reportmode)
2129	{	2093	{
2130	/* mouse report from vt window */	2094	/* mouse report from vt window */
2131	/* don't report release of wheel "buttons" */	2095	/* don't report release of wheel "buttons" */
2132	if (ev.button >= 4)	2096	if (ev.button >= 4)
…		…
2162	{	2126	{
2163	case Button1:	2127	case Button1:
2164	case Button3:	2128	case Button3:
2165	selection_make (ev.time);	2129	selection_make (ev.time);
2166	break;	2130	break;
		2131
2167	case Button2:	2132	case Button2:
2168	selection_request (ev.time, ev.x, ev.y);	2133	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
		2134	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2169	break;	2135	break;
		2136
2170	#ifdef MOUSE_WHEEL	2137	#ifdef MOUSE_WHEEL
2171	case Button4:	2138	case Button4:
2172	case Button5:	2139	case Button5:
2173	{	2140	{
2174	int i;	2141	int i;
…		…
2196	slip_wheel_ev.start ();	2163	slip_wheel_ev.start ();
2197	}	2164	}
2198	else	2165	else
2199	{	2166	{
2200	# endif	2167	# endif
2201	# ifdef JUMP_MOUSE_WHEEL
2202	scr_page (v, i);	2168	scr_page (v, i);
2203	scr_refresh (SMOOTH_REFRESH);
2204	scrollbar_show (1);	2169	scrollbar_show (1);
2205	# else
2206	while (i--)
2207	{
2208	scr_page (v, 1);
2209	scr_refresh (SMOOTH_REFRESH);
2210	scrollbar_show (1);
2211	}
2212	# endif
2213	# ifdef MOUSE_SLIP_WHEELING	2170	# ifdef MOUSE_SLIP_WHEELING
2214	}	2171	}
2215	#endif	2172	# endif
2216	}	2173	}
2217	break;	2174	break;
2218	#endif	2175	#endif
2219	}	2176	}
2220	}	2177	}
2221	#ifdef MENUBAR
2222	else if (isMenuBarWindow (ev.window))
2223	menubar_control (ev);
2224	#endif
2225	}	2178	}
2226		2179
2227	#ifdef TRANSPARENT	2180	#ifdef TRANSPARENT
2228	#if TINTING	2181	#if TINTING
2229	/* taken from aterm-0.4.2 */	2182	/* taken from aterm-0.4.2 */
…		…
2666	am_transparent = 0;	2619	am_transparent = 0;
2667	/* XXX: also turn off Opt_transparent? */	2620	/* XXX: also turn off Opt_transparent? */
2668	}	2621	}
2669	else	2622	else
2670	{	2623	{
2671	#if WAIT_FOR_WM
2672	/* wait (an arbitrary period) for the WM to do its thing
2673	* needed for fvwm2.2.2 (and before?) */
2674	sleep (1);
2675	#endif
2676	for (n = 0; n < (unsigned int)i; n++)	2624	for (n = 0; n < (unsigned int)i; n++)
2677	{	2625	{
2678	XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);	2626	XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2679	XClearWindow (disp, parent[n]);	2627	XClearWindow (disp, parent[n]);
2680	}	2628	}
…		…
2709		2657
2710	bool	2658	bool
2711	rxvt_term::cmd_parse ()	2659	rxvt_term::cmd_parse ()
2712	{	2660	{
2713	bool flag = false;	2661	bool flag = false;
2714	unicode_t ch = NOCHAR;	2662	wchar_t ch = NOCHAR;
2715	char *seq_begin; // remember start of esc-sequence here	2663	char *seq_begin; // remember start of esc-sequence here
2716		2664
2717	for (;;)	2665	for (;;)
2718	{	2666	{
2719	if (ch == NOCHAR)	2667	if (ch == NOCHAR)
2720	{	2668	{
2721	seq_begin = cmdbuf_ptr;	2669	seq_begin = cmdbuf_ptr;
2722	ch = next_char ();	2670	ch = next_char ();
2723	}
2724		2671
2725	if (ch == NOCHAR) // TODO: improve	2672	if (ch == NOCHAR)
2726	break;	2673	break;
		2674	}
2727		2675
2728	if (!IS_CONTROL (ch) \|\| ch == C0_LF \|\| ch == C0_CR \|\| ch == C0_HT)	2676	if (!IS_CONTROL (ch) \|\| ch == C0_LF \|\| ch == C0_CR \|\| ch == C0_HT)
2729	{	2677	{
2730	if (!seen_input)	2678	if (!seen_input)
2731	{	2679	{
…		…
2740	if (seen_resize && cmd_pid)	2688	if (seen_resize && cmd_pid)
2741	kill (-cmd_pid, SIGWINCH);	2689	kill (-cmd_pid, SIGWINCH);
2742	}	2690	}
2743		2691
2744	/* Read a text string from the input buffer */	2692	/* Read a text string from the input buffer */
2745	unicode_t buf[UBUFSIZ];	2693	wchar_t buf[UBUFSIZ];
2746	bool refreshnow = false;	2694	bool refreshnow = false;
2747	int nlines = 0;	2695	int nlines = 0;
2748	unicode_t *str = buf;	2696	wchar_t *str = buf;
2749	unicode_t *eol = str + min (ncol, UBUFSIZ);	2697	wchar_t *eol = str + min (ncol, UBUFSIZ);
2750		2698
2751	for (;;)	2699	for (;;)
2752	{	2700	{
2753	if (ch == NOCHAR \|\| (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))	2701	if (ch == NOCHAR \|\| (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2754	break;	2702	break;
…		…
2772	}	2720	}
2773		2721
2774	// scr_add_lines only works for nlines <= nrow - 1.	2722	// scr_add_lines only works for nlines <= nrow - 1.
2775	if (nlines >= nrow - 1)	2723	if (nlines >= nrow - 1)
2776	{	2724	{
		2725	if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2777	if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END)))	2726	&& HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2778	scr_add_lines (buf, nlines, str - buf);	2727	scr_add_lines (buf, str - buf, nlines);
2779		2728
2780	nlines = 0;	2729	nlines = 0;
2781	str = buf;	2730	str = buf;
2782	eol = str + min (ncol, UBUFSIZ);	2731	eol = str + min (ncol, UBUFSIZ);
2783	}	2732	}
…		…
2797		2746
2798	seq_begin = cmdbuf_ptr;	2747	seq_begin = cmdbuf_ptr;
2799	ch = next_char ();	2748	ch = next_char ();
2800	}	2749	}
2801		2750
		2751	if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2802	if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END)))	2752	&& HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2803	scr_add_lines (buf, nlines, str - buf);	2753	scr_add_lines (buf, str - buf, nlines);
2804		2754
2805	/*	2755	/*
2806	* If there have been a lot of new lines, then update the screen	2756	* If there have been a lot of new lines, then update the screen
2807	* What the heck I'll cheat and only refresh less than every page-full.	2757	* What the heck I'll cheat and only refresh less than every page-full.
2808	* the number of pages between refreshes is refresh_limit, which	2758	* the number of pages between refreshes is refresh_limit, which
…		…
2813	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)	2763	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2814	refresh_limit++;	2764	refresh_limit++;
2815	else	2765	else
2816	{	2766	{
2817	flag = true;	2767	flag = true;
2818	scr_refresh (refresh_type);	2768	scr_refresh ();
2819	flush_ev.stop ();	2769	want_refresh = 1;
2820	}	2770	}
2821	}	2771	}
2822		2772
2823	}	2773	}
2824	else	2774	else
…		…
2839	}	2789	}
2840		2790
2841	return flag;	2791	return flag;
2842	}	2792	}
2843		2793
2844	// read the next octet
2845	unicode_t
2846	rxvt_term::next_octet ()
2847	{
2848	return cmdbuf_ptr < cmdbuf_endp
2849	? *cmdbuf_ptr++
2850	: NOCHAR;
2851	}
2852
2853	// read the next character	2794	// read the next character
2854	unicode_t	2795	wchar_t
2855	rxvt_term::next_char ()	2796	rxvt_term::next_char () NOTHROW
2856	{	2797	{
2857	while (cmdbuf_ptr < cmdbuf_endp)	2798	while (cmdbuf_ptr < cmdbuf_endp)
2858	{	2799	{
2859	// assume 7-bit to be ascii ALWAYS	2800	// assume 7-bit to be ascii ALWAYS
2860	if ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b)	2801	if ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b)
…		…
2869	cmdbuf_ptr = cmdbuf_endp;	2810	cmdbuf_ptr = cmdbuf_endp;
2870	break;	2811	break;
2871	}	2812	}
2872		2813
2873	if (len == (size_t)-1)	2814	if (len == (size_t)-1)
2874	return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through	2815	return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2875		2816
2876	// assume wchar == unicode	2817	// assume wchar == unicode
2877	cmdbuf_ptr += len;	2818	cmdbuf_ptr += len;
2878	return wc & UNICODE_MASK;	2819	return wc & UNICODE_MASK;
2879	}	2820	}
2880		2821
2881	return NOCHAR;	2822	return NOCHAR;
2882	}	2823	}
		2824
		2825	// read the next octet
		2826	uint32_t
		2827	rxvt_term::next_octet () NOTHROW
		2828	{
		2829	return cmdbuf_ptr < cmdbuf_endp
		2830	? (unsigned char)*cmdbuf_ptr++
		2831	: NOCHAR;
		2832	}
		2833
		2834	static class out_of_input out_of_input;
2883		2835
2884	/* rxvt_cmd_getc () - Return next input character */	2836	/* rxvt_cmd_getc () - Return next input character */
2885	/*	2837	/*
2886	* Return the next input character after first passing any keyboard input	2838	* Return the next input character after first passing any keyboard input
2887	* to the command.	2839	* to the command.
2888	*/	2840	*/
2889	unicode_t	2841	wchar_t
2890	rxvt_term::cmd_getc ()	2842	rxvt_term::cmd_getc () THROW ((class out_of_input))
2891	{	2843	{
2892	unicode_t c = next_char ();	2844	wchar_t c = next_char ();
2893		2845
2894	if (c == NOCHAR)	2846	if (c == NOCHAR)
2895	throw out_of_input;	2847	throw out_of_input;
2896		2848
2897	return c;	2849	return c;
2898	}	2850	}
2899		2851
2900	unicode_t	2852	uint32_t
2901	rxvt_term::cmd_get8 ()	2853	rxvt_term::cmd_get8 () THROW ((class out_of_input))
2902	{	2854	{
2903	unicode_t c = next_octet ();	2855	uint32_t c = next_octet ();
2904		2856
2905	if (c == NOCHAR)	2857	if (c == NOCHAR)
2906	throw out_of_input;	2858	throw out_of_input;
2907		2859
2908	return c;	2860	return c;
…		…
3175	break;	3127	break;
3176		3128
3177	/* 8.3.87: NEXT LINE */	3129	/* 8.3.87: NEXT LINE */
3178	case C1_NEL: /* ESC E */	3130	case C1_NEL: /* ESC E */
3179	{	3131	{
3180	unicode_t nlcr[] = { C0_LF, C0_CR };	3132	wchar_t nlcr[] = { C0_LF, C0_CR };
3181	scr_add_lines (nlcr, 1, 2);	3133	scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3182	}	3134	}
3183	break;	3135	break;
3184		3136
3185	/* kidnapped escape sequence: Should be 8.3.48 */	3137	/* kidnapped escape sequence: Should be 8.3.48 */
3186	case C1_ESA: /* ESC G */	3138	case C1_ESA: /* ESC G */
…		…
3327	ndef = get_byte_array_bit (csi_defaults, i);	3279	ndef = get_byte_array_bit (csi_defaults, i);
3328	for (p = 0; p < nargs; p++)	3280	for (p = 0; p < nargs; p++)
3329	if (arg[p] == -1)	3281	if (arg[p] == -1)
3330	arg[p] = ndef;	3282	arg[p] = ndef;
3331		3283
3332	#ifdef DEBUG_CMD
3333	fprintf (stderr, "CSI ");
3334	for (p = 0; p < nargs; p++)
3335	fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3336	fprintf (stderr, "%c\n", ch);
3337	#endif
3338
3339	/*	3284	/*
3340	* private mode handling	3285	* private mode handling
3341	*/	3286	*/
3342	if (priv)	3287	if (priv)
3343	{	3288	{
3344	switch (priv)	3289	switch (priv)
3345	{	3290	{
3346	case '>':	3291	case '>':
3347	if (ch == CSI_DA) /* secondary device attributes */	3292	if (ch == CSI_DA) /* secondary device attributes */
		3293	{
		3294	// first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
		3295	// 'U' for rxvt-unicode <= 7.2, and Mm85 (e.g. 7385 for 7.3) for later versions.
		3296	//
		3297	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
		3298	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
		3299	// that we do not support xterm mouse reporting (should be 95 when we do).
		3300	//
3348	tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);	3301	tt_printf ("\033[>%c%c85;94;0c", VERSION[0], VERSION[1]);
		3302	}
3349	break;	3303	break;
3350	case '?':	3304	case '?':
3351	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')	3305	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')
3352	process_terminal_mode (ch, priv, nargs, arg);	3306	process_terminal_mode (ch, priv, nargs, arg);
3353	break;	3307	break;
…		…
3785	* XTerm escape sequences: ESC ] Ps;Pt (ST\|BEL)	3739	* XTerm escape sequences: ESC ] Ps;Pt (ST\|BEL)
3786	*/	3740	*/
3787	void	3741	void
3788	rxvt_term::process_xterm_seq (int op, const char *str, char resp)	3742	rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3789	{	3743	{
3790	int changed = 0;
3791	int color;	3744	int color;
3792	char buf, name;	3745	char buf, name;
3793	bool query = str[0] == '?' && !str[1];	3746	bool query = str[0] == '?' && !str[1];
3794	int saveop = op;	3747	int saveop = op;
3795	dDisp;	3748	dDisp;
…		…
3850	{	3803	{
3851	if ((name = strchr (buf, ';')) == NULL)	3804	if ((name = strchr (buf, ';')) == NULL)
3852	break;	3805	break;
3853		3806
3854	*name++ = '\0';	3807	*name++ = '\0';
3855	color = atoi (buf);	3808	color = atoi (buf) + minCOLOR;
3856		3809
3857	if (color < 0 \|\| color >= TOTAL_COLORS)	3810	if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3858	break;	3811	break;
3859		3812
3860	if ((buf = strchr (name, ';')) != NULL)	3813	if ((buf = strchr (name, ';')) != NULL)
3861	*buf++ = '\0';	3814	*buf++ = '\0';
3862		3815
3863	if (name[0] == '?' && !name[1])	3816	if (name[0] == '?' && !name[1])
3864	{	3817	{
3865	unsigned short r, g, b;	3818	unsigned short r, g, b;
3866	pix_colors_focused[color + minCOLOR].get (display, r, g, b);	3819	pix_colors_focused[color].get (display, r, g, b);
3867	tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);	3820	tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3868	}	3821	}
3869	else	3822	else
3870	set_window_color (color + minCOLOR, name);	3823	set_window_color (color, name);
3871	}	3824	}
3872	break;	3825	break;
3873	case XTerm_Color00:	3826	case XTerm_Color00:
3874	process_color_seq (XTerm_Color00, Color_fg, str, resp);	3827	process_color_seq (XTerm_Color00, Color_fg, str, resp);
3875	break;	3828	break;
3876	case XTerm_Color01:	3829	case XTerm_Color01:
3877	process_color_seq (XTerm_Color00, Color_bg, str, resp);	3830	process_color_seq (XTerm_Color01, Color_bg, str, resp);
3878	break;	3831	break;
3879	#ifndef NO_CURSORCOLOR	3832	#ifndef NO_CURSORCOLOR
3880	case XTerm_Color_cursor:	3833	case XTerm_Color_cursor:
3881	process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);	3834	process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3882	break;	3835	break;
…		…
3886	break;	3839	break;
3887	case XTerm_Color_pointer_bg:	3840	case XTerm_Color_pointer_bg:
3888	process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);	3841	process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3889	break;	3842	break;
3890	#ifndef NO_BOLD_UNDERLINE_REVERSE	3843	#ifndef NO_BOLD_UNDERLINE_REVERSE
3891	case XTerm_Color_BD:
3892	process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3893	break;
3894	case XTerm_Color_UL:
3895	process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3896	break;
3897	case XTerm_Color_RV:	3844	case XTerm_Color_RV:
3898	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3845	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
		3846	break;
		3847	case Rxvt_Color_BD:
		3848	case URxvt_Color_BD:
		3849	process_color_seq (op, Color_BD, str, resp);
		3850	break;
		3851	case Rxvt_Color_UL:
		3852	case URxvt_Color_UL:
		3853	process_color_seq (op, Color_UL, str, resp);
3899	break;	3854	break;
3900	case URxvt_Color_IT:	3855	case URxvt_Color_IT:
3901	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);	3856	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3902	break;	3857	break;
3903	#endif	3858	#endif
…		…
3908	if (am_transparent)	3863	if (am_transparent)
3909	want_full_refresh = want_refresh = 1;	3864	want_full_refresh = want_refresh = 1;
3910	break;	3865	break;
3911	#endif	3866	#endif
3912		3867
3913	case XTerm_Pixmap:	3868	case Rxvt_Pixmap:
		3869	{
3914	if (*str != ';')	3870	if (*str != ';')
3915	{	3871	{
3916	#if XPM_BACKGROUND	3872	#if XPM_BACKGROUND
3917	scale_pixmap (""); /* reset to default scaling */	3873	scale_pixmap (""); /* reset to default scaling */
3918	set_bgPixmap (str); /* change pixmap */	3874	set_bgPixmap (str); /* change pixmap */
3919	#endif
3920	scr_touch (true);	3875	scr_touch (true);
		3876	#endif
3921	}	3877	}
		3878
		3879	int changed = 0;
		3880
3922	while ((str = strchr (str, ';')) != NULL)	3881	while ((str = strchr (str, ';')) != NULL)
3923	{	3882	{
3924	str++;	3883	str++;
3925	#if XPM_BACKGROUND	3884	#if XPM_BACKGROUND
3926	changed += scale_pixmap (str);	3885	changed += scale_pixmap (str);
3927	#endif	3886	#endif
3928	}	3887	}
3929		3888
3930	if (changed)	3889	if (changed)
3931	{	3890	{
3932	#ifdef XPM_BACKGROUND	3891	#ifdef XPM_BACKGROUND
3933	resize_pixmap ();	3892	resize_pixmap ();
3934	#endif
3935	scr_touch (true);	3893	scr_touch (true);
		3894	#endif
3936	}	3895	}
		3896	}
3937	break;	3897	break;
3938		3898
3939	case XTerm_restoreFG:	3899	case Rxvt_restoreFG:
3940	set_window_color (Color_fg, str);	3900	set_window_color (Color_fg, str);
3941	break;	3901	break;
3942	case XTerm_restoreBG:	3902	case Rxvt_restoreBG:
3943	set_window_color (Color_bg, str);	3903	set_window_color (Color_bg, str);
3944	break;	3904	break;
3945		3905
3946	case XTerm_logfile:	3906	case XTerm_logfile:
3947	// TODO, when secure mode?	3907	// TODO, when secure mode?
3948	break;	3908	break;
3949		3909
3950	#ifdef MENUBAR
3951	case URxvt_Menu:
3952	if (OPTION (Opt_insecure))
3953	menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3954	break;
3955	#endif
3956	#if 0	3910	#if 0
3957	case XTerm_dumpscreen: /* no error notices */	3911	case Rxvt_dumpscreen: /* no error notices */
3958	{	3912	{
3959	int fd;	3913	int fd;
3960	if ((fd = open (str, O_RDWR \| O_CREAT \| O_EXCL, 0600)) >= 0)	3914	if ((fd = open (str, O_RDWR \| O_CREAT \| O_EXCL, 0600)) >= 0)
3961	{	3915	{
3962	scr_dump (fd);	3916	scr_dump (fd);
…		…
3993	if (query)	3947	if (query)
3994	tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);	3948	tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3995	else	3949	else
3996	{	3950	{
3997	set_locale (str);	3951	set_locale (str);
3998	pty.set_utf8_mode (enc_utf8);	3952	pty->set_utf8_mode (enc_utf8);
3999	init_xlocale ();	3953	init_xlocale ();
4000	}	3954	}
4001	break;	3955	break;
4002		3956
4003	case URxvt_view_up:	3957	case URxvt_view_up:
…		…
4014	break;	3968	break;
4015	#endif	3969	#endif
4016		3970
4017	#if ENABLE_PERL	3971	#if ENABLE_PERL
4018	case URxvt_perl:	3972	case URxvt_perl:
4019	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END)))	3973	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
4020	; // no responses yet	3974	; // no responses yet
4021	break;	3975	break;
4022	#endif	3976	#endif
4023	}	3977	}
4024	}	3978	}
…		…
4056	return state;	4010	return state;
4057	}	4011	}
4058		4012
4059	/* we're not using priv _yet_ */	4013	/* we're not using priv _yet_ */
4060	void	4014	void
4061	rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)	4015	rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4062	{	4016	{
4063	unsigned int i, j;	4017	unsigned int i, j;
4064	int state;	4018	int state;
4065		4019
4066	static const struct	4020	static const struct
…		…
4077	{ 5, PrivMode_rVideo },	4031	{ 5, PrivMode_rVideo },
4078	{ 6, PrivMode_relOrigin },	4032	{ 6, PrivMode_relOrigin },
4079	{ 7, PrivMode_Autowrap },	4033	{ 7, PrivMode_Autowrap },
4080	// 8, bi-directional support mode	4034	// 8, bi-directional support mode
4081	{ 9, PrivMode_MouseX10 },	4035	{ 9, PrivMode_MouseX10 },
4082	#ifdef menuBar_esc
4083	{ menuBar_esc, PrivMode_menuBar },
4084	#endif
4085	// 18, 19 printing-related	4036	// 18, 19 printing-related
4086	{ 25, PrivMode_VisibleCursor },	4037	{ 25, PrivMode_VisibleCursor },
4087	#ifdef scrollBar_esc	4038	#ifdef scrollBar_esc
4088	{ scrollBar_esc, PrivMode_scrollBar },	4039	{ scrollBar_esc, PrivMode_scrollBar },
4089	#endif	4040	#endif
…		…
4136	/* extra handling for values with state unkept */	4087	/* extra handling for values with state unkept */
4137	switch (arg[i])	4088	switch (arg[i])
4138	{	4089	{
4139	#if ENABLE_STYLES	4090	#if ENABLE_STYLES
4140	case 1021:	4091	case 1021:
4141	if (mode)	4092	set_option (Opt_intensityStyles, mode);
4142	SET_OPTION (Opt_intensityStyles);
4143	else
4144	CLR_OPTION (Opt_intensityStyles);
4145		4093
4146	scr_touch (true);	4094	scr_touch (true);
4147	break;	4095	break;
4148	#endif	4096	#endif
4149	case 1048: /* alternative cursor save */	4097	case 1048: /* alternative cursor save */
…		…
4171	case 3: /* 80/132 */	4119	case 3: /* 80/132 */
4172	if (priv_modes & PrivMode_132OK)	4120	if (priv_modes & PrivMode_132OK)
4173	set_widthheight (((state ? 132 : 80) * fwidth), height);	4121	set_widthheight (((state ? 132 : 80) * fwidth), height);
4174	break;	4122	break;
4175	case 4: /* smooth scrolling */	4123	case 4: /* smooth scrolling */
4176	if (!state)	4124	set_option (Opt_jumpScroll, !state);
4177	SET_OPTION (Opt_jumpScroll);
4178	else
4179	CLR_OPTION (Opt_jumpScroll);
4180	break;	4125	break;
4181	case 5: /* reverse video */	4126	case 5: /* reverse video */
4182	scr_rvideo_mode (state);	4127	scr_rvideo_mode (state);
4183	break;	4128	break;
4184	case 6: /* relative/absolute origins */	4129	case 6: /* relative/absolute origins */
…		…
4190	/* case 8: - auto repeat, can't do on a per window basis */	4135	/* case 8: - auto repeat, can't do on a per window basis */
4191	case 9: /* X10 mouse reporting */	4136	case 9: /* X10 mouse reporting */
4192	if (state) /* orthogonal */	4137	if (state) /* orthogonal */
4193	priv_modes &= ~PrivMode_MouseX11;	4138	priv_modes &= ~PrivMode_MouseX11;
4194	break;	4139	break;
4195	#ifdef menuBar_esc
4196	case menuBar_esc:
4197	#ifdef MENUBAR
4198	map_menuBar (state);
4199	#endif
4200	break;
4201	#endif
4202	#ifdef scrollBar_esc	4140	#ifdef scrollBar_esc
4203	case scrollBar_esc:	4141	case scrollBar_esc:
4204	if (scrollbar_mapping (state))	4142	if (scrollbar_mapping (state))
4205	{	4143	{
4206	resize_all_windows (0, 0, 0);	4144	resize_all_windows (0, 0, 0);
…		…
4225	#if 0	4163	#if 0
4226	case 1001:	4164	case 1001:
4227	break; /* X11 mouse highlighting */	4165	break; /* X11 mouse highlighting */
4228	#endif	4166	#endif
4229	case 1010: /* scroll to bottom on TTY output inhibit */	4167	case 1010: /* scroll to bottom on TTY output inhibit */
4230	if (!state)	4168	set_option (Opt_scrollTtyOutput, !state);
4231	SET_OPTION (Opt_scrollTtyOutput);
4232	else
4233	CLR_OPTION (Opt_scrollTtyOutput);
4234	break;	4169	break;
4235	case 1011: /* scroll to bottom on key press */	4170	case 1011: /* scroll to bottom on key press */
4236	if (state)	4171	set_option (Opt_scrollTtyKeypress, state);
4237	SET_OPTION (Opt_scrollTtyKeypress);
4238	else
4239	CLR_OPTION (Opt_scrollTtyKeypress);
4240	break;	4172	break;
4241	case 1047: /* secondary screen w/ clearing last */	4173	case 1047: /* secondary screen w/ clearing last */
4242	if (OPTION (Opt_secondaryScreen))	4174	if (OPTION (Opt_secondaryScreen))
4243	if (current_screen != PRIMARY)	4175	if (current_screen != PRIMARY)
4244	scr_erase_screen (2);	4176	scr_erase_screen (2);
…		…
4454	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT	4386	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4455		4387
4456	void	4388	void
4457	rxvt_term::tt_write (const char *data, unsigned int len)	4389	rxvt_term::tt_write (const char *data, unsigned int len)
4458	{	4390	{
		4391	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
		4392	return;
		4393
		4394	if (pty->pty < 0)
		4395	return;
		4396
4459	if (v_buflen == 0)	4397	if (v_buflen == 0)
4460	{	4398	{
4461	ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));	4399	ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4462		4400
4463	if ((unsigned int)written == len)	4401	if ((unsigned int)written == len)
4464	return;	4402	return;
4465		4403
4466	data += written;	4404	data += written;
…		…
4475	pty_ev.set (EVENT_READ \| EVENT_WRITE);	4413	pty_ev.set (EVENT_READ \| EVENT_WRITE);
4476	}	4414	}
4477		4415
4478	void rxvt_term::pty_write ()	4416	void rxvt_term::pty_write ()
4479	{	4417	{
4480	int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));	4418	int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4481		4419
4482	if (written > 0)	4420	if (written > 0)
4483	{	4421	{
4484	v_buflen -= written;	4422	v_buflen -= written;
4485		4423

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.237 by root, Fri Jan 6 01:16:58 2006 UTC vs. Revision 1.283 by root, Tue Jan 24 19:40:12 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.237 by root, Fri Jan 6 01:16:58 2006 UTC vs.
Revision 1.283 by root, Tue Jan 24 19:40:12 2006 UTC