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.301 by root, Tue Jan 31 21:23:13 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
65	/*----------------------------------------------------------------------*/	60	/*----------------------------------------------------------------------*/
66		61
67	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)	62	#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		63
72	#if ENABLE_FRILLS || ISO_14755	64	#if ENABLE_FRILLS || ISO_14755
73		65
74	#define ISO_14755_STARTED 0x80000000UL	66	#define ISO_14755_STARTED 0x80000000UL
75	#define ISO_14755_51 0x40000000UL // basic (section 5.1)	67	#define ISO_14755_51 0x40000000UL // basic (section 5.1)
…		…
147	|| !IN_RANGE_EXC (y, 0, nrow))	139	|| !IN_RANGE_EXC (y, 0, nrow))
148	return;	140	return;
149		141
150	for (;;)	142	for (;;)
151	{	143	{
152	const line_t &l = ROW(y - view_start);	144	const line_t &l = ROW(y + view_start);
153		145
154	text_t t = l.t[x];	146	text_t t = l.t[x];
155		147
156	if (t != NOCHAR || !x)	148	if (t != NOCHAR || !x)
157	{	149	{
…		…
230	# if !UNICODE3	222	# if !UNICODE3
231	if (ch >= 0x10000)	223	if (ch >= 0x10000)
232	ch = 0xfffd;	224	ch = 0xfffd;
233	# endif	225	# endif
234	scr_overlay_set (11, y, ch, r);	226	scr_overlay_set (11, y, ch, r);
		227
		228	if (WCWIDTH (ch) >= 2)
235	scr_overlay_set (12, y, NOCHAR, r);	229	scr_overlay_set (12, y, NOCHAR, r);
236	}	230	}
237		231
		232	// {
		233	// char buf[4+4+3+1];
		234	// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
		235	// scr_overlay_set (0, 0, buf);
		236	// }
238	scr_overlay_set (0, len , attr);	237	scr_overlay_set (0, len , attr);
239	scr_overlay_set (0, len + 1, fname);	238	scr_overlay_set (0, len + 1, fname);
240		239
241	free (fname);	240	free (fname);
242		241
…		…
302	rxvt_term::lookup_key (XKeyEvent &ev)	301	rxvt_term::lookup_key (XKeyEvent &ev)
303	{	302	{
304	int ctrl, meta, shft, len;	303	int ctrl, meta, shft, len;
305	unsigned int newlen;	304	unsigned int newlen;
306	KeySym keysym;	305	KeySym keysym;
307	#ifdef DEBUG_CMD
308	static int debug_key = 1; /* accessible by a debugger only */
309	#endif
310	int valid_keysym;	306	int valid_keysym;
311	char kbuf[KBUFSZ];	307	char kbuf[KBUFSZ];
312		308
313	/*	309	/*
314	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an	310	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
…		…
443	scr_move_to (0, 1);	439	scr_move_to (0, 1);
444	return;	440	return;
445	}	441	}
446	else if (keysym == XK_End)	442	else if (keysym == XK_End)
447	{	443	{
448	scr_move_to (1, 0);	444	scr_move_to (1, 1);
449	return;	445	return;
450	}	446	}
451	}	447	}
452	#endif	448	#endif
453	}	449	}
…		…
464	{	460	{
465	switch (keysym)	461	switch (keysym)
466	{	462	{
467	/* normal XTerm key bindings */	463	/* normal XTerm key bindings */
468	case XK_Insert: /* Shift+Insert = paste mouse selection */	464	case XK_Insert: /* Shift+Insert = paste mouse selection */
469	selection_request (ev.time, 0, 0);	465	selection_request (ev.time);
470	return;	466	return;
471	#if TODO	467	#if TODO
472	/* rxvt extras */	468	/* rxvt extras */
473	case XK_KP_Add: /* Shift+KP_Add = bigger font */	469	case XK_KP_Add: /* Shift+KP_Add = bigger font */
474	change_font (FONT_UP);	470	change_font (FONT_UP);
…		…
867	#endif	863	#endif
868	/* nil */ ;	864	/* nil */ ;
869	}	865	}
870	}	866	}
871		867
872	if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_STR_LEN, kbuf, len, DT_END)))	868	if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
873	return;	869	return;
874		870
875	if (len <= 0)	871	if (len <= 0)
876	return; /* not mapped */	872	return; /* not mapped */
877		873
…		…
905	{	901	{
906	const char ch = C0_ESC;	902	const char ch = C0_ESC;
907	tt_write (&ch, 1);	903	tt_write (&ch, 1);
908	}	904	}
909		905
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);	906	tt_write (kbuf, (unsigned int)len);
921	}	907	}
922	/*}}} */	908	/*}}} */
923		909
924	#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)	910	#if defined (KEYSYM_RESOURCE)
925	/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
926	/* attempt to `write' count to the input buffer */
927	unsigned int	911	unsigned int
928	rxvt_term::cmd_write (const char *str, unsigned int count)	912	rxvt_term::cmd_write (const char *str, unsigned int count)
929	{	913	{
930	unsigned int n, s;	914	unsigned int n, s;
931		915
…		…
972		956
973	if (want_refresh)	957	if (want_refresh)
974	{	958	{
975	if (SHOULD_INVOKE (HOOK_LINE_UPDATE))	959	if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
976	{	960	{
977	int row = -view_start;	961	int row = view_start;
978	int end_row = row + nrow;	962	int end_row = row + nrow;
979		963
980	while (row > -nsaved && ROW (row - 1).is_longer ())	964	while (row > top_row && ROW (row - 1).is_longer ())
981	--row;	965	--row;
982		966
983	do	967	do
984	{	968	{
985	int start_row = row;	969	int start_row = row;
…		…
987		971
988	do	972	do
989	{	973	{
990	l = &ROW (row++);	974	l = &ROW (row++);
991		975
992	if (l->f & LINE_FILTERED)	976	if (!(l->f & LINE_FILTERED))
993	row++;
994	else
995	{	977	{
996	// line not filtered, mark it as filtered	978	// line not filtered, mark it as filtered
997	l->f |= LINE_FILTERED;	979	l->f |= LINE_FILTERED;
998	while (l->is_longer ())	980	while (l->is_longer ())
999	{	981	{
1000	l = &ROW (++row);	982	l = &ROW (row++);
1001	l->f |= LINE_FILTERED;	983	l->f |= LINE_FILTERED;
1002	}	984	}
1003		985
1004	// and filter it	986	// and filter it
1005	HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));	987	HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
…		…
1007	break;	989	break;
1008	}	990	}
1009	}	991	}
1010	while (l->is_longer () && row < end_row);	992	while (l->is_longer () && row < end_row);
1011	}	993	}
1012	while (++row < end_row);	994	while (row < end_row);
1013	}	995	}
1014		996
1015	scr_refresh (refresh_type);	997	scr_refresh ();
1016	scrollbar_show (1);	998	scrollbar_show (1);
1017	#ifdef USE_XIM	999	#ifdef USE_XIM
1018	IMSendSpot ();	1000	IMSendSpot ();
1019	#endif	1001	#endif
1020	}	1002	}
…		…
1023	}	1005	}
1024		1006
1025	void	1007	void
1026	rxvt_term::check_cb (check_watcher &w)	1008	rxvt_term::check_cb (check_watcher &w)
1027	{	1009	{
1028	SET_R (this);	1010	make_current ();
1029	SET_LOCALE (locale);
1030		1011
1031	display->flush ();	1012	display->flush ();
1032		1013
1033	if (want_refresh && !flush_ev.active)	1014	if (want_refresh && !flush_ev.active)
1034	flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally	1015	flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1035	}	1016	}
1036		1017
1037	void	1018	void
1038	rxvt_term::flush_cb (time_watcher &w)	1019	rxvt_term::flush_cb (time_watcher &w)
1039	{	1020	{
1040	SET_R (this);	1021	make_current ();
1041	SET_LOCALE (locale);
1042		1022
1043	refresh_limit = 1;	1023	refresh_limit = 1;
1044	refresh_count = 0;	1024	refresh_count = 0;
1045	flush ();	1025	flush ();
1046	}	1026	}
…		…
1050	rxvt_term::cursor_blink_cb (time_watcher &w)	1030	rxvt_term::cursor_blink_cb (time_watcher &w)
1051	{	1031	{
1052	hidden_cursor = !hidden_cursor;	1032	hidden_cursor = !hidden_cursor;
1053	want_refresh = 1;	1033	want_refresh = 1;
1054		1034
1055	w.start (w.at + BLINK_INTERVAL);	1035	w.start (w.at + CURSOR_BLINK_INTERVAL);
1056	}	1036	}
1057	#endif	1037	#endif
1058		1038
1059	#ifdef TEXT_BLINK	1039	#ifdef TEXT_BLINK
1060	void	1040	void
…		…
1074	rxvt_term::cont_scroll_cb (time_watcher &w)	1054	rxvt_term::cont_scroll_cb (time_watcher &w)
1075	{	1055	{
1076	if ((scrollbar_isUp() || scrollbar_isDn()) &&	1056	if ((scrollbar_isUp() || scrollbar_isDn()) &&
1077	scr_page (scrollbar_isUp() ? UP : DN, 1))	1057	scr_page (scrollbar_isUp() ? UP : DN, 1))
1078	{	1058	{
1079	refresh_type |= SMOOTH_REFRESH;
1080	want_refresh = 1;	1059	want_refresh = 1;
1081	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1060	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1082	}	1061	}
1083	}	1062	}
1084	#endif	1063	#endif
…		…
1088	rxvt_term::sel_scroll_cb (time_watcher &w)	1067	rxvt_term::sel_scroll_cb (time_watcher &w)
1089	{	1068	{
1090	if (scr_page (scroll_selection_dir, scroll_selection_lines))	1069	if (scr_page (scroll_selection_dir, scroll_selection_lines))
1091	{	1070	{
1092	selection_extend (selection_save_x, selection_save_y, selection_save_state);	1071	selection_extend (selection_save_x, selection_save_y, selection_save_state);
1093	refresh_type |= SMOOTH_REFRESH;
1094	want_refresh = 1;	1072	want_refresh = 1;
1095	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1073	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1096	}	1074	}
1097	}	1075	}
1098	#endif	1076	#endif
…		…
1103	{	1081	{
1104	if (mouse_slip_wheel_speed == 0	1082	if (mouse_slip_wheel_speed == 0
1105	|| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)	1083	|| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1106	: scr_page (UP, mouse_slip_wheel_speed))	1084	: scr_page (UP, mouse_slip_wheel_speed))
1107	{	1085	{
1108	if (view_start == nsaved ||	1086	if (view_start == top_row || view_start == 0)
1109	view_start == 0)
1110	mouse_slip_wheel_speed = 0;	1087	mouse_slip_wheel_speed = 0;
1111		1088
1112	refresh_type |= SMOOTH_REFRESH;
1113	want_refresh = 1;	1089	want_refresh = 1;
1114	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1090	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1115	}	1091	}
1116	}	1092	}
1117	#endif
1118
1119	#if HAVE_SCHED_YIELD
1120	static struct event_handler
1121	{
1122	check_watcher cw_yield;
1123
1124	void yield (check_watcher &w)
1125	{
1126	sched_yield ();
1127	w.stop ();
1128	}
1129
1130	event_handler ()
1131	: cw_yield (this, &event_handler::yield)
1132	{
1133	}
1134	} event_handler;
1135	#endif	1093	#endif
1136		1094
1137	bool	1095	bool
1138	rxvt_term::pty_fill ()	1096	rxvt_term::pty_fill ()
1139	{	1097	{
…		…
1147		1105
1148	memmove (cmdbuf_base, cmdbuf_ptr, n);	1106	memmove (cmdbuf_base, cmdbuf_ptr, n);
1149	cmdbuf_ptr = cmdbuf_base;	1107	cmdbuf_ptr = cmdbuf_base;
1150	cmdbuf_endp = cmdbuf_ptr + n;	1108	cmdbuf_endp = cmdbuf_ptr + n;
1151		1109
1152	ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);	1110	ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1153		1111
1154	if (r > 0)	1112	if (r > 0)
1155	{	1113	{
1156	cmdbuf_endp += r;	1114	cmdbuf_endp += r;
1157	return true;	1115	return true;
…		…
1175	}	1133	}
1176		1134
1177	void	1135	void
1178	rxvt_term::pty_cb (io_watcher &w, short revents)	1136	rxvt_term::pty_cb (io_watcher &w, short revents)
1179	{	1137	{
1180	SET_R (this);	1138	make_current ();
1181	SET_LOCALE (locale);
1182		1139
1183	if (revents & EVENT_READ)	1140	if (revents & EVENT_READ)
1184	// loop, but don't allow a single term to monopolize us	1141	// loop, but don't allow a single term to monopolize us
1185	while (pty_fill ())	1142	while (pty_fill ())
1186	if (cmd_parse ())	1143	if (cmd_parse ())
…		…
1191	}	1148	}
1192		1149
1193	void	1150	void
1194	rxvt_term::pointer_unblank ()	1151	rxvt_term::pointer_unblank ()
1195	{	1152	{
1196	XDefineCursor (display->display, vt, TermWin_cursor);	1153	XDefineCursor (xdisp, vt, TermWin_cursor);
1197	recolour_cursor ();	1154	recolour_cursor ();
1198		1155
1199	#ifdef POINTER_BLANK	1156	#ifdef POINTER_BLANK
1200	hidden_pointer = 0;	1157	hidden_pointer = 0;
1201		1158
…		…
1209	rxvt_term::pointer_blank ()	1166	rxvt_term::pointer_blank ()
1210	{	1167	{
1211	if (!OPTION (Opt_pointerBlank))	1168	if (!OPTION (Opt_pointerBlank))
1212	return;	1169	return;
1213		1170
1214	XDefineCursor (display->display, vt, display->blank_cursor);	1171	XDefineCursor (xdisp, vt, display->blank_cursor);
1215	XFlush (display->display);	1172	XFlush (xdisp);
1216		1173
1217	hidden_pointer = 1;	1174	hidden_pointer = 1;
1218	}	1175	}
1219		1176
1220	void	1177	void
1221	rxvt_term::pointer_cb (time_watcher &w)	1178	rxvt_term::pointer_cb (time_watcher &w)
1222	{	1179	{
1223	SET_R (this);	1180	make_current ();
1224	SET_LOCALE (locale);
1225		1181
1226	pointer_blank ();	1182	pointer_blank ();
1227	}	1183	}
1228	#endif	1184	#endif
1229		1185
…		…
1294	(32 + button_number + key_state),	1250	(32 + button_number + key_state),
1295	(32 + x + 1),	1251	(32 + x + 1),
1296	(32 + y + 1));	1252	(32 + y + 1));
1297	}	1253	}
1298		1254
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 */	1255	/*{{{ process an X event */
1310	void	1256	void
1311	rxvt_term::x_cb (XEvent &ev)	1257	rxvt_term::x_cb (XEvent &ev)
1312	{	1258	{
1313	dDisp;	1259	make_current ();
1314		1260
1315	SET_R (this);	1261	dLocal (Display *, xdisp);
1316	SET_LOCALE (locale);
1317		1262
		1263	if (ev.xany.window == vt
		1264	&& SHOULD_INVOKE (HOOK_X_EVENT)
		1265	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
		1266	return;
		1267
		1268	// for XQueryPointer
1318	Window unused_root, unused_child;	1269	Window unused_root, unused_child;
1319	int unused_root_x, unused_root_y;	1270	int unused_root_x, unused_root_y;
1320	unsigned int unused_mask;	1271	unsigned int unused_mask;
1321		1272
1322	switch (ev.type)	1273	switch (ev.type)
…		…
1329		1280
1330	break;	1281	break;
1331		1282
1332	case KeyRelease:	1283	case KeyRelease:
1333	{	1284	{
1334	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755	1285	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1335	KeySym ks;	1286	KeySym keysym;
1336		1287
1337	ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/	1288	keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1338	#endif	1289	#endif
1339		1290
1340	#if ENABLE_FRILLS || ISO_14755	1291	#if ENABLE_FRILLS || ISO_14755
1341	// ISO 14755 support	1292	// ISO 14755 support
1342	if (iso14755buf)	1293	if (iso14755buf)
…		…
1347	# endif	1298	# endif
1348	# if ISO_14755	1299	# if ISO_14755
1349	// iso14755 part 5.2 handling: release time	1300	// iso14755 part 5.2 handling: release time
1350	// first: controls	1301	// first: controls
1351	if ((ev.xkey.state & ControlMask)	1302	if ((ev.xkey.state & ControlMask)
1352	&& ((ks >= 0x40 && ks <= 0x5f)	1303	&& ((keysym >= 0x40 && keysym <= 0x5f)
1353	|| (ks >= 0x61 && ks <= 0x7f)))	1304	|| (keysym >= 0x61 && keysym <= 0x7f)))
1354	{	1305	{
1355	iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);	1306	iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1356	commit_iso14755 ();	1307	commit_iso14755 ();
1357	goto skip_switch;	1308	goto skip_switch;
1358	}	1309	}
1359		1310
1360	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)	1311	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1361	if (i[0] == ks)	1312	if (i[0] == keysym)
1362	{	1313	{
1363	iso14755buf = ISO_14755_51 | i[1];	1314	iso14755buf = ISO_14755_51 | i[1];
1364	commit_iso14755 ();	1315	commit_iso14755 ();
1365	goto skip_switch;	1316	goto skip_switch;
1366	}	1317	}
…		…
1390	iso14755buf = 0;	1341	iso14755buf = 0;
1391	}	1342	}
1392	#endif	1343	#endif
1393		1344
1394	if (ev.xany.window == vt	1345	if (ev.xany.window == vt
1395	&& HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_END)))	1346	&& HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1396	break;	1347	break;
1397		1348
1398	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	1349	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1399	if (!(ev.xkey.state & ControlMask))	1350	if (!(ev.xkey.state & ControlMask))
1400	slip_wheel_ev.stop ();	1351	slip_wheel_ev.stop ();
1401	else if (ks == XK_Control_L || ks == XK_Control_R)	1352	else if (keysym == XK_Control_L || keysym == XK_Control_R)
1402	mouse_slip_wheel_speed = 0;	1353	mouse_slip_wheel_speed = 0;
1403	#endif	1354	#endif
1404	break;	1355	break;
1405	}	1356	}
1406		1357
…		…
1412	button_release (ev.xbutton);	1363	button_release (ev.xbutton);
1413	break;	1364	break;
1414		1365
1415	case ClientMessage:	1366	case ClientMessage:
1416	if (ev.xclient.format == 32	1367	if (ev.xclient.format == 32
1417	&& ev.xclient.message_type == xa[XA_WM_PROTOCOLS])	1368	&& !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1418	{	1369	{
		1370	if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
		1371	{
		1372	if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
		1373	{
1419	if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])	1374	if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
		1375	{
		1376	if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1420	destroy ();	1377	destroy ();
		1378	}
1421	#if ENABLE_EWMH	1379	#if ENABLE_EWMH
1422	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])	1380	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1423	XSendEvent (disp, ev.xclient.window = display->root,	1381	XSendEvent (xdisp, ev.xclient.window = display->root,
1424	False, SubstructureRedirectMask | SubstructureNotifyMask,	1382	False, SubstructureRedirectMask | SubstructureNotifyMask,
1425	&ev);	1383	&ev);
		1384	#endif
		1385	}
		1386	}
		1387	#if ENABLE_XEMBED
		1388	else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
		1389	{
		1390	if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
		1391	focus_in ();
		1392	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
		1393	focus_out ();
		1394	}
1426	#endif	1395	#endif
1427	}	1396	}
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;	1397	break;
1464		1398
1465	case MappingNotify:	1399	case MappingNotify:
1466	XRefreshKeyboardMapping (&ev.xmapping);	1400	XRefreshKeyboardMapping (&ev.xmapping);
1467	break;	1401	break;
…		…
1500	break;	1434	break;
1501		1435
1502	case ConfigureNotify:	1436	case ConfigureNotify:
1503	if (ev.xconfigure.window == parent[0])	1437	if (ev.xconfigure.window == parent[0])
1504	{	1438	{
1505	while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))	1439	while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev))
1506	;	1440	;
1507		1441
1508	if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)	1442	if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1509	{	1443	{
1510	seen_resize = 1;	1444	seen_resize = 1;
1511	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1445	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1512	}	1446	}
1513		1447
		1448	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
		1449
1514	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */	1450	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1515	if (OPTION (Opt_transparent))	1451	if (OPTION (Opt_transparent))
1516	check_our_parents ();	1452	check_our_parents ();
1517	#endif	1453	#endif
1518	}	1454	}
1519	break;	1455	break;
1520		1456
1521	case PropertyNotify:	1457	case PropertyNotify:
		1458	if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1522	if (ev.xproperty.atom == xa[XA_VT_SELECTION]	1459	if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1523	&& ev.xproperty.state == PropertyNewValue)	1460	&& ev.xproperty.state == PropertyNewValue)
1524	selection_property (ev.xproperty.window, ev.xproperty.atom);	1461	selection_property (ev.xproperty.window, ev.xproperty.atom);
1525		1462
1526	break;	1463	break;
1527		1464
1528	case SelectionClear:	1465	case SelectionClear:
1529	selection_clear ();	1466	selection_clear ();
…		…
1565	if (ev.xany.window == vt)	1502	if (ev.xany.window == vt)
1566	{	1503	{
1567	do	1504	do
1568	scr_expose (ev.xexpose.x, ev.xexpose.y,	1505	scr_expose (ev.xexpose.x, ev.xexpose.y,
1569	ev.xexpose.width, ev.xexpose.height, False);	1506	ev.xexpose.width, ev.xexpose.height, False);
1570	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));	1507	while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev));
1571		1508
1572	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1509	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1573		1510
1574	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))	1511	while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev))
1575	scr_expose (ev.xexpose.x, ev.xexpose.y,	1512	scr_expose (ev.xexpose.x, ev.xexpose.y,
1576	ev.xexpose.width, ev.xexpose.height, False);	1513	ev.xexpose.width, ev.xexpose.height, False);
1577		1514
1578	scr_refresh (refresh_type);	1515	want_refresh = 1;
1579	}	1516	}
1580	else	1517	else
1581	{	1518	{
1582	XEvent unused_event;	1519	XEvent unused_event;
1583		1520
1584	while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))	1521	while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event))
1585	;	1522	;
1586	while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))	1523	while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event))
1587	;	1524	;
1588		1525
1589	if (isScrollbarWindow (ev.xany.window))	1526	if (isScrollbarWindow (ev.xany.window))
1590	{	1527	{
1591	scrollBar.setIdle ();	1528	scrollBar.setIdle ();
1592	scrollbar_show (0);	1529	scrollbar_show (0);
1593	}	1530	}
1594	#ifdef MENUBAR
1595	if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1596	menubar_expose ();
1597	#endif
1598		1531
1599	#ifdef TRANSPARENT	1532	#ifdef TRANSPARENT
1600	if (am_transparent && ev.xany.window == parent[0])	1533	if (am_transparent && ev.xany.window == parent[0])
1601	XClearWindow (disp, ev.xany.window);	1534	XClearWindow (xdisp, ev.xany.window);
1602	#endif	1535	#endif
1603	}	1536	}
1604	break;	1537	break;
1605		1538
1606	case MotionNotify:	1539	case MotionNotify:
1607	#ifdef POINTER_BLANK	1540	#ifdef POINTER_BLANK
1608	if (hidden_pointer)	1541	if (hidden_pointer)
1609	pointer_unblank ();	1542	pointer_unblank ();
1610	#endif	1543	#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)	1544	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1619	break;	1545	break;
1620		1546
1621	if (ev.xany.window == vt)	1547	if (ev.xany.window == vt)
1622	{	1548	{
		1549	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1623	if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))	1550	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1624	; // nop	1551	; // nop
1625	else if (ev.xbutton.state & (Button1Mask | Button3Mask))	1552	else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1626	{	1553	{
1627	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))	1554	while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev))
1628	;	1555	;
1629		1556
1630	XQueryPointer (disp, vt,	1557	XQueryPointer (xdisp, vt,
1631	&unused_root, &unused_child,	1558	&unused_root, &unused_child,
1632	&unused_root_x, &unused_root_y,	1559	&unused_root_x, &unused_root_y,
1633	&ev.xbutton.x, &ev.xbutton.y,	1560	&ev.xbutton.x, &ev.xbutton.y,
1634	&ev.xbutton.state);	1561	&ev.xbutton.state);
1635	#ifdef MOUSE_THRESHOLD	1562	#ifdef MOUSE_THRESHOLD
…		…
1699	#endif	1626	#endif
1700	}	1627	}
1701	}	1628	}
1702	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1629	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1703	{	1630	{
1704	while (XCheckTypedWindowEvent (disp, scrollBar.win,	1631	while (XCheckTypedWindowEvent (xdisp, scrollBar.win,
1705	MotionNotify, &ev))	1632	MotionNotify, &ev))
1706	;	1633	;
1707		1634
1708	XQueryPointer (disp, scrollBar.win,	1635	XQueryPointer (xdisp, scrollBar.win,
1709	&unused_root, &unused_child,	1636	&unused_root, &unused_child,
1710	&unused_root_x, &unused_root_y,	1637	&unused_root_x, &unused_root_y,
1711	&ev.xbutton.x, &ev.xbutton.y,	1638	&ev.xbutton.x, &ev.xbutton.y,
1712	&unused_mask);	1639	&unused_mask);
1713	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1640	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1714	scrollbar_size ());	1641	scrollbar_size ());
1715	scr_refresh (refresh_type);	1642	want_refresh = 1;
1716	refresh_limit = 0;	1643	refresh_limit = 0;
1717	scrollbar_show (1);	1644	scrollbar_show (1);
1718	}	1645	}
1719	break;	1646	break;
1720	}	1647	}
…		…
1728	{	1655	{
1729	hidden_cursor = 0;	1656	hidden_cursor = 0;
1730	want_refresh = 1;	1657	want_refresh = 1;
1731	}	1658	}
1732		1659
1733	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1660	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1734	}	1661	}
1735	#endif	1662	#endif
1736		1663
1737	#if defined(POINTER_BLANK)	1664	#if defined(POINTER_BLANK)
1738	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)	1665	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
…		…
1766	XSetICFocus (Input_Context);	1693	XSetICFocus (Input_Context);
1767	}	1694	}
1768	#endif	1695	#endif
1769	#if CURSOR_BLINK	1696	#if CURSOR_BLINK
1770	if (OPTION (Opt_cursorBlink))	1697	if (OPTION (Opt_cursorBlink))
1771	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1698	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1772	#endif	1699	#endif
1773	#if OFF_FOCUS_FADING	1700	#if OFF_FOCUS_FADING
1774	if (rs[Rs_fade])	1701	if (rs[Rs_fade])
1775	{	1702	{
1776	pix_colors = pix_colors_focused;	1703	pix_colors = pix_colors_focused;
…		…
1820		1747
1821	#if TRANSPARENT	1748	#if TRANSPARENT
1822	void	1749	void
1823	rxvt_term::rootwin_cb (XEvent &ev)	1750	rxvt_term::rootwin_cb (XEvent &ev)
1824	{	1751	{
1825	SET_R (this);	1752	make_current ();
1826	SET_LOCALE (locale);
1827		1753
1828	switch (ev.type)	1754	switch (ev.type)
1829	{	1755	{
1830	case PropertyNotify:	1756	case PropertyNotify:
1831	/*	1757	/*
…		…
1858	/*	1784	/*
1859	* VT window processing of button press	1785	* VT window processing of button press
1860	*/	1786	*/
1861	if (ev.window == vt)	1787	if (ev.window == vt)
1862	{	1788	{
		1789	if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
		1790	return;
		1791
1863	#if ISO_14755	1792	#if ISO_14755
1864	// 5.4	1793	// 5.4
1865	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))	1794	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1866	{	1795	{
1867	iso14755_54 (ev.x, ev.y);	1796	iso14755_54 (ev.x, ev.y);
…		…
1909	else	1838	else
1910	{	1839	{
1911	if (ev.button != MEvent.button)	1840	if (ev.button != MEvent.button)
1912	MEvent.clicks = 0;	1841	MEvent.clicks = 0;
1913		1842
1914	if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1915	switch (ev.button)	1843	switch (ev.button)
1916	{	1844	{
1917	case Button1:	1845	case Button1:
1918	/* allow meta + click to select rectangular areas */	1846	/* allow meta + click to select rectangular areas */
1919	/* should be done in screen.C */	1847	/* should be done in screen.C */
1920	#if ENABLE_FRILLS	1848	#if ENABLE_FRILLS
1921	selection.rect = !!(ev.state & ModMetaMask);	1849	selection.rect = !!(ev.state & ModMetaMask);
1922	#else	1850	#else
1923	selection.rect = false;	1851	selection.rect = false;
1924	#endif	1852	#endif
1925		1853
1926	/* allow shift+left click to extend selection */	1854	/* allow shift+left click to extend selection */
1927	if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))	1855	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1928	{	1856	{
1929	if (MEvent.button == Button1 && clickintime)	1857	if (MEvent.button == Button1 && clickintime)
1930	selection_rotate (ev.x, ev.y);	1858	selection_rotate (ev.x, ev.y);
1931	else	1859	else
1932	selection_extend (ev.x, ev.y, 1);	1860	selection_extend (ev.x, ev.y, 1);
1933	}	1861	}
1934	else	1862	else
1935	{	1863	{
1936	if (MEvent.button == Button1 && clickintime)	1864	if (MEvent.button == Button1 && clickintime)
1937	MEvent.clicks++;	1865	MEvent.clicks++;
1938	else	1866	else
1939	MEvent.clicks = 1;	1867	MEvent.clicks = 1;
1940		1868
1941	selection_click (MEvent.clicks, ev.x, ev.y);	1869	selection_click (MEvent.clicks, ev.x, ev.y);
1942	}	1870	}
1943		1871
1944	MEvent.button = Button1;	1872	MEvent.button = Button1;
1945	break;	1873	break;
1946		1874
1947	case Button3:	1875	case Button3:
1948	if (MEvent.button == Button3 && clickintime)	1876	if (MEvent.button == Button3 && clickintime)
1949	selection_rotate (ev.x, ev.y);	1877	selection_rotate (ev.x, ev.y);
1950	else	1878	else
1951	selection_extend (ev.x, ev.y, 1);	1879	selection_extend (ev.x, ev.y, 1);
1952		1880
1953	MEvent.button = Button3;	1881	MEvent.button = Button3;
1954	break;	1882	break;
1955	}	1883	}
1956	}	1884	}
1957		1885
1958	MEvent.time = ev.time;	1886	MEvent.time = ev.time;
1959	return;	1887	return;
1960	}	1888	}
1961		1889
…		…
2100	}	2028	}
2101	}	2029	}
2102		2030
2103	return;	2031	return;
2104	}	2032	}
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	}	2033	}
2114		2034
2115	void	2035	void
2116	rxvt_term::button_release (XButtonEvent &ev)	2036	rxvt_term::button_release (XButtonEvent &ev)
2117	{	2037	{
…		…
2123		2043
2124	if (scrollbar_isUpDn ())	2044	if (scrollbar_isUpDn ())
2125	{	2045	{
2126	scrollBar.setIdle ();	2046	scrollBar.setIdle ();
2127	scrollbar_show (0);	2047	scrollbar_show (0);
2128	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2129	refresh_type &= ~SMOOTH_REFRESH;
2130	#endif
2131	}	2048	}
2132		2049
2133	#ifdef SELECTION_SCROLLING	2050	#ifdef SELECTION_SCROLLING
2134	if (sel_scroll_ev.active)	2051	if (sel_scroll_ev.active)
2135	sel_scroll_ev.stop();	2052	sel_scroll_ev.stop();
2136	#endif	2053	#endif
2137		2054
2138	if (ev.window == vt)	2055	if (ev.window == vt)
2139	{	2056	{
		2057	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
		2058	return;
		2059
2140	#if ISO_14755	2060	#if ISO_14755
2141	// 5.4	2061	// 5.4
2142	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))	2062	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2143	return;	2063	return;
2144	#endif	2064	#endif
		2065
2145	if (reportmode)	2066	if (reportmode)
2146	{	2067	{
2147	/* mouse report from vt window */	2068	/* mouse report from vt window */
2148	/* don't report release of wheel "buttons" */	2069	/* don't report release of wheel "buttons" */
2149	if (ev.button >= 4)	2070	if (ev.button >= 4)
…		…
2173	if (priv_modes & PrivMode_mouse_report	2094	if (priv_modes & PrivMode_mouse_report
2174	&& bypass_keystate	2095	&& bypass_keystate
2175	&& ev.button == Button1 && MEvent.clicks <= 1)	2096	&& ev.button == Button1 && MEvent.clicks <= 1)
2176	selection_extend (ev.x, ev.y, 0);	2097	selection_extend (ev.x, ev.y, 0);
2177		2098
2178	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2179	return;
2180
2181	switch (ev.button)	2099	switch (ev.button)
2182	{	2100	{
2183	case Button1:	2101	case Button1:
2184	case Button3:	2102	case Button3:
2185	selection_make (ev.time);	2103	selection_make (ev.time);
2186	break;	2104	break;
		2105
2187	case Button2:	2106	case Button2:
2188	selection_request (ev.time, ev.x, ev.y);	2107	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
		2108	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2189	break;	2109	break;
		2110
2190	#ifdef MOUSE_WHEEL	2111	#ifdef MOUSE_WHEEL
2191	case Button4:	2112	case Button4:
2192	case Button5:	2113	case Button5:
2193	{	2114	{
2194	int i;	2115	int i;
…		…
2216	slip_wheel_ev.start ();	2137	slip_wheel_ev.start ();
2217	}	2138	}
2218	else	2139	else
2219	{	2140	{
2220	# endif	2141	# endif
2221	# ifdef JUMP_MOUSE_WHEEL
2222	scr_page (v, i);	2142	scr_page (v, i);
2223	scr_refresh (SMOOTH_REFRESH);
2224	scrollbar_show (1);	2143	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	2144	# ifdef MOUSE_SLIP_WHEELING
2234	}	2145	}
2235	#endif	2146	# endif
2236	}	2147	}
2237	break;	2148	break;
2238	#endif	2149	#endif
2239	}	2150	}
2240	}	2151	}
2241	#ifdef MENUBAR
2242	else if (isMenuBarWindow (ev.window))
2243	menubar_control (ev);
2244	#endif
2245	}	2152	}
2246		2153
2247	#ifdef TRANSPARENT	2154	#ifdef TRANSPARENT
2248	#if TINTING	2155	#if TINTING
2249	/* taken from aterm-0.4.2 */	2156	/* taken from aterm-0.4.2 */
2250		2157
2251	typedef uint32_t RUINT32T;	2158	typedef uint32_t RUINT32T;
2252		2159
2253	void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)	2160	void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2254	{	2161	{
2255	int sh_r, sh_g, sh_b;	2162	int sh_r, sh_g, sh_b;
2256	RUINT32T mask_r, mask_g, mask_b;	2163	RUINT32T mask_r, mask_g, mask_b;
2257	RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;	2164	RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2258	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;	2165	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2259	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;	2166	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2260	int i;	2167	int i;
2261		2168
2262	Visual *visual = display->visual;	2169	Visual *visual = term->visual;
2263		2170
2264	if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;	2171	if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2265		2172
2266	/* for convenience */	2173	/* for convenience */
2267	mask_r = visual->red_mask;	2174	mask_r = visual->red_mask;
…		…
2488	Atom atype;	2395	Atom atype;
2489	unsigned char *prop = NULL;	2396	unsigned char *prop = NULL;
2490	Window root, oldp, *list;	2397	Window root, oldp, *list;
2491	Pixmap rootpixmap = None;	2398	Pixmap rootpixmap = None;
2492	XWindowAttributes wattr, wrootattr;	2399	XWindowAttributes wattr, wrootattr;
2493	dDisp;
2494		2400
2495	pchanged = 0;	2401	pchanged = 0;
2496		2402
2497	if (!OPTION (Opt_transparent))	2403	if (!OPTION (Opt_transparent))
2498	return pchanged; /* Don't try any more */	2404	return pchanged; /* Don't try any more */
2499		2405
2500	XGetWindowAttributes (disp, display->root, &wrootattr);	2406	XGetWindowAttributes (xdisp, display->root, &wrootattr);
2501	rootdepth = wrootattr.depth;	2407	rootdepth = wrootattr.depth;
2502		2408
2503	XGetWindowAttributes (disp, parent[0], &wattr);	2409	XGetWindowAttributes (xdisp, parent[0], &wattr);
2504		2410
2505	if (rootdepth != wattr.depth)	2411	if (rootdepth != wattr.depth)
2506	{	2412	{
2507	if (am_transparent)	2413	if (am_transparent)
2508	{	2414	{
2509	pchanged = 1;	2415	pchanged = 1;
2510	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2416	XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2511	am_transparent = am_pixmap_trans = 0;	2417	am_transparent = am_pixmap_trans = 0;
2512	}	2418	}
2513		2419
2514	return pchanged; /* Don't try any more */	2420	return pchanged; /* Don't try any more */
2515	}	2421	}
2516		2422
2517	/* Get all X ops out of the queue so that our information is up-to-date. */	2423	/* Get all X ops out of the queue so that our information is up-to-date. */
2518	XSync (disp, False);	2424	XSync (xdisp, False);
2519		2425
2520	/*	2426	/*
2521	* Make the frame window set by the window manager have	2427	* Make the frame window set by the window manager have
2522	* the root background. Some window managers put multiple nested frame	2428	* the root background. Some window managers put multiple nested frame
2523	* windows for each client, so we have to take care about that.	2429	* windows for each client, so we have to take care about that.
2524	*/	2430	*/
2525	i = (xa[XA_XROOTPMAP_ID]	2431	i = (xa[XA_XROOTPMAP_ID]
2526	&& XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],	2432	&& XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2527	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2433	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2528	&nitems, &bytes_after, &prop) == Success);	2434	&nitems, &bytes_after, &prop) == Success);
2529		2435
2530	if (!i || prop == NULL)	2436	if (!i || prop == NULL)
2531	i = (xa[XA_ESETROOT_PMAP_ID]	2437	i = (xa[XA_ESETROOT_PMAP_ID]
2532	&& XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],	2438	&& XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2533	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2439	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2534	&nitems, &bytes_after, &prop) == Success);	2440	&nitems, &bytes_after, &prop) == Success);
2535		2441
2536	if (!i || prop == NULL	2442	if (!i || prop == NULL
2537	#if TINTING	2443	#if TINTING
2538	|| !rs[Rs_color + Color_tint]	2444	|| !ISSET_PIXCOLOR (Color_tint)
2539	#endif	2445	#endif
2540	)	2446	)
2541	have_pixmap = 0;	2447	have_pixmap = 0;
2542	else	2448	else
2543	{	2449	{
…		…
2556	Window cr;	2462	Window cr;
2557	XImage *image;	2463	XImage *image;
2558	GC gc;	2464	GC gc;
2559	XGCValues gcvalue;	2465	XGCValues gcvalue;
2560		2466
2561	XTranslateCoordinates (disp, parent[0], display->root,	2467	XTranslateCoordinates (xdisp, parent[0], display->root,
2562	0, 0, &sx, &sy, &cr);	2468	0, 0, &sx, &sy, &cr);
2563	nw = (unsigned int)szHint.width;	2469	nw = (unsigned int)szHint.width;
2564	nh = (unsigned int)szHint.height;	2470	nh = (unsigned int)szHint.height;
2565	nx = ny = 0;	2471	nx = ny = 0;
2566		2472
…		…
2579	}	2485	}
2580		2486
2581	min_it (nw, (unsigned int) (wrootattr.width - sx));	2487	min_it (nw, (unsigned int) (wrootattr.width - sx));
2582	min_it (nh, (unsigned int) (wrootattr.height - sy));	2488	min_it (nh, (unsigned int) (wrootattr.height - sy));
2583		2489
2584	XSync (disp, False);	2490	XSync (xdisp, False);
2585	allowedxerror = -1;	2491	allowedxerror = -1;
2586	image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);	2492	image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2587		2493
2588	/* XXX: handle BadMatch - usually because we're outside the pixmap */	2494	/* XXX: handle BadMatch - usually because we're outside the pixmap */
2589	/* XXX: may need a delay here? */	2495	/* XXX: may need a delay here? */
2590	allowedxerror = 0;	2496	allowedxerror = 0;
2591		2497
…		…
2594	if (am_transparent && am_pixmap_trans)	2500	if (am_transparent && am_pixmap_trans)
2595	{	2501	{
2596	pchanged = 1;	2502	pchanged = 1;
2597	if (pixmap != None)	2503	if (pixmap != None)
2598	{	2504	{
2599	XFreePixmap (disp, pixmap);	2505	XFreePixmap (xdisp, pixmap);
2600	pixmap = None;	2506	pixmap = None;
2601	}	2507	}
2602	}	2508	}
2603		2509
2604	am_pixmap_trans = 0;	2510	am_pixmap_trans = 0;
2605	}	2511	}
2606	else	2512	else
2607	{	2513	{
2608	if (pixmap != None)	2514	if (pixmap != None)
2609	XFreePixmap (disp, pixmap);	2515	XFreePixmap (xdisp, pixmap);
2610		2516
2611	#if TINTING	2517	#if TINTING
2612	if (ISSET_PIXCOLOR (Color_tint))	2518	if (ISSET_PIXCOLOR (Color_tint))
2613	{	2519	{
2614	unsigned short rm, gm, bm;
2615	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;	2520	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2616		2521
		2522	rgba c;
2617	pix_colors_focused[Color_tint].get (display, rm, gm, bm);	2523	pix_colors_focused [Color_tint].get (c);
2618		2524
2619	ShadeXImage (display, image, shade, rm, gm, bm);	2525	ShadeXImage (this, image, shade, c.r, c.g, c.b);
2620	}	2526	}
2621	#endif	2527	#endif
2622		2528
2623	pixmap = XCreatePixmap (disp, vt,	2529	pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2624	szHint.width, szHint.height, image->depth);
2625	gc = XCreateGC (disp, vt, 0UL, &gcvalue);	2530	gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2626	XPutImage (disp, pixmap, gc, image, 0, 0,	2531	XPutImage (xdisp, pixmap, gc, image, 0, 0,
2627	nx, ny, image->width, image->height);	2532	nx, ny, image->width, image->height);
2628	XFreeGC (disp, gc);	2533	XFreeGC (xdisp, gc);
2629	XDestroyImage (image);	2534	XDestroyImage (image);
2630	XSetWindowBackgroundPixmap (disp, parent[0], pixmap);	2535	XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2631	XClearWindow (disp, parent[0]);	2536	XClearWindow (xdisp, parent[0]);
2632		2537
2633	if (!am_transparent || !am_pixmap_trans)	2538	if (!am_transparent || !am_pixmap_trans)
2634	pchanged = 1;	2539	pchanged = 1;
2635		2540
2636	am_transparent = am_pixmap_trans = 1;	2541	am_transparent = am_pixmap_trans = 1;
2637	}	2542	}
2638	}	2543	}
2639		2544
2640	if (am_pixmap_trans)	2545	if (am_pixmap_trans)
2641	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2546	XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2642	else	2547	else
2643	{	2548	{
2644	unsigned int n;	2549	unsigned int n;
2645	/*	2550	/*
2646	* InheritPixmap transparency	2551	* InheritPixmap transparency
2647	*/	2552	*/
2648	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2553	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2649	{	2554	{
2650	oldp = parent[i];	2555	oldp = parent[i];
2651	XQueryTree (disp, parent[i - 1], &root,	2556	XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n);
2652	&parent[i], &list, &n);
2653	XFree (list);	2557	XFree (list);
2654		2558
2655	if (parent[i] == display->root)	2559	if (parent[i] == display->root)
2656	{	2560	{
2657	if (oldp != None)	2561	if (oldp != None)
…		…
2665	}	2569	}
2666		2570
2667	n = 0;	2571	n = 0;
2668		2572
2669	if (pchanged)	2573	if (pchanged)
2670	{
2671	for (; n < (unsigned int)i; n++)	2574	for (; n < (unsigned int)i; n++)
2672	{	2575	{
2673	XGetWindowAttributes (disp, parent[n], &wattr);	2576	XGetWindowAttributes (xdisp, parent[n], &wattr);
		2577
2674	if (wattr.depth != rootdepth || wattr.c_class == InputOnly)	2578	if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2675	{	2579	{
2676	n = (int) (sizeof (parent) / sizeof (Window)) + 1;	2580	n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2677	break;	2581	break;
2678	}	2582	}
2679	}	2583	}
2680	}
2681		2584
2682	if (n > (int) (sizeof (parent) / sizeof (parent[0])))	2585	if (n > (sizeof (parent) / sizeof (parent[0])))
2683	{	2586	{
2684	XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);	2587	XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2685	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2588	XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2686	am_transparent = 0;	2589	am_transparent = 0;
2687	/* XXX: also turn off Opt_transparent? */	2590	/* XXX: also turn off Opt_transparent? */
2688	}	2591	}
2689	else	2592	else
2690	{	2593	{
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++)	2594	for (n = 0; n < (unsigned int)i; n++)
2697	{	2595	{
2698	XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);	2596	XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2699	XClearWindow (disp, parent[n]);	2597	XClearWindow (xdisp, parent[n]);
2700	}	2598	}
2701		2599
2702	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2600	XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2703	am_transparent = 1;	2601	am_transparent = 1;
2704	}	2602	}
2705		2603
2706	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2604	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2707	parent[i] = None;	2605	parent[i] = None;
2708	}	2606	}
2709		2607
2710	if (scrollBar.win)	2608	if (scrollBar.win)
2711	{	2609	{
2712	XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);	2610	XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2713	scrollBar.setIdle ();	2611	scrollBar.setIdle ();
2714	scrollbar_show (0);	2612	scrollbar_show (0);
2715	}	2613	}
2716		2614
2717	if (am_transparent)	2615	if (am_transparent)
…		…
2792	}	2690	}
2793		2691
2794	// scr_add_lines only works for nlines <= nrow - 1.	2692	// scr_add_lines only works for nlines <= nrow - 1.
2795	if (nlines >= nrow - 1)	2693	if (nlines >= nrow - 1)
2796	{	2694	{
		2695	if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2797	if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))	2696	&& HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2798	scr_add_lines (buf, str - buf, nlines);	2697	scr_add_lines (buf, str - buf, nlines);
2799		2698
2800	nlines = 0;	2699	nlines = 0;
2801	str = buf;	2700	str = buf;
2802	eol = str + min (ncol, UBUFSIZ);	2701	eol = str + min (ncol, UBUFSIZ);
…		…
2817		2716
2818	seq_begin = cmdbuf_ptr;	2717	seq_begin = cmdbuf_ptr;
2819	ch = next_char ();	2718	ch = next_char ();
2820	}	2719	}
2821		2720
		2721	if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2822	if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))	2722	&& HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2823	scr_add_lines (buf, str - buf, nlines);	2723	scr_add_lines (buf, str - buf, nlines);
2824		2724
2825	/*	2725	/*
2826	* If there have been a lot of new lines, then update the screen	2726	* 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.	2727	* What the heck I'll cheat and only refresh less than every page-full.
…		…
2833	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)	2733	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2834	refresh_limit++;	2734	refresh_limit++;
2835	else	2735	else
2836	{	2736	{
2837	flag = true;	2737	flag = true;
2838	scr_refresh (refresh_type);	2738	scr_refresh ();
2839	flush_ev.stop ();	2739	want_refresh = 1;
2840	}	2740	}
2841	}	2741	}
2842		2742
2843	}	2743	}
2844	else	2744	else
…		…
2861	return flag;	2761	return flag;
2862	}	2762	}
2863		2763
2864	// read the next character	2764	// read the next character
2865	wchar_t	2765	wchar_t
2866	rxvt_term::next_char ()	2766	rxvt_term::next_char () NOTHROW
2867	{	2767	{
2868	while (cmdbuf_ptr < cmdbuf_endp)	2768	while (cmdbuf_ptr < cmdbuf_endp)
2869	{	2769	{
2870	// assume 7-bit to be ascii ALWAYS	2770	// assume 7-bit to be ascii ALWAYS
2871	if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)	2771	if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
…		…
2892	return NOCHAR;	2792	return NOCHAR;
2893	}	2793	}
2894		2794
2895	// read the next octet	2795	// read the next octet
2896	uint32_t	2796	uint32_t
2897	rxvt_term::next_octet ()	2797	rxvt_term::next_octet () NOTHROW
2898	{	2798	{
2899	return cmdbuf_ptr < cmdbuf_endp	2799	return cmdbuf_ptr < cmdbuf_endp
2900	? (unsigned char)*cmdbuf_ptr++	2800	? (unsigned char)*cmdbuf_ptr++
2901	: NOCHAR;	2801	: NOCHAR;
2902	}	2802	}
		2803
		2804	static class out_of_input out_of_input;
2903		2805
2904	/* rxvt_cmd_getc () - Return next input character */	2806	/* rxvt_cmd_getc () - Return next input character */
2905	/*	2807	/*
2906	* Return the next input character after first passing any keyboard input	2808	* Return the next input character after first passing any keyboard input
2907	* to the command.	2809	* to the command.
2908	*/	2810	*/
2909	wchar_t	2811	wchar_t
2910	rxvt_term::cmd_getc ()	2812	rxvt_term::cmd_getc () THROW ((class out_of_input))
2911	{	2813	{
2912	wchar_t c = next_char ();	2814	wchar_t c = next_char ();
2913		2815
2914	if (c == NOCHAR)	2816	if (c == NOCHAR)
2915	throw out_of_input;	2817	throw out_of_input;
2916		2818
2917	return c;	2819	return c;
2918	}	2820	}
2919		2821
2920	uint32_t	2822	uint32_t
2921	rxvt_term::cmd_get8 ()	2823	rxvt_term::cmd_get8 () THROW ((class out_of_input))
2922	{	2824	{
2923	uint32_t c = next_octet ();	2825	uint32_t c = next_octet ();
2924		2826
2925	if (c == NOCHAR)	2827	if (c == NOCHAR)
2926	throw out_of_input;	2828	throw out_of_input;
…		…
3164	scr_charset_set (2, (unsigned int)cmd_getc ());	3066	scr_charset_set (2, (unsigned int)cmd_getc ());
3165	break;	3067	break;
3166	case '+':	3068	case '+':
3167	scr_charset_set (3, (unsigned int)cmd_getc ());	3069	scr_charset_set (3, (unsigned int)cmd_getc ());
3168	break;	3070	break;
3169	#if ENABLE_FRILLS	3071	#if !ENABLE_MINIMAL
3170	case '6':	3072	case '6':
3171	scr_backindex ();	3073	scr_backindex ();
3172	break;	3074	break;
3173	#endif	3075	#endif
3174	case '7':	3076	case '7':
3175	scr_cursor (SAVE);	3077	scr_cursor (SAVE);
3176	break;	3078	break;
3177	case '8':	3079	case '8':
3178	scr_cursor (RESTORE);	3080	scr_cursor (RESTORE);
3179	break;	3081	break;
3180	#if ENABLE_FRILLS	3082	#if !ENABLE_MINIMAL
3181	case '9':	3083	case '9':
3182	scr_forwardindex ();	3084	scr_forwardindex ();
3183	break;	3085	break;
3184	#endif	3086	#endif
3185	case '=':	3087	case '=':
…		…
3347	ndef = get_byte_array_bit (csi_defaults, i);	3249	ndef = get_byte_array_bit (csi_defaults, i);
3348	for (p = 0; p < nargs; p++)	3250	for (p = 0; p < nargs; p++)
3349	if (arg[p] == -1)	3251	if (arg[p] == -1)
3350	arg[p] = ndef;	3252	arg[p] = ndef;
3351		3253
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	/*	3254	/*
3360	* private mode handling	3255	* private mode handling
3361	*/	3256	*/
3362	if (priv)	3257	if (priv)
3363	{	3258	{
3364	switch (priv)	3259	switch (priv)
3365	{	3260	{
3366	case '>':	3261	case '>':
3367	if (ch == CSI_DA) /* secondary device attributes */	3262	if (ch == CSI_DA) /* secondary device attributes */
3368	tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);	3263	{
		3264	// first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
		3265	// 'U' for rxvt-unicode != 7.[34] (where it was broken).
		3266	//
		3267	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
		3268	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
		3269	// that we do not support xterm mouse reporting (should be 95 when we do).
		3270	//
		3271	tt_printf ("\033[>%d;94;0c", 'U');
		3272	}
3369	break;	3273	break;
3370	case '?':	3274	case '?':
3371	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')	3275	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3372	process_terminal_mode (ch, priv, nargs, arg);	3276	process_terminal_mode (ch, priv, nargs, arg);
3373	break;	3277	break;
…		…
3576	break;	3480	break;
3577	case CSI_75:	3481	case CSI_75:
3578	scr_cursor (RESTORE);	3482	scr_cursor (RESTORE);
3579	break;	3483	break;
3580		3484
3581	#if ENABLE_FRILLS	3485	#if !ENABLE_MINIMAL
3582	case CSI_74:	3486	case CSI_74:
3583	process_window_ops (arg, nargs);	3487	process_window_ops (arg, nargs);
3584	break;	3488	break;
3585	#endif	3489	#endif
3586		3490
…		…
3593	break;	3497	break;
3594	}	3498	}
3595	}	3499	}
3596	/*}}} */	3500	/*}}} */
3597		3501
3598	#if ENABLE_FRILLS	3502	#if !ENABLE_MINIMAL
3599	/* ARGSUSED */	3503	/* ARGSUSED */
3600	void	3504	void
3601	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3505	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3602	{	3506	{
3603	int x, y;	3507	int x, y;
3604	XWindowAttributes wattr;	3508	XWindowAttributes wattr;
3605	Window wdummy;	3509	Window wdummy;
3606	dDisp;	3510
		3511	dLocal (Display *, xdisp);
3607		3512
3608	if (nargs == 0)	3513	if (nargs == 0)
3609	return;	3514	return;
3610		3515
3611	switch (args[0])	3516	switch (args[0])
3612	{	3517	{
3613	/*	3518	/*
3614	* commands	3519	* commands
3615	*/	3520	*/
3616	case 1: /* deiconify window */	3521	case 1: /* deiconify window */
3617	XMapWindow (disp, parent[0]);	3522	XMapWindow (xdisp, parent[0]);
3618	break;	3523	break;
3619	case 2: /* iconify window */	3524	case 2: /* iconify window */
3620	XIconifyWindow (disp, parent[0], display->screen);	3525	XIconifyWindow (xdisp, parent[0], display->screen);
3621	break;	3526	break;
3622	case 3: /* set position (pixels) */	3527	case 3: /* set position (pixels) */
3623	XMoveWindow (disp, parent[0], args[1], args[2]);	3528	XMoveWindow (xdisp, parent[0], args[1], args[2]);
3624	break;	3529	break;
3625	case 4: /* set size (pixels) */	3530	case 4: /* set size (pixels) */
3626	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3531	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3627	break;	3532	break;
3628	case 5: /* raise window */	3533	case 5: /* raise window */
3629	XRaiseWindow (disp, parent[0]);	3534	XRaiseWindow (xdisp, parent[0]);
3630	break;	3535	break;
3631	case 6: /* lower window */	3536	case 6: /* lower window */
3632	XLowerWindow (disp, parent[0]);	3537	XLowerWindow (xdisp, parent[0]);
3633	break;	3538	break;
3634	case 7: /* refresh window */	3539	case 7: /* refresh window */
3635	scr_touch (true);	3540	scr_touch (true);
3636	break;	3541	break;
3637	case 8: /* set size (chars) */	3542	case 8: /* set size (chars) */
…		…
3644	if (args[0] >= 24) /* set height (chars) */	3549	if (args[0] >= 24) /* set height (chars) */
3645	set_widthheight ((unsigned int)width,	3550	set_widthheight ((unsigned int)width,
3646	(unsigned int) (args[1] * fheight));	3551	(unsigned int) (args[1] * fheight));
3647	break;	3552	break;
3648		3553
3649
3650	/*	3554	/*
3651	* reports - some output format copied from XTerm	3555	* reports - some output format copied from XTerm
3652	*/	3556	*/
3653	case 11: /* report window state */	3557	case 11: /* report window state */
3654	XGetWindowAttributes (disp, parent[0], &wattr);	3558	XGetWindowAttributes (xdisp, parent[0], &wattr);
3655	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3559	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3656	break;	3560	break;
3657	case 13: /* report window position */	3561	case 13: /* report window position */
3658	XGetWindowAttributes (disp, parent[0], &wattr);	3562	XGetWindowAttributes (xdisp, parent[0], &wattr);
3659	XTranslateCoordinates (disp, parent[0], wattr.root,	3563	XTranslateCoordinates (xdisp, parent[0], wattr.root,
3660	-wattr.border_width, -wattr.border_width,	3564	-wattr.border_width, -wattr.border_width,
3661	&x, &y, &wdummy);	3565	&x, &y, &wdummy);
3662	tt_printf ("\033[3;%d;%dt", x, y);	3566	tt_printf ("\033[3;%d;%dt", x, y);
3663	break;	3567	break;
3664	case 14: /* report window size (pixels) */	3568	case 14: /* report window size (pixels) */
3665	XGetWindowAttributes (disp, parent[0], &wattr);	3569	XGetWindowAttributes (xdisp, parent[0], &wattr);
3666	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3570	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3667	break;	3571	break;
3668	case 18: /* report text area size (chars) */	3572	case 18: /* report text area size (chars) */
3669	tt_printf ("\033[8;%d;%dt", nrow, ncol);	3573	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3670	break;	3574	break;
…		…
3672	tt_printf ("\033[9;%d;%dt", nrow, ncol);	3576	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3673	break;	3577	break;
3674	case 20: /* report icon label */	3578	case 20: /* report icon label */
3675	{	3579	{
3676	char *s;	3580	char *s;
3677	XGetIconName (disp, parent[0], &s);	3581	XGetIconName (xdisp, parent[0], &s);
3678	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3582	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3679	XFree (s);	3583	XFree (s);
3680	}	3584	}
3681	break;	3585	break;
3682	case 21: /* report window title */	3586	case 21: /* report window title */
3683	{	3587	{
3684	char *s;	3588	char *s;
3685	XFetchName (disp, parent[0], &s);	3589	XFetchName (xdisp, parent[0], &s);
3686	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3590	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3687	XFree (s);	3591	XFree (s);
3688	}	3592	}
3689	break;	3593	break;
3690	}	3594	}
…		…
3791	void	3695	void
3792	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)	3696	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3793	{	3697	{
3794	if (str[0] == '?' && !str[1])	3698	if (str[0] == '?' && !str[1])
3795	{	3699	{
3796	unsigned short r, g, b;	3700	rgba c;
3797	pix_colors_focused[color].get (display, r, g, b);	3701	pix_colors_focused[color].get (c);
		3702
		3703	#if XFT
		3704	if (c.a != rgba::MAX_CC)
		3705	tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
		3706	else
		3707	#endif
3798	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);	3708	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3799	}	3709	}
3800	else	3710	else
3801	set_window_color (color, str);	3711	set_window_color (color, str);
3802	}	3712	}
3803		3713
…		…
3805	* XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)	3715	* XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3806	*/	3716	*/
3807	void	3717	void
3808	rxvt_term::process_xterm_seq (int op, const char *str, char resp)	3718	rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3809	{	3719	{
3810	int changed = 0;
3811	int color;	3720	int color;
3812	char *buf, *name;	3721	char *buf, *name;
3813	bool query = str[0] == '?' && !str[1];	3722	bool query = str[0] == '?' && !str[1];
3814	int saveop = op;	3723	int saveop = op;
3815	dDisp;	3724
		3725	dLocal (Display *, xdisp);
3816		3726
3817	assert (str != NULL);	3727	assert (str != NULL);
3818	switch (op)	3728	switch (op)
3819	{	3729	{
3820	case XTerm_name:	3730	case XTerm_name:
…		…
3836	unsigned long bytes_after;	3746	unsigned long bytes_after;
3837	unsigned char *value = 0;	3747	unsigned char *value = 0;
3838	const char *str = "";	3748	const char *str = "";
3839		3749
3840	if (prop	3750	if (prop
3841	&& XGetWindowProperty (disp, parent[0],	3751	&& XGetWindowProperty (xdisp, parent[0],
3842	prop, 0, 1<<16, 0, AnyPropertyType,	3752	prop, 0, 1<<16, 0, AnyPropertyType,
3843	&actual_type, &actual_format,	3753	&actual_type, &actual_format,
3844	&nitems, &bytes_after, &value) == Success	3754	&nitems, &bytes_after, &value) == Success
3845	&& actual_type != None	3755	&& actual_type != None
3846	&& actual_format == 8)	3756	&& actual_format == 8)
3847	str = (const char *)(value);	3757	str = (const char *)(value);
3848		3758
3849	tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);	3759	tt_printf ("\033]%d;%s%c", op, str, resp);
3850		3760
3851	XFree (value);	3761	XFree (value);
3852	}	3762	}
3853	else	3763	else
3854	{	3764	{
…		…
3858	{	3768	{
3859	*eq = 0;	3769	*eq = 0;
3860	set_utf8_property (display->atom (str), eq + 1);	3770	set_utf8_property (display->atom (str), eq + 1);
3861	}	3771	}
3862	else	3772	else
3863	XDeleteProperty (disp, parent[0],	3773	XDeleteProperty (xdisp, parent[0],
3864	display->atom (str));	3774	display->atom (str));
3865	}	3775	}
3866	break;	3776	break;
3867		3777
3868	case XTerm_Color:	3778	case XTerm_Color:
…		…
3870	{	3780	{
3871	if ((name = strchr (buf, ';')) == NULL)	3781	if ((name = strchr (buf, ';')) == NULL)
3872	break;	3782	break;
3873		3783
3874	*name++ = '\0';	3784	*name++ = '\0';
3875	color = atoi (buf);	3785	color = atoi (buf) + minCOLOR;
3876		3786
3877	if (color < 0 || color >= TOTAL_COLORS)	3787	if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3878	break;	3788	break;
3879		3789
3880	if ((buf = strchr (name, ';')) != NULL)	3790	if ((buf = strchr (name, ';')) != NULL)
3881	*buf++ = '\0';	3791	*buf++ = '\0';
3882		3792
3883	if (name[0] == '?' && !name[1])	3793	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	}	3794	}
3892	break;	3795	break;
3893	case XTerm_Color00:	3796	case XTerm_Color00:
3894	process_color_seq (XTerm_Color00, Color_fg, str, resp);	3797	process_color_seq (op, Color_fg, str, resp);
3895	break;	3798	break;
3896	case XTerm_Color01:	3799	case XTerm_Color01:
3897	process_color_seq (XTerm_Color00, Color_bg, str, resp);	3800	process_color_seq (op, Color_bg, str, resp);
3898	break;	3801	break;
3899	#ifndef NO_CURSORCOLOR	3802	#ifndef NO_CURSORCOLOR
3900	case XTerm_Color_cursor:	3803	case XTerm_Color_cursor:
3901	process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);	3804	process_color_seq (op, Color_cursor, str, resp);
3902	break;	3805	break;
3903	#endif	3806	#endif
3904	case XTerm_Color_pointer_fg:	3807	case XTerm_Color_pointer_fg:
3905	process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);	3808	process_color_seq (op, Color_pointer_fg, str, resp);
3906	break;	3809	break;
3907	case XTerm_Color_pointer_bg:	3810	case XTerm_Color_pointer_bg:
3908	process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);	3811	process_color_seq (op, Color_pointer_bg, str, resp);
3909	break;	3812	break;
3910	#ifndef NO_BOLD_UNDERLINE_REVERSE	3813	#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:	3814	case XTerm_Color_RV:
3918	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3815	process_color_seq (op, Color_RV, str, resp);
		3816	break;
		3817	case Rxvt_Color_BD:
		3818	case URxvt_Color_BD:
		3819	process_color_seq (op, Color_BD, str, resp);
		3820	break;
		3821	case Rxvt_Color_UL:
		3822	case URxvt_Color_UL:
		3823	process_color_seq (op, Color_UL, str, resp);
3919	break;	3824	break;
3920	case URxvt_Color_IT:	3825	case URxvt_Color_IT:
3921	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);	3826	process_color_seq (op, Color_IT, str, resp);
3922	break;	3827	break;
3923	#endif	3828	#endif
3924	#if TRANSPARENT && TINTING	3829	#if TRANSPARENT && TINTING
3925	case URxvt_Color_tint:	3830	case URxvt_Color_tint:
3926	process_color_seq (URxvt_Color_tint, Color_tint, str, resp);	3831	process_color_seq (op, Color_tint, str, resp);
		3832
3927	check_our_parents ();	3833	check_our_parents ();
		3834
3928	if (am_transparent)	3835	if (am_transparent)
3929	want_full_refresh = want_refresh = 1;	3836	want_full_refresh = want_refresh = 1;
3930	break;
3931	#endif
3932		3837
		3838	break;
		3839	#endif
		3840
3933	case XTerm_Pixmap:	3841	case Rxvt_Pixmap:
		3842	{
3934	if (*str != ';')	3843	if (*str != ';')
3935	{	3844	{
3936	#if XPM_BACKGROUND	3845	#if XPM_BACKGROUND
3937	scale_pixmap (""); /* reset to default scaling */	3846	scale_pixmap (""); /* reset to default scaling */
3938	set_bgPixmap (str); /* change pixmap */	3847	set_bgPixmap (str); /* change pixmap */
3939	#endif
3940	scr_touch (true);	3848	scr_touch (true);
		3849	#endif
3941	}	3850	}
		3851
		3852	int changed = 0;
		3853
3942	while ((str = strchr (str, ';')) != NULL)	3854	while ((str = strchr (str, ';')) != NULL)
3943	{	3855	{
3944	str++;	3856	str++;
3945	#if XPM_BACKGROUND	3857	#if XPM_BACKGROUND
3946	changed += scale_pixmap (str);	3858	changed += scale_pixmap (str);
3947	#endif	3859	#endif
3948	}	3860	}
3949		3861
3950	if (changed)	3862	if (changed)
3951	{	3863	{
3952	#ifdef XPM_BACKGROUND	3864	#ifdef XPM_BACKGROUND
3953	resize_pixmap ();	3865	resize_pixmap ();
3954	#endif
3955	scr_touch (true);	3866	scr_touch (true);
		3867	#endif
3956	}	3868	}
		3869	}
3957	break;	3870	break;
3958		3871
3959	case XTerm_restoreFG:	3872	case Rxvt_restoreFG:
3960	set_window_color (Color_fg, str);	3873	set_window_color (Color_fg, str);
3961	break;	3874	break;
3962	case XTerm_restoreBG:	3875	case Rxvt_restoreBG:
3963	set_window_color (Color_bg, str);	3876	set_window_color (Color_bg, str);
3964	break;	3877	break;
3965		3878
3966	case XTerm_logfile:	3879	case XTerm_logfile:
3967	// TODO, when secure mode?	3880	// TODO, when secure mode?
3968	break;	3881	break;
3969		3882
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	3883	#if 0
3977	case XTerm_dumpscreen: /* no error notices */	3884	case Rxvt_dumpscreen: /* no error notices */
3978	{	3885	{
3979	int fd;	3886	int fd;
3980	if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)	3887	if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3981	{	3888	{
3982	scr_dump (fd);	3889	scr_dump (fd);
…		…
4006	allocated.push_back ((void *)res);	3913	allocated.push_back ((void *)res);
4007	set_fonts ();	3914	set_fonts ();
4008	}	3915	}
4009	break;	3916	break;
4010		3917
4011	#if ENABLE_FRILLS	3918	case URxvt_version:
		3919	if (query)
		3920	tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
		3921	op,
		3922	rs[Rs_name], VERSION[0], VERSION[2],
		3923	resp);
		3924	break;
		3925
		3926	#if !ENABLE_MINIMAL
4012	case URxvt_locale:	3927	case URxvt_locale:
4013	if (query)	3928	if (query)
4014	tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);	3929	tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
4015	else	3930	else
4016	{	3931	{
4017	set_locale (str);	3932	set_locale (str);
4018	pty.set_utf8_mode (enc_utf8);	3933	pty->set_utf8_mode (enc_utf8);
4019	init_xlocale ();	3934	init_xlocale ();
4020	}	3935	}
4021	break;	3936	break;
4022		3937
4023	case URxvt_view_up:	3938	case URxvt_view_up:
…		…
4076	return state;	3991	return state;
4077	}	3992	}
4078		3993
4079	/* we're not using priv _yet_ */	3994	/* we're not using priv _yet_ */
4080	void	3995	void
4081	rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)	3996	rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4082	{	3997	{
4083	unsigned int i, j;	3998	unsigned int i, j;
4084	int state;	3999	int state;
4085		4000
4086	static const struct	4001	static const struct
…		…
4097	{ 5, PrivMode_rVideo },	4012	{ 5, PrivMode_rVideo },
4098	{ 6, PrivMode_relOrigin },	4013	{ 6, PrivMode_relOrigin },
4099	{ 7, PrivMode_Autowrap },	4014	{ 7, PrivMode_Autowrap },
4100	// 8, bi-directional support mode	4015	// 8, bi-directional support mode
4101	{ 9, PrivMode_MouseX10 },	4016	{ 9, PrivMode_MouseX10 },
4102	#ifdef menuBar_esc
4103	{ menuBar_esc, PrivMode_menuBar },
4104	#endif
4105	// 18, 19 printing-related	4017	// 18, 19 printing-related
4106	{ 25, PrivMode_VisibleCursor },	4018	{ 25, PrivMode_VisibleCursor },
4107	#ifdef scrollBar_esc	4019	#ifdef scrollBar_esc
4108	{ scrollBar_esc, PrivMode_scrollBar },	4020	{ scrollBar_esc, PrivMode_scrollBar },
4109	#endif	4021	#endif
…		…
4204	/* case 8: - auto repeat, can't do on a per window basis */	4116	/* case 8: - auto repeat, can't do on a per window basis */
4205	case 9: /* X10 mouse reporting */	4117	case 9: /* X10 mouse reporting */
4206	if (state) /* orthogonal */	4118	if (state) /* orthogonal */
4207	priv_modes &= ~PrivMode_MouseX11;	4119	priv_modes &= ~PrivMode_MouseX11;
4208	break;	4120	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	4121	#ifdef scrollBar_esc
4217	case scrollBar_esc:	4122	case scrollBar_esc:
4218	if (scrollbar_mapping (state))	4123	if (scrollbar_mapping (state))
4219	{	4124	{
4220	resize_all_windows (0, 0, 0);	4125	resize_all_windows (0, 0, 0);
…		…
4390	scr_color (Color_bg, Color_bg);	4295	scr_color (Color_bg, Color_bg);
4391	break;	4296	break;
4392		4297
4393	//case 50: // not variable spacing	4298	//case 50: // not variable spacing
4394		4299
4395	#if ENABLE_FRILLS	4300	#if !ENABLE_MINIMAL
4396	case 90:	4301	case 90:
4397	case 91: /* set bright fg color */	4302	case 91: /* set bright fg color */
4398	case 92:	4303	case 92:
4399	case 93:	4304	case 93:
4400	case 94:	4305	case 94:
…		…
4462	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT	4367	const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4463		4368
4464	void	4369	void
4465	rxvt_term::tt_write (const char *data, unsigned int len)	4370	rxvt_term::tt_write (const char *data, unsigned int len)
4466	{	4371	{
4467	if (pty.pty < 0)	4372	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4468	return;	4373	return;
4469		4374
		4375	if (pty->pty < 0)
		4376	return;
		4377
4470	if (v_buflen == 0)	4378	if (v_buflen == 0)
4471	{	4379	{
4472	ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));	4380	ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4473		4381
4474	if ((unsigned int)written == len)	4382	if ((unsigned int)written == len)
4475	return;	4383	return;
4476		4384
4477	data += written;	4385	data += written;
…		…
4486	pty_ev.set (EVENT_READ | EVENT_WRITE);	4394	pty_ev.set (EVENT_READ | EVENT_WRITE);
4487	}	4395	}
4488		4396
4489	void rxvt_term::pty_write ()	4397	void rxvt_term::pty_write ()
4490	{	4398	{
4491	int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));	4399	int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4492		4400
4493	if (written > 0)	4401	if (written > 0)
4494	{	4402	{
4495	v_buflen -= written;	4403	v_buflen -= written;
4496		4404

Diff Legend

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