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

Diff Legend

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