ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/rxvt-unicode/src/command.C

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.261 by root, Fri Jan 13 15:42:50 2006 UTC vs.
Revision 1.312 by root, Sat Mar 4 22:05:05 2006 UTC

1	/*--------------------------------*-C-*---------------------------------*	1	/*----------------------------------------------------------------------*
2	* File: command.C	2	* File: command.C
3	*----------------------------------------------------------------------*	3	*----------------------------------------------------------------------*
4	*	4	*
5	* All portions of code are copyright by their respective author/s.	5	* All portions of code are copyright by their respective author/s.
6	* Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>	6	* Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
…		…
49	#include "rxvt.h"	49	#include "rxvt.h"
50	#include "rxvtperl.h"	50	#include "rxvtperl.h"
51	#include "version.h"	51	#include "version.h"
52	#include "command.h"	52	#include "command.h"
53		53
54	#if HAVE_SCHED_YIELD
55	#undef HAVE_SCHED_YIELD // disabled for the time being
56	//# include <sched.h>
57	#endif
58
59	#ifdef KEYSYM_RESOURCE	54	#ifdef KEYSYM_RESOURCE
60	# include "keyboard.h"	55	# include "keyboard.h"
61	#endif	56	#endif
62		57
63	#include <csignal>	58	#include <csignal>
64		59
		60	#if LINUX_YIELD_HACK
		61	# include <ctime>
		62	#endif
		63
65	/*----------------------------------------------------------------------*/	64	/*----------------------------------------------------------------------*/
66		65
67	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)	66	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68
69	// exception thrown when the command parser runs out of input data
70	class out_of_input { } out_of_input;
71		67
72	#if ENABLE_FRILLS || ISO_14755	68	#if ENABLE_FRILLS || ISO_14755
73		69
74	#define ISO_14755_STARTED 0x80000000UL	70	#define ISO_14755_STARTED 0x80000000UL
75	#define ISO_14755_51 0x40000000UL // basic (section 5.1)	71	#define ISO_14755_51 0x40000000UL // basic (section 5.1)
…		…
147	|| !IN_RANGE_EXC (y, 0, nrow))	143	|| !IN_RANGE_EXC (y, 0, nrow))
148	return;	144	return;
149		145
150	for (;;)	146	for (;;)
151	{	147	{
152	const line_t &l = ROW(y - view_start);	148	const line_t &l = ROW(y + view_start);
153		149
154	text_t t = l.t[x];	150	text_t t = l.t[x];
155		151
156	if (t != NOCHAR || !x)	152	if (t != NOCHAR || !x)
157	{	153	{
…		…
230	# if !UNICODE3	226	# if !UNICODE3
231	if (ch >= 0x10000)	227	if (ch >= 0x10000)
232	ch = 0xfffd;	228	ch = 0xfffd;
233	# endif	229	# endif
234	scr_overlay_set (11, y, ch, r);	230	scr_overlay_set (11, y, ch, r);
		231
		232	if (WCWIDTH (ch) >= 2)
235	scr_overlay_set (12, y, NOCHAR, r);	233	scr_overlay_set (12, y, NOCHAR, r);
236	}	234	}
237		235
		236	// {
		237	// char buf[4+4+3+1];
		238	// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
		239	// scr_overlay_set (0, 0, buf);
		240	// }
238	scr_overlay_set (0, len , attr);	241	scr_overlay_set (0, len , attr);
239	scr_overlay_set (0, len + 1, fname);	242	scr_overlay_set (0, len + 1, fname);
240		243
241	free (fname);	244	free (fname);
242		245
…		…
295		298
296	return -1;	299	return -1;
297	}	300	}
298	#endif	301	#endif
299		302
300	/*{{{ Convert the keypress event into a string */
301	void	303	void
302	rxvt_term::lookup_key (XKeyEvent &ev)	304	rxvt_term::key_press (XKeyEvent &ev)
303	{	305	{
304	int ctrl, meta, shft, len;	306	int ctrl, meta, shft, len;
305	unsigned int newlen;	307	unsigned int newlen;
306	KeySym keysym;	308	KeySym keysym;
307	#ifdef DEBUG_CMD
308	static int debug_key = 1; /* accessible by a debugger only */
309	#endif
310	int valid_keysym;	309	int valid_keysym;
311	char kbuf[KBUFSZ];	310	char kbuf[KBUFSZ];
		311
		312	#if ISO_14755
		313	if (iso14755buf & ISO_14755_52)
		314	return;
		315	#endif
312		316
313	/*	317	/*
314	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an	318	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
315	* escape sequence to toggle the Keypad.	319	* escape sequence to toggle the Keypad.
316	*	320	*
…		…
443	scr_move_to (0, 1);	447	scr_move_to (0, 1);
444	return;	448	return;
445	}	449	}
446	else if (keysym == XK_End)	450	else if (keysym == XK_End)
447	{	451	{
448	scr_move_to (1, 0);	452	scr_move_to (1, 1);
449	return;	453	return;
450	}	454	}
451	}	455	}
452	#endif	456	#endif
453	}	457	}
…		…
464	{	468	{
465	switch (keysym)	469	switch (keysym)
466	{	470	{
467	/* normal XTerm key bindings */	471	/* normal XTerm key bindings */
468	case XK_Insert: /* Shift+Insert = paste mouse selection */	472	case XK_Insert: /* Shift+Insert = paste mouse selection */
469	selection_request (ev.time, 0, 0);	473	selection_request (ev.time);
470	return;	474	return;
471	#if TODO	475	#if TODO
472	/* rxvt extras */	476	/* rxvt extras */
473	case XK_KP_Add: /* Shift+KP_Add = bigger font */	477	case XK_KP_Add: /* Shift+KP_Add = bigger font */
474	change_font (FONT_UP);	478	change_font (FONT_UP);
…		…
905	{	909	{
906	const char ch = C0_ESC;	910	const char ch = C0_ESC;
907	tt_write (&ch, 1);	911	tt_write (&ch, 1);
908	}	912	}
909		913
910	#if defined(DEBUG_CMD)
911	/* Display keyboard buffer contents */
912	unsigned char *p;
913	int i;
914
915	fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
916	for (i = 0, p = kbuf; i < len; i++, p++)
917	fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
918	fprintf (stderr, "'\n");
919	#endif /* DEBUG_CMD */
920	tt_write (kbuf, (unsigned int)len);	914	tt_write (kbuf, (unsigned int)len);
921	}	915	}
922	/*}}} */
923		916
		917	void
		918	rxvt_term::key_release (XKeyEvent &ev)
		919	{
		920	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
		921	KeySym keysym;
		922
		923	keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
		924	#endif
		925
		926	#if ENABLE_FRILLS || ISO_14755
		927	// ISO 14755 support
		928	if (iso14755buf)
		929	if (iso14755buf & ISO_14755_52)
		930	{
		931	# if ENABLE_OVERLAY
		932	scr_overlay_off ();
		933	# endif
		934	# if ISO_14755
		935	// iso14755 part 5.2 handling: release time
		936	// first: controls
		937	if ((ev.state & ControlMask)
		938	&& ((keysym >= 0x40 && keysym <= 0x5f)
		939	|| (keysym >= 0x61 && keysym <= 0x7f)))
		940	{
		941	iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
		942	commit_iso14755 ();
		943
		944	return;
		945	}
		946
		947	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
		948	if (i[0] == keysym)
		949	{
		950	iso14755buf = ISO_14755_51 | i[1];
		951	commit_iso14755 ();
		952
		953	return;
		954	}
		955
		956	scr_bell ();
		957	# endif
		958	iso14755buf = 0;
		959
		960	return;
		961	}
		962	else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
		963	{
		964	# if ENABLE_OVERLAY
		965	scr_overlay_off ();
		966	# endif
		967	if (iso14755buf & ISO_14755_51)
		968	commit_iso14755 ();
		969	#if ISO_14755
		970	else if (iso14755buf & ISO_14755_STARTED)
		971	{
		972	iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
		973
		974	scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
		975	scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
		976	}
		977	# endif
		978	else
		979	iso14755buf = 0;
		980	}
		981	#endif
		982
		983	if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
		984	return;
		985
		986	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
		987	if (!(ev.state & ControlMask))
		988	slip_wheel_ev.stop ();
		989	else if (keysym == XK_Control_L || keysym == XK_Control_R)
		990	mouse_slip_wheel_speed = 0;
		991	#endif
		992	}
		993
924	#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)	994	#if defined (KEYSYM_RESOURCE)
925	/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
926	/* attempt to `write' count to the input buffer */
927	unsigned int	995	unsigned int
928	rxvt_term::cmd_write (const char *str, unsigned int count)	996	rxvt_term::cmd_write (const char *str, unsigned int count)
929	{	997	{
930	unsigned int n, s;	998	unsigned int n, s;
931		999
…		…
972		1040
973	if (want_refresh)	1041	if (want_refresh)
974	{	1042	{
975	if (SHOULD_INVOKE (HOOK_LINE_UPDATE))	1043	if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
976	{	1044	{
977	int row = -view_start;	1045	int row = view_start;
978	int end_row = row + nrow;	1046	int end_row = row + nrow;
979		1047
980	while (row > -nsaved && ROW (row - 1).is_longer ())	1048	while (row > top_row && ROW (row - 1).is_longer ())
981	--row;	1049	--row;
982		1050
983	do	1051	do
984	{	1052	{
985	int start_row = row;	1053	int start_row = row;
…		…
1008	while (l->is_longer () && row < end_row);	1076	while (l->is_longer () && row < end_row);
1009	}	1077	}
1010	while (row < end_row);	1078	while (row < end_row);
1011	}	1079	}
1012		1080
1013	scr_refresh (refresh_type);	1081	scr_refresh ();
1014	scrollbar_show (1);	1082	scrollbar_show (1);
1015	#ifdef USE_XIM	1083	#ifdef USE_XIM
1016	IMSendSpot ();	1084	IMSendSpot ();
1017	#endif	1085	#endif
1018	}	1086	}
…		…
1021	}	1089	}
1022		1090
1023	void	1091	void
1024	rxvt_term::check_cb (check_watcher &w)	1092	rxvt_term::check_cb (check_watcher &w)
1025	{	1093	{
1026	SET_R (this);	1094	make_current ();
1027	SET_LOCALE (locale);
1028		1095
1029	display->flush ();	1096	display->flush ();
1030		1097
1031	if (want_refresh && !flush_ev.active)	1098	if (want_refresh && !flush_ev.active)
1032	flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally	1099	flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1033	}	1100	}
1034		1101
1035	void	1102	void
1036	rxvt_term::flush_cb (time_watcher &w)	1103	rxvt_term::flush_cb (time_watcher &w)
1037	{	1104	{
1038	SET_R (this);	1105	make_current ();
1039	SET_LOCALE (locale);
1040		1106
1041	refresh_limit = 1;	1107	refresh_limit = 1;
1042	refresh_count = 0;	1108	refresh_count = 0;
1043	flush ();	1109	flush ();
1044	}	1110	}
…		…
1048	rxvt_term::cursor_blink_cb (time_watcher &w)	1114	rxvt_term::cursor_blink_cb (time_watcher &w)
1049	{	1115	{
1050	hidden_cursor = !hidden_cursor;	1116	hidden_cursor = !hidden_cursor;
1051	want_refresh = 1;	1117	want_refresh = 1;
1052		1118
1053	w.start (w.at + BLINK_INTERVAL);	1119	w.start (w.at + CURSOR_BLINK_INTERVAL);
1054	}	1120	}
1055	#endif	1121	#endif
1056		1122
1057	#ifdef TEXT_BLINK	1123	#ifdef TEXT_BLINK
1058	void	1124	void
…		…
1072	rxvt_term::cont_scroll_cb (time_watcher &w)	1138	rxvt_term::cont_scroll_cb (time_watcher &w)
1073	{	1139	{
1074	if ((scrollbar_isUp() || scrollbar_isDn()) &&	1140	if ((scrollbar_isUp() || scrollbar_isDn()) &&
1075	scr_page (scrollbar_isUp() ? UP : DN, 1))	1141	scr_page (scrollbar_isUp() ? UP : DN, 1))
1076	{	1142	{
1077	refresh_type |= SMOOTH_REFRESH;
1078	want_refresh = 1;	1143	want_refresh = 1;
1079	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1144	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1080	}	1145	}
1081	}	1146	}
1082	#endif	1147	#endif
…		…
1086	rxvt_term::sel_scroll_cb (time_watcher &w)	1151	rxvt_term::sel_scroll_cb (time_watcher &w)
1087	{	1152	{
1088	if (scr_page (scroll_selection_dir, scroll_selection_lines))	1153	if (scr_page (scroll_selection_dir, scroll_selection_lines))
1089	{	1154	{
1090	selection_extend (selection_save_x, selection_save_y, selection_save_state);	1155	selection_extend (selection_save_x, selection_save_y, selection_save_state);
1091	refresh_type |= SMOOTH_REFRESH;
1092	want_refresh = 1;	1156	want_refresh = 1;
1093	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1157	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1094	}	1158	}
1095	}	1159	}
1096	#endif	1160	#endif
…		…
1101	{	1165	{
1102	if (mouse_slip_wheel_speed == 0	1166	if (mouse_slip_wheel_speed == 0
1103	|| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)	1167	|| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1104	: scr_page (UP, mouse_slip_wheel_speed))	1168	: scr_page (UP, mouse_slip_wheel_speed))
1105	{	1169	{
1106	if (view_start == nsaved ||	1170	if (view_start == top_row || view_start == 0)
1107	view_start == 0)
1108	mouse_slip_wheel_speed = 0;	1171	mouse_slip_wheel_speed = 0;
1109		1172
1110	refresh_type |= SMOOTH_REFRESH;
1111	want_refresh = 1;	1173	want_refresh = 1;
1112	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1174	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1113	}	1175	}
1114	}	1176	}
1115	#endif	1177	#endif
1116		1178
1117	#if HAVE_SCHED_YIELD	1179	#if LINUX_YIELD_HACK
1118	static struct event_handler	1180	static struct event_handler
1119	{	1181	{
1120	check_watcher cw_yield;	1182	check_watcher yield_ev;
1121		1183
1122	void yield (check_watcher &w)	1184	void yield_cb (check_watcher &w)
1123	{	1185	{
1124	sched_yield ();	1186	// this should really be sched_yield(), but the linux guys thought
		1187	// that giving a process calling sched_yield () less cpu time than
		1188	// ones with high nice levels is a useful thing to do. It surely is is
		1189	// allowed by the sus... as is returning ENOSYS.
		1190
		1191	struct timespec ts = { 0, 0 };
		1192	nanosleep (&ts, 0);
		1193
1125	w.stop ();	1194	w.stop ();
1126	}	1195	}
1127		1196
1128	event_handler ()	1197	event_handler ()
1129	: cw_yield (this, &event_handler::yield)	1198	: yield_ev (this, &event_handler::yield_cb)
1130	{	1199	{
1131	}	1200	}
1132	} event_handler;	1201	} event_handler;
1133	#endif	1202	#endif
1134		1203
…		…
1145		1214
1146	memmove (cmdbuf_base, cmdbuf_ptr, n);	1215	memmove (cmdbuf_base, cmdbuf_ptr, n);
1147	cmdbuf_ptr = cmdbuf_base;	1216	cmdbuf_ptr = cmdbuf_base;
1148	cmdbuf_endp = cmdbuf_ptr + n;	1217	cmdbuf_endp = cmdbuf_ptr + n;
1149		1218
1150	ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);	1219	ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1151		1220
1152	if (r > 0)	1221	if (r > 0)
1153	{	1222	{
1154	cmdbuf_endp += r;	1223	cmdbuf_endp += r;
1155	return true;	1224	return true;
1156	}	1225	}
1157	else if (r < 0 && (errno == EAGAIN || errno == EINTR))	1226	else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1158	{	1227	{
1159	#if HAVE_SCHED_YIELD	1228	#if LINUX_YIELD_HACK
1160	if (display->is_local)	1229	if (display->is_local)
1161	event_handler.cw_yield.start ();	1230	event_handler.yield_ev.start ();
1162	#endif	1231	#endif
1163	}	1232	}
1164	else	1233	else
1165	{	1234	{
1166	pty_ev.stop ();	1235	pty_ev.stop ();
…		…
1173	}	1242	}
1174		1243
1175	void	1244	void
1176	rxvt_term::pty_cb (io_watcher &w, short revents)	1245	rxvt_term::pty_cb (io_watcher &w, short revents)
1177	{	1246	{
1178	SET_R (this);	1247	make_current ();
1179	SET_LOCALE (locale);
1180		1248
1181	if (revents & EVENT_READ)	1249	if (revents & EVENT_READ)
1182	// loop, but don't allow a single term to monopolize us	1250	// loop, but don't allow a single term to monopolize us
1183	while (pty_fill ())	1251	while (pty_fill ())
1184	if (cmd_parse ())	1252	if (cmd_parse ())
…		…
1189	}	1257	}
1190		1258
1191	void	1259	void
1192	rxvt_term::pointer_unblank ()	1260	rxvt_term::pointer_unblank ()
1193	{	1261	{
1194	XDefineCursor (display->display, vt, TermWin_cursor);	1262	XDefineCursor (dpy, vt, TermWin_cursor);
1195	recolour_cursor ();	1263	recolour_cursor ();
1196		1264
1197	#ifdef POINTER_BLANK	1265	#ifdef POINTER_BLANK
1198	hidden_pointer = 0;	1266	hidden_pointer = 0;
1199		1267
…		…
1207	rxvt_term::pointer_blank ()	1275	rxvt_term::pointer_blank ()
1208	{	1276	{
1209	if (!OPTION (Opt_pointerBlank))	1277	if (!OPTION (Opt_pointerBlank))
1210	return;	1278	return;
1211		1279
1212	XDefineCursor (display->display, vt, display->blank_cursor);	1280	XDefineCursor (dpy, vt, display->blank_cursor);
1213	XFlush (display->display);	1281	XFlush (dpy);
1214		1282
1215	hidden_pointer = 1;	1283	hidden_pointer = 1;
1216	}	1284	}
1217		1285
1218	void	1286	void
1219	rxvt_term::pointer_cb (time_watcher &w)	1287	rxvt_term::pointer_cb (time_watcher &w)
1220	{	1288	{
1221	SET_R (this);	1289	make_current ();
1222	SET_LOCALE (locale);
1223		1290
1224	pointer_blank ();	1291	pointer_blank ();
1225	}	1292	}
1226	#endif	1293	#endif
1227		1294
…		…
1292	(32 + button_number + key_state),	1359	(32 + button_number + key_state),
1293	(32 + x + 1),	1360	(32 + x + 1),
1294	(32 + y + 1));	1361	(32 + y + 1));
1295	}	1362	}
1296		1363
1297	#ifdef USING_W11LIB
1298	void
1299	rxvt_W11_process_x_event (XEvent *ev)
1300	{
1301	rxvt_t *r = rxvt_get_r ();
1302
1303	x_cb (*ev);
1304	}
1305	#endif
1306
1307	/*{{{ process an X event */	1364	/*{{{ process an X event */
1308	void	1365	void
1309	rxvt_term::x_cb (XEvent &ev)	1366	rxvt_term::x_cb (XEvent &ev)
1310	{	1367	{
1311	dDisp;	1368	make_current ();
1312		1369
1313	SET_R (this);	1370	dLocal (Display *, dpy);
1314	SET_LOCALE (locale);
1315		1371
1316	if (ev.xany.window == vt	1372	if (ev.xany.window == vt
		1373	&& SHOULD_INVOKE (HOOK_X_EVENT)
1317	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))	1374	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1318	return;	1375	return;
1319		1376
1320	// for XQueryPointer	1377	// for XQueryPointer
1321	Window unused_root, unused_child;	1378	Window unused_root, unused_child;
…		…
1323	unsigned int unused_mask;	1380	unsigned int unused_mask;
1324		1381
1325	switch (ev.type)	1382	switch (ev.type)
1326	{	1383	{
1327	case KeyPress:	1384	case KeyPress:
1328	#if ISO_14755	1385	key_press (ev.xkey);
1329	if (!(iso14755buf & ISO_14755_52))
1330	#endif
1331	lookup_key (ev.xkey);
1332
1333	break;	1386	break;
1334		1387
1335	case KeyRelease:	1388	case KeyRelease:
1336	{	1389	key_release (ev.xkey);
1337	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1338	KeySym keysym;
1339
1340	keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1341	#endif
1342
1343	#if ENABLE_FRILLS || ISO_14755
1344	// ISO 14755 support
1345	if (iso14755buf)
1346	if (iso14755buf & ISO_14755_52)
1347	{
1348	# if ENABLE_OVERLAY
1349	scr_overlay_off ();
1350	# endif
1351	# if ISO_14755
1352	// iso14755 part 5.2 handling: release time
1353	// first: controls
1354	if ((ev.xkey.state & ControlMask)
1355	&& ((keysym >= 0x40 && keysym <= 0x5f)
1356	|| (keysym >= 0x61 && keysym <= 0x7f)))
1357	{
1358	iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1359	commit_iso14755 ();
1360	goto skip_switch;
1361	}
1362
1363	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1364	if (i[0] == keysym)
1365	{
1366	iso14755buf = ISO_14755_51 | i[1];
1367	commit_iso14755 ();
1368	goto skip_switch;
1369	}
1370
1371	scr_bell ();
1372	# endif
1373	iso14755buf = 0;
1374	break;
1375	}
1376	else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1377	{
1378	# if ENABLE_OVERLAY
1379	scr_overlay_off ();
1380	# endif
1381	if (iso14755buf & ISO_14755_51)
1382	commit_iso14755 ();
1383	#if ISO_14755
1384	else if (iso14755buf & ISO_14755_STARTED)
1385	{
1386	iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1387
1388	scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1389	scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1390	}
1391	# endif
1392	else
1393	iso14755buf = 0;
1394	}
1395	#endif
1396
1397	if (ev.xany.window == vt
1398	&& HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1399	break;
1400
1401	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1402	if (!(ev.xkey.state & ControlMask))
1403	slip_wheel_ev.stop ();
1404	else if (keysym == XK_Control_L || keysym == XK_Control_R)
1405	mouse_slip_wheel_speed = 0;
1406	#endif
1407	break;	1390	break;
1408	}
1409		1391
1410	case ButtonPress:	1392	case ButtonPress:
1411	button_press (ev.xbutton);	1393	button_press (ev.xbutton);
1412	break;	1394	break;
1413		1395
…		…
1415	button_release (ev.xbutton);	1397	button_release (ev.xbutton);
1416	break;	1398	break;
1417		1399
1418	case ClientMessage:	1400	case ClientMessage:
1419	if (ev.xclient.format == 32	1401	if (ev.xclient.format == 32
1420	&& ev.xclient.message_type == xa[XA_WM_PROTOCOLS])	1402	&& !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1421	{	1403	{
		1404	if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
		1405	{
		1406	if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
		1407	{
1422	if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])	1408	if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
		1409	{
		1410	if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1423	destroy ();	1411	destroy ();
		1412	}
1424	#if ENABLE_EWMH	1413	#if ENABLE_EWMH
1425	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])	1414	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1426	XSendEvent (disp, ev.xclient.window = display->root,	1415	XSendEvent (dpy, ev.xclient.window = display->root,
1427	False, SubstructureRedirectMask | SubstructureNotifyMask,	1416	False, SubstructureRedirectMask | SubstructureNotifyMask,
1428	&ev);	1417	&ev);
		1418	#endif
		1419	}
		1420	}
		1421	#if ENABLE_XEMBED
		1422	else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
		1423	{
		1424	if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
		1425	focus_in ();
		1426	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
		1427	focus_out ();
		1428	}
1429	#endif	1429	#endif
1430	}	1430	}
1431	#if ENABLE_XEMBED
1432	else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1433	{
1434	if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1435	focus_in ();
1436	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1437	focus_out ();
1438	}
1439	#endif
1440	#ifdef OFFIX_DND
1441	/* OffiX Dnd (drag 'n' drop) protocol */
1442	else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1443	&& (ev.xclient.data.l[0] == DndFile
1444	|| ev.xclient.data.l[0] == DndDir
1445	|| ev.xclient.data.l[0] == DndLink))
1446	{
1447	/* Get Dnd data */
1448	Atom ActualType;
1449	int ActualFormat;
1450	unsigned char *data;
1451	unsigned long Size, RemainingBytes;
1452
1453	XGetWindowProperty (disp, display->root,
1454	xa[XA_DNDSELECTION],
1455	0L, 1000000L,
1456	False, AnyPropertyType,
1457	&ActualType, &ActualFormat,
1458	&Size, &RemainingBytes,
1459	&data);
1460	set_string_property (XA_CUT_BUFFER0, data);
1461	XFree (data);
1462	selection_paste (display->root, XA_CUT_BUFFER0, true);
1463	XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1464	}
1465	#endif /* OFFIX_DND */
1466	break;	1431	break;
1467		1432
1468	case MappingNotify:	1433	case MappingNotify:
1469	XRefreshKeyboardMapping (&ev.xmapping);	1434	XRefreshKeyboardMapping (&ev.xmapping);
1470	break;	1435	break;
…		…
1503	break;	1468	break;
1504		1469
1505	case ConfigureNotify:	1470	case ConfigureNotify:
1506	if (ev.xconfigure.window == parent[0])	1471	if (ev.xconfigure.window == parent[0])
1507	{	1472	{
1508	while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))	1473	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1509	;	1474	;
1510		1475
1511	if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)	1476	if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1512	{	1477	{
1513	seen_resize = 1;	1478	seen_resize = 1;
1514	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1479	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1515	}	1480	}
1516		1481
		1482	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
		1483
1517	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */	1484	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1518	if (OPTION (Opt_transparent))	1485	if (OPTION (Opt_transparent))
1519	check_our_parents ();	1486	check_our_parents ();
1520	#endif	1487	#endif
1521	}	1488	}
1522	break;	1489	break;
1523		1490
1524	case PropertyNotify:	1491	case PropertyNotify:
		1492	if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1525	if (ev.xproperty.atom == xa[XA_VT_SELECTION]	1493	if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1526	&& ev.xproperty.state == PropertyNewValue)	1494	&& ev.xproperty.state == PropertyNewValue)
1527	selection_property (ev.xproperty.window, ev.xproperty.atom);	1495	selection_property (ev.xproperty.window, ev.xproperty.atom);
1528		1496
1529	break;	1497	break;
1530		1498
1531	case SelectionClear:	1499	case SelectionClear:
1532	selection_clear ();	1500	selection_clear ();
…		…
1568	if (ev.xany.window == vt)	1536	if (ev.xany.window == vt)
1569	{	1537	{
1570	do	1538	do
1571	scr_expose (ev.xexpose.x, ev.xexpose.y,	1539	scr_expose (ev.xexpose.x, ev.xexpose.y,
1572	ev.xexpose.width, ev.xexpose.height, False);	1540	ev.xexpose.width, ev.xexpose.height, False);
1573	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));	1541	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1574		1542
1575	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1543	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1576		1544
1577	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))	1545	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1578	scr_expose (ev.xexpose.x, ev.xexpose.y,	1546	scr_expose (ev.xexpose.x, ev.xexpose.y,
1579	ev.xexpose.width, ev.xexpose.height, False);	1547	ev.xexpose.width, ev.xexpose.height, False);
1580		1548
1581	want_refresh = 1;	1549	want_refresh = 1;
1582	}	1550	}
1583	else	1551	else
1584	{	1552	{
1585	XEvent unused_event;	1553	XEvent unused_event;
1586		1554
1587	while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))	1555	while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1588	;	1556	;
1589	while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))	1557	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1590	;	1558	;
1591		1559
1592	if (isScrollbarWindow (ev.xany.window))	1560	if (isScrollbarWindow (ev.xany.window))
1593	{	1561	{
1594	scrollBar.setIdle ();	1562	scrollBar.setIdle ();
1595	scrollbar_show (0);	1563	scrollbar_show (0);
1596	}	1564	}
1597	#ifdef MENUBAR
1598	if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1599	menubar_expose ();
1600	#endif
1601		1565
1602	#ifdef TRANSPARENT	1566	#ifdef TRANSPARENT
1603	if (am_transparent && ev.xany.window == parent[0])	1567	if (am_transparent && ev.xany.window == parent[0])
1604	XClearWindow (disp, ev.xany.window);	1568	XClearWindow (dpy, ev.xany.window);
1605	#endif	1569	#endif
1606	}	1570	}
1607	break;	1571	break;
1608		1572
1609	case MotionNotify:	1573	case MotionNotify:
1610	#ifdef POINTER_BLANK	1574	#ifdef POINTER_BLANK
1611	if (hidden_pointer)	1575	if (hidden_pointer)
1612	pointer_unblank ();	1576	pointer_unblank ();
1613	#endif	1577	#endif
1614	#if MENUBAR
1615	if (isMenuBarWindow (ev.xany.window))
1616	{
1617	menubar_control (ev.xbutton);
1618	break;
1619	}
1620	#endif
1621	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)	1578	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1622	break;	1579	break;
1623		1580
1624	if (ev.xany.window == vt)	1581	if (ev.xany.window == vt)
1625	{	1582	{
		1583	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1626	if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))	1584	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1627	; // nop	1585	; // nop
1628	else if (ev.xbutton.state & (Button1Mask | Button3Mask))	1586	else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1629	{	1587	{
1630	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))	1588	while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1631	;	1589	;
1632		1590
1633	XQueryPointer (disp, vt,	1591	XQueryPointer (dpy, vt,
1634	&unused_root, &unused_child,	1592	&unused_root, &unused_child,
1635	&unused_root_x, &unused_root_y,	1593	&unused_root_x, &unused_root_y,
1636	&ev.xbutton.x, &ev.xbutton.y,	1594	&ev.xbutton.x, &ev.xbutton.y,
1637	&ev.xbutton.state);	1595	&ev.xbutton.state);
1638	#ifdef MOUSE_THRESHOLD	1596	#ifdef MOUSE_THRESHOLD
…		…
1702	#endif	1660	#endif
1703	}	1661	}
1704	}	1662	}
1705	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1663	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1706	{	1664	{
1707	while (XCheckTypedWindowEvent (disp, scrollBar.win,	1665	while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1708	MotionNotify, &ev))	1666	MotionNotify, &ev))
1709	;	1667	;
1710		1668
1711	XQueryPointer (disp, scrollBar.win,	1669	XQueryPointer (dpy, scrollBar.win,
1712	&unused_root, &unused_child,	1670	&unused_root, &unused_child,
1713	&unused_root_x, &unused_root_y,	1671	&unused_root_x, &unused_root_y,
1714	&ev.xbutton.x, &ev.xbutton.y,	1672	&ev.xbutton.x, &ev.xbutton.y,
1715	&unused_mask);	1673	&unused_mask);
1716	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1674	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
…		…
1720	scrollbar_show (1);	1678	scrollbar_show (1);
1721	}	1679	}
1722	break;	1680	break;
1723	}	1681	}
1724		1682
1725	skip_switch: ;
1726
1727	#if defined(CURSOR_BLINK)	1683	#if defined(CURSOR_BLINK)
1728	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)	1684	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1729	{	1685	{
1730	if (hidden_cursor)	1686	if (hidden_cursor)
1731	{	1687	{
1732	hidden_cursor = 0;	1688	hidden_cursor = 0;
1733	want_refresh = 1;	1689	want_refresh = 1;
1734	}	1690	}
1735		1691
1736	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1692	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1737	}	1693	}
1738	#endif	1694	#endif
1739		1695
1740	#if defined(POINTER_BLANK)	1696	#if defined(POINTER_BLANK)
1741	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)	1697	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
…		…
1758	if (!focus)	1714	if (!focus)
1759	{	1715	{
1760	focus = 1;	1716	focus = 1;
1761	want_refresh = 1;	1717	want_refresh = 1;
1762		1718
1763	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));	1719	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1764		1720
1765	#if USE_XIM	1721	#if USE_XIM
1766	if (Input_Context != NULL)	1722	if (Input_Context != NULL)
1767	{	1723	{
1768	IMSetStatusPosition ();	1724	IMSetPosition ();
1769	XSetICFocus (Input_Context);	1725	XSetICFocus (Input_Context);
1770	}	1726	}
1771	#endif	1727	#endif
1772	#if CURSOR_BLINK	1728	#if CURSOR_BLINK
1773	if (OPTION (Opt_cursorBlink))	1729	if (OPTION (Opt_cursorBlink))
1774	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1730	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1775	#endif	1731	#endif
1776	#if OFF_FOCUS_FADING	1732	#if OFF_FOCUS_FADING
1777	if (rs[Rs_fade])	1733	if (rs[Rs_fade])
1778	{	1734	{
1779	pix_colors = pix_colors_focused;	1735	pix_colors = pix_colors_focused;
…		…
1823		1779
1824	#if TRANSPARENT	1780	#if TRANSPARENT
1825	void	1781	void
1826	rxvt_term::rootwin_cb (XEvent &ev)	1782	rxvt_term::rootwin_cb (XEvent &ev)
1827	{	1783	{
1828	SET_R (this);	1784	make_current ();
1829	SET_LOCALE (locale);
1830		1785
1831	switch (ev.type)	1786	switch (ev.type)
1832	{	1787	{
1833	case PropertyNotify:	1788	case PropertyNotify:
1834	/*	1789	/*
…		…
1861	/*	1816	/*
1862	* VT window processing of button press	1817	* VT window processing of button press
1863	*/	1818	*/
1864	if (ev.window == vt)	1819	if (ev.window == vt)
1865	{	1820	{
		1821	if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
		1822	return;
		1823
1866	#if ISO_14755	1824	#if ISO_14755
1867	// 5.4	1825	// 5.4
1868	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))	1826	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1869	{	1827	{
1870	iso14755_54 (ev.x, ev.y);	1828	iso14755_54 (ev.x, ev.y);
…		…
1912	else	1870	else
1913	{	1871	{
1914	if (ev.button != MEvent.button)	1872	if (ev.button != MEvent.button)
1915	MEvent.clicks = 0;	1873	MEvent.clicks = 0;
1916		1874
1917	if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1918	switch (ev.button)	1875	switch (ev.button)
1919	{	1876	{
1920	case Button1:	1877	case Button1:
1921	/* allow meta + click to select rectangular areas */	1878	/* allow meta + click to select rectangular areas */
1922	/* should be done in screen.C */	1879	/* should be done in screen.C */
1923	#if ENABLE_FRILLS	1880	#if ENABLE_FRILLS
1924	selection.rect = !!(ev.state & ModMetaMask);	1881	selection.rect = !!(ev.state & ModMetaMask);
1925	#else	1882	#else
1926	selection.rect = false;	1883	selection.rect = false;
1927	#endif	1884	#endif
1928		1885
1929	/* allow shift+left click to extend selection */	1886	/* allow shift+left click to extend selection */
1930	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))	1887	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1931	{	1888	{
1932	if (MEvent.button == Button1 && clickintime)	1889	if (MEvent.button == Button1 && clickintime)
1933	selection_rotate (ev.x, ev.y);	1890	selection_rotate (ev.x, ev.y);
1934	else	1891	else
1935	selection_extend (ev.x, ev.y, 1);	1892	selection_extend (ev.x, ev.y, 1);
1936	}	1893	}
1937	else	1894	else
1938	{	1895	{
1939	if (MEvent.button == Button1 && clickintime)	1896	if (MEvent.button == Button1 && clickintime)
1940	MEvent.clicks++;	1897	MEvent.clicks++;
1941	else	1898	else
1942	MEvent.clicks = 1;	1899	MEvent.clicks = 1;
1943		1900
1944	selection_click (MEvent.clicks, ev.x, ev.y);	1901	selection_click (MEvent.clicks, ev.x, ev.y);
1945	}	1902	}
1946		1903
1947	MEvent.button = Button1;	1904	MEvent.button = Button1;
1948	break;	1905	break;
1949		1906
1950	case Button3:	1907	case Button3:
1951	if (MEvent.button == Button3 && clickintime)	1908	if (MEvent.button == Button3 && clickintime)
1952	selection_rotate (ev.x, ev.y);	1909	selection_rotate (ev.x, ev.y);
1953	else	1910	else
1954	selection_extend (ev.x, ev.y, 1);	1911	selection_extend (ev.x, ev.y, 1);
1955		1912
1956	MEvent.button = Button3;	1913	MEvent.button = Button3;
1957	break;	1914	break;
1958	}	1915	}
1959	}	1916	}
1960		1917
1961	MEvent.time = ev.time;	1918	MEvent.time = ev.time;
1962	return;	1919	return;
1963	}	1920	}
1964		1921
…		…
2103	}	2060	}
2104	}	2061	}
2105		2062
2106	return;	2063	return;
2107	}	2064	}
2108
2109	#if MENUBAR
2110	/*
2111	* Menubar window processing of button press
2112	*/
2113	if (isMenuBarWindow (ev.window))
2114	menubar_control (ev);
2115	#endif
2116	}	2065	}
2117		2066
2118	void	2067	void
2119	rxvt_term::button_release (XButtonEvent &ev)	2068	rxvt_term::button_release (XButtonEvent &ev)
2120	{	2069	{
…		…
2126		2075
2127	if (scrollbar_isUpDn ())	2076	if (scrollbar_isUpDn ())
2128	{	2077	{
2129	scrollBar.setIdle ();	2078	scrollBar.setIdle ();
2130	scrollbar_show (0);	2079	scrollbar_show (0);
2131	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2132	refresh_type &= ~SMOOTH_REFRESH;
2133	#endif
2134	}	2080	}
2135		2081
2136	#ifdef SELECTION_SCROLLING	2082	#ifdef SELECTION_SCROLLING
2137	if (sel_scroll_ev.active)	2083	if (sel_scroll_ev.active)
2138	sel_scroll_ev.stop();	2084	sel_scroll_ev.stop();
2139	#endif	2085	#endif
2140		2086
2141	if (ev.window == vt)	2087	if (ev.window == vt)
2142	{	2088	{
		2089	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
		2090	return;
		2091
2143	#if ISO_14755	2092	#if ISO_14755
2144	// 5.4	2093	// 5.4
2145	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))	2094	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2146	return;	2095	return;
2147	#endif	2096	#endif
		2097
2148	if (reportmode)	2098	if (reportmode)
2149	{	2099	{
2150	/* mouse report from vt window */	2100	/* mouse report from vt window */
2151	/* don't report release of wheel "buttons" */	2101	/* don't report release of wheel "buttons" */
2152	if (ev.button >= 4)	2102	if (ev.button >= 4)
…		…
2176	if (priv_modes & PrivMode_mouse_report	2126	if (priv_modes & PrivMode_mouse_report
2177	&& bypass_keystate	2127	&& bypass_keystate
2178	&& ev.button == Button1 && MEvent.clicks <= 1)	2128	&& ev.button == Button1 && MEvent.clicks <= 1)
2179	selection_extend (ev.x, ev.y, 0);	2129	selection_extend (ev.x, ev.y, 0);
2180		2130
2181	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2182	return;
2183
2184	switch (ev.button)	2131	switch (ev.button)
2185	{	2132	{
2186	case Button1:	2133	case Button1:
2187	case Button3:	2134	case Button3:
2188	selection_make (ev.time);	2135	selection_make (ev.time);
2189	break;	2136	break;
		2137
2190	case Button2:	2138	case Button2:
2191	selection_request (ev.time, ev.x, ev.y);	2139	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
		2140	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2192	break;	2141	break;
		2142
2193	#ifdef MOUSE_WHEEL	2143	#ifdef MOUSE_WHEEL
2194	case Button4:	2144	case Button4:
2195	case Button5:	2145	case Button5:
2196	{	2146	{
2197	int i;	2147	int i;
…		…
2229	}	2179	}
2230	break;	2180	break;
2231	#endif	2181	#endif
2232	}	2182	}
2233	}	2183	}
2234	#ifdef MENUBAR
2235	else if (isMenuBarWindow (ev.window))
2236	menubar_control (ev);
2237	#endif
2238	}	2184	}
2239		2185
2240	#ifdef TRANSPARENT	2186	#ifdef TRANSPARENT
2241	#if TINTING	2187	#if TINTING
2242	/* taken from aterm-0.4.2 */	2188	/* taken from aterm-0.4.2 */
2243		2189
2244	typedef uint32_t RUINT32T;	2190	typedef uint32_t RUINT32T;
2245		2191
2246	void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)	2192	void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2247	{	2193	{
2248	int sh_r, sh_g, sh_b;	2194	int sh_r, sh_g, sh_b;
2249	RUINT32T mask_r, mask_g, mask_b;	2195	RUINT32T mask_r, mask_g, mask_b;
2250	RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;	2196	RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2251	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;	2197	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2252	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;	2198	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2253	int i;	2199	int i;
2254		2200
2255	Visual *visual = display->visual;	2201	Visual *visual = term->visual;
2256		2202
2257	if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;	2203	if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2258		2204
2259	/* for convenience */	2205	/* for convenience */
2260	mask_r = visual->red_mask;	2206	mask_r = visual->red_mask;
…		…
2481	Atom atype;	2427	Atom atype;
2482	unsigned char *prop = NULL;	2428	unsigned char *prop = NULL;
2483	Window root, oldp, *list;	2429	Window root, oldp, *list;
2484	Pixmap rootpixmap = None;	2430	Pixmap rootpixmap = None;
2485	XWindowAttributes wattr, wrootattr;	2431	XWindowAttributes wattr, wrootattr;
2486	dDisp;
2487		2432
2488	pchanged = 0;	2433	pchanged = 0;
2489		2434
2490	if (!OPTION (Opt_transparent))	2435	if (!OPTION (Opt_transparent))
2491	return pchanged; /* Don't try any more */	2436	return pchanged; /* Don't try any more */
2492		2437
2493	XGetWindowAttributes (disp, display->root, &wrootattr);	2438	XGetWindowAttributes (dpy, display->root, &wrootattr);
2494	rootdepth = wrootattr.depth;	2439	rootdepth = wrootattr.depth;
2495		2440
2496	XGetWindowAttributes (disp, parent[0], &wattr);	2441	XGetWindowAttributes (dpy, parent[0], &wattr);
2497		2442
2498	if (rootdepth != wattr.depth)	2443	if (rootdepth != wattr.depth)
2499	{	2444	{
2500	if (am_transparent)	2445	if (am_transparent)
2501	{	2446	{
2502	pchanged = 1;	2447	pchanged = 1;
2503	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2448	XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2504	am_transparent = am_pixmap_trans = 0;	2449	am_transparent = am_pixmap_trans = 0;
2505	}	2450	}
2506		2451
2507	return pchanged; /* Don't try any more */	2452	return pchanged; /* Don't try any more */
2508	}	2453	}
2509		2454
2510	/* Get all X ops out of the queue so that our information is up-to-date. */	2455	/* Get all X ops out of the queue so that our information is up-to-date. */
2511	XSync (disp, False);	2456	XSync (dpy, False);
2512		2457
2513	/*	2458	/*
2514	* Make the frame window set by the window manager have	2459	* Make the frame window set by the window manager have
2515	* the root background. Some window managers put multiple nested frame	2460	* the root background. Some window managers put multiple nested frame
2516	* windows for each client, so we have to take care about that.	2461	* windows for each client, so we have to take care about that.
2517	*/	2462	*/
2518	i = (xa[XA_XROOTPMAP_ID]	2463	i = (xa[XA_XROOTPMAP_ID]
2519	&& XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],	2464	&& XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2520	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2465	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2521	&nitems, &bytes_after, &prop) == Success);	2466	&nitems, &bytes_after, &prop) == Success);
2522		2467
2523	if (!i || prop == NULL)	2468	if (!i || prop == NULL)
2524	i = (xa[XA_ESETROOT_PMAP_ID]	2469	i = (xa[XA_ESETROOT_PMAP_ID]
2525	&& XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],	2470	&& XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2526	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2471	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2527	&nitems, &bytes_after, &prop) == Success);	2472	&nitems, &bytes_after, &prop) == Success);
2528		2473
2529	if (!i || prop == NULL	2474	if (!i || prop == NULL
2530	#if TINTING	2475	#if TINTING
2531	|| !rs[Rs_color + Color_tint]	2476	|| !ISSET_PIXCOLOR (Color_tint)
2532	#endif	2477	#endif
2533	)	2478	)
2534	have_pixmap = 0;	2479	have_pixmap = 0;
2535	else	2480	else
2536	{	2481	{
…		…
2549	Window cr;	2494	Window cr;
2550	XImage *image;	2495	XImage *image;
2551	GC gc;	2496	GC gc;
2552	XGCValues gcvalue;	2497	XGCValues gcvalue;
2553		2498
2554	XTranslateCoordinates (disp, parent[0], display->root,	2499	XTranslateCoordinates (dpy, parent[0], display->root,
2555	0, 0, &sx, &sy, &cr);	2500	0, 0, &sx, &sy, &cr);
2556	nw = (unsigned int)szHint.width;	2501	nw = (unsigned int)szHint.width;
2557	nh = (unsigned int)szHint.height;	2502	nh = (unsigned int)szHint.height;
2558	nx = ny = 0;	2503	nx = ny = 0;
2559		2504
…		…
2572	}	2517	}
2573		2518
2574	min_it (nw, (unsigned int) (wrootattr.width - sx));	2519	min_it (nw, (unsigned int) (wrootattr.width - sx));
2575	min_it (nh, (unsigned int) (wrootattr.height - sy));	2520	min_it (nh, (unsigned int) (wrootattr.height - sy));
2576		2521
2577	XSync (disp, False);	2522	XSync (dpy, False);
2578	allowedxerror = -1;	2523	allowedxerror = -1;
2579	image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);	2524	image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2580		2525
2581	/* XXX: handle BadMatch - usually because we're outside the pixmap */	2526	/* XXX: handle BadMatch - usually because we're outside the pixmap */
2582	/* XXX: may need a delay here? */	2527	/* XXX: may need a delay here? */
2583	allowedxerror = 0;	2528	allowedxerror = 0;
2584		2529
…		…
2587	if (am_transparent && am_pixmap_trans)	2532	if (am_transparent && am_pixmap_trans)
2588	{	2533	{
2589	pchanged = 1;	2534	pchanged = 1;
2590	if (pixmap != None)	2535	if (pixmap != None)
2591	{	2536	{
2592	XFreePixmap (disp, pixmap);	2537	XFreePixmap (dpy, pixmap);
2593	pixmap = None;	2538	pixmap = None;
2594	}	2539	}
2595	}	2540	}
2596		2541
2597	am_pixmap_trans = 0;	2542	am_pixmap_trans = 0;
2598	}	2543	}
2599	else	2544	else
2600	{	2545	{
2601	if (pixmap != None)	2546	if (pixmap != None)
2602	XFreePixmap (disp, pixmap);	2547	XFreePixmap (dpy, pixmap);
2603		2548
2604	#if TINTING	2549	#if TINTING
2605	if (ISSET_PIXCOLOR (Color_tint))	2550	if (ISSET_PIXCOLOR (Color_tint))
2606	{	2551	{
2607	unsigned short rm, gm, bm;
2608	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;	2552	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2609		2553
		2554	rgba c;
2610	pix_colors_focused[Color_tint].get (display, rm, gm, bm);	2555	pix_colors_focused [Color_tint].get (c);
2611		2556
2612	ShadeXImage (display, image, shade, rm, gm, bm);	2557	ShadeXImage (this, image, shade, c.r, c.g, c.b);
2613	}	2558	}
2614	#endif	2559	#endif
2615		2560
2616	pixmap = XCreatePixmap (disp, vt,	2561	pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2617	szHint.width, szHint.height, image->depth);
2618	gc = XCreateGC (disp, vt, 0UL, &gcvalue);	2562	gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2619	XPutImage (disp, pixmap, gc, image, 0, 0,	2563	XPutImage (dpy, pixmap, gc, image, 0, 0,
2620	nx, ny, image->width, image->height);	2564	nx, ny, image->width, image->height);
2621	XFreeGC (disp, gc);	2565	XFreeGC (dpy, gc);
2622	XDestroyImage (image);	2566	XDestroyImage (image);
2623	XSetWindowBackgroundPixmap (disp, parent[0], pixmap);	2567	XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2624	XClearWindow (disp, parent[0]);	2568	XClearWindow (dpy, parent[0]);
2625		2569
2626	if (!am_transparent || !am_pixmap_trans)	2570	if (!am_transparent || !am_pixmap_trans)
2627	pchanged = 1;	2571	pchanged = 1;
2628		2572
2629	am_transparent = am_pixmap_trans = 1;	2573	am_transparent = am_pixmap_trans = 1;
2630	}	2574	}
2631	}	2575	}
2632		2576
2633	if (am_pixmap_trans)	2577	if (am_pixmap_trans)
2634	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2578	XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2635	else	2579	else
2636	{	2580	{
2637	unsigned int n;	2581	unsigned int n;
2638	/*	2582	/*
2639	* InheritPixmap transparency	2583	* InheritPixmap transparency
2640	*/	2584	*/
2641	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2585	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2642	{	2586	{
2643	oldp = parent[i];	2587	oldp = parent[i];
2644	XQueryTree (disp, parent[i - 1], &root,	2588	XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2645	&parent[i], &list, &n);
2646	XFree (list);	2589	XFree (list);
2647		2590
2648	if (parent[i] == display->root)	2591	if (parent[i] == display->root)
2649	{	2592	{
2650	if (oldp != None)	2593	if (oldp != None)
…		…
2658	}	2601	}
2659		2602
2660	n = 0;	2603	n = 0;
2661		2604
2662	if (pchanged)	2605	if (pchanged)
2663	{
2664	for (; n < (unsigned int)i; n++)	2606	for (; n < (unsigned int)i; n++)
2665	{	2607	{
2666	XGetWindowAttributes (disp, parent[n], &wattr);	2608	XGetWindowAttributes (dpy, parent[n], &wattr);
		2609
2667	if (wattr.depth != rootdepth || wattr.c_class == InputOnly)	2610	if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2668	{	2611	{
2669	n = (int) (sizeof (parent) / sizeof (Window)) + 1;	2612	n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2670	break;	2613	break;
2671	}	2614	}
2672	}	2615	}
2673	}
2674		2616
2675	if (n > (int) (sizeof (parent) / sizeof (parent[0])))	2617	if (n > (sizeof (parent) / sizeof (parent[0])))
2676	{	2618	{
2677	XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);	2619	XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2678	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2620	XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2679	am_transparent = 0;	2621	am_transparent = 0;
2680	/* XXX: also turn off Opt_transparent? */	2622	/* XXX: also turn off Opt_transparent? */
2681	}	2623	}
2682	else	2624	else
2683	{	2625	{
2684	#if WAIT_FOR_WM
2685	/* wait (an arbitrary period) for the WM to do its thing
2686	* needed for fvwm2.2.2 (and before?) */
2687	sleep (1);
2688	#endif
2689	for (n = 0; n < (unsigned int)i; n++)	2626	for (n = 0; n < (unsigned int)i; n++)
2690	{	2627	{
2691	XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);	2628	XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2692	XClearWindow (disp, parent[n]);	2629	XClearWindow (dpy, parent[n]);
2693	}	2630	}
2694		2631
2695	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2632	XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2696	am_transparent = 1;	2633	am_transparent = 1;
2697	}	2634	}
2698		2635
2699	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2636	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2700	parent[i] = None;	2637	parent[i] = None;
2701	}	2638	}
2702		2639
2703	if (scrollBar.win)	2640	if (scrollBar.win)
2704	{	2641	{
2705	XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);	2642	XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2706	scrollBar.setIdle ();	2643	scrollBar.setIdle ();
2707	scrollbar_show (0);	2644	scrollbar_show (0);
2708	}	2645	}
2709		2646
2710	if (am_transparent)	2647	if (am_transparent)
…		…
2785	}	2722	}
2786		2723
2787	// scr_add_lines only works for nlines <= nrow - 1.	2724	// scr_add_lines only works for nlines <= nrow - 1.
2788	if (nlines >= nrow - 1)	2725	if (nlines >= nrow - 1)
2789	{	2726	{
		2727	if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2790	if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))	2728	&& HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2791	scr_add_lines (buf, str - buf, nlines);	2729	scr_add_lines (buf, str - buf, nlines);
2792		2730
2793	nlines = 0;	2731	nlines = 0;
2794	str = buf;	2732	str = buf;
2795	eol = str + min (ncol, UBUFSIZ);	2733	eol = str + min (ncol, UBUFSIZ);
…		…
2810		2748
2811	seq_begin = cmdbuf_ptr;	2749	seq_begin = cmdbuf_ptr;
2812	ch = next_char ();	2750	ch = next_char ();
2813	}	2751	}
2814		2752
		2753	if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2815	if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))	2754	&& HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2816	scr_add_lines (buf, str - buf, nlines);	2755	scr_add_lines (buf, str - buf, nlines);
2817		2756
2818	/*	2757	/*
2819	* If there have been a lot of new lines, then update the screen	2758	* If there have been a lot of new lines, then update the screen
2820	* What the heck I'll cheat and only refresh less than every page-full.	2759	* What the heck I'll cheat and only refresh less than every page-full.
…		…
2826	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)	2765	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2827	refresh_limit++;	2766	refresh_limit++;
2828	else	2767	else
2829	{	2768	{
2830	flag = true;	2769	flag = true;
		2770	//TODO: due to popular request, implement "skipscroll" option here
2831	scr_refresh (refresh_type);	2771	scr_refresh ();
2832	want_refresh = 1;	2772	want_refresh = 1;
2833	}	2773	}
2834	}	2774	}
2835		2775
2836	}	2776	}
…		…
2854	return flag;	2794	return flag;
2855	}	2795	}
2856		2796
2857	// read the next character	2797	// read the next character
2858	wchar_t	2798	wchar_t
2859	rxvt_term::next_char ()	2799	rxvt_term::next_char () NOTHROW
2860	{	2800	{
2861	while (cmdbuf_ptr < cmdbuf_endp)	2801	while (cmdbuf_ptr < cmdbuf_endp)
2862	{	2802	{
2863	// assume 7-bit to be ascii ALWAYS	2803	// assume 7-bit to be ascii ALWAYS
2864	if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)	2804	if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
…		…
2885	return NOCHAR;	2825	return NOCHAR;
2886	}	2826	}
2887		2827
2888	// read the next octet	2828	// read the next octet
2889	uint32_t	2829	uint32_t
2890	rxvt_term::next_octet ()	2830	rxvt_term::next_octet () NOTHROW
2891	{	2831	{
2892	return cmdbuf_ptr < cmdbuf_endp	2832	return cmdbuf_ptr < cmdbuf_endp
2893	? (unsigned char)*cmdbuf_ptr++	2833	? (unsigned char)*cmdbuf_ptr++
2894	: NOCHAR;	2834	: NOCHAR;
2895	}	2835	}
		2836
		2837	static class out_of_input out_of_input;
2896		2838
2897	/* rxvt_cmd_getc () - Return next input character */	2839	/* rxvt_cmd_getc () - Return next input character */
2898	/*	2840	/*
2899	* Return the next input character after first passing any keyboard input	2841	* Return the next input character after first passing any keyboard input
2900	* to the command.	2842	* to the command.
2901	*/	2843	*/
2902	wchar_t	2844	wchar_t
2903	rxvt_term::cmd_getc ()	2845	rxvt_term::cmd_getc () THROW ((class out_of_input))
2904	{	2846	{
2905	wchar_t c = next_char ();	2847	wchar_t c = next_char ();
2906		2848
2907	if (c == NOCHAR)	2849	if (c == NOCHAR)
2908	throw out_of_input;	2850	throw out_of_input;
2909		2851
2910	return c;	2852	return c;
2911	}	2853	}
2912		2854
2913	uint32_t	2855	uint32_t
2914	rxvt_term::cmd_get8 ()	2856	rxvt_term::cmd_get8 () THROW ((class out_of_input))
2915	{	2857	{
2916	uint32_t c = next_octet ();	2858	uint32_t c = next_octet ();
2917		2859
2918	if (c == NOCHAR)	2860	if (c == NOCHAR)
2919	throw out_of_input;	2861	throw out_of_input;
…		…
3157	scr_charset_set (2, (unsigned int)cmd_getc ());	3099	scr_charset_set (2, (unsigned int)cmd_getc ());
3158	break;	3100	break;
3159	case '+':	3101	case '+':
3160	scr_charset_set (3, (unsigned int)cmd_getc ());	3102	scr_charset_set (3, (unsigned int)cmd_getc ());
3161	break;	3103	break;
3162	#if ENABLE_FRILLS	3104	#if !ENABLE_MINIMAL
3163	case '6':	3105	case '6':
3164	scr_backindex ();	3106	scr_backindex ();
3165	break;	3107	break;
3166	#endif	3108	#endif
3167	case '7':	3109	case '7':
3168	scr_cursor (SAVE);	3110	scr_cursor (SAVE);
3169	break;	3111	break;
3170	case '8':	3112	case '8':
3171	scr_cursor (RESTORE);	3113	scr_cursor (RESTORE);
3172	break;	3114	break;
3173	#if ENABLE_FRILLS	3115	#if !ENABLE_MINIMAL
3174	case '9':	3116	case '9':
3175	scr_forwardindex ();	3117	scr_forwardindex ();
3176	break;	3118	break;
3177	#endif	3119	#endif
3178	case '=':	3120	case '=':
…		…
3340	ndef = get_byte_array_bit (csi_defaults, i);	3282	ndef = get_byte_array_bit (csi_defaults, i);
3341	for (p = 0; p < nargs; p++)	3283	for (p = 0; p < nargs; p++)
3342	if (arg[p] == -1)	3284	if (arg[p] == -1)
3343	arg[p] = ndef;	3285	arg[p] = ndef;
3344		3286
3345	#ifdef DEBUG_CMD
3346	fprintf (stderr, "CSI ");
3347	for (p = 0; p < nargs; p++)
3348	fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3349	fprintf (stderr, "%c\n", ch);
3350	#endif
3351
3352	/*	3287	/*
3353	* private mode handling	3288	* private mode handling
3354	*/	3289	*/
3355	if (priv)	3290	if (priv)
3356	{	3291	{
3357	switch (priv)	3292	switch (priv)
3358	{	3293	{
3359	case '>':	3294	case '>':
3360	if (ch == CSI_DA) /* secondary device attributes */	3295	if (ch == CSI_DA) /* secondary device attributes */
3361	tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);	3296	{
		3297	// first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
		3298	// 'U' for rxvt-unicode != 7.[34] (where it was broken).
		3299	//
		3300	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
		3301	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
		3302	// that we do not support xterm mouse reporting (should be 95 when we do).
		3303	//
		3304	tt_printf ("\033[>%d;94;0c", 'U');
		3305	}
3362	break;	3306	break;
3363	case '?':	3307	case '?':
3364	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')	3308	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3365	process_terminal_mode (ch, priv, nargs, arg);	3309	process_terminal_mode (ch, priv, nargs, arg);
3366	break;	3310	break;
…		…
3569	break;	3513	break;
3570	case CSI_75:	3514	case CSI_75:
3571	scr_cursor (RESTORE);	3515	scr_cursor (RESTORE);
3572	break;	3516	break;
3573		3517
3574	#if ENABLE_FRILLS	3518	#if !ENABLE_MINIMAL
3575	case CSI_74:	3519	case CSI_74:
3576	process_window_ops (arg, nargs);	3520	process_window_ops (arg, nargs);
3577	break;	3521	break;
3578	#endif	3522	#endif
3579		3523
…		…
3586	break;	3530	break;
3587	}	3531	}
3588	}	3532	}
3589	/*}}} */	3533	/*}}} */
3590		3534
3591	#if ENABLE_FRILLS	3535	#if !ENABLE_MINIMAL
3592	/* ARGSUSED */	3536	/* ARGSUSED */
3593	void	3537	void
3594	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3538	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3595	{	3539	{
3596	int x, y;	3540	int x, y;
3597	XWindowAttributes wattr;	3541	XWindowAttributes wattr;
3598	Window wdummy;	3542	Window wdummy;
3599	dDisp;	3543
		3544	dLocal (Display *, dpy);
3600		3545
3601	if (nargs == 0)	3546	if (nargs == 0)
3602	return;	3547	return;
3603		3548
3604	switch (args[0])	3549	switch (args[0])
3605	{	3550	{
3606	/*	3551	/*
3607	* commands	3552	* commands
3608	*/	3553	*/
3609	case 1: /* deiconify window */	3554	case 1: /* deiconify window */
3610	XMapWindow (disp, parent[0]);	3555	XMapWindow (dpy, parent[0]);
3611	break;	3556	break;
3612	case 2: /* iconify window */	3557	case 2: /* iconify window */
3613	XIconifyWindow (disp, parent[0], display->screen);	3558	XIconifyWindow (dpy, parent[0], display->screen);
3614	break;	3559	break;
3615	case 3: /* set position (pixels) */	3560	case 3: /* set position (pixels) */
3616	XMoveWindow (disp, parent[0], args[1], args[2]);	3561	XMoveWindow (dpy, parent[0], args[1], args[2]);
3617	break;	3562	break;
3618	case 4: /* set size (pixels) */	3563	case 4: /* set size (pixels) */
3619	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3564	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3620	break;	3565	break;
3621	case 5: /* raise window */	3566	case 5: /* raise window */
3622	XRaiseWindow (disp, parent[0]);	3567	XRaiseWindow (dpy, parent[0]);
3623	break;	3568	break;
3624	case 6: /* lower window */	3569	case 6: /* lower window */
3625	XLowerWindow (disp, parent[0]);	3570	XLowerWindow (dpy, parent[0]);
3626	break;	3571	break;
3627	case 7: /* refresh window */	3572	case 7: /* refresh window */
3628	scr_touch (true);	3573	scr_touch (true);
3629	break;	3574	break;
3630	case 8: /* set size (chars) */	3575	case 8: /* set size (chars) */
…		…
3637	if (args[0] >= 24) /* set height (chars) */	3582	if (args[0] >= 24) /* set height (chars) */
3638	set_widthheight ((unsigned int)width,	3583	set_widthheight ((unsigned int)width,
3639	(unsigned int) (args[1] * fheight));	3584	(unsigned int) (args[1] * fheight));
3640	break;	3585	break;
3641		3586
3642
3643	/*	3587	/*
3644	* reports - some output format copied from XTerm	3588	* reports - some output format copied from XTerm
3645	*/	3589	*/
3646	case 11: /* report window state */	3590	case 11: /* report window state */
3647	XGetWindowAttributes (disp, parent[0], &wattr);	3591	XGetWindowAttributes (dpy, parent[0], &wattr);
3648	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3592	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3649	break;	3593	break;
3650	case 13: /* report window position */	3594	case 13: /* report window position */
3651	XGetWindowAttributes (disp, parent[0], &wattr);	3595	XGetWindowAttributes (dpy, parent[0], &wattr);
3652	XTranslateCoordinates (disp, parent[0], wattr.root,	3596	XTranslateCoordinates (dpy, parent[0], wattr.root,
3653	-wattr.border_width, -wattr.border_width,	3597	-wattr.border_width, -wattr.border_width,
3654	&x, &y, &wdummy);	3598	&x, &y, &wdummy);
3655	tt_printf ("\033[3;%d;%dt", x, y);	3599	tt_printf ("\033[3;%d;%dt", x, y);
3656	break;	3600	break;
3657	case 14: /* report window size (pixels) */	3601	case 14: /* report window size (pixels) */
3658	XGetWindowAttributes (disp, parent[0], &wattr);	3602	XGetWindowAttributes (dpy, parent[0], &wattr);
3659	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3603	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3660	break;	3604	break;
3661	case 18: /* report text area size (chars) */	3605	case 18: /* report text area size (chars) */
3662	tt_printf ("\033[8;%d;%dt", nrow, ncol);	3606	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3663	break;	3607	break;
…		…
3665	tt_printf ("\033[9;%d;%dt", nrow, ncol);	3609	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3666	break;	3610	break;
3667	case 20: /* report icon label */	3611	case 20: /* report icon label */
3668	{	3612	{
3669	char *s;	3613	char *s;
3670	XGetIconName (disp, parent[0], &s);	3614	XGetIconName (dpy, parent[0], &s);
3671	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3615	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3672	XFree (s);	3616	XFree (s);
3673	}	3617	}
3674	break;	3618	break;
3675	case 21: /* report window title */	3619	case 21: /* report window title */
3676	{	3620	{
3677	char *s;	3621	char *s;
3678	XFetchName (disp, parent[0], &s);	3622	XFetchName (dpy, parent[0], &s);
3679	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3623	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3680	XFree (s);	3624	XFree (s);
3681	}	3625	}
3682	break;	3626	break;
3683	}	3627	}
…		…
3784	void	3728	void
3785	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)	3729	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3786	{	3730	{
3787	if (str[0] == '?' && !str[1])	3731	if (str[0] == '?' && !str[1])
3788	{	3732	{
3789	unsigned short r, g, b;	3733	rgba c;
3790	pix_colors_focused[color].get (display, r, g, b);	3734	pix_colors_focused[color].get (c);
		3735
		3736	#if XFT
		3737	if (c.a != rgba::MAX_CC)
		3738	tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
		3739	else
		3740	#endif
3791	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);	3741	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3792	}	3742	}
3793	else	3743	else
3794	set_window_color (color, str);	3744	set_window_color (color, str);
3795	}	3745	}
3796		3746
…		…
3798	* XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)	3748	* XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3799	*/	3749	*/
3800	void	3750	void
3801	rxvt_term::process_xterm_seq (int op, const char *str, char resp)	3751	rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3802	{	3752	{
3803	int changed = 0;
3804	int color;	3753	int color;
3805	char *buf, *name;	3754	char *buf, *name;
3806	bool query = str[0] == '?' && !str[1];	3755	bool query = str[0] == '?' && !str[1];
3807	int saveop = op;	3756	int saveop = op;
3808	dDisp;	3757
		3758	dLocal (Display *, dpy);
3809		3759
3810	assert (str != NULL);	3760	assert (str != NULL);
		3761
		3762	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
		3763	return;
		3764
3811	switch (op)	3765	switch (op)
3812	{	3766	{
3813	case XTerm_name:	3767	case XTerm_name:
3814	set_title (str);	3768	set_title (str);
3815	/* FALLTHROUGH */	3769	/* FALLTHROUGH */
…		…
3829	unsigned long bytes_after;	3783	unsigned long bytes_after;
3830	unsigned char *value = 0;	3784	unsigned char *value = 0;
3831	const char *str = "";	3785	const char *str = "";
3832		3786
3833	if (prop	3787	if (prop
3834	&& XGetWindowProperty (disp, parent[0],	3788	&& XGetWindowProperty (dpy, parent[0],
3835	prop, 0, 1<<16, 0, AnyPropertyType,	3789	prop, 0, 1<<16, 0, AnyPropertyType,
3836	&actual_type, &actual_format,	3790	&actual_type, &actual_format,
3837	&nitems, &bytes_after, &value) == Success	3791	&nitems, &bytes_after, &value) == Success
3838	&& actual_type != None	3792	&& actual_type != None
3839	&& actual_format == 8)	3793	&& actual_format == 8)
3840	str = (const char *)(value);	3794	str = (const char *)(value);
3841		3795
3842	tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);	3796	tt_printf ("\033]%d;%s%c", op, str, resp);
3843		3797
3844	XFree (value);	3798	XFree (value);
3845	}	3799	}
3846	else	3800	else
3847	{	3801	{
…		…
3851	{	3805	{
3852	*eq = 0;	3806	*eq = 0;
3853	set_utf8_property (display->atom (str), eq + 1);	3807	set_utf8_property (display->atom (str), eq + 1);
3854	}	3808	}
3855	else	3809	else
3856	XDeleteProperty (disp, parent[0],	3810	XDeleteProperty (dpy, parent[0],
3857	display->atom (str));	3811	display->atom (str));
3858	}	3812	}
3859	break;	3813	break;
3860		3814
3861	case XTerm_Color:	3815	case XTerm_Color:
…		…
3871	break;	3825	break;
3872		3826
3873	if ((buf = strchr (name, ';')) != NULL)	3827	if ((buf = strchr (name, ';')) != NULL)
3874	*buf++ = '\0';	3828	*buf++ = '\0';
3875		3829
3876	if (name[0] == '?' && !name[1])	3830	process_color_seq (op, color, name, resp);
3877	{
3878	unsigned short r, g, b;
3879	pix_colors_focused[color].get (display, r, g, b);
3880	tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3881	}
3882	else
3883	set_window_color (color, name);
3884	}	3831	}
3885	break;	3832	break;
3886	case XTerm_Color00:	3833	case XTerm_Color00:
3887	process_color_seq (XTerm_Color00, Color_fg, str, resp);	3834	process_color_seq (op, Color_fg, str, resp);
3888	break;	3835	break;
3889	case XTerm_Color01:	3836	case XTerm_Color01:
3890	process_color_seq (XTerm_Color01, Color_bg, str, resp);	3837	process_color_seq (op, Color_bg, str, resp);
3891	break;	3838	break;
3892	#ifndef NO_CURSORCOLOR	3839	#ifndef NO_CURSORCOLOR
3893	case XTerm_Color_cursor:	3840	case XTerm_Color_cursor:
3894	process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);	3841	process_color_seq (op, Color_cursor, str, resp);
3895	break;	3842	break;
3896	#endif	3843	#endif
3897	case XTerm_Color_pointer_fg:	3844	case XTerm_Color_pointer_fg:
3898	process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);	3845	process_color_seq (op, Color_pointer_fg, str, resp);
3899	break;	3846	break;
3900	case XTerm_Color_pointer_bg:	3847	case XTerm_Color_pointer_bg:
3901	process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);	3848	process_color_seq (op, Color_pointer_bg, str, resp);
3902	break;	3849	break;
3903	#ifndef NO_BOLD_UNDERLINE_REVERSE	3850	#ifndef NO_BOLD_UNDERLINE_REVERSE
3904	case XTerm_Color_RV:	3851	case XTerm_Color_RV:
3905	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3852	process_color_seq (op, Color_RV, str, resp);
3906	break;	3853	break;
3907	case Rxvt_Color_BD:	3854	case Rxvt_Color_BD:
3908	case URxvt_Color_BD:	3855	case URxvt_Color_BD:
3909	process_color_seq (op, Color_BD, str, resp);	3856	process_color_seq (op, Color_BD, str, resp);
3910	break;	3857	break;
3911	case Rxvt_Color_UL:	3858	case Rxvt_Color_UL:
3912	case URxvt_Color_UL:	3859	case URxvt_Color_UL:
3913	process_color_seq (op, Color_UL, str, resp);	3860	process_color_seq (op, Color_UL, str, resp);
3914	break;	3861	break;
3915	case URxvt_Color_IT:	3862	case URxvt_Color_IT:
3916	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);	3863	process_color_seq (op, Color_IT, str, resp);
3917	break;	3864	break;
3918	#endif	3865	#endif
3919	#if TRANSPARENT && TINTING	3866	#if TRANSPARENT && TINTING
3920	case URxvt_Color_tint:	3867	case URxvt_Color_tint:
3921	process_color_seq (URxvt_Color_tint, Color_tint, str, resp);	3868	process_color_seq (op, Color_tint, str, resp);
		3869
3922	check_our_parents ();	3870	check_our_parents ();
		3871
3923	if (am_transparent)	3872	if (am_transparent)
3924	want_full_refresh = want_refresh = 1;	3873	want_full_refresh = want_refresh = 1;
		3874
3925	break;	3875	break;
3926	#endif	3876	#endif
3927		3877
3928	case Rxvt_Pixmap:	3878	case Rxvt_Pixmap:
		3879	{
3929	if (*str != ';')	3880	if (*str != ';')
3930	{	3881	{
3931	#if XPM_BACKGROUND	3882	#if XPM_BACKGROUND
3932	scale_pixmap (""); /* reset to default scaling */	3883	scale_pixmap (""); /* reset to default scaling */
3933	set_bgPixmap (str); /* change pixmap */	3884	set_bgPixmap (str); /* change pixmap */
3934	scr_touch (true);	3885	scr_touch (true);
3935	#endif	3886	#endif
3936	}	3887	}
3937		3888
		3889	int changed = 0;
		3890
3938	while ((str = strchr (str, ';')) != NULL)	3891	while ((str = strchr (str, ';')) != NULL)
3939	{	3892	{
3940	str++;	3893	str++;
3941	#if XPM_BACKGROUND	3894	#if XPM_BACKGROUND
3942	changed += scale_pixmap (str);	3895	changed += scale_pixmap (str);
3943	#endif	3896	#endif
3944	}	3897	}
3945		3898
3946	if (changed)	3899	if (changed)
3947	{	3900	{
3948	#ifdef XPM_BACKGROUND	3901	#ifdef XPM_BACKGROUND
3949	resize_pixmap ();	3902	resize_pixmap ();
3950	scr_touch (true);	3903	scr_touch (true);
3951	#endif	3904	#endif
3952	}	3905	}
		3906	}
3953	break;	3907	break;
3954		3908
3955	case Rxvt_restoreFG:	3909	case Rxvt_restoreFG:
3956	set_window_color (Color_fg, str);	3910	set_window_color (Color_fg, str);
3957	break;	3911	break;
…		…
3961		3915
3962	case XTerm_logfile:	3916	case XTerm_logfile:
3963	// TODO, when secure mode?	3917	// TODO, when secure mode?
3964	break;	3918	break;
3965		3919
3966	#ifdef MENUBAR
3967	case URxvt_Menu:
3968	if (OPTION (Opt_insecure))
3969	menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3970	break;
3971	#endif
3972	#if 0	3920	#if 0
3973	case Rxvt_dumpscreen: /* no error notices */	3921	case Rxvt_dumpscreen: /* no error notices */
3974	{	3922	{
3975	int fd;	3923	int fd;
3976	if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)	3924	if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
…		…
4002	allocated.push_back ((void *)res);	3950	allocated.push_back ((void *)res);
4003	set_fonts ();	3951	set_fonts ();
4004	}	3952	}
4005	break;	3953	break;
4006		3954
4007	#if ENABLE_FRILLS	3955	case URxvt_version:
		3956	if (query)
		3957	tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
		3958	op,
		3959	rs[Rs_name], VERSION[0], VERSION[2],
		3960	resp);
		3961	break;
		3962
		3963	#if !ENABLE_MINIMAL
4008	case URxvt_locale:	3964	case URxvt_locale:
4009	if (query)	3965	if (query)
4010	tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);	3966	tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
4011	else	3967	else
4012	{	3968	{
4013	set_locale (str);	3969	set_locale (str);
4014	pty.set_utf8_mode (enc_utf8);	3970	pty->set_utf8_mode (enc_utf8);
4015	init_xlocale ();	3971	init_xlocale ();
4016	}	3972	}
4017	break;	3973	break;
4018		3974
4019	case URxvt_view_up:	3975	case URxvt_view_up:
…		…
4030	break;	3986	break;
4031	#endif	3987	#endif
4032		3988
4033	#if ENABLE_PERL	3989	#if ENABLE_PERL
4034	case URxvt_perl:	3990	case URxvt_perl:
4035	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))	3991	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
4036	; // no responses yet	3992	; // no responses yet
4037	break;	3993	break;
4038	#endif	3994	#endif
4039	}	3995	}
4040	}	3996	}
…		…
4072	return state;	4028	return state;
4073	}	4029	}
4074		4030
4075	/* we're not using priv _yet_ */	4031	/* we're not using priv _yet_ */
4076	void	4032	void
4077	rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)	4033	rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4078	{	4034	{
4079	unsigned int i, j;	4035	unsigned int i, j;
4080	int state;	4036	int state;
4081		4037
4082	static const struct	4038	static const struct
…		…
4093	{ 5, PrivMode_rVideo },	4049	{ 5, PrivMode_rVideo },
4094	{ 6, PrivMode_relOrigin },	4050	{ 6, PrivMode_relOrigin },
4095	{ 7, PrivMode_Autowrap },	4051	{ 7, PrivMode_Autowrap },
4096	// 8, bi-directional support mode	4052	// 8, bi-directional support mode
4097	{ 9, PrivMode_MouseX10 },	4053	{ 9, PrivMode_MouseX10 },
4098	#ifdef menuBar_esc
4099	{ menuBar_esc, PrivMode_menuBar },
4100	#endif
4101	// 18, 19 printing-related	4054	// 18, 19 printing-related
4102	{ 25, PrivMode_VisibleCursor },	4055	{ 25, PrivMode_VisibleCursor },
4103	#ifdef scrollBar_esc	4056	#ifdef scrollBar_esc
4104	{ scrollBar_esc, PrivMode_scrollBar },	4057	{ scrollBar_esc, PrivMode_scrollBar },
4105	#endif	4058	#endif
…		…
4200	/* case 8: - auto repeat, can't do on a per window basis */	4153	/* case 8: - auto repeat, can't do on a per window basis */
4201	case 9: /* X10 mouse reporting */	4154	case 9: /* X10 mouse reporting */
4202	if (state) /* orthogonal */	4155	if (state) /* orthogonal */
4203	priv_modes &= ~PrivMode_MouseX11;	4156	priv_modes &= ~PrivMode_MouseX11;
4204	break;	4157	break;
4205	#ifdef menuBar_esc
4206	case menuBar_esc:
4207	#ifdef MENUBAR
4208	map_menuBar (state);
4209	#endif
4210	break;
4211	#endif
4212	#ifdef scrollBar_esc	4158	#ifdef scrollBar_esc
4213	case scrollBar_esc:	4159	case scrollBar_esc:
4214	if (scrollbar_mapping (state))	4160	if (scrollbar_mapping (state))
4215	{	4161	{
4216	resize_all_windows (0, 0, 0);	4162	resize_all_windows (0, 0, 0);
…		…
4386	scr_color (Color_bg, Color_bg);	4332	scr_color (Color_bg, Color_bg);
4387	break;	4333	break;
4388		4334
4389	//case 50: // not variable spacing	4335	//case 50: // not variable spacing
4390		4336
4391	#if ENABLE_FRILLS	4337	#if !ENABLE_MINIMAL
4392	case 90:	4338	case 90:
4393	case 91: /* set bright fg color */	4339	case 91: /* set bright fg color */
4394	case 92:	4340	case 92:
4395	case 93:	4341	case 93:
4396	case 94:	4342	case 94:
…		…
4461	rxvt_term::tt_write (const char *data, unsigned int len)	4407	rxvt_term::tt_write (const char *data, unsigned int len)
4462	{	4408	{
4463	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))	4409	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4464	return;	4410	return;
4465		4411
4466	if (pty.pty < 0)	4412	if (pty->pty < 0)
4467	return;	4413	return;
4468		4414
4469	if (v_buflen == 0)	4415	if (v_buflen == 0)
4470	{	4416	{
4471	ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));	4417	ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4472		4418
4473	if ((unsigned int)written == len)	4419	if ((unsigned int)written == len)
4474	return;	4420	return;
4475		4421
4476	data += written;	4422	data += written;
…		…
4485	pty_ev.set (EVENT_READ | EVENT_WRITE);	4431	pty_ev.set (EVENT_READ | EVENT_WRITE);
4486	}	4432	}
4487		4433
4488	void rxvt_term::pty_write ()	4434	void rxvt_term::pty_write ()
4489	{	4435	{
4490	int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));	4436	int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4491		4437
4492	if (written > 0)	4438	if (written > 0)
4493	{	4439	{
4494	v_buflen -= written;	4440	v_buflen -= written;
4495		4441

Diff Legend

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