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.251 by root, Sun Jan 8 07:55:36 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);
…		…
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;
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;
…		…
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)
…		…
1329		1309
1330	break;	1310	break;
1331		1311
1332	case KeyRelease:	1312	case KeyRelease:
1333	{	1313	{
1334	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755	1314	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1335	KeySym ks;	1315	KeySym keysym;
1336		1316
1337	ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/	1317	keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1338	#endif	1318	#endif
1339		1319
1340	#if ENABLE_FRILLS || ISO_14755	1320	#if ENABLE_FRILLS || ISO_14755
1341	// ISO 14755 support	1321	// ISO 14755 support
1342	if (iso14755buf)	1322	if (iso14755buf)
…		…
1347	# endif	1327	# endif
1348	# if ISO_14755	1328	# if ISO_14755
1349	// iso14755 part 5.2 handling: release time	1329	// iso14755 part 5.2 handling: release time
1350	// first: controls	1330	// first: controls
1351	if ((ev.xkey.state & ControlMask)	1331	if ((ev.xkey.state & ControlMask)
1352	&& ((ks >= 0x40 && ks <= 0x5f)	1332	&& ((keysym >= 0x40 && keysym <= 0x5f)
1353	|| (ks >= 0x61 && ks <= 0x7f)))	1333	|| (keysym >= 0x61 && keysym <= 0x7f)))
1354	{	1334	{
1355	iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);	1335	iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1356	commit_iso14755 ();	1336	commit_iso14755 ();
1357	goto skip_switch;	1337	goto skip_switch;
1358	}	1338	}
1359		1339
1360	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)	1340	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1361	if (i[0] == ks)	1341	if (i[0] == keysym)
1362	{	1342	{
1363	iso14755buf = ISO_14755_51 | i[1];	1343	iso14755buf = ISO_14755_51 | i[1];
1364	commit_iso14755 ();	1344	commit_iso14755 ();
1365	goto skip_switch;	1345	goto skip_switch;
1366	}	1346	}
…		…
1390	iso14755buf = 0;	1370	iso14755buf = 0;
1391	}	1371	}
1392	#endif	1372	#endif
1393		1373
1394	if (ev.xany.window == vt	1374	if (ev.xany.window == vt
1395	&& HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_END)))	1375	&& HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1396	break;	1376	break;
1397		1377
1398	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	1378	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1399	if (!(ev.xkey.state & ControlMask))	1379	if (!(ev.xkey.state & ControlMask))
1400	slip_wheel_ev.stop ();	1380	slip_wheel_ev.stop ();
1401	else if (ks == XK_Control_L || ks == XK_Control_R)	1381	else if (keysym == XK_Control_L || keysym == XK_Control_R)
1402	mouse_slip_wheel_speed = 0;	1382	mouse_slip_wheel_speed = 0;
1403	#endif	1383	#endif
1404	break;	1384	break;
1405	}	1385	}
1406		1386
…		…
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	scr_refresh (refresh_type);	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,
1714	scrollbar_size ());	1670	scrollbar_size ());
1715	scr_refresh (refresh_type);	1671	want_refresh = 1;
1716	refresh_limit = 0;	1672	refresh_limit = 0;
1717	scrollbar_show (1);	1673	scrollbar_show (1);
1718	}	1674	}
1719	break;	1675	break;
1720	}	1676	}
…		…
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;
…		…
2216	slip_wheel_ev.start ();	2166	slip_wheel_ev.start ();
2217	}	2167	}
2218	else	2168	else
2219	{	2169	{
2220	# endif	2170	# endif
2221	# ifdef JUMP_MOUSE_WHEEL
2222	scr_page (v, i);	2171	scr_page (v, i);
2223	scr_refresh (SMOOTH_REFRESH);
2224	scrollbar_show (1);	2172	scrollbar_show (1);
2225	# else
2226	while (i--)
2227	{
2228	scr_page (v, 1);
2229	scr_refresh (SMOOTH_REFRESH);
2230	scrollbar_show (1);
2231	}
2232	# endif
2233	# ifdef MOUSE_SLIP_WHEELING	2173	# ifdef MOUSE_SLIP_WHEELING
2234	}	2174	}
2235	#endif	2175	# endif
2236	}	2176	}
2237	break;	2177	break;
2238	#endif	2178	#endif
2239	}	2179	}
2240	}	2180	}
2241	#ifdef MENUBAR
2242	else if (isMenuBarWindow (ev.window))
2243	menubar_control (ev);
2244	#endif
2245	}	2181	}
2246		2182
2247	#ifdef TRANSPARENT	2183	#ifdef TRANSPARENT
2248	#if TINTING	2184	#if TINTING
2249	/* taken from aterm-0.4.2 */	2185	/* taken from aterm-0.4.2 */
2250		2186
2251	typedef uint32_t RUINT32T;	2187	typedef uint32_t RUINT32T;
2252		2188
2253	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)
2254	{	2190	{
2255	int sh_r, sh_g, sh_b;	2191	int sh_r, sh_g, sh_b;
2256	RUINT32T mask_r, mask_g, mask_b;	2192	RUINT32T mask_r, mask_g, mask_b;
2257	RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;	2193	RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2258	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;	2194	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2259	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;	2195	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2260	int i;	2196	int i;
2261		2197
2262	Visual *visual = display->visual;	2198	Visual *visual = term->visual;
2263		2199
2264	if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;	2200	if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2265		2201
2266	/* for convenience */	2202	/* for convenience */
2267	mask_r = visual->red_mask;	2203	mask_r = visual->red_mask;
…		…
2488	Atom atype;	2424	Atom atype;
2489	unsigned char *prop = NULL;	2425	unsigned char *prop = NULL;
2490	Window root, oldp, *list;	2426	Window root, oldp, *list;
2491	Pixmap rootpixmap = None;	2427	Pixmap rootpixmap = None;
2492	XWindowAttributes wattr, wrootattr;	2428	XWindowAttributes wattr, wrootattr;
2493	dDisp;
2494		2429
2495	pchanged = 0;	2430	pchanged = 0;
2496		2431
2497	if (!OPTION (Opt_transparent))	2432	if (!OPTION (Opt_transparent))
2498	return pchanged; /* Don't try any more */	2433	return pchanged; /* Don't try any more */
2499		2434
2500	XGetWindowAttributes (disp, display->root, &wrootattr);	2435	XGetWindowAttributes (dpy, display->root, &wrootattr);
2501	rootdepth = wrootattr.depth;	2436	rootdepth = wrootattr.depth;
2502		2437
2503	XGetWindowAttributes (disp, parent[0], &wattr);	2438	XGetWindowAttributes (dpy, parent[0], &wattr);
2504		2439
2505	if (rootdepth != wattr.depth)	2440	if (rootdepth != wattr.depth)
2506	{	2441	{
2507	if (am_transparent)	2442	if (am_transparent)
2508	{	2443	{
2509	pchanged = 1;	2444	pchanged = 1;
2510	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2445	XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2511	am_transparent = am_pixmap_trans = 0;	2446	am_transparent = am_pixmap_trans = 0;
2512	}	2447	}
2513		2448
2514	return pchanged; /* Don't try any more */	2449	return pchanged; /* Don't try any more */
2515	}	2450	}
2516		2451
2517	/* 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. */
2518	XSync (disp, False);	2453	XSync (dpy, False);
2519		2454
2520	/*	2455	/*
2521	* Make the frame window set by the window manager have	2456	* Make the frame window set by the window manager have
2522	* the root background. Some window managers put multiple nested frame	2457	* the root background. Some window managers put multiple nested frame
2523	* 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.
2524	*/	2459	*/
2525	i = (xa[XA_XROOTPMAP_ID]	2460	i = (xa[XA_XROOTPMAP_ID]
2526	&& XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],	2461	&& XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2527	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2462	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2528	&nitems, &bytes_after, &prop) == Success);	2463	&nitems, &bytes_after, &prop) == Success);
2529		2464
2530	if (!i || prop == NULL)	2465	if (!i || prop == NULL)
2531	i = (xa[XA_ESETROOT_PMAP_ID]	2466	i = (xa[XA_ESETROOT_PMAP_ID]
2532	&& XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],	2467	&& XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2533	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2468	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2534	&nitems, &bytes_after, &prop) == Success);	2469	&nitems, &bytes_after, &prop) == Success);
2535		2470
2536	if (!i || prop == NULL	2471	if (!i || prop == NULL
2537	#if TINTING	2472	#if TINTING
2538	|| !rs[Rs_color + Color_tint]	2473	|| !ISSET_PIXCOLOR (Color_tint)
2539	#endif	2474	#endif
2540	)	2475	)
2541	have_pixmap = 0;	2476	have_pixmap = 0;
2542	else	2477	else
2543	{	2478	{
…		…
2556	Window cr;	2491	Window cr;
2557	XImage *image;	2492	XImage *image;
2558	GC gc;	2493	GC gc;
2559	XGCValues gcvalue;	2494	XGCValues gcvalue;
2560		2495
2561	XTranslateCoordinates (disp, parent[0], display->root,	2496	XTranslateCoordinates (dpy, parent[0], display->root,
2562	0, 0, &sx, &sy, &cr);	2497	0, 0, &sx, &sy, &cr);
2563	nw = (unsigned int)szHint.width;	2498	nw = (unsigned int)szHint.width;
2564	nh = (unsigned int)szHint.height;	2499	nh = (unsigned int)szHint.height;
2565	nx = ny = 0;	2500	nx = ny = 0;
2566		2501
…		…
2579	}	2514	}
2580		2515
2581	min_it (nw, (unsigned int) (wrootattr.width - sx));	2516	min_it (nw, (unsigned int) (wrootattr.width - sx));
2582	min_it (nh, (unsigned int) (wrootattr.height - sy));	2517	min_it (nh, (unsigned int) (wrootattr.height - sy));
2583		2518
2584	XSync (disp, False);	2519	XSync (dpy, False);
2585	allowedxerror = -1;	2520	allowedxerror = -1;
2586	image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);	2521	image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2587		2522
2588	/* XXX: handle BadMatch - usually because we're outside the pixmap */	2523	/* XXX: handle BadMatch - usually because we're outside the pixmap */
2589	/* XXX: may need a delay here? */	2524	/* XXX: may need a delay here? */
2590	allowedxerror = 0;	2525	allowedxerror = 0;
2591		2526
…		…
2594	if (am_transparent && am_pixmap_trans)	2529	if (am_transparent && am_pixmap_trans)
2595	{	2530	{
2596	pchanged = 1;	2531	pchanged = 1;
2597	if (pixmap != None)	2532	if (pixmap != None)
2598	{	2533	{
2599	XFreePixmap (disp, pixmap);	2534	XFreePixmap (dpy, pixmap);
2600	pixmap = None;	2535	pixmap = None;
2601	}	2536	}
2602	}	2537	}
2603		2538
2604	am_pixmap_trans = 0;	2539	am_pixmap_trans = 0;
2605	}	2540	}
2606	else	2541	else
2607	{	2542	{
2608	if (pixmap != None)	2543	if (pixmap != None)
2609	XFreePixmap (disp, pixmap);	2544	XFreePixmap (dpy, pixmap);
2610		2545
2611	#if TINTING	2546	#if TINTING
2612	if (ISSET_PIXCOLOR (Color_tint))	2547	if (ISSET_PIXCOLOR (Color_tint))
2613	{	2548	{
2614	unsigned short rm, gm, bm;
2615	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;	2549	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2616		2550
		2551	rgba c;
2617	pix_colors_focused[Color_tint].get (display, rm, gm, bm);	2552	pix_colors_focused [Color_tint].get (c);
2618		2553
2619	ShadeXImage (display, image, shade, rm, gm, bm);	2554	ShadeXImage (this, image, shade, c.r, c.g, c.b);
2620	}	2555	}
2621	#endif	2556	#endif
2622		2557
2623	pixmap = XCreatePixmap (disp, vt,	2558	pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2624	szHint.width, szHint.height, image->depth);
2625	gc = XCreateGC (disp, vt, 0UL, &gcvalue);	2559	gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2626	XPutImage (disp, pixmap, gc, image, 0, 0,	2560	XPutImage (dpy, pixmap, gc, image, 0, 0,
2627	nx, ny, image->width, image->height);	2561	nx, ny, image->width, image->height);
2628	XFreeGC (disp, gc);	2562	XFreeGC (dpy, gc);
2629	XDestroyImage (image);	2563	XDestroyImage (image);
2630	XSetWindowBackgroundPixmap (disp, parent[0], pixmap);	2564	XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2631	XClearWindow (disp, parent[0]);	2565	XClearWindow (dpy, parent[0]);
2632		2566
2633	if (!am_transparent || !am_pixmap_trans)	2567	if (!am_transparent || !am_pixmap_trans)
2634	pchanged = 1;	2568	pchanged = 1;
2635		2569
2636	am_transparent = am_pixmap_trans = 1;	2570	am_transparent = am_pixmap_trans = 1;
2637	}	2571	}
2638	}	2572	}
2639		2573
2640	if (am_pixmap_trans)	2574	if (am_pixmap_trans)
2641	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2575	XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2642	else	2576	else
2643	{	2577	{
2644	unsigned int n;	2578	unsigned int n;
2645	/*	2579	/*
2646	* InheritPixmap transparency	2580	* InheritPixmap transparency
2647	*/	2581	*/
2648	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2582	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2649	{	2583	{
2650	oldp = parent[i];	2584	oldp = parent[i];
2651	XQueryTree (disp, parent[i - 1], &root,	2585	XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2652	&parent[i], &list, &n);
2653	XFree (list);	2586	XFree (list);
2654		2587
2655	if (parent[i] == display->root)	2588	if (parent[i] == display->root)
2656	{	2589	{
2657	if (oldp != None)	2590	if (oldp != None)
…		…
2665	}	2598	}
2666		2599
2667	n = 0;	2600	n = 0;
2668		2601
2669	if (pchanged)	2602	if (pchanged)
2670	{
2671	for (; n < (unsigned int)i; n++)	2603	for (; n < (unsigned int)i; n++)
2672	{	2604	{
2673	XGetWindowAttributes (disp, parent[n], &wattr);	2605	XGetWindowAttributes (dpy, parent[n], &wattr);
		2606
2674	if (wattr.depth != rootdepth || wattr.c_class == InputOnly)	2607	if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2675	{	2608	{
2676	n = (int) (sizeof (parent) / sizeof (Window)) + 1;	2609	n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2677	break;	2610	break;
2678	}	2611	}
2679	}	2612	}
2680	}
2681		2613
2682	if (n > (int) (sizeof (parent) / sizeof (parent[0])))	2614	if (n > (sizeof (parent) / sizeof (parent[0])))
2683	{	2615	{
2684	XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);	2616	XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2685	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2617	XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2686	am_transparent = 0;	2618	am_transparent = 0;
2687	/* XXX: also turn off Opt_transparent? */	2619	/* XXX: also turn off Opt_transparent? */
2688	}	2620	}
2689	else	2621	else
2690	{	2622	{
2691	#if WAIT_FOR_WM
2692	/* wait (an arbitrary period) for the WM to do its thing
2693	* needed for fvwm2.2.2 (and before?) */
2694	sleep (1);
2695	#endif
2696	for (n = 0; n < (unsigned int)i; n++)	2623	for (n = 0; n < (unsigned int)i; n++)
2697	{	2624	{
2698	XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);	2625	XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2699	XClearWindow (disp, parent[n]);	2626	XClearWindow (dpy, parent[n]);
2700	}	2627	}
2701		2628
2702	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2629	XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2703	am_transparent = 1;	2630	am_transparent = 1;
2704	}	2631	}
2705		2632
2706	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2633	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2707	parent[i] = None;	2634	parent[i] = None;
2708	}	2635	}
2709		2636
2710	if (scrollBar.win)	2637	if (scrollBar.win)
2711	{	2638	{
2712	XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);	2639	XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2713	scrollBar.setIdle ();	2640	scrollBar.setIdle ();
2714	scrollbar_show (0);	2641	scrollbar_show (0);
2715	}	2642	}
2716		2643
2717	if (am_transparent)	2644	if (am_transparent)
…		…
2792	}	2719	}
2793		2720
2794	// scr_add_lines only works for nlines <= nrow - 1.	2721	// scr_add_lines only works for nlines <= nrow - 1.
2795	if (nlines >= nrow - 1)	2722	if (nlines >= nrow - 1)
2796	{	2723	{
		2724	if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2797	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))))
2798	scr_add_lines (buf, str - buf, nlines);	2726	scr_add_lines (buf, str - buf, nlines);
2799		2727
2800	nlines = 0;	2728	nlines = 0;
2801	str = buf;	2729	str = buf;
2802	eol = str + min (ncol, UBUFSIZ);	2730	eol = str + min (ncol, UBUFSIZ);
…		…
2817		2745
2818	seq_begin = cmdbuf_ptr;	2746	seq_begin = cmdbuf_ptr;
2819	ch = next_char ();	2747	ch = next_char ();
2820	}	2748	}
2821		2749
		2750	if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2822	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))))
2823	scr_add_lines (buf, str - buf, nlines);	2752	scr_add_lines (buf, str - buf, nlines);
2824		2753
2825	/*	2754	/*
2826	* 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
2827	* 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.
…		…
2833	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)	2762	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2834	refresh_limit++;	2763	refresh_limit++;
2835	else	2764	else
2836	{	2765	{
2837	flag = true;	2766	flag = true;
2838	scr_refresh (refresh_type);	2767	scr_refresh ();
2839	flush_ev.stop ();	2768	want_refresh = 1;
2840	}	2769	}
2841	}	2770	}
2842		2771
2843	}	2772	}
2844	else	2773	else
…		…
2861	return flag;	2790	return flag;
2862	}	2791	}
2863		2792
2864	// read the next character	2793	// read the next character
2865	wchar_t	2794	wchar_t
2866	rxvt_term::next_char ()	2795	rxvt_term::next_char () NOTHROW
2867	{	2796	{
2868	while (cmdbuf_ptr < cmdbuf_endp)	2797	while (cmdbuf_ptr < cmdbuf_endp)
2869	{	2798	{
2870	// assume 7-bit to be ascii ALWAYS	2799	// assume 7-bit to be ascii ALWAYS
2871	if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)	2800	if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
…		…
2892	return NOCHAR;	2821	return NOCHAR;
2893	}	2822	}
2894		2823
2895	// read the next octet	2824	// read the next octet
2896	uint32_t	2825	uint32_t
2897	rxvt_term::next_octet ()	2826	rxvt_term::next_octet () NOTHROW
2898	{	2827	{
2899	return cmdbuf_ptr < cmdbuf_endp	2828	return cmdbuf_ptr < cmdbuf_endp
2900	? (unsigned char)*cmdbuf_ptr++	2829	? (unsigned char)*cmdbuf_ptr++
2901	: NOCHAR;	2830	: NOCHAR;
2902	}	2831	}
		2832
		2833	static class out_of_input out_of_input;
2903		2834
2904	/* rxvt_cmd_getc () - Return next input character */	2835	/* rxvt_cmd_getc () - Return next input character */
2905	/*	2836	/*
2906	* Return the next input character after first passing any keyboard input	2837	* Return the next input character after first passing any keyboard input
2907	* to the command.	2838	* to the command.
2908	*/	2839	*/
2909	wchar_t	2840	wchar_t
2910	rxvt_term::cmd_getc ()	2841	rxvt_term::cmd_getc () THROW ((class out_of_input))
2911	{	2842	{
2912	wchar_t c = next_char ();	2843	wchar_t c = next_char ();
2913		2844
2914	if (c == NOCHAR)	2845	if (c == NOCHAR)
2915	throw out_of_input;	2846	throw out_of_input;
2916		2847
2917	return c;	2848	return c;
2918	}	2849	}
2919		2850
2920	uint32_t	2851	uint32_t
2921	rxvt_term::cmd_get8 ()	2852	rxvt_term::cmd_get8 () THROW ((class out_of_input))
2922	{	2853	{
2923	uint32_t c = next_octet ();	2854	uint32_t c = next_octet ();
2924		2855
2925	if (c == NOCHAR)	2856	if (c == NOCHAR)
2926	throw out_of_input;	2857	throw out_of_input;
…		…
3164	scr_charset_set (2, (unsigned int)cmd_getc ());	3095	scr_charset_set (2, (unsigned int)cmd_getc ());
3165	break;	3096	break;
3166	case '+':	3097	case '+':
3167	scr_charset_set (3, (unsigned int)cmd_getc ());	3098	scr_charset_set (3, (unsigned int)cmd_getc ());
3168	break;	3099	break;
3169	#if ENABLE_FRILLS	3100	#if !ENABLE_MINIMAL
3170	case '6':	3101	case '6':
3171	scr_backindex ();	3102	scr_backindex ();
3172	break;	3103	break;
3173	#endif	3104	#endif
3174	case '7':	3105	case '7':
3175	scr_cursor (SAVE);	3106	scr_cursor (SAVE);
3176	break;	3107	break;
3177	case '8':	3108	case '8':
3178	scr_cursor (RESTORE);	3109	scr_cursor (RESTORE);
3179	break;	3110	break;
3180	#if ENABLE_FRILLS	3111	#if !ENABLE_MINIMAL
3181	case '9':	3112	case '9':
3182	scr_forwardindex ();	3113	scr_forwardindex ();
3183	break;	3114	break;
3184	#endif	3115	#endif
3185	case '=':	3116	case '=':
…		…
3347	ndef = get_byte_array_bit (csi_defaults, i);	3278	ndef = get_byte_array_bit (csi_defaults, i);
3348	for (p = 0; p < nargs; p++)	3279	for (p = 0; p < nargs; p++)
3349	if (arg[p] == -1)	3280	if (arg[p] == -1)
3350	arg[p] = ndef;	3281	arg[p] = ndef;
3351		3282
3352	#ifdef DEBUG_CMD
3353	fprintf (stderr, "CSI ");
3354	for (p = 0; p < nargs; p++)
3355	fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3356	fprintf (stderr, "%c\n", ch);
3357	#endif
3358
3359	/*	3283	/*
3360	* private mode handling	3284	* private mode handling
3361	*/	3285	*/
3362	if (priv)	3286	if (priv)
3363	{	3287	{
3364	switch (priv)	3288	switch (priv)
3365	{	3289	{
3366	case '>':	3290	case '>':
3367	if (ch == CSI_DA) /* secondary device attributes */	3291	if (ch == CSI_DA) /* secondary device attributes */
3368	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	}
3369	break;	3302	break;
3370	case '?':	3303	case '?':
3371	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')	3304	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3372	process_terminal_mode (ch, priv, nargs, arg);	3305	process_terminal_mode (ch, priv, nargs, arg);
3373	break;	3306	break;
…		…
3576	break;	3509	break;
3577	case CSI_75:	3510	case CSI_75:
3578	scr_cursor (RESTORE);	3511	scr_cursor (RESTORE);
3579	break;	3512	break;
3580		3513
3581	#if ENABLE_FRILLS	3514	#if !ENABLE_MINIMAL
3582	case CSI_74:	3515	case CSI_74:
3583	process_window_ops (arg, nargs);	3516	process_window_ops (arg, nargs);
3584	break;	3517	break;
3585	#endif	3518	#endif
3586		3519
…		…
3593	break;	3526	break;
3594	}	3527	}
3595	}	3528	}
3596	/*}}} */	3529	/*}}} */
3597		3530
3598	#if ENABLE_FRILLS	3531	#if !ENABLE_MINIMAL
3599	/* ARGSUSED */	3532	/* ARGSUSED */
3600	void	3533	void
3601	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3534	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3602	{	3535	{
3603	int x, y;	3536	int x, y;
3604	XWindowAttributes wattr;	3537	XWindowAttributes wattr;
3605	Window wdummy;	3538	Window wdummy;
3606	dDisp;	3539
		3540	dLocal (Display *, dpy);
3607		3541
3608	if (nargs == 0)	3542	if (nargs == 0)
3609	return;	3543	return;
3610		3544
3611	switch (args[0])	3545	switch (args[0])
3612	{	3546	{
3613	/*	3547	/*
3614	* commands	3548	* commands
3615	*/	3549	*/
3616	case 1: /* deiconify window */	3550	case 1: /* deiconify window */
3617	XMapWindow (disp, parent[0]);	3551	XMapWindow (dpy, parent[0]);
3618	break;	3552	break;
3619	case 2: /* iconify window */	3553	case 2: /* iconify window */
3620	XIconifyWindow (disp, parent[0], display->screen);	3554	XIconifyWindow (dpy, parent[0], display->screen);
3621	break;	3555	break;
3622	case 3: /* set position (pixels) */	3556	case 3: /* set position (pixels) */
3623	XMoveWindow (disp, parent[0], args[1], args[2]);	3557	XMoveWindow (dpy, parent[0], args[1], args[2]);
3624	break;	3558	break;
3625	case 4: /* set size (pixels) */	3559	case 4: /* set size (pixels) */
3626	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3560	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3627	break;	3561	break;
3628	case 5: /* raise window */	3562	case 5: /* raise window */
3629	XRaiseWindow (disp, parent[0]);	3563	XRaiseWindow (dpy, parent[0]);
3630	break;	3564	break;
3631	case 6: /* lower window */	3565	case 6: /* lower window */
3632	XLowerWindow (disp, parent[0]);	3566	XLowerWindow (dpy, parent[0]);
3633	break;	3567	break;
3634	case 7: /* refresh window */	3568	case 7: /* refresh window */
3635	scr_touch (true);	3569	scr_touch (true);
3636	break;	3570	break;
3637	case 8: /* set size (chars) */	3571	case 8: /* set size (chars) */
…		…
3644	if (args[0] >= 24) /* set height (chars) */	3578	if (args[0] >= 24) /* set height (chars) */
3645	set_widthheight ((unsigned int)width,	3579	set_widthheight ((unsigned int)width,
3646	(unsigned int) (args[1] * fheight));	3580	(unsigned int) (args[1] * fheight));
3647	break;	3581	break;
3648		3582
3649
3650	/*	3583	/*
3651	* reports - some output format copied from XTerm	3584	* reports - some output format copied from XTerm
3652	*/	3585	*/
3653	case 11: /* report window state */	3586	case 11: /* report window state */
3654	XGetWindowAttributes (disp, parent[0], &wattr);	3587	XGetWindowAttributes (dpy, parent[0], &wattr);
3655	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3588	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3656	break;	3589	break;
3657	case 13: /* report window position */	3590	case 13: /* report window position */
3658	XGetWindowAttributes (disp, parent[0], &wattr);	3591	XGetWindowAttributes (dpy, parent[0], &wattr);
3659	XTranslateCoordinates (disp, parent[0], wattr.root,	3592	XTranslateCoordinates (dpy, parent[0], wattr.root,
3660	-wattr.border_width, -wattr.border_width,	3593	-wattr.border_width, -wattr.border_width,
3661	&x, &y, &wdummy);	3594	&x, &y, &wdummy);
3662	tt_printf ("\033[3;%d;%dt", x, y);	3595	tt_printf ("\033[3;%d;%dt", x, y);
3663	break;	3596	break;
3664	case 14: /* report window size (pixels) */	3597	case 14: /* report window size (pixels) */
3665	XGetWindowAttributes (disp, parent[0], &wattr);	3598	XGetWindowAttributes (dpy, parent[0], &wattr);
3666	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3599	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3667	break;	3600	break;
3668	case 18: /* report text area size (chars) */	3601	case 18: /* report text area size (chars) */
3669	tt_printf ("\033[8;%d;%dt", nrow, ncol);	3602	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3670	break;	3603	break;
…		…
3672	tt_printf ("\033[9;%d;%dt", nrow, ncol);	3605	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3673	break;	3606	break;
3674	case 20: /* report icon label */	3607	case 20: /* report icon label */
3675	{	3608	{
3676	char *s;	3609	char *s;
3677	XGetIconName (disp, parent[0], &s);	3610	XGetIconName (dpy, parent[0], &s);
3678	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 */
3679	XFree (s);	3612	XFree (s);
3680	}	3613	}
3681	break;	3614	break;
3682	case 21: /* report window title */	3615	case 21: /* report window title */
3683	{	3616	{
3684	char *s;	3617	char *s;
3685	XFetchName (disp, parent[0], &s);	3618	XFetchName (dpy, parent[0], &s);
3686	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 */
3687	XFree (s);	3620	XFree (s);
3688	}	3621	}
3689	break;	3622	break;
3690	}	3623	}
…		…
3791	void	3724	void
3792	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)
3793	{	3726	{
3794	if (str[0] == '?' && !str[1])	3727	if (str[0] == '?' && !str[1])
3795	{	3728	{
3796	unsigned short r, g, b;	3729	rgba c;
3797	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
3798	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);
3799	}	3738	}
3800	else	3739	else
3801	set_window_color (color, str);	3740	set_window_color (color, str);
3802	}	3741	}
3803		3742
…		…
3805	* XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)	3744	* XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3806	*/	3745	*/
3807	void	3746	void
3808	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)
3809	{	3748	{
3810	int changed = 0;
3811	int color;	3749	int color;
3812	char *buf, *name;	3750	char *buf, *name;
3813	bool query = str[0] == '?' && !str[1];	3751	bool query = str[0] == '?' && !str[1];
3814	int saveop = op;	3752	int saveop = op;
3815	dDisp;	3753
		3754	dLocal (Display *, dpy);
3816		3755
3817	assert (str != NULL);	3756	assert (str != NULL);
3818	switch (op)	3757	switch (op)
3819	{	3758	{
3820	case XTerm_name:	3759	case XTerm_name:
…		…
3836	unsigned long bytes_after;	3775	unsigned long bytes_after;
3837	unsigned char *value = 0;	3776	unsigned char *value = 0;
3838	const char *str = "";	3777	const char *str = "";
3839		3778
3840	if (prop	3779	if (prop
3841	&& XGetWindowProperty (disp, parent[0],	3780	&& XGetWindowProperty (dpy, parent[0],
3842	prop, 0, 1<<16, 0, AnyPropertyType,	3781	prop, 0, 1<<16, 0, AnyPropertyType,
3843	&actual_type, &actual_format,	3782	&actual_type, &actual_format,
3844	&nitems, &bytes_after, &value) == Success	3783	&nitems, &bytes_after, &value) == Success
3845	&& actual_type != None	3784	&& actual_type != None
3846	&& actual_format == 8)	3785	&& actual_format == 8)
3847	str = (const char *)(value);	3786	str = (const char *)(value);
3848		3787
3849	tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);	3788	tt_printf ("\033]%d;%s%c", op, str, resp);
3850		3789
3851	XFree (value);	3790	XFree (value);
3852	}	3791	}
3853	else	3792	else
3854	{	3793	{
…		…
3858	{	3797	{
3859	*eq = 0;	3798	*eq = 0;
3860	set_utf8_property (display->atom (str), eq + 1);	3799	set_utf8_property (display->atom (str), eq + 1);
3861	}	3800	}
3862	else	3801	else
3863	XDeleteProperty (disp, parent[0],	3802	XDeleteProperty (dpy, parent[0],
3864	display->atom (str));	3803	display->atom (str));
3865	}	3804	}
3866	break;	3805	break;
3867		3806
3868	case XTerm_Color:	3807	case XTerm_Color:
…		…
3870	{	3809	{
3871	if ((name = strchr (buf, ';')) == NULL)	3810	if ((name = strchr (buf, ';')) == NULL)
3872	break;	3811	break;
3873		3812
3874	*name++ = '\0';	3813	*name++ = '\0';
3875	color = atoi (buf);	3814	color = atoi (buf) + minCOLOR;
3876		3815
3877	if (color < 0 || color >= TOTAL_COLORS)	3816	if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3878	break;	3817	break;
3879		3818
3880	if ((buf = strchr (name, ';')) != NULL)	3819	if ((buf = strchr (name, ';')) != NULL)
3881	*buf++ = '\0';	3820	*buf++ = '\0';
3882		3821
3883	if (name[0] == '?' && !name[1])	3822	process_color_seq (op, color, name, resp);
3884	{
3885	unsigned short r, g, b;
3886	pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3887	tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3888	}
3889	else
3890	set_window_color (color + minCOLOR, name);
3891	}	3823	}
3892	break;	3824	break;
3893	case XTerm_Color00:	3825	case XTerm_Color00:
3894	process_color_seq (XTerm_Color00, Color_fg, str, resp);	3826	process_color_seq (op, Color_fg, str, resp);
3895	break;	3827	break;
3896	case XTerm_Color01:	3828	case XTerm_Color01:
3897	process_color_seq (XTerm_Color00, Color_bg, str, resp);	3829	process_color_seq (op, Color_bg, str, resp);
3898	break;	3830	break;
3899	#ifndef NO_CURSORCOLOR	3831	#ifndef NO_CURSORCOLOR
3900	case XTerm_Color_cursor:	3832	case XTerm_Color_cursor:
3901	process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);	3833	process_color_seq (op, Color_cursor, str, resp);
3902	break;	3834	break;
3903	#endif	3835	#endif
3904	case XTerm_Color_pointer_fg:	3836	case XTerm_Color_pointer_fg:
3905	process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);	3837	process_color_seq (op, Color_pointer_fg, str, resp);
3906	break;	3838	break;
3907	case XTerm_Color_pointer_bg:	3839	case XTerm_Color_pointer_bg:
3908	process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);	3840	process_color_seq (op, Color_pointer_bg, str, resp);
3909	break;	3841	break;
3910	#ifndef NO_BOLD_UNDERLINE_REVERSE	3842	#ifndef NO_BOLD_UNDERLINE_REVERSE
3911	case XTerm_Color_BD:
3912	process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3913	break;
3914	case XTerm_Color_UL:
3915	process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3916	break;
3917	case XTerm_Color_RV:	3843	case XTerm_Color_RV:
3918	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);
3919	break;	3853	break;
3920	case URxvt_Color_IT:	3854	case URxvt_Color_IT:
3921	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);	3855	process_color_seq (op, Color_IT, str, resp);
3922	break;	3856	break;
3923	#endif	3857	#endif
3924	#if TRANSPARENT && TINTING	3858	#if TRANSPARENT && TINTING
3925	case URxvt_Color_tint:	3859	case URxvt_Color_tint:
3926	process_color_seq (URxvt_Color_tint, Color_tint, str, resp);	3860	process_color_seq (op, Color_tint, str, resp);
		3861
3927	check_our_parents ();	3862	check_our_parents ();
		3863
3928	if (am_transparent)	3864	if (am_transparent)
3929	want_full_refresh = want_refresh = 1;	3865	want_full_refresh = want_refresh = 1;
3930	break;
3931	#endif
3932		3866
		3867	break;
		3868	#endif
		3869
3933	case XTerm_Pixmap:	3870	case Rxvt_Pixmap:
		3871	{
3934	if (*str != ';')	3872	if (*str != ';')
3935	{	3873	{
3936	#if XPM_BACKGROUND	3874	#if XPM_BACKGROUND
3937	scale_pixmap (""); /* reset to default scaling */	3875	scale_pixmap (""); /* reset to default scaling */
3938	set_bgPixmap (str); /* change pixmap */	3876	set_bgPixmap (str); /* change pixmap */
3939	#endif
3940	scr_touch (true);	3877	scr_touch (true);
		3878	#endif
3941	}	3879	}
		3880
		3881	int changed = 0;
		3882
3942	while ((str = strchr (str, ';')) != NULL)	3883	while ((str = strchr (str, ';')) != NULL)
3943	{	3884	{
3944	str++;	3885	str++;
3945	#if XPM_BACKGROUND	3886	#if XPM_BACKGROUND
3946	changed += scale_pixmap (str);	3887	changed += scale_pixmap (str);
3947	#endif	3888	#endif
3948	}	3889	}
3949		3890
3950	if (changed)	3891	if (changed)
3951	{	3892	{
3952	#ifdef XPM_BACKGROUND	3893	#ifdef XPM_BACKGROUND
3953	resize_pixmap ();	3894	resize_pixmap ();
3954	#endif
3955	scr_touch (true);	3895	scr_touch (true);
		3896	#endif
3956	}	3897	}
		3898	}
3957	break;	3899	break;
3958		3900
3959	case XTerm_restoreFG:	3901	case Rxvt_restoreFG:
3960	set_window_color (Color_fg, str);	3902	set_window_color (Color_fg, str);
3961	break;	3903	break;
3962	case XTerm_restoreBG:	3904	case Rxvt_restoreBG:
3963	set_window_color (Color_bg, str);	3905	set_window_color (Color_bg, str);
3964	break;	3906	break;
3965		3907
3966	case XTerm_logfile:	3908	case XTerm_logfile:
3967	// TODO, when secure mode?	3909	// TODO, when secure mode?
3968	break;	3910	break;
3969		3911
3970	#ifdef MENUBAR
3971	case URxvt_Menu:
3972	if (OPTION (Opt_insecure))
3973	menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3974	break;
3975	#endif
3976	#if 0	3912	#if 0
3977	case XTerm_dumpscreen: /* no error notices */	3913	case Rxvt_dumpscreen: /* no error notices */
3978	{	3914	{
3979	int fd;	3915	int fd;
3980	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)
3981	{	3917	{
3982	scr_dump (fd);	3918	scr_dump (fd);
…		…
4006	allocated.push_back ((void *)res);	3942	allocated.push_back ((void *)res);
4007	set_fonts ();	3943	set_fonts ();
4008	}	3944	}
4009	break;	3945	break;
4010		3946
4011	#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
4012	case URxvt_locale:	3956	case URxvt_locale:
4013	if (query)	3957	if (query)
4014	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);
4015	else	3959	else
4016	{	3960	{
4017	set_locale (str);	3961	set_locale (str);
4018	pty.set_utf8_mode (enc_utf8);	3962	pty->set_utf8_mode (enc_utf8);
4019	init_xlocale ();	3963	init_xlocale ();
4020	}	3964	}
4021	break;	3965	break;
4022		3966
4023	case URxvt_view_up:	3967	case URxvt_view_up:
…		…
4076	return state;	4020	return state;
4077	}	4021	}
4078		4022
4079	/* we're not using priv _yet_ */	4023	/* we're not using priv _yet_ */
4080	void	4024	void
4081	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)
4082	{	4026	{
4083	unsigned int i, j;	4027	unsigned int i, j;
4084	int state;	4028	int state;
4085		4029
4086	static const struct	4030	static const struct
…		…
4097	{ 5, PrivMode_rVideo },	4041	{ 5, PrivMode_rVideo },
4098	{ 6, PrivMode_relOrigin },	4042	{ 6, PrivMode_relOrigin },
4099	{ 7, PrivMode_Autowrap },	4043	{ 7, PrivMode_Autowrap },
4100	// 8, bi-directional support mode	4044	// 8, bi-directional support mode
4101	{ 9, PrivMode_MouseX10 },	4045	{ 9, PrivMode_MouseX10 },
4102	#ifdef menuBar_esc
4103	{ menuBar_esc, PrivMode_menuBar },
4104	#endif
4105	// 18, 19 printing-related	4046	// 18, 19 printing-related
4106	{ 25, PrivMode_VisibleCursor },	4047	{ 25, PrivMode_VisibleCursor },
4107	#ifdef scrollBar_esc	4048	#ifdef scrollBar_esc
4108	{ scrollBar_esc, PrivMode_scrollBar },	4049	{ scrollBar_esc, PrivMode_scrollBar },
4109	#endif	4050	#endif
…		…
4204	/* 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 */
4205	case 9: /* X10 mouse reporting */	4146	case 9: /* X10 mouse reporting */
4206	if (state) /* orthogonal */	4147	if (state) /* orthogonal */
4207	priv_modes &= ~PrivMode_MouseX11;	4148	priv_modes &= ~PrivMode_MouseX11;
4208	break;	4149	break;
4209	#ifdef menuBar_esc
4210	case menuBar_esc:
4211	#ifdef MENUBAR
4212	map_menuBar (state);
4213	#endif
4214	break;
4215	#endif
4216	#ifdef scrollBar_esc	4150	#ifdef scrollBar_esc
4217	case scrollBar_esc:	4151	case scrollBar_esc:
4218	if (scrollbar_mapping (state))	4152	if (scrollbar_mapping (state))
4219	{	4153	{
4220	resize_all_windows (0, 0, 0);	4154	resize_all_windows (0, 0, 0);
…		…
4390	scr_color (Color_bg, Color_bg);	4324	scr_color (Color_bg, Color_bg);
4391	break;	4325	break;
4392		4326
4393	//case 50: // not variable spacing	4327	//case 50: // not variable spacing
4394		4328
4395	#if ENABLE_FRILLS	4329	#if !ENABLE_MINIMAL
4396	case 90:	4330	case 90:
4397	case 91: /* set bright fg color */	4331	case 91: /* set bright fg color */
4398	case 92:	4332	case 92:
4399	case 93:	4333	case 93:
4400	case 94:	4334	case 94:
…		…
4462	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT	4396	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4463		4397
4464	void	4398	void
4465	rxvt_term::tt_write (const char *data, unsigned int len)	4399	rxvt_term::tt_write (const char *data, unsigned int len)
4466	{	4400	{
4467	if (pty.pty < 0)	4401	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4468	return;	4402	return;
4469		4403
		4404	if (pty->pty < 0)
		4405	return;
		4406
4470	if (v_buflen == 0)	4407	if (v_buflen == 0)
4471	{	4408	{
4472	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));
4473		4410
4474	if ((unsigned int)written == len)	4411	if ((unsigned int)written == len)
4475	return;	4412	return;
4476		4413
4477	data += written;	4414	data += written;
…		…
4486	pty_ev.set (EVENT_READ | EVENT_WRITE);	4423	pty_ev.set (EVENT_READ | EVENT_WRITE);
4487	}	4424	}
4488		4425
4489	void rxvt_term::pty_write ()	4426	void rxvt_term::pty_write ()
4490	{	4427	{
4491	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));
4492		4429
4493	if (written > 0)	4430	if (written > 0)
4494	{	4431	{
4495	v_buflen -= written;	4432	v_buflen -= written;
4496		4433

Diff Legend

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