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.258 by root, Thu Jan 12 03:32:56 2006 UTC vs.
Revision 1.303 by root, Tue Jan 31 21:47:56 2006 UTC

…		…
49	#include "rxvt.h"	49	#include "rxvt.h"
50	#include "rxvtperl.h"	50	#include "rxvtperl.h"
51	#include "version.h"	51	#include "version.h"
52	#include "command.h"	52	#include "command.h"
53		53
54	#if HAVE_SCHED_YIELD
55	#undef HAVE_SCHED_YIELD // disabled for the time being
56	//# include <sched.h>
57	#endif
58
59	#ifdef KEYSYM_RESOURCE	54	#ifdef KEYSYM_RESOURCE
60	# include "keyboard.h"	55	# include "keyboard.h"
61	#endif	56	#endif
62		57
63	#include <csignal>	58	#include <csignal>
64		59
		60	#if LINUX_YIELD_HACK
		61	# include <ctime>
		62	#endif
		63
65	/*----------------------------------------------------------------------*/	64	/*----------------------------------------------------------------------*/
66		65
67	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)	66	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68
69	// exception thrown when the command parser runs out of input data
70	class out_of_input { } out_of_input;
71		67
72	#if ENABLE_FRILLS || ISO_14755	68	#if ENABLE_FRILLS || ISO_14755
73		69
74	#define ISO_14755_STARTED 0x80000000UL	70	#define ISO_14755_STARTED 0x80000000UL
75	#define ISO_14755_51 0x40000000UL // basic (section 5.1)	71	#define ISO_14755_51 0x40000000UL // basic (section 5.1)
…		…
147	|| !IN_RANGE_EXC (y, 0, nrow))	143	|| !IN_RANGE_EXC (y, 0, nrow))
148	return;	144	return;
149		145
150	for (;;)	146	for (;;)
151	{	147	{
152	const line_t &l = ROW(y - view_start);	148	const line_t &l = ROW(y + view_start);
153		149
154	text_t t = l.t[x];	150	text_t t = l.t[x];
155		151
156	if (t != NOCHAR || !x)	152	if (t != NOCHAR || !x)
157	{	153	{
…		…
230	# if !UNICODE3	226	# if !UNICODE3
231	if (ch >= 0x10000)	227	if (ch >= 0x10000)
232	ch = 0xfffd;	228	ch = 0xfffd;
233	# endif	229	# endif
234	scr_overlay_set (11, y, ch, r);	230	scr_overlay_set (11, y, ch, r);
		231
		232	if (WCWIDTH (ch) >= 2)
235	scr_overlay_set (12, y, NOCHAR, r);	233	scr_overlay_set (12, y, NOCHAR, r);
236	}	234	}
237		235
		236	// {
		237	// char buf[4+4+3+1];
		238	// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
		239	// scr_overlay_set (0, 0, buf);
		240	// }
238	scr_overlay_set (0, len , attr);	241	scr_overlay_set (0, len , attr);
239	scr_overlay_set (0, len + 1, fname);	242	scr_overlay_set (0, len + 1, fname);
240		243
241	free (fname);	244	free (fname);
242		245
…		…
302	rxvt_term::lookup_key (XKeyEvent &ev)	305	rxvt_term::lookup_key (XKeyEvent &ev)
303	{	306	{
304	int ctrl, meta, shft, len;	307	int ctrl, meta, shft, len;
305	unsigned int newlen;	308	unsigned int newlen;
306	KeySym keysym;	309	KeySym keysym;
307	#ifdef DEBUG_CMD
308	static int debug_key = 1; /* accessible by a debugger only */
309	#endif
310	int valid_keysym;	310	int valid_keysym;
311	char kbuf[KBUFSZ];	311	char kbuf[KBUFSZ];
312		312
313	/*	313	/*
314	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an	314	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
…		…
443	scr_move_to (0, 1);	443	scr_move_to (0, 1);
444	return;	444	return;
445	}	445	}
446	else if (keysym == XK_End)	446	else if (keysym == XK_End)
447	{	447	{
448	scr_move_to (1, 0);	448	scr_move_to (1, 1);
449	return;	449	return;
450	}	450	}
451	}	451	}
452	#endif	452	#endif
453	}	453	}
…		…
464	{	464	{
465	switch (keysym)	465	switch (keysym)
466	{	466	{
467	/* normal XTerm key bindings */	467	/* normal XTerm key bindings */
468	case XK_Insert: /* Shift+Insert = paste mouse selection */	468	case XK_Insert: /* Shift+Insert = paste mouse selection */
469	selection_request (ev.time, 0, 0);	469	selection_request (ev.time);
470	return;	470	return;
471	#if TODO	471	#if TODO
472	/* rxvt extras */	472	/* rxvt extras */
473	case XK_KP_Add: /* Shift+KP_Add = bigger font */	473	case XK_KP_Add: /* Shift+KP_Add = bigger font */
474	change_font (FONT_UP);	474	change_font (FONT_UP);
…		…
905	{	905	{
906	const char ch = C0_ESC;	906	const char ch = C0_ESC;
907	tt_write (&ch, 1);	907	tt_write (&ch, 1);
908	}	908	}
909		909
910	#if defined(DEBUG_CMD)
911	/* Display keyboard buffer contents */
912	unsigned char *p;
913	int i;
914
915	fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
916	for (i = 0, p = kbuf; i < len; i++, p++)
917	fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
918	fprintf (stderr, "'\n");
919	#endif /* DEBUG_CMD */
920	tt_write (kbuf, (unsigned int)len);	910	tt_write (kbuf, (unsigned int)len);
921	}	911	}
922	/*}}} */	912	/*}}} */
923		913
924	#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)	914	#if defined (KEYSYM_RESOURCE)
925	/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
926	/* attempt to `write' count to the input buffer */
927	unsigned int	915	unsigned int
928	rxvt_term::cmd_write (const char *str, unsigned int count)	916	rxvt_term::cmd_write (const char *str, unsigned int count)
929	{	917	{
930	unsigned int n, s;	918	unsigned int n, s;
931		919
…		…
972		960
973	if (want_refresh)	961	if (want_refresh)
974	{	962	{
975	if (SHOULD_INVOKE (HOOK_LINE_UPDATE))	963	if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
976	{	964	{
977	int row = -view_start;	965	int row = view_start;
978	int end_row = row + nrow;	966	int end_row = row + nrow;
979		967
980	while (row > -nsaved && ROW (row - 1).is_longer ())	968	while (row > top_row && ROW (row - 1).is_longer ())
981	--row;	969	--row;
982		970
983	do	971	do
984	{	972	{
985	int start_row = row;	973	int start_row = row;
…		…
1008	while (l->is_longer () && row < end_row);	996	while (l->is_longer () && row < end_row);
1009	}	997	}
1010	while (row < end_row);	998	while (row < end_row);
1011	}	999	}
1012		1000
1013	scr_refresh (refresh_type);	1001	scr_refresh ();
1014	scrollbar_show (1);	1002	scrollbar_show (1);
1015	#ifdef USE_XIM	1003	#ifdef USE_XIM
1016	IMSendSpot ();	1004	IMSendSpot ();
1017	#endif	1005	#endif
1018	}	1006	}
…		…
1021	}	1009	}
1022		1010
1023	void	1011	void
1024	rxvt_term::check_cb (check_watcher &w)	1012	rxvt_term::check_cb (check_watcher &w)
1025	{	1013	{
1026	SET_R (this);	1014	make_current ();
1027	SET_LOCALE (locale);
1028		1015
1029	display->flush ();	1016	display->flush ();
1030		1017
1031	if (want_refresh && !flush_ev.active)	1018	if (want_refresh && !flush_ev.active)
1032	flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally	1019	flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1033	}	1020	}
1034		1021
1035	void	1022	void
1036	rxvt_term::flush_cb (time_watcher &w)	1023	rxvt_term::flush_cb (time_watcher &w)
1037	{	1024	{
1038	SET_R (this);	1025	make_current ();
1039	SET_LOCALE (locale);
1040		1026
1041	refresh_limit = 1;	1027	refresh_limit = 1;
1042	refresh_count = 0;	1028	refresh_count = 0;
1043	flush ();	1029	flush ();
1044	}	1030	}
…		…
1048	rxvt_term::cursor_blink_cb (time_watcher &w)	1034	rxvt_term::cursor_blink_cb (time_watcher &w)
1049	{	1035	{
1050	hidden_cursor = !hidden_cursor;	1036	hidden_cursor = !hidden_cursor;
1051	want_refresh = 1;	1037	want_refresh = 1;
1052		1038
1053	w.start (w.at + BLINK_INTERVAL);	1039	w.start (w.at + CURSOR_BLINK_INTERVAL);
1054	}	1040	}
1055	#endif	1041	#endif
1056		1042
1057	#ifdef TEXT_BLINK	1043	#ifdef TEXT_BLINK
1058	void	1044	void
…		…
1072	rxvt_term::cont_scroll_cb (time_watcher &w)	1058	rxvt_term::cont_scroll_cb (time_watcher &w)
1073	{	1059	{
1074	if ((scrollbar_isUp() || scrollbar_isDn()) &&	1060	if ((scrollbar_isUp() || scrollbar_isDn()) &&
1075	scr_page (scrollbar_isUp() ? UP : DN, 1))	1061	scr_page (scrollbar_isUp() ? UP : DN, 1))
1076	{	1062	{
1077	refresh_type |= SMOOTH_REFRESH;
1078	want_refresh = 1;	1063	want_refresh = 1;
1079	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1064	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1080	}	1065	}
1081	}	1066	}
1082	#endif	1067	#endif
…		…
1086	rxvt_term::sel_scroll_cb (time_watcher &w)	1071	rxvt_term::sel_scroll_cb (time_watcher &w)
1087	{	1072	{
1088	if (scr_page (scroll_selection_dir, scroll_selection_lines))	1073	if (scr_page (scroll_selection_dir, scroll_selection_lines))
1089	{	1074	{
1090	selection_extend (selection_save_x, selection_save_y, selection_save_state);	1075	selection_extend (selection_save_x, selection_save_y, selection_save_state);
1091	refresh_type |= SMOOTH_REFRESH;
1092	want_refresh = 1;	1076	want_refresh = 1;
1093	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1077	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1094	}	1078	}
1095	}	1079	}
1096	#endif	1080	#endif
…		…
1101	{	1085	{
1102	if (mouse_slip_wheel_speed == 0	1086	if (mouse_slip_wheel_speed == 0
1103	|| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)	1087	|| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1104	: scr_page (UP, mouse_slip_wheel_speed))	1088	: scr_page (UP, mouse_slip_wheel_speed))
1105	{	1089	{
1106	if (view_start == nsaved ||	1090	if (view_start == top_row || view_start == 0)
1107	view_start == 0)
1108	mouse_slip_wheel_speed = 0;	1091	mouse_slip_wheel_speed = 0;
1109		1092
1110	refresh_type |= SMOOTH_REFRESH;
1111	want_refresh = 1;	1093	want_refresh = 1;
1112	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1094	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1113	}	1095	}
1114	}	1096	}
1115	#endif	1097	#endif
1116		1098
1117	#if HAVE_SCHED_YIELD	1099	#if LINUX_YIELD_HACK
1118	static struct event_handler	1100	static struct event_handler
1119	{	1101	{
1120	check_watcher cw_yield;	1102	check_watcher yield_ev;
1121		1103
1122	void yield (check_watcher &w)	1104	void yield_cb (check_watcher &w)
1123	{	1105	{
1124	sched_yield ();	1106	// this should really be sched_yield(), but the linux guys thought
		1107	// that giving a process calling sched_yield () less cpu time than
		1108	// ones with high nice levels.
		1109
		1110	struct timespec ts = { 0, 0 };
		1111	nanosleep (&ts, 0);
		1112
1125	w.stop ();	1113	w.stop ();
1126	}	1114	}
1127		1115
1128	event_handler ()	1116	event_handler ()
1129	: cw_yield (this, &event_handler::yield)	1117	: yield_ev (this, &event_handler::yield_cb)
1130	{	1118	{
1131	}	1119	}
1132	} event_handler;	1120	} event_handler;
1133	#endif	1121	#endif
1134		1122
…		…
1145		1133
1146	memmove (cmdbuf_base, cmdbuf_ptr, n);	1134	memmove (cmdbuf_base, cmdbuf_ptr, n);
1147	cmdbuf_ptr = cmdbuf_base;	1135	cmdbuf_ptr = cmdbuf_base;
1148	cmdbuf_endp = cmdbuf_ptr + n;	1136	cmdbuf_endp = cmdbuf_ptr + n;
1149		1137
1150	ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);	1138	ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1151		1139
1152	if (r > 0)	1140	if (r > 0)
1153	{	1141	{
1154	cmdbuf_endp += r;	1142	cmdbuf_endp += r;
1155	return true;	1143	return true;
1156	}	1144	}
1157	else if (r < 0 && (errno == EAGAIN || errno == EINTR))	1145	else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1158	{	1146	{
1159	#if HAVE_SCHED_YIELD	1147	#if LINUX_YIELD_HACK
1160	if (display->is_local)	1148	if (display->is_local)
1161	event_handler.cw_yield.start ();	1149	event_handler.yield_ev.start ();
1162	#endif	1150	#endif
1163	}	1151	}
1164	else	1152	else
1165	{	1153	{
1166	pty_ev.stop ();	1154	pty_ev.stop ();
…		…
1173	}	1161	}
1174		1162
1175	void	1163	void
1176	rxvt_term::pty_cb (io_watcher &w, short revents)	1164	rxvt_term::pty_cb (io_watcher &w, short revents)
1177	{	1165	{
1178	SET_R (this);	1166	make_current ();
1179	SET_LOCALE (locale);
1180		1167
1181	if (revents & EVENT_READ)	1168	if (revents & EVENT_READ)
1182	// loop, but don't allow a single term to monopolize us	1169	// loop, but don't allow a single term to monopolize us
1183	while (pty_fill ())	1170	while (pty_fill ())
1184	if (cmd_parse ())	1171	if (cmd_parse ())
…		…
1189	}	1176	}
1190		1177
1191	void	1178	void
1192	rxvt_term::pointer_unblank ()	1179	rxvt_term::pointer_unblank ()
1193	{	1180	{
1194	XDefineCursor (display->display, vt, TermWin_cursor);	1181	XDefineCursor (xdisp, vt, TermWin_cursor);
1195	recolour_cursor ();	1182	recolour_cursor ();
1196		1183
1197	#ifdef POINTER_BLANK	1184	#ifdef POINTER_BLANK
1198	hidden_pointer = 0;	1185	hidden_pointer = 0;
1199		1186
…		…
1207	rxvt_term::pointer_blank ()	1194	rxvt_term::pointer_blank ()
1208	{	1195	{
1209	if (!OPTION (Opt_pointerBlank))	1196	if (!OPTION (Opt_pointerBlank))
1210	return;	1197	return;
1211		1198
1212	XDefineCursor (display->display, vt, display->blank_cursor);	1199	XDefineCursor (xdisp, vt, display->blank_cursor);
1213	XFlush (display->display);	1200	XFlush (xdisp);
1214		1201
1215	hidden_pointer = 1;	1202	hidden_pointer = 1;
1216	}	1203	}
1217		1204
1218	void	1205	void
1219	rxvt_term::pointer_cb (time_watcher &w)	1206	rxvt_term::pointer_cb (time_watcher &w)
1220	{	1207	{
1221	SET_R (this);	1208	make_current ();
1222	SET_LOCALE (locale);
1223		1209
1224	pointer_blank ();	1210	pointer_blank ();
1225	}	1211	}
1226	#endif	1212	#endif
1227		1213
…		…
1292	(32 + button_number + key_state),	1278	(32 + button_number + key_state),
1293	(32 + x + 1),	1279	(32 + x + 1),
1294	(32 + y + 1));	1280	(32 + y + 1));
1295	}	1281	}
1296		1282
1297	#ifdef USING_W11LIB
1298	void
1299	rxvt_W11_process_x_event (XEvent *ev)
1300	{
1301	rxvt_t *r = rxvt_get_r ();
1302
1303	x_cb (*ev);
1304	}
1305	#endif
1306
1307	/*{{{ process an X event */	1283	/*{{{ process an X event */
1308	void	1284	void
1309	rxvt_term::x_cb (XEvent &ev)	1285	rxvt_term::x_cb (XEvent &ev)
1310	{	1286	{
1311	dDisp;	1287	make_current ();
1312		1288
1313	SET_R (this);	1289	dLocal (Display *, xdisp);
1314	SET_LOCALE (locale);
1315		1290
		1291	if (ev.xany.window == vt
		1292	&& SHOULD_INVOKE (HOOK_X_EVENT)
		1293	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
		1294	return;
		1295
		1296	// for XQueryPointer
1316	Window unused_root, unused_child;	1297	Window unused_root, unused_child;
1317	int unused_root_x, unused_root_y;	1298	int unused_root_x, unused_root_y;
1318	unsigned int unused_mask;	1299	unsigned int unused_mask;
1319		1300
1320	switch (ev.type)	1301	switch (ev.type)
…		…
1410	button_release (ev.xbutton);	1391	button_release (ev.xbutton);
1411	break;	1392	break;
1412		1393
1413	case ClientMessage:	1394	case ClientMessage:
1414	if (ev.xclient.format == 32	1395	if (ev.xclient.format == 32
1415	&& ev.xclient.message_type == xa[XA_WM_PROTOCOLS])	1396	&& !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1416	{	1397	{
		1398	if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
		1399	{
		1400	if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
		1401	{
1417	if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])	1402	if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
		1403	{
		1404	if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1418	destroy ();	1405	destroy ();
		1406	}
1419	#if ENABLE_EWMH	1407	#if ENABLE_EWMH
1420	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])	1408	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1421	XSendEvent (disp, ev.xclient.window = display->root,	1409	XSendEvent (xdisp, ev.xclient.window = display->root,
1422	False, SubstructureRedirectMask | SubstructureNotifyMask,	1410	False, SubstructureRedirectMask | SubstructureNotifyMask,
1423	&ev);	1411	&ev);
		1412	#endif
		1413	}
		1414	}
		1415	#if ENABLE_XEMBED
		1416	else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
		1417	{
		1418	if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
		1419	focus_in ();
		1420	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
		1421	focus_out ();
		1422	}
1424	#endif	1423	#endif
1425	}	1424	}
1426	#if ENABLE_XEMBED
1427	else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1428	{
1429	if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1430	focus_in ();
1431	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1432	focus_out ();
1433	}
1434	#endif
1435	#ifdef OFFIX_DND
1436	/* OffiX Dnd (drag 'n' drop) protocol */
1437	else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1438	&& (ev.xclient.data.l[0] == DndFile
1439	|| ev.xclient.data.l[0] == DndDir
1440	|| ev.xclient.data.l[0] == DndLink))
1441	{
1442	/* Get Dnd data */
1443	Atom ActualType;
1444	int ActualFormat;
1445	unsigned char *data;
1446	unsigned long Size, RemainingBytes;
1447
1448	XGetWindowProperty (disp, display->root,
1449	xa[XA_DNDSELECTION],
1450	0L, 1000000L,
1451	False, AnyPropertyType,
1452	&ActualType, &ActualFormat,
1453	&Size, &RemainingBytes,
1454	&data);
1455	set_string_property (XA_CUT_BUFFER0, data);
1456	XFree (data);
1457	selection_paste (display->root, XA_CUT_BUFFER0, true);
1458	XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1459	}
1460	#endif /* OFFIX_DND */
1461	break;	1425	break;
1462		1426
1463	case MappingNotify:	1427	case MappingNotify:
1464	XRefreshKeyboardMapping (&ev.xmapping);	1428	XRefreshKeyboardMapping (&ev.xmapping);
1465	break;	1429	break;
…		…
1498	break;	1462	break;
1499		1463
1500	case ConfigureNotify:	1464	case ConfigureNotify:
1501	if (ev.xconfigure.window == parent[0])	1465	if (ev.xconfigure.window == parent[0])
1502	{	1466	{
1503	while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))	1467	while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev))
1504	;	1468	;
1505		1469
1506	if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)	1470	if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1507	{	1471	{
1508	seen_resize = 1;	1472	seen_resize = 1;
1509	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1473	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1510	}	1474	}
1511		1475
		1476	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
		1477
1512	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */	1478	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1513	if (OPTION (Opt_transparent))	1479	if (OPTION (Opt_transparent))
1514	check_our_parents ();	1480	check_our_parents ();
1515	#endif	1481	#endif
1516	}	1482	}
1517	break;	1483	break;
1518		1484
1519	case PropertyNotify:	1485	case PropertyNotify:
		1486	if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1520	if (ev.xproperty.atom == xa[XA_VT_SELECTION]	1487	if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1521	&& ev.xproperty.state == PropertyNewValue)	1488	&& ev.xproperty.state == PropertyNewValue)
1522	selection_property (ev.xproperty.window, ev.xproperty.atom);	1489	selection_property (ev.xproperty.window, ev.xproperty.atom);
1523		1490
1524	break;	1491	break;
1525		1492
1526	case SelectionClear:	1493	case SelectionClear:
1527	selection_clear ();	1494	selection_clear ();
…		…
1563	if (ev.xany.window == vt)	1530	if (ev.xany.window == vt)
1564	{	1531	{
1565	do	1532	do
1566	scr_expose (ev.xexpose.x, ev.xexpose.y,	1533	scr_expose (ev.xexpose.x, ev.xexpose.y,
1567	ev.xexpose.width, ev.xexpose.height, False);	1534	ev.xexpose.width, ev.xexpose.height, False);
1568	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));	1535	while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev));
1569		1536
1570	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1537	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1571		1538
1572	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))	1539	while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev))
1573	scr_expose (ev.xexpose.x, ev.xexpose.y,	1540	scr_expose (ev.xexpose.x, ev.xexpose.y,
1574	ev.xexpose.width, ev.xexpose.height, False);	1541	ev.xexpose.width, ev.xexpose.height, False);
1575		1542
1576	want_refresh = 1;	1543	want_refresh = 1;
1577	}	1544	}
1578	else	1545	else
1579	{	1546	{
1580	XEvent unused_event;	1547	XEvent unused_event;
1581		1548
1582	while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))	1549	while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event))
1583	;	1550	;
1584	while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))	1551	while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event))
1585	;	1552	;
1586		1553
1587	if (isScrollbarWindow (ev.xany.window))	1554	if (isScrollbarWindow (ev.xany.window))
1588	{	1555	{
1589	scrollBar.setIdle ();	1556	scrollBar.setIdle ();
1590	scrollbar_show (0);	1557	scrollbar_show (0);
1591	}	1558	}
1592	#ifdef MENUBAR
1593	if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1594	menubar_expose ();
1595	#endif
1596		1559
1597	#ifdef TRANSPARENT	1560	#ifdef TRANSPARENT
1598	if (am_transparent && ev.xany.window == parent[0])	1561	if (am_transparent && ev.xany.window == parent[0])
1599	XClearWindow (disp, ev.xany.window);	1562	XClearWindow (xdisp, ev.xany.window);
1600	#endif	1563	#endif
1601	}	1564	}
1602	break;	1565	break;
1603		1566
1604	case MotionNotify:	1567	case MotionNotify:
1605	#ifdef POINTER_BLANK	1568	#ifdef POINTER_BLANK
1606	if (hidden_pointer)	1569	if (hidden_pointer)
1607	pointer_unblank ();	1570	pointer_unblank ();
1608	#endif	1571	#endif
1609	#if MENUBAR
1610	if (isMenuBarWindow (ev.xany.window))
1611	{
1612	menubar_control (ev.xbutton);
1613	break;
1614	}
1615	#endif
1616	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)	1572	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1617	break;	1573	break;
1618		1574
1619	if (ev.xany.window == vt)	1575	if (ev.xany.window == vt)
1620	{	1576	{
		1577	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1621	if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))	1578	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1622	; // nop	1579	; // nop
1623	else if (ev.xbutton.state & (Button1Mask | Button3Mask))	1580	else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1624	{	1581	{
1625	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))	1582	while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev))
1626	;	1583	;
1627		1584
1628	XQueryPointer (disp, vt,	1585	XQueryPointer (xdisp, vt,
1629	&unused_root, &unused_child,	1586	&unused_root, &unused_child,
1630	&unused_root_x, &unused_root_y,	1587	&unused_root_x, &unused_root_y,
1631	&ev.xbutton.x, &ev.xbutton.y,	1588	&ev.xbutton.x, &ev.xbutton.y,
1632	&ev.xbutton.state);	1589	&ev.xbutton.state);
1633	#ifdef MOUSE_THRESHOLD	1590	#ifdef MOUSE_THRESHOLD
…		…
1697	#endif	1654	#endif
1698	}	1655	}
1699	}	1656	}
1700	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1657	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1701	{	1658	{
1702	while (XCheckTypedWindowEvent (disp, scrollBar.win,	1659	while (XCheckTypedWindowEvent (xdisp, scrollBar.win,
1703	MotionNotify, &ev))	1660	MotionNotify, &ev))
1704	;	1661	;
1705		1662
1706	XQueryPointer (disp, scrollBar.win,	1663	XQueryPointer (xdisp, scrollBar.win,
1707	&unused_root, &unused_child,	1664	&unused_root, &unused_child,
1708	&unused_root_x, &unused_root_y,	1665	&unused_root_x, &unused_root_y,
1709	&ev.xbutton.x, &ev.xbutton.y,	1666	&ev.xbutton.x, &ev.xbutton.y,
1710	&unused_mask);	1667	&unused_mask);
1711	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1668	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
…		…
1726	{	1683	{
1727	hidden_cursor = 0;	1684	hidden_cursor = 0;
1728	want_refresh = 1;	1685	want_refresh = 1;
1729	}	1686	}
1730		1687
1731	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1688	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1732	}	1689	}
1733	#endif	1690	#endif
1734		1691
1735	#if defined(POINTER_BLANK)	1692	#if defined(POINTER_BLANK)
1736	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)	1693	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
…		…
1764	XSetICFocus (Input_Context);	1721	XSetICFocus (Input_Context);
1765	}	1722	}
1766	#endif	1723	#endif
1767	#if CURSOR_BLINK	1724	#if CURSOR_BLINK
1768	if (OPTION (Opt_cursorBlink))	1725	if (OPTION (Opt_cursorBlink))
1769	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1726	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1770	#endif	1727	#endif
1771	#if OFF_FOCUS_FADING	1728	#if OFF_FOCUS_FADING
1772	if (rs[Rs_fade])	1729	if (rs[Rs_fade])
1773	{	1730	{
1774	pix_colors = pix_colors_focused;	1731	pix_colors = pix_colors_focused;
…		…
1818		1775
1819	#if TRANSPARENT	1776	#if TRANSPARENT
1820	void	1777	void
1821	rxvt_term::rootwin_cb (XEvent &ev)	1778	rxvt_term::rootwin_cb (XEvent &ev)
1822	{	1779	{
1823	SET_R (this);	1780	make_current ();
1824	SET_LOCALE (locale);
1825		1781
1826	switch (ev.type)	1782	switch (ev.type)
1827	{	1783	{
1828	case PropertyNotify:	1784	case PropertyNotify:
1829	/*	1785	/*
…		…
1856	/*	1812	/*
1857	* VT window processing of button press	1813	* VT window processing of button press
1858	*/	1814	*/
1859	if (ev.window == vt)	1815	if (ev.window == vt)
1860	{	1816	{
		1817	if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
		1818	return;
		1819
1861	#if ISO_14755	1820	#if ISO_14755
1862	// 5.4	1821	// 5.4
1863	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))	1822	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1864	{	1823	{
1865	iso14755_54 (ev.x, ev.y);	1824	iso14755_54 (ev.x, ev.y);
…		…
1907	else	1866	else
1908	{	1867	{
1909	if (ev.button != MEvent.button)	1868	if (ev.button != MEvent.button)
1910	MEvent.clicks = 0;	1869	MEvent.clicks = 0;
1911		1870
1912	if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1913	switch (ev.button)	1871	switch (ev.button)
1914	{	1872	{
1915	case Button1:	1873	case Button1:
1916	/* allow meta + click to select rectangular areas */	1874	/* allow meta + click to select rectangular areas */
1917	/* should be done in screen.C */	1875	/* should be done in screen.C */
1918	#if ENABLE_FRILLS	1876	#if ENABLE_FRILLS
1919	selection.rect = !!(ev.state & ModMetaMask);	1877	selection.rect = !!(ev.state & ModMetaMask);
1920	#else	1878	#else
1921	selection.rect = false;	1879	selection.rect = false;
1922	#endif	1880	#endif
1923		1881
1924	/* allow shift+left click to extend selection */	1882	/* allow shift+left click to extend selection */
1925	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))	1883	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1926	{	1884	{
1927	if (MEvent.button == Button1 && clickintime)	1885	if (MEvent.button == Button1 && clickintime)
1928	selection_rotate (ev.x, ev.y);	1886	selection_rotate (ev.x, ev.y);
1929	else	1887	else
1930	selection_extend (ev.x, ev.y, 1);	1888	selection_extend (ev.x, ev.y, 1);
1931	}	1889	}
1932	else	1890	else
1933	{	1891	{
1934	if (MEvent.button == Button1 && clickintime)	1892	if (MEvent.button == Button1 && clickintime)
1935	MEvent.clicks++;	1893	MEvent.clicks++;
1936	else	1894	else
1937	MEvent.clicks = 1;	1895	MEvent.clicks = 1;
1938		1896
1939	selection_click (MEvent.clicks, ev.x, ev.y);	1897	selection_click (MEvent.clicks, ev.x, ev.y);
1940	}	1898	}
1941		1899
1942	MEvent.button = Button1;	1900	MEvent.button = Button1;
1943	break;	1901	break;
1944		1902
1945	case Button3:	1903	case Button3:
1946	if (MEvent.button == Button3 && clickintime)	1904	if (MEvent.button == Button3 && clickintime)
1947	selection_rotate (ev.x, ev.y);	1905	selection_rotate (ev.x, ev.y);
1948	else	1906	else
1949	selection_extend (ev.x, ev.y, 1);	1907	selection_extend (ev.x, ev.y, 1);
1950		1908
1951	MEvent.button = Button3;	1909	MEvent.button = Button3;
1952	break;	1910	break;
1953	}	1911	}
1954	}	1912	}
1955		1913
1956	MEvent.time = ev.time;	1914	MEvent.time = ev.time;
1957	return;	1915	return;
1958	}	1916	}
1959		1917
…		…
2098	}	2056	}
2099	}	2057	}
2100		2058
2101	return;	2059	return;
2102	}	2060	}
2103
2104	#if MENUBAR
2105	/*
2106	* Menubar window processing of button press
2107	*/
2108	if (isMenuBarWindow (ev.window))
2109	menubar_control (ev);
2110	#endif
2111	}	2061	}
2112		2062
2113	void	2063	void
2114	rxvt_term::button_release (XButtonEvent &ev)	2064	rxvt_term::button_release (XButtonEvent &ev)
2115	{	2065	{
…		…
2121		2071
2122	if (scrollbar_isUpDn ())	2072	if (scrollbar_isUpDn ())
2123	{	2073	{
2124	scrollBar.setIdle ();	2074	scrollBar.setIdle ();
2125	scrollbar_show (0);	2075	scrollbar_show (0);
2126	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2127	refresh_type &= ~SMOOTH_REFRESH;
2128	#endif
2129	}	2076	}
2130		2077
2131	#ifdef SELECTION_SCROLLING	2078	#ifdef SELECTION_SCROLLING
2132	if (sel_scroll_ev.active)	2079	if (sel_scroll_ev.active)
2133	sel_scroll_ev.stop();	2080	sel_scroll_ev.stop();
2134	#endif	2081	#endif
2135		2082
2136	if (ev.window == vt)	2083	if (ev.window == vt)
2137	{	2084	{
		2085	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
		2086	return;
		2087
2138	#if ISO_14755	2088	#if ISO_14755
2139	// 5.4	2089	// 5.4
2140	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))	2090	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2141	return;	2091	return;
2142	#endif	2092	#endif
		2093
2143	if (reportmode)	2094	if (reportmode)
2144	{	2095	{
2145	/* mouse report from vt window */	2096	/* mouse report from vt window */
2146	/* don't report release of wheel "buttons" */	2097	/* don't report release of wheel "buttons" */
2147	if (ev.button >= 4)	2098	if (ev.button >= 4)
…		…
2171	if (priv_modes & PrivMode_mouse_report	2122	if (priv_modes & PrivMode_mouse_report
2172	&& bypass_keystate	2123	&& bypass_keystate
2173	&& ev.button == Button1 && MEvent.clicks <= 1)	2124	&& ev.button == Button1 && MEvent.clicks <= 1)
2174	selection_extend (ev.x, ev.y, 0);	2125	selection_extend (ev.x, ev.y, 0);
2175		2126
2176	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2177	return;
2178
2179	switch (ev.button)	2127	switch (ev.button)
2180	{	2128	{
2181	case Button1:	2129	case Button1:
2182	case Button3:	2130	case Button3:
2183	selection_make (ev.time);	2131	selection_make (ev.time);
2184	break;	2132	break;
		2133
2185	case Button2:	2134	case Button2:
2186	selection_request (ev.time, ev.x, ev.y);	2135	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
		2136	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2187	break;	2137	break;
		2138
2188	#ifdef MOUSE_WHEEL	2139	#ifdef MOUSE_WHEEL
2189	case Button4:	2140	case Button4:
2190	case Button5:	2141	case Button5:
2191	{	2142	{
2192	int i;	2143	int i;
…		…
2224	}	2175	}
2225	break;	2176	break;
2226	#endif	2177	#endif
2227	}	2178	}
2228	}	2179	}
2229	#ifdef MENUBAR
2230	else if (isMenuBarWindow (ev.window))
2231	menubar_control (ev);
2232	#endif
2233	}	2180	}
2234		2181
2235	#ifdef TRANSPARENT	2182	#ifdef TRANSPARENT
2236	#if TINTING	2183	#if TINTING
2237	/* taken from aterm-0.4.2 */	2184	/* taken from aterm-0.4.2 */
2238		2185
2239	typedef uint32_t RUINT32T;	2186	typedef uint32_t RUINT32T;
2240		2187
2241	void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)	2188	void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2242	{	2189	{
2243	int sh_r, sh_g, sh_b;	2190	int sh_r, sh_g, sh_b;
2244	RUINT32T mask_r, mask_g, mask_b;	2191	RUINT32T mask_r, mask_g, mask_b;
2245	RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;	2192	RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2246	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;	2193	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2247	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;	2194	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2248	int i;	2195	int i;
2249		2196
2250	Visual *visual = display->visual;	2197	Visual *visual = term->visual;
2251		2198
2252	if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;	2199	if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2253		2200
2254	/* for convenience */	2201	/* for convenience */
2255	mask_r = visual->red_mask;	2202	mask_r = visual->red_mask;
…		…
2476	Atom atype;	2423	Atom atype;
2477	unsigned char *prop = NULL;	2424	unsigned char *prop = NULL;
2478	Window root, oldp, *list;	2425	Window root, oldp, *list;
2479	Pixmap rootpixmap = None;	2426	Pixmap rootpixmap = None;
2480	XWindowAttributes wattr, wrootattr;	2427	XWindowAttributes wattr, wrootattr;
2481	dDisp;
2482		2428
2483	pchanged = 0;	2429	pchanged = 0;
2484		2430
2485	if (!OPTION (Opt_transparent))	2431	if (!OPTION (Opt_transparent))
2486	return pchanged; /* Don't try any more */	2432	return pchanged; /* Don't try any more */
2487		2433
2488	XGetWindowAttributes (disp, display->root, &wrootattr);	2434	XGetWindowAttributes (xdisp, display->root, &wrootattr);
2489	rootdepth = wrootattr.depth;	2435	rootdepth = wrootattr.depth;
2490		2436
2491	XGetWindowAttributes (disp, parent[0], &wattr);	2437	XGetWindowAttributes (xdisp, parent[0], &wattr);
2492		2438
2493	if (rootdepth != wattr.depth)	2439	if (rootdepth != wattr.depth)
2494	{	2440	{
2495	if (am_transparent)	2441	if (am_transparent)
2496	{	2442	{
2497	pchanged = 1;	2443	pchanged = 1;
2498	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2444	XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2499	am_transparent = am_pixmap_trans = 0;	2445	am_transparent = am_pixmap_trans = 0;
2500	}	2446	}
2501		2447
2502	return pchanged; /* Don't try any more */	2448	return pchanged; /* Don't try any more */
2503	}	2449	}
2504		2450
2505	/* Get all X ops out of the queue so that our information is up-to-date. */	2451	/* Get all X ops out of the queue so that our information is up-to-date. */
2506	XSync (disp, False);	2452	XSync (xdisp, False);
2507		2453
2508	/*	2454	/*
2509	* Make the frame window set by the window manager have	2455	* Make the frame window set by the window manager have
2510	* the root background. Some window managers put multiple nested frame	2456	* the root background. Some window managers put multiple nested frame
2511	* windows for each client, so we have to take care about that.	2457	* windows for each client, so we have to take care about that.
2512	*/	2458	*/
2513	i = (xa[XA_XROOTPMAP_ID]	2459	i = (xa[XA_XROOTPMAP_ID]
2514	&& XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],	2460	&& XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2515	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2461	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2516	&nitems, &bytes_after, &prop) == Success);	2462	&nitems, &bytes_after, &prop) == Success);
2517		2463
2518	if (!i || prop == NULL)	2464	if (!i || prop == NULL)
2519	i = (xa[XA_ESETROOT_PMAP_ID]	2465	i = (xa[XA_ESETROOT_PMAP_ID]
2520	&& XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],	2466	&& XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2521	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2467	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2522	&nitems, &bytes_after, &prop) == Success);	2468	&nitems, &bytes_after, &prop) == Success);
2523		2469
2524	if (!i || prop == NULL	2470	if (!i || prop == NULL
2525	#if TINTING	2471	#if TINTING
2526	|| !rs[Rs_color + Color_tint]	2472	|| !ISSET_PIXCOLOR (Color_tint)
2527	#endif	2473	#endif
2528	)	2474	)
2529	have_pixmap = 0;	2475	have_pixmap = 0;
2530	else	2476	else
2531	{	2477	{
…		…
2544	Window cr;	2490	Window cr;
2545	XImage *image;	2491	XImage *image;
2546	GC gc;	2492	GC gc;
2547	XGCValues gcvalue;	2493	XGCValues gcvalue;
2548		2494
2549	XTranslateCoordinates (disp, parent[0], display->root,	2495	XTranslateCoordinates (xdisp, parent[0], display->root,
2550	0, 0, &sx, &sy, &cr);	2496	0, 0, &sx, &sy, &cr);
2551	nw = (unsigned int)szHint.width;	2497	nw = (unsigned int)szHint.width;
2552	nh = (unsigned int)szHint.height;	2498	nh = (unsigned int)szHint.height;
2553	nx = ny = 0;	2499	nx = ny = 0;
2554		2500
…		…
2567	}	2513	}
2568		2514
2569	min_it (nw, (unsigned int) (wrootattr.width - sx));	2515	min_it (nw, (unsigned int) (wrootattr.width - sx));
2570	min_it (nh, (unsigned int) (wrootattr.height - sy));	2516	min_it (nh, (unsigned int) (wrootattr.height - sy));
2571		2517
2572	XSync (disp, False);	2518	XSync (xdisp, False);
2573	allowedxerror = -1;	2519	allowedxerror = -1;
2574	image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);	2520	image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2575		2521
2576	/* XXX: handle BadMatch - usually because we're outside the pixmap */	2522	/* XXX: handle BadMatch - usually because we're outside the pixmap */
2577	/* XXX: may need a delay here? */	2523	/* XXX: may need a delay here? */
2578	allowedxerror = 0;	2524	allowedxerror = 0;
2579		2525
…		…
2582	if (am_transparent && am_pixmap_trans)	2528	if (am_transparent && am_pixmap_trans)
2583	{	2529	{
2584	pchanged = 1;	2530	pchanged = 1;
2585	if (pixmap != None)	2531	if (pixmap != None)
2586	{	2532	{
2587	XFreePixmap (disp, pixmap);	2533	XFreePixmap (xdisp, pixmap);
2588	pixmap = None;	2534	pixmap = None;
2589	}	2535	}
2590	}	2536	}
2591		2537
2592	am_pixmap_trans = 0;	2538	am_pixmap_trans = 0;
2593	}	2539	}
2594	else	2540	else
2595	{	2541	{
2596	if (pixmap != None)	2542	if (pixmap != None)
2597	XFreePixmap (disp, pixmap);	2543	XFreePixmap (xdisp, pixmap);
2598		2544
2599	#if TINTING	2545	#if TINTING
2600	if (ISSET_PIXCOLOR (Color_tint))	2546	if (ISSET_PIXCOLOR (Color_tint))
2601	{	2547	{
2602	unsigned short rm, gm, bm;
2603	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;	2548	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2604		2549
		2550	rgba c;
2605	pix_colors_focused[Color_tint].get (display, rm, gm, bm);	2551	pix_colors_focused [Color_tint].get (c);
2606		2552
2607	ShadeXImage (display, image, shade, rm, gm, bm);	2553	ShadeXImage (this, image, shade, c.r, c.g, c.b);
2608	}	2554	}
2609	#endif	2555	#endif
2610		2556
2611	pixmap = XCreatePixmap (disp, vt,	2557	pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2612	szHint.width, szHint.height, image->depth);
2613	gc = XCreateGC (disp, vt, 0UL, &gcvalue);	2558	gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2614	XPutImage (disp, pixmap, gc, image, 0, 0,	2559	XPutImage (xdisp, pixmap, gc, image, 0, 0,
2615	nx, ny, image->width, image->height);	2560	nx, ny, image->width, image->height);
2616	XFreeGC (disp, gc);	2561	XFreeGC (xdisp, gc);
2617	XDestroyImage (image);	2562	XDestroyImage (image);
2618	XSetWindowBackgroundPixmap (disp, parent[0], pixmap);	2563	XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2619	XClearWindow (disp, parent[0]);	2564	XClearWindow (xdisp, parent[0]);
2620		2565
2621	if (!am_transparent || !am_pixmap_trans)	2566	if (!am_transparent || !am_pixmap_trans)
2622	pchanged = 1;	2567	pchanged = 1;
2623		2568
2624	am_transparent = am_pixmap_trans = 1;	2569	am_transparent = am_pixmap_trans = 1;
2625	}	2570	}
2626	}	2571	}
2627		2572
2628	if (am_pixmap_trans)	2573	if (am_pixmap_trans)
2629	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2574	XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2630	else	2575	else
2631	{	2576	{
2632	unsigned int n;	2577	unsigned int n;
2633	/*	2578	/*
2634	* InheritPixmap transparency	2579	* InheritPixmap transparency
2635	*/	2580	*/
2636	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2581	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2637	{	2582	{
2638	oldp = parent[i];	2583	oldp = parent[i];
2639	XQueryTree (disp, parent[i - 1], &root,	2584	XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n);
2640	&parent[i], &list, &n);
2641	XFree (list);	2585	XFree (list);
2642		2586
2643	if (parent[i] == display->root)	2587	if (parent[i] == display->root)
2644	{	2588	{
2645	if (oldp != None)	2589	if (oldp != None)
…		…
2653	}	2597	}
2654		2598
2655	n = 0;	2599	n = 0;
2656		2600
2657	if (pchanged)	2601	if (pchanged)
2658	{
2659	for (; n < (unsigned int)i; n++)	2602	for (; n < (unsigned int)i; n++)
2660	{	2603	{
2661	XGetWindowAttributes (disp, parent[n], &wattr);	2604	XGetWindowAttributes (xdisp, parent[n], &wattr);
		2605
2662	if (wattr.depth != rootdepth || wattr.c_class == InputOnly)	2606	if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2663	{	2607	{
2664	n = (int) (sizeof (parent) / sizeof (Window)) + 1;	2608	n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2665	break;	2609	break;
2666	}	2610	}
2667	}	2611	}
2668	}
2669		2612
2670	if (n > (int) (sizeof (parent) / sizeof (parent[0])))	2613	if (n > (sizeof (parent) / sizeof (parent[0])))
2671	{	2614	{
2672	XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);	2615	XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2673	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2616	XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2674	am_transparent = 0;	2617	am_transparent = 0;
2675	/* XXX: also turn off Opt_transparent? */	2618	/* XXX: also turn off Opt_transparent? */
2676	}	2619	}
2677	else	2620	else
2678	{	2621	{
2679	#if WAIT_FOR_WM
2680	/* wait (an arbitrary period) for the WM to do its thing
2681	* needed for fvwm2.2.2 (and before?) */
2682	sleep (1);
2683	#endif
2684	for (n = 0; n < (unsigned int)i; n++)	2622	for (n = 0; n < (unsigned int)i; n++)
2685	{	2623	{
2686	XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);	2624	XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2687	XClearWindow (disp, parent[n]);	2625	XClearWindow (xdisp, parent[n]);
2688	}	2626	}
2689		2627
2690	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2628	XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2691	am_transparent = 1;	2629	am_transparent = 1;
2692	}	2630	}
2693		2631
2694	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2632	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2695	parent[i] = None;	2633	parent[i] = None;
2696	}	2634	}
2697		2635
2698	if (scrollBar.win)	2636	if (scrollBar.win)
2699	{	2637	{
2700	XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);	2638	XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2701	scrollBar.setIdle ();	2639	scrollBar.setIdle ();
2702	scrollbar_show (0);	2640	scrollbar_show (0);
2703	}	2641	}
2704		2642
2705	if (am_transparent)	2643	if (am_transparent)
…		…
2780	}	2718	}
2781		2719
2782	// scr_add_lines only works for nlines <= nrow - 1.	2720	// scr_add_lines only works for nlines <= nrow - 1.
2783	if (nlines >= nrow - 1)	2721	if (nlines >= nrow - 1)
2784	{	2722	{
		2723	if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2785	if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))	2724	&& HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2786	scr_add_lines (buf, str - buf, nlines);	2725	scr_add_lines (buf, str - buf, nlines);
2787		2726
2788	nlines = 0;	2727	nlines = 0;
2789	str = buf;	2728	str = buf;
2790	eol = str + min (ncol, UBUFSIZ);	2729	eol = str + min (ncol, UBUFSIZ);
…		…
2805		2744
2806	seq_begin = cmdbuf_ptr;	2745	seq_begin = cmdbuf_ptr;
2807	ch = next_char ();	2746	ch = next_char ();
2808	}	2747	}
2809		2748
		2749	if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2810	if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))	2750	&& HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2811	scr_add_lines (buf, str - buf, nlines);	2751	scr_add_lines (buf, str - buf, nlines);
2812		2752
2813	/*	2753	/*
2814	* If there have been a lot of new lines, then update the screen	2754	* If there have been a lot of new lines, then update the screen
2815	* What the heck I'll cheat and only refresh less than every page-full.	2755	* What the heck I'll cheat and only refresh less than every page-full.
…		…
2821	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)	2761	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2822	refresh_limit++;	2762	refresh_limit++;
2823	else	2763	else
2824	{	2764	{
2825	flag = true;	2765	flag = true;
2826	scr_refresh (refresh_type);	2766	scr_refresh ();
2827	want_refresh = 1;	2767	want_refresh = 1;
2828	}	2768	}
2829	}	2769	}
2830		2770
2831	}	2771	}
…		…
2849	return flag;	2789	return flag;
2850	}	2790	}
2851		2791
2852	// read the next character	2792	// read the next character
2853	wchar_t	2793	wchar_t
2854	rxvt_term::next_char ()	2794	rxvt_term::next_char () NOTHROW
2855	{	2795	{
2856	while (cmdbuf_ptr < cmdbuf_endp)	2796	while (cmdbuf_ptr < cmdbuf_endp)
2857	{	2797	{
2858	// assume 7-bit to be ascii ALWAYS	2798	// assume 7-bit to be ascii ALWAYS
2859	if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)	2799	if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
…		…
2880	return NOCHAR;	2820	return NOCHAR;
2881	}	2821	}
2882		2822
2883	// read the next octet	2823	// read the next octet
2884	uint32_t	2824	uint32_t
2885	rxvt_term::next_octet ()	2825	rxvt_term::next_octet () NOTHROW
2886	{	2826	{
2887	return cmdbuf_ptr < cmdbuf_endp	2827	return cmdbuf_ptr < cmdbuf_endp
2888	? (unsigned char)*cmdbuf_ptr++	2828	? (unsigned char)*cmdbuf_ptr++
2889	: NOCHAR;	2829	: NOCHAR;
2890	}	2830	}
		2831
		2832	static class out_of_input out_of_input;
2891		2833
2892	/* rxvt_cmd_getc () - Return next input character */	2834	/* rxvt_cmd_getc () - Return next input character */
2893	/*	2835	/*
2894	* Return the next input character after first passing any keyboard input	2836	* Return the next input character after first passing any keyboard input
2895	* to the command.	2837	* to the command.
2896	*/	2838	*/
2897	wchar_t	2839	wchar_t
2898	rxvt_term::cmd_getc ()	2840	rxvt_term::cmd_getc () THROW ((class out_of_input))
2899	{	2841	{
2900	wchar_t c = next_char ();	2842	wchar_t c = next_char ();
2901		2843
2902	if (c == NOCHAR)	2844	if (c == NOCHAR)
2903	throw out_of_input;	2845	throw out_of_input;
2904		2846
2905	return c;	2847	return c;
2906	}	2848	}
2907		2849
2908	uint32_t	2850	uint32_t
2909	rxvt_term::cmd_get8 ()	2851	rxvt_term::cmd_get8 () THROW ((class out_of_input))
2910	{	2852	{
2911	uint32_t c = next_octet ();	2853	uint32_t c = next_octet ();
2912		2854
2913	if (c == NOCHAR)	2855	if (c == NOCHAR)
2914	throw out_of_input;	2856	throw out_of_input;
…		…
3152	scr_charset_set (2, (unsigned int)cmd_getc ());	3094	scr_charset_set (2, (unsigned int)cmd_getc ());
3153	break;	3095	break;
3154	case '+':	3096	case '+':
3155	scr_charset_set (3, (unsigned int)cmd_getc ());	3097	scr_charset_set (3, (unsigned int)cmd_getc ());
3156	break;	3098	break;
3157	#if ENABLE_FRILLS	3099	#if !ENABLE_MINIMAL
3158	case '6':	3100	case '6':
3159	scr_backindex ();	3101	scr_backindex ();
3160	break;	3102	break;
3161	#endif	3103	#endif
3162	case '7':	3104	case '7':
3163	scr_cursor (SAVE);	3105	scr_cursor (SAVE);
3164	break;	3106	break;
3165	case '8':	3107	case '8':
3166	scr_cursor (RESTORE);	3108	scr_cursor (RESTORE);
3167	break;	3109	break;
3168	#if ENABLE_FRILLS	3110	#if !ENABLE_MINIMAL
3169	case '9':	3111	case '9':
3170	scr_forwardindex ();	3112	scr_forwardindex ();
3171	break;	3113	break;
3172	#endif	3114	#endif
3173	case '=':	3115	case '=':
…		…
3335	ndef = get_byte_array_bit (csi_defaults, i);	3277	ndef = get_byte_array_bit (csi_defaults, i);
3336	for (p = 0; p < nargs; p++)	3278	for (p = 0; p < nargs; p++)
3337	if (arg[p] == -1)	3279	if (arg[p] == -1)
3338	arg[p] = ndef;	3280	arg[p] = ndef;
3339		3281
3340	#ifdef DEBUG_CMD
3341	fprintf (stderr, "CSI ");
3342	for (p = 0; p < nargs; p++)
3343	fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3344	fprintf (stderr, "%c\n", ch);
3345	#endif
3346
3347	/*	3282	/*
3348	* private mode handling	3283	* private mode handling
3349	*/	3284	*/
3350	if (priv)	3285	if (priv)
3351	{	3286	{
3352	switch (priv)	3287	switch (priv)
3353	{	3288	{
3354	case '>':	3289	case '>':
3355	if (ch == CSI_DA) /* secondary device attributes */	3290	if (ch == CSI_DA) /* secondary device attributes */
3356	tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);	3291	{
		3292	// first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
		3293	// 'U' for rxvt-unicode != 7.[34] (where it was broken).
		3294	//
		3295	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
		3296	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
		3297	// that we do not support xterm mouse reporting (should be 95 when we do).
		3298	//
		3299	tt_printf ("\033[>%d;94;0c", 'U');
		3300	}
3357	break;	3301	break;
3358	case '?':	3302	case '?':
3359	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')	3303	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3360	process_terminal_mode (ch, priv, nargs, arg);	3304	process_terminal_mode (ch, priv, nargs, arg);
3361	break;	3305	break;
…		…
3564	break;	3508	break;
3565	case CSI_75:	3509	case CSI_75:
3566	scr_cursor (RESTORE);	3510	scr_cursor (RESTORE);
3567	break;	3511	break;
3568		3512
3569	#if ENABLE_FRILLS	3513	#if !ENABLE_MINIMAL
3570	case CSI_74:	3514	case CSI_74:
3571	process_window_ops (arg, nargs);	3515	process_window_ops (arg, nargs);
3572	break;	3516	break;
3573	#endif	3517	#endif
3574		3518
…		…
3581	break;	3525	break;
3582	}	3526	}
3583	}	3527	}
3584	/*}}} */	3528	/*}}} */
3585		3529
3586	#if ENABLE_FRILLS	3530	#if !ENABLE_MINIMAL
3587	/* ARGSUSED */	3531	/* ARGSUSED */
3588	void	3532	void
3589	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3533	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3590	{	3534	{
3591	int x, y;	3535	int x, y;
3592	XWindowAttributes wattr;	3536	XWindowAttributes wattr;
3593	Window wdummy;	3537	Window wdummy;
3594	dDisp;	3538
		3539	dLocal (Display *, xdisp);
3595		3540
3596	if (nargs == 0)	3541	if (nargs == 0)
3597	return;	3542	return;
3598		3543
3599	switch (args[0])	3544	switch (args[0])
3600	{	3545	{
3601	/*	3546	/*
3602	* commands	3547	* commands
3603	*/	3548	*/
3604	case 1: /* deiconify window */	3549	case 1: /* deiconify window */
3605	XMapWindow (disp, parent[0]);	3550	XMapWindow (xdisp, parent[0]);
3606	break;	3551	break;
3607	case 2: /* iconify window */	3552	case 2: /* iconify window */
3608	XIconifyWindow (disp, parent[0], display->screen);	3553	XIconifyWindow (xdisp, parent[0], display->screen);
3609	break;	3554	break;
3610	case 3: /* set position (pixels) */	3555	case 3: /* set position (pixels) */
3611	XMoveWindow (disp, parent[0], args[1], args[2]);	3556	XMoveWindow (xdisp, parent[0], args[1], args[2]);
3612	break;	3557	break;
3613	case 4: /* set size (pixels) */	3558	case 4: /* set size (pixels) */
3614	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3559	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3615	break;	3560	break;
3616	case 5: /* raise window */	3561	case 5: /* raise window */
3617	XRaiseWindow (disp, parent[0]);	3562	XRaiseWindow (xdisp, parent[0]);
3618	break;	3563	break;
3619	case 6: /* lower window */	3564	case 6: /* lower window */
3620	XLowerWindow (disp, parent[0]);	3565	XLowerWindow (xdisp, parent[0]);
3621	break;	3566	break;
3622	case 7: /* refresh window */	3567	case 7: /* refresh window */
3623	scr_touch (true);	3568	scr_touch (true);
3624	break;	3569	break;
3625	case 8: /* set size (chars) */	3570	case 8: /* set size (chars) */
…		…
3632	if (args[0] >= 24) /* set height (chars) */	3577	if (args[0] >= 24) /* set height (chars) */
3633	set_widthheight ((unsigned int)width,	3578	set_widthheight ((unsigned int)width,
3634	(unsigned int) (args[1] * fheight));	3579	(unsigned int) (args[1] * fheight));
3635	break;	3580	break;
3636		3581
3637
3638	/*	3582	/*
3639	* reports - some output format copied from XTerm	3583	* reports - some output format copied from XTerm
3640	*/	3584	*/
3641	case 11: /* report window state */	3585	case 11: /* report window state */
3642	XGetWindowAttributes (disp, parent[0], &wattr);	3586	XGetWindowAttributes (xdisp, parent[0], &wattr);
3643	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3587	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3644	break;	3588	break;
3645	case 13: /* report window position */	3589	case 13: /* report window position */
3646	XGetWindowAttributes (disp, parent[0], &wattr);	3590	XGetWindowAttributes (xdisp, parent[0], &wattr);
3647	XTranslateCoordinates (disp, parent[0], wattr.root,	3591	XTranslateCoordinates (xdisp, parent[0], wattr.root,
3648	-wattr.border_width, -wattr.border_width,	3592	-wattr.border_width, -wattr.border_width,
3649	&x, &y, &wdummy);	3593	&x, &y, &wdummy);
3650	tt_printf ("\033[3;%d;%dt", x, y);	3594	tt_printf ("\033[3;%d;%dt", x, y);
3651	break;	3595	break;
3652	case 14: /* report window size (pixels) */	3596	case 14: /* report window size (pixels) */
3653	XGetWindowAttributes (disp, parent[0], &wattr);	3597	XGetWindowAttributes (xdisp, parent[0], &wattr);
3654	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3598	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3655	break;	3599	break;
3656	case 18: /* report text area size (chars) */	3600	case 18: /* report text area size (chars) */
3657	tt_printf ("\033[8;%d;%dt", nrow, ncol);	3601	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3658	break;	3602	break;
…		…
3660	tt_printf ("\033[9;%d;%dt", nrow, ncol);	3604	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3661	break;	3605	break;
3662	case 20: /* report icon label */	3606	case 20: /* report icon label */
3663	{	3607	{
3664	char *s;	3608	char *s;
3665	XGetIconName (disp, parent[0], &s);	3609	XGetIconName (xdisp, parent[0], &s);
3666	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3610	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3667	XFree (s);	3611	XFree (s);
3668	}	3612	}
3669	break;	3613	break;
3670	case 21: /* report window title */	3614	case 21: /* report window title */
3671	{	3615	{
3672	char *s;	3616	char *s;
3673	XFetchName (disp, parent[0], &s);	3617	XFetchName (xdisp, parent[0], &s);
3674	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3618	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3675	XFree (s);	3619	XFree (s);
3676	}	3620	}
3677	break;	3621	break;
3678	}	3622	}
…		…
3779	void	3723	void
3780	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)	3724	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3781	{	3725	{
3782	if (str[0] == '?' && !str[1])	3726	if (str[0] == '?' && !str[1])
3783	{	3727	{
3784	unsigned short r, g, b;	3728	rgba c;
3785	pix_colors_focused[color].get (display, r, g, b);	3729	pix_colors_focused[color].get (c);
		3730
		3731	#if XFT
		3732	if (c.a != rgba::MAX_CC)
		3733	tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
		3734	else
		3735	#endif
3786	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);	3736	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3787	}	3737	}
3788	else	3738	else
3789	set_window_color (color, str);	3739	set_window_color (color, str);
3790	}	3740	}
3791		3741
…		…
3793	* XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)	3743	* XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3794	*/	3744	*/
3795	void	3745	void
3796	rxvt_term::process_xterm_seq (int op, const char *str, char resp)	3746	rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3797	{	3747	{
3798	int changed = 0;
3799	int color;	3748	int color;
3800	char *buf, *name;	3749	char *buf, *name;
3801	bool query = str[0] == '?' && !str[1];	3750	bool query = str[0] == '?' && !str[1];
3802	int saveop = op;	3751	int saveop = op;
3803	dDisp;	3752
		3753	dLocal (Display *, xdisp);
3804		3754
3805	assert (str != NULL);	3755	assert (str != NULL);
3806	switch (op)	3756	switch (op)
3807	{	3757	{
3808	case XTerm_name:	3758	case XTerm_name:
…		…
3824	unsigned long bytes_after;	3774	unsigned long bytes_after;
3825	unsigned char *value = 0;	3775	unsigned char *value = 0;
3826	const char *str = "";	3776	const char *str = "";
3827		3777
3828	if (prop	3778	if (prop
3829	&& XGetWindowProperty (disp, parent[0],	3779	&& XGetWindowProperty (xdisp, parent[0],
3830	prop, 0, 1<<16, 0, AnyPropertyType,	3780	prop, 0, 1<<16, 0, AnyPropertyType,
3831	&actual_type, &actual_format,	3781	&actual_type, &actual_format,
3832	&nitems, &bytes_after, &value) == Success	3782	&nitems, &bytes_after, &value) == Success
3833	&& actual_type != None	3783	&& actual_type != None
3834	&& actual_format == 8)	3784	&& actual_format == 8)
3835	str = (const char *)(value);	3785	str = (const char *)(value);
3836		3786
3837	tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);	3787	tt_printf ("\033]%d;%s%c", op, str, resp);
3838		3788
3839	XFree (value);	3789	XFree (value);
3840	}	3790	}
3841	else	3791	else
3842	{	3792	{
…		…
3846	{	3796	{
3847	*eq = 0;	3797	*eq = 0;
3848	set_utf8_property (display->atom (str), eq + 1);	3798	set_utf8_property (display->atom (str), eq + 1);
3849	}	3799	}
3850	else	3800	else
3851	XDeleteProperty (disp, parent[0],	3801	XDeleteProperty (xdisp, parent[0],
3852	display->atom (str));	3802	display->atom (str));
3853	}	3803	}
3854	break;	3804	break;
3855		3805
3856	case XTerm_Color:	3806	case XTerm_Color:
…		…
3866	break;	3816	break;
3867		3817
3868	if ((buf = strchr (name, ';')) != NULL)	3818	if ((buf = strchr (name, ';')) != NULL)
3869	*buf++ = '\0';	3819	*buf++ = '\0';
3870		3820
3871	if (name[0] == '?' && !name[1])	3821	process_color_seq (op, color, name, resp);
3872	{
3873	unsigned short r, g, b;
3874	pix_colors_focused[color].get (display, r, g, b);
3875	tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3876	}
3877	else
3878	set_window_color (color, name);
3879	}	3822	}
3880	break;	3823	break;
3881	case XTerm_Color00:	3824	case XTerm_Color00:
3882	process_color_seq (XTerm_Color00, Color_fg, str, resp);	3825	process_color_seq (op, Color_fg, str, resp);
3883	break;	3826	break;
3884	case XTerm_Color01:	3827	case XTerm_Color01:
3885	process_color_seq (XTerm_Color01, Color_bg, str, resp);	3828	process_color_seq (op, Color_bg, str, resp);
3886	break;	3829	break;
3887	#ifndef NO_CURSORCOLOR	3830	#ifndef NO_CURSORCOLOR
3888	case XTerm_Color_cursor:	3831	case XTerm_Color_cursor:
3889	process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);	3832	process_color_seq (op, Color_cursor, str, resp);
3890	break;	3833	break;
3891	#endif	3834	#endif
3892	case XTerm_Color_pointer_fg:	3835	case XTerm_Color_pointer_fg:
3893	process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);	3836	process_color_seq (op, Color_pointer_fg, str, resp);
3894	break;	3837	break;
3895	case XTerm_Color_pointer_bg:	3838	case XTerm_Color_pointer_bg:
3896	process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);	3839	process_color_seq (op, Color_pointer_bg, str, resp);
3897	break;	3840	break;
3898	#ifndef NO_BOLD_UNDERLINE_REVERSE	3841	#ifndef NO_BOLD_UNDERLINE_REVERSE
3899	case XTerm_Color_RV:	3842	case XTerm_Color_RV:
3900	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3843	process_color_seq (op, Color_RV, str, resp);
3901	break;	3844	break;
3902	case Rxvt_Color_BD:	3845	case Rxvt_Color_BD:
3903	case URxvt_Color_BD:	3846	case URxvt_Color_BD:
3904	process_color_seq (op, Color_BD, str, resp);	3847	process_color_seq (op, Color_BD, str, resp);
3905	break;	3848	break;
3906	case Rxvt_Color_UL:	3849	case Rxvt_Color_UL:
3907	case URxvt_Color_UL:	3850	case URxvt_Color_UL:
3908	process_color_seq (op, Color_UL, str, resp);	3851	process_color_seq (op, Color_UL, str, resp);
3909	break;	3852	break;
3910	case URxvt_Color_IT:	3853	case URxvt_Color_IT:
3911	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);	3854	process_color_seq (op, Color_IT, str, resp);
3912	break;	3855	break;
3913	#endif	3856	#endif
3914	#if TRANSPARENT && TINTING	3857	#if TRANSPARENT && TINTING
3915	case URxvt_Color_tint:	3858	case URxvt_Color_tint:
3916	process_color_seq (URxvt_Color_tint, Color_tint, str, resp);	3859	process_color_seq (op, Color_tint, str, resp);
		3860
3917	check_our_parents ();	3861	check_our_parents ();
		3862
3918	if (am_transparent)	3863	if (am_transparent)
3919	want_full_refresh = want_refresh = 1;	3864	want_full_refresh = want_refresh = 1;
		3865
3920	break;	3866	break;
3921	#endif	3867	#endif
3922		3868
3923	case Rxvt_Pixmap:	3869	case Rxvt_Pixmap:
		3870	{
3924	if (*str != ';')	3871	if (*str != ';')
3925	{	3872	{
3926	#if XPM_BACKGROUND	3873	#if XPM_BACKGROUND
3927	scale_pixmap (""); /* reset to default scaling */	3874	scale_pixmap (""); /* reset to default scaling */
3928	set_bgPixmap (str); /* change pixmap */	3875	set_bgPixmap (str); /* change pixmap */
3929	scr_touch (true);	3876	scr_touch (true);
3930	#endif	3877	#endif
3931	}	3878	}
3932		3879
		3880	int changed = 0;
		3881
3933	while ((str = strchr (str, ';')) != NULL)	3882	while ((str = strchr (str, ';')) != NULL)
3934	{	3883	{
3935	str++;	3884	str++;
3936	#if XPM_BACKGROUND	3885	#if XPM_BACKGROUND
3937	changed += scale_pixmap (str);	3886	changed += scale_pixmap (str);
3938	#endif	3887	#endif
3939	}	3888	}
3940		3889
3941	if (changed)	3890	if (changed)
3942	{	3891	{
3943	#ifdef XPM_BACKGROUND	3892	#ifdef XPM_BACKGROUND
3944	resize_pixmap ();	3893	resize_pixmap ();
3945	scr_touch (true);	3894	scr_touch (true);
3946	#endif	3895	#endif
3947	}	3896	}
		3897	}
3948	break;	3898	break;
3949		3899
3950	case Rxvt_restoreFG:	3900	case Rxvt_restoreFG:
3951	set_window_color (Color_fg, str);	3901	set_window_color (Color_fg, str);
3952	break;	3902	break;
…		…
3956		3906
3957	case XTerm_logfile:	3907	case XTerm_logfile:
3958	// TODO, when secure mode?	3908	// TODO, when secure mode?
3959	break;	3909	break;
3960		3910
3961	#ifdef MENUBAR
3962	case URxvt_Menu:
3963	if (OPTION (Opt_insecure))
3964	menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3965	break;
3966	#endif
3967	#if 0	3911	#if 0
3968	case Rxvt_dumpscreen: /* no error notices */	3912	case Rxvt_dumpscreen: /* no error notices */
3969	{	3913	{
3970	int fd;	3914	int fd;
3971	if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)	3915	if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
…		…
3997	allocated.push_back ((void *)res);	3941	allocated.push_back ((void *)res);
3998	set_fonts ();	3942	set_fonts ();
3999	}	3943	}
4000	break;	3944	break;
4001		3945
4002	#if ENABLE_FRILLS	3946	case URxvt_version:
		3947	if (query)
		3948	tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
		3949	op,
		3950	rs[Rs_name], VERSION[0], VERSION[2],
		3951	resp);
		3952	break;
		3953
		3954	#if !ENABLE_MINIMAL
4003	case URxvt_locale:	3955	case URxvt_locale:
4004	if (query)	3956	if (query)
4005	tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);	3957	tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
4006	else	3958	else
4007	{	3959	{
4008	set_locale (str);	3960	set_locale (str);
4009	pty.set_utf8_mode (enc_utf8);	3961	pty->set_utf8_mode (enc_utf8);
4010	init_xlocale ();	3962	init_xlocale ();
4011	}	3963	}
4012	break;	3964	break;
4013		3965
4014	case URxvt_view_up:	3966	case URxvt_view_up:
…		…
4067	return state;	4019	return state;
4068	}	4020	}
4069		4021
4070	/* we're not using priv _yet_ */	4022	/* we're not using priv _yet_ */
4071	void	4023	void
4072	rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)	4024	rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4073	{	4025	{
4074	unsigned int i, j;	4026	unsigned int i, j;
4075	int state;	4027	int state;
4076		4028
4077	static const struct	4029	static const struct
…		…
4088	{ 5, PrivMode_rVideo },	4040	{ 5, PrivMode_rVideo },
4089	{ 6, PrivMode_relOrigin },	4041	{ 6, PrivMode_relOrigin },
4090	{ 7, PrivMode_Autowrap },	4042	{ 7, PrivMode_Autowrap },
4091	// 8, bi-directional support mode	4043	// 8, bi-directional support mode
4092	{ 9, PrivMode_MouseX10 },	4044	{ 9, PrivMode_MouseX10 },
4093	#ifdef menuBar_esc
4094	{ menuBar_esc, PrivMode_menuBar },
4095	#endif
4096	// 18, 19 printing-related	4045	// 18, 19 printing-related
4097	{ 25, PrivMode_VisibleCursor },	4046	{ 25, PrivMode_VisibleCursor },
4098	#ifdef scrollBar_esc	4047	#ifdef scrollBar_esc
4099	{ scrollBar_esc, PrivMode_scrollBar },	4048	{ scrollBar_esc, PrivMode_scrollBar },
4100	#endif	4049	#endif
…		…
4195	/* case 8: - auto repeat, can't do on a per window basis */	4144	/* case 8: - auto repeat, can't do on a per window basis */
4196	case 9: /* X10 mouse reporting */	4145	case 9: /* X10 mouse reporting */
4197	if (state) /* orthogonal */	4146	if (state) /* orthogonal */
4198	priv_modes &= ~PrivMode_MouseX11;	4147	priv_modes &= ~PrivMode_MouseX11;
4199	break;	4148	break;
4200	#ifdef menuBar_esc
4201	case menuBar_esc:
4202	#ifdef MENUBAR
4203	map_menuBar (state);
4204	#endif
4205	break;
4206	#endif
4207	#ifdef scrollBar_esc	4149	#ifdef scrollBar_esc
4208	case scrollBar_esc:	4150	case scrollBar_esc:
4209	if (scrollbar_mapping (state))	4151	if (scrollbar_mapping (state))
4210	{	4152	{
4211	resize_all_windows (0, 0, 0);	4153	resize_all_windows (0, 0, 0);
…		…
4381	scr_color (Color_bg, Color_bg);	4323	scr_color (Color_bg, Color_bg);
4382	break;	4324	break;
4383		4325
4384	//case 50: // not variable spacing	4326	//case 50: // not variable spacing
4385		4327
4386	#if ENABLE_FRILLS	4328	#if !ENABLE_MINIMAL
4387	case 90:	4329	case 90:
4388	case 91: /* set bright fg color */	4330	case 91: /* set bright fg color */
4389	case 92:	4331	case 92:
4390	case 93:	4332	case 93:
4391	case 94:	4333	case 94:
…		…
4456	rxvt_term::tt_write (const char *data, unsigned int len)	4398	rxvt_term::tt_write (const char *data, unsigned int len)
4457	{	4399	{
4458	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))	4400	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4459	return;	4401	return;
4460		4402
4461	if (pty.pty < 0)	4403	if (pty->pty < 0)
4462	return;	4404	return;
4463		4405
4464	if (v_buflen == 0)	4406	if (v_buflen == 0)
4465	{	4407	{
4466	ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));	4408	ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4467		4409
4468	if ((unsigned int)written == len)	4410	if ((unsigned int)written == len)
4469	return;	4411	return;
4470		4412
4471	data += written;	4413	data += written;
…		…
4480	pty_ev.set (EVENT_READ | EVENT_WRITE);	4422	pty_ev.set (EVENT_READ | EVENT_WRITE);
4481	}	4423	}
4482		4424
4483	void rxvt_term::pty_write ()	4425	void rxvt_term::pty_write ()
4484	{	4426	{
4485	int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));	4427	int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4486		4428
4487	if (written > 0)	4429	if (written > 0)
4488	{	4430	{
4489	v_buflen -= written;	4431	v_buflen -= written;
4490		4432

Diff Legend

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