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.246 by root, Fri Jan 6 18:36:21 2006 UTC vs.
Revision 1.303 by root, Tue Jan 31 21:47:56 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
…		…
302	rxvt_term::lookup_key (XKeyEvent &ev)	305	rxvt_term::lookup_key (XKeyEvent &ev)
303	{	306	{
304	int ctrl, meta, shft, len;	307	int ctrl, meta, shft, len;
305	unsigned int newlen;	308	unsigned int newlen;
306	KeySym keysym;	309	KeySym keysym;
307	#ifdef DEBUG_CMD
308	static int debug_key = 1; /* accessible by a debugger only */
309	#endif
310	int valid_keysym;	310	int valid_keysym;
311	char kbuf[KBUFSZ];	311	char kbuf[KBUFSZ];
312		312
313	/*	313	/*
314	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an	314	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
…		…
443	scr_move_to (0, 1);	443	scr_move_to (0, 1);
444	return;	444	return;
445	}	445	}
446	else if (keysym == XK_End)	446	else if (keysym == XK_End)
447	{	447	{
448	scr_move_to (1, 0);	448	scr_move_to (1, 1);
449	return;	449	return;
450	}	450	}
451	}	451	}
452	#endif	452	#endif
453	}	453	}
…		…
464	{	464	{
465	switch (keysym)	465	switch (keysym)
466	{	466	{
467	/* normal XTerm key bindings */	467	/* normal XTerm key bindings */
468	case XK_Insert: /* Shift+Insert = paste mouse selection */	468	case XK_Insert: /* Shift+Insert = paste mouse selection */
469	selection_request (ev.time, 0, 0);	469	selection_request (ev.time);
470	return;	470	return;
471	#if TODO	471	#if TODO
472	/* rxvt extras */	472	/* rxvt extras */
473	case XK_KP_Add: /* Shift+KP_Add = bigger font */	473	case XK_KP_Add: /* Shift+KP_Add = bigger font */
474	change_font (FONT_UP);	474	change_font (FONT_UP);
…		…
867	#endif	867	#endif
868	/* nil */ ;	868	/* nil */ ;
869	}	869	}
870	}	870	}
871		871
872	if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_STR_LEN, kbuf, len, DT_END)))	872	if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
873	return;	873	return;
874		874
875	if (len <= 0)	875	if (len <= 0)
876	return; /* not mapped */	876	return; /* not mapped */
877		877
…		…
905	{	905	{
906	const char ch = C0_ESC;	906	const char ch = C0_ESC;
907	tt_write (&ch, 1);	907	tt_write (&ch, 1);
908	}	908	}
909		909
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);	910	tt_write (kbuf, (unsigned int)len);
921	}	911	}
922	/*}}} */	912	/*}}} */
923		913
924	#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)	914	#if defined (KEYSYM_RESOURCE)
925	/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
926	/* attempt to `write' count to the input buffer */
927	unsigned int	915	unsigned int
928	rxvt_term::cmd_write (const char *str, unsigned int count)	916	rxvt_term::cmd_write (const char *str, unsigned int count)
929	{	917	{
930	unsigned int n, s;	918	unsigned int n, s;
931		919
…		…
972		960
973	if (want_refresh)	961	if (want_refresh)
974	{	962	{
975	if (SHOULD_INVOKE (HOOK_LINE_UPDATE))	963	if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
976	{	964	{
977	int row = -view_start;	965	int row = view_start;
		966	int end_row = row + nrow;
978		967
979	while (row > -nsaved && ROW (row - 1).is_longer ())	968	while (row > top_row && ROW (row - 1).is_longer ())
980	--row;	969	--row;
981		970
982	while (row < -view_start + nrow)	971	do
983	{	972	{
984	int start_row = row;	973	int start_row = row;
985	line_t *l;	974	line_t *l;
986		975
987	do	976	do
988	{	977	{
989	l = &ROW (row);	978	l = &ROW (row++);
990		979
991	if (!(l->f & LINE_FILTERED))	980	if (!(l->f & LINE_FILTERED))
992	{	981	{
993	// line not filtered, mark it as filtered	982	// line not filtered, mark it as filtered
994	l->f |= LINE_FILTERED;	983	l->f |= LINE_FILTERED;
995	while (l->is_longer ())	984	while (l->is_longer ())
996	{	985	{
997	l = &ROW (++row);	986	l = &ROW (row++);
998	l->f |= LINE_FILTERED;	987	l->f |= LINE_FILTERED;
999	}	988	}
1000		989
1001	// and filter it	990	// and filter it
1002	HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));	991	HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1003		992
1004	break;	993	break;
1005	}	994	}
1006	}	995	}
1007	while (l->is_longer ());	996	while (l->is_longer () && row < end_row);
1008
1009	row++;
1010	}	997	}
		998	while (row < end_row);
1011		999	}
1012	}
1013		1000
1014	scr_refresh (refresh_type);	1001	scr_refresh ();
1015	scrollbar_show (1);	1002	scrollbar_show (1);
1016	#ifdef USE_XIM	1003	#ifdef USE_XIM
1017	IMSendSpot ();	1004	IMSendSpot ();
1018	#endif	1005	#endif
1019	}	1006	}
…		…
1022	}	1009	}
1023		1010
1024	void	1011	void
1025	rxvt_term::check_cb (check_watcher &w)	1012	rxvt_term::check_cb (check_watcher &w)
1026	{	1013	{
1027	SET_R (this);	1014	make_current ();
1028	SET_LOCALE (locale);
1029		1015
1030	display->flush ();	1016	display->flush ();
1031		1017
1032	if (want_refresh && !flush_ev.active)	1018	if (want_refresh && !flush_ev.active)
1033	flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally	1019	flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1034	}	1020	}
1035		1021
1036	void	1022	void
1037	rxvt_term::flush_cb (time_watcher &w)	1023	rxvt_term::flush_cb (time_watcher &w)
1038	{	1024	{
1039	SET_R (this);	1025	make_current ();
1040	SET_LOCALE (locale);
1041		1026
1042	refresh_limit = 1;	1027	refresh_limit = 1;
1043	refresh_count = 0;	1028	refresh_count = 0;
1044	flush ();	1029	flush ();
1045	}	1030	}
…		…
1049	rxvt_term::cursor_blink_cb (time_watcher &w)	1034	rxvt_term::cursor_blink_cb (time_watcher &w)
1050	{	1035	{
1051	hidden_cursor = !hidden_cursor;	1036	hidden_cursor = !hidden_cursor;
1052	want_refresh = 1;	1037	want_refresh = 1;
1053		1038
1054	w.start (w.at + BLINK_INTERVAL);	1039	w.start (w.at + CURSOR_BLINK_INTERVAL);
1055	}	1040	}
1056	#endif	1041	#endif
1057		1042
1058	#ifdef TEXT_BLINK	1043	#ifdef TEXT_BLINK
1059	void	1044	void
…		…
1073	rxvt_term::cont_scroll_cb (time_watcher &w)	1058	rxvt_term::cont_scroll_cb (time_watcher &w)
1074	{	1059	{
1075	if ((scrollbar_isUp() || scrollbar_isDn()) &&	1060	if ((scrollbar_isUp() || scrollbar_isDn()) &&
1076	scr_page (scrollbar_isUp() ? UP : DN, 1))	1061	scr_page (scrollbar_isUp() ? UP : DN, 1))
1077	{	1062	{
1078	refresh_type |= SMOOTH_REFRESH;
1079	want_refresh = 1;	1063	want_refresh = 1;
1080	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1064	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1081	}	1065	}
1082	}	1066	}
1083	#endif	1067	#endif
…		…
1087	rxvt_term::sel_scroll_cb (time_watcher &w)	1071	rxvt_term::sel_scroll_cb (time_watcher &w)
1088	{	1072	{
1089	if (scr_page (scroll_selection_dir, scroll_selection_lines))	1073	if (scr_page (scroll_selection_dir, scroll_selection_lines))
1090	{	1074	{
1091	selection_extend (selection_save_x, selection_save_y, selection_save_state);	1075	selection_extend (selection_save_x, selection_save_y, selection_save_state);
1092	refresh_type |= SMOOTH_REFRESH;
1093	want_refresh = 1;	1076	want_refresh = 1;
1094	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1077	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1095	}	1078	}
1096	}	1079	}
1097	#endif	1080	#endif
…		…
1102	{	1085	{
1103	if (mouse_slip_wheel_speed == 0	1086	if (mouse_slip_wheel_speed == 0
1104	|| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)	1087	|| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1105	: scr_page (UP, mouse_slip_wheel_speed))	1088	: scr_page (UP, mouse_slip_wheel_speed))
1106	{	1089	{
1107	if (view_start == nsaved ||	1090	if (view_start == top_row || view_start == 0)
1108	view_start == 0)
1109	mouse_slip_wheel_speed = 0;	1091	mouse_slip_wheel_speed = 0;
1110		1092
1111	refresh_type |= SMOOTH_REFRESH;
1112	want_refresh = 1;	1093	want_refresh = 1;
1113	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1094	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1114	}	1095	}
1115	}	1096	}
1116	#endif	1097	#endif
1117		1098
1118	#if HAVE_SCHED_YIELD	1099	#if LINUX_YIELD_HACK
1119	static struct event_handler	1100	static struct event_handler
1120	{	1101	{
1121	check_watcher cw_yield;	1102	check_watcher yield_ev;
1122		1103
1123	void yield (check_watcher &w)	1104	void yield_cb (check_watcher &w)
1124	{	1105	{
1125	sched_yield ();	1106	// this should really be sched_yield(), but the linux guys thought
		1107	// that giving a process calling sched_yield () less cpu time than
		1108	// ones with high nice levels.
		1109
		1110	struct timespec ts = { 0, 0 };
		1111	nanosleep (&ts, 0);
		1112
1126	w.stop ();	1113	w.stop ();
1127	}	1114	}
1128		1115
1129	event_handler ()	1116	event_handler ()
1130	: cw_yield (this, &event_handler::yield)	1117	: yield_ev (this, &event_handler::yield_cb)
1131	{	1118	{
1132	}	1119	}
1133	} event_handler;	1120	} event_handler;
1134	#endif	1121	#endif
1135		1122
…		…
1146		1133
1147	memmove (cmdbuf_base, cmdbuf_ptr, n);	1134	memmove (cmdbuf_base, cmdbuf_ptr, n);
1148	cmdbuf_ptr = cmdbuf_base;	1135	cmdbuf_ptr = cmdbuf_base;
1149	cmdbuf_endp = cmdbuf_ptr + n;	1136	cmdbuf_endp = cmdbuf_ptr + n;
1150		1137
1151	ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);	1138	ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1152		1139
1153	if (r > 0)	1140	if (r > 0)
1154	{	1141	{
1155	cmdbuf_endp += r;	1142	cmdbuf_endp += r;
1156	return true;	1143	return true;
1157	}	1144	}
1158	else if (r < 0 && (errno == EAGAIN || errno == EINTR))	1145	else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1159	{	1146	{
1160	#if HAVE_SCHED_YIELD	1147	#if LINUX_YIELD_HACK
1161	if (display->is_local)	1148	if (display->is_local)
1162	event_handler.cw_yield.start ();	1149	event_handler.yield_ev.start ();
1163	#endif	1150	#endif
1164	}	1151	}
1165	else	1152	else
1166	{	1153	{
1167	pty_ev.stop ();	1154	pty_ev.stop ();
…		…
1174	}	1161	}
1175		1162
1176	void	1163	void
1177	rxvt_term::pty_cb (io_watcher &w, short revents)	1164	rxvt_term::pty_cb (io_watcher &w, short revents)
1178	{	1165	{
1179	SET_R (this);	1166	make_current ();
1180	SET_LOCALE (locale);
1181		1167
1182	if (revents & EVENT_READ)	1168	if (revents & EVENT_READ)
1183	// loop, but don't allow a single term to monopolize us	1169	// loop, but don't allow a single term to monopolize us
1184	while (pty_fill ())	1170	while (pty_fill ())
1185	if (cmd_parse ())	1171	if (cmd_parse ())
…		…
1190	}	1176	}
1191		1177
1192	void	1178	void
1193	rxvt_term::pointer_unblank ()	1179	rxvt_term::pointer_unblank ()
1194	{	1180	{
1195	XDefineCursor (display->display, vt, TermWin_cursor);	1181	XDefineCursor (xdisp, vt, TermWin_cursor);
1196	recolour_cursor ();	1182	recolour_cursor ();
1197		1183
1198	#ifdef POINTER_BLANK	1184	#ifdef POINTER_BLANK
1199	hidden_pointer = 0;	1185	hidden_pointer = 0;
1200		1186
…		…
1208	rxvt_term::pointer_blank ()	1194	rxvt_term::pointer_blank ()
1209	{	1195	{
1210	if (!OPTION (Opt_pointerBlank))	1196	if (!OPTION (Opt_pointerBlank))
1211	return;	1197	return;
1212		1198
1213	XDefineCursor (display->display, vt, display->blank_cursor);	1199	XDefineCursor (xdisp, vt, display->blank_cursor);
1214	XFlush (display->display);	1200	XFlush (xdisp);
1215		1201
1216	hidden_pointer = 1;	1202	hidden_pointer = 1;
1217	}	1203	}
1218		1204
1219	void	1205	void
1220	rxvt_term::pointer_cb (time_watcher &w)	1206	rxvt_term::pointer_cb (time_watcher &w)
1221	{	1207	{
1222	SET_R (this);	1208	make_current ();
1223	SET_LOCALE (locale);
1224		1209
1225	pointer_blank ();	1210	pointer_blank ();
1226	}	1211	}
1227	#endif	1212	#endif
1228		1213
…		…
1293	(32 + button_number + key_state),	1278	(32 + button_number + key_state),
1294	(32 + x + 1),	1279	(32 + x + 1),
1295	(32 + y + 1));	1280	(32 + y + 1));
1296	}	1281	}
1297		1282
1298	#ifdef USING_W11LIB
1299	void
1300	rxvt_W11_process_x_event (XEvent *ev)
1301	{
1302	rxvt_t *r = rxvt_get_r ();
1303
1304	x_cb (*ev);
1305	}
1306	#endif
1307
1308	/*{{{ process an X event */	1283	/*{{{ process an X event */
1309	void	1284	void
1310	rxvt_term::x_cb (XEvent &ev)	1285	rxvt_term::x_cb (XEvent &ev)
1311	{	1286	{
1312	dDisp;	1287	make_current ();
1313		1288
1314	SET_R (this);	1289	dLocal (Display *, xdisp);
1315	SET_LOCALE (locale);
1316		1290
1317	#if defined(CURSOR_BLINK)	1291	if (ev.xany.window == vt
1318	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)	1292	&& SHOULD_INVOKE (HOOK_X_EVENT)
1319	{	1293	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1320	if (hidden_cursor)	1294	return;
1321	{
1322	hidden_cursor = 0;
1323	want_refresh = 1;
1324	}
1325		1295
1326	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1296	// for XQueryPointer
1327	}
1328	#endif
1329
1330	#if defined(POINTER_BLANK)
1331	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1332	{
1333	if (ev.type == MotionNotify
1334	|| ev.type == ButtonPress
1335	|| ev.type == ButtonRelease)
1336	if (hidden_pointer)
1337	pointer_unblank ();
1338
1339	if (ev.type == KeyPress && hidden_pointer == 0)
1340	pointer_blank ();
1341	}
1342	#endif
1343
1344	Window unused_root, unused_child;	1297	Window unused_root, unused_child;
1345	int unused_root_x, unused_root_y;	1298	int unused_root_x, unused_root_y;
1346	unsigned int unused_mask;	1299	unsigned int unused_mask;
1347		1300
1348	switch (ev.type)	1301	switch (ev.type)
…		…
1355		1308
1356	break;	1309	break;
1357		1310
1358	case KeyRelease:	1311	case KeyRelease:
1359	{	1312	{
1360	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755	1313	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1361	KeySym ks;	1314	KeySym keysym;
1362		1315
1363	ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/	1316	keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1364	#endif	1317	#endif
1365		1318
1366	#if ENABLE_FRILLS || ISO_14755	1319	#if ENABLE_FRILLS || ISO_14755
1367	// ISO 14755 support	1320	// ISO 14755 support
1368	if (iso14755buf)	1321	if (iso14755buf)
…		…
1373	# endif	1326	# endif
1374	# if ISO_14755	1327	# if ISO_14755
1375	// iso14755 part 5.2 handling: release time	1328	// iso14755 part 5.2 handling: release time
1376	// first: controls	1329	// first: controls
1377	if ((ev.xkey.state & ControlMask)	1330	if ((ev.xkey.state & ControlMask)
1378	&& ((ks >= 0x40 && ks <= 0x5f)	1331	&& ((keysym >= 0x40 && keysym <= 0x5f)
1379	|| (ks >= 0x61 && ks <= 0x7f)))	1332	|| (keysym >= 0x61 && keysym <= 0x7f)))
1380	{	1333	{
1381	iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);	1334	iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1382	commit_iso14755 ();	1335	commit_iso14755 ();
1383	return; // case-break;	1336	goto skip_switch;
1384	}	1337	}
1385		1338
1386	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)	1339	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1387	if (i[0] == ks)	1340	if (i[0] == keysym)
1388	{	1341	{
1389	iso14755buf = ISO_14755_51 | i[1];	1342	iso14755buf = ISO_14755_51 | i[1];
1390	commit_iso14755 ();	1343	commit_iso14755 ();
1391	return; // case-break;	1344	goto skip_switch;
1392	}	1345	}
1393		1346
1394	scr_bell ();	1347	scr_bell ();
1395	# endif	1348	# endif
1396	iso14755buf = 0;	1349	iso14755buf = 0;
…		…
1416	iso14755buf = 0;	1369	iso14755buf = 0;
1417	}	1370	}
1418	#endif	1371	#endif
1419		1372
1420	if (ev.xany.window == vt	1373	if (ev.xany.window == vt
1421	&& HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_END)))	1374	&& HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1422	break;	1375	break;
1423		1376
1424	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	1377	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1425	if (!(ev.xkey.state & ControlMask))	1378	if (!(ev.xkey.state & ControlMask))
1426	slip_wheel_ev.stop ();	1379	slip_wheel_ev.stop ();
1427	else if (ks == XK_Control_L || ks == XK_Control_R)	1380	else if (keysym == XK_Control_L || keysym == XK_Control_R)
1428	mouse_slip_wheel_speed = 0;	1381	mouse_slip_wheel_speed = 0;
1429	#endif	1382	#endif
1430	break;	1383	break;
1431	}	1384	}
1432		1385
…		…
1438	button_release (ev.xbutton);	1391	button_release (ev.xbutton);
1439	break;	1392	break;
1440		1393
1441	case ClientMessage:	1394	case ClientMessage:
1442	if (ev.xclient.format == 32	1395	if (ev.xclient.format == 32
1443	&& ev.xclient.message_type == xa[XA_WM_PROTOCOLS])	1396	&& !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1444	{	1397	{
		1398	if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
		1399	{
		1400	if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
		1401	{
1445	if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])	1402	if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
		1403	{
		1404	if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1446	destroy ();	1405	destroy ();
		1406	}
1447	#if ENABLE_EWMH	1407	#if ENABLE_EWMH
1448	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])	1408	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1449	XSendEvent (disp, ev.xclient.window = display->root,	1409	XSendEvent (xdisp, ev.xclient.window = display->root,
1450	False, SubstructureRedirectMask | SubstructureNotifyMask,	1410	False, SubstructureRedirectMask | SubstructureNotifyMask,
1451	&ev);	1411	&ev);
		1412	#endif
		1413	}
		1414	}
		1415	#if ENABLE_XEMBED
		1416	else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
		1417	{
		1418	if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
		1419	focus_in ();
		1420	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
		1421	focus_out ();
		1422	}
1452	#endif	1423	#endif
1453	}	1424	}
1454	#if ENABLE_XEMBED
1455	else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1456	{
1457	if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1458	focus_in ();
1459	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1460	focus_out ();
1461	}
1462	#endif
1463	#ifdef OFFIX_DND
1464	/* OffiX Dnd (drag 'n' drop) protocol */
1465	else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1466	&& (ev.xclient.data.l[0] == DndFile
1467	|| ev.xclient.data.l[0] == DndDir
1468	|| ev.xclient.data.l[0] == DndLink))
1469	{
1470	/* Get Dnd data */
1471	Atom ActualType;
1472	int ActualFormat;
1473	unsigned char *data;
1474	unsigned long Size, RemainingBytes;
1475
1476	XGetWindowProperty (disp, display->root,
1477	xa[XA_DNDSELECTION],
1478	0L, 1000000L,
1479	False, AnyPropertyType,
1480	&ActualType, &ActualFormat,
1481	&Size, &RemainingBytes,
1482	&data);
1483	set_string_property (XA_CUT_BUFFER0, data);
1484	XFree (data);
1485	selection_paste (display->root, XA_CUT_BUFFER0, true);
1486	XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1487	}
1488	#endif /* OFFIX_DND */
1489	break;	1425	break;
1490		1426
1491	case MappingNotify:	1427	case MappingNotify:
1492	XRefreshKeyboardMapping (&ev.xmapping);	1428	XRefreshKeyboardMapping (&ev.xmapping);
1493	break;	1429	break;
…		…
1526	break;	1462	break;
1527		1463
1528	case ConfigureNotify:	1464	case ConfigureNotify:
1529	if (ev.xconfigure.window == parent[0])	1465	if (ev.xconfigure.window == parent[0])
1530	{	1466	{
1531	while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))	1467	while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev))
1532	;	1468	;
1533		1469
1534	if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)	1470	if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1535	{	1471	{
1536	seen_resize = 1;	1472	seen_resize = 1;
1537	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1473	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1538	}	1474	}
1539		1475
		1476	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
		1477
1540	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */	1478	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1541	if (OPTION (Opt_transparent))	1479	if (OPTION (Opt_transparent))
1542	check_our_parents ();	1480	check_our_parents ();
1543	#endif	1481	#endif
1544	}	1482	}
1545	break;	1483	break;
1546		1484
1547	case PropertyNotify:	1485	case PropertyNotify:
		1486	if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1548	if (ev.xproperty.atom == xa[XA_VT_SELECTION]	1487	if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1549	&& ev.xproperty.state == PropertyNewValue)	1488	&& ev.xproperty.state == PropertyNewValue)
1550	selection_property (ev.xproperty.window, ev.xproperty.atom);	1489	selection_property (ev.xproperty.window, ev.xproperty.atom);
1551		1490
1552	break;	1491	break;
1553		1492
1554	case SelectionClear:	1493	case SelectionClear:
1555	selection_clear ();	1494	selection_clear ();
…		…
1560	selection_paste (ev.xselection.requestor, ev.xselection.property, true);	1499	selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1561	break;	1500	break;
1562		1501
1563	case SelectionRequest:	1502	case SelectionRequest:
1564	selection_send (ev.xselectionrequest);	1503	selection_send (ev.xselectionrequest);
		1504	break;
		1505
		1506	case MapNotify:
		1507	mapped = 1;
		1508	#ifdef TEXT_BLINK
		1509	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
		1510	#endif
		1511	HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1565	break;	1512	break;
1566		1513
1567	case UnmapNotify:	1514	case UnmapNotify:
1568	mapped = 0;	1515	mapped = 0;
1569	#ifdef TEXT_BLINK	1516	#ifdef TEXT_BLINK
1570	text_blink_ev.stop ();	1517	text_blink_ev.stop ();
1571	#endif	1518	#endif
1572	break;	1519	HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1573
1574	case MapNotify:
1575	mapped = 1;
1576	#ifdef TEXT_BLINK
1577	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1578	#endif
1579	break;	1520	break;
1580		1521
1581	#ifdef TRANSPARENT	1522	#ifdef TRANSPARENT
1582	case ReparentNotify:	1523	case ReparentNotify:
1583	rootwin_cb (ev);	1524	rootwin_cb (ev);
…		…
1589	if (ev.xany.window == vt)	1530	if (ev.xany.window == vt)
1590	{	1531	{
1591	do	1532	do
1592	scr_expose (ev.xexpose.x, ev.xexpose.y,	1533	scr_expose (ev.xexpose.x, ev.xexpose.y,
1593	ev.xexpose.width, ev.xexpose.height, False);	1534	ev.xexpose.width, ev.xexpose.height, False);
1594	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));	1535	while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev));
1595		1536
1596	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1537	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1597		1538
1598	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))	1539	while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev))
1599	scr_expose (ev.xexpose.x, ev.xexpose.y,	1540	scr_expose (ev.xexpose.x, ev.xexpose.y,
1600	ev.xexpose.width, ev.xexpose.height, False);	1541	ev.xexpose.width, ev.xexpose.height, False);
1601		1542
1602	scr_refresh (refresh_type);	1543	want_refresh = 1;
1603	}	1544	}
1604	else	1545	else
1605	{	1546	{
1606	XEvent unused_event;	1547	XEvent unused_event;
1607		1548
1608	while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))	1549	while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event))
1609	;	1550	;
1610	while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))	1551	while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event))
1611	;	1552	;
1612		1553
1613	if (isScrollbarWindow (ev.xany.window))	1554	if (isScrollbarWindow (ev.xany.window))
1614	{	1555	{
1615	scrollBar.setIdle ();	1556	scrollBar.setIdle ();
1616	scrollbar_show (0);	1557	scrollbar_show (0);
1617	}	1558	}
1618	#ifdef MENUBAR
1619	if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1620	menubar_expose ();
1621	#endif
1622		1559
1623	#ifdef TRANSPARENT	1560	#ifdef TRANSPARENT
1624	if (am_transparent && ev.xany.window == parent[0])	1561	if (am_transparent && ev.xany.window == parent[0])
1625	XClearWindow (disp, ev.xany.window);	1562	XClearWindow (xdisp, ev.xany.window);
1626	#endif	1563	#endif
1627	}	1564	}
1628	break;	1565	break;
1629		1566
1630	case MotionNotify:	1567	case MotionNotify:
1631	#ifdef POINTER_BLANK	1568	#ifdef POINTER_BLANK
1632	if (hidden_pointer)	1569	if (hidden_pointer)
1633	pointer_unblank ();	1570	pointer_unblank ();
1634	#endif	1571	#endif
1635	#if MENUBAR
1636	if (isMenuBarWindow (ev.xany.window))
1637	{
1638	menubar_control (ev.xbutton);
1639	break;
1640	}
1641	#endif
1642	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)	1572	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1643	break;	1573	break;
1644		1574
1645	if (ev.xany.window == vt)	1575	if (ev.xany.window == vt)
1646	{	1576	{
		1577	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1647	if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))	1578	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1648	; // nop	1579	; // nop
1649	else if (ev.xbutton.state & (Button1Mask | Button3Mask))	1580	else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1650	{	1581	{
1651	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))	1582	while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev))
1652	;	1583	;
1653		1584
1654	XQueryPointer (disp, vt,	1585	XQueryPointer (xdisp, vt,
1655	&unused_root, &unused_child,	1586	&unused_root, &unused_child,
1656	&unused_root_x, &unused_root_y,	1587	&unused_root_x, &unused_root_y,
1657	&ev.xbutton.x, &ev.xbutton.y,	1588	&ev.xbutton.x, &ev.xbutton.y,
1658	&ev.xbutton.state);	1589	&ev.xbutton.state);
1659	#ifdef MOUSE_THRESHOLD	1590	#ifdef MOUSE_THRESHOLD
…		…
1723	#endif	1654	#endif
1724	}	1655	}
1725	}	1656	}
1726	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1657	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1727	{	1658	{
1728	while (XCheckTypedWindowEvent (disp, scrollBar.win,	1659	while (XCheckTypedWindowEvent (xdisp, scrollBar.win,
1729	MotionNotify, &ev))	1660	MotionNotify, &ev))
1730	;	1661	;
1731		1662
1732	XQueryPointer (disp, scrollBar.win,	1663	XQueryPointer (xdisp, scrollBar.win,
1733	&unused_root, &unused_child,	1664	&unused_root, &unused_child,
1734	&unused_root_x, &unused_root_y,	1665	&unused_root_x, &unused_root_y,
1735	&ev.xbutton.x, &ev.xbutton.y,	1666	&ev.xbutton.x, &ev.xbutton.y,
1736	&unused_mask);	1667	&unused_mask);
1737	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1668	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1738	scrollbar_size ());	1669	scrollbar_size ());
1739	scr_refresh (refresh_type);	1670	want_refresh = 1;
1740	refresh_limit = 0;	1671	refresh_limit = 0;
1741	scrollbar_show (1);	1672	scrollbar_show (1);
1742	}	1673	}
1743	break;	1674	break;
1744	}	1675	}
		1676
		1677	skip_switch: ;
		1678
		1679	#if defined(CURSOR_BLINK)
		1680	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
		1681	{
		1682	if (hidden_cursor)
		1683	{
		1684	hidden_cursor = 0;
		1685	want_refresh = 1;
		1686	}
		1687
		1688	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
		1689	}
		1690	#endif
		1691
		1692	#if defined(POINTER_BLANK)
		1693	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
		1694	{
		1695	if (ev.type == MotionNotify
		1696	|| ev.type == ButtonPress
		1697	|| ev.type == ButtonRelease)
		1698	if (hidden_pointer)
		1699	pointer_unblank ();
		1700
		1701	if (ev.type == KeyPress && hidden_pointer == 0)
		1702	pointer_blank ();
		1703	}
		1704	#endif
1745	}	1705	}
1746		1706
1747	void	1707	void
1748	rxvt_term::focus_in ()	1708	rxvt_term::focus_in ()
1749	{	1709	{
…		…
1761	XSetICFocus (Input_Context);	1721	XSetICFocus (Input_Context);
1762	}	1722	}
1763	#endif	1723	#endif
1764	#if CURSOR_BLINK	1724	#if CURSOR_BLINK
1765	if (OPTION (Opt_cursorBlink))	1725	if (OPTION (Opt_cursorBlink))
1766	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1726	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1767	#endif	1727	#endif
1768	#if OFF_FOCUS_FADING	1728	#if OFF_FOCUS_FADING
1769	if (rs[Rs_fade])	1729	if (rs[Rs_fade])
1770	{	1730	{
1771	pix_colors = pix_colors_focused;	1731	pix_colors = pix_colors_focused;
…		…
1815		1775
1816	#if TRANSPARENT	1776	#if TRANSPARENT
1817	void	1777	void
1818	rxvt_term::rootwin_cb (XEvent &ev)	1778	rxvt_term::rootwin_cb (XEvent &ev)
1819	{	1779	{
1820	SET_R (this);	1780	make_current ();
1821	SET_LOCALE (locale);
1822		1781
1823	switch (ev.type)	1782	switch (ev.type)
1824	{	1783	{
1825	case PropertyNotify:	1784	case PropertyNotify:
1826	/*	1785	/*
…		…
1853	/*	1812	/*
1854	* VT window processing of button press	1813	* VT window processing of button press
1855	*/	1814	*/
1856	if (ev.window == vt)	1815	if (ev.window == vt)
1857	{	1816	{
		1817	if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
		1818	return;
		1819
1858	#if ISO_14755	1820	#if ISO_14755
1859	// 5.4	1821	// 5.4
1860	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))	1822	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1861	{	1823	{
1862	iso14755_54 (ev.x, ev.y);	1824	iso14755_54 (ev.x, ev.y);
…		…
1904	else	1866	else
1905	{	1867	{
1906	if (ev.button != MEvent.button)	1868	if (ev.button != MEvent.button)
1907	MEvent.clicks = 0;	1869	MEvent.clicks = 0;
1908		1870
1909	if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1910	switch (ev.button)	1871	switch (ev.button)
1911	{	1872	{
1912	case Button1:	1873	case Button1:
1913	/* allow meta + click to select rectangular areas */	1874	/* allow meta + click to select rectangular areas */
1914	/* should be done in screen.C */	1875	/* should be done in screen.C */
1915	#if ENABLE_FRILLS	1876	#if ENABLE_FRILLS
1916	selection.rect = !!(ev.state & ModMetaMask);	1877	selection.rect = !!(ev.state & ModMetaMask);
1917	#else	1878	#else
1918	selection.rect = false;	1879	selection.rect = false;
1919	#endif	1880	#endif
1920		1881
1921	/* allow shift+left click to extend selection */	1882	/* allow shift+left click to extend selection */
1922	if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))	1883	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1923	{	1884	{
1924	if (MEvent.button == Button1 && clickintime)	1885	if (MEvent.button == Button1 && clickintime)
1925	selection_rotate (ev.x, ev.y);	1886	selection_rotate (ev.x, ev.y);
1926	else	1887	else
1927	selection_extend (ev.x, ev.y, 1);	1888	selection_extend (ev.x, ev.y, 1);
1928	}	1889	}
1929	else	1890	else
1930	{	1891	{
1931	if (MEvent.button == Button1 && clickintime)	1892	if (MEvent.button == Button1 && clickintime)
1932	MEvent.clicks++;	1893	MEvent.clicks++;
1933	else	1894	else
1934	MEvent.clicks = 1;	1895	MEvent.clicks = 1;
1935		1896
1936	selection_click (MEvent.clicks, ev.x, ev.y);	1897	selection_click (MEvent.clicks, ev.x, ev.y);
1937	}	1898	}
1938		1899
1939	MEvent.button = Button1;	1900	MEvent.button = Button1;
1940	break;	1901	break;
1941		1902
1942	case Button3:	1903	case Button3:
1943	if (MEvent.button == Button3 && clickintime)	1904	if (MEvent.button == Button3 && clickintime)
1944	selection_rotate (ev.x, ev.y);	1905	selection_rotate (ev.x, ev.y);
1945	else	1906	else
1946	selection_extend (ev.x, ev.y, 1);	1907	selection_extend (ev.x, ev.y, 1);
1947		1908
1948	MEvent.button = Button3;	1909	MEvent.button = Button3;
1949	break;	1910	break;
1950	}	1911	}
1951	}	1912	}
1952		1913
1953	MEvent.time = ev.time;	1914	MEvent.time = ev.time;
1954	return;	1915	return;
1955	}	1916	}
1956		1917
…		…
2095	}	2056	}
2096	}	2057	}
2097		2058
2098	return;	2059	return;
2099	}	2060	}
2100
2101	#if MENUBAR
2102	/*
2103	* Menubar window processing of button press
2104	*/
2105	if (isMenuBarWindow (ev.window))
2106	menubar_control (ev);
2107	#endif
2108	}	2061	}
2109		2062
2110	void	2063	void
2111	rxvt_term::button_release (XButtonEvent &ev)	2064	rxvt_term::button_release (XButtonEvent &ev)
2112	{	2065	{
…		…
2118		2071
2119	if (scrollbar_isUpDn ())	2072	if (scrollbar_isUpDn ())
2120	{	2073	{
2121	scrollBar.setIdle ();	2074	scrollBar.setIdle ();
2122	scrollbar_show (0);	2075	scrollbar_show (0);
2123	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2124	refresh_type &= ~SMOOTH_REFRESH;
2125	#endif
2126	}	2076	}
2127		2077
2128	#ifdef SELECTION_SCROLLING	2078	#ifdef SELECTION_SCROLLING
2129	if (sel_scroll_ev.active)	2079	if (sel_scroll_ev.active)
2130	sel_scroll_ev.stop();	2080	sel_scroll_ev.stop();
2131	#endif	2081	#endif
2132		2082
2133	if (ev.window == vt)	2083	if (ev.window == vt)
2134	{	2084	{
		2085	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
		2086	return;
		2087
2135	#if ISO_14755	2088	#if ISO_14755
2136	// 5.4	2089	// 5.4
2137	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))	2090	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2138	return;	2091	return;
2139	#endif	2092	#endif
		2093
2140	if (reportmode)	2094	if (reportmode)
2141	{	2095	{
2142	/* mouse report from vt window */	2096	/* mouse report from vt window */
2143	/* don't report release of wheel "buttons" */	2097	/* don't report release of wheel "buttons" */
2144	if (ev.button >= 4)	2098	if (ev.button >= 4)
…		…
2168	if (priv_modes & PrivMode_mouse_report	2122	if (priv_modes & PrivMode_mouse_report
2169	&& bypass_keystate	2123	&& bypass_keystate
2170	&& ev.button == Button1 && MEvent.clicks <= 1)	2124	&& ev.button == Button1 && MEvent.clicks <= 1)
2171	selection_extend (ev.x, ev.y, 0);	2125	selection_extend (ev.x, ev.y, 0);
2172		2126
2173	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2174	return;
2175
2176	switch (ev.button)	2127	switch (ev.button)
2177	{	2128	{
2178	case Button1:	2129	case Button1:
2179	case Button3:	2130	case Button3:
2180	selection_make (ev.time);	2131	selection_make (ev.time);
2181	break;	2132	break;
		2133
2182	case Button2:	2134	case Button2:
2183	selection_request (ev.time, ev.x, ev.y);	2135	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
		2136	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2184	break;	2137	break;
		2138
2185	#ifdef MOUSE_WHEEL	2139	#ifdef MOUSE_WHEEL
2186	case Button4:	2140	case Button4:
2187	case Button5:	2141	case Button5:
2188	{	2142	{
2189	int i;	2143	int i;
…		…
2211	slip_wheel_ev.start ();	2165	slip_wheel_ev.start ();
2212	}	2166	}
2213	else	2167	else
2214	{	2168	{
2215	# endif	2169	# endif
2216	# ifdef JUMP_MOUSE_WHEEL
2217	scr_page (v, i);	2170	scr_page (v, i);
2218	scr_refresh (SMOOTH_REFRESH);
2219	scrollbar_show (1);	2171	scrollbar_show (1);
2220	# else
2221	while (i--)
2222	{
2223	scr_page (v, 1);
2224	scr_refresh (SMOOTH_REFRESH);
2225	scrollbar_show (1);
2226	}
2227	# endif
2228	# ifdef MOUSE_SLIP_WHEELING	2172	# ifdef MOUSE_SLIP_WHEELING
2229	}	2173	}
2230	#endif	2174	# endif
2231	}	2175	}
2232	break;	2176	break;
2233	#endif	2177	#endif
2234	}	2178	}
2235	}	2179	}
2236	#ifdef MENUBAR
2237	else if (isMenuBarWindow (ev.window))
2238	menubar_control (ev);
2239	#endif
2240	}	2180	}
2241		2181
2242	#ifdef TRANSPARENT	2182	#ifdef TRANSPARENT
2243	#if TINTING	2183	#if TINTING
2244	/* taken from aterm-0.4.2 */	2184	/* taken from aterm-0.4.2 */
2245		2185
2246	typedef uint32_t RUINT32T;	2186	typedef uint32_t RUINT32T;
2247		2187
2248	void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)	2188	void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2249	{	2189	{
2250	int sh_r, sh_g, sh_b;	2190	int sh_r, sh_g, sh_b;
2251	RUINT32T mask_r, mask_g, mask_b;	2191	RUINT32T mask_r, mask_g, mask_b;
2252	RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;	2192	RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2253	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;	2193	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2254	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;	2194	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2255	int i;	2195	int i;
2256		2196
2257	Visual *visual = display->visual;	2197	Visual *visual = term->visual;
2258		2198
2259	if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;	2199	if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2260		2200
2261	/* for convenience */	2201	/* for convenience */
2262	mask_r = visual->red_mask;	2202	mask_r = visual->red_mask;
…		…
2483	Atom atype;	2423	Atom atype;
2484	unsigned char *prop = NULL;	2424	unsigned char *prop = NULL;
2485	Window root, oldp, *list;	2425	Window root, oldp, *list;
2486	Pixmap rootpixmap = None;	2426	Pixmap rootpixmap = None;
2487	XWindowAttributes wattr, wrootattr;	2427	XWindowAttributes wattr, wrootattr;
2488	dDisp;
2489		2428
2490	pchanged = 0;	2429	pchanged = 0;
2491		2430
2492	if (!OPTION (Opt_transparent))	2431	if (!OPTION (Opt_transparent))
2493	return pchanged; /* Don't try any more */	2432	return pchanged; /* Don't try any more */
2494		2433
2495	XGetWindowAttributes (disp, display->root, &wrootattr);	2434	XGetWindowAttributes (xdisp, display->root, &wrootattr);
2496	rootdepth = wrootattr.depth;	2435	rootdepth = wrootattr.depth;
2497		2436
2498	XGetWindowAttributes (disp, parent[0], &wattr);	2437	XGetWindowAttributes (xdisp, parent[0], &wattr);
2499		2438
2500	if (rootdepth != wattr.depth)	2439	if (rootdepth != wattr.depth)
2501	{	2440	{
2502	if (am_transparent)	2441	if (am_transparent)
2503	{	2442	{
2504	pchanged = 1;	2443	pchanged = 1;
2505	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2444	XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2506	am_transparent = am_pixmap_trans = 0;	2445	am_transparent = am_pixmap_trans = 0;
2507	}	2446	}
2508		2447
2509	return pchanged; /* Don't try any more */	2448	return pchanged; /* Don't try any more */
2510	}	2449	}
2511		2450
2512	/* Get all X ops out of the queue so that our information is up-to-date. */	2451	/* Get all X ops out of the queue so that our information is up-to-date. */
2513	XSync (disp, False);	2452	XSync (xdisp, False);
2514		2453
2515	/*	2454	/*
2516	* Make the frame window set by the window manager have	2455	* Make the frame window set by the window manager have
2517	* the root background. Some window managers put multiple nested frame	2456	* the root background. Some window managers put multiple nested frame
2518	* windows for each client, so we have to take care about that.	2457	* windows for each client, so we have to take care about that.
2519	*/	2458	*/
2520	i = (xa[XA_XROOTPMAP_ID]	2459	i = (xa[XA_XROOTPMAP_ID]
2521	&& XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],	2460	&& XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2522	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2461	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2523	&nitems, &bytes_after, &prop) == Success);	2462	&nitems, &bytes_after, &prop) == Success);
2524		2463
2525	if (!i || prop == NULL)	2464	if (!i || prop == NULL)
2526	i = (xa[XA_ESETROOT_PMAP_ID]	2465	i = (xa[XA_ESETROOT_PMAP_ID]
2527	&& XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],	2466	&& XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2528	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2467	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2529	&nitems, &bytes_after, &prop) == Success);	2468	&nitems, &bytes_after, &prop) == Success);
2530		2469
2531	if (!i || prop == NULL	2470	if (!i || prop == NULL
2532	#if TINTING	2471	#if TINTING
2533	|| !rs[Rs_color + Color_tint]	2472	|| !ISSET_PIXCOLOR (Color_tint)
2534	#endif	2473	#endif
2535	)	2474	)
2536	have_pixmap = 0;	2475	have_pixmap = 0;
2537	else	2476	else
2538	{	2477	{
…		…
2551	Window cr;	2490	Window cr;
2552	XImage *image;	2491	XImage *image;
2553	GC gc;	2492	GC gc;
2554	XGCValues gcvalue;	2493	XGCValues gcvalue;
2555		2494
2556	XTranslateCoordinates (disp, parent[0], display->root,	2495	XTranslateCoordinates (xdisp, parent[0], display->root,
2557	0, 0, &sx, &sy, &cr);	2496	0, 0, &sx, &sy, &cr);
2558	nw = (unsigned int)szHint.width;	2497	nw = (unsigned int)szHint.width;
2559	nh = (unsigned int)szHint.height;	2498	nh = (unsigned int)szHint.height;
2560	nx = ny = 0;	2499	nx = ny = 0;
2561		2500
…		…
2574	}	2513	}
2575		2514
2576	min_it (nw, (unsigned int) (wrootattr.width - sx));	2515	min_it (nw, (unsigned int) (wrootattr.width - sx));
2577	min_it (nh, (unsigned int) (wrootattr.height - sy));	2516	min_it (nh, (unsigned int) (wrootattr.height - sy));
2578		2517
2579	XSync (disp, False);	2518	XSync (xdisp, False);
2580	allowedxerror = -1;	2519	allowedxerror = -1;
2581	image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);	2520	image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2582		2521
2583	/* XXX: handle BadMatch - usually because we're outside the pixmap */	2522	/* XXX: handle BadMatch - usually because we're outside the pixmap */
2584	/* XXX: may need a delay here? */	2523	/* XXX: may need a delay here? */
2585	allowedxerror = 0;	2524	allowedxerror = 0;
2586		2525
…		…
2589	if (am_transparent && am_pixmap_trans)	2528	if (am_transparent && am_pixmap_trans)
2590	{	2529	{
2591	pchanged = 1;	2530	pchanged = 1;
2592	if (pixmap != None)	2531	if (pixmap != None)
2593	{	2532	{
2594	XFreePixmap (disp, pixmap);	2533	XFreePixmap (xdisp, pixmap);
2595	pixmap = None;	2534	pixmap = None;
2596	}	2535	}
2597	}	2536	}
2598		2537
2599	am_pixmap_trans = 0;	2538	am_pixmap_trans = 0;
2600	}	2539	}
2601	else	2540	else
2602	{	2541	{
2603	if (pixmap != None)	2542	if (pixmap != None)
2604	XFreePixmap (disp, pixmap);	2543	XFreePixmap (xdisp, pixmap);
2605		2544
2606	#if TINTING	2545	#if TINTING
2607	if (ISSET_PIXCOLOR (Color_tint))	2546	if (ISSET_PIXCOLOR (Color_tint))
2608	{	2547	{
2609	unsigned short rm, gm, bm;
2610	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;	2548	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2611		2549
		2550	rgba c;
2612	pix_colors_focused[Color_tint].get (display, rm, gm, bm);	2551	pix_colors_focused [Color_tint].get (c);
2613		2552
2614	ShadeXImage (display, image, shade, rm, gm, bm);	2553	ShadeXImage (this, image, shade, c.r, c.g, c.b);
2615	}	2554	}
2616	#endif	2555	#endif
2617		2556
2618	pixmap = XCreatePixmap (disp, vt,	2557	pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2619	szHint.width, szHint.height, image->depth);
2620	gc = XCreateGC (disp, vt, 0UL, &gcvalue);	2558	gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2621	XPutImage (disp, pixmap, gc, image, 0, 0,	2559	XPutImage (xdisp, pixmap, gc, image, 0, 0,
2622	nx, ny, image->width, image->height);	2560	nx, ny, image->width, image->height);
2623	XFreeGC (disp, gc);	2561	XFreeGC (xdisp, gc);
2624	XDestroyImage (image);	2562	XDestroyImage (image);
2625	XSetWindowBackgroundPixmap (disp, parent[0], pixmap);	2563	XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2626	XClearWindow (disp, parent[0]);	2564	XClearWindow (xdisp, parent[0]);
2627		2565
2628	if (!am_transparent || !am_pixmap_trans)	2566	if (!am_transparent || !am_pixmap_trans)
2629	pchanged = 1;	2567	pchanged = 1;
2630		2568
2631	am_transparent = am_pixmap_trans = 1;	2569	am_transparent = am_pixmap_trans = 1;
2632	}	2570	}
2633	}	2571	}
2634		2572
2635	if (am_pixmap_trans)	2573	if (am_pixmap_trans)
2636	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2574	XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2637	else	2575	else
2638	{	2576	{
2639	unsigned int n;	2577	unsigned int n;
2640	/*	2578	/*
2641	* InheritPixmap transparency	2579	* InheritPixmap transparency
2642	*/	2580	*/
2643	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2581	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2644	{	2582	{
2645	oldp = parent[i];	2583	oldp = parent[i];
2646	XQueryTree (disp, parent[i - 1], &root,	2584	XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n);
2647	&parent[i], &list, &n);
2648	XFree (list);	2585	XFree (list);
2649		2586
2650	if (parent[i] == display->root)	2587	if (parent[i] == display->root)
2651	{	2588	{
2652	if (oldp != None)	2589	if (oldp != None)
…		…
2660	}	2597	}
2661		2598
2662	n = 0;	2599	n = 0;
2663		2600
2664	if (pchanged)	2601	if (pchanged)
2665	{
2666	for (; n < (unsigned int)i; n++)	2602	for (; n < (unsigned int)i; n++)
2667	{	2603	{
2668	XGetWindowAttributes (disp, parent[n], &wattr);	2604	XGetWindowAttributes (xdisp, parent[n], &wattr);
		2605
2669	if (wattr.depth != rootdepth || wattr.c_class == InputOnly)	2606	if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2670	{	2607	{
2671	n = (int) (sizeof (parent) / sizeof (Window)) + 1;	2608	n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2672	break;	2609	break;
2673	}	2610	}
2674	}	2611	}
2675	}
2676		2612
2677	if (n > (int) (sizeof (parent) / sizeof (parent[0])))	2613	if (n > (sizeof (parent) / sizeof (parent[0])))
2678	{	2614	{
2679	XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);	2615	XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2680	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2616	XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2681	am_transparent = 0;	2617	am_transparent = 0;
2682	/* XXX: also turn off Opt_transparent? */	2618	/* XXX: also turn off Opt_transparent? */
2683	}	2619	}
2684	else	2620	else
2685	{	2621	{
2686	#if WAIT_FOR_WM
2687	/* wait (an arbitrary period) for the WM to do its thing
2688	* needed for fvwm2.2.2 (and before?) */
2689	sleep (1);
2690	#endif
2691	for (n = 0; n < (unsigned int)i; n++)	2622	for (n = 0; n < (unsigned int)i; n++)
2692	{	2623	{
2693	XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);	2624	XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2694	XClearWindow (disp, parent[n]);	2625	XClearWindow (xdisp, parent[n]);
2695	}	2626	}
2696		2627
2697	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2628	XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2698	am_transparent = 1;	2629	am_transparent = 1;
2699	}	2630	}
2700		2631
2701	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2632	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2702	parent[i] = None;	2633	parent[i] = None;
2703	}	2634	}
2704		2635
2705	if (scrollBar.win)	2636	if (scrollBar.win)
2706	{	2637	{
2707	XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);	2638	XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2708	scrollBar.setIdle ();	2639	scrollBar.setIdle ();
2709	scrollbar_show (0);	2640	scrollbar_show (0);
2710	}	2641	}
2711		2642
2712	if (am_transparent)	2643	if (am_transparent)
…		…
2787	}	2718	}
2788		2719
2789	// scr_add_lines only works for nlines <= nrow - 1.	2720	// scr_add_lines only works for nlines <= nrow - 1.
2790	if (nlines >= nrow - 1)	2721	if (nlines >= nrow - 1)
2791	{	2722	{
		2723	if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2792	if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))	2724	&& HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2793	scr_add_lines (buf, str - buf, nlines);	2725	scr_add_lines (buf, str - buf, nlines);
2794		2726
2795	nlines = 0;	2727	nlines = 0;
2796	str = buf;	2728	str = buf;
2797	eol = str + min (ncol, UBUFSIZ);	2729	eol = str + min (ncol, UBUFSIZ);
…		…
2812		2744
2813	seq_begin = cmdbuf_ptr;	2745	seq_begin = cmdbuf_ptr;
2814	ch = next_char ();	2746	ch = next_char ();
2815	}	2747	}
2816		2748
		2749	if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2817	if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))	2750	&& HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2818	scr_add_lines (buf, str - buf, nlines);	2751	scr_add_lines (buf, str - buf, nlines);
2819		2752
2820	/*	2753	/*
2821	* If there have been a lot of new lines, then update the screen	2754	* If there have been a lot of new lines, then update the screen
2822	* What the heck I'll cheat and only refresh less than every page-full.	2755	* What the heck I'll cheat and only refresh less than every page-full.
…		…
2828	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)	2761	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2829	refresh_limit++;	2762	refresh_limit++;
2830	else	2763	else
2831	{	2764	{
2832	flag = true;	2765	flag = true;
2833	scr_refresh (refresh_type);	2766	scr_refresh ();
2834	flush_ev.stop ();	2767	want_refresh = 1;
2835	}	2768	}
2836	}	2769	}
2837		2770
2838	}	2771	}
2839	else	2772	else
…		…
2856	return flag;	2789	return flag;
2857	}	2790	}
2858		2791
2859	// read the next character	2792	// read the next character
2860	wchar_t	2793	wchar_t
2861	rxvt_term::next_char ()	2794	rxvt_term::next_char () NOTHROW
2862	{	2795	{
2863	while (cmdbuf_ptr < cmdbuf_endp)	2796	while (cmdbuf_ptr < cmdbuf_endp)
2864	{	2797	{
2865	// assume 7-bit to be ascii ALWAYS	2798	// assume 7-bit to be ascii ALWAYS
2866	if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)	2799	if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
…		…
2887	return NOCHAR;	2820	return NOCHAR;
2888	}	2821	}
2889		2822
2890	// read the next octet	2823	// read the next octet
2891	uint32_t	2824	uint32_t
2892	rxvt_term::next_octet ()	2825	rxvt_term::next_octet () NOTHROW
2893	{	2826	{
2894	return cmdbuf_ptr < cmdbuf_endp	2827	return cmdbuf_ptr < cmdbuf_endp
2895	? (unsigned char)*cmdbuf_ptr++	2828	? (unsigned char)*cmdbuf_ptr++
2896	: NOCHAR;	2829	: NOCHAR;
2897	}	2830	}
		2831
		2832	static class out_of_input out_of_input;
2898		2833
2899	/* rxvt_cmd_getc () - Return next input character */	2834	/* rxvt_cmd_getc () - Return next input character */
2900	/*	2835	/*
2901	* Return the next input character after first passing any keyboard input	2836	* Return the next input character after first passing any keyboard input
2902	* to the command.	2837	* to the command.
2903	*/	2838	*/
2904	wchar_t	2839	wchar_t
2905	rxvt_term::cmd_getc ()	2840	rxvt_term::cmd_getc () THROW ((class out_of_input))
2906	{	2841	{
2907	wchar_t c = next_char ();	2842	wchar_t c = next_char ();
2908		2843
2909	if (c == NOCHAR)	2844	if (c == NOCHAR)
2910	throw out_of_input;	2845	throw out_of_input;
2911		2846
2912	return c;	2847	return c;
2913	}	2848	}
2914		2849
2915	uint32_t	2850	uint32_t
2916	rxvt_term::cmd_get8 ()	2851	rxvt_term::cmd_get8 () THROW ((class out_of_input))
2917	{	2852	{
2918	uint32_t c = next_octet ();	2853	uint32_t c = next_octet ();
2919		2854
2920	if (c == NOCHAR)	2855	if (c == NOCHAR)
2921	throw out_of_input;	2856	throw out_of_input;
…		…
3159	scr_charset_set (2, (unsigned int)cmd_getc ());	3094	scr_charset_set (2, (unsigned int)cmd_getc ());
3160	break;	3095	break;
3161	case '+':	3096	case '+':
3162	scr_charset_set (3, (unsigned int)cmd_getc ());	3097	scr_charset_set (3, (unsigned int)cmd_getc ());
3163	break;	3098	break;
3164	#if ENABLE_FRILLS	3099	#if !ENABLE_MINIMAL
3165	case '6':	3100	case '6':
3166	scr_backindex ();	3101	scr_backindex ();
3167	break;	3102	break;
3168	#endif	3103	#endif
3169	case '7':	3104	case '7':
3170	scr_cursor (SAVE);	3105	scr_cursor (SAVE);
3171	break;	3106	break;
3172	case '8':	3107	case '8':
3173	scr_cursor (RESTORE);	3108	scr_cursor (RESTORE);
3174	break;	3109	break;
3175	#if ENABLE_FRILLS	3110	#if !ENABLE_MINIMAL
3176	case '9':	3111	case '9':
3177	scr_forwardindex ();	3112	scr_forwardindex ();
3178	break;	3113	break;
3179	#endif	3114	#endif
3180	case '=':	3115	case '=':
…		…
3342	ndef = get_byte_array_bit (csi_defaults, i);	3277	ndef = get_byte_array_bit (csi_defaults, i);
3343	for (p = 0; p < nargs; p++)	3278	for (p = 0; p < nargs; p++)
3344	if (arg[p] == -1)	3279	if (arg[p] == -1)
3345	arg[p] = ndef;	3280	arg[p] = ndef;
3346		3281
3347	#ifdef DEBUG_CMD
3348	fprintf (stderr, "CSI ");
3349	for (p = 0; p < nargs; p++)
3350	fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3351	fprintf (stderr, "%c\n", ch);
3352	#endif
3353
3354	/*	3282	/*
3355	* private mode handling	3283	* private mode handling
3356	*/	3284	*/
3357	if (priv)	3285	if (priv)
3358	{	3286	{
3359	switch (priv)	3287	switch (priv)
3360	{	3288	{
3361	case '>':	3289	case '>':
3362	if (ch == CSI_DA) /* secondary device attributes */	3290	if (ch == CSI_DA) /* secondary device attributes */
3363	tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);	3291	{
		3292	// first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
		3293	// 'U' for rxvt-unicode != 7.[34] (where it was broken).
		3294	//
		3295	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
		3296	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
		3297	// that we do not support xterm mouse reporting (should be 95 when we do).
		3298	//
		3299	tt_printf ("\033[>%d;94;0c", 'U');
		3300	}
3364	break;	3301	break;
3365	case '?':	3302	case '?':
3366	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')	3303	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3367	process_terminal_mode (ch, priv, nargs, arg);	3304	process_terminal_mode (ch, priv, nargs, arg);
3368	break;	3305	break;
…		…
3571	break;	3508	break;
3572	case CSI_75:	3509	case CSI_75:
3573	scr_cursor (RESTORE);	3510	scr_cursor (RESTORE);
3574	break;	3511	break;
3575		3512
3576	#if ENABLE_FRILLS	3513	#if !ENABLE_MINIMAL
3577	case CSI_74:	3514	case CSI_74:
3578	process_window_ops (arg, nargs);	3515	process_window_ops (arg, nargs);
3579	break;	3516	break;
3580	#endif	3517	#endif
3581		3518
…		…
3588	break;	3525	break;
3589	}	3526	}
3590	}	3527	}
3591	/*}}} */	3528	/*}}} */
3592		3529
3593	#if ENABLE_FRILLS	3530	#if !ENABLE_MINIMAL
3594	/* ARGSUSED */	3531	/* ARGSUSED */
3595	void	3532	void
3596	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3533	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3597	{	3534	{
3598	int x, y;	3535	int x, y;
3599	XWindowAttributes wattr;	3536	XWindowAttributes wattr;
3600	Window wdummy;	3537	Window wdummy;
3601	dDisp;	3538
		3539	dLocal (Display *, xdisp);
3602		3540
3603	if (nargs == 0)	3541	if (nargs == 0)
3604	return;	3542	return;
3605		3543
3606	switch (args[0])	3544	switch (args[0])
3607	{	3545	{
3608	/*	3546	/*
3609	* commands	3547	* commands
3610	*/	3548	*/
3611	case 1: /* deiconify window */	3549	case 1: /* deiconify window */
3612	XMapWindow (disp, parent[0]);	3550	XMapWindow (xdisp, parent[0]);
3613	break;	3551	break;
3614	case 2: /* iconify window */	3552	case 2: /* iconify window */
3615	XIconifyWindow (disp, parent[0], display->screen);	3553	XIconifyWindow (xdisp, parent[0], display->screen);
3616	break;	3554	break;
3617	case 3: /* set position (pixels) */	3555	case 3: /* set position (pixels) */
3618	XMoveWindow (disp, parent[0], args[1], args[2]);	3556	XMoveWindow (xdisp, parent[0], args[1], args[2]);
3619	break;	3557	break;
3620	case 4: /* set size (pixels) */	3558	case 4: /* set size (pixels) */
3621	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3559	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3622	break;	3560	break;
3623	case 5: /* raise window */	3561	case 5: /* raise window */
3624	XRaiseWindow (disp, parent[0]);	3562	XRaiseWindow (xdisp, parent[0]);
3625	break;	3563	break;
3626	case 6: /* lower window */	3564	case 6: /* lower window */
3627	XLowerWindow (disp, parent[0]);	3565	XLowerWindow (xdisp, parent[0]);
3628	break;	3566	break;
3629	case 7: /* refresh window */	3567	case 7: /* refresh window */
3630	scr_touch (true);	3568	scr_touch (true);
3631	break;	3569	break;
3632	case 8: /* set size (chars) */	3570	case 8: /* set size (chars) */
…		…
3639	if (args[0] >= 24) /* set height (chars) */	3577	if (args[0] >= 24) /* set height (chars) */
3640	set_widthheight ((unsigned int)width,	3578	set_widthheight ((unsigned int)width,
3641	(unsigned int) (args[1] * fheight));	3579	(unsigned int) (args[1] * fheight));
3642	break;	3580	break;
3643		3581
3644
3645	/*	3582	/*
3646	* reports - some output format copied from XTerm	3583	* reports - some output format copied from XTerm
3647	*/	3584	*/
3648	case 11: /* report window state */	3585	case 11: /* report window state */
3649	XGetWindowAttributes (disp, parent[0], &wattr);	3586	XGetWindowAttributes (xdisp, parent[0], &wattr);
3650	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3587	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3651	break;	3588	break;
3652	case 13: /* report window position */	3589	case 13: /* report window position */
3653	XGetWindowAttributes (disp, parent[0], &wattr);	3590	XGetWindowAttributes (xdisp, parent[0], &wattr);
3654	XTranslateCoordinates (disp, parent[0], wattr.root,	3591	XTranslateCoordinates (xdisp, parent[0], wattr.root,
3655	-wattr.border_width, -wattr.border_width,	3592	-wattr.border_width, -wattr.border_width,
3656	&x, &y, &wdummy);	3593	&x, &y, &wdummy);
3657	tt_printf ("\033[3;%d;%dt", x, y);	3594	tt_printf ("\033[3;%d;%dt", x, y);
3658	break;	3595	break;
3659	case 14: /* report window size (pixels) */	3596	case 14: /* report window size (pixels) */
3660	XGetWindowAttributes (disp, parent[0], &wattr);	3597	XGetWindowAttributes (xdisp, parent[0], &wattr);
3661	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3598	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3662	break;	3599	break;
3663	case 18: /* report text area size (chars) */	3600	case 18: /* report text area size (chars) */
3664	tt_printf ("\033[8;%d;%dt", nrow, ncol);	3601	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3665	break;	3602	break;
…		…
3667	tt_printf ("\033[9;%d;%dt", nrow, ncol);	3604	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3668	break;	3605	break;
3669	case 20: /* report icon label */	3606	case 20: /* report icon label */
3670	{	3607	{
3671	char *s;	3608	char *s;
3672	XGetIconName (disp, parent[0], &s);	3609	XGetIconName (xdisp, parent[0], &s);
3673	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3610	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3674	XFree (s);	3611	XFree (s);
3675	}	3612	}
3676	break;	3613	break;
3677	case 21: /* report window title */	3614	case 21: /* report window title */
3678	{	3615	{
3679	char *s;	3616	char *s;
3680	XFetchName (disp, parent[0], &s);	3617	XFetchName (xdisp, parent[0], &s);
3681	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3618	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3682	XFree (s);	3619	XFree (s);
3683	}	3620	}
3684	break;	3621	break;
3685	}	3622	}
…		…
3786	void	3723	void
3787	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)	3724	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3788	{	3725	{
3789	if (str[0] == '?' && !str[1])	3726	if (str[0] == '?' && !str[1])
3790	{	3727	{
3791	unsigned short r, g, b;	3728	rgba c;
3792	pix_colors_focused[color].get (display, r, g, b);	3729	pix_colors_focused[color].get (c);
		3730
		3731	#if XFT
		3732	if (c.a != rgba::MAX_CC)
		3733	tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
		3734	else
		3735	#endif
3793	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);	3736	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3794	}	3737	}
3795	else	3738	else
3796	set_window_color (color, str);	3739	set_window_color (color, str);
3797	}	3740	}
3798		3741
…		…
3800	* XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)	3743	* XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3801	*/	3744	*/
3802	void	3745	void
3803	rxvt_term::process_xterm_seq (int op, const char *str, char resp)	3746	rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3804	{	3747	{
3805	int changed = 0;
3806	int color;	3748	int color;
3807	char *buf, *name;	3749	char *buf, *name;
3808	bool query = str[0] == '?' && !str[1];	3750	bool query = str[0] == '?' && !str[1];
3809	int saveop = op;	3751	int saveop = op;
3810	dDisp;	3752
		3753	dLocal (Display *, xdisp);
3811		3754
3812	assert (str != NULL);	3755	assert (str != NULL);
3813	switch (op)	3756	switch (op)
3814	{	3757	{
3815	case XTerm_name:	3758	case XTerm_name:
…		…
3831	unsigned long bytes_after;	3774	unsigned long bytes_after;
3832	unsigned char *value = 0;	3775	unsigned char *value = 0;
3833	const char *str = "";	3776	const char *str = "";
3834		3777
3835	if (prop	3778	if (prop
3836	&& XGetWindowProperty (disp, parent[0],	3779	&& XGetWindowProperty (xdisp, parent[0],
3837	prop, 0, 1<<16, 0, AnyPropertyType,	3780	prop, 0, 1<<16, 0, AnyPropertyType,
3838	&actual_type, &actual_format,	3781	&actual_type, &actual_format,
3839	&nitems, &bytes_after, &value) == Success	3782	&nitems, &bytes_after, &value) == Success
3840	&& actual_type != None	3783	&& actual_type != None
3841	&& actual_format == 8)	3784	&& actual_format == 8)
3842	str = (const char *)(value);	3785	str = (const char *)(value);
3843		3786
3844	tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);	3787	tt_printf ("\033]%d;%s%c", op, str, resp);
3845		3788
3846	XFree (value);	3789	XFree (value);
3847	}	3790	}
3848	else	3791	else
3849	{	3792	{
…		…
3853	{	3796	{
3854	*eq = 0;	3797	*eq = 0;
3855	set_utf8_property (display->atom (str), eq + 1);	3798	set_utf8_property (display->atom (str), eq + 1);
3856	}	3799	}
3857	else	3800	else
3858	XDeleteProperty (disp, parent[0],	3801	XDeleteProperty (xdisp, parent[0],
3859	display->atom (str));	3802	display->atom (str));
3860	}	3803	}
3861	break;	3804	break;
3862		3805
3863	case XTerm_Color:	3806	case XTerm_Color:
…		…
3865	{	3808	{
3866	if ((name = strchr (buf, ';')) == NULL)	3809	if ((name = strchr (buf, ';')) == NULL)
3867	break;	3810	break;
3868		3811
3869	*name++ = '\0';	3812	*name++ = '\0';
3870	color = atoi (buf);	3813	color = atoi (buf) + minCOLOR;
3871		3814
3872	if (color < 0 || color >= TOTAL_COLORS)	3815	if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3873	break;	3816	break;
3874		3817
3875	if ((buf = strchr (name, ';')) != NULL)	3818	if ((buf = strchr (name, ';')) != NULL)
3876	*buf++ = '\0';	3819	*buf++ = '\0';
3877		3820
3878	if (name[0] == '?' && !name[1])	3821	process_color_seq (op, color, name, resp);
3879	{
3880	unsigned short r, g, b;
3881	pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3882	tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3883	}
3884	else
3885	set_window_color (color + minCOLOR, name);
3886	}	3822	}
3887	break;	3823	break;
3888	case XTerm_Color00:	3824	case XTerm_Color00:
3889	process_color_seq (XTerm_Color00, Color_fg, str, resp);	3825	process_color_seq (op, Color_fg, str, resp);
3890	break;	3826	break;
3891	case XTerm_Color01:	3827	case XTerm_Color01:
3892	process_color_seq (XTerm_Color00, Color_bg, str, resp);	3828	process_color_seq (op, Color_bg, str, resp);
3893	break;	3829	break;
3894	#ifndef NO_CURSORCOLOR	3830	#ifndef NO_CURSORCOLOR
3895	case XTerm_Color_cursor:	3831	case XTerm_Color_cursor:
3896	process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);	3832	process_color_seq (op, Color_cursor, str, resp);
3897	break;	3833	break;
3898	#endif	3834	#endif
3899	case XTerm_Color_pointer_fg:	3835	case XTerm_Color_pointer_fg:
3900	process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);	3836	process_color_seq (op, Color_pointer_fg, str, resp);
3901	break;	3837	break;
3902	case XTerm_Color_pointer_bg:	3838	case XTerm_Color_pointer_bg:
3903	process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);	3839	process_color_seq (op, Color_pointer_bg, str, resp);
3904	break;	3840	break;
3905	#ifndef NO_BOLD_UNDERLINE_REVERSE	3841	#ifndef NO_BOLD_UNDERLINE_REVERSE
3906	case XTerm_Color_BD:
3907	process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3908	break;
3909	case XTerm_Color_UL:
3910	process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3911	break;
3912	case XTerm_Color_RV:	3842	case XTerm_Color_RV:
3913	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3843	process_color_seq (op, Color_RV, str, resp);
		3844	break;
		3845	case Rxvt_Color_BD:
		3846	case URxvt_Color_BD:
		3847	process_color_seq (op, Color_BD, str, resp);
		3848	break;
		3849	case Rxvt_Color_UL:
		3850	case URxvt_Color_UL:
		3851	process_color_seq (op, Color_UL, str, resp);
3914	break;	3852	break;
3915	case URxvt_Color_IT:	3853	case URxvt_Color_IT:
3916	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);	3854	process_color_seq (op, Color_IT, str, resp);
3917	break;	3855	break;
3918	#endif	3856	#endif
3919	#if TRANSPARENT && TINTING	3857	#if TRANSPARENT && TINTING
3920	case URxvt_Color_tint:	3858	case URxvt_Color_tint:
3921	process_color_seq (URxvt_Color_tint, Color_tint, str, resp);	3859	process_color_seq (op, Color_tint, str, resp);
		3860
3922	check_our_parents ();	3861	check_our_parents ();
		3862
3923	if (am_transparent)	3863	if (am_transparent)
3924	want_full_refresh = want_refresh = 1;	3864	want_full_refresh = want_refresh = 1;
3925	break;
3926	#endif
3927		3865
		3866	break;
		3867	#endif
		3868
3928	case XTerm_Pixmap:	3869	case Rxvt_Pixmap:
		3870	{
3929	if (*str != ';')	3871	if (*str != ';')
3930	{	3872	{
3931	#if XPM_BACKGROUND	3873	#if XPM_BACKGROUND
3932	scale_pixmap (""); /* reset to default scaling */	3874	scale_pixmap (""); /* reset to default scaling */
3933	set_bgPixmap (str); /* change pixmap */	3875	set_bgPixmap (str); /* change pixmap */
3934	#endif
3935	scr_touch (true);	3876	scr_touch (true);
		3877	#endif
3936	}	3878	}
		3879
		3880	int changed = 0;
		3881
3937	while ((str = strchr (str, ';')) != NULL)	3882	while ((str = strchr (str, ';')) != NULL)
3938	{	3883	{
3939	str++;	3884	str++;
3940	#if XPM_BACKGROUND	3885	#if XPM_BACKGROUND
3941	changed += scale_pixmap (str);	3886	changed += scale_pixmap (str);
3942	#endif	3887	#endif
3943	}	3888	}
3944		3889
3945	if (changed)	3890	if (changed)
3946	{	3891	{
3947	#ifdef XPM_BACKGROUND	3892	#ifdef XPM_BACKGROUND
3948	resize_pixmap ();	3893	resize_pixmap ();
3949	#endif
3950	scr_touch (true);	3894	scr_touch (true);
		3895	#endif
3951	}	3896	}
		3897	}
3952	break;	3898	break;
3953		3899
3954	case XTerm_restoreFG:	3900	case Rxvt_restoreFG:
3955	set_window_color (Color_fg, str);	3901	set_window_color (Color_fg, str);
3956	break;	3902	break;
3957	case XTerm_restoreBG:	3903	case Rxvt_restoreBG:
3958	set_window_color (Color_bg, str);	3904	set_window_color (Color_bg, str);
3959	break;	3905	break;
3960		3906
3961	case XTerm_logfile:	3907	case XTerm_logfile:
3962	// TODO, when secure mode?	3908	// TODO, when secure mode?
3963	break;	3909	break;
3964		3910
3965	#ifdef MENUBAR
3966	case URxvt_Menu:
3967	if (OPTION (Opt_insecure))
3968	menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3969	break;
3970	#endif
3971	#if 0	3911	#if 0
3972	case XTerm_dumpscreen: /* no error notices */	3912	case Rxvt_dumpscreen: /* no error notices */
3973	{	3913	{
3974	int fd;	3914	int fd;
3975	if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)	3915	if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3976	{	3916	{
3977	scr_dump (fd);	3917	scr_dump (fd);
…		…
4001	allocated.push_back ((void *)res);	3941	allocated.push_back ((void *)res);
4002	set_fonts ();	3942	set_fonts ();
4003	}	3943	}
4004	break;	3944	break;
4005		3945
4006	#if ENABLE_FRILLS	3946	case URxvt_version:
		3947	if (query)
		3948	tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
		3949	op,
		3950	rs[Rs_name], VERSION[0], VERSION[2],
		3951	resp);
		3952	break;
		3953
		3954	#if !ENABLE_MINIMAL
4007	case URxvt_locale:	3955	case URxvt_locale:
4008	if (query)	3956	if (query)
4009	tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);	3957	tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
4010	else	3958	else
4011	{	3959	{
4012	set_locale (str);	3960	set_locale (str);
4013	pty.set_utf8_mode (enc_utf8);	3961	pty->set_utf8_mode (enc_utf8);
4014	init_xlocale ();	3962	init_xlocale ();
4015	}	3963	}
4016	break;	3964	break;
4017		3965
4018	case URxvt_view_up:	3966	case URxvt_view_up:
…		…
4071	return state;	4019	return state;
4072	}	4020	}
4073		4021
4074	/* we're not using priv _yet_ */	4022	/* we're not using priv _yet_ */
4075	void	4023	void
4076	rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)	4024	rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4077	{	4025	{
4078	unsigned int i, j;	4026	unsigned int i, j;
4079	int state;	4027	int state;
4080		4028
4081	static const struct	4029	static const struct
…		…
4092	{ 5, PrivMode_rVideo },	4040	{ 5, PrivMode_rVideo },
4093	{ 6, PrivMode_relOrigin },	4041	{ 6, PrivMode_relOrigin },
4094	{ 7, PrivMode_Autowrap },	4042	{ 7, PrivMode_Autowrap },
4095	// 8, bi-directional support mode	4043	// 8, bi-directional support mode
4096	{ 9, PrivMode_MouseX10 },	4044	{ 9, PrivMode_MouseX10 },
4097	#ifdef menuBar_esc
4098	{ menuBar_esc, PrivMode_menuBar },
4099	#endif
4100	// 18, 19 printing-related	4045	// 18, 19 printing-related
4101	{ 25, PrivMode_VisibleCursor },	4046	{ 25, PrivMode_VisibleCursor },
4102	#ifdef scrollBar_esc	4047	#ifdef scrollBar_esc
4103	{ scrollBar_esc, PrivMode_scrollBar },	4048	{ scrollBar_esc, PrivMode_scrollBar },
4104	#endif	4049	#endif
…		…
4151	/* extra handling for values with state unkept */	4096	/* extra handling for values with state unkept */
4152	switch (arg[i])	4097	switch (arg[i])
4153	{	4098	{
4154	#if ENABLE_STYLES	4099	#if ENABLE_STYLES
4155	case 1021:	4100	case 1021:
4156	if (mode)	4101	set_option (Opt_intensityStyles, mode);
4157	SET_OPTION (Opt_intensityStyles);
4158	else
4159	CLR_OPTION (Opt_intensityStyles);
4160		4102
4161	scr_touch (true);	4103	scr_touch (true);
4162	break;	4104	break;
4163	#endif	4105	#endif
4164	case 1048: /* alternative cursor save */	4106	case 1048: /* alternative cursor save */
…		…
4186	case 3: /* 80/132 */	4128	case 3: /* 80/132 */
4187	if (priv_modes & PrivMode_132OK)	4129	if (priv_modes & PrivMode_132OK)
4188	set_widthheight (((state ? 132 : 80) * fwidth), height);	4130	set_widthheight (((state ? 132 : 80) * fwidth), height);
4189	break;	4131	break;
4190	case 4: /* smooth scrolling */	4132	case 4: /* smooth scrolling */
4191	if (!state)	4133	set_option (Opt_jumpScroll, !state);
4192	SET_OPTION (Opt_jumpScroll);
4193	else
4194	CLR_OPTION (Opt_jumpScroll);
4195	break;	4134	break;
4196	case 5: /* reverse video */	4135	case 5: /* reverse video */
4197	scr_rvideo_mode (state);	4136	scr_rvideo_mode (state);
4198	break;	4137	break;
4199	case 6: /* relative/absolute origins */	4138	case 6: /* relative/absolute origins */
…		…
4205	/* case 8: - auto repeat, can't do on a per window basis */	4144	/* case 8: - auto repeat, can't do on a per window basis */
4206	case 9: /* X10 mouse reporting */	4145	case 9: /* X10 mouse reporting */
4207	if (state) /* orthogonal */	4146	if (state) /* orthogonal */
4208	priv_modes &= ~PrivMode_MouseX11;	4147	priv_modes &= ~PrivMode_MouseX11;
4209	break;	4148	break;
4210	#ifdef menuBar_esc
4211	case menuBar_esc:
4212	#ifdef MENUBAR
4213	map_menuBar (state);
4214	#endif
4215	break;
4216	#endif
4217	#ifdef scrollBar_esc	4149	#ifdef scrollBar_esc
4218	case scrollBar_esc:	4150	case scrollBar_esc:
4219	if (scrollbar_mapping (state))	4151	if (scrollbar_mapping (state))
4220	{	4152	{
4221	resize_all_windows (0, 0, 0);	4153	resize_all_windows (0, 0, 0);
…		…
4240	#if 0	4172	#if 0
4241	case 1001:	4173	case 1001:
4242	break; /* X11 mouse highlighting */	4174	break; /* X11 mouse highlighting */
4243	#endif	4175	#endif
4244	case 1010: /* scroll to bottom on TTY output inhibit */	4176	case 1010: /* scroll to bottom on TTY output inhibit */
4245	if (!state)	4177	set_option (Opt_scrollTtyOutput, !state);
4246	SET_OPTION (Opt_scrollTtyOutput);
4247	else
4248	CLR_OPTION (Opt_scrollTtyOutput);
4249	break;	4178	break;
4250	case 1011: /* scroll to bottom on key press */	4179	case 1011: /* scroll to bottom on key press */
4251	if (state)	4180	set_option (Opt_scrollTtyKeypress, state);
4252	SET_OPTION (Opt_scrollTtyKeypress);
4253	else
4254	CLR_OPTION (Opt_scrollTtyKeypress);
4255	break;	4181	break;
4256	case 1047: /* secondary screen w/ clearing last */	4182	case 1047: /* secondary screen w/ clearing last */
4257	if (OPTION (Opt_secondaryScreen))	4183	if (OPTION (Opt_secondaryScreen))
4258	if (current_screen != PRIMARY)	4184	if (current_screen != PRIMARY)
4259	scr_erase_screen (2);	4185	scr_erase_screen (2);
…		…
4397	scr_color (Color_bg, Color_bg);	4323	scr_color (Color_bg, Color_bg);
4398	break;	4324	break;
4399		4325
4400	//case 50: // not variable spacing	4326	//case 50: // not variable spacing
4401		4327
4402	#if ENABLE_FRILLS	4328	#if !ENABLE_MINIMAL
4403	case 90:	4329	case 90:
4404	case 91: /* set bright fg color */	4330	case 91: /* set bright fg color */
4405	case 92:	4331	case 92:
4406	case 93:	4332	case 93:
4407	case 94:	4333	case 94:
…		…
4469	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT	4395	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4470		4396
4471	void	4397	void
4472	rxvt_term::tt_write (const char *data, unsigned int len)	4398	rxvt_term::tt_write (const char *data, unsigned int len)
4473	{	4399	{
4474	if (pty.pty < 0)	4400	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4475	return;	4401	return;
4476		4402
		4403	if (pty->pty < 0)
		4404	return;
		4405
4477	if (v_buflen == 0)	4406	if (v_buflen == 0)
4478	{	4407	{
4479	ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));	4408	ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4480		4409
4481	if ((unsigned int)written == len)	4410	if ((unsigned int)written == len)
4482	return;	4411	return;
4483		4412
4484	data += written;	4413	data += written;
…		…
4493	pty_ev.set (EVENT_READ | EVENT_WRITE);	4422	pty_ev.set (EVENT_READ | EVENT_WRITE);
4494	}	4423	}
4495		4424
4496	void rxvt_term::pty_write ()	4425	void rxvt_term::pty_write ()
4497	{	4426	{
4498	int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));	4427	int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4499		4428
4500	if (written > 0)	4429	if (written > 0)
4501	{	4430	{
4502	v_buflen -= written;	4431	v_buflen -= written;
4503		4432

Diff Legend

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