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.300 by root, Tue Jan 31 19:53:30 2006 UTC

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

Diff Legend

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