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.250 by root, Sun Jan 8 06:35:23 2006 UTC vs.
Revision 1.308 by root, Mon Feb 20 19:42:55 2006 UTC

…		…
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);
…		…
867	#endif	871	#endif
868	/* nil */ ;	872	/* nil */ ;
869	}	873	}
870	}	874	}
871		875
872	if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_STR_LEN, kbuf, len, DT_END)))	876	if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
873	return;	877	return;
874		878
875	if (len <= 0)	879	if (len <= 0)
876	return; /* not mapped */	880	return; /* not mapped */
877		881
…		…
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;
…		…
1005	break;	1073	break;
1006	}	1074	}
1007	}	1075	}
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
		1372	if (ev.xany.window == vt
		1373	&& SHOULD_INVOKE (HOOK_X_EVENT)
		1374	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
		1375	return;
		1376
		1377	// for XQueryPointer
1316	Window unused_root, unused_child;	1378	Window unused_root, unused_child;
1317	int unused_root_x, unused_root_y;	1379	int unused_root_x, unused_root_y;
1318	unsigned int unused_mask;	1380	unsigned int unused_mask;
1319		1381
1320	switch (ev.type)	1382	switch (ev.type)
1321	{	1383	{
1322	case KeyPress:	1384	case KeyPress:
1323	#if ISO_14755	1385	key_press (ev.xkey);
1324	if (!(iso14755buf & ISO_14755_52))
1325	#endif
1326	lookup_key (ev.xkey);
1327
1328	break;	1386	break;
1329		1387
1330	case KeyRelease:	1388	case KeyRelease:
1331	{	1389	key_release (ev.xkey);
1332	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1333	KeySym ks;
1334
1335	ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1336	#endif
1337
1338	#if ENABLE_FRILLS || ISO_14755
1339	// ISO 14755 support
1340	if (iso14755buf)
1341	if (iso14755buf & ISO_14755_52)
1342	{
1343	# if ENABLE_OVERLAY
1344	scr_overlay_off ();
1345	# endif
1346	# if ISO_14755
1347	// iso14755 part 5.2 handling: release time
1348	// first: controls
1349	if ((ev.xkey.state & ControlMask)
1350	&& ((ks >= 0x40 && ks <= 0x5f)
1351	|| (ks >= 0x61 && ks <= 0x7f)))
1352	{
1353	iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1354	commit_iso14755 ();
1355	goto skip_switch;
1356	}
1357
1358	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1359	if (i[0] == ks)
1360	{
1361	iso14755buf = ISO_14755_51 | i[1];
1362	commit_iso14755 ();
1363	goto skip_switch;
1364	}
1365
1366	scr_bell ();
1367	# endif
1368	iso14755buf = 0;
1369	break;
1370	}
1371	else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1372	{
1373	# if ENABLE_OVERLAY
1374	scr_overlay_off ();
1375	# endif
1376	if (iso14755buf & ISO_14755_51)
1377	commit_iso14755 ();
1378	#if ISO_14755
1379	else if (iso14755buf & ISO_14755_STARTED)
1380	{
1381	iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1382
1383	scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1384	scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1385	}
1386	# endif
1387	else
1388	iso14755buf = 0;
1389	}
1390	#endif
1391
1392	if (ev.xany.window == vt
1393	&& HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_END)))
1394	break;
1395
1396	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1397	if (!(ev.xkey.state & ControlMask))
1398	slip_wheel_ev.stop ();
1399	else if (ks == XK_Control_L || ks == XK_Control_R)
1400	mouse_slip_wheel_speed = 0;
1401	#endif
1402	break;	1390	break;
1403	}
1404		1391
1405	case ButtonPress:	1392	case ButtonPress:
1406	button_press (ev.xbutton);	1393	button_press (ev.xbutton);
1407	break;	1394	break;
1408		1395
…		…
1410	button_release (ev.xbutton);	1397	button_release (ev.xbutton);
1411	break;	1398	break;
1412		1399
1413	case ClientMessage:	1400	case ClientMessage:
1414	if (ev.xclient.format == 32	1401	if (ev.xclient.format == 32
1415	&& ev.xclient.message_type == xa[XA_WM_PROTOCOLS])	1402	&& !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1416	{	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	{
1417	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)))
1418	destroy ();	1411	destroy ();
		1412	}
1419	#if ENABLE_EWMH	1413	#if ENABLE_EWMH
1420	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])
1421	XSendEvent (disp, ev.xclient.window = display->root,	1415	XSendEvent (dpy, ev.xclient.window = display->root,
1422	False, SubstructureRedirectMask | SubstructureNotifyMask,	1416	False, SubstructureRedirectMask | SubstructureNotifyMask,
1423	&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	}
1424	#endif	1429	#endif
1425	}	1430	}
1426	#if ENABLE_XEMBED
1427	else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1428	{
1429	if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1430	focus_in ();
1431	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1432	focus_out ();
1433	}
1434	#endif
1435	#ifdef OFFIX_DND
1436	/* OffiX Dnd (drag 'n' drop) protocol */
1437	else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1438	&& (ev.xclient.data.l[0] == DndFile
1439	|| ev.xclient.data.l[0] == DndDir
1440	|| ev.xclient.data.l[0] == DndLink))
1441	{
1442	/* Get Dnd data */
1443	Atom ActualType;
1444	int ActualFormat;
1445	unsigned char *data;
1446	unsigned long Size, RemainingBytes;
1447
1448	XGetWindowProperty (disp, display->root,
1449	xa[XA_DNDSELECTION],
1450	0L, 1000000L,
1451	False, AnyPropertyType,
1452	&ActualType, &ActualFormat,
1453	&Size, &RemainingBytes,
1454	&data);
1455	set_string_property (XA_CUT_BUFFER0, data);
1456	XFree (data);
1457	selection_paste (display->root, XA_CUT_BUFFER0, true);
1458	XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1459	}
1460	#endif /* OFFIX_DND */
1461	break;	1431	break;
1462		1432
1463	case MappingNotify:	1433	case MappingNotify:
1464	XRefreshKeyboardMapping (&ev.xmapping);	1434	XRefreshKeyboardMapping (&ev.xmapping);
1465	break;	1435	break;
…		…
1498	break;	1468	break;
1499		1469
1500	case ConfigureNotify:	1470	case ConfigureNotify:
1501	if (ev.xconfigure.window == parent[0])	1471	if (ev.xconfigure.window == parent[0])
1502	{	1472	{
1503	while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))	1473	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1504	;	1474	;
1505		1475
1506	if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)	1476	if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1507	{	1477	{
1508	seen_resize = 1;	1478	seen_resize = 1;
1509	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1479	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1510	}	1480	}
1511		1481
		1482	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
		1483
1512	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */	1484	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1513	if (OPTION (Opt_transparent))	1485	if (OPTION (Opt_transparent))
1514	check_our_parents ();	1486	check_our_parents ();
1515	#endif	1487	#endif
1516	}	1488	}
1517	break;	1489	break;
1518		1490
1519	case PropertyNotify:	1491	case PropertyNotify:
		1492	if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1520	if (ev.xproperty.atom == xa[XA_VT_SELECTION]	1493	if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1521	&& ev.xproperty.state == PropertyNewValue)	1494	&& ev.xproperty.state == PropertyNewValue)
1522	selection_property (ev.xproperty.window, ev.xproperty.atom);	1495	selection_property (ev.xproperty.window, ev.xproperty.atom);
1523		1496
1524	break;	1497	break;
1525		1498
1526	case SelectionClear:	1499	case SelectionClear:
1527	selection_clear ();	1500	selection_clear ();
…		…
1563	if (ev.xany.window == vt)	1536	if (ev.xany.window == vt)
1564	{	1537	{
1565	do	1538	do
1566	scr_expose (ev.xexpose.x, ev.xexpose.y,	1539	scr_expose (ev.xexpose.x, ev.xexpose.y,
1567	ev.xexpose.width, ev.xexpose.height, False);	1540	ev.xexpose.width, ev.xexpose.height, False);
1568	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));	1541	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1569		1542
1570	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1543	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1571		1544
1572	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))	1545	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1573	scr_expose (ev.xexpose.x, ev.xexpose.y,	1546	scr_expose (ev.xexpose.x, ev.xexpose.y,
1574	ev.xexpose.width, ev.xexpose.height, False);	1547	ev.xexpose.width, ev.xexpose.height, False);
1575		1548
1576	scr_refresh (refresh_type);	1549	want_refresh = 1;
1577	}	1550	}
1578	else	1551	else
1579	{	1552	{
1580	XEvent unused_event;	1553	XEvent unused_event;
1581		1554
1582	while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))	1555	while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1583	;	1556	;
1584	while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))	1557	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1585	;	1558	;
1586		1559
1587	if (isScrollbarWindow (ev.xany.window))	1560	if (isScrollbarWindow (ev.xany.window))
1588	{	1561	{
1589	scrollBar.setIdle ();	1562	scrollBar.setIdle ();
1590	scrollbar_show (0);	1563	scrollbar_show (0);
1591	}	1564	}
1592	#ifdef MENUBAR
1593	if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1594	menubar_expose ();
1595	#endif
1596		1565
1597	#ifdef TRANSPARENT	1566	#ifdef TRANSPARENT
1598	if (am_transparent && ev.xany.window == parent[0])	1567	if (am_transparent && ev.xany.window == parent[0])
1599	XClearWindow (disp, ev.xany.window);	1568	XClearWindow (dpy, ev.xany.window);
1600	#endif	1569	#endif
1601	}	1570	}
1602	break;	1571	break;
1603		1572
1604	case MotionNotify:	1573	case MotionNotify:
1605	#ifdef POINTER_BLANK	1574	#ifdef POINTER_BLANK
1606	if (hidden_pointer)	1575	if (hidden_pointer)
1607	pointer_unblank ();	1576	pointer_unblank ();
1608	#endif	1577	#endif
1609	#if MENUBAR
1610	if (isMenuBarWindow (ev.xany.window))
1611	{
1612	menubar_control (ev.xbutton);
1613	break;
1614	}
1615	#endif
1616	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)	1578	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1617	break;	1579	break;
1618		1580
1619	if (ev.xany.window == vt)	1581	if (ev.xany.window == vt)
1620	{	1582	{
		1583	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1621	if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))	1584	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1622	; // nop	1585	; // nop
1623	else if (ev.xbutton.state & (Button1Mask | Button3Mask))	1586	else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1624	{	1587	{
1625	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))	1588	while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1626	;	1589	;
1627		1590
1628	XQueryPointer (disp, vt,	1591	XQueryPointer (dpy, vt,
1629	&unused_root, &unused_child,	1592	&unused_root, &unused_child,
1630	&unused_root_x, &unused_root_y,	1593	&unused_root_x, &unused_root_y,
1631	&ev.xbutton.x, &ev.xbutton.y,	1594	&ev.xbutton.x, &ev.xbutton.y,
1632	&ev.xbutton.state);	1595	&ev.xbutton.state);
1633	#ifdef MOUSE_THRESHOLD	1596	#ifdef MOUSE_THRESHOLD
…		…
1697	#endif	1660	#endif
1698	}	1661	}
1699	}	1662	}
1700	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1663	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1701	{	1664	{
1702	while (XCheckTypedWindowEvent (disp, scrollBar.win,	1665	while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1703	MotionNotify, &ev))	1666	MotionNotify, &ev))
1704	;	1667	;
1705		1668
1706	XQueryPointer (disp, scrollBar.win,	1669	XQueryPointer (dpy, scrollBar.win,
1707	&unused_root, &unused_child,	1670	&unused_root, &unused_child,
1708	&unused_root_x, &unused_root_y,	1671	&unused_root_x, &unused_root_y,
1709	&ev.xbutton.x, &ev.xbutton.y,	1672	&ev.xbutton.x, &ev.xbutton.y,
1710	&unused_mask);	1673	&unused_mask);
1711	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1674	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1712	scrollbar_size ());	1675	scrollbar_size ());
1713	scr_refresh (refresh_type);	1676	want_refresh = 1;
1714	refresh_limit = 0;	1677	refresh_limit = 0;
1715	scrollbar_show (1);	1678	scrollbar_show (1);
1716	}	1679	}
1717	break;	1680	break;
1718	}	1681	}
1719		1682
1720	skip_switch: ;
1721
1722	#if defined(CURSOR_BLINK)	1683	#if defined(CURSOR_BLINK)
1723	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)	1684	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1724	{	1685	{
1725	if (hidden_cursor)	1686	if (hidden_cursor)
1726	{	1687	{
1727	hidden_cursor = 0;	1688	hidden_cursor = 0;
1728	want_refresh = 1;	1689	want_refresh = 1;
1729	}	1690	}
1730		1691
1731	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1692	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1732	}	1693	}
1733	#endif	1694	#endif
1734		1695
1735	#if defined(POINTER_BLANK)	1696	#if defined(POINTER_BLANK)
1736	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)	1697	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
…		…
1753	if (!focus)	1714	if (!focus)
1754	{	1715	{
1755	focus = 1;	1716	focus = 1;
1756	want_refresh = 1;	1717	want_refresh = 1;
1757		1718
1758	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));	1719	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1759		1720
1760	#if USE_XIM	1721	#if USE_XIM
1761	if (Input_Context != NULL)	1722	if (Input_Context != NULL)
1762	{	1723	{
1763	IMSetStatusPosition ();	1724	IMSetPosition ();
1764	XSetICFocus (Input_Context);	1725	XSetICFocus (Input_Context);
1765	}	1726	}
1766	#endif	1727	#endif
1767	#if CURSOR_BLINK	1728	#if CURSOR_BLINK
1768	if (OPTION (Opt_cursorBlink))	1729	if (OPTION (Opt_cursorBlink))
1769	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1730	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1770	#endif	1731	#endif
1771	#if OFF_FOCUS_FADING	1732	#if OFF_FOCUS_FADING
1772	if (rs[Rs_fade])	1733	if (rs[Rs_fade])
1773	{	1734	{
1774	pix_colors = pix_colors_focused;	1735	pix_colors = pix_colors_focused;
…		…
1818		1779
1819	#if TRANSPARENT	1780	#if TRANSPARENT
1820	void	1781	void
1821	rxvt_term::rootwin_cb (XEvent &ev)	1782	rxvt_term::rootwin_cb (XEvent &ev)
1822	{	1783	{
1823	SET_R (this);	1784	make_current ();
1824	SET_LOCALE (locale);
1825		1785
1826	switch (ev.type)	1786	switch (ev.type)
1827	{	1787	{
1828	case PropertyNotify:	1788	case PropertyNotify:
1829	/*	1789	/*
…		…
1856	/*	1816	/*
1857	* VT window processing of button press	1817	* VT window processing of button press
1858	*/	1818	*/
1859	if (ev.window == vt)	1819	if (ev.window == vt)
1860	{	1820	{
		1821	if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
		1822	return;
		1823
1861	#if ISO_14755	1824	#if ISO_14755
1862	// 5.4	1825	// 5.4
1863	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))	1826	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1864	{	1827	{
1865	iso14755_54 (ev.x, ev.y);	1828	iso14755_54 (ev.x, ev.y);
…		…
1907	else	1870	else
1908	{	1871	{
1909	if (ev.button != MEvent.button)	1872	if (ev.button != MEvent.button)
1910	MEvent.clicks = 0;	1873	MEvent.clicks = 0;
1911		1874
1912	if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1913	switch (ev.button)	1875	switch (ev.button)
1914	{	1876	{
1915	case Button1:	1877	case Button1:
1916	/* allow meta + click to select rectangular areas */	1878	/* allow meta + click to select rectangular areas */
1917	/* should be done in screen.C */	1879	/* should be done in screen.C */
1918	#if ENABLE_FRILLS	1880	#if ENABLE_FRILLS
1919	selection.rect = !!(ev.state & ModMetaMask);	1881	selection.rect = !!(ev.state & ModMetaMask);
1920	#else	1882	#else
1921	selection.rect = false;	1883	selection.rect = false;
1922	#endif	1884	#endif
1923		1885
1924	/* allow shift+left click to extend selection */	1886	/* allow shift+left click to extend selection */
1925	if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))	1887	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1926	{	1888	{
1927	if (MEvent.button == Button1 && clickintime)	1889	if (MEvent.button == Button1 && clickintime)
1928	selection_rotate (ev.x, ev.y);	1890	selection_rotate (ev.x, ev.y);
1929	else	1891	else
1930	selection_extend (ev.x, ev.y, 1);	1892	selection_extend (ev.x, ev.y, 1);
1931	}	1893	}
1932	else	1894	else
1933	{	1895	{
1934	if (MEvent.button == Button1 && clickintime)	1896	if (MEvent.button == Button1 && clickintime)
1935	MEvent.clicks++;	1897	MEvent.clicks++;
1936	else	1898	else
1937	MEvent.clicks = 1;	1899	MEvent.clicks = 1;
1938		1900
1939	selection_click (MEvent.clicks, ev.x, ev.y);	1901	selection_click (MEvent.clicks, ev.x, ev.y);
1940	}	1902	}
1941		1903
1942	MEvent.button = Button1;	1904	MEvent.button = Button1;
1943	break;	1905	break;
1944		1906
1945	case Button3:	1907	case Button3:
1946	if (MEvent.button == Button3 && clickintime)	1908	if (MEvent.button == Button3 && clickintime)
1947	selection_rotate (ev.x, ev.y);	1909	selection_rotate (ev.x, ev.y);
1948	else	1910	else
1949	selection_extend (ev.x, ev.y, 1);	1911	selection_extend (ev.x, ev.y, 1);
1950		1912
1951	MEvent.button = Button3;	1913	MEvent.button = Button3;
1952	break;	1914	break;
1953	}	1915	}
1954	}	1916	}
1955		1917
1956	MEvent.time = ev.time;	1918	MEvent.time = ev.time;
1957	return;	1919	return;
1958	}	1920	}
1959		1921
…		…
2098	}	2060	}
2099	}	2061	}
2100		2062
2101	return;	2063	return;
2102	}	2064	}
2103
2104	#if MENUBAR
2105	/*
2106	* Menubar window processing of button press
2107	*/
2108	if (isMenuBarWindow (ev.window))
2109	menubar_control (ev);
2110	#endif
2111	}	2065	}
2112		2066
2113	void	2067	void
2114	rxvt_term::button_release (XButtonEvent &ev)	2068	rxvt_term::button_release (XButtonEvent &ev)
2115	{	2069	{
…		…
2121		2075
2122	if (scrollbar_isUpDn ())	2076	if (scrollbar_isUpDn ())
2123	{	2077	{
2124	scrollBar.setIdle ();	2078	scrollBar.setIdle ();
2125	scrollbar_show (0);	2079	scrollbar_show (0);
2126	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2127	refresh_type &= ~SMOOTH_REFRESH;
2128	#endif
2129	}	2080	}
2130		2081
2131	#ifdef SELECTION_SCROLLING	2082	#ifdef SELECTION_SCROLLING
2132	if (sel_scroll_ev.active)	2083	if (sel_scroll_ev.active)
2133	sel_scroll_ev.stop();	2084	sel_scroll_ev.stop();
2134	#endif	2085	#endif
2135		2086
2136	if (ev.window == vt)	2087	if (ev.window == vt)
2137	{	2088	{
		2089	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
		2090	return;
		2091
2138	#if ISO_14755	2092	#if ISO_14755
2139	// 5.4	2093	// 5.4
2140	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))	2094	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2141	return;	2095	return;
2142	#endif	2096	#endif
		2097
2143	if (reportmode)	2098	if (reportmode)
2144	{	2099	{
2145	/* mouse report from vt window */	2100	/* mouse report from vt window */
2146	/* don't report release of wheel "buttons" */	2101	/* don't report release of wheel "buttons" */
2147	if (ev.button >= 4)	2102	if (ev.button >= 4)
…		…
2171	if (priv_modes & PrivMode_mouse_report	2126	if (priv_modes & PrivMode_mouse_report
2172	&& bypass_keystate	2127	&& bypass_keystate
2173	&& ev.button == Button1 && MEvent.clicks <= 1)	2128	&& ev.button == Button1 && MEvent.clicks <= 1)
2174	selection_extend (ev.x, ev.y, 0);	2129	selection_extend (ev.x, ev.y, 0);
2175		2130
2176	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2177	return;
2178
2179	switch (ev.button)	2131	switch (ev.button)
2180	{	2132	{
2181	case Button1:	2133	case Button1:
2182	case Button3:	2134	case Button3:
2183	selection_make (ev.time);	2135	selection_make (ev.time);
2184	break;	2136	break;
		2137
2185	case Button2:	2138	case Button2:
2186	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);
2187	break;	2141	break;
		2142
2188	#ifdef MOUSE_WHEEL	2143	#ifdef MOUSE_WHEEL
2189	case Button4:	2144	case Button4:
2190	case Button5:	2145	case Button5:
2191	{	2146	{
2192	int i;	2147	int i;
…		…
2214	slip_wheel_ev.start ();	2169	slip_wheel_ev.start ();
2215	}	2170	}
2216	else	2171	else
2217	{	2172	{
2218	# endif	2173	# endif
2219	# ifdef JUMP_MOUSE_WHEEL
2220	scr_page (v, i);	2174	scr_page (v, i);
2221	scr_refresh (SMOOTH_REFRESH);
2222	scrollbar_show (1);	2175	scrollbar_show (1);
2223	# else
2224	while (i--)
2225	{
2226	scr_page (v, 1);
2227	scr_refresh (SMOOTH_REFRESH);
2228	scrollbar_show (1);
2229	}
2230	# endif
2231	# ifdef MOUSE_SLIP_WHEELING	2176	# ifdef MOUSE_SLIP_WHEELING
2232	}	2177	}
2233	#endif	2178	# endif
2234	}	2179	}
2235	break;	2180	break;
2236	#endif	2181	#endif
2237	}	2182	}
2238	}	2183	}
2239	#ifdef MENUBAR
2240	else if (isMenuBarWindow (ev.window))
2241	menubar_control (ev);
2242	#endif
2243	}	2184	}
2244		2185
2245	#ifdef TRANSPARENT	2186	#ifdef TRANSPARENT
2246	#if TINTING	2187	#if TINTING
2247	/* taken from aterm-0.4.2 */	2188	/* taken from aterm-0.4.2 */
2248		2189
2249	typedef uint32_t RUINT32T;	2190	typedef uint32_t RUINT32T;
2250		2191
2251	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)
2252	{	2193	{
2253	int sh_r, sh_g, sh_b;	2194	int sh_r, sh_g, sh_b;
2254	RUINT32T mask_r, mask_g, mask_b;	2195	RUINT32T mask_r, mask_g, mask_b;
2255	RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;	2196	RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2256	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;	2197	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2257	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;	2198	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2258	int i;	2199	int i;
2259		2200
2260	Visual *visual = display->visual;	2201	Visual *visual = term->visual;
2261		2202
2262	if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;	2203	if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2263		2204
2264	/* for convenience */	2205	/* for convenience */
2265	mask_r = visual->red_mask;	2206	mask_r = visual->red_mask;
…		…
2486	Atom atype;	2427	Atom atype;
2487	unsigned char *prop = NULL;	2428	unsigned char *prop = NULL;
2488	Window root, oldp, *list;	2429	Window root, oldp, *list;
2489	Pixmap rootpixmap = None;	2430	Pixmap rootpixmap = None;
2490	XWindowAttributes wattr, wrootattr;	2431	XWindowAttributes wattr, wrootattr;
2491	dDisp;
2492		2432
2493	pchanged = 0;	2433	pchanged = 0;
2494		2434
2495	if (!OPTION (Opt_transparent))	2435	if (!OPTION (Opt_transparent))
2496	return pchanged; /* Don't try any more */	2436	return pchanged; /* Don't try any more */
2497		2437
2498	XGetWindowAttributes (disp, display->root, &wrootattr);	2438	XGetWindowAttributes (dpy, display->root, &wrootattr);
2499	rootdepth = wrootattr.depth;	2439	rootdepth = wrootattr.depth;
2500		2440
2501	XGetWindowAttributes (disp, parent[0], &wattr);	2441	XGetWindowAttributes (dpy, parent[0], &wattr);
2502		2442
2503	if (rootdepth != wattr.depth)	2443	if (rootdepth != wattr.depth)
2504	{	2444	{
2505	if (am_transparent)	2445	if (am_transparent)
2506	{	2446	{
2507	pchanged = 1;	2447	pchanged = 1;
2508	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2448	XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2509	am_transparent = am_pixmap_trans = 0;	2449	am_transparent = am_pixmap_trans = 0;
2510	}	2450	}
2511		2451
2512	return pchanged; /* Don't try any more */	2452	return pchanged; /* Don't try any more */
2513	}	2453	}
2514		2454
2515	/* 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. */
2516	XSync (disp, False);	2456	XSync (dpy, False);
2517		2457
2518	/*	2458	/*
2519	* Make the frame window set by the window manager have	2459	* Make the frame window set by the window manager have
2520	* the root background. Some window managers put multiple nested frame	2460	* the root background. Some window managers put multiple nested frame
2521	* 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.
2522	*/	2462	*/
2523	i = (xa[XA_XROOTPMAP_ID]	2463	i = (xa[XA_XROOTPMAP_ID]
2524	&& XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],	2464	&& XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2525	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2465	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2526	&nitems, &bytes_after, &prop) == Success);	2466	&nitems, &bytes_after, &prop) == Success);
2527		2467
2528	if (!i || prop == NULL)	2468	if (!i || prop == NULL)
2529	i = (xa[XA_ESETROOT_PMAP_ID]	2469	i = (xa[XA_ESETROOT_PMAP_ID]
2530	&& XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],	2470	&& XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2531	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2471	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2532	&nitems, &bytes_after, &prop) == Success);	2472	&nitems, &bytes_after, &prop) == Success);
2533		2473
2534	if (!i || prop == NULL	2474	if (!i || prop == NULL
2535	#if TINTING	2475	#if TINTING
2536	|| !rs[Rs_color + Color_tint]	2476	|| !ISSET_PIXCOLOR (Color_tint)
2537	#endif	2477	#endif
2538	)	2478	)
2539	have_pixmap = 0;	2479	have_pixmap = 0;
2540	else	2480	else
2541	{	2481	{
…		…
2554	Window cr;	2494	Window cr;
2555	XImage *image;	2495	XImage *image;
2556	GC gc;	2496	GC gc;
2557	XGCValues gcvalue;	2497	XGCValues gcvalue;
2558		2498
2559	XTranslateCoordinates (disp, parent[0], display->root,	2499	XTranslateCoordinates (dpy, parent[0], display->root,
2560	0, 0, &sx, &sy, &cr);	2500	0, 0, &sx, &sy, &cr);
2561	nw = (unsigned int)szHint.width;	2501	nw = (unsigned int)szHint.width;
2562	nh = (unsigned int)szHint.height;	2502	nh = (unsigned int)szHint.height;
2563	nx = ny = 0;	2503	nx = ny = 0;
2564		2504
…		…
2577	}	2517	}
2578		2518
2579	min_it (nw, (unsigned int) (wrootattr.width - sx));	2519	min_it (nw, (unsigned int) (wrootattr.width - sx));
2580	min_it (nh, (unsigned int) (wrootattr.height - sy));	2520	min_it (nh, (unsigned int) (wrootattr.height - sy));
2581		2521
2582	XSync (disp, False);	2522	XSync (dpy, False);
2583	allowedxerror = -1;	2523	allowedxerror = -1;
2584	image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);	2524	image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2585		2525
2586	/* XXX: handle BadMatch - usually because we're outside the pixmap */	2526	/* XXX: handle BadMatch - usually because we're outside the pixmap */
2587	/* XXX: may need a delay here? */	2527	/* XXX: may need a delay here? */
2588	allowedxerror = 0;	2528	allowedxerror = 0;
2589		2529
…		…
2592	if (am_transparent && am_pixmap_trans)	2532	if (am_transparent && am_pixmap_trans)
2593	{	2533	{
2594	pchanged = 1;	2534	pchanged = 1;
2595	if (pixmap != None)	2535	if (pixmap != None)
2596	{	2536	{
2597	XFreePixmap (disp, pixmap);	2537	XFreePixmap (dpy, pixmap);
2598	pixmap = None;	2538	pixmap = None;
2599	}	2539	}
2600	}	2540	}
2601		2541
2602	am_pixmap_trans = 0;	2542	am_pixmap_trans = 0;
2603	}	2543	}
2604	else	2544	else
2605	{	2545	{
2606	if (pixmap != None)	2546	if (pixmap != None)
2607	XFreePixmap (disp, pixmap);	2547	XFreePixmap (dpy, pixmap);
2608		2548
2609	#if TINTING	2549	#if TINTING
2610	if (ISSET_PIXCOLOR (Color_tint))	2550	if (ISSET_PIXCOLOR (Color_tint))
2611	{	2551	{
2612	unsigned short rm, gm, bm;
2613	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;	2552	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2614		2553
		2554	rgba c;
2615	pix_colors_focused[Color_tint].get (display, rm, gm, bm);	2555	pix_colors_focused [Color_tint].get (c);
2616		2556
2617	ShadeXImage (display, image, shade, rm, gm, bm);	2557	ShadeXImage (this, image, shade, c.r, c.g, c.b);
2618	}	2558	}
2619	#endif	2559	#endif
2620		2560
2621	pixmap = XCreatePixmap (disp, vt,	2561	pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2622	szHint.width, szHint.height, image->depth);
2623	gc = XCreateGC (disp, vt, 0UL, &gcvalue);	2562	gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2624	XPutImage (disp, pixmap, gc, image, 0, 0,	2563	XPutImage (dpy, pixmap, gc, image, 0, 0,
2625	nx, ny, image->width, image->height);	2564	nx, ny, image->width, image->height);
2626	XFreeGC (disp, gc);	2565	XFreeGC (dpy, gc);
2627	XDestroyImage (image);	2566	XDestroyImage (image);
2628	XSetWindowBackgroundPixmap (disp, parent[0], pixmap);	2567	XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2629	XClearWindow (disp, parent[0]);	2568	XClearWindow (dpy, parent[0]);
2630		2569
2631	if (!am_transparent || !am_pixmap_trans)	2570	if (!am_transparent || !am_pixmap_trans)
2632	pchanged = 1;	2571	pchanged = 1;
2633		2572
2634	am_transparent = am_pixmap_trans = 1;	2573	am_transparent = am_pixmap_trans = 1;
2635	}	2574	}
2636	}	2575	}
2637		2576
2638	if (am_pixmap_trans)	2577	if (am_pixmap_trans)
2639	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2578	XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2640	else	2579	else
2641	{	2580	{
2642	unsigned int n;	2581	unsigned int n;
2643	/*	2582	/*
2644	* InheritPixmap transparency	2583	* InheritPixmap transparency
2645	*/	2584	*/
2646	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2585	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2647	{	2586	{
2648	oldp = parent[i];	2587	oldp = parent[i];
2649	XQueryTree (disp, parent[i - 1], &root,	2588	XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2650	&parent[i], &list, &n);
2651	XFree (list);	2589	XFree (list);
2652		2590
2653	if (parent[i] == display->root)	2591	if (parent[i] == display->root)
2654	{	2592	{
2655	if (oldp != None)	2593	if (oldp != None)
…		…
2663	}	2601	}
2664		2602
2665	n = 0;	2603	n = 0;
2666		2604
2667	if (pchanged)	2605	if (pchanged)
2668	{
2669	for (; n < (unsigned int)i; n++)	2606	for (; n < (unsigned int)i; n++)
2670	{	2607	{
2671	XGetWindowAttributes (disp, parent[n], &wattr);	2608	XGetWindowAttributes (dpy, parent[n], &wattr);
		2609
2672	if (wattr.depth != rootdepth || wattr.c_class == InputOnly)	2610	if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2673	{	2611	{
2674	n = (int) (sizeof (parent) / sizeof (Window)) + 1;	2612	n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2675	break;	2613	break;
2676	}	2614	}
2677	}	2615	}
2678	}
2679		2616
2680	if (n > (int) (sizeof (parent) / sizeof (parent[0])))	2617	if (n > (sizeof (parent) / sizeof (parent[0])))
2681	{	2618	{
2682	XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);	2619	XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2683	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2620	XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2684	am_transparent = 0;	2621	am_transparent = 0;
2685	/* XXX: also turn off Opt_transparent? */	2622	/* XXX: also turn off Opt_transparent? */
2686	}	2623	}
2687	else	2624	else
2688	{	2625	{
2689	#if WAIT_FOR_WM
2690	/* wait (an arbitrary period) for the WM to do its thing
2691	* needed for fvwm2.2.2 (and before?) */
2692	sleep (1);
2693	#endif
2694	for (n = 0; n < (unsigned int)i; n++)	2626	for (n = 0; n < (unsigned int)i; n++)
2695	{	2627	{
2696	XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);	2628	XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2697	XClearWindow (disp, parent[n]);	2629	XClearWindow (dpy, parent[n]);
2698	}	2630	}
2699		2631
2700	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2632	XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2701	am_transparent = 1;	2633	am_transparent = 1;
2702	}	2634	}
2703		2635
2704	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2636	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2705	parent[i] = None;	2637	parent[i] = None;
2706	}	2638	}
2707		2639
2708	if (scrollBar.win)	2640	if (scrollBar.win)
2709	{	2641	{
2710	XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);	2642	XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2711	scrollBar.setIdle ();	2643	scrollBar.setIdle ();
2712	scrollbar_show (0);	2644	scrollbar_show (0);
2713	}	2645	}
2714		2646
2715	if (am_transparent)	2647	if (am_transparent)
…		…
2790	}	2722	}
2791		2723
2792	// scr_add_lines only works for nlines <= nrow - 1.	2724	// scr_add_lines only works for nlines <= nrow - 1.
2793	if (nlines >= nrow - 1)	2725	if (nlines >= nrow - 1)
2794	{	2726	{
		2727	if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2795	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))))
2796	scr_add_lines (buf, str - buf, nlines);	2729	scr_add_lines (buf, str - buf, nlines);
2797		2730
2798	nlines = 0;	2731	nlines = 0;
2799	str = buf;	2732	str = buf;
2800	eol = str + min (ncol, UBUFSIZ);	2733	eol = str + min (ncol, UBUFSIZ);
…		…
2815		2748
2816	seq_begin = cmdbuf_ptr;	2749	seq_begin = cmdbuf_ptr;
2817	ch = next_char ();	2750	ch = next_char ();
2818	}	2751	}
2819		2752
		2753	if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2820	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))))
2821	scr_add_lines (buf, str - buf, nlines);	2755	scr_add_lines (buf, str - buf, nlines);
2822		2756
2823	/*	2757	/*
2824	* 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
2825	* 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.
…		…
2831	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)	2765	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2832	refresh_limit++;	2766	refresh_limit++;
2833	else	2767	else
2834	{	2768	{
2835	flag = true;	2769	flag = true;
2836	scr_refresh (refresh_type);	2770	scr_refresh ();
2837	flush_ev.stop ();	2771	want_refresh = 1;
2838	}	2772	}
2839	}	2773	}
2840		2774
2841	}	2775	}
2842	else	2776	else
…		…
2859	return flag;	2793	return flag;
2860	}	2794	}
2861		2795
2862	// read the next character	2796	// read the next character
2863	wchar_t	2797	wchar_t
2864	rxvt_term::next_char ()	2798	rxvt_term::next_char () NOTHROW
2865	{	2799	{
2866	while (cmdbuf_ptr < cmdbuf_endp)	2800	while (cmdbuf_ptr < cmdbuf_endp)
2867	{	2801	{
2868	// assume 7-bit to be ascii ALWAYS	2802	// assume 7-bit to be ascii ALWAYS
2869	if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)	2803	if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
…		…
2890	return NOCHAR;	2824	return NOCHAR;
2891	}	2825	}
2892		2826
2893	// read the next octet	2827	// read the next octet
2894	uint32_t	2828	uint32_t
2895	rxvt_term::next_octet ()	2829	rxvt_term::next_octet () NOTHROW
2896	{	2830	{
2897	return cmdbuf_ptr < cmdbuf_endp	2831	return cmdbuf_ptr < cmdbuf_endp
2898	? (unsigned char)*cmdbuf_ptr++	2832	? (unsigned char)*cmdbuf_ptr++
2899	: NOCHAR;	2833	: NOCHAR;
2900	}	2834	}
		2835
		2836	static class out_of_input out_of_input;
2901		2837
2902	/* rxvt_cmd_getc () - Return next input character */	2838	/* rxvt_cmd_getc () - Return next input character */
2903	/*	2839	/*
2904	* Return the next input character after first passing any keyboard input	2840	* Return the next input character after first passing any keyboard input
2905	* to the command.	2841	* to the command.
2906	*/	2842	*/
2907	wchar_t	2843	wchar_t
2908	rxvt_term::cmd_getc ()	2844	rxvt_term::cmd_getc () THROW ((class out_of_input))
2909	{	2845	{
2910	wchar_t c = next_char ();	2846	wchar_t c = next_char ();
2911		2847
2912	if (c == NOCHAR)	2848	if (c == NOCHAR)
2913	throw out_of_input;	2849	throw out_of_input;
2914		2850
2915	return c;	2851	return c;
2916	}	2852	}
2917		2853
2918	uint32_t	2854	uint32_t
2919	rxvt_term::cmd_get8 ()	2855	rxvt_term::cmd_get8 () THROW ((class out_of_input))
2920	{	2856	{
2921	uint32_t c = next_octet ();	2857	uint32_t c = next_octet ();
2922		2858
2923	if (c == NOCHAR)	2859	if (c == NOCHAR)
2924	throw out_of_input;	2860	throw out_of_input;
…		…
3162	scr_charset_set (2, (unsigned int)cmd_getc ());	3098	scr_charset_set (2, (unsigned int)cmd_getc ());
3163	break;	3099	break;
3164	case '+':	3100	case '+':
3165	scr_charset_set (3, (unsigned int)cmd_getc ());	3101	scr_charset_set (3, (unsigned int)cmd_getc ());
3166	break;	3102	break;
3167	#if ENABLE_FRILLS	3103	#if !ENABLE_MINIMAL
3168	case '6':	3104	case '6':
3169	scr_backindex ();	3105	scr_backindex ();
3170	break;	3106	break;
3171	#endif	3107	#endif
3172	case '7':	3108	case '7':
3173	scr_cursor (SAVE);	3109	scr_cursor (SAVE);
3174	break;	3110	break;
3175	case '8':	3111	case '8':
3176	scr_cursor (RESTORE);	3112	scr_cursor (RESTORE);
3177	break;	3113	break;
3178	#if ENABLE_FRILLS	3114	#if !ENABLE_MINIMAL
3179	case '9':	3115	case '9':
3180	scr_forwardindex ();	3116	scr_forwardindex ();
3181	break;	3117	break;
3182	#endif	3118	#endif
3183	case '=':	3119	case '=':
…		…
3345	ndef = get_byte_array_bit (csi_defaults, i);	3281	ndef = get_byte_array_bit (csi_defaults, i);
3346	for (p = 0; p < nargs; p++)	3282	for (p = 0; p < nargs; p++)
3347	if (arg[p] == -1)	3283	if (arg[p] == -1)
3348	arg[p] = ndef;	3284	arg[p] = ndef;
3349		3285
3350	#ifdef DEBUG_CMD
3351	fprintf (stderr, "CSI ");
3352	for (p = 0; p < nargs; p++)
3353	fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3354	fprintf (stderr, "%c\n", ch);
3355	#endif
3356
3357	/*	3286	/*
3358	* private mode handling	3287	* private mode handling
3359	*/	3288	*/
3360	if (priv)	3289	if (priv)
3361	{	3290	{
3362	switch (priv)	3291	switch (priv)
3363	{	3292	{
3364	case '>':	3293	case '>':
3365	if (ch == CSI_DA) /* secondary device attributes */	3294	if (ch == CSI_DA) /* secondary device attributes */
3366	tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);	3295	{
		3296	// first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
		3297	// 'U' for rxvt-unicode != 7.[34] (where it was broken).
		3298	//
		3299	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
		3300	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
		3301	// that we do not support xterm mouse reporting (should be 95 when we do).
		3302	//
		3303	tt_printf ("\033[>%d;94;0c", 'U');
		3304	}
3367	break;	3305	break;
3368	case '?':	3306	case '?':
3369	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')	3307	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3370	process_terminal_mode (ch, priv, nargs, arg);	3308	process_terminal_mode (ch, priv, nargs, arg);
3371	break;	3309	break;
…		…
3574	break;	3512	break;
3575	case CSI_75:	3513	case CSI_75:
3576	scr_cursor (RESTORE);	3514	scr_cursor (RESTORE);
3577	break;	3515	break;
3578		3516
3579	#if ENABLE_FRILLS	3517	#if !ENABLE_MINIMAL
3580	case CSI_74:	3518	case CSI_74:
3581	process_window_ops (arg, nargs);	3519	process_window_ops (arg, nargs);
3582	break;	3520	break;
3583	#endif	3521	#endif
3584		3522
…		…
3591	break;	3529	break;
3592	}	3530	}
3593	}	3531	}
3594	/*}}} */	3532	/*}}} */
3595		3533
3596	#if ENABLE_FRILLS	3534	#if !ENABLE_MINIMAL
3597	/* ARGSUSED */	3535	/* ARGSUSED */
3598	void	3536	void
3599	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3537	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3600	{	3538	{
3601	int x, y;	3539	int x, y;
3602	XWindowAttributes wattr;	3540	XWindowAttributes wattr;
3603	Window wdummy;	3541	Window wdummy;
3604	dDisp;	3542
		3543	dLocal (Display *, dpy);
3605		3544
3606	if (nargs == 0)	3545	if (nargs == 0)
3607	return;	3546	return;
3608		3547
3609	switch (args[0])	3548	switch (args[0])
3610	{	3549	{
3611	/*	3550	/*
3612	* commands	3551	* commands
3613	*/	3552	*/
3614	case 1: /* deiconify window */	3553	case 1: /* deiconify window */
3615	XMapWindow (disp, parent[0]);	3554	XMapWindow (dpy, parent[0]);
3616	break;	3555	break;
3617	case 2: /* iconify window */	3556	case 2: /* iconify window */
3618	XIconifyWindow (disp, parent[0], display->screen);	3557	XIconifyWindow (dpy, parent[0], display->screen);
3619	break;	3558	break;
3620	case 3: /* set position (pixels) */	3559	case 3: /* set position (pixels) */
3621	XMoveWindow (disp, parent[0], args[1], args[2]);	3560	XMoveWindow (dpy, parent[0], args[1], args[2]);
3622	break;	3561	break;
3623	case 4: /* set size (pixels) */	3562	case 4: /* set size (pixels) */
3624	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3563	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3625	break;	3564	break;
3626	case 5: /* raise window */	3565	case 5: /* raise window */
3627	XRaiseWindow (disp, parent[0]);	3566	XRaiseWindow (dpy, parent[0]);
3628	break;	3567	break;
3629	case 6: /* lower window */	3568	case 6: /* lower window */
3630	XLowerWindow (disp, parent[0]);	3569	XLowerWindow (dpy, parent[0]);
3631	break;	3570	break;
3632	case 7: /* refresh window */	3571	case 7: /* refresh window */
3633	scr_touch (true);	3572	scr_touch (true);
3634	break;	3573	break;
3635	case 8: /* set size (chars) */	3574	case 8: /* set size (chars) */
…		…
3642	if (args[0] >= 24) /* set height (chars) */	3581	if (args[0] >= 24) /* set height (chars) */
3643	set_widthheight ((unsigned int)width,	3582	set_widthheight ((unsigned int)width,
3644	(unsigned int) (args[1] * fheight));	3583	(unsigned int) (args[1] * fheight));
3645	break;	3584	break;
3646		3585
3647
3648	/*	3586	/*
3649	* reports - some output format copied from XTerm	3587	* reports - some output format copied from XTerm
3650	*/	3588	*/
3651	case 11: /* report window state */	3589	case 11: /* report window state */
3652	XGetWindowAttributes (disp, parent[0], &wattr);	3590	XGetWindowAttributes (dpy, parent[0], &wattr);
3653	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3591	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3654	break;	3592	break;
3655	case 13: /* report window position */	3593	case 13: /* report window position */
3656	XGetWindowAttributes (disp, parent[0], &wattr);	3594	XGetWindowAttributes (dpy, parent[0], &wattr);
3657	XTranslateCoordinates (disp, parent[0], wattr.root,	3595	XTranslateCoordinates (dpy, parent[0], wattr.root,
3658	-wattr.border_width, -wattr.border_width,	3596	-wattr.border_width, -wattr.border_width,
3659	&x, &y, &wdummy);	3597	&x, &y, &wdummy);
3660	tt_printf ("\033[3;%d;%dt", x, y);	3598	tt_printf ("\033[3;%d;%dt", x, y);
3661	break;	3599	break;
3662	case 14: /* report window size (pixels) */	3600	case 14: /* report window size (pixels) */
3663	XGetWindowAttributes (disp, parent[0], &wattr);	3601	XGetWindowAttributes (dpy, parent[0], &wattr);
3664	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3602	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3665	break;	3603	break;
3666	case 18: /* report text area size (chars) */	3604	case 18: /* report text area size (chars) */
3667	tt_printf ("\033[8;%d;%dt", nrow, ncol);	3605	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3668	break;	3606	break;
…		…
3670	tt_printf ("\033[9;%d;%dt", nrow, ncol);	3608	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3671	break;	3609	break;
3672	case 20: /* report icon label */	3610	case 20: /* report icon label */
3673	{	3611	{
3674	char *s;	3612	char *s;
3675	XGetIconName (disp, parent[0], &s);	3613	XGetIconName (dpy, parent[0], &s);
3676	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3614	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3677	XFree (s);	3615	XFree (s);
3678	}	3616	}
3679	break;	3617	break;
3680	case 21: /* report window title */	3618	case 21: /* report window title */
3681	{	3619	{
3682	char *s;	3620	char *s;
3683	XFetchName (disp, parent[0], &s);	3621	XFetchName (dpy, parent[0], &s);
3684	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3622	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3685	XFree (s);	3623	XFree (s);
3686	}	3624	}
3687	break;	3625	break;
3688	}	3626	}
…		…
3789	void	3727	void
3790	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)	3728	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3791	{	3729	{
3792	if (str[0] == '?' && !str[1])	3730	if (str[0] == '?' && !str[1])
3793	{	3731	{
3794	unsigned short r, g, b;	3732	rgba c;
3795	pix_colors_focused[color].get (display, r, g, b);	3733	pix_colors_focused[color].get (c);
		3734
		3735	#if XFT
		3736	if (c.a != rgba::MAX_CC)
		3737	tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
		3738	else
		3739	#endif
3796	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);	3740	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3797	}	3741	}
3798	else	3742	else
3799	set_window_color (color, str);	3743	set_window_color (color, str);
3800	}	3744	}
3801		3745
…		…
3803	* XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)	3747	* XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3804	*/	3748	*/
3805	void	3749	void
3806	rxvt_term::process_xterm_seq (int op, const char *str, char resp)	3750	rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3807	{	3751	{
3808	int changed = 0;
3809	int color;	3752	int color;
3810	char *buf, *name;	3753	char *buf, *name;
3811	bool query = str[0] == '?' && !str[1];	3754	bool query = str[0] == '?' && !str[1];
3812	int saveop = op;	3755	int saveop = op;
3813	dDisp;	3756
		3757	dLocal (Display *, dpy);
3814		3758
3815	assert (str != NULL);	3759	assert (str != NULL);
3816	switch (op)	3760	switch (op)
3817	{	3761	{
3818	case XTerm_name:	3762	case XTerm_name:
…		…
3834	unsigned long bytes_after;	3778	unsigned long bytes_after;
3835	unsigned char *value = 0;	3779	unsigned char *value = 0;
3836	const char *str = "";	3780	const char *str = "";
3837		3781
3838	if (prop	3782	if (prop
3839	&& XGetWindowProperty (disp, parent[0],	3783	&& XGetWindowProperty (dpy, parent[0],
3840	prop, 0, 1<<16, 0, AnyPropertyType,	3784	prop, 0, 1<<16, 0, AnyPropertyType,
3841	&actual_type, &actual_format,	3785	&actual_type, &actual_format,
3842	&nitems, &bytes_after, &value) == Success	3786	&nitems, &bytes_after, &value) == Success
3843	&& actual_type != None	3787	&& actual_type != None
3844	&& actual_format == 8)	3788	&& actual_format == 8)
3845	str = (const char *)(value);	3789	str = (const char *)(value);
3846		3790
3847	tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);	3791	tt_printf ("\033]%d;%s%c", op, str, resp);
3848		3792
3849	XFree (value);	3793	XFree (value);
3850	}	3794	}
3851	else	3795	else
3852	{	3796	{
…		…
3856	{	3800	{
3857	*eq = 0;	3801	*eq = 0;
3858	set_utf8_property (display->atom (str), eq + 1);	3802	set_utf8_property (display->atom (str), eq + 1);
3859	}	3803	}
3860	else	3804	else
3861	XDeleteProperty (disp, parent[0],	3805	XDeleteProperty (dpy, parent[0],
3862	display->atom (str));	3806	display->atom (str));
3863	}	3807	}
3864	break;	3808	break;
3865		3809
3866	case XTerm_Color:	3810	case XTerm_Color:
…		…
3868	{	3812	{
3869	if ((name = strchr (buf, ';')) == NULL)	3813	if ((name = strchr (buf, ';')) == NULL)
3870	break;	3814	break;
3871		3815
3872	*name++ = '\0';	3816	*name++ = '\0';
3873	color = atoi (buf);	3817	color = atoi (buf) + minCOLOR;
3874		3818
3875	if (color < 0 || color >= TOTAL_COLORS)	3819	if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3876	break;	3820	break;
3877		3821
3878	if ((buf = strchr (name, ';')) != NULL)	3822	if ((buf = strchr (name, ';')) != NULL)
3879	*buf++ = '\0';	3823	*buf++ = '\0';
3880		3824
3881	if (name[0] == '?' && !name[1])	3825	process_color_seq (op, color, name, resp);
3882	{
3883	unsigned short r, g, b;
3884	pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3885	tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3886	}
3887	else
3888	set_window_color (color + minCOLOR, name);
3889	}	3826	}
3890	break;	3827	break;
3891	case XTerm_Color00:	3828	case XTerm_Color00:
3892	process_color_seq (XTerm_Color00, Color_fg, str, resp);	3829	process_color_seq (op, Color_fg, str, resp);
3893	break;	3830	break;
3894	case XTerm_Color01:	3831	case XTerm_Color01:
3895	process_color_seq (XTerm_Color00, Color_bg, str, resp);	3832	process_color_seq (op, Color_bg, str, resp);
3896	break;	3833	break;
3897	#ifndef NO_CURSORCOLOR	3834	#ifndef NO_CURSORCOLOR
3898	case XTerm_Color_cursor:	3835	case XTerm_Color_cursor:
3899	process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);	3836	process_color_seq (op, Color_cursor, str, resp);
3900	break;	3837	break;
3901	#endif	3838	#endif
3902	case XTerm_Color_pointer_fg:	3839	case XTerm_Color_pointer_fg:
3903	process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);	3840	process_color_seq (op, Color_pointer_fg, str, resp);
3904	break;	3841	break;
3905	case XTerm_Color_pointer_bg:	3842	case XTerm_Color_pointer_bg:
3906	process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);	3843	process_color_seq (op, Color_pointer_bg, str, resp);
3907	break;	3844	break;
3908	#ifndef NO_BOLD_UNDERLINE_REVERSE	3845	#ifndef NO_BOLD_UNDERLINE_REVERSE
3909	case XTerm_Color_BD:
3910	process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3911	break;
3912	case XTerm_Color_UL:
3913	process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3914	break;
3915	case XTerm_Color_RV:	3846	case XTerm_Color_RV:
3916	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3847	process_color_seq (op, Color_RV, str, resp);
		3848	break;
		3849	case Rxvt_Color_BD:
		3850	case URxvt_Color_BD:
		3851	process_color_seq (op, Color_BD, str, resp);
		3852	break;
		3853	case Rxvt_Color_UL:
		3854	case URxvt_Color_UL:
		3855	process_color_seq (op, Color_UL, str, resp);
3917	break;	3856	break;
3918	case URxvt_Color_IT:	3857	case URxvt_Color_IT:
3919	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);	3858	process_color_seq (op, Color_IT, str, resp);
3920	break;	3859	break;
3921	#endif	3860	#endif
3922	#if TRANSPARENT && TINTING	3861	#if TRANSPARENT && TINTING
3923	case URxvt_Color_tint:	3862	case URxvt_Color_tint:
3924	process_color_seq (URxvt_Color_tint, Color_tint, str, resp);	3863	process_color_seq (op, Color_tint, str, resp);
		3864
3925	check_our_parents ();	3865	check_our_parents ();
		3866
3926	if (am_transparent)	3867	if (am_transparent)
3927	want_full_refresh = want_refresh = 1;	3868	want_full_refresh = want_refresh = 1;
3928	break;
3929	#endif
3930		3869
		3870	break;
		3871	#endif
		3872
3931	case XTerm_Pixmap:	3873	case Rxvt_Pixmap:
		3874	{
3932	if (*str != ';')	3875	if (*str != ';')
3933	{	3876	{
3934	#if XPM_BACKGROUND	3877	#if XPM_BACKGROUND
3935	scale_pixmap (""); /* reset to default scaling */	3878	scale_pixmap (""); /* reset to default scaling */
3936	set_bgPixmap (str); /* change pixmap */	3879	set_bgPixmap (str); /* change pixmap */
3937	#endif
3938	scr_touch (true);	3880	scr_touch (true);
		3881	#endif
3939	}	3882	}
		3883
		3884	int changed = 0;
		3885
3940	while ((str = strchr (str, ';')) != NULL)	3886	while ((str = strchr (str, ';')) != NULL)
3941	{	3887	{
3942	str++;	3888	str++;
3943	#if XPM_BACKGROUND	3889	#if XPM_BACKGROUND
3944	changed += scale_pixmap (str);	3890	changed += scale_pixmap (str);
3945	#endif	3891	#endif
3946	}	3892	}
3947		3893
3948	if (changed)	3894	if (changed)
3949	{	3895	{
3950	#ifdef XPM_BACKGROUND	3896	#ifdef XPM_BACKGROUND
3951	resize_pixmap ();	3897	resize_pixmap ();
3952	#endif
3953	scr_touch (true);	3898	scr_touch (true);
		3899	#endif
3954	}	3900	}
		3901	}
3955	break;	3902	break;
3956		3903
3957	case XTerm_restoreFG:	3904	case Rxvt_restoreFG:
3958	set_window_color (Color_fg, str);	3905	set_window_color (Color_fg, str);
3959	break;	3906	break;
3960	case XTerm_restoreBG:	3907	case Rxvt_restoreBG:
3961	set_window_color (Color_bg, str);	3908	set_window_color (Color_bg, str);
3962	break;	3909	break;
3963		3910
3964	case XTerm_logfile:	3911	case XTerm_logfile:
3965	// TODO, when secure mode?	3912	// TODO, when secure mode?
3966	break;	3913	break;
3967		3914
3968	#ifdef MENUBAR
3969	case URxvt_Menu:
3970	if (OPTION (Opt_insecure))
3971	menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3972	break;
3973	#endif
3974	#if 0	3915	#if 0
3975	case XTerm_dumpscreen: /* no error notices */	3916	case Rxvt_dumpscreen: /* no error notices */
3976	{	3917	{
3977	int fd;	3918	int fd;
3978	if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)	3919	if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3979	{	3920	{
3980	scr_dump (fd);	3921	scr_dump (fd);
…		…
4004	allocated.push_back ((void *)res);	3945	allocated.push_back ((void *)res);
4005	set_fonts ();	3946	set_fonts ();
4006	}	3947	}
4007	break;	3948	break;
4008		3949
4009	#if ENABLE_FRILLS	3950	case URxvt_version:
		3951	if (query)
		3952	tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
		3953	op,
		3954	rs[Rs_name], VERSION[0], VERSION[2],
		3955	resp);
		3956	break;
		3957
		3958	#if !ENABLE_MINIMAL
4010	case URxvt_locale:	3959	case URxvt_locale:
4011	if (query)	3960	if (query)
4012	tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);	3961	tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
4013	else	3962	else
4014	{	3963	{
4015	set_locale (str);	3964	set_locale (str);
4016	pty.set_utf8_mode (enc_utf8);	3965	pty->set_utf8_mode (enc_utf8);
4017	init_xlocale ();	3966	init_xlocale ();
4018	}	3967	}
4019	break;	3968	break;
4020		3969
4021	case URxvt_view_up:	3970	case URxvt_view_up:
…		…
4074	return state;	4023	return state;
4075	}	4024	}
4076		4025
4077	/* we're not using priv _yet_ */	4026	/* we're not using priv _yet_ */
4078	void	4027	void
4079	rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)	4028	rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4080	{	4029	{
4081	unsigned int i, j;	4030	unsigned int i, j;
4082	int state;	4031	int state;
4083		4032
4084	static const struct	4033	static const struct
…		…
4095	{ 5, PrivMode_rVideo },	4044	{ 5, PrivMode_rVideo },
4096	{ 6, PrivMode_relOrigin },	4045	{ 6, PrivMode_relOrigin },
4097	{ 7, PrivMode_Autowrap },	4046	{ 7, PrivMode_Autowrap },
4098	// 8, bi-directional support mode	4047	// 8, bi-directional support mode
4099	{ 9, PrivMode_MouseX10 },	4048	{ 9, PrivMode_MouseX10 },
4100	#ifdef menuBar_esc
4101	{ menuBar_esc, PrivMode_menuBar },
4102	#endif
4103	// 18, 19 printing-related	4049	// 18, 19 printing-related
4104	{ 25, PrivMode_VisibleCursor },	4050	{ 25, PrivMode_VisibleCursor },
4105	#ifdef scrollBar_esc	4051	#ifdef scrollBar_esc
4106	{ scrollBar_esc, PrivMode_scrollBar },	4052	{ scrollBar_esc, PrivMode_scrollBar },
4107	#endif	4053	#endif
…		…
4202	/* case 8: - auto repeat, can't do on a per window basis */	4148	/* case 8: - auto repeat, can't do on a per window basis */
4203	case 9: /* X10 mouse reporting */	4149	case 9: /* X10 mouse reporting */
4204	if (state) /* orthogonal */	4150	if (state) /* orthogonal */
4205	priv_modes &= ~PrivMode_MouseX11;	4151	priv_modes &= ~PrivMode_MouseX11;
4206	break;	4152	break;
4207	#ifdef menuBar_esc
4208	case menuBar_esc:
4209	#ifdef MENUBAR
4210	map_menuBar (state);
4211	#endif
4212	break;
4213	#endif
4214	#ifdef scrollBar_esc	4153	#ifdef scrollBar_esc
4215	case scrollBar_esc:	4154	case scrollBar_esc:
4216	if (scrollbar_mapping (state))	4155	if (scrollbar_mapping (state))
4217	{	4156	{
4218	resize_all_windows (0, 0, 0);	4157	resize_all_windows (0, 0, 0);
…		…
4388	scr_color (Color_bg, Color_bg);	4327	scr_color (Color_bg, Color_bg);
4389	break;	4328	break;
4390		4329
4391	//case 50: // not variable spacing	4330	//case 50: // not variable spacing
4392		4331
4393	#if ENABLE_FRILLS	4332	#if !ENABLE_MINIMAL
4394	case 90:	4333	case 90:
4395	case 91: /* set bright fg color */	4334	case 91: /* set bright fg color */
4396	case 92:	4335	case 92:
4397	case 93:	4336	case 93:
4398	case 94:	4337	case 94:
…		…
4460	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT	4399	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4461		4400
4462	void	4401	void
4463	rxvt_term::tt_write (const char *data, unsigned int len)	4402	rxvt_term::tt_write (const char *data, unsigned int len)
4464	{	4403	{
4465	if (pty.pty < 0)	4404	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4466	return;	4405	return;
4467		4406
		4407	if (pty->pty < 0)
		4408	return;
		4409
4468	if (v_buflen == 0)	4410	if (v_buflen == 0)
4469	{	4411	{
4470	ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));	4412	ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4471		4413
4472	if ((unsigned int)written == len)	4414	if ((unsigned int)written == len)
4473	return;	4415	return;
4474		4416
4475	data += written;	4417	data += written;
…		…
4484	pty_ev.set (EVENT_READ | EVENT_WRITE);	4426	pty_ev.set (EVENT_READ | EVENT_WRITE);
4485	}	4427	}
4486		4428
4487	void rxvt_term::pty_write ()	4429	void rxvt_term::pty_write ()
4488	{	4430	{
4489	int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));	4431	int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4490		4432
4491	if (written > 0)	4433	if (written > 0)
4492	{	4434	{
4493	v_buflen -= written;	4435	v_buflen -= written;
4494		4436

Diff Legend

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