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.248 by root, Sun Jan 8 00:07:18 2006 UTC vs.
Revision 1.301 by root, Tue Jan 31 21:23:13 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
65	/*----------------------------------------------------------------------*/	60	/*----------------------------------------------------------------------*/
66		61
67	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)	62	#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		63
72	#if ENABLE_FRILLS || ISO_14755	64	#if ENABLE_FRILLS || ISO_14755
73		65
74	#define ISO_14755_STARTED 0x80000000UL	66	#define ISO_14755_STARTED 0x80000000UL
75	#define ISO_14755_51 0x40000000UL // basic (section 5.1)	67	#define ISO_14755_51 0x40000000UL // basic (section 5.1)
…		…
147	|| !IN_RANGE_EXC (y, 0, nrow))	139	|| !IN_RANGE_EXC (y, 0, nrow))
148	return;	140	return;
149		141
150	for (;;)	142	for (;;)
151	{	143	{
152	const line_t &l = ROW(y - view_start);	144	const line_t &l = ROW(y + view_start);
153		145
154	text_t t = l.t[x];	146	text_t t = l.t[x];
155		147
156	if (t != NOCHAR || !x)	148	if (t != NOCHAR || !x)
157	{	149	{
…		…
230	# if !UNICODE3	222	# if !UNICODE3
231	if (ch >= 0x10000)	223	if (ch >= 0x10000)
232	ch = 0xfffd;	224	ch = 0xfffd;
233	# endif	225	# endif
234	scr_overlay_set (11, y, ch, r);	226	scr_overlay_set (11, y, ch, r);
		227
		228	if (WCWIDTH (ch) >= 2)
235	scr_overlay_set (12, y, NOCHAR, r);	229	scr_overlay_set (12, y, NOCHAR, r);
236	}	230	}
237		231
		232	// {
		233	// char buf[4+4+3+1];
		234	// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
		235	// scr_overlay_set (0, 0, buf);
		236	// }
238	scr_overlay_set (0, len , attr);	237	scr_overlay_set (0, len , attr);
239	scr_overlay_set (0, len + 1, fname);	238	scr_overlay_set (0, len + 1, fname);
240		239
241	free (fname);	240	free (fname);
242		241
…		…
302	rxvt_term::lookup_key (XKeyEvent &ev)	301	rxvt_term::lookup_key (XKeyEvent &ev)
303	{	302	{
304	int ctrl, meta, shft, len;	303	int ctrl, meta, shft, len;
305	unsigned int newlen;	304	unsigned int newlen;
306	KeySym keysym;	305	KeySym keysym;
307	#ifdef DEBUG_CMD
308	static int debug_key = 1; /* accessible by a debugger only */
309	#endif
310	int valid_keysym;	306	int valid_keysym;
311	char kbuf[KBUFSZ];	307	char kbuf[KBUFSZ];
312		308
313	/*	309	/*
314	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an	310	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
…		…
443	scr_move_to (0, 1);	439	scr_move_to (0, 1);
444	return;	440	return;
445	}	441	}
446	else if (keysym == XK_End)	442	else if (keysym == XK_End)
447	{	443	{
448	scr_move_to (1, 0);	444	scr_move_to (1, 1);
449	return;	445	return;
450	}	446	}
451	}	447	}
452	#endif	448	#endif
453	}	449	}
…		…
464	{	460	{
465	switch (keysym)	461	switch (keysym)
466	{	462	{
467	/* normal XTerm key bindings */	463	/* normal XTerm key bindings */
468	case XK_Insert: /* Shift+Insert = paste mouse selection */	464	case XK_Insert: /* Shift+Insert = paste mouse selection */
469	selection_request (ev.time, 0, 0);	465	selection_request (ev.time);
470	return;	466	return;
471	#if TODO	467	#if TODO
472	/* rxvt extras */	468	/* rxvt extras */
473	case XK_KP_Add: /* Shift+KP_Add = bigger font */	469	case XK_KP_Add: /* Shift+KP_Add = bigger font */
474	change_font (FONT_UP);	470	change_font (FONT_UP);
…		…
867	#endif	863	#endif
868	/* nil */ ;	864	/* nil */ ;
869	}	865	}
870	}	866	}
871		867
872	if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_STR_LEN, kbuf, len, DT_END)))	868	if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
873	return;	869	return;
874		870
875	if (len <= 0)	871	if (len <= 0)
876	return; /* not mapped */	872	return; /* not mapped */
877		873
…		…
905	{	901	{
906	const char ch = C0_ESC;	902	const char ch = C0_ESC;
907	tt_write (&ch, 1);	903	tt_write (&ch, 1);
908	}	904	}
909		905
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);	906	tt_write (kbuf, (unsigned int)len);
921	}	907	}
922	/*}}} */	908	/*}}} */
923		909
924	#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)	910	#if defined (KEYSYM_RESOURCE)
925	/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
926	/* attempt to `write' count to the input buffer */
927	unsigned int	911	unsigned int
928	rxvt_term::cmd_write (const char *str, unsigned int count)	912	rxvt_term::cmd_write (const char *str, unsigned int count)
929	{	913	{
930	unsigned int n, s;	914	unsigned int n, s;
931		915
…		…
972		956
973	if (want_refresh)	957	if (want_refresh)
974	{	958	{
975	if (SHOULD_INVOKE (HOOK_LINE_UPDATE))	959	if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
976	{	960	{
977	int row = -view_start;	961	int row = view_start;
		962	int end_row = row + nrow;
978		963
979	while (row > -nsaved && ROW (row - 1).is_longer ())	964	while (row > top_row && ROW (row - 1).is_longer ())
980	--row;	965	--row;
981		966
982	while (row < -view_start + nrow)	967	do
983	{	968	{
984	int start_row = row;	969	int start_row = row;
985	line_t *l;	970	line_t *l;
986		971
987	do	972	do
988	{	973	{
989	l = &ROW (row);	974	l = &ROW (row++);
990		975
991	if (!(l->f & LINE_FILTERED))	976	if (!(l->f & LINE_FILTERED))
992	{	977	{
993	// line not filtered, mark it as filtered	978	// line not filtered, mark it as filtered
994	l->f |= LINE_FILTERED;	979	l->f |= LINE_FILTERED;
995	while (l->is_longer ())	980	while (l->is_longer ())
996	{	981	{
997	l = &ROW (++row);	982	l = &ROW (row++);
998	l->f |= LINE_FILTERED;	983	l->f |= LINE_FILTERED;
999	}	984	}
1000		985
1001	// and filter it	986	// and filter it
1002	HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));	987	HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1003		988
1004	break;	989	break;
1005	}	990	}
1006	}	991	}
1007	while (l->is_longer ());	992	while (l->is_longer () && row < end_row);
1008
1009	row++;
1010	}	993	}
		994	while (row < end_row);
1011		995	}
1012	}
1013		996
1014	scr_refresh (refresh_type);	997	scr_refresh ();
1015	scrollbar_show (1);	998	scrollbar_show (1);
1016	#ifdef USE_XIM	999	#ifdef USE_XIM
1017	IMSendSpot ();	1000	IMSendSpot ();
1018	#endif	1001	#endif
1019	}	1002	}
…		…
1022	}	1005	}
1023		1006
1024	void	1007	void
1025	rxvt_term::check_cb (check_watcher &w)	1008	rxvt_term::check_cb (check_watcher &w)
1026	{	1009	{
1027	SET_R (this);	1010	make_current ();
1028	SET_LOCALE (locale);
1029		1011
1030	display->flush ();	1012	display->flush ();
1031		1013
1032	if (want_refresh && !flush_ev.active)	1014	if (want_refresh && !flush_ev.active)
1033	flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally	1015	flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1034	}	1016	}
1035		1017
1036	void	1018	void
1037	rxvt_term::flush_cb (time_watcher &w)	1019	rxvt_term::flush_cb (time_watcher &w)
1038	{	1020	{
1039	SET_R (this);	1021	make_current ();
1040	SET_LOCALE (locale);
1041		1022
1042	refresh_limit = 1;	1023	refresh_limit = 1;
1043	refresh_count = 0;	1024	refresh_count = 0;
1044	flush ();	1025	flush ();
1045	}	1026	}
…		…
1049	rxvt_term::cursor_blink_cb (time_watcher &w)	1030	rxvt_term::cursor_blink_cb (time_watcher &w)
1050	{	1031	{
1051	hidden_cursor = !hidden_cursor;	1032	hidden_cursor = !hidden_cursor;
1052	want_refresh = 1;	1033	want_refresh = 1;
1053		1034
1054	w.start (w.at + BLINK_INTERVAL);	1035	w.start (w.at + CURSOR_BLINK_INTERVAL);
1055	}	1036	}
1056	#endif	1037	#endif
1057		1038
1058	#ifdef TEXT_BLINK	1039	#ifdef TEXT_BLINK
1059	void	1040	void
…		…
1073	rxvt_term::cont_scroll_cb (time_watcher &w)	1054	rxvt_term::cont_scroll_cb (time_watcher &w)
1074	{	1055	{
1075	if ((scrollbar_isUp() || scrollbar_isDn()) &&	1056	if ((scrollbar_isUp() || scrollbar_isDn()) &&
1076	scr_page (scrollbar_isUp() ? UP : DN, 1))	1057	scr_page (scrollbar_isUp() ? UP : DN, 1))
1077	{	1058	{
1078	refresh_type |= SMOOTH_REFRESH;
1079	want_refresh = 1;	1059	want_refresh = 1;
1080	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1060	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1081	}	1061	}
1082	}	1062	}
1083	#endif	1063	#endif
…		…
1087	rxvt_term::sel_scroll_cb (time_watcher &w)	1067	rxvt_term::sel_scroll_cb (time_watcher &w)
1088	{	1068	{
1089	if (scr_page (scroll_selection_dir, scroll_selection_lines))	1069	if (scr_page (scroll_selection_dir, scroll_selection_lines))
1090	{	1070	{
1091	selection_extend (selection_save_x, selection_save_y, selection_save_state);	1071	selection_extend (selection_save_x, selection_save_y, selection_save_state);
1092	refresh_type |= SMOOTH_REFRESH;
1093	want_refresh = 1;	1072	want_refresh = 1;
1094	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1073	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1095	}	1074	}
1096	}	1075	}
1097	#endif	1076	#endif
…		…
1102	{	1081	{
1103	if (mouse_slip_wheel_speed == 0	1082	if (mouse_slip_wheel_speed == 0
1104	|| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)	1083	|| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1105	: scr_page (UP, mouse_slip_wheel_speed))	1084	: scr_page (UP, mouse_slip_wheel_speed))
1106	{	1085	{
1107	if (view_start == nsaved ||	1086	if (view_start == top_row || view_start == 0)
1108	view_start == 0)
1109	mouse_slip_wheel_speed = 0;	1087	mouse_slip_wheel_speed = 0;
1110		1088
1111	refresh_type |= SMOOTH_REFRESH;
1112	want_refresh = 1;	1089	want_refresh = 1;
1113	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1090	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1114	}	1091	}
1115	}	1092	}
1116	#endif
1117
1118	#if HAVE_SCHED_YIELD
1119	static struct event_handler
1120	{
1121	check_watcher cw_yield;
1122
1123	void yield (check_watcher &w)
1124	{
1125	sched_yield ();
1126	w.stop ();
1127	}
1128
1129	event_handler ()
1130	: cw_yield (this, &event_handler::yield)
1131	{
1132	}
1133	} event_handler;
1134	#endif	1093	#endif
1135		1094
1136	bool	1095	bool
1137	rxvt_term::pty_fill ()	1096	rxvt_term::pty_fill ()
1138	{	1097	{
…		…
1146		1105
1147	memmove (cmdbuf_base, cmdbuf_ptr, n);	1106	memmove (cmdbuf_base, cmdbuf_ptr, n);
1148	cmdbuf_ptr = cmdbuf_base;	1107	cmdbuf_ptr = cmdbuf_base;
1149	cmdbuf_endp = cmdbuf_ptr + n;	1108	cmdbuf_endp = cmdbuf_ptr + n;
1150		1109
1151	ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);	1110	ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1152		1111
1153	if (r > 0)	1112	if (r > 0)
1154	{	1113	{
1155	cmdbuf_endp += r;	1114	cmdbuf_endp += r;
1156	return true;	1115	return true;
…		…
1174	}	1133	}
1175		1134
1176	void	1135	void
1177	rxvt_term::pty_cb (io_watcher &w, short revents)	1136	rxvt_term::pty_cb (io_watcher &w, short revents)
1178	{	1137	{
1179	SET_R (this);	1138	make_current ();
1180	SET_LOCALE (locale);
1181		1139
1182	if (revents & EVENT_READ)	1140	if (revents & EVENT_READ)
1183	// loop, but don't allow a single term to monopolize us	1141	// loop, but don't allow a single term to monopolize us
1184	while (pty_fill ())	1142	while (pty_fill ())
1185	if (cmd_parse ())	1143	if (cmd_parse ())
…		…
1190	}	1148	}
1191		1149
1192	void	1150	void
1193	rxvt_term::pointer_unblank ()	1151	rxvt_term::pointer_unblank ()
1194	{	1152	{
1195	XDefineCursor (display->display, vt, TermWin_cursor);	1153	XDefineCursor (xdisp, vt, TermWin_cursor);
1196	recolour_cursor ();	1154	recolour_cursor ();
1197		1155
1198	#ifdef POINTER_BLANK	1156	#ifdef POINTER_BLANK
1199	hidden_pointer = 0;	1157	hidden_pointer = 0;
1200		1158
…		…
1208	rxvt_term::pointer_blank ()	1166	rxvt_term::pointer_blank ()
1209	{	1167	{
1210	if (!OPTION (Opt_pointerBlank))	1168	if (!OPTION (Opt_pointerBlank))
1211	return;	1169	return;
1212		1170
1213	XDefineCursor (display->display, vt, display->blank_cursor);	1171	XDefineCursor (xdisp, vt, display->blank_cursor);
1214	XFlush (display->display);	1172	XFlush (xdisp);
1215		1173
1216	hidden_pointer = 1;	1174	hidden_pointer = 1;
1217	}	1175	}
1218		1176
1219	void	1177	void
1220	rxvt_term::pointer_cb (time_watcher &w)	1178	rxvt_term::pointer_cb (time_watcher &w)
1221	{	1179	{
1222	SET_R (this);	1180	make_current ();
1223	SET_LOCALE (locale);
1224		1181
1225	pointer_blank ();	1182	pointer_blank ();
1226	}	1183	}
1227	#endif	1184	#endif
1228		1185
…		…
1293	(32 + button_number + key_state),	1250	(32 + button_number + key_state),
1294	(32 + x + 1),	1251	(32 + x + 1),
1295	(32 + y + 1));	1252	(32 + y + 1));
1296	}	1253	}
1297		1254
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 */	1255	/*{{{ process an X event */
1309	void	1256	void
1310	rxvt_term::x_cb (XEvent &ev)	1257	rxvt_term::x_cb (XEvent &ev)
1311	{	1258	{
1312	dDisp;	1259	make_current ();
1313		1260
1314	SET_R (this);	1261	dLocal (Display *, xdisp);
1315	SET_LOCALE (locale);
1316		1262
		1263	if (ev.xany.window == vt
		1264	&& SHOULD_INVOKE (HOOK_X_EVENT)
		1265	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
		1266	return;
		1267
		1268	// for XQueryPointer
1317	Window unused_root, unused_child;	1269	Window unused_root, unused_child;
1318	int unused_root_x, unused_root_y;	1270	int unused_root_x, unused_root_y;
1319	unsigned int unused_mask;	1271	unsigned int unused_mask;
1320		1272
1321	switch (ev.type)	1273	switch (ev.type)
…		…
1328		1280
1329	break;	1281	break;
1330		1282
1331	case KeyRelease:	1283	case KeyRelease:
1332	{	1284	{
1333	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755	1285	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1334	KeySym ks;	1286	KeySym keysym;
1335		1287
1336	ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/	1288	keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1337	#endif	1289	#endif
1338		1290
1339	#if ENABLE_FRILLS || ISO_14755	1291	#if ENABLE_FRILLS || ISO_14755
1340	// ISO 14755 support	1292	// ISO 14755 support
1341	if (iso14755buf)	1293	if (iso14755buf)
…		…
1346	# endif	1298	# endif
1347	# if ISO_14755	1299	# if ISO_14755
1348	// iso14755 part 5.2 handling: release time	1300	// iso14755 part 5.2 handling: release time
1349	// first: controls	1301	// first: controls
1350	if ((ev.xkey.state & ControlMask)	1302	if ((ev.xkey.state & ControlMask)
1351	&& ((ks >= 0x40 && ks <= 0x5f)	1303	&& ((keysym >= 0x40 && keysym <= 0x5f)
1352	|| (ks >= 0x61 && ks <= 0x7f)))	1304	|| (keysym >= 0x61 && keysym <= 0x7f)))
1353	{	1305	{
1354	iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);	1306	iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1355	commit_iso14755 ();	1307	commit_iso14755 ();
1356	goto skip_switch;	1308	goto skip_switch;
1357	}	1309	}
1358		1310
1359	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)	1311	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1360	if (i[0] == ks)	1312	if (i[0] == keysym)
1361	{	1313	{
1362	iso14755buf = ISO_14755_51 | i[1];	1314	iso14755buf = ISO_14755_51 | i[1];
1363	commit_iso14755 ();	1315	commit_iso14755 ();
1364	goto skip_switch;	1316	goto skip_switch;
1365	}	1317	}
…		…
1389	iso14755buf = 0;	1341	iso14755buf = 0;
1390	}	1342	}
1391	#endif	1343	#endif
1392		1344
1393	if (ev.xany.window == vt	1345	if (ev.xany.window == vt
1394	&& HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_END)))	1346	&& HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1395	break;	1347	break;
1396		1348
1397	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	1349	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1398	if (!(ev.xkey.state & ControlMask))	1350	if (!(ev.xkey.state & ControlMask))
1399	slip_wheel_ev.stop ();	1351	slip_wheel_ev.stop ();
1400	else if (ks == XK_Control_L || ks == XK_Control_R)	1352	else if (keysym == XK_Control_L || keysym == XK_Control_R)
1401	mouse_slip_wheel_speed = 0;	1353	mouse_slip_wheel_speed = 0;
1402	#endif	1354	#endif
1403	break;	1355	break;
1404	}	1356	}
1405		1357
…		…
1411	button_release (ev.xbutton);	1363	button_release (ev.xbutton);
1412	break;	1364	break;
1413		1365
1414	case ClientMessage:	1366	case ClientMessage:
1415	if (ev.xclient.format == 32	1367	if (ev.xclient.format == 32
1416	&& ev.xclient.message_type == xa[XA_WM_PROTOCOLS])	1368	&& !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1417	{	1369	{
		1370	if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
		1371	{
		1372	if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
		1373	{
1418	if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])	1374	if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
		1375	{
		1376	if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1419	destroy ();	1377	destroy ();
		1378	}
1420	#if ENABLE_EWMH	1379	#if ENABLE_EWMH
1421	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])	1380	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1422	XSendEvent (disp, ev.xclient.window = display->root,	1381	XSendEvent (xdisp, ev.xclient.window = display->root,
1423	False, SubstructureRedirectMask | SubstructureNotifyMask,	1382	False, SubstructureRedirectMask | SubstructureNotifyMask,
1424	&ev);	1383	&ev);
		1384	#endif
		1385	}
		1386	}
		1387	#if ENABLE_XEMBED
		1388	else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
		1389	{
		1390	if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
		1391	focus_in ();
		1392	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
		1393	focus_out ();
		1394	}
1425	#endif	1395	#endif
1426	}	1396	}
1427	#if ENABLE_XEMBED
1428	else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1429	{
1430	if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1431	focus_in ();
1432	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1433	focus_out ();
1434	}
1435	#endif
1436	#ifdef OFFIX_DND
1437	/* OffiX Dnd (drag 'n' drop) protocol */
1438	else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1439	&& (ev.xclient.data.l[0] == DndFile
1440	|| ev.xclient.data.l[0] == DndDir
1441	|| ev.xclient.data.l[0] == DndLink))
1442	{
1443	/* Get Dnd data */
1444	Atom ActualType;
1445	int ActualFormat;
1446	unsigned char *data;
1447	unsigned long Size, RemainingBytes;
1448
1449	XGetWindowProperty (disp, display->root,
1450	xa[XA_DNDSELECTION],
1451	0L, 1000000L,
1452	False, AnyPropertyType,
1453	&ActualType, &ActualFormat,
1454	&Size, &RemainingBytes,
1455	&data);
1456	set_string_property (XA_CUT_BUFFER0, data);
1457	XFree (data);
1458	selection_paste (display->root, XA_CUT_BUFFER0, true);
1459	XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1460	}
1461	#endif /* OFFIX_DND */
1462	break;	1397	break;
1463		1398
1464	case MappingNotify:	1399	case MappingNotify:
1465	XRefreshKeyboardMapping (&ev.xmapping);	1400	XRefreshKeyboardMapping (&ev.xmapping);
1466	break;	1401	break;
…		…
1499	break;	1434	break;
1500		1435
1501	case ConfigureNotify:	1436	case ConfigureNotify:
1502	if (ev.xconfigure.window == parent[0])	1437	if (ev.xconfigure.window == parent[0])
1503	{	1438	{
1504	while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))	1439	while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev))
1505	;	1440	;
1506		1441
1507	if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)	1442	if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1508	{	1443	{
1509	seen_resize = 1;	1444	seen_resize = 1;
1510	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1445	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1511	}	1446	}
1512		1447
		1448	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
		1449
1513	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */	1450	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1514	if (OPTION (Opt_transparent))	1451	if (OPTION (Opt_transparent))
1515	check_our_parents ();	1452	check_our_parents ();
1516	#endif	1453	#endif
1517	}	1454	}
1518	break;	1455	break;
1519		1456
1520	case PropertyNotify:	1457	case PropertyNotify:
		1458	if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1521	if (ev.xproperty.atom == xa[XA_VT_SELECTION]	1459	if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1522	&& ev.xproperty.state == PropertyNewValue)	1460	&& ev.xproperty.state == PropertyNewValue)
1523	selection_property (ev.xproperty.window, ev.xproperty.atom);	1461	selection_property (ev.xproperty.window, ev.xproperty.atom);
1524		1462
1525	break;	1463	break;
1526		1464
1527	case SelectionClear:	1465	case SelectionClear:
1528	selection_clear ();	1466	selection_clear ();
…		…
1564	if (ev.xany.window == vt)	1502	if (ev.xany.window == vt)
1565	{	1503	{
1566	do	1504	do
1567	scr_expose (ev.xexpose.x, ev.xexpose.y,	1505	scr_expose (ev.xexpose.x, ev.xexpose.y,
1568	ev.xexpose.width, ev.xexpose.height, False);	1506	ev.xexpose.width, ev.xexpose.height, False);
1569	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));	1507	while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev));
1570		1508
1571	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1509	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1572		1510
1573	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))	1511	while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev))
1574	scr_expose (ev.xexpose.x, ev.xexpose.y,	1512	scr_expose (ev.xexpose.x, ev.xexpose.y,
1575	ev.xexpose.width, ev.xexpose.height, False);	1513	ev.xexpose.width, ev.xexpose.height, False);
1576		1514
1577	scr_refresh (refresh_type);	1515	want_refresh = 1;
1578	}	1516	}
1579	else	1517	else
1580	{	1518	{
1581	XEvent unused_event;	1519	XEvent unused_event;
1582		1520
1583	while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))	1521	while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event))
1584	;	1522	;
1585	while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))	1523	while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event))
1586	;	1524	;
1587		1525
1588	if (isScrollbarWindow (ev.xany.window))	1526	if (isScrollbarWindow (ev.xany.window))
1589	{	1527	{
1590	scrollBar.setIdle ();	1528	scrollBar.setIdle ();
1591	scrollbar_show (0);	1529	scrollbar_show (0);
1592	}	1530	}
1593	#ifdef MENUBAR
1594	if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1595	menubar_expose ();
1596	#endif
1597		1531
1598	#ifdef TRANSPARENT	1532	#ifdef TRANSPARENT
1599	if (am_transparent && ev.xany.window == parent[0])	1533	if (am_transparent && ev.xany.window == parent[0])
1600	XClearWindow (disp, ev.xany.window);	1534	XClearWindow (xdisp, ev.xany.window);
1601	#endif	1535	#endif
1602	}	1536	}
1603	break;	1537	break;
1604		1538
1605	case MotionNotify:	1539	case MotionNotify:
1606	#ifdef POINTER_BLANK	1540	#ifdef POINTER_BLANK
1607	if (hidden_pointer)	1541	if (hidden_pointer)
1608	pointer_unblank ();	1542	pointer_unblank ();
1609	#endif	1543	#endif
1610	#if MENUBAR
1611	if (isMenuBarWindow (ev.xany.window))
1612	{
1613	menubar_control (ev.xbutton);
1614	break;
1615	}
1616	#endif
1617	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)	1544	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1618	break;	1545	break;
1619		1546
1620	if (ev.xany.window == vt)	1547	if (ev.xany.window == vt)
1621	{	1548	{
		1549	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1622	if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))	1550	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1623	; // nop	1551	; // nop
1624	else if (ev.xbutton.state & (Button1Mask | Button3Mask))	1552	else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1625	{	1553	{
1626	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))	1554	while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev))
1627	;	1555	;
1628		1556
1629	XQueryPointer (disp, vt,	1557	XQueryPointer (xdisp, vt,
1630	&unused_root, &unused_child,	1558	&unused_root, &unused_child,
1631	&unused_root_x, &unused_root_y,	1559	&unused_root_x, &unused_root_y,
1632	&ev.xbutton.x, &ev.xbutton.y,	1560	&ev.xbutton.x, &ev.xbutton.y,
1633	&ev.xbutton.state);	1561	&ev.xbutton.state);
1634	#ifdef MOUSE_THRESHOLD	1562	#ifdef MOUSE_THRESHOLD
…		…
1698	#endif	1626	#endif
1699	}	1627	}
1700	}	1628	}
1701	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1629	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1702	{	1630	{
1703	while (XCheckTypedWindowEvent (disp, scrollBar.win,	1631	while (XCheckTypedWindowEvent (xdisp, scrollBar.win,
1704	MotionNotify, &ev))	1632	MotionNotify, &ev))
1705	;	1633	;
1706		1634
1707	XQueryPointer (disp, scrollBar.win,	1635	XQueryPointer (xdisp, scrollBar.win,
1708	&unused_root, &unused_child,	1636	&unused_root, &unused_child,
1709	&unused_root_x, &unused_root_y,	1637	&unused_root_x, &unused_root_y,
1710	&ev.xbutton.x, &ev.xbutton.y,	1638	&ev.xbutton.x, &ev.xbutton.y,
1711	&unused_mask);	1639	&unused_mask);
1712	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1640	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1713	scrollbar_size ());	1641	scrollbar_size ());
1714	scr_refresh (refresh_type);	1642	want_refresh = 1;
1715	refresh_limit = 0;	1643	refresh_limit = 0;
1716	scrollbar_show (1);	1644	scrollbar_show (1);
1717	}	1645	}
1718	break;	1646	break;
1719	}	1647	}
…		…
1727	{	1655	{
1728	hidden_cursor = 0;	1656	hidden_cursor = 0;
1729	want_refresh = 1;	1657	want_refresh = 1;
1730	}	1658	}
1731		1659
1732	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1660	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1733	}	1661	}
1734	#endif	1662	#endif
1735		1663
1736	#if defined(POINTER_BLANK)	1664	#if defined(POINTER_BLANK)
1737	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)	1665	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
…		…
1765	XSetICFocus (Input_Context);	1693	XSetICFocus (Input_Context);
1766	}	1694	}
1767	#endif	1695	#endif
1768	#if CURSOR_BLINK	1696	#if CURSOR_BLINK
1769	if (OPTION (Opt_cursorBlink))	1697	if (OPTION (Opt_cursorBlink))
1770	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1698	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1771	#endif	1699	#endif
1772	#if OFF_FOCUS_FADING	1700	#if OFF_FOCUS_FADING
1773	if (rs[Rs_fade])	1701	if (rs[Rs_fade])
1774	{	1702	{
1775	pix_colors = pix_colors_focused;	1703	pix_colors = pix_colors_focused;
…		…
1819		1747
1820	#if TRANSPARENT	1748	#if TRANSPARENT
1821	void	1749	void
1822	rxvt_term::rootwin_cb (XEvent &ev)	1750	rxvt_term::rootwin_cb (XEvent &ev)
1823	{	1751	{
1824	SET_R (this);	1752	make_current ();
1825	SET_LOCALE (locale);
1826		1753
1827	switch (ev.type)	1754	switch (ev.type)
1828	{	1755	{
1829	case PropertyNotify:	1756	case PropertyNotify:
1830	/*	1757	/*
…		…
1857	/*	1784	/*
1858	* VT window processing of button press	1785	* VT window processing of button press
1859	*/	1786	*/
1860	if (ev.window == vt)	1787	if (ev.window == vt)
1861	{	1788	{
		1789	if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
		1790	return;
		1791
1862	#if ISO_14755	1792	#if ISO_14755
1863	// 5.4	1793	// 5.4
1864	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))	1794	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1865	{	1795	{
1866	iso14755_54 (ev.x, ev.y);	1796	iso14755_54 (ev.x, ev.y);
…		…
1908	else	1838	else
1909	{	1839	{
1910	if (ev.button != MEvent.button)	1840	if (ev.button != MEvent.button)
1911	MEvent.clicks = 0;	1841	MEvent.clicks = 0;
1912		1842
1913	if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1914	switch (ev.button)	1843	switch (ev.button)
1915	{	1844	{
1916	case Button1:	1845	case Button1:
1917	/* allow meta + click to select rectangular areas */	1846	/* allow meta + click to select rectangular areas */
1918	/* should be done in screen.C */	1847	/* should be done in screen.C */
1919	#if ENABLE_FRILLS	1848	#if ENABLE_FRILLS
1920	selection.rect = !!(ev.state & ModMetaMask);	1849	selection.rect = !!(ev.state & ModMetaMask);
1921	#else	1850	#else
1922	selection.rect = false;	1851	selection.rect = false;
1923	#endif	1852	#endif
1924		1853
1925	/* allow shift+left click to extend selection */	1854	/* allow shift+left click to extend selection */
1926	if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))	1855	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1927	{	1856	{
1928	if (MEvent.button == Button1 && clickintime)	1857	if (MEvent.button == Button1 && clickintime)
1929	selection_rotate (ev.x, ev.y);	1858	selection_rotate (ev.x, ev.y);
1930	else	1859	else
1931	selection_extend (ev.x, ev.y, 1);	1860	selection_extend (ev.x, ev.y, 1);
1932	}	1861	}
1933	else	1862	else
1934	{	1863	{
1935	if (MEvent.button == Button1 && clickintime)	1864	if (MEvent.button == Button1 && clickintime)
1936	MEvent.clicks++;	1865	MEvent.clicks++;
1937	else	1866	else
1938	MEvent.clicks = 1;	1867	MEvent.clicks = 1;
1939		1868
1940	selection_click (MEvent.clicks, ev.x, ev.y);	1869	selection_click (MEvent.clicks, ev.x, ev.y);
1941	}	1870	}
1942		1871
1943	MEvent.button = Button1;	1872	MEvent.button = Button1;
1944	break;	1873	break;
1945		1874
1946	case Button3:	1875	case Button3:
1947	if (MEvent.button == Button3 && clickintime)	1876	if (MEvent.button == Button3 && clickintime)
1948	selection_rotate (ev.x, ev.y);	1877	selection_rotate (ev.x, ev.y);
1949	else	1878	else
1950	selection_extend (ev.x, ev.y, 1);	1879	selection_extend (ev.x, ev.y, 1);
1951		1880
1952	MEvent.button = Button3;	1881	MEvent.button = Button3;
1953	break;	1882	break;
1954	}	1883	}
1955	}	1884	}
1956		1885
1957	MEvent.time = ev.time;	1886	MEvent.time = ev.time;
1958	return;	1887	return;
1959	}	1888	}
1960		1889
…		…
2099	}	2028	}
2100	}	2029	}
2101		2030
2102	return;	2031	return;
2103	}	2032	}
2104
2105	#if MENUBAR
2106	/*
2107	* Menubar window processing of button press
2108	*/
2109	if (isMenuBarWindow (ev.window))
2110	menubar_control (ev);
2111	#endif
2112	}	2033	}
2113		2034
2114	void	2035	void
2115	rxvt_term::button_release (XButtonEvent &ev)	2036	rxvt_term::button_release (XButtonEvent &ev)
2116	{	2037	{
…		…
2122		2043
2123	if (scrollbar_isUpDn ())	2044	if (scrollbar_isUpDn ())
2124	{	2045	{
2125	scrollBar.setIdle ();	2046	scrollBar.setIdle ();
2126	scrollbar_show (0);	2047	scrollbar_show (0);
2127	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2128	refresh_type &= ~SMOOTH_REFRESH;
2129	#endif
2130	}	2048	}
2131		2049
2132	#ifdef SELECTION_SCROLLING	2050	#ifdef SELECTION_SCROLLING
2133	if (sel_scroll_ev.active)	2051	if (sel_scroll_ev.active)
2134	sel_scroll_ev.stop();	2052	sel_scroll_ev.stop();
2135	#endif	2053	#endif
2136		2054
2137	if (ev.window == vt)	2055	if (ev.window == vt)
2138	{	2056	{
		2057	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
		2058	return;
		2059
2139	#if ISO_14755	2060	#if ISO_14755
2140	// 5.4	2061	// 5.4
2141	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))	2062	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2142	return;	2063	return;
2143	#endif	2064	#endif
		2065
2144	if (reportmode)	2066	if (reportmode)
2145	{	2067	{
2146	/* mouse report from vt window */	2068	/* mouse report from vt window */
2147	/* don't report release of wheel "buttons" */	2069	/* don't report release of wheel "buttons" */
2148	if (ev.button >= 4)	2070	if (ev.button >= 4)
…		…
2172	if (priv_modes & PrivMode_mouse_report	2094	if (priv_modes & PrivMode_mouse_report
2173	&& bypass_keystate	2095	&& bypass_keystate
2174	&& ev.button == Button1 && MEvent.clicks <= 1)	2096	&& ev.button == Button1 && MEvent.clicks <= 1)
2175	selection_extend (ev.x, ev.y, 0);	2097	selection_extend (ev.x, ev.y, 0);
2176		2098
2177	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2178	return;
2179
2180	switch (ev.button)	2099	switch (ev.button)
2181	{	2100	{
2182	case Button1:	2101	case Button1:
2183	case Button3:	2102	case Button3:
2184	selection_make (ev.time);	2103	selection_make (ev.time);
2185	break;	2104	break;
		2105
2186	case Button2:	2106	case Button2:
2187	selection_request (ev.time, ev.x, ev.y);	2107	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
		2108	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2188	break;	2109	break;
		2110
2189	#ifdef MOUSE_WHEEL	2111	#ifdef MOUSE_WHEEL
2190	case Button4:	2112	case Button4:
2191	case Button5:	2113	case Button5:
2192	{	2114	{
2193	int i;	2115	int i;
…		…
2215	slip_wheel_ev.start ();	2137	slip_wheel_ev.start ();
2216	}	2138	}
2217	else	2139	else
2218	{	2140	{
2219	# endif	2141	# endif
2220	# ifdef JUMP_MOUSE_WHEEL
2221	scr_page (v, i);	2142	scr_page (v, i);
2222	scr_refresh (SMOOTH_REFRESH);
2223	scrollbar_show (1);	2143	scrollbar_show (1);
2224	# else
2225	while (i--)
2226	{
2227	scr_page (v, 1);
2228	scr_refresh (SMOOTH_REFRESH);
2229	scrollbar_show (1);
2230	}
2231	# endif
2232	# ifdef MOUSE_SLIP_WHEELING	2144	# ifdef MOUSE_SLIP_WHEELING
2233	}	2145	}
2234	#endif	2146	# endif
2235	}	2147	}
2236	break;	2148	break;
2237	#endif	2149	#endif
2238	}	2150	}
2239	}	2151	}
2240	#ifdef MENUBAR
2241	else if (isMenuBarWindow (ev.window))
2242	menubar_control (ev);
2243	#endif
2244	}	2152	}
2245		2153
2246	#ifdef TRANSPARENT	2154	#ifdef TRANSPARENT
2247	#if TINTING	2155	#if TINTING
2248	/* taken from aterm-0.4.2 */	2156	/* taken from aterm-0.4.2 */
2249		2157
2250	typedef uint32_t RUINT32T;	2158	typedef uint32_t RUINT32T;
2251		2159
2252	void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)	2160	void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2253	{	2161	{
2254	int sh_r, sh_g, sh_b;	2162	int sh_r, sh_g, sh_b;
2255	RUINT32T mask_r, mask_g, mask_b;	2163	RUINT32T mask_r, mask_g, mask_b;
2256	RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;	2164	RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2257	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;	2165	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2258	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;	2166	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2259	int i;	2167	int i;
2260		2168
2261	Visual *visual = display->visual;	2169	Visual *visual = term->visual;
2262		2170
2263	if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;	2171	if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2264		2172
2265	/* for convenience */	2173	/* for convenience */
2266	mask_r = visual->red_mask;	2174	mask_r = visual->red_mask;
…		…
2487	Atom atype;	2395	Atom atype;
2488	unsigned char *prop = NULL;	2396	unsigned char *prop = NULL;
2489	Window root, oldp, *list;	2397	Window root, oldp, *list;
2490	Pixmap rootpixmap = None;	2398	Pixmap rootpixmap = None;
2491	XWindowAttributes wattr, wrootattr;	2399	XWindowAttributes wattr, wrootattr;
2492	dDisp;
2493		2400
2494	pchanged = 0;	2401	pchanged = 0;
2495		2402
2496	if (!OPTION (Opt_transparent))	2403	if (!OPTION (Opt_transparent))
2497	return pchanged; /* Don't try any more */	2404	return pchanged; /* Don't try any more */
2498		2405
2499	XGetWindowAttributes (disp, display->root, &wrootattr);	2406	XGetWindowAttributes (xdisp, display->root, &wrootattr);
2500	rootdepth = wrootattr.depth;	2407	rootdepth = wrootattr.depth;
2501		2408
2502	XGetWindowAttributes (disp, parent[0], &wattr);	2409	XGetWindowAttributes (xdisp, parent[0], &wattr);
2503		2410
2504	if (rootdepth != wattr.depth)	2411	if (rootdepth != wattr.depth)
2505	{	2412	{
2506	if (am_transparent)	2413	if (am_transparent)
2507	{	2414	{
2508	pchanged = 1;	2415	pchanged = 1;
2509	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2416	XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2510	am_transparent = am_pixmap_trans = 0;	2417	am_transparent = am_pixmap_trans = 0;
2511	}	2418	}
2512		2419
2513	return pchanged; /* Don't try any more */	2420	return pchanged; /* Don't try any more */
2514	}	2421	}
2515		2422
2516	/* Get all X ops out of the queue so that our information is up-to-date. */	2423	/* Get all X ops out of the queue so that our information is up-to-date. */
2517	XSync (disp, False);	2424	XSync (xdisp, False);
2518		2425
2519	/*	2426	/*
2520	* Make the frame window set by the window manager have	2427	* Make the frame window set by the window manager have
2521	* the root background. Some window managers put multiple nested frame	2428	* the root background. Some window managers put multiple nested frame
2522	* windows for each client, so we have to take care about that.	2429	* windows for each client, so we have to take care about that.
2523	*/	2430	*/
2524	i = (xa[XA_XROOTPMAP_ID]	2431	i = (xa[XA_XROOTPMAP_ID]
2525	&& XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],	2432	&& XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2526	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2433	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2527	&nitems, &bytes_after, &prop) == Success);	2434	&nitems, &bytes_after, &prop) == Success);
2528		2435
2529	if (!i || prop == NULL)	2436	if (!i || prop == NULL)
2530	i = (xa[XA_ESETROOT_PMAP_ID]	2437	i = (xa[XA_ESETROOT_PMAP_ID]
2531	&& XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],	2438	&& XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2532	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2439	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2533	&nitems, &bytes_after, &prop) == Success);	2440	&nitems, &bytes_after, &prop) == Success);
2534		2441
2535	if (!i || prop == NULL	2442	if (!i || prop == NULL
2536	#if TINTING	2443	#if TINTING
2537	|| !rs[Rs_color + Color_tint]	2444	|| !ISSET_PIXCOLOR (Color_tint)
2538	#endif	2445	#endif
2539	)	2446	)
2540	have_pixmap = 0;	2447	have_pixmap = 0;
2541	else	2448	else
2542	{	2449	{
…		…
2555	Window cr;	2462	Window cr;
2556	XImage *image;	2463	XImage *image;
2557	GC gc;	2464	GC gc;
2558	XGCValues gcvalue;	2465	XGCValues gcvalue;
2559		2466
2560	XTranslateCoordinates (disp, parent[0], display->root,	2467	XTranslateCoordinates (xdisp, parent[0], display->root,
2561	0, 0, &sx, &sy, &cr);	2468	0, 0, &sx, &sy, &cr);
2562	nw = (unsigned int)szHint.width;	2469	nw = (unsigned int)szHint.width;
2563	nh = (unsigned int)szHint.height;	2470	nh = (unsigned int)szHint.height;
2564	nx = ny = 0;	2471	nx = ny = 0;
2565		2472
…		…
2578	}	2485	}
2579		2486
2580	min_it (nw, (unsigned int) (wrootattr.width - sx));	2487	min_it (nw, (unsigned int) (wrootattr.width - sx));
2581	min_it (nh, (unsigned int) (wrootattr.height - sy));	2488	min_it (nh, (unsigned int) (wrootattr.height - sy));
2582		2489
2583	XSync (disp, False);	2490	XSync (xdisp, False);
2584	allowedxerror = -1;	2491	allowedxerror = -1;
2585	image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);	2492	image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2586		2493
2587	/* XXX: handle BadMatch - usually because we're outside the pixmap */	2494	/* XXX: handle BadMatch - usually because we're outside the pixmap */
2588	/* XXX: may need a delay here? */	2495	/* XXX: may need a delay here? */
2589	allowedxerror = 0;	2496	allowedxerror = 0;
2590		2497
…		…
2593	if (am_transparent && am_pixmap_trans)	2500	if (am_transparent && am_pixmap_trans)
2594	{	2501	{
2595	pchanged = 1;	2502	pchanged = 1;
2596	if (pixmap != None)	2503	if (pixmap != None)
2597	{	2504	{
2598	XFreePixmap (disp, pixmap);	2505	XFreePixmap (xdisp, pixmap);
2599	pixmap = None;	2506	pixmap = None;
2600	}	2507	}
2601	}	2508	}
2602		2509
2603	am_pixmap_trans = 0;	2510	am_pixmap_trans = 0;
2604	}	2511	}
2605	else	2512	else
2606	{	2513	{
2607	if (pixmap != None)	2514	if (pixmap != None)
2608	XFreePixmap (disp, pixmap);	2515	XFreePixmap (xdisp, pixmap);
2609		2516
2610	#if TINTING	2517	#if TINTING
2611	if (ISSET_PIXCOLOR (Color_tint))	2518	if (ISSET_PIXCOLOR (Color_tint))
2612	{	2519	{
2613	unsigned short rm, gm, bm;
2614	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;	2520	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2615		2521
		2522	rgba c;
2616	pix_colors_focused[Color_tint].get (display, rm, gm, bm);	2523	pix_colors_focused [Color_tint].get (c);
2617		2524
2618	ShadeXImage (display, image, shade, rm, gm, bm);	2525	ShadeXImage (this, image, shade, c.r, c.g, c.b);
2619	}	2526	}
2620	#endif	2527	#endif
2621		2528
2622	pixmap = XCreatePixmap (disp, vt,	2529	pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2623	szHint.width, szHint.height, image->depth);
2624	gc = XCreateGC (disp, vt, 0UL, &gcvalue);	2530	gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2625	XPutImage (disp, pixmap, gc, image, 0, 0,	2531	XPutImage (xdisp, pixmap, gc, image, 0, 0,
2626	nx, ny, image->width, image->height);	2532	nx, ny, image->width, image->height);
2627	XFreeGC (disp, gc);	2533	XFreeGC (xdisp, gc);
2628	XDestroyImage (image);	2534	XDestroyImage (image);
2629	XSetWindowBackgroundPixmap (disp, parent[0], pixmap);	2535	XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2630	XClearWindow (disp, parent[0]);	2536	XClearWindow (xdisp, parent[0]);
2631		2537
2632	if (!am_transparent || !am_pixmap_trans)	2538	if (!am_transparent || !am_pixmap_trans)
2633	pchanged = 1;	2539	pchanged = 1;
2634		2540
2635	am_transparent = am_pixmap_trans = 1;	2541	am_transparent = am_pixmap_trans = 1;
2636	}	2542	}
2637	}	2543	}
2638		2544
2639	if (am_pixmap_trans)	2545	if (am_pixmap_trans)
2640	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2546	XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2641	else	2547	else
2642	{	2548	{
2643	unsigned int n;	2549	unsigned int n;
2644	/*	2550	/*
2645	* InheritPixmap transparency	2551	* InheritPixmap transparency
2646	*/	2552	*/
2647	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2553	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2648	{	2554	{
2649	oldp = parent[i];	2555	oldp = parent[i];
2650	XQueryTree (disp, parent[i - 1], &root,	2556	XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n);
2651	&parent[i], &list, &n);
2652	XFree (list);	2557	XFree (list);
2653		2558
2654	if (parent[i] == display->root)	2559	if (parent[i] == display->root)
2655	{	2560	{
2656	if (oldp != None)	2561	if (oldp != None)
…		…
2664	}	2569	}
2665		2570
2666	n = 0;	2571	n = 0;
2667		2572
2668	if (pchanged)	2573	if (pchanged)
2669	{
2670	for (; n < (unsigned int)i; n++)	2574	for (; n < (unsigned int)i; n++)
2671	{	2575	{
2672	XGetWindowAttributes (disp, parent[n], &wattr);	2576	XGetWindowAttributes (xdisp, parent[n], &wattr);
		2577
2673	if (wattr.depth != rootdepth || wattr.c_class == InputOnly)	2578	if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2674	{	2579	{
2675	n = (int) (sizeof (parent) / sizeof (Window)) + 1;	2580	n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2676	break;	2581	break;
2677	}	2582	}
2678	}	2583	}
2679	}
2680		2584
2681	if (n > (int) (sizeof (parent) / sizeof (parent[0])))	2585	if (n > (sizeof (parent) / sizeof (parent[0])))
2682	{	2586	{
2683	XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);	2587	XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2684	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2588	XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2685	am_transparent = 0;	2589	am_transparent = 0;
2686	/* XXX: also turn off Opt_transparent? */	2590	/* XXX: also turn off Opt_transparent? */
2687	}	2591	}
2688	else	2592	else
2689	{	2593	{
2690	#if WAIT_FOR_WM
2691	/* wait (an arbitrary period) for the WM to do its thing
2692	* needed for fvwm2.2.2 (and before?) */
2693	sleep (1);
2694	#endif
2695	for (n = 0; n < (unsigned int)i; n++)	2594	for (n = 0; n < (unsigned int)i; n++)
2696	{	2595	{
2697	XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);	2596	XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2698	XClearWindow (disp, parent[n]);	2597	XClearWindow (xdisp, parent[n]);
2699	}	2598	}
2700		2599
2701	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2600	XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2702	am_transparent = 1;	2601	am_transparent = 1;
2703	}	2602	}
2704		2603
2705	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2604	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2706	parent[i] = None;	2605	parent[i] = None;
2707	}	2606	}
2708		2607
2709	if (scrollBar.win)	2608	if (scrollBar.win)
2710	{	2609	{
2711	XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);	2610	XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2712	scrollBar.setIdle ();	2611	scrollBar.setIdle ();
2713	scrollbar_show (0);	2612	scrollbar_show (0);
2714	}	2613	}
2715		2614
2716	if (am_transparent)	2615	if (am_transparent)
…		…
2791	}	2690	}
2792		2691
2793	// scr_add_lines only works for nlines <= nrow - 1.	2692	// scr_add_lines only works for nlines <= nrow - 1.
2794	if (nlines >= nrow - 1)	2693	if (nlines >= nrow - 1)
2795	{	2694	{
		2695	if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2796	if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))	2696	&& HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2797	scr_add_lines (buf, str - buf, nlines);	2697	scr_add_lines (buf, str - buf, nlines);
2798		2698
2799	nlines = 0;	2699	nlines = 0;
2800	str = buf;	2700	str = buf;
2801	eol = str + min (ncol, UBUFSIZ);	2701	eol = str + min (ncol, UBUFSIZ);
…		…
2816		2716
2817	seq_begin = cmdbuf_ptr;	2717	seq_begin = cmdbuf_ptr;
2818	ch = next_char ();	2718	ch = next_char ();
2819	}	2719	}
2820		2720
		2721	if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2821	if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))	2722	&& HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2822	scr_add_lines (buf, str - buf, nlines);	2723	scr_add_lines (buf, str - buf, nlines);
2823		2724
2824	/*	2725	/*
2825	* If there have been a lot of new lines, then update the screen	2726	* If there have been a lot of new lines, then update the screen
2826	* What the heck I'll cheat and only refresh less than every page-full.	2727	* What the heck I'll cheat and only refresh less than every page-full.
…		…
2832	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)	2733	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2833	refresh_limit++;	2734	refresh_limit++;
2834	else	2735	else
2835	{	2736	{
2836	flag = true;	2737	flag = true;
2837	scr_refresh (refresh_type);	2738	scr_refresh ();
2838	flush_ev.stop ();	2739	want_refresh = 1;
2839	}	2740	}
2840	}	2741	}
2841		2742
2842	}	2743	}
2843	else	2744	else
…		…
2860	return flag;	2761	return flag;
2861	}	2762	}
2862		2763
2863	// read the next character	2764	// read the next character
2864	wchar_t	2765	wchar_t
2865	rxvt_term::next_char ()	2766	rxvt_term::next_char () NOTHROW
2866	{	2767	{
2867	while (cmdbuf_ptr < cmdbuf_endp)	2768	while (cmdbuf_ptr < cmdbuf_endp)
2868	{	2769	{
2869	// assume 7-bit to be ascii ALWAYS	2770	// assume 7-bit to be ascii ALWAYS
2870	if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)	2771	if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
…		…
2891	return NOCHAR;	2792	return NOCHAR;
2892	}	2793	}
2893		2794
2894	// read the next octet	2795	// read the next octet
2895	uint32_t	2796	uint32_t
2896	rxvt_term::next_octet ()	2797	rxvt_term::next_octet () NOTHROW
2897	{	2798	{
2898	return cmdbuf_ptr < cmdbuf_endp	2799	return cmdbuf_ptr < cmdbuf_endp
2899	? (unsigned char)*cmdbuf_ptr++	2800	? (unsigned char)*cmdbuf_ptr++
2900	: NOCHAR;	2801	: NOCHAR;
2901	}	2802	}
		2803
		2804	static class out_of_input out_of_input;
2902		2805
2903	/* rxvt_cmd_getc () - Return next input character */	2806	/* rxvt_cmd_getc () - Return next input character */
2904	/*	2807	/*
2905	* Return the next input character after first passing any keyboard input	2808	* Return the next input character after first passing any keyboard input
2906	* to the command.	2809	* to the command.
2907	*/	2810	*/
2908	wchar_t	2811	wchar_t
2909	rxvt_term::cmd_getc ()	2812	rxvt_term::cmd_getc () THROW ((class out_of_input))
2910	{	2813	{
2911	wchar_t c = next_char ();	2814	wchar_t c = next_char ();
2912		2815
2913	if (c == NOCHAR)	2816	if (c == NOCHAR)
2914	throw out_of_input;	2817	throw out_of_input;
2915		2818
2916	return c;	2819	return c;
2917	}	2820	}
2918		2821
2919	uint32_t	2822	uint32_t
2920	rxvt_term::cmd_get8 ()	2823	rxvt_term::cmd_get8 () THROW ((class out_of_input))
2921	{	2824	{
2922	uint32_t c = next_octet ();	2825	uint32_t c = next_octet ();
2923		2826
2924	if (c == NOCHAR)	2827	if (c == NOCHAR)
2925	throw out_of_input;	2828	throw out_of_input;
…		…
3163	scr_charset_set (2, (unsigned int)cmd_getc ());	3066	scr_charset_set (2, (unsigned int)cmd_getc ());
3164	break;	3067	break;
3165	case '+':	3068	case '+':
3166	scr_charset_set (3, (unsigned int)cmd_getc ());	3069	scr_charset_set (3, (unsigned int)cmd_getc ());
3167	break;	3070	break;
3168	#if ENABLE_FRILLS	3071	#if !ENABLE_MINIMAL
3169	case '6':	3072	case '6':
3170	scr_backindex ();	3073	scr_backindex ();
3171	break;	3074	break;
3172	#endif	3075	#endif
3173	case '7':	3076	case '7':
3174	scr_cursor (SAVE);	3077	scr_cursor (SAVE);
3175	break;	3078	break;
3176	case '8':	3079	case '8':
3177	scr_cursor (RESTORE);	3080	scr_cursor (RESTORE);
3178	break;	3081	break;
3179	#if ENABLE_FRILLS	3082	#if !ENABLE_MINIMAL
3180	case '9':	3083	case '9':
3181	scr_forwardindex ();	3084	scr_forwardindex ();
3182	break;	3085	break;
3183	#endif	3086	#endif
3184	case '=':	3087	case '=':
…		…
3346	ndef = get_byte_array_bit (csi_defaults, i);	3249	ndef = get_byte_array_bit (csi_defaults, i);
3347	for (p = 0; p < nargs; p++)	3250	for (p = 0; p < nargs; p++)
3348	if (arg[p] == -1)	3251	if (arg[p] == -1)
3349	arg[p] = ndef;	3252	arg[p] = ndef;
3350		3253
3351	#ifdef DEBUG_CMD
3352	fprintf (stderr, "CSI ");
3353	for (p = 0; p < nargs; p++)
3354	fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3355	fprintf (stderr, "%c\n", ch);
3356	#endif
3357
3358	/*	3254	/*
3359	* private mode handling	3255	* private mode handling
3360	*/	3256	*/
3361	if (priv)	3257	if (priv)
3362	{	3258	{
3363	switch (priv)	3259	switch (priv)
3364	{	3260	{
3365	case '>':	3261	case '>':
3366	if (ch == CSI_DA) /* secondary device attributes */	3262	if (ch == CSI_DA) /* secondary device attributes */
3367	tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);	3263	{
		3264	// first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
		3265	// 'U' for rxvt-unicode != 7.[34] (where it was broken).
		3266	//
		3267	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
		3268	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
		3269	// that we do not support xterm mouse reporting (should be 95 when we do).
		3270	//
		3271	tt_printf ("\033[>%d;94;0c", 'U');
		3272	}
3368	break;	3273	break;
3369	case '?':	3274	case '?':
3370	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')	3275	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3371	process_terminal_mode (ch, priv, nargs, arg);	3276	process_terminal_mode (ch, priv, nargs, arg);
3372	break;	3277	break;
…		…
3575	break;	3480	break;
3576	case CSI_75:	3481	case CSI_75:
3577	scr_cursor (RESTORE);	3482	scr_cursor (RESTORE);
3578	break;	3483	break;
3579		3484
3580	#if ENABLE_FRILLS	3485	#if !ENABLE_MINIMAL
3581	case CSI_74:	3486	case CSI_74:
3582	process_window_ops (arg, nargs);	3487	process_window_ops (arg, nargs);
3583	break;	3488	break;
3584	#endif	3489	#endif
3585		3490
…		…
3592	break;	3497	break;
3593	}	3498	}
3594	}	3499	}
3595	/*}}} */	3500	/*}}} */
3596		3501
3597	#if ENABLE_FRILLS	3502	#if !ENABLE_MINIMAL
3598	/* ARGSUSED */	3503	/* ARGSUSED */
3599	void	3504	void
3600	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3505	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3601	{	3506	{
3602	int x, y;	3507	int x, y;
3603	XWindowAttributes wattr;	3508	XWindowAttributes wattr;
3604	Window wdummy;	3509	Window wdummy;
3605	dDisp;	3510
		3511	dLocal (Display *, xdisp);
3606		3512
3607	if (nargs == 0)	3513	if (nargs == 0)
3608	return;	3514	return;
3609		3515
3610	switch (args[0])	3516	switch (args[0])
3611	{	3517	{
3612	/*	3518	/*
3613	* commands	3519	* commands
3614	*/	3520	*/
3615	case 1: /* deiconify window */	3521	case 1: /* deiconify window */
3616	XMapWindow (disp, parent[0]);	3522	XMapWindow (xdisp, parent[0]);
3617	break;	3523	break;
3618	case 2: /* iconify window */	3524	case 2: /* iconify window */
3619	XIconifyWindow (disp, parent[0], display->screen);	3525	XIconifyWindow (xdisp, parent[0], display->screen);
3620	break;	3526	break;
3621	case 3: /* set position (pixels) */	3527	case 3: /* set position (pixels) */
3622	XMoveWindow (disp, parent[0], args[1], args[2]);	3528	XMoveWindow (xdisp, parent[0], args[1], args[2]);
3623	break;	3529	break;
3624	case 4: /* set size (pixels) */	3530	case 4: /* set size (pixels) */
3625	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3531	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3626	break;	3532	break;
3627	case 5: /* raise window */	3533	case 5: /* raise window */
3628	XRaiseWindow (disp, parent[0]);	3534	XRaiseWindow (xdisp, parent[0]);
3629	break;	3535	break;
3630	case 6: /* lower window */	3536	case 6: /* lower window */
3631	XLowerWindow (disp, parent[0]);	3537	XLowerWindow (xdisp, parent[0]);
3632	break;	3538	break;
3633	case 7: /* refresh window */	3539	case 7: /* refresh window */
3634	scr_touch (true);	3540	scr_touch (true);
3635	break;	3541	break;
3636	case 8: /* set size (chars) */	3542	case 8: /* set size (chars) */
…		…
3643	if (args[0] >= 24) /* set height (chars) */	3549	if (args[0] >= 24) /* set height (chars) */
3644	set_widthheight ((unsigned int)width,	3550	set_widthheight ((unsigned int)width,
3645	(unsigned int) (args[1] * fheight));	3551	(unsigned int) (args[1] * fheight));
3646	break;	3552	break;
3647		3553
3648
3649	/*	3554	/*
3650	* reports - some output format copied from XTerm	3555	* reports - some output format copied from XTerm
3651	*/	3556	*/
3652	case 11: /* report window state */	3557	case 11: /* report window state */
3653	XGetWindowAttributes (disp, parent[0], &wattr);	3558	XGetWindowAttributes (xdisp, parent[0], &wattr);
3654	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3559	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3655	break;	3560	break;
3656	case 13: /* report window position */	3561	case 13: /* report window position */
3657	XGetWindowAttributes (disp, parent[0], &wattr);	3562	XGetWindowAttributes (xdisp, parent[0], &wattr);
3658	XTranslateCoordinates (disp, parent[0], wattr.root,	3563	XTranslateCoordinates (xdisp, parent[0], wattr.root,
3659	-wattr.border_width, -wattr.border_width,	3564	-wattr.border_width, -wattr.border_width,
3660	&x, &y, &wdummy);	3565	&x, &y, &wdummy);
3661	tt_printf ("\033[3;%d;%dt", x, y);	3566	tt_printf ("\033[3;%d;%dt", x, y);
3662	break;	3567	break;
3663	case 14: /* report window size (pixels) */	3568	case 14: /* report window size (pixels) */
3664	XGetWindowAttributes (disp, parent[0], &wattr);	3569	XGetWindowAttributes (xdisp, parent[0], &wattr);
3665	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3570	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3666	break;	3571	break;
3667	case 18: /* report text area size (chars) */	3572	case 18: /* report text area size (chars) */
3668	tt_printf ("\033[8;%d;%dt", nrow, ncol);	3573	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3669	break;	3574	break;
…		…
3671	tt_printf ("\033[9;%d;%dt", nrow, ncol);	3576	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3672	break;	3577	break;
3673	case 20: /* report icon label */	3578	case 20: /* report icon label */
3674	{	3579	{
3675	char *s;	3580	char *s;
3676	XGetIconName (disp, parent[0], &s);	3581	XGetIconName (xdisp, parent[0], &s);
3677	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3582	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3678	XFree (s);	3583	XFree (s);
3679	}	3584	}
3680	break;	3585	break;
3681	case 21: /* report window title */	3586	case 21: /* report window title */
3682	{	3587	{
3683	char *s;	3588	char *s;
3684	XFetchName (disp, parent[0], &s);	3589	XFetchName (xdisp, parent[0], &s);
3685	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3590	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3686	XFree (s);	3591	XFree (s);
3687	}	3592	}
3688	break;	3593	break;
3689	}	3594	}
…		…
3790	void	3695	void
3791	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)	3696	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3792	{	3697	{
3793	if (str[0] == '?' && !str[1])	3698	if (str[0] == '?' && !str[1])
3794	{	3699	{
3795	unsigned short r, g, b;	3700	rgba c;
3796	pix_colors_focused[color].get (display, r, g, b);	3701	pix_colors_focused[color].get (c);
		3702
		3703	#if XFT
		3704	if (c.a != rgba::MAX_CC)
		3705	tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
		3706	else
		3707	#endif
3797	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);	3708	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3798	}	3709	}
3799	else	3710	else
3800	set_window_color (color, str);	3711	set_window_color (color, str);
3801	}	3712	}
3802		3713
…		…
3804	* XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)	3715	* XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3805	*/	3716	*/
3806	void	3717	void
3807	rxvt_term::process_xterm_seq (int op, const char *str, char resp)	3718	rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3808	{	3719	{
3809	int changed = 0;
3810	int color;	3720	int color;
3811	char *buf, *name;	3721	char *buf, *name;
3812	bool query = str[0] == '?' && !str[1];	3722	bool query = str[0] == '?' && !str[1];
3813	int saveop = op;	3723	int saveop = op;
3814	dDisp;	3724
		3725	dLocal (Display *, xdisp);
3815		3726
3816	assert (str != NULL);	3727	assert (str != NULL);
3817	switch (op)	3728	switch (op)
3818	{	3729	{
3819	case XTerm_name:	3730	case XTerm_name:
…		…
3835	unsigned long bytes_after;	3746	unsigned long bytes_after;
3836	unsigned char *value = 0;	3747	unsigned char *value = 0;
3837	const char *str = "";	3748	const char *str = "";
3838		3749
3839	if (prop	3750	if (prop
3840	&& XGetWindowProperty (disp, parent[0],	3751	&& XGetWindowProperty (xdisp, parent[0],
3841	prop, 0, 1<<16, 0, AnyPropertyType,	3752	prop, 0, 1<<16, 0, AnyPropertyType,
3842	&actual_type, &actual_format,	3753	&actual_type, &actual_format,
3843	&nitems, &bytes_after, &value) == Success	3754	&nitems, &bytes_after, &value) == Success
3844	&& actual_type != None	3755	&& actual_type != None
3845	&& actual_format == 8)	3756	&& actual_format == 8)
3846	str = (const char *)(value);	3757	str = (const char *)(value);
3847		3758
3848	tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);	3759	tt_printf ("\033]%d;%s%c", op, str, resp);
3849		3760
3850	XFree (value);	3761	XFree (value);
3851	}	3762	}
3852	else	3763	else
3853	{	3764	{
…		…
3857	{	3768	{
3858	*eq = 0;	3769	*eq = 0;
3859	set_utf8_property (display->atom (str), eq + 1);	3770	set_utf8_property (display->atom (str), eq + 1);
3860	}	3771	}
3861	else	3772	else
3862	XDeleteProperty (disp, parent[0],	3773	XDeleteProperty (xdisp, parent[0],
3863	display->atom (str));	3774	display->atom (str));
3864	}	3775	}
3865	break;	3776	break;
3866		3777
3867	case XTerm_Color:	3778	case XTerm_Color:
…		…
3869	{	3780	{
3870	if ((name = strchr (buf, ';')) == NULL)	3781	if ((name = strchr (buf, ';')) == NULL)
3871	break;	3782	break;
3872		3783
3873	*name++ = '\0';	3784	*name++ = '\0';
3874	color = atoi (buf);	3785	color = atoi (buf) + minCOLOR;
3875		3786
3876	if (color < 0 || color >= TOTAL_COLORS)	3787	if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3877	break;	3788	break;
3878		3789
3879	if ((buf = strchr (name, ';')) != NULL)	3790	if ((buf = strchr (name, ';')) != NULL)
3880	*buf++ = '\0';	3791	*buf++ = '\0';
3881		3792
3882	if (name[0] == '?' && !name[1])	3793	process_color_seq (op, color, name, resp);
3883	{
3884	unsigned short r, g, b;
3885	pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3886	tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3887	}
3888	else
3889	set_window_color (color + minCOLOR, name);
3890	}	3794	}
3891	break;	3795	break;
3892	case XTerm_Color00:	3796	case XTerm_Color00:
3893	process_color_seq (XTerm_Color00, Color_fg, str, resp);	3797	process_color_seq (op, Color_fg, str, resp);
3894	break;	3798	break;
3895	case XTerm_Color01:	3799	case XTerm_Color01:
3896	process_color_seq (XTerm_Color00, Color_bg, str, resp);	3800	process_color_seq (op, Color_bg, str, resp);
3897	break;	3801	break;
3898	#ifndef NO_CURSORCOLOR	3802	#ifndef NO_CURSORCOLOR
3899	case XTerm_Color_cursor:	3803	case XTerm_Color_cursor:
3900	process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);	3804	process_color_seq (op, Color_cursor, str, resp);
3901	break;	3805	break;
3902	#endif	3806	#endif
3903	case XTerm_Color_pointer_fg:	3807	case XTerm_Color_pointer_fg:
3904	process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);	3808	process_color_seq (op, Color_pointer_fg, str, resp);
3905	break;	3809	break;
3906	case XTerm_Color_pointer_bg:	3810	case XTerm_Color_pointer_bg:
3907	process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);	3811	process_color_seq (op, Color_pointer_bg, str, resp);
3908	break;	3812	break;
3909	#ifndef NO_BOLD_UNDERLINE_REVERSE	3813	#ifndef NO_BOLD_UNDERLINE_REVERSE
3910	case XTerm_Color_BD:
3911	process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3912	break;
3913	case XTerm_Color_UL:
3914	process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3915	break;
3916	case XTerm_Color_RV:	3814	case XTerm_Color_RV:
3917	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3815	process_color_seq (op, Color_RV, str, resp);
		3816	break;
		3817	case Rxvt_Color_BD:
		3818	case URxvt_Color_BD:
		3819	process_color_seq (op, Color_BD, str, resp);
		3820	break;
		3821	case Rxvt_Color_UL:
		3822	case URxvt_Color_UL:
		3823	process_color_seq (op, Color_UL, str, resp);
3918	break;	3824	break;
3919	case URxvt_Color_IT:	3825	case URxvt_Color_IT:
3920	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);	3826	process_color_seq (op, Color_IT, str, resp);
3921	break;	3827	break;
3922	#endif	3828	#endif
3923	#if TRANSPARENT && TINTING	3829	#if TRANSPARENT && TINTING
3924	case URxvt_Color_tint:	3830	case URxvt_Color_tint:
3925	process_color_seq (URxvt_Color_tint, Color_tint, str, resp);	3831	process_color_seq (op, Color_tint, str, resp);
		3832
3926	check_our_parents ();	3833	check_our_parents ();
		3834
3927	if (am_transparent)	3835	if (am_transparent)
3928	want_full_refresh = want_refresh = 1;	3836	want_full_refresh = want_refresh = 1;
3929	break;
3930	#endif
3931		3837
		3838	break;
		3839	#endif
		3840
3932	case XTerm_Pixmap:	3841	case Rxvt_Pixmap:
		3842	{
3933	if (*str != ';')	3843	if (*str != ';')
3934	{	3844	{
3935	#if XPM_BACKGROUND	3845	#if XPM_BACKGROUND
3936	scale_pixmap (""); /* reset to default scaling */	3846	scale_pixmap (""); /* reset to default scaling */
3937	set_bgPixmap (str); /* change pixmap */	3847	set_bgPixmap (str); /* change pixmap */
3938	#endif
3939	scr_touch (true);	3848	scr_touch (true);
		3849	#endif
3940	}	3850	}
		3851
		3852	int changed = 0;
		3853
3941	while ((str = strchr (str, ';')) != NULL)	3854	while ((str = strchr (str, ';')) != NULL)
3942	{	3855	{
3943	str++;	3856	str++;
3944	#if XPM_BACKGROUND	3857	#if XPM_BACKGROUND
3945	changed += scale_pixmap (str);	3858	changed += scale_pixmap (str);
3946	#endif	3859	#endif
3947	}	3860	}
3948		3861
3949	if (changed)	3862	if (changed)
3950	{	3863	{
3951	#ifdef XPM_BACKGROUND	3864	#ifdef XPM_BACKGROUND
3952	resize_pixmap ();	3865	resize_pixmap ();
3953	#endif
3954	scr_touch (true);	3866	scr_touch (true);
		3867	#endif
3955	}	3868	}
		3869	}
3956	break;	3870	break;
3957		3871
3958	case XTerm_restoreFG:	3872	case Rxvt_restoreFG:
3959	set_window_color (Color_fg, str);	3873	set_window_color (Color_fg, str);
3960	break;	3874	break;
3961	case XTerm_restoreBG:	3875	case Rxvt_restoreBG:
3962	set_window_color (Color_bg, str);	3876	set_window_color (Color_bg, str);
3963	break;	3877	break;
3964		3878
3965	case XTerm_logfile:	3879	case XTerm_logfile:
3966	// TODO, when secure mode?	3880	// TODO, when secure mode?
3967	break;	3881	break;
3968		3882
3969	#ifdef MENUBAR
3970	case URxvt_Menu:
3971	if (OPTION (Opt_insecure))
3972	menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3973	break;
3974	#endif
3975	#if 0	3883	#if 0
3976	case XTerm_dumpscreen: /* no error notices */	3884	case Rxvt_dumpscreen: /* no error notices */
3977	{	3885	{
3978	int fd;	3886	int fd;
3979	if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)	3887	if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3980	{	3888	{
3981	scr_dump (fd);	3889	scr_dump (fd);
…		…
4005	allocated.push_back ((void *)res);	3913	allocated.push_back ((void *)res);
4006	set_fonts ();	3914	set_fonts ();
4007	}	3915	}
4008	break;	3916	break;
4009		3917
4010	#if ENABLE_FRILLS	3918	case URxvt_version:
		3919	if (query)
		3920	tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
		3921	op,
		3922	rs[Rs_name], VERSION[0], VERSION[2],
		3923	resp);
		3924	break;
		3925
		3926	#if !ENABLE_MINIMAL
4011	case URxvt_locale:	3927	case URxvt_locale:
4012	if (query)	3928	if (query)
4013	tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);	3929	tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
4014	else	3930	else
4015	{	3931	{
4016	set_locale (str);	3932	set_locale (str);
4017	pty.set_utf8_mode (enc_utf8);	3933	pty->set_utf8_mode (enc_utf8);
4018	init_xlocale ();	3934	init_xlocale ();
4019	}	3935	}
4020	break;	3936	break;
4021		3937
4022	case URxvt_view_up:	3938	case URxvt_view_up:
…		…
4075	return state;	3991	return state;
4076	}	3992	}
4077		3993
4078	/* we're not using priv _yet_ */	3994	/* we're not using priv _yet_ */
4079	void	3995	void
4080	rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)	3996	rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4081	{	3997	{
4082	unsigned int i, j;	3998	unsigned int i, j;
4083	int state;	3999	int state;
4084		4000
4085	static const struct	4001	static const struct
…		…
4096	{ 5, PrivMode_rVideo },	4012	{ 5, PrivMode_rVideo },
4097	{ 6, PrivMode_relOrigin },	4013	{ 6, PrivMode_relOrigin },
4098	{ 7, PrivMode_Autowrap },	4014	{ 7, PrivMode_Autowrap },
4099	// 8, bi-directional support mode	4015	// 8, bi-directional support mode
4100	{ 9, PrivMode_MouseX10 },	4016	{ 9, PrivMode_MouseX10 },
4101	#ifdef menuBar_esc
4102	{ menuBar_esc, PrivMode_menuBar },
4103	#endif
4104	// 18, 19 printing-related	4017	// 18, 19 printing-related
4105	{ 25, PrivMode_VisibleCursor },	4018	{ 25, PrivMode_VisibleCursor },
4106	#ifdef scrollBar_esc	4019	#ifdef scrollBar_esc
4107	{ scrollBar_esc, PrivMode_scrollBar },	4020	{ scrollBar_esc, PrivMode_scrollBar },
4108	#endif	4021	#endif
…		…
4155	/* extra handling for values with state unkept */	4068	/* extra handling for values with state unkept */
4156	switch (arg[i])	4069	switch (arg[i])
4157	{	4070	{
4158	#if ENABLE_STYLES	4071	#if ENABLE_STYLES
4159	case 1021:	4072	case 1021:
4160	if (mode)	4073	set_option (Opt_intensityStyles, mode);
4161	SET_OPTION (Opt_intensityStyles);
4162	else
4163	CLR_OPTION (Opt_intensityStyles);
4164		4074
4165	scr_touch (true);	4075	scr_touch (true);
4166	break;	4076	break;
4167	#endif	4077	#endif
4168	case 1048: /* alternative cursor save */	4078	case 1048: /* alternative cursor save */
…		…
4190	case 3: /* 80/132 */	4100	case 3: /* 80/132 */
4191	if (priv_modes & PrivMode_132OK)	4101	if (priv_modes & PrivMode_132OK)
4192	set_widthheight (((state ? 132 : 80) * fwidth), height);	4102	set_widthheight (((state ? 132 : 80) * fwidth), height);
4193	break;	4103	break;
4194	case 4: /* smooth scrolling */	4104	case 4: /* smooth scrolling */
4195	if (!state)	4105	set_option (Opt_jumpScroll, !state);
4196	SET_OPTION (Opt_jumpScroll);
4197	else
4198	CLR_OPTION (Opt_jumpScroll);
4199	break;	4106	break;
4200	case 5: /* reverse video */	4107	case 5: /* reverse video */
4201	scr_rvideo_mode (state);	4108	scr_rvideo_mode (state);
4202	break;	4109	break;
4203	case 6: /* relative/absolute origins */	4110	case 6: /* relative/absolute origins */
…		…
4209	/* case 8: - auto repeat, can't do on a per window basis */	4116	/* case 8: - auto repeat, can't do on a per window basis */
4210	case 9: /* X10 mouse reporting */	4117	case 9: /* X10 mouse reporting */
4211	if (state) /* orthogonal */	4118	if (state) /* orthogonal */
4212	priv_modes &= ~PrivMode_MouseX11;	4119	priv_modes &= ~PrivMode_MouseX11;
4213	break;	4120	break;
4214	#ifdef menuBar_esc
4215	case menuBar_esc:
4216	#ifdef MENUBAR
4217	map_menuBar (state);
4218	#endif
4219	break;
4220	#endif
4221	#ifdef scrollBar_esc	4121	#ifdef scrollBar_esc
4222	case scrollBar_esc:	4122	case scrollBar_esc:
4223	if (scrollbar_mapping (state))	4123	if (scrollbar_mapping (state))
4224	{	4124	{
4225	resize_all_windows (0, 0, 0);	4125	resize_all_windows (0, 0, 0);
…		…
4244	#if 0	4144	#if 0
4245	case 1001:	4145	case 1001:
4246	break; /* X11 mouse highlighting */	4146	break; /* X11 mouse highlighting */
4247	#endif	4147	#endif
4248	case 1010: /* scroll to bottom on TTY output inhibit */	4148	case 1010: /* scroll to bottom on TTY output inhibit */
4249	if (!state)	4149	set_option (Opt_scrollTtyOutput, !state);
4250	SET_OPTION (Opt_scrollTtyOutput);
4251	else
4252	CLR_OPTION (Opt_scrollTtyOutput);
4253	break;	4150	break;
4254	case 1011: /* scroll to bottom on key press */	4151	case 1011: /* scroll to bottom on key press */
4255	if (state)	4152	set_option (Opt_scrollTtyKeypress, state);
4256	SET_OPTION (Opt_scrollTtyKeypress);
4257	else
4258	CLR_OPTION (Opt_scrollTtyKeypress);
4259	break;	4153	break;
4260	case 1047: /* secondary screen w/ clearing last */	4154	case 1047: /* secondary screen w/ clearing last */
4261	if (OPTION (Opt_secondaryScreen))	4155	if (OPTION (Opt_secondaryScreen))
4262	if (current_screen != PRIMARY)	4156	if (current_screen != PRIMARY)
4263	scr_erase_screen (2);	4157	scr_erase_screen (2);
…		…
4401	scr_color (Color_bg, Color_bg);	4295	scr_color (Color_bg, Color_bg);
4402	break;	4296	break;
4403		4297
4404	//case 50: // not variable spacing	4298	//case 50: // not variable spacing
4405		4299
4406	#if ENABLE_FRILLS	4300	#if !ENABLE_MINIMAL
4407	case 90:	4301	case 90:
4408	case 91: /* set bright fg color */	4302	case 91: /* set bright fg color */
4409	case 92:	4303	case 92:
4410	case 93:	4304	case 93:
4411	case 94:	4305	case 94:
…		…
4473	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT	4367	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4474		4368
4475	void	4369	void
4476	rxvt_term::tt_write (const char *data, unsigned int len)	4370	rxvt_term::tt_write (const char *data, unsigned int len)
4477	{	4371	{
4478	if (pty.pty < 0)	4372	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4479	return;	4373	return;
4480		4374
		4375	if (pty->pty < 0)
		4376	return;
		4377
4481	if (v_buflen == 0)	4378	if (v_buflen == 0)
4482	{	4379	{
4483	ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));	4380	ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4484		4381
4485	if ((unsigned int)written == len)	4382	if ((unsigned int)written == len)
4486	return;	4383	return;
4487		4384
4488	data += written;	4385	data += written;
…		…
4497	pty_ev.set (EVENT_READ | EVENT_WRITE);	4394	pty_ev.set (EVENT_READ | EVENT_WRITE);
4498	}	4395	}
4499		4396
4500	void rxvt_term::pty_write ()	4397	void rxvt_term::pty_write ()
4501	{	4398	{
4502	int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));	4399	int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4503		4400
4504	if (written > 0)	4401	if (written > 0)
4505	{	4402	{
4506	v_buflen -= written;	4403	v_buflen -= written;
4507		4404

Diff Legend

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