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.249 by root, Sun Jan 8 01:02:15 2006 UTC vs.
Revision 1.303 by root, Tue Jan 31 21:47:56 2006 UTC

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

Diff Legend

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