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.290 by root, Sat Jan 28 20:41:38 2006 UTC

…		…
64		64
65	/*----------------------------------------------------------------------*/	65	/*----------------------------------------------------------------------*/
66		66
67	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)	67	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68		68
69	// exception thrown when the command parser runs out of input data
70	class out_of_input { } out_of_input;
71
72	#if ENABLE_FRILLS || ISO_14755	69	#if ENABLE_FRILLS || ISO_14755
73		70
74	#define ISO_14755_STARTED 0x80000000UL	71	#define ISO_14755_STARTED 0x80000000UL
75	#define ISO_14755_51 0x40000000UL // basic (section 5.1)	72	#define ISO_14755_51 0x40000000UL // basic (section 5.1)
76	#define ISO_14755_52 0x20000000UL // keycap (section 5.2)	73	#define ISO_14755_52 0x20000000UL // keycap (section 5.2)
…		…
147	|| !IN_RANGE_EXC (y, 0, nrow))	144	|| !IN_RANGE_EXC (y, 0, nrow))
148	return;	145	return;
149		146
150	for (;;)	147	for (;;)
151	{	148	{
152	const line_t &l = ROW(y - view_start);	149	const line_t &l = ROW(y + view_start);
153		150
154	text_t t = l.t[x];	151	text_t t = l.t[x];
155		152
156	if (t != NOCHAR || !x)	153	if (t != NOCHAR || !x)
157	{	154	{
…		…
302	rxvt_term::lookup_key (XKeyEvent &ev)	299	rxvt_term::lookup_key (XKeyEvent &ev)
303	{	300	{
304	int ctrl, meta, shft, len;	301	int ctrl, meta, shft, len;
305	unsigned int newlen;	302	unsigned int newlen;
306	KeySym keysym;	303	KeySym keysym;
307	#ifdef DEBUG_CMD
308	static int debug_key = 1; /* accessible by a debugger only */
309	#endif
310	int valid_keysym;	304	int valid_keysym;
311	char kbuf[KBUFSZ];	305	char kbuf[KBUFSZ];
312		306
313	/*	307	/*
314	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an	308	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
…		…
443	scr_move_to (0, 1);	437	scr_move_to (0, 1);
444	return;	438	return;
445	}	439	}
446	else if (keysym == XK_End)	440	else if (keysym == XK_End)
447	{	441	{
448	scr_move_to (1, 0);	442	scr_move_to (1, 1);
449	return;	443	return;
450	}	444	}
451	}	445	}
452	#endif	446	#endif
453	}	447	}
…		…
464	{	458	{
465	switch (keysym)	459	switch (keysym)
466	{	460	{
467	/* normal XTerm key bindings */	461	/* normal XTerm key bindings */
468	case XK_Insert: /* Shift+Insert = paste mouse selection */	462	case XK_Insert: /* Shift+Insert = paste mouse selection */
469	selection_request (ev.time, 0, 0);	463	selection_request (ev.time);
470	return;	464	return;
471	#if TODO	465	#if TODO
472	/* rxvt extras */	466	/* rxvt extras */
473	case XK_KP_Add: /* Shift+KP_Add = bigger font */	467	case XK_KP_Add: /* Shift+KP_Add = bigger font */
474	change_font (FONT_UP);	468	change_font (FONT_UP);
…		…
867	#endif	861	#endif
868	/* nil */ ;	862	/* nil */ ;
869	}	863	}
870	}	864	}
871		865
872	if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_STR_LEN, kbuf, len, DT_END)))	866	if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
873	return;	867	return;
874		868
875	if (len <= 0)	869	if (len <= 0)
876	return; /* not mapped */	870	return; /* not mapped */
877		871
…		…
905	{	899	{
906	const char ch = C0_ESC;	900	const char ch = C0_ESC;
907	tt_write (&ch, 1);	901	tt_write (&ch, 1);
908	}	902	}
909		903
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);	904	tt_write (kbuf, (unsigned int)len);
921	}	905	}
922	/*}}} */	906	/*}}} */
923		907
924	#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)	908	#if defined (KEYSYM_RESOURCE)
925	/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
926	/* attempt to `write' count to the input buffer */
927	unsigned int	909	unsigned int
928	rxvt_term::cmd_write (const char *str, unsigned int count)	910	rxvt_term::cmd_write (const char *str, unsigned int count)
929	{	911	{
930	unsigned int n, s;	912	unsigned int n, s;
931		913
…		…
972		954
973	if (want_refresh)	955	if (want_refresh)
974	{	956	{
975	if (SHOULD_INVOKE (HOOK_LINE_UPDATE))	957	if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
976	{	958	{
977	int row = -view_start;	959	int row = view_start;
		960	int end_row = row + nrow;
978		961
979	while (row > -nsaved && ROW (row - 1).is_longer ())	962	while (row > top_row && ROW (row - 1).is_longer ())
980	--row;	963	--row;
981		964
982	while (row < -view_start + nrow)	965	do
983	{	966	{
984	int start_row = row;	967	int start_row = row;
985	line_t *l;	968	line_t *l;
986		969
987	do	970	do
988	{	971	{
989	l = &ROW (row);	972	l = &ROW (row++);
990		973
991	if (!(l->f & LINE_FILTERED))	974	if (!(l->f & LINE_FILTERED))
992	{	975	{
993	// line not filtered, mark it as filtered	976	// line not filtered, mark it as filtered
994	l->f |= LINE_FILTERED;	977	l->f |= LINE_FILTERED;
995	while (l->is_longer ())	978	while (l->is_longer ())
996	{	979	{
997	l = &ROW (++row);	980	l = &ROW (row++);
998	l->f |= LINE_FILTERED;	981	l->f |= LINE_FILTERED;
999	}	982	}
1000		983
1001	// and filter it	984	// and filter it
1002	HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));	985	HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1003		986
1004	break;	987	break;
1005	}	988	}
1006	}	989	}
1007	while (l->is_longer ());	990	while (l->is_longer () && row < end_row);
1008
1009	row++;
1010	}	991	}
		992	while (row < end_row);
1011		993	}
1012	}
1013		994
1014	scr_refresh (refresh_type);	995	scr_refresh ();
1015	scrollbar_show (1);	996	scrollbar_show (1);
1016	#ifdef USE_XIM	997	#ifdef USE_XIM
1017	IMSendSpot ();	998	IMSendSpot ();
1018	#endif	999	#endif
1019	}	1000	}
…		…
1022	}	1003	}
1023		1004
1024	void	1005	void
1025	rxvt_term::check_cb (check_watcher &w)	1006	rxvt_term::check_cb (check_watcher &w)
1026	{	1007	{
1027	SET_R (this);	1008	make_current ();
1028	SET_LOCALE (locale);
1029		1009
1030	display->flush ();	1010	display->flush ();
1031		1011
1032	if (want_refresh && !flush_ev.active)	1012	if (want_refresh && !flush_ev.active)
1033	flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally	1013	flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1034	}	1014	}
1035		1015
1036	void	1016	void
1037	rxvt_term::flush_cb (time_watcher &w)	1017	rxvt_term::flush_cb (time_watcher &w)
1038	{	1018	{
1039	SET_R (this);	1019	make_current ();
1040	SET_LOCALE (locale);
1041		1020
1042	refresh_limit = 1;	1021	refresh_limit = 1;
1043	refresh_count = 0;	1022	refresh_count = 0;
1044	flush ();	1023	flush ();
1045	}	1024	}
…		…
1049	rxvt_term::cursor_blink_cb (time_watcher &w)	1028	rxvt_term::cursor_blink_cb (time_watcher &w)
1050	{	1029	{
1051	hidden_cursor = !hidden_cursor;	1030	hidden_cursor = !hidden_cursor;
1052	want_refresh = 1;	1031	want_refresh = 1;
1053		1032
1054	w.start (w.at + BLINK_INTERVAL);	1033	w.start (w.at + CURSOR_BLINK_INTERVAL);
1055	}	1034	}
1056	#endif	1035	#endif
1057		1036
1058	#ifdef TEXT_BLINK	1037	#ifdef TEXT_BLINK
1059	void	1038	void
…		…
1073	rxvt_term::cont_scroll_cb (time_watcher &w)	1052	rxvt_term::cont_scroll_cb (time_watcher &w)
1074	{	1053	{
1075	if ((scrollbar_isUp() || scrollbar_isDn()) &&	1054	if ((scrollbar_isUp() || scrollbar_isDn()) &&
1076	scr_page (scrollbar_isUp() ? UP : DN, 1))	1055	scr_page (scrollbar_isUp() ? UP : DN, 1))
1077	{	1056	{
1078	refresh_type |= SMOOTH_REFRESH;
1079	want_refresh = 1;	1057	want_refresh = 1;
1080	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1058	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1081	}	1059	}
1082	}	1060	}
1083	#endif	1061	#endif
…		…
1087	rxvt_term::sel_scroll_cb (time_watcher &w)	1065	rxvt_term::sel_scroll_cb (time_watcher &w)
1088	{	1066	{
1089	if (scr_page (scroll_selection_dir, scroll_selection_lines))	1067	if (scr_page (scroll_selection_dir, scroll_selection_lines))
1090	{	1068	{
1091	selection_extend (selection_save_x, selection_save_y, selection_save_state);	1069	selection_extend (selection_save_x, selection_save_y, selection_save_state);
1092	refresh_type |= SMOOTH_REFRESH;
1093	want_refresh = 1;	1070	want_refresh = 1;
1094	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1071	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1095	}	1072	}
1096	}	1073	}
1097	#endif	1074	#endif
…		…
1102	{	1079	{
1103	if (mouse_slip_wheel_speed == 0	1080	if (mouse_slip_wheel_speed == 0
1104	|| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)	1081	|| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1105	: scr_page (UP, mouse_slip_wheel_speed))	1082	: scr_page (UP, mouse_slip_wheel_speed))
1106	{	1083	{
1107	if (view_start == nsaved ||	1084	if (view_start == top_row || view_start == 0)
1108	view_start == 0)
1109	mouse_slip_wheel_speed = 0;	1085	mouse_slip_wheel_speed = 0;
1110		1086
1111	refresh_type |= SMOOTH_REFRESH;
1112	want_refresh = 1;	1087	want_refresh = 1;
1113	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1088	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1114	}	1089	}
1115	}	1090	}
1116	#endif	1091	#endif
…		…
1146		1121
1147	memmove (cmdbuf_base, cmdbuf_ptr, n);	1122	memmove (cmdbuf_base, cmdbuf_ptr, n);
1148	cmdbuf_ptr = cmdbuf_base;	1123	cmdbuf_ptr = cmdbuf_base;
1149	cmdbuf_endp = cmdbuf_ptr + n;	1124	cmdbuf_endp = cmdbuf_ptr + n;
1150		1125
1151	ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);	1126	ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1152		1127
1153	if (r > 0)	1128	if (r > 0)
1154	{	1129	{
1155	cmdbuf_endp += r;	1130	cmdbuf_endp += r;
1156	return true;	1131	return true;
…		…
1174	}	1149	}
1175		1150
1176	void	1151	void
1177	rxvt_term::pty_cb (io_watcher &w, short revents)	1152	rxvt_term::pty_cb (io_watcher &w, short revents)
1178	{	1153	{
1179	SET_R (this);	1154	make_current ();
1180	SET_LOCALE (locale);
1181		1155
1182	if (revents & EVENT_READ)	1156	if (revents & EVENT_READ)
1183	// loop, but don't allow a single term to monopolize us	1157	// loop, but don't allow a single term to monopolize us
1184	while (pty_fill ())	1158	while (pty_fill ())
1185	if (cmd_parse ())	1159	if (cmd_parse ())
…		…
1190	}	1164	}
1191		1165
1192	void	1166	void
1193	rxvt_term::pointer_unblank ()	1167	rxvt_term::pointer_unblank ()
1194	{	1168	{
1195	XDefineCursor (display->display, vt, TermWin_cursor);	1169	XDefineCursor (xdisp, vt, TermWin_cursor);
1196	recolour_cursor ();	1170	recolour_cursor ();
1197		1171
1198	#ifdef POINTER_BLANK	1172	#ifdef POINTER_BLANK
1199	hidden_pointer = 0;	1173	hidden_pointer = 0;
1200		1174
…		…
1208	rxvt_term::pointer_blank ()	1182	rxvt_term::pointer_blank ()
1209	{	1183	{
1210	if (!OPTION (Opt_pointerBlank))	1184	if (!OPTION (Opt_pointerBlank))
1211	return;	1185	return;
1212		1186
1213	XDefineCursor (display->display, vt, display->blank_cursor);	1187	XDefineCursor (xdisp, vt, display->blank_cursor);
1214	XFlush (display->display);	1188	XFlush (xdisp);
1215		1189
1216	hidden_pointer = 1;	1190	hidden_pointer = 1;
1217	}	1191	}
1218		1192
1219	void	1193	void
1220	rxvt_term::pointer_cb (time_watcher &w)	1194	rxvt_term::pointer_cb (time_watcher &w)
1221	{	1195	{
1222	SET_R (this);	1196	make_current ();
1223	SET_LOCALE (locale);
1224		1197
1225	pointer_blank ();	1198	pointer_blank ();
1226	}	1199	}
1227	#endif	1200	#endif
1228		1201
…		…
1293	(32 + button_number + key_state),	1266	(32 + button_number + key_state),
1294	(32 + x + 1),	1267	(32 + x + 1),
1295	(32 + y + 1));	1268	(32 + y + 1));
1296	}	1269	}
1297		1270
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 */	1271	/*{{{ process an X event */
1309	void	1272	void
1310	rxvt_term::x_cb (XEvent &ev)	1273	rxvt_term::x_cb (XEvent &ev)
1311	{	1274	{
1312	dDisp;	1275	make_current ();
1313		1276
1314	SET_R (this);	1277	dLocal (Display *, xdisp);
1315	SET_LOCALE (locale);
1316		1278
		1279	if (ev.xany.window == vt
		1280	&& SHOULD_INVOKE (HOOK_X_EVENT)
		1281	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
		1282	return;
		1283
		1284	// for XQueryPointer
1317	Window unused_root, unused_child;	1285	Window unused_root, unused_child;
1318	int unused_root_x, unused_root_y;	1286	int unused_root_x, unused_root_y;
1319	unsigned int unused_mask;	1287	unsigned int unused_mask;
1320		1288
1321	switch (ev.type)	1289	switch (ev.type)
…		…
1328		1296
1329	break;	1297	break;
1330		1298
1331	case KeyRelease:	1299	case KeyRelease:
1332	{	1300	{
1333	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755	1301	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1334	KeySym ks;	1302	KeySym keysym;
1335		1303
1336	ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/	1304	keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1337	#endif	1305	#endif
1338		1306
1339	#if ENABLE_FRILLS || ISO_14755	1307	#if ENABLE_FRILLS || ISO_14755
1340	// ISO 14755 support	1308	// ISO 14755 support
1341	if (iso14755buf)	1309	if (iso14755buf)
…		…
1346	# endif	1314	# endif
1347	# if ISO_14755	1315	# if ISO_14755
1348	// iso14755 part 5.2 handling: release time	1316	// iso14755 part 5.2 handling: release time
1349	// first: controls	1317	// first: controls
1350	if ((ev.xkey.state & ControlMask)	1318	if ((ev.xkey.state & ControlMask)
1351	&& ((ks >= 0x40 && ks <= 0x5f)	1319	&& ((keysym >= 0x40 && keysym <= 0x5f)
1352	|| (ks >= 0x61 && ks <= 0x7f)))	1320	|| (keysym >= 0x61 && keysym <= 0x7f)))
1353	{	1321	{
1354	iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);	1322	iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1355	commit_iso14755 ();	1323	commit_iso14755 ();
1356	goto skip_switch;	1324	goto skip_switch;
1357	}	1325	}
1358		1326
1359	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)	1327	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1360	if (i[0] == ks)	1328	if (i[0] == keysym)
1361	{	1329	{
1362	iso14755buf = ISO_14755_51 | i[1];	1330	iso14755buf = ISO_14755_51 | i[1];
1363	commit_iso14755 ();	1331	commit_iso14755 ();
1364	goto skip_switch;	1332	goto skip_switch;
1365	}	1333	}
…		…
1389	iso14755buf = 0;	1357	iso14755buf = 0;
1390	}	1358	}
1391	#endif	1359	#endif
1392		1360
1393	if (ev.xany.window == vt	1361	if (ev.xany.window == vt
1394	&& HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_END)))	1362	&& HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1395	break;	1363	break;
1396		1364
1397	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	1365	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1398	if (!(ev.xkey.state & ControlMask))	1366	if (!(ev.xkey.state & ControlMask))
1399	slip_wheel_ev.stop ();	1367	slip_wheel_ev.stop ();
1400	else if (ks == XK_Control_L || ks == XK_Control_R)	1368	else if (keysym == XK_Control_L || keysym == XK_Control_R)
1401	mouse_slip_wheel_speed = 0;	1369	mouse_slip_wheel_speed = 0;
1402	#endif	1370	#endif
1403	break;	1371	break;
1404	}	1372	}
1405		1373
…		…
1411	button_release (ev.xbutton);	1379	button_release (ev.xbutton);
1412	break;	1380	break;
1413		1381
1414	case ClientMessage:	1382	case ClientMessage:
1415	if (ev.xclient.format == 32	1383	if (ev.xclient.format == 32
1416	&& ev.xclient.message_type == xa[XA_WM_PROTOCOLS])	1384	&& !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1417	{	1385	{
		1386	if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
		1387	{
		1388	if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
		1389	{
1418	if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])	1390	if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
		1391	{
		1392	if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1419	destroy ();	1393	destroy ();
		1394	}
1420	#if ENABLE_EWMH	1395	#if ENABLE_EWMH
1421	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])	1396	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1422	XSendEvent (disp, ev.xclient.window = display->root,	1397	XSendEvent (xdisp, ev.xclient.window = display->root,
1423	False, SubstructureRedirectMask | SubstructureNotifyMask,	1398	False, SubstructureRedirectMask | SubstructureNotifyMask,
1424	&ev);	1399	&ev);
		1400	#endif
		1401	}
		1402	}
		1403	#if ENABLE_XEMBED
		1404	else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
		1405	{
		1406	if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
		1407	focus_in ();
		1408	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
		1409	focus_out ();
		1410	}
1425	#endif	1411	#endif
1426	}	1412	}
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;	1413	break;
1463		1414
1464	case MappingNotify:	1415	case MappingNotify:
1465	XRefreshKeyboardMapping (&ev.xmapping);	1416	XRefreshKeyboardMapping (&ev.xmapping);
1466	break;	1417	break;
…		…
1499	break;	1450	break;
1500		1451
1501	case ConfigureNotify:	1452	case ConfigureNotify:
1502	if (ev.xconfigure.window == parent[0])	1453	if (ev.xconfigure.window == parent[0])
1503	{	1454	{
1504	while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))	1455	while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev))
1505	;	1456	;
1506		1457
1507	if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)	1458	if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1508	{	1459	{
1509	seen_resize = 1;	1460	seen_resize = 1;
1510	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1461	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1511	}	1462	}
1512		1463
		1464	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
		1465
1513	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */	1466	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1514	if (OPTION (Opt_transparent))	1467	if (OPTION (Opt_transparent))
1515	check_our_parents ();	1468	check_our_parents ();
1516	#endif	1469	#endif
1517	}	1470	}
1518	break;	1471	break;
1519		1472
1520	case PropertyNotify:	1473	case PropertyNotify:
		1474	if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1521	if (ev.xproperty.atom == xa[XA_VT_SELECTION]	1475	if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1522	&& ev.xproperty.state == PropertyNewValue)	1476	&& ev.xproperty.state == PropertyNewValue)
1523	selection_property (ev.xproperty.window, ev.xproperty.atom);	1477	selection_property (ev.xproperty.window, ev.xproperty.atom);
1524		1478
1525	break;	1479	break;
1526		1480
1527	case SelectionClear:	1481	case SelectionClear:
1528	selection_clear ();	1482	selection_clear ();
…		…
1564	if (ev.xany.window == vt)	1518	if (ev.xany.window == vt)
1565	{	1519	{
1566	do	1520	do
1567	scr_expose (ev.xexpose.x, ev.xexpose.y,	1521	scr_expose (ev.xexpose.x, ev.xexpose.y,
1568	ev.xexpose.width, ev.xexpose.height, False);	1522	ev.xexpose.width, ev.xexpose.height, False);
1569	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));	1523	while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev));
1570		1524
1571	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1525	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1572		1526
1573	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))	1527	while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev))
1574	scr_expose (ev.xexpose.x, ev.xexpose.y,	1528	scr_expose (ev.xexpose.x, ev.xexpose.y,
1575	ev.xexpose.width, ev.xexpose.height, False);	1529	ev.xexpose.width, ev.xexpose.height, False);
1576		1530
1577	scr_refresh (refresh_type);	1531	want_refresh = 1;
1578	}	1532	}
1579	else	1533	else
1580	{	1534	{
1581	XEvent unused_event;	1535	XEvent unused_event;
1582		1536
1583	while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))	1537	while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event))
1584	;	1538	;
1585	while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))	1539	while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event))
1586	;	1540	;
1587		1541
1588	if (isScrollbarWindow (ev.xany.window))	1542	if (isScrollbarWindow (ev.xany.window))
1589	{	1543	{
1590	scrollBar.setIdle ();	1544	scrollBar.setIdle ();
1591	scrollbar_show (0);	1545	scrollbar_show (0);
1592	}	1546	}
1593	#ifdef MENUBAR
1594	if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1595	menubar_expose ();
1596	#endif
1597		1547
1598	#ifdef TRANSPARENT	1548	#ifdef TRANSPARENT
1599	if (am_transparent && ev.xany.window == parent[0])	1549	if (am_transparent && ev.xany.window == parent[0])
1600	XClearWindow (disp, ev.xany.window);	1550	XClearWindow (xdisp, ev.xany.window);
1601	#endif	1551	#endif
1602	}	1552	}
1603	break;	1553	break;
1604		1554
1605	case MotionNotify:	1555	case MotionNotify:
1606	#ifdef POINTER_BLANK	1556	#ifdef POINTER_BLANK
1607	if (hidden_pointer)	1557	if (hidden_pointer)
1608	pointer_unblank ();	1558	pointer_unblank ();
1609	#endif	1559	#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)	1560	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1618	break;	1561	break;
1619		1562
1620	if (ev.xany.window == vt)	1563	if (ev.xany.window == vt)
1621	{	1564	{
		1565	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1622	if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))	1566	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1623	; // nop	1567	; // nop
1624	else if (ev.xbutton.state & (Button1Mask | Button3Mask))	1568	else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1625	{	1569	{
1626	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))	1570	while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev))
1627	;	1571	;
1628		1572
1629	XQueryPointer (disp, vt,	1573	XQueryPointer (xdisp, vt,
1630	&unused_root, &unused_child,	1574	&unused_root, &unused_child,
1631	&unused_root_x, &unused_root_y,	1575	&unused_root_x, &unused_root_y,
1632	&ev.xbutton.x, &ev.xbutton.y,	1576	&ev.xbutton.x, &ev.xbutton.y,
1633	&ev.xbutton.state);	1577	&ev.xbutton.state);
1634	#ifdef MOUSE_THRESHOLD	1578	#ifdef MOUSE_THRESHOLD
…		…
1698	#endif	1642	#endif
1699	}	1643	}
1700	}	1644	}
1701	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1645	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1702	{	1646	{
1703	while (XCheckTypedWindowEvent (disp, scrollBar.win,	1647	while (XCheckTypedWindowEvent (xdisp, scrollBar.win,
1704	MotionNotify, &ev))	1648	MotionNotify, &ev))
1705	;	1649	;
1706		1650
1707	XQueryPointer (disp, scrollBar.win,	1651	XQueryPointer (xdisp, scrollBar.win,
1708	&unused_root, &unused_child,	1652	&unused_root, &unused_child,
1709	&unused_root_x, &unused_root_y,	1653	&unused_root_x, &unused_root_y,
1710	&ev.xbutton.x, &ev.xbutton.y,	1654	&ev.xbutton.x, &ev.xbutton.y,
1711	&unused_mask);	1655	&unused_mask);
1712	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1656	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1713	scrollbar_size ());	1657	scrollbar_size ());
1714	scr_refresh (refresh_type);	1658	want_refresh = 1;
1715	refresh_limit = 0;	1659	refresh_limit = 0;
1716	scrollbar_show (1);	1660	scrollbar_show (1);
1717	}	1661	}
1718	break;	1662	break;
1719	}	1663	}
…		…
1727	{	1671	{
1728	hidden_cursor = 0;	1672	hidden_cursor = 0;
1729	want_refresh = 1;	1673	want_refresh = 1;
1730	}	1674	}
1731		1675
1732	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1676	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1733	}	1677	}
1734	#endif	1678	#endif
1735		1679
1736	#if defined(POINTER_BLANK)	1680	#if defined(POINTER_BLANK)
1737	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)	1681	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
…		…
1765	XSetICFocus (Input_Context);	1709	XSetICFocus (Input_Context);
1766	}	1710	}
1767	#endif	1711	#endif
1768	#if CURSOR_BLINK	1712	#if CURSOR_BLINK
1769	if (OPTION (Opt_cursorBlink))	1713	if (OPTION (Opt_cursorBlink))
1770	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1714	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1771	#endif	1715	#endif
1772	#if OFF_FOCUS_FADING	1716	#if OFF_FOCUS_FADING
1773	if (rs[Rs_fade])	1717	if (rs[Rs_fade])
1774	{	1718	{
1775	pix_colors = pix_colors_focused;	1719	pix_colors = pix_colors_focused;
…		…
1819		1763
1820	#if TRANSPARENT	1764	#if TRANSPARENT
1821	void	1765	void
1822	rxvt_term::rootwin_cb (XEvent &ev)	1766	rxvt_term::rootwin_cb (XEvent &ev)
1823	{	1767	{
1824	SET_R (this);	1768	make_current ();
1825	SET_LOCALE (locale);
1826		1769
1827	switch (ev.type)	1770	switch (ev.type)
1828	{	1771	{
1829	case PropertyNotify:	1772	case PropertyNotify:
1830	/*	1773	/*
…		…
1857	/*	1800	/*
1858	* VT window processing of button press	1801	* VT window processing of button press
1859	*/	1802	*/
1860	if (ev.window == vt)	1803	if (ev.window == vt)
1861	{	1804	{
		1805	if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
		1806	return;
		1807
1862	#if ISO_14755	1808	#if ISO_14755
1863	// 5.4	1809	// 5.4
1864	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))	1810	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1865	{	1811	{
1866	iso14755_54 (ev.x, ev.y);	1812	iso14755_54 (ev.x, ev.y);
…		…
1908	else	1854	else
1909	{	1855	{
1910	if (ev.button != MEvent.button)	1856	if (ev.button != MEvent.button)
1911	MEvent.clicks = 0;	1857	MEvent.clicks = 0;
1912		1858
1913	if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1914	switch (ev.button)	1859	switch (ev.button)
1915	{	1860	{
1916	case Button1:	1861	case Button1:
1917	/* allow meta + click to select rectangular areas */	1862	/* allow meta + click to select rectangular areas */
1918	/* should be done in screen.C */	1863	/* should be done in screen.C */
1919	#if ENABLE_FRILLS	1864	#if ENABLE_FRILLS
1920	selection.rect = !!(ev.state & ModMetaMask);	1865	selection.rect = !!(ev.state & ModMetaMask);
1921	#else	1866	#else
1922	selection.rect = false;	1867	selection.rect = false;
1923	#endif	1868	#endif
1924		1869
1925	/* allow shift+left click to extend selection */	1870	/* allow shift+left click to extend selection */
1926	if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))	1871	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1927	{	1872	{
1928	if (MEvent.button == Button1 && clickintime)	1873	if (MEvent.button == Button1 && clickintime)
1929	selection_rotate (ev.x, ev.y);	1874	selection_rotate (ev.x, ev.y);
1930	else	1875	else
1931	selection_extend (ev.x, ev.y, 1);	1876	selection_extend (ev.x, ev.y, 1);
1932	}	1877	}
1933	else	1878	else
1934	{	1879	{
1935	if (MEvent.button == Button1 && clickintime)	1880	if (MEvent.button == Button1 && clickintime)
1936	MEvent.clicks++;	1881	MEvent.clicks++;
1937	else	1882	else
1938	MEvent.clicks = 1;	1883	MEvent.clicks = 1;
1939		1884
1940	selection_click (MEvent.clicks, ev.x, ev.y);	1885	selection_click (MEvent.clicks, ev.x, ev.y);
1941	}	1886	}
1942		1887
1943	MEvent.button = Button1;	1888	MEvent.button = Button1;
1944	break;	1889	break;
1945		1890
1946	case Button3:	1891	case Button3:
1947	if (MEvent.button == Button3 && clickintime)	1892	if (MEvent.button == Button3 && clickintime)
1948	selection_rotate (ev.x, ev.y);	1893	selection_rotate (ev.x, ev.y);
1949	else	1894	else
1950	selection_extend (ev.x, ev.y, 1);	1895	selection_extend (ev.x, ev.y, 1);
1951		1896
1952	MEvent.button = Button3;	1897	MEvent.button = Button3;
1953	break;	1898	break;
1954	}	1899	}
1955	}	1900	}
1956		1901
1957	MEvent.time = ev.time;	1902	MEvent.time = ev.time;
1958	return;	1903	return;
1959	}	1904	}
1960		1905
…		…
2099	}	2044	}
2100	}	2045	}
2101		2046
2102	return;	2047	return;
2103	}	2048	}
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	}	2049	}
2113		2050
2114	void	2051	void
2115	rxvt_term::button_release (XButtonEvent &ev)	2052	rxvt_term::button_release (XButtonEvent &ev)
2116	{	2053	{
…		…
2122		2059
2123	if (scrollbar_isUpDn ())	2060	if (scrollbar_isUpDn ())
2124	{	2061	{
2125	scrollBar.setIdle ();	2062	scrollBar.setIdle ();
2126	scrollbar_show (0);	2063	scrollbar_show (0);
2127	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2128	refresh_type &= ~SMOOTH_REFRESH;
2129	#endif
2130	}	2064	}
2131		2065
2132	#ifdef SELECTION_SCROLLING	2066	#ifdef SELECTION_SCROLLING
2133	if (sel_scroll_ev.active)	2067	if (sel_scroll_ev.active)
2134	sel_scroll_ev.stop();	2068	sel_scroll_ev.stop();
2135	#endif	2069	#endif
2136		2070
2137	if (ev.window == vt)	2071	if (ev.window == vt)
2138	{	2072	{
		2073	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
		2074	return;
		2075
2139	#if ISO_14755	2076	#if ISO_14755
2140	// 5.4	2077	// 5.4
2141	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))	2078	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2142	return;	2079	return;
2143	#endif	2080	#endif
		2081
2144	if (reportmode)	2082	if (reportmode)
2145	{	2083	{
2146	/* mouse report from vt window */	2084	/* mouse report from vt window */
2147	/* don't report release of wheel "buttons" */	2085	/* don't report release of wheel "buttons" */
2148	if (ev.button >= 4)	2086	if (ev.button >= 4)
…		…
2172	if (priv_modes & PrivMode_mouse_report	2110	if (priv_modes & PrivMode_mouse_report
2173	&& bypass_keystate	2111	&& bypass_keystate
2174	&& ev.button == Button1 && MEvent.clicks <= 1)	2112	&& ev.button == Button1 && MEvent.clicks <= 1)
2175	selection_extend (ev.x, ev.y, 0);	2113	selection_extend (ev.x, ev.y, 0);
2176		2114
2177	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2178	return;
2179
2180	switch (ev.button)	2115	switch (ev.button)
2181	{	2116	{
2182	case Button1:	2117	case Button1:
2183	case Button3:	2118	case Button3:
2184	selection_make (ev.time);	2119	selection_make (ev.time);
2185	break;	2120	break;
		2121
2186	case Button2:	2122	case Button2:
2187	selection_request (ev.time, ev.x, ev.y);	2123	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
		2124	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2188	break;	2125	break;
		2126
2189	#ifdef MOUSE_WHEEL	2127	#ifdef MOUSE_WHEEL
2190	case Button4:	2128	case Button4:
2191	case Button5:	2129	case Button5:
2192	{	2130	{
2193	int i;	2131	int i;
…		…
2215	slip_wheel_ev.start ();	2153	slip_wheel_ev.start ();
2216	}	2154	}
2217	else	2155	else
2218	{	2156	{
2219	# endif	2157	# endif
2220	# ifdef JUMP_MOUSE_WHEEL
2221	scr_page (v, i);	2158	scr_page (v, i);
2222	scr_refresh (SMOOTH_REFRESH);
2223	scrollbar_show (1);	2159	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	2160	# ifdef MOUSE_SLIP_WHEELING
2233	}	2161	}
2234	#endif	2162	# endif
2235	}	2163	}
2236	break;	2164	break;
2237	#endif	2165	#endif
2238	}	2166	}
2239	}	2167	}
2240	#ifdef MENUBAR
2241	else if (isMenuBarWindow (ev.window))
2242	menubar_control (ev);
2243	#endif
2244	}	2168	}
2245		2169
2246	#ifdef TRANSPARENT	2170	#ifdef TRANSPARENT
2247	#if TINTING	2171	#if TINTING
2248	/* taken from aterm-0.4.2 */	2172	/* taken from aterm-0.4.2 */
2249		2173
2250	typedef uint32_t RUINT32T;	2174	typedef uint32_t RUINT32T;
2251		2175
2252	void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)	2176	void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2253	{	2177	{
2254	int sh_r, sh_g, sh_b;	2178	int sh_r, sh_g, sh_b;
2255	RUINT32T mask_r, mask_g, mask_b;	2179	RUINT32T mask_r, mask_g, mask_b;
2256	RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;	2180	RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2257	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;	2181	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2258	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;	2182	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2259	int i;	2183	int i;
2260		2184
2261	Visual *visual = display->visual;	2185	Visual *visual = term->visual;
2262		2186
2263	if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;	2187	if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2264		2188
2265	/* for convenience */	2189	/* for convenience */
2266	mask_r = visual->red_mask;	2190	mask_r = visual->red_mask;
…		…
2487	Atom atype;	2411	Atom atype;
2488	unsigned char *prop = NULL;	2412	unsigned char *prop = NULL;
2489	Window root, oldp, *list;	2413	Window root, oldp, *list;
2490	Pixmap rootpixmap = None;	2414	Pixmap rootpixmap = None;
2491	XWindowAttributes wattr, wrootattr;	2415	XWindowAttributes wattr, wrootattr;
2492	dDisp;
2493		2416
2494	pchanged = 0;	2417	pchanged = 0;
2495		2418
2496	if (!OPTION (Opt_transparent))	2419	if (!OPTION (Opt_transparent))
2497	return pchanged; /* Don't try any more */	2420	return pchanged; /* Don't try any more */
2498		2421
2499	XGetWindowAttributes (disp, display->root, &wrootattr);	2422	XGetWindowAttributes (xdisp, display->root, &wrootattr);
2500	rootdepth = wrootattr.depth;	2423	rootdepth = wrootattr.depth;
2501		2424
2502	XGetWindowAttributes (disp, parent[0], &wattr);	2425	XGetWindowAttributes (xdisp, parent[0], &wattr);
2503		2426
2504	if (rootdepth != wattr.depth)	2427	if (rootdepth != wattr.depth)
2505	{	2428	{
2506	if (am_transparent)	2429	if (am_transparent)
2507	{	2430	{
2508	pchanged = 1;	2431	pchanged = 1;
2509	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2432	XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2510	am_transparent = am_pixmap_trans = 0;	2433	am_transparent = am_pixmap_trans = 0;
2511	}	2434	}
2512		2435
2513	return pchanged; /* Don't try any more */	2436	return pchanged; /* Don't try any more */
2514	}	2437	}
2515		2438
2516	/* Get all X ops out of the queue so that our information is up-to-date. */	2439	/* Get all X ops out of the queue so that our information is up-to-date. */
2517	XSync (disp, False);	2440	XSync (xdisp, False);
2518		2441
2519	/*	2442	/*
2520	* Make the frame window set by the window manager have	2443	* Make the frame window set by the window manager have
2521	* the root background. Some window managers put multiple nested frame	2444	* the root background. Some window managers put multiple nested frame
2522	* windows for each client, so we have to take care about that.	2445	* windows for each client, so we have to take care about that.
2523	*/	2446	*/
2524	i = (xa[XA_XROOTPMAP_ID]	2447	i = (xa[XA_XROOTPMAP_ID]
2525	&& XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],	2448	&& XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2526	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2449	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2527	&nitems, &bytes_after, &prop) == Success);	2450	&nitems, &bytes_after, &prop) == Success);
2528		2451
2529	if (!i || prop == NULL)	2452	if (!i || prop == NULL)
2530	i = (xa[XA_ESETROOT_PMAP_ID]	2453	i = (xa[XA_ESETROOT_PMAP_ID]
2531	&& XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],	2454	&& XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2532	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2455	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2533	&nitems, &bytes_after, &prop) == Success);	2456	&nitems, &bytes_after, &prop) == Success);
2534		2457
2535	if (!i || prop == NULL	2458	if (!i || prop == NULL
2536	#if TINTING	2459	#if TINTING
…		…
2555	Window cr;	2478	Window cr;
2556	XImage *image;	2479	XImage *image;
2557	GC gc;	2480	GC gc;
2558	XGCValues gcvalue;	2481	XGCValues gcvalue;
2559		2482
2560	XTranslateCoordinates (disp, parent[0], display->root,	2483	XTranslateCoordinates (xdisp, parent[0], display->root,
2561	0, 0, &sx, &sy, &cr);	2484	0, 0, &sx, &sy, &cr);
2562	nw = (unsigned int)szHint.width;	2485	nw = (unsigned int)szHint.width;
2563	nh = (unsigned int)szHint.height;	2486	nh = (unsigned int)szHint.height;
2564	nx = ny = 0;	2487	nx = ny = 0;
2565		2488
…		…
2578	}	2501	}
2579		2502
2580	min_it (nw, (unsigned int) (wrootattr.width - sx));	2503	min_it (nw, (unsigned int) (wrootattr.width - sx));
2581	min_it (nh, (unsigned int) (wrootattr.height - sy));	2504	min_it (nh, (unsigned int) (wrootattr.height - sy));
2582		2505
2583	XSync (disp, False);	2506	XSync (xdisp, False);
2584	allowedxerror = -1;	2507	allowedxerror = -1;
2585	image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);	2508	image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2586		2509
2587	/* XXX: handle BadMatch - usually because we're outside the pixmap */	2510	/* XXX: handle BadMatch - usually because we're outside the pixmap */
2588	/* XXX: may need a delay here? */	2511	/* XXX: may need a delay here? */
2589	allowedxerror = 0;	2512	allowedxerror = 0;
2590		2513
…		…
2593	if (am_transparent && am_pixmap_trans)	2516	if (am_transparent && am_pixmap_trans)
2594	{	2517	{
2595	pchanged = 1;	2518	pchanged = 1;
2596	if (pixmap != None)	2519	if (pixmap != None)
2597	{	2520	{
2598	XFreePixmap (disp, pixmap);	2521	XFreePixmap (xdisp, pixmap);
2599	pixmap = None;	2522	pixmap = None;
2600	}	2523	}
2601	}	2524	}
2602		2525
2603	am_pixmap_trans = 0;	2526	am_pixmap_trans = 0;
2604	}	2527	}
2605	else	2528	else
2606	{	2529	{
2607	if (pixmap != None)	2530	if (pixmap != None)
2608	XFreePixmap (disp, pixmap);	2531	XFreePixmap (xdisp, pixmap);
2609		2532
2610	#if TINTING	2533	#if TINTING
2611	if (ISSET_PIXCOLOR (Color_tint))	2534	if (ISSET_PIXCOLOR (Color_tint))
2612	{	2535	{
2613	unsigned short rm, gm, bm;	2536	unsigned short rm, gm, bm;
2614	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;	2537	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2615		2538
2616	pix_colors_focused[Color_tint].get (display, rm, gm, bm);	2539	pix_colors_focused[Color_tint].get (this, rm, gm, bm);
2617		2540
2618	ShadeXImage (display, image, shade, rm, gm, bm);	2541	ShadeXImage (this, image, shade, rm, gm, bm);
2619	}	2542	}
2620	#endif	2543	#endif
2621		2544
2622	pixmap = XCreatePixmap (disp, vt,	2545	pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2623	szHint.width, szHint.height, image->depth);
2624	gc = XCreateGC (disp, vt, 0UL, &gcvalue);	2546	gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2625	XPutImage (disp, pixmap, gc, image, 0, 0,	2547	XPutImage (xdisp, pixmap, gc, image, 0, 0,
2626	nx, ny, image->width, image->height);	2548	nx, ny, image->width, image->height);
2627	XFreeGC (disp, gc);	2549	XFreeGC (xdisp, gc);
2628	XDestroyImage (image);	2550	XDestroyImage (image);
2629	XSetWindowBackgroundPixmap (disp, parent[0], pixmap);	2551	XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2630	XClearWindow (disp, parent[0]);	2552	XClearWindow (xdisp, parent[0]);
2631		2553
2632	if (!am_transparent || !am_pixmap_trans)	2554	if (!am_transparent || !am_pixmap_trans)
2633	pchanged = 1;	2555	pchanged = 1;
2634		2556
2635	am_transparent = am_pixmap_trans = 1;	2557	am_transparent = am_pixmap_trans = 1;
2636	}	2558	}
2637	}	2559	}
2638		2560
2639	if (am_pixmap_trans)	2561	if (am_pixmap_trans)
2640	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2562	XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2641	else	2563	else
2642	{	2564	{
2643	unsigned int n;	2565	unsigned int n;
2644	/*	2566	/*
2645	* InheritPixmap transparency	2567	* InheritPixmap transparency
2646	*/	2568	*/
2647	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2569	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2648	{	2570	{
2649	oldp = parent[i];	2571	oldp = parent[i];
2650	XQueryTree (disp, parent[i - 1], &root,	2572	XQueryTree (xdisp, parent[i - 1], &root,
2651	&parent[i], &list, &n);	2573	&parent[i], &list, &n);
2652	XFree (list);	2574	XFree (list);
2653		2575
2654	if (parent[i] == display->root)	2576	if (parent[i] == display->root)
2655	{	2577	{
…		…
2667		2589
2668	if (pchanged)	2590	if (pchanged)
2669	{	2591	{
2670	for (; n < (unsigned int)i; n++)	2592	for (; n < (unsigned int)i; n++)
2671	{	2593	{
2672	XGetWindowAttributes (disp, parent[n], &wattr);	2594	XGetWindowAttributes (xdisp, parent[n], &wattr);
2673	if (wattr.depth != rootdepth || wattr.c_class == InputOnly)	2595	if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2674	{	2596	{
2675	n = (int) (sizeof (parent) / sizeof (Window)) + 1;	2597	n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2676	break;	2598	break;
2677	}	2599	}
2678	}	2600	}
2679	}	2601	}
2680		2602
2681	if (n > (int) (sizeof (parent) / sizeof (parent[0])))	2603	if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2682	{	2604	{
2683	XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);	2605	XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2684	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2606	XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2685	am_transparent = 0;	2607	am_transparent = 0;
2686	/* XXX: also turn off Opt_transparent? */	2608	/* XXX: also turn off Opt_transparent? */
2687	}	2609	}
2688	else	2610	else
2689	{	2611	{
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++)	2612	for (n = 0; n < (unsigned int)i; n++)
2696	{	2613	{
2697	XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);	2614	XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2698	XClearWindow (disp, parent[n]);	2615	XClearWindow (xdisp, parent[n]);
2699	}	2616	}
2700		2617
2701	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2618	XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2702	am_transparent = 1;	2619	am_transparent = 1;
2703	}	2620	}
2704		2621
2705	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2622	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2706	parent[i] = None;	2623	parent[i] = None;
2707	}	2624	}
2708		2625
2709	if (scrollBar.win)	2626	if (scrollBar.win)
2710	{	2627	{
2711	XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);	2628	XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2712	scrollBar.setIdle ();	2629	scrollBar.setIdle ();
2713	scrollbar_show (0);	2630	scrollbar_show (0);
2714	}	2631	}
2715		2632
2716	if (am_transparent)	2633	if (am_transparent)
…		…
2791	}	2708	}
2792		2709
2793	// scr_add_lines only works for nlines <= nrow - 1.	2710	// scr_add_lines only works for nlines <= nrow - 1.
2794	if (nlines >= nrow - 1)	2711	if (nlines >= nrow - 1)
2795	{	2712	{
		2713	if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2796	if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))	2714	&& HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2797	scr_add_lines (buf, str - buf, nlines);	2715	scr_add_lines (buf, str - buf, nlines);
2798		2716
2799	nlines = 0;	2717	nlines = 0;
2800	str = buf;	2718	str = buf;
2801	eol = str + min (ncol, UBUFSIZ);	2719	eol = str + min (ncol, UBUFSIZ);
…		…
2816		2734
2817	seq_begin = cmdbuf_ptr;	2735	seq_begin = cmdbuf_ptr;
2818	ch = next_char ();	2736	ch = next_char ();
2819	}	2737	}
2820		2738
		2739	if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2821	if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))	2740	&& HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2822	scr_add_lines (buf, str - buf, nlines);	2741	scr_add_lines (buf, str - buf, nlines);
2823		2742
2824	/*	2743	/*
2825	* If there have been a lot of new lines, then update the screen	2744	* 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.	2745	* What the heck I'll cheat and only refresh less than every page-full.
…		…
2832	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)	2751	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2833	refresh_limit++;	2752	refresh_limit++;
2834	else	2753	else
2835	{	2754	{
2836	flag = true;	2755	flag = true;
2837	scr_refresh (refresh_type);	2756	scr_refresh ();
2838	flush_ev.stop ();	2757	want_refresh = 1;
2839	}	2758	}
2840	}	2759	}
2841		2760
2842	}	2761	}
2843	else	2762	else
…		…
2860	return flag;	2779	return flag;
2861	}	2780	}
2862		2781
2863	// read the next character	2782	// read the next character
2864	wchar_t	2783	wchar_t
2865	rxvt_term::next_char ()	2784	rxvt_term::next_char () NOTHROW
2866	{	2785	{
2867	while (cmdbuf_ptr < cmdbuf_endp)	2786	while (cmdbuf_ptr < cmdbuf_endp)
2868	{	2787	{
2869	// assume 7-bit to be ascii ALWAYS	2788	// assume 7-bit to be ascii ALWAYS
2870	if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)	2789	if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
…		…
2891	return NOCHAR;	2810	return NOCHAR;
2892	}	2811	}
2893		2812
2894	// read the next octet	2813	// read the next octet
2895	uint32_t	2814	uint32_t
2896	rxvt_term::next_octet ()	2815	rxvt_term::next_octet () NOTHROW
2897	{	2816	{
2898	return cmdbuf_ptr < cmdbuf_endp	2817	return cmdbuf_ptr < cmdbuf_endp
2899	? (unsigned char)*cmdbuf_ptr++	2818	? (unsigned char)*cmdbuf_ptr++
2900	: NOCHAR;	2819	: NOCHAR;
2901	}	2820	}
		2821
		2822	static class out_of_input out_of_input;
2902		2823
2903	/* rxvt_cmd_getc () - Return next input character */	2824	/* rxvt_cmd_getc () - Return next input character */
2904	/*	2825	/*
2905	* Return the next input character after first passing any keyboard input	2826	* Return the next input character after first passing any keyboard input
2906	* to the command.	2827	* to the command.
2907	*/	2828	*/
2908	wchar_t	2829	wchar_t
2909	rxvt_term::cmd_getc ()	2830	rxvt_term::cmd_getc () THROW ((class out_of_input))
2910	{	2831	{
2911	wchar_t c = next_char ();	2832	wchar_t c = next_char ();
2912		2833
2913	if (c == NOCHAR)	2834	if (c == NOCHAR)
2914	throw out_of_input;	2835	throw out_of_input;
2915		2836
2916	return c;	2837	return c;
2917	}	2838	}
2918		2839
2919	uint32_t	2840	uint32_t
2920	rxvt_term::cmd_get8 ()	2841	rxvt_term::cmd_get8 () THROW ((class out_of_input))
2921	{	2842	{
2922	uint32_t c = next_octet ();	2843	uint32_t c = next_octet ();
2923		2844
2924	if (c == NOCHAR)	2845	if (c == NOCHAR)
2925	throw out_of_input;	2846	throw out_of_input;
…		…
3346	ndef = get_byte_array_bit (csi_defaults, i);	3267	ndef = get_byte_array_bit (csi_defaults, i);
3347	for (p = 0; p < nargs; p++)	3268	for (p = 0; p < nargs; p++)
3348	if (arg[p] == -1)	3269	if (arg[p] == -1)
3349	arg[p] = ndef;	3270	arg[p] = ndef;
3350		3271
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	/*	3272	/*
3359	* private mode handling	3273	* private mode handling
3360	*/	3274	*/
3361	if (priv)	3275	if (priv)
3362	{	3276	{
3363	switch (priv)	3277	switch (priv)
3364	{	3278	{
3365	case '>':	3279	case '>':
3366	if (ch == CSI_DA) /* secondary device attributes */	3280	if (ch == CSI_DA) /* secondary device attributes */
3367	tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);	3281	{
		3282	// first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
		3283	// 'U' for rxvt-unicode != 7.[34] (where it was broken).
		3284	//
		3285	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
		3286	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
		3287	// that we do not support xterm mouse reporting (should be 95 when we do).
		3288	//
		3289	tt_printf ("\033[>%d;94;0c", 'U');
		3290	}
3368	break;	3291	break;
3369	case '?':	3292	case '?':
3370	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')	3293	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3371	process_terminal_mode (ch, priv, nargs, arg);	3294	process_terminal_mode (ch, priv, nargs, arg);
3372	break;	3295	break;
…		…
3600	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3523	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3601	{	3524	{
3602	int x, y;	3525	int x, y;
3603	XWindowAttributes wattr;	3526	XWindowAttributes wattr;
3604	Window wdummy;	3527	Window wdummy;
3605	dDisp;	3528
		3529	dLocal (Display *, xdisp);
3606		3530
3607	if (nargs == 0)	3531	if (nargs == 0)
3608	return;	3532	return;
3609		3533
3610	switch (args[0])	3534	switch (args[0])
3611	{	3535	{
3612	/*	3536	/*
3613	* commands	3537	* commands
3614	*/	3538	*/
3615	case 1: /* deiconify window */	3539	case 1: /* deiconify window */
3616	XMapWindow (disp, parent[0]);	3540	XMapWindow (xdisp, parent[0]);
3617	break;	3541	break;
3618	case 2: /* iconify window */	3542	case 2: /* iconify window */
3619	XIconifyWindow (disp, parent[0], display->screen);	3543	XIconifyWindow (xdisp, parent[0], display->screen);
3620	break;	3544	break;
3621	case 3: /* set position (pixels) */	3545	case 3: /* set position (pixels) */
3622	XMoveWindow (disp, parent[0], args[1], args[2]);	3546	XMoveWindow (xdisp, parent[0], args[1], args[2]);
3623	break;	3547	break;
3624	case 4: /* set size (pixels) */	3548	case 4: /* set size (pixels) */
3625	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3549	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3626	break;	3550	break;
3627	case 5: /* raise window */	3551	case 5: /* raise window */
3628	XRaiseWindow (disp, parent[0]);	3552	XRaiseWindow (xdisp, parent[0]);
3629	break;	3553	break;
3630	case 6: /* lower window */	3554	case 6: /* lower window */
3631	XLowerWindow (disp, parent[0]);	3555	XLowerWindow (xdisp, parent[0]);
3632	break;	3556	break;
3633	case 7: /* refresh window */	3557	case 7: /* refresh window */
3634	scr_touch (true);	3558	scr_touch (true);
3635	break;	3559	break;
3636	case 8: /* set size (chars) */	3560	case 8: /* set size (chars) */
…		…
3648		3572
3649	/*	3573	/*
3650	* reports - some output format copied from XTerm	3574	* reports - some output format copied from XTerm
3651	*/	3575	*/
3652	case 11: /* report window state */	3576	case 11: /* report window state */
3653	XGetWindowAttributes (disp, parent[0], &wattr);	3577	XGetWindowAttributes (xdisp, parent[0], &wattr);
3654	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3578	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3655	break;	3579	break;
3656	case 13: /* report window position */	3580	case 13: /* report window position */
3657	XGetWindowAttributes (disp, parent[0], &wattr);	3581	XGetWindowAttributes (xdisp, parent[0], &wattr);
3658	XTranslateCoordinates (disp, parent[0], wattr.root,	3582	XTranslateCoordinates (xdisp, parent[0], wattr.root,
3659	-wattr.border_width, -wattr.border_width,	3583	-wattr.border_width, -wattr.border_width,
3660	&x, &y, &wdummy);	3584	&x, &y, &wdummy);
3661	tt_printf ("\033[3;%d;%dt", x, y);	3585	tt_printf ("\033[3;%d;%dt", x, y);
3662	break;	3586	break;
3663	case 14: /* report window size (pixels) */	3587	case 14: /* report window size (pixels) */
3664	XGetWindowAttributes (disp, parent[0], &wattr);	3588	XGetWindowAttributes (xdisp, parent[0], &wattr);
3665	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3589	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3666	break;	3590	break;
3667	case 18: /* report text area size (chars) */	3591	case 18: /* report text area size (chars) */
3668	tt_printf ("\033[8;%d;%dt", nrow, ncol);	3592	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3669	break;	3593	break;
…		…
3671	tt_printf ("\033[9;%d;%dt", nrow, ncol);	3595	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3672	break;	3596	break;
3673	case 20: /* report icon label */	3597	case 20: /* report icon label */
3674	{	3598	{
3675	char *s;	3599	char *s;
3676	XGetIconName (disp, parent[0], &s);	3600	XGetIconName (xdisp, parent[0], &s);
3677	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3601	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3678	XFree (s);	3602	XFree (s);
3679	}	3603	}
3680	break;	3604	break;
3681	case 21: /* report window title */	3605	case 21: /* report window title */
3682	{	3606	{
3683	char *s;	3607	char *s;
3684	XFetchName (disp, parent[0], &s);	3608	XFetchName (xdisp, parent[0], &s);
3685	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3609	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3686	XFree (s);	3610	XFree (s);
3687	}	3611	}
3688	break;	3612	break;
3689	}	3613	}
…		…
3791	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)	3715	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3792	{	3716	{
3793	if (str[0] == '?' && !str[1])	3717	if (str[0] == '?' && !str[1])
3794	{	3718	{
3795	unsigned short r, g, b;	3719	unsigned short r, g, b;
3796	pix_colors_focused[color].get (display, r, g, b);	3720	pix_colors_focused[color].get (this, r, g, b);
3797	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);	3721	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3798	}	3722	}
3799	else	3723	else
3800	set_window_color (color, str);	3724	set_window_color (color, str);
3801	}	3725	}
…		…
3804	* XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)	3728	* XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3805	*/	3729	*/
3806	void	3730	void
3807	rxvt_term::process_xterm_seq (int op, const char *str, char resp)	3731	rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3808	{	3732	{
3809	int changed = 0;
3810	int color;	3733	int color;
3811	char *buf, *name;	3734	char *buf, *name;
3812	bool query = str[0] == '?' && !str[1];	3735	bool query = str[0] == '?' && !str[1];
3813	int saveop = op;	3736	int saveop = op;
3814	dDisp;	3737
		3738	dLocal (Display *, xdisp);
3815		3739
3816	assert (str != NULL);	3740	assert (str != NULL);
3817	switch (op)	3741	switch (op)
3818	{	3742	{
3819	case XTerm_name:	3743	case XTerm_name:
…		…
3835	unsigned long bytes_after;	3759	unsigned long bytes_after;
3836	unsigned char *value = 0;	3760	unsigned char *value = 0;
3837	const char *str = "";	3761	const char *str = "";
3838		3762
3839	if (prop	3763	if (prop
3840	&& XGetWindowProperty (disp, parent[0],	3764	&& XGetWindowProperty (xdisp, parent[0],
3841	prop, 0, 1<<16, 0, AnyPropertyType,	3765	prop, 0, 1<<16, 0, AnyPropertyType,
3842	&actual_type, &actual_format,	3766	&actual_type, &actual_format,
3843	&nitems, &bytes_after, &value) == Success	3767	&nitems, &bytes_after, &value) == Success
3844	&& actual_type != None	3768	&& actual_type != None
3845	&& actual_format == 8)	3769	&& actual_format == 8)
3846	str = (const char *)(value);	3770	str = (const char *)(value);
3847		3771
3848	tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);	3772	tt_printf ("\033]%d;%s%c", op, str, resp);
3849		3773
3850	XFree (value);	3774	XFree (value);
3851	}	3775	}
3852	else	3776	else
3853	{	3777	{
…		…
3857	{	3781	{
3858	*eq = 0;	3782	*eq = 0;
3859	set_utf8_property (display->atom (str), eq + 1);	3783	set_utf8_property (display->atom (str), eq + 1);
3860	}	3784	}
3861	else	3785	else
3862	XDeleteProperty (disp, parent[0],	3786	XDeleteProperty (xdisp, parent[0],
3863	display->atom (str));	3787	display->atom (str));
3864	}	3788	}
3865	break;	3789	break;
3866		3790
3867	case XTerm_Color:	3791	case XTerm_Color:
…		…
3869	{	3793	{
3870	if ((name = strchr (buf, ';')) == NULL)	3794	if ((name = strchr (buf, ';')) == NULL)
3871	break;	3795	break;
3872		3796
3873	*name++ = '\0';	3797	*name++ = '\0';
3874	color = atoi (buf);	3798	color = atoi (buf) + minCOLOR;
3875		3799
3876	if (color < 0 || color >= TOTAL_COLORS)	3800	if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3877	break;	3801	break;
3878		3802
3879	if ((buf = strchr (name, ';')) != NULL)	3803	if ((buf = strchr (name, ';')) != NULL)
3880	*buf++ = '\0';	3804	*buf++ = '\0';
3881		3805
3882	if (name[0] == '?' && !name[1])	3806	if (name[0] == '?' && !name[1])
3883	{	3807	{
3884	unsigned short r, g, b;	3808	unsigned short r, g, b;
3885	pix_colors_focused[color + minCOLOR].get (display, r, g, b);	3809	pix_colors_focused[color].get (this, r, g, b);
3886	tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);	3810	tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", op, color, r, g, b, resp);
3887	}	3811	}
3888	else	3812	else
3889	set_window_color (color + minCOLOR, name);	3813	set_window_color (color, name);
3890	}	3814	}
3891	break;	3815	break;
3892	case XTerm_Color00:	3816	case XTerm_Color00:
3893	process_color_seq (XTerm_Color00, Color_fg, str, resp);	3817	process_color_seq (op, Color_fg, str, resp);
3894	break;	3818	break;
3895	case XTerm_Color01:	3819	case XTerm_Color01:
3896	process_color_seq (XTerm_Color00, Color_bg, str, resp);	3820	process_color_seq (op, Color_bg, str, resp);
3897	break;	3821	break;
3898	#ifndef NO_CURSORCOLOR	3822	#ifndef NO_CURSORCOLOR
3899	case XTerm_Color_cursor:	3823	case XTerm_Color_cursor:
3900	process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);	3824	process_color_seq (op, Color_cursor, str, resp);
3901	break;	3825	break;
3902	#endif	3826	#endif
3903	case XTerm_Color_pointer_fg:	3827	case XTerm_Color_pointer_fg:
3904	process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);	3828	process_color_seq (op, Color_pointer_fg, str, resp);
3905	break;	3829	break;
3906	case XTerm_Color_pointer_bg:	3830	case XTerm_Color_pointer_bg:
3907	process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);	3831	process_color_seq (op, Color_pointer_bg, str, resp);
3908	break;	3832	break;
3909	#ifndef NO_BOLD_UNDERLINE_REVERSE	3833	#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:	3834	case XTerm_Color_RV:
3917	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3835	process_color_seq (op, Color_RV, str, resp);
		3836	break;
		3837	case Rxvt_Color_BD:
		3838	case URxvt_Color_BD:
		3839	process_color_seq (op, Color_BD, str, resp);
		3840	break;
		3841	case Rxvt_Color_UL:
		3842	case URxvt_Color_UL:
		3843	process_color_seq (op, Color_UL, str, resp);
3918	break;	3844	break;
3919	case URxvt_Color_IT:	3845	case URxvt_Color_IT:
3920	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);	3846	process_color_seq (op, Color_IT, str, resp);
3921	break;	3847	break;
3922	#endif	3848	#endif
3923	#if TRANSPARENT && TINTING	3849	#if TRANSPARENT && TINTING
3924	case URxvt_Color_tint:	3850	case URxvt_Color_tint:
3925	process_color_seq (URxvt_Color_tint, Color_tint, str, resp);	3851	process_color_seq (op, Color_tint, str, resp);
3926	check_our_parents ();	3852	check_our_parents ();
3927	if (am_transparent)	3853	if (am_transparent)
3928	want_full_refresh = want_refresh = 1;	3854	want_full_refresh = want_refresh = 1;
3929	break;	3855	break;
3930	#endif	3856	#endif
3931		3857
3932	case XTerm_Pixmap:	3858	case Rxvt_Pixmap:
		3859	{
3933	if (*str != ';')	3860	if (*str != ';')
3934	{	3861	{
3935	#if XPM_BACKGROUND	3862	#if XPM_BACKGROUND
3936	scale_pixmap (""); /* reset to default scaling */	3863	scale_pixmap (""); /* reset to default scaling */
3937	set_bgPixmap (str); /* change pixmap */	3864	set_bgPixmap (str); /* change pixmap */
3938	#endif
3939	scr_touch (true);	3865	scr_touch (true);
		3866	#endif
3940	}	3867	}
		3868
		3869	int changed = 0;
		3870
3941	while ((str = strchr (str, ';')) != NULL)	3871	while ((str = strchr (str, ';')) != NULL)
3942	{	3872	{
3943	str++;	3873	str++;
3944	#if XPM_BACKGROUND	3874	#if XPM_BACKGROUND
3945	changed += scale_pixmap (str);	3875	changed += scale_pixmap (str);
3946	#endif	3876	#endif
3947	}	3877	}
3948		3878
3949	if (changed)	3879	if (changed)
3950	{	3880	{
3951	#ifdef XPM_BACKGROUND	3881	#ifdef XPM_BACKGROUND
3952	resize_pixmap ();	3882	resize_pixmap ();
3953	#endif
3954	scr_touch (true);	3883	scr_touch (true);
		3884	#endif
3955	}	3885	}
		3886	}
3956	break;	3887	break;
3957		3888
3958	case XTerm_restoreFG:	3889	case Rxvt_restoreFG:
3959	set_window_color (Color_fg, str);	3890	set_window_color (Color_fg, str);
3960	break;	3891	break;
3961	case XTerm_restoreBG:	3892	case Rxvt_restoreBG:
3962	set_window_color (Color_bg, str);	3893	set_window_color (Color_bg, str);
3963	break;	3894	break;
3964		3895
3965	case XTerm_logfile:	3896	case XTerm_logfile:
3966	// TODO, when secure mode?	3897	// TODO, when secure mode?
3967	break;	3898	break;
3968		3899
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	3900	#if 0
3976	case XTerm_dumpscreen: /* no error notices */	3901	case Rxvt_dumpscreen: /* no error notices */
3977	{	3902	{
3978	int fd;	3903	int fd;
3979	if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)	3904	if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3980	{	3905	{
3981	scr_dump (fd);	3906	scr_dump (fd);
…		…
4005	allocated.push_back ((void *)res);	3930	allocated.push_back ((void *)res);
4006	set_fonts ();	3931	set_fonts ();
4007	}	3932	}
4008	break;	3933	break;
4009		3934
		3935	case URxvt_version:
		3936	if (query)
		3937	tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
		3938	op,
		3939	rs[Rs_name], VERSION[0], VERSION[2],
		3940	resp);
		3941	break;
		3942
4010	#if ENABLE_FRILLS	3943	#if ENABLE_FRILLS
4011	case URxvt_locale:	3944	case URxvt_locale:
4012	if (query)	3945	if (query)
4013	tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);	3946	tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
4014	else	3947	else
4015	{	3948	{
4016	set_locale (str);	3949	set_locale (str);
4017	pty.set_utf8_mode (enc_utf8);	3950	pty->set_utf8_mode (enc_utf8);
4018	init_xlocale ();	3951	init_xlocale ();
4019	}	3952	}
4020	break;	3953	break;
4021		3954
4022	case URxvt_view_up:	3955	case URxvt_view_up:
…		…
4075	return state;	4008	return state;
4076	}	4009	}
4077		4010
4078	/* we're not using priv _yet_ */	4011	/* we're not using priv _yet_ */
4079	void	4012	void
4080	rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)	4013	rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4081	{	4014	{
4082	unsigned int i, j;	4015	unsigned int i, j;
4083	int state;	4016	int state;
4084		4017
4085	static const struct	4018	static const struct
…		…
4096	{ 5, PrivMode_rVideo },	4029	{ 5, PrivMode_rVideo },
4097	{ 6, PrivMode_relOrigin },	4030	{ 6, PrivMode_relOrigin },
4098	{ 7, PrivMode_Autowrap },	4031	{ 7, PrivMode_Autowrap },
4099	// 8, bi-directional support mode	4032	// 8, bi-directional support mode
4100	{ 9, PrivMode_MouseX10 },	4033	{ 9, PrivMode_MouseX10 },
4101	#ifdef menuBar_esc
4102	{ menuBar_esc, PrivMode_menuBar },
4103	#endif
4104	// 18, 19 printing-related	4034	// 18, 19 printing-related
4105	{ 25, PrivMode_VisibleCursor },	4035	{ 25, PrivMode_VisibleCursor },
4106	#ifdef scrollBar_esc	4036	#ifdef scrollBar_esc
4107	{ scrollBar_esc, PrivMode_scrollBar },	4037	{ scrollBar_esc, PrivMode_scrollBar },
4108	#endif	4038	#endif
…		…
4155	/* extra handling for values with state unkept */	4085	/* extra handling for values with state unkept */
4156	switch (arg[i])	4086	switch (arg[i])
4157	{	4087	{
4158	#if ENABLE_STYLES	4088	#if ENABLE_STYLES
4159	case 1021:	4089	case 1021:
4160	if (mode)	4090	set_option (Opt_intensityStyles, mode);
4161	SET_OPTION (Opt_intensityStyles);
4162	else
4163	CLR_OPTION (Opt_intensityStyles);
4164		4091
4165	scr_touch (true);	4092	scr_touch (true);
4166	break;	4093	break;
4167	#endif	4094	#endif
4168	case 1048: /* alternative cursor save */	4095	case 1048: /* alternative cursor save */
…		…
4190	case 3: /* 80/132 */	4117	case 3: /* 80/132 */
4191	if (priv_modes & PrivMode_132OK)	4118	if (priv_modes & PrivMode_132OK)
4192	set_widthheight (((state ? 132 : 80) * fwidth), height);	4119	set_widthheight (((state ? 132 : 80) * fwidth), height);
4193	break;	4120	break;
4194	case 4: /* smooth scrolling */	4121	case 4: /* smooth scrolling */
4195	if (!state)	4122	set_option (Opt_jumpScroll, !state);
4196	SET_OPTION (Opt_jumpScroll);
4197	else
4198	CLR_OPTION (Opt_jumpScroll);
4199	break;	4123	break;
4200	case 5: /* reverse video */	4124	case 5: /* reverse video */
4201	scr_rvideo_mode (state);	4125	scr_rvideo_mode (state);
4202	break;	4126	break;
4203	case 6: /* relative/absolute origins */	4127	case 6: /* relative/absolute origins */
…		…
4209	/* case 8: - auto repeat, can't do on a per window basis */	4133	/* case 8: - auto repeat, can't do on a per window basis */
4210	case 9: /* X10 mouse reporting */	4134	case 9: /* X10 mouse reporting */
4211	if (state) /* orthogonal */	4135	if (state) /* orthogonal */
4212	priv_modes &= ~PrivMode_MouseX11;	4136	priv_modes &= ~PrivMode_MouseX11;
4213	break;	4137	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	4138	#ifdef scrollBar_esc
4222	case scrollBar_esc:	4139	case scrollBar_esc:
4223	if (scrollbar_mapping (state))	4140	if (scrollbar_mapping (state))
4224	{	4141	{
4225	resize_all_windows (0, 0, 0);	4142	resize_all_windows (0, 0, 0);
…		…
4244	#if 0	4161	#if 0
4245	case 1001:	4162	case 1001:
4246	break; /* X11 mouse highlighting */	4163	break; /* X11 mouse highlighting */
4247	#endif	4164	#endif
4248	case 1010: /* scroll to bottom on TTY output inhibit */	4165	case 1010: /* scroll to bottom on TTY output inhibit */
4249	if (!state)	4166	set_option (Opt_scrollTtyOutput, !state);
4250	SET_OPTION (Opt_scrollTtyOutput);
4251	else
4252	CLR_OPTION (Opt_scrollTtyOutput);
4253	break;	4167	break;
4254	case 1011: /* scroll to bottom on key press */	4168	case 1011: /* scroll to bottom on key press */
4255	if (state)	4169	set_option (Opt_scrollTtyKeypress, state);
4256	SET_OPTION (Opt_scrollTtyKeypress);
4257	else
4258	CLR_OPTION (Opt_scrollTtyKeypress);
4259	break;	4170	break;
4260	case 1047: /* secondary screen w/ clearing last */	4171	case 1047: /* secondary screen w/ clearing last */
4261	if (OPTION (Opt_secondaryScreen))	4172	if (OPTION (Opt_secondaryScreen))
4262	if (current_screen != PRIMARY)	4173	if (current_screen != PRIMARY)
4263	scr_erase_screen (2);	4174	scr_erase_screen (2);
…		…
4473	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT	4384	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4474		4385
4475	void	4386	void
4476	rxvt_term::tt_write (const char *data, unsigned int len)	4387	rxvt_term::tt_write (const char *data, unsigned int len)
4477	{	4388	{
4478	if (pty.pty < 0)	4389	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4479	return;	4390	return;
4480		4391
		4392	if (pty->pty < 0)
		4393	return;
		4394
4481	if (v_buflen == 0)	4395	if (v_buflen == 0)
4482	{	4396	{
4483	ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));	4397	ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4484		4398
4485	if ((unsigned int)written == len)	4399	if ((unsigned int)written == len)
4486	return;	4400	return;
4487		4401
4488	data += written;	4402	data += written;
…		…
4497	pty_ev.set (EVENT_READ | EVENT_WRITE);	4411	pty_ev.set (EVENT_READ | EVENT_WRITE);
4498	}	4412	}
4499		4413
4500	void rxvt_term::pty_write ()	4414	void rxvt_term::pty_write ()
4501	{	4415	{
4502	int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));	4416	int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4503		4417
4504	if (written > 0)	4418	if (written > 0)
4505	{	4419	{
4506	v_buflen -= written;	4420	v_buflen -= written;
4507		4421

Diff Legend

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