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.268 by root, Tue Jan 17 05:47:42 2006 UTC vs.
Revision 1.323 by ayin, Mon May 28 18:38:03 2007 UTC

1	/*--------------------------------*-C-*---------------------------------*	1	/*----------------------------------------------------------------------*
2	* File: command.C	2	* File: command.C
3	*----------------------------------------------------------------------*	3	*----------------------------------------------------------------------*
4	*	4	*
5	* All portions of code are copyright by their respective author/s.	5	* All portions of code are copyright by their respective author/s.
6	* Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>	6	* Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
…		…
49	#include "rxvt.h"	49	#include "rxvt.h"
50	#include "rxvtperl.h"	50	#include "rxvtperl.h"
51	#include "version.h"	51	#include "version.h"
52	#include "command.h"	52	#include "command.h"
53		53
54	#if HAVE_SCHED_YIELD
55	#undef HAVE_SCHED_YIELD // disabled for the time being
56	//# include <sched.h>
57	#endif
58
59	#ifdef KEYSYM_RESOURCE	54	#ifdef KEYSYM_RESOURCE
60	# include "keyboard.h"	55	# include "keyboard.h"
61	#endif	56	#endif
62		57
63	#include <csignal>	58	#include <csignal>
64		59
		60	#if LINUX_YIELD_HACK
		61	# include <ctime>
		62	#endif
		63
65	/*----------------------------------------------------------------------*/	64	/*----------------------------------------------------------------------*/
66		65
67	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)	66	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68
69	// exception thrown when the command parser runs out of input data
70	class out_of_input { } out_of_input;
71		67
72	#if ENABLE_FRILLS || ISO_14755	68	#if ENABLE_FRILLS || ISO_14755
73		69
74	#define ISO_14755_STARTED 0x80000000UL	70	#define ISO_14755_STARTED 0x80000000UL
75	#define ISO_14755_51 0x40000000UL // basic (section 5.1)	71	#define ISO_14755_51 0x40000000UL // basic (section 5.1)
…		…
230	# if !UNICODE3	226	# if !UNICODE3
231	if (ch >= 0x10000)	227	if (ch >= 0x10000)
232	ch = 0xfffd;	228	ch = 0xfffd;
233	# endif	229	# endif
234	scr_overlay_set (11, y, ch, r);	230	scr_overlay_set (11, y, ch, r);
		231
		232	if (WCWIDTH (ch) >= 2)
235	scr_overlay_set (12, y, NOCHAR, r);	233	scr_overlay_set (12, y, NOCHAR, r);
236	}	234	}
237		235
		236	// {
		237	// char buf[4+4+3+1];
		238	// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
		239	// scr_overlay_set (0, 0, buf);
		240	// }
238	scr_overlay_set (0, len , attr);	241	scr_overlay_set (0, len , attr);
239	scr_overlay_set (0, len + 1, fname);	242	scr_overlay_set (0, len + 1, fname);
240		243
241	free (fname);	244	free (fname);
242		245
…		…
295		298
296	return -1;	299	return -1;
297	}	300	}
298	#endif	301	#endif
299		302
300	/*{{{ Convert the keypress event into a string */
301	void	303	void
302	rxvt_term::lookup_key (XKeyEvent &ev)	304	rxvt_term::key_press (XKeyEvent &ev)
303	{	305	{
304	int ctrl, meta, shft, len;	306	int ctrl, meta, shft, len;
305	unsigned int newlen;	307	unsigned int newlen;
306	KeySym keysym;	308	KeySym keysym;
307	#ifdef DEBUG_CMD
308	static int debug_key = 1; /* accessible by a debugger only */
309	#endif
310	int valid_keysym;	309	int valid_keysym;
311	char kbuf[KBUFSZ];	310	char kbuf[KBUFSZ];
		311
		312	#if ISO_14755
		313	if (iso14755buf & ISO_14755_52)
		314	return;
		315	#endif
312		316
313	/*	317	/*
314	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an	318	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
315	* escape sequence to toggle the Keypad.	319	* escape sequence to toggle the Keypad.
316	*	320	*
…		…
464	{	468	{
465	switch (keysym)	469	switch (keysym)
466	{	470	{
467	/* normal XTerm key bindings */	471	/* normal XTerm key bindings */
468	case XK_Insert: /* Shift+Insert = paste mouse selection */	472	case XK_Insert: /* Shift+Insert = paste mouse selection */
469	selection_request (ev.time, 0, 0);	473	selection_request (ev.time);
470	return;	474	return;
471	#if TODO	475	#if TODO
472	/* rxvt extras */	476	/* rxvt extras */
473	case XK_KP_Add: /* Shift+KP_Add = bigger font */	477	case XK_KP_Add: /* Shift+KP_Add = bigger font */
474	change_font (FONT_UP);	478	change_font (FONT_UP);
…		…
493	{	497	{
494	commit_iso14755 ();	498	commit_iso14755 ();
495	iso14755buf = ISO_14755_51;	499	iso14755buf = ISO_14755_51;
496	# if ISO_14755	500	# if ISO_14755
497	iso14755_51 (0);	501	iso14755_51 (0);
		502	# endif
		503	return;
		504	}
		505	else if (keysym == XK_BackSpace)
		506	{
		507	iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
		508	# if ISO_14755
		509	iso14755_51 (iso14755buf & ISO_14755_MASK);
498	# endif	510	# endif
499	return;	511	return;
500	}	512	}
501	else if ((hv = hex_keyval (ev)) >= 0)	513	else if ((hv = hex_keyval (ev)) >= 0)
502	{	514	{
…		…
873	return;	885	return;
874		886
875	if (len <= 0)	887	if (len <= 0)
876	return; /* not mapped */	888	return; /* not mapped */
877		889
878	if (OPTION (Opt_scrollTtyKeypress))	890	if (option (Opt_scrollTtyKeypress))
879	if (view_start)	891	if (view_start)
880	{	892	{
881	view_start = 0;	893	view_start = 0;
882	want_refresh = 1;	894	want_refresh = 1;
883	}	895	}
…		…
905	{	917	{
906	const char ch = C0_ESC;	918	const char ch = C0_ESC;
907	tt_write (&ch, 1);	919	tt_write (&ch, 1);
908	}	920	}
909		921
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);	922	tt_write (kbuf, (unsigned int)len);
921	}	923	}
922	/*}}} */	924
		925	void
		926	rxvt_term::key_release (XKeyEvent &ev)
		927	{
		928	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
		929	KeySym keysym;
		930
		931	keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
		932	#endif
		933
		934	#if ENABLE_FRILLS || ISO_14755
		935	// ISO 14755 support
		936	if (iso14755buf)
		937	if (iso14755buf & ISO_14755_52)
		938	{
		939	# if ENABLE_OVERLAY
		940	scr_overlay_off ();
		941	# endif
		942	# if ISO_14755
		943	// iso14755 part 5.2 handling: release time
		944	// first: controls
		945	if ((ev.state & ControlMask)
		946	&& ((keysym >= 0x40 && keysym <= 0x5f)
		947	|| (keysym >= 0x61 && keysym <= 0x7f)))
		948	{
		949	iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
		950	commit_iso14755 ();
		951
		952	return;
		953	}
		954
		955	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
		956	if (i[0] == keysym)
		957	{
		958	iso14755buf = ISO_14755_51 | i[1];
		959	commit_iso14755 ();
		960
		961	return;
		962	}
		963
		964	scr_bell ();
		965	# endif
		966	iso14755buf = 0;
		967
		968	return;
		969	}
		970	else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
		971	{
		972	# if ENABLE_OVERLAY
		973	scr_overlay_off ();
		974	# endif
		975	if (iso14755buf & ISO_14755_51)
		976	commit_iso14755 ();
		977	#if ISO_14755
		978	else if (iso14755buf & ISO_14755_STARTED)
		979	{
		980	iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
		981
		982	scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
		983	scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
		984	}
		985	# endif
		986	else
		987	iso14755buf = 0;
		988	}
		989	#endif
		990
		991	if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
		992	return;
		993
		994	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
		995	if (!(ev.state & ControlMask))
		996	slip_wheel_ev.stop ();
		997	else if (keysym == XK_Control_L || keysym == XK_Control_R)
		998	mouse_slip_wheel_speed = 0;
		999	#endif
		1000	}
923		1001
924	#if defined (KEYSYM_RESOURCE)	1002	#if defined (KEYSYM_RESOURCE)
925	unsigned int	1003	unsigned int
926	rxvt_term::cmd_write (const char *str, unsigned int count)	1004	rxvt_term::cmd_write (const char *str, unsigned int count)
927	{	1005	{
…		…
1044	rxvt_term::cursor_blink_cb (time_watcher &w)	1122	rxvt_term::cursor_blink_cb (time_watcher &w)
1045	{	1123	{
1046	hidden_cursor = !hidden_cursor;	1124	hidden_cursor = !hidden_cursor;
1047	want_refresh = 1;	1125	want_refresh = 1;
1048		1126
1049	w.start (w.at + BLINK_INTERVAL);	1127	w.start (w.at + CURSOR_BLINK_INTERVAL);
1050	}	1128	}
1051	#endif	1129	#endif
1052		1130
1053	#ifdef TEXT_BLINK	1131	#ifdef TEXT_BLINK
1054	void	1132	void
…		…
1104	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1182	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1105	}	1183	}
1106	}	1184	}
1107	#endif	1185	#endif
1108		1186
1109	#if HAVE_SCHED_YIELD	1187	#if LINUX_YIELD_HACK
1110	static struct event_handler	1188	static struct event_handler
1111	{	1189	{
1112	check_watcher cw_yield;	1190	check_watcher yield_ev;
1113		1191
1114	void yield (check_watcher &w)	1192	void yield_cb (check_watcher &w)
1115	{	1193	{
1116	sched_yield ();	1194	// this should really be sched_yield(), but the linux guys thought
		1195	// that giving a process calling sched_yield () less cpu time than
		1196	// ones with high nice levels is a useful thing to do. It surely is is
		1197	// allowed by the sus... as is returning ENOSYS.
		1198
		1199	struct timespec ts = { 0, 0 };
		1200	nanosleep (&ts, 0);
		1201
1117	w.stop ();	1202	w.stop ();
1118	}	1203	}
1119		1204
1120	event_handler ()	1205	event_handler ()
1121	: cw_yield (this, &event_handler::yield)	1206	: yield_ev (this, &event_handler::yield_cb)
1122	{	1207	{
1123	}	1208	}
1124	} event_handler;	1209	} event_handler;
1125	#endif	1210	#endif
1126		1211
…		…
1137		1222
1138	memmove (cmdbuf_base, cmdbuf_ptr, n);	1223	memmove (cmdbuf_base, cmdbuf_ptr, n);
1139	cmdbuf_ptr = cmdbuf_base;	1224	cmdbuf_ptr = cmdbuf_base;
1140	cmdbuf_endp = cmdbuf_ptr + n;	1225	cmdbuf_endp = cmdbuf_ptr + n;
1141		1226
1142	ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);	1227	ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1143		1228
1144	if (r > 0)	1229	if (r > 0)
1145	{	1230	{
1146	cmdbuf_endp += r;	1231	cmdbuf_endp += r;
1147	return true;	1232	return true;
1148	}	1233	}
1149	else if (r < 0 && (errno == EAGAIN || errno == EINTR))	1234	else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1150	{	1235	{
1151	#if HAVE_SCHED_YIELD	1236	#if LINUX_YIELD_HACK
1152	if (display->is_local)	1237	if (display->is_local)
1153	event_handler.cw_yield.start ();	1238	event_handler.yield_ev.start ();
1154	#endif	1239	#endif
1155	}	1240	}
1156	else	1241	else
1157	{	1242	{
1158	pty_ev.stop ();	1243	pty_ev.stop ();
1159		1244
1160	if (!OPTION (Opt_hold))	1245	if (!option (Opt_hold))
1161	destroy ();	1246	destroy ();
1162	}	1247	}
1163		1248
1164	return false;	1249	return false;
1165	}	1250	}
…		…
1180	}	1265	}
1181		1266
1182	void	1267	void
1183	rxvt_term::pointer_unblank ()	1268	rxvt_term::pointer_unblank ()
1184	{	1269	{
1185	XDefineCursor (display->display, vt, TermWin_cursor);	1270	XDefineCursor (dpy, vt, TermWin_cursor);
1186	recolour_cursor ();	1271	recolour_cursor ();
1187		1272
1188	#ifdef POINTER_BLANK	1273	#ifdef POINTER_BLANK
1189	hidden_pointer = 0;	1274	hidden_pointer = 0;
1190		1275
1191	if (OPTION (Opt_pointerBlank))	1276	if (option (Opt_pointerBlank))
1192	pointer_ev.start (NOW + pointerBlankDelay);	1277	pointer_ev.start (NOW + pointerBlankDelay);
1193	#endif	1278	#endif
1194	}	1279	}
1195		1280
1196	#ifdef POINTER_BLANK	1281	#ifdef POINTER_BLANK
1197	void	1282	void
1198	rxvt_term::pointer_blank ()	1283	rxvt_term::pointer_blank ()
1199	{	1284	{
1200	if (!OPTION (Opt_pointerBlank))	1285	if (!option (Opt_pointerBlank))
1201	return;	1286	return;
1202		1287
1203	XDefineCursor (display->display, vt, display->blank_cursor);	1288	XDefineCursor (dpy, vt, display->blank_cursor);
1204	XFlush (display->display);	1289	XFlush (dpy);
1205		1290
1206	hidden_pointer = 1;	1291	hidden_pointer = 1;
1207	}	1292	}
1208		1293
1209	void	1294	void
…		…
1282	(32 + button_number + key_state),	1367	(32 + button_number + key_state),
1283	(32 + x + 1),	1368	(32 + x + 1),
1284	(32 + y + 1));	1369	(32 + y + 1));
1285	}	1370	}
1286		1371
1287	#ifdef USING_W11LIB
1288	void
1289	rxvt_W11_process_x_event (XEvent *ev)
1290	{
1291	rxvt_t *r = rxvt_get_r ();
1292
1293	x_cb (*ev);
1294	}
1295	#endif
1296
1297	/*{{{ process an X event */	1372	/*{{{ process an X event */
1298	void	1373	void
1299	rxvt_term::x_cb (XEvent &ev)	1374	rxvt_term::x_cb (XEvent &ev)
1300	{	1375	{
1301	make_current ();	1376	make_current ();
1302		1377
1303	dDisp;	1378	dLocal (Display *, dpy);
1304		1379
1305	if (ev.xany.window == vt	1380	if (ev.xany.window == vt
1306	&& SHOULD_INVOKE (HOOK_X_EVENT)	1381	&& SHOULD_INVOKE (HOOK_X_EVENT)
1307	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))	1382	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1308	return;	1383	return;
…		…
1313	unsigned int unused_mask;	1388	unsigned int unused_mask;
1314		1389
1315	switch (ev.type)	1390	switch (ev.type)
1316	{	1391	{
1317	case KeyPress:	1392	case KeyPress:
1318	#if ISO_14755	1393	key_press (ev.xkey);
1319	if (!(iso14755buf & ISO_14755_52))
1320	#endif
1321	lookup_key (ev.xkey);
1322
1323	break;	1394	break;
1324		1395
1325	case KeyRelease:	1396	case KeyRelease:
1326	{	1397	key_release (ev.xkey);
1327	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1328	KeySym keysym;
1329
1330	keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1331	#endif
1332
1333	#if ENABLE_FRILLS || ISO_14755
1334	// ISO 14755 support
1335	if (iso14755buf)
1336	if (iso14755buf & ISO_14755_52)
1337	{
1338	# if ENABLE_OVERLAY
1339	scr_overlay_off ();
1340	# endif
1341	# if ISO_14755
1342	// iso14755 part 5.2 handling: release time
1343	// first: controls
1344	if ((ev.xkey.state & ControlMask)
1345	&& ((keysym >= 0x40 && keysym <= 0x5f)
1346	|| (keysym >= 0x61 && keysym <= 0x7f)))
1347	{
1348	iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1349	commit_iso14755 ();
1350	goto skip_switch;
1351	}
1352
1353	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1354	if (i[0] == keysym)
1355	{
1356	iso14755buf = ISO_14755_51 | i[1];
1357	commit_iso14755 ();
1358	goto skip_switch;
1359	}
1360
1361	scr_bell ();
1362	# endif
1363	iso14755buf = 0;
1364	break;
1365	}
1366	else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1367	{
1368	# if ENABLE_OVERLAY
1369	scr_overlay_off ();
1370	# endif
1371	if (iso14755buf & ISO_14755_51)
1372	commit_iso14755 ();
1373	#if ISO_14755
1374	else if (iso14755buf & ISO_14755_STARTED)
1375	{
1376	iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1377
1378	scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1379	scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1380	}
1381	# endif
1382	else
1383	iso14755buf = 0;
1384	}
1385	#endif
1386
1387	if (ev.xany.window == vt
1388	&& HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1389	break;
1390
1391	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1392	if (!(ev.xkey.state & ControlMask))
1393	slip_wheel_ev.stop ();
1394	else if (keysym == XK_Control_L || keysym == XK_Control_R)
1395	mouse_slip_wheel_speed = 0;
1396	#endif
1397	break;	1398	break;
1398	}
1399		1399
1400	case ButtonPress:	1400	case ButtonPress:
1401	button_press (ev.xbutton);	1401	button_press (ev.xbutton);
1402	break;	1402	break;
1403		1403
…		…
1405	button_release (ev.xbutton);	1405	button_release (ev.xbutton);
1406	break;	1406	break;
1407		1407
1408	case ClientMessage:	1408	case ClientMessage:
1409	if (ev.xclient.format == 32	1409	if (ev.xclient.format == 32
1410	&& ev.xclient.message_type == xa[XA_WM_PROTOCOLS])	1410	&& !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1411	{	1411	{
		1412	if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
		1413	{
		1414	if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
		1415	{
1412	if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])	1416	if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
		1417	{
		1418	if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1413	destroy ();	1419	destroy ();
		1420	}
1414	#if ENABLE_EWMH	1421	#if ENABLE_EWMH
1415	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])	1422	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1416	XSendEvent (disp, ev.xclient.window = display->root,	1423	XSendEvent (dpy, ev.xclient.window = display->root,
1417	False, SubstructureRedirectMask | SubstructureNotifyMask,	1424	False, SubstructureRedirectMask | SubstructureNotifyMask,
1418	&ev);	1425	&ev);
		1426	#endif
		1427	}
		1428	}
		1429	#if ENABLE_XEMBED
		1430	else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
		1431	{
		1432	if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
		1433	focus_in ();
		1434	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
		1435	focus_out ();
		1436	}
1419	#endif	1437	#endif
1420	}	1438	}
1421	#if ENABLE_XEMBED
1422	else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1423	{
1424	if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1425	focus_in ();
1426	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1427	focus_out ();
1428	}
1429	#endif
1430	#ifdef OFFIX_DND
1431	/* OffiX Dnd (drag 'n' drop) protocol */
1432	else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1433	&& (ev.xclient.data.l[0] == DndFile
1434	|| ev.xclient.data.l[0] == DndDir
1435	|| ev.xclient.data.l[0] == DndLink))
1436	{
1437	/* Get Dnd data */
1438	Atom ActualType;
1439	int ActualFormat;
1440	unsigned char *data;
1441	unsigned long Size, RemainingBytes;
1442
1443	XGetWindowProperty (disp, display->root,
1444	xa[XA_DNDSELECTION],
1445	0L, 1000000L,
1446	False, AnyPropertyType,
1447	&ActualType, &ActualFormat,
1448	&Size, &RemainingBytes,
1449	&data);
1450	set_string_property (XA_CUT_BUFFER0, data);
1451	XFree (data);
1452	selection_paste (display->root, XA_CUT_BUFFER0, true);
1453	XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1454	}
1455	#endif /* OFFIX_DND */
1456	break;	1439	break;
1457		1440
1458	case MappingNotify:	1441	case MappingNotify:
1459	XRefreshKeyboardMapping (&ev.xmapping);	1442	XRefreshKeyboardMapping (&ev.xmapping);
1460	break;	1443	break;
…		…
1483	break;	1466	break;
1484	}	1467	}
1485	break;	1468	break;
1486		1469
1487	case FocusIn:	1470	case FocusIn:
		1471	if (ev.xfocus.detail != NotifyInferior
		1472	&& ev.xfocus.detail != NotifyPointer
		1473	&& ev.xfocus.mode != NotifyGrab)
1488	focus_in ();	1474	focus_in ();
1489	break;	1475	break;
1490		1476
1491	case FocusOut:	1477	case FocusOut:
		1478	if (ev.xfocus.detail != NotifyInferior
		1479	&& ev.xfocus.detail != NotifyPointer
		1480	&& ev.xfocus.mode != NotifyGrab)
1492	focus_out ();	1481	focus_out ();
1493	break;	1482	break;
1494		1483
1495	case ConfigureNotify:	1484	case ConfigureNotify:
1496	if (ev.xconfigure.window == parent[0])	1485	if (ev.xconfigure.window == parent[0])
1497	{	1486	{
1498	while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))	1487	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1499	;	1488	;
1500		1489
1501	if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)	1490	if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1502	{	1491	{
1503	seen_resize = 1;	1492	seen_resize = 1;
1504	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1493	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1505	}	1494	}
1506		1495
1507	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */	1496	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
		1497
		1498	#ifdef TRANSPARENT
1508	if (OPTION (Opt_transparent))	1499	if (option (Opt_transparent))
1509	check_our_parents ();	1500	check_our_parents ();
1510	#endif	1501	#endif
1511	}	1502	}
1512	break;	1503	break;
1513		1504
1514	case PropertyNotify:	1505	case PropertyNotify:
		1506	if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1515	if (ev.xproperty.atom == xa[XA_VT_SELECTION]	1507	if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1516	&& ev.xproperty.state == PropertyNewValue)	1508	&& ev.xproperty.state == PropertyNewValue)
1517	selection_property (ev.xproperty.window, ev.xproperty.atom);	1509	selection_property (ev.xproperty.window, ev.xproperty.atom);
1518		1510
1519	break;	1511	break;
1520		1512
1521	case SelectionClear:	1513	case SelectionClear:
1522	selection_clear ();	1514	selection_clear ();
…		…
1558	if (ev.xany.window == vt)	1550	if (ev.xany.window == vt)
1559	{	1551	{
1560	do	1552	do
1561	scr_expose (ev.xexpose.x, ev.xexpose.y,	1553	scr_expose (ev.xexpose.x, ev.xexpose.y,
1562	ev.xexpose.width, ev.xexpose.height, False);	1554	ev.xexpose.width, ev.xexpose.height, False);
1563	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));	1555	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1564		1556
1565	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1557	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1566		1558
1567	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))	1559	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1568	scr_expose (ev.xexpose.x, ev.xexpose.y,	1560	scr_expose (ev.xexpose.x, ev.xexpose.y,
1569	ev.xexpose.width, ev.xexpose.height, False);	1561	ev.xexpose.width, ev.xexpose.height, False);
1570		1562
1571	want_refresh = 1;	1563	want_refresh = 1;
1572	}	1564	}
1573	else	1565	else
1574	{	1566	{
1575	XEvent unused_event;	1567	XEvent unused_event;
1576		1568
1577	while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))	1569	while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1578	;	1570	;
1579	while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))	1571	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1580	;	1572	;
1581		1573
1582	if (isScrollbarWindow (ev.xany.window))	1574	if (isScrollbarWindow (ev.xany.window))
1583	{	1575	{
1584	scrollBar.setIdle ();	1576	scrollBar.setIdle ();
1585	scrollbar_show (0);	1577	scrollbar_show (0);
1586	}	1578	}
1587		1579
1588	#ifdef TRANSPARENT	1580	#ifdef TRANSPARENT
1589	if (am_transparent && ev.xany.window == parent[0])	1581	if (am_transparent && ev.xany.window == parent[0])
1590	XClearWindow (disp, ev.xany.window);	1582	XClearWindow (dpy, ev.xany.window);
1591	#endif	1583	#endif
1592	}	1584	}
1593	break;	1585	break;
1594		1586
1595	case MotionNotify:	1587	case MotionNotify:
…		…
1605	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)	1597	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1606	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))	1598	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1607	; // nop	1599	; // nop
1608	else if (ev.xbutton.state & (Button1Mask | Button3Mask))	1600	else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1609	{	1601	{
1610	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))	1602	while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1611	;	1603	;
1612		1604
1613	XQueryPointer (disp, vt,	1605	XQueryPointer (dpy, vt,
1614	&unused_root, &unused_child,	1606	&unused_root, &unused_child,
1615	&unused_root_x, &unused_root_y,	1607	&unused_root_x, &unused_root_y,
1616	&ev.xbutton.x, &ev.xbutton.y,	1608	&ev.xbutton.x, &ev.xbutton.y,
1617	&ev.xbutton.state);	1609	&ev.xbutton.state);
1618	#ifdef MOUSE_THRESHOLD	1610	#ifdef MOUSE_THRESHOLD
…		…
1682	#endif	1674	#endif
1683	}	1675	}
1684	}	1676	}
1685	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1677	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1686	{	1678	{
1687	while (XCheckTypedWindowEvent (disp, scrollBar.win,	1679	while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1688	MotionNotify, &ev))	1680	MotionNotify, &ev))
1689	;	1681	;
1690		1682
1691	XQueryPointer (disp, scrollBar.win,	1683	XQueryPointer (dpy, scrollBar.win,
1692	&unused_root, &unused_child,	1684	&unused_root, &unused_child,
1693	&unused_root_x, &unused_root_y,	1685	&unused_root_x, &unused_root_y,
1694	&ev.xbutton.x, &ev.xbutton.y,	1686	&ev.xbutton.x, &ev.xbutton.y,
1695	&unused_mask);	1687	&unused_mask);
1696	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1688	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
…		…
1700	scrollbar_show (1);	1692	scrollbar_show (1);
1701	}	1693	}
1702	break;	1694	break;
1703	}	1695	}
1704		1696
1705	skip_switch: ;
1706
1707	#if defined(CURSOR_BLINK)	1697	#if defined(CURSOR_BLINK)
1708	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)	1698	if (option (Opt_cursorBlink) && ev.type == KeyPress)
1709	{	1699	{
1710	if (hidden_cursor)	1700	if (hidden_cursor)
1711	{	1701	{
1712	hidden_cursor = 0;	1702	hidden_cursor = 0;
1713	want_refresh = 1;	1703	want_refresh = 1;
1714	}	1704	}
1715		1705
1716	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1706	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1717	}	1707	}
1718	#endif	1708	#endif
1719		1709
1720	#if defined(POINTER_BLANK)	1710	#if defined(POINTER_BLANK)
1721	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)	1711	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1722	{	1712	{
1723	if (ev.type == MotionNotify	1713	if (ev.type == MotionNotify
1724	|| ev.type == ButtonPress	1714	|| ev.type == ButtonPress
1725	|| ev.type == ButtonRelease)	1715	|| ev.type == ButtonRelease)
1726	if (hidden_pointer)	1716	if (hidden_pointer)
…		…
1738	if (!focus)	1728	if (!focus)
1739	{	1729	{
1740	focus = 1;	1730	focus = 1;
1741	want_refresh = 1;	1731	want_refresh = 1;
1742		1732
1743	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));	1733	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1744		1734
1745	#if USE_XIM	1735	#if USE_XIM
1746	if (Input_Context != NULL)	1736	if (Input_Context != NULL)
1747	{	1737	{
1748	IMSetStatusPosition ();	1738	IMSetPosition ();
1749	XSetICFocus (Input_Context);	1739	XSetICFocus (Input_Context);
1750	}	1740	}
1751	#endif	1741	#endif
1752	#if CURSOR_BLINK	1742	#if CURSOR_BLINK
1753	if (OPTION (Opt_cursorBlink))	1743	if (option (Opt_cursorBlink))
1754	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1744	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1755	#endif	1745	#endif
1756	#if OFF_FOCUS_FADING	1746	#if OFF_FOCUS_FADING
1757	if (rs[Rs_fade])	1747	if (rs[Rs_fade])
1758	{	1748	{
1759	pix_colors = pix_colors_focused;	1749	pix_colors = pix_colors_focused;
1760	scr_recolour ();	1750	scr_recolour ();
		1751	}
		1752	#endif
		1753	#if ENABLE_FRILLS
		1754	if (option (Opt_urgentOnBell))
		1755	{
		1756	XWMHints *h;
		1757
		1758	h = XGetWMHints(dpy, parent[0]);
		1759	if (h != NULL)
		1760	{
		1761	h->flags &= ~XUrgencyHint;
		1762	XSetWMHints(dpy, parent[0], h);
		1763	}
1761	}	1764	}
1762	#endif	1765	#endif
1763	}	1766	}
1764	}	1767	}
1765		1768
…		…
1785	#if USE_XIM	1788	#if USE_XIM
1786	if (Input_Context != NULL)	1789	if (Input_Context != NULL)
1787	XUnsetICFocus (Input_Context);	1790	XUnsetICFocus (Input_Context);
1788	#endif	1791	#endif
1789	#if CURSOR_BLINK	1792	#if CURSOR_BLINK
1790	if (OPTION (Opt_cursorBlink))	1793	if (option (Opt_cursorBlink))
1791	cursor_blink_ev.stop ();	1794	cursor_blink_ev.stop ();
1792	hidden_cursor = 0;	1795	hidden_cursor = 0;
1793	#endif	1796	#endif
1794	#if OFF_FOCUS_FADING	1797	#if OFF_FOCUS_FADING
1795	if (rs[Rs_fade])	1798	if (rs[Rs_fade])
…		…
1799	}	1802	}
1800	#endif	1803	#endif
1801	}	1804	}
1802	}	1805	}
1803		1806
1804	#if TRANSPARENT	1807	void
		1808	rxvt_term::update_fade_color (unsigned int idx)
		1809	{
		1810	#if OFF_FOCUS_FADING
		1811	if (rs[Rs_fade])
		1812	{
		1813	rgba c;
		1814	pix_colors [Color_fade].get (c);
		1815	pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
		1816	}
		1817	#endif
		1818	}
		1819
		1820	#if TRANSPARENT || ENABLE_PERL
1805	void	1821	void
1806	rxvt_term::rootwin_cb (XEvent &ev)	1822	rxvt_term::rootwin_cb (XEvent &ev)
1807	{	1823	{
1808	make_current ();	1824	make_current ();
1809		1825
		1826	if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
		1827	&& HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
		1828	return;
		1829
		1830	# if TRANSPARENT
1810	switch (ev.type)	1831	switch (ev.type)
1811	{	1832	{
1812	case PropertyNotify:	1833	case PropertyNotify:
1813	/*	1834	/*
1814	* if user used some Esetroot compatible prog to set the root bg,	1835	* if user used some Esetroot compatible prog to set the root bg,
…		…
1818	&& ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])	1839	&& ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1819	return;	1840	return;
1820		1841
1821	/* FALLTHROUGH */	1842	/* FALLTHROUGH */
1822	case ReparentNotify:	1843	case ReparentNotify:
1823	if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)	1844	if (option (Opt_transparent) && check_our_parents () && am_transparent)
1824	want_refresh = want_full_refresh = 1;	1845	want_refresh = want_full_refresh = 1;
1825	break;	1846	break;
1826	}	1847	}
		1848	# endif
1827	}	1849	}
1828	#endif	1850	#endif
1829		1851
1830	void	1852	void
1831	rxvt_term::button_press (XButtonEvent &ev)	1853	rxvt_term::button_press (XButtonEvent &ev)
…		…
1840	/*	1862	/*
1841	* VT window processing of button press	1863	* VT window processing of button press
1842	*/	1864	*/
1843	if (ev.window == vt)	1865	if (ev.window == vt)
1844	{	1866	{
		1867	if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
		1868	return;
		1869
1845	#if ISO_14755	1870	#if ISO_14755
1846	// 5.4	1871	// 5.4
1847	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))	1872	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1848	{	1873	{
1849	iso14755_54 (ev.x, ev.y);	1874	iso14755_54 (ev.x, ev.y);
…		…
1891	else	1916	else
1892	{	1917	{
1893	if (ev.button != MEvent.button)	1918	if (ev.button != MEvent.button)
1894	MEvent.clicks = 0;	1919	MEvent.clicks = 0;
1895		1920
1896	if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1897	switch (ev.button)	1921	switch (ev.button)
1898	{	1922	{
1899	case Button1:	1923	case Button1:
1900	/* allow meta + click to select rectangular areas */	1924	/* allow meta + click to select rectangular areas */
1901	/* should be done in screen.C */	1925	/* should be done in screen.C */
1902	#if ENABLE_FRILLS	1926	#if ENABLE_FRILLS
1903	selection.rect = !!(ev.state & ModMetaMask);	1927	selection.rect = !!(ev.state & ModMetaMask);
1904	#else	1928	#else
1905	selection.rect = false;	1929	selection.rect = false;
1906	#endif	1930	#endif
1907		1931
1908	/* allow shift+left click to extend selection */	1932	/* allow shift+left click to extend selection */
1909	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))	1933	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1910	{	1934	{
1911	if (MEvent.button == Button1 && clickintime)	1935	if (MEvent.button == Button1 && clickintime)
1912	selection_rotate (ev.x, ev.y);	1936	selection_rotate (ev.x, ev.y);
1913	else	1937	else
1914	selection_extend (ev.x, ev.y, 1);	1938	selection_extend (ev.x, ev.y, 1);
1915	}	1939	}
1916	else	1940	else
1917	{	1941	{
1918	if (MEvent.button == Button1 && clickintime)	1942	if (MEvent.button == Button1 && clickintime)
1919	MEvent.clicks++;	1943	MEvent.clicks++;
1920	else	1944	else
1921	MEvent.clicks = 1;	1945	MEvent.clicks = 1;
1922		1946
1923	selection_click (MEvent.clicks, ev.x, ev.y);	1947	selection_click (MEvent.clicks, ev.x, ev.y);
1924	}	1948	}
1925		1949
1926	MEvent.button = Button1;	1950	MEvent.button = Button1;
1927	break;	1951	break;
1928		1952
1929	case Button3:	1953	case Button3:
1930	if (MEvent.button == Button3 && clickintime)	1954	if (MEvent.button == Button3 && clickintime)
1931	selection_rotate (ev.x, ev.y);	1955	selection_rotate (ev.x, ev.y);
1932	else	1956	else
1933	selection_extend (ev.x, ev.y, 1);	1957	selection_extend (ev.x, ev.y, 1);
1934		1958
1935	MEvent.button = Button3;	1959	MEvent.button = Button3;
1936	break;	1960	break;
1937	}	1961	}
1938	}	1962	}
1939		1963
1940	MEvent.time = ev.time;	1964	MEvent.time = ev.time;
1941	return;	1965	return;
1942	}	1966	}
1943		1967
…		…
2106	sel_scroll_ev.stop();	2130	sel_scroll_ev.stop();
2107	#endif	2131	#endif
2108		2132
2109	if (ev.window == vt)	2133	if (ev.window == vt)
2110	{	2134	{
		2135	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
		2136	return;
		2137
2111	#if ISO_14755	2138	#if ISO_14755
2112	// 5.4	2139	// 5.4
2113	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))	2140	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2114	return;	2141	return;
2115	#endif	2142	#endif
		2143
2116	if (reportmode)	2144	if (reportmode)
2117	{	2145	{
2118	/* mouse report from vt window */	2146	/* mouse report from vt window */
2119	/* don't report release of wheel "buttons" */	2147	/* don't report release of wheel "buttons" */
2120	if (ev.button >= 4)	2148	if (ev.button >= 4)
…		…
2144	if (priv_modes & PrivMode_mouse_report	2172	if (priv_modes & PrivMode_mouse_report
2145	&& bypass_keystate	2173	&& bypass_keystate
2146	&& ev.button == Button1 && MEvent.clicks <= 1)	2174	&& ev.button == Button1 && MEvent.clicks <= 1)
2147	selection_extend (ev.x, ev.y, 0);	2175	selection_extend (ev.x, ev.y, 0);
2148		2176
2149	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2150	return;
2151
2152	switch (ev.button)	2177	switch (ev.button)
2153	{	2178	{
2154	case Button1:	2179	case Button1:
2155	case Button3:	2180	case Button3:
2156	selection_make (ev.time);	2181	selection_make (ev.time);
2157	break;	2182	break;
		2183
2158	case Button2:	2184	case Button2:
2159	selection_request (ev.time, ev.x, ev.y);	2185	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
		2186	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2160	break;	2187	break;
		2188
2161	#ifdef MOUSE_WHEEL	2189	#ifdef MOUSE_WHEEL
2162	case Button4:	2190	case Button4:
2163	case Button5:	2191	case Button5:
2164	{	2192	{
2165	int i;	2193	int i;
…		…
2167		2195
2168	v = ev.button == Button4 ? UP : DN;	2196	v = ev.button == Button4 ? UP : DN;
2169		2197
2170	if (ev.state & ShiftMask)	2198	if (ev.state & ShiftMask)
2171	i = 1;	2199	i = 1;
2172	else if (OPTION (Opt_mouseWheelScrollPage))	2200	else if (option (Opt_mouseWheelScrollPage))
2173	i = nrow - 1;	2201	i = nrow - 1;
2174	else	2202	else
2175	i = 5;	2203	i = 5;
2176		2204
2177	# ifdef MOUSE_SLIP_WHEELING	2205	# ifdef MOUSE_SLIP_WHEELING
…		…
2205	#if TINTING	2233	#if TINTING
2206	/* taken from aterm-0.4.2 */	2234	/* taken from aterm-0.4.2 */
2207		2235
2208	typedef uint32_t RUINT32T;	2236	typedef uint32_t RUINT32T;
2209		2237
2210	void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)	2238	void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2211	{	2239	{
2212	int sh_r, sh_g, sh_b;	2240	int sh_r, sh_g, sh_b;
2213	RUINT32T mask_r, mask_g, mask_b;	2241	RUINT32T mask_r, mask_g, mask_b;
2214	RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;	2242	RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2215	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;	2243	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2216	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;	2244	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2217	int i;	2245	int i;
2218		2246
2219	Visual *visual = display->visual;	2247	Visual *visual = term->visual;
2220		2248
2221	if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;	2249	if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2222		2250
2223	/* for convenience */	2251	/* for convenience */
2224	mask_r = visual->red_mask;	2252	mask_r = visual->red_mask;
…		…
2445	Atom atype;	2473	Atom atype;
2446	unsigned char *prop = NULL;	2474	unsigned char *prop = NULL;
2447	Window root, oldp, *list;	2475	Window root, oldp, *list;
2448	Pixmap rootpixmap = None;	2476	Pixmap rootpixmap = None;
2449	XWindowAttributes wattr, wrootattr;	2477	XWindowAttributes wattr, wrootattr;
2450	dDisp;
2451		2478
2452	pchanged = 0;	2479	pchanged = 0;
2453		2480
2454	if (!OPTION (Opt_transparent))	2481	if (!option (Opt_transparent))
2455	return pchanged; /* Don't try any more */	2482	return pchanged; /* Don't try any more */
2456		2483
2457	XGetWindowAttributes (disp, display->root, &wrootattr);	2484	XGetWindowAttributes (dpy, display->root, &wrootattr);
2458	rootdepth = wrootattr.depth;	2485	rootdepth = wrootattr.depth;
2459		2486
2460	XGetWindowAttributes (disp, parent[0], &wattr);	2487	XGetWindowAttributes (dpy, parent[0], &wattr);
2461		2488
2462	if (rootdepth != wattr.depth)	2489	if (rootdepth != wattr.depth)
2463	{	2490	{
2464	if (am_transparent)	2491	if (am_transparent)
2465	{	2492	{
2466	pchanged = 1;	2493	pchanged = 1;
2467	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2494	XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2468	am_transparent = am_pixmap_trans = 0;	2495	am_transparent = am_pixmap_trans = 0;
2469	}	2496	}
2470		2497
2471	return pchanged; /* Don't try any more */	2498	return pchanged; /* Don't try any more */
2472	}	2499	}
2473		2500
2474	/* Get all X ops out of the queue so that our information is up-to-date. */	2501	/* Get all X ops out of the queue so that our information is up-to-date. */
2475	XSync (disp, False);	2502	XSync (dpy, False);
2476		2503
2477	/*	2504	/*
2478	* Make the frame window set by the window manager have	2505	* Make the frame window set by the window manager have
2479	* the root background. Some window managers put multiple nested frame	2506	* the root background. Some window managers put multiple nested frame
2480	* windows for each client, so we have to take care about that.	2507	* windows for each client, so we have to take care about that.
2481	*/	2508	*/
2482	i = (xa[XA_XROOTPMAP_ID]	2509	i = (xa[XA_XROOTPMAP_ID]
2483	&& XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],	2510	&& XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2484	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2511	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2485	&nitems, &bytes_after, &prop) == Success);	2512	&nitems, &bytes_after, &prop) == Success);
2486		2513
2487	if (!i || prop == NULL)	2514	if (!i || prop == NULL)
2488	i = (xa[XA_ESETROOT_PMAP_ID]	2515	i = (xa[XA_ESETROOT_PMAP_ID]
2489	&& XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],	2516	&& XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2490	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2517	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2491	&nitems, &bytes_after, &prop) == Success);	2518	&nitems, &bytes_after, &prop) == Success);
2492		2519
2493	if (!i || prop == NULL	2520	if (!i || prop == NULL
2494	#if TINTING	2521	#if TINTING
2495	|| !rs[Rs_color + Color_tint]	2522	|| !ISSET_PIXCOLOR (Color_tint)
2496	#endif	2523	#endif
2497	)	2524	)
2498	have_pixmap = 0;	2525	have_pixmap = 0;
2499	else	2526	else
2500	{	2527	{
…		…
2513	Window cr;	2540	Window cr;
2514	XImage *image;	2541	XImage *image;
2515	GC gc;	2542	GC gc;
2516	XGCValues gcvalue;	2543	XGCValues gcvalue;
2517		2544
2518	XTranslateCoordinates (disp, parent[0], display->root,	2545	XTranslateCoordinates (dpy, parent[0], display->root,
2519	0, 0, &sx, &sy, &cr);	2546	0, 0, &sx, &sy, &cr);
2520	nw = (unsigned int)szHint.width;	2547	nw = (unsigned int)szHint.width;
2521	nh = (unsigned int)szHint.height;	2548	nh = (unsigned int)szHint.height;
2522	nx = ny = 0;	2549	nx = ny = 0;
2523		2550
…		…
2536	}	2563	}
2537		2564
2538	min_it (nw, (unsigned int) (wrootattr.width - sx));	2565	min_it (nw, (unsigned int) (wrootattr.width - sx));
2539	min_it (nh, (unsigned int) (wrootattr.height - sy));	2566	min_it (nh, (unsigned int) (wrootattr.height - sy));
2540		2567
2541	XSync (disp, False);	2568	XSync (dpy, False);
2542	allowedxerror = -1;	2569	allowedxerror = -1;
2543	image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);	2570	image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2544		2571
2545	/* XXX: handle BadMatch - usually because we're outside the pixmap */	2572	/* XXX: handle BadMatch - usually because we're outside the pixmap */
2546	/* XXX: may need a delay here? */	2573	/* XXX: may need a delay here? */
2547	allowedxerror = 0;	2574	allowedxerror = 0;
2548		2575
…		…
2551	if (am_transparent && am_pixmap_trans)	2578	if (am_transparent && am_pixmap_trans)
2552	{	2579	{
2553	pchanged = 1;	2580	pchanged = 1;
2554	if (pixmap != None)	2581	if (pixmap != None)
2555	{	2582	{
2556	XFreePixmap (disp, pixmap);	2583	XFreePixmap (dpy, pixmap);
2557	pixmap = None;	2584	pixmap = None;
2558	}	2585	}
2559	}	2586	}
2560		2587
2561	am_pixmap_trans = 0;	2588	am_pixmap_trans = 0;
2562	}	2589	}
2563	else	2590	else
2564	{	2591	{
2565	if (pixmap != None)	2592	if (pixmap != None)
2566	XFreePixmap (disp, pixmap);	2593	XFreePixmap (dpy, pixmap);
2567		2594
2568	#if TINTING	2595	#if TINTING
2569	if (ISSET_PIXCOLOR (Color_tint))	2596	if (ISSET_PIXCOLOR (Color_tint))
2570	{	2597	{
2571	unsigned short rm, gm, bm;
2572	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;	2598	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2573		2599
		2600	rgba c;
2574	pix_colors_focused[Color_tint].get (display, rm, gm, bm);	2601	pix_colors_focused [Color_tint].get (c);
2575		2602
2576	ShadeXImage (display, image, shade, rm, gm, bm);	2603	ShadeXImage (this, image, shade, c.r, c.g, c.b);
2577	}	2604	}
2578	#endif	2605	#endif
2579		2606
2580	pixmap = XCreatePixmap (disp, vt,	2607	pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2581	szHint.width, szHint.height, image->depth);
2582	gc = XCreateGC (disp, vt, 0UL, &gcvalue);	2608	gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2583	XPutImage (disp, pixmap, gc, image, 0, 0,	2609	XPutImage (dpy, pixmap, gc, image, 0, 0,
2584	nx, ny, image->width, image->height);	2610	nx, ny, image->width, image->height);
2585	XFreeGC (disp, gc);	2611	XFreeGC (dpy, gc);
2586	XDestroyImage (image);	2612	XDestroyImage (image);
2587	XSetWindowBackgroundPixmap (disp, parent[0], pixmap);	2613	XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2588	XClearWindow (disp, parent[0]);	2614	XClearWindow (dpy, parent[0]);
2589		2615
2590	if (!am_transparent || !am_pixmap_trans)	2616	if (!am_transparent || !am_pixmap_trans)
2591	pchanged = 1;	2617	pchanged = 1;
2592		2618
2593	am_transparent = am_pixmap_trans = 1;	2619	am_transparent = am_pixmap_trans = 1;
2594	}	2620	}
2595	}	2621	}
2596		2622
2597	if (am_pixmap_trans)	2623	if (am_pixmap_trans)
2598	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2624	XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2599	else	2625	else
2600	{	2626	{
2601	unsigned int n;	2627	unsigned int n;
2602	/*	2628	/*
2603	* InheritPixmap transparency	2629	* InheritPixmap transparency
2604	*/	2630	*/
2605	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2631	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2606	{	2632	{
2607	oldp = parent[i];	2633	oldp = parent[i];
2608	XQueryTree (disp, parent[i - 1], &root,	2634	XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2609	&parent[i], &list, &n);
2610	XFree (list);	2635	XFree (list);
2611		2636
2612	if (parent[i] == display->root)	2637	if (parent[i] == display->root)
2613	{	2638	{
2614	if (oldp != None)	2639	if (oldp != None)
…		…
2622	}	2647	}
2623		2648
2624	n = 0;	2649	n = 0;
2625		2650
2626	if (pchanged)	2651	if (pchanged)
2627	{
2628	for (; n < (unsigned int)i; n++)	2652	for (; n < (unsigned int)i; n++)
2629	{	2653	{
2630	XGetWindowAttributes (disp, parent[n], &wattr);	2654	XGetWindowAttributes (dpy, parent[n], &wattr);
		2655
2631	if (wattr.depth != rootdepth || wattr.c_class == InputOnly)	2656	if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2632	{	2657	{
2633	n = (int) (sizeof (parent) / sizeof (Window)) + 1;	2658	n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2634	break;	2659	break;
2635	}	2660	}
2636	}	2661	}
2637	}
2638		2662
2639	if (n > (int) (sizeof (parent) / sizeof (parent[0])))	2663	if (n > (sizeof (parent) / sizeof (parent[0])))
2640	{	2664	{
2641	XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);	2665	XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2642	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2666	XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2643	am_transparent = 0;	2667	am_transparent = 0;
2644	/* XXX: also turn off Opt_transparent? */	2668	/* XXX: also turn off Opt_transparent? */
2645	}	2669	}
2646	else	2670	else
2647	{	2671	{
2648	#if WAIT_FOR_WM
2649	/* wait (an arbitrary period) for the WM to do its thing
2650	* needed for fvwm2.2.2 (and before?) */
2651	sleep (1);
2652	#endif
2653	for (n = 0; n < (unsigned int)i; n++)	2672	for (n = 0; n < (unsigned int)i; n++)
2654	{	2673	{
2655	XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);	2674	XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2656	XClearWindow (disp, parent[n]);	2675	XClearWindow (dpy, parent[n]);
2657	}	2676	}
2658		2677
2659	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2678	XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2660	am_transparent = 1;	2679	am_transparent = 1;
2661	}	2680	}
2662		2681
2663	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2682	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2664	parent[i] = None;	2683	parent[i] = None;
2665	}	2684	}
2666		2685
2667	if (scrollBar.win)	2686	if (scrollBar.win)
2668	{	2687	{
2669	XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);	2688	XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2670	scrollBar.setIdle ();	2689	scrollBar.setIdle ();
2671	scrollbar_show (0);	2690	scrollbar_show (0);
2672	}	2691	}
2673		2692
2674	if (am_transparent)	2693	if (am_transparent)
…		…
2737	if (ch == C0_LF)	2756	if (ch == C0_LF)
2738	nlines++;	2757	nlines++;
2739		2758
2740	refresh_count++;	2759	refresh_count++;
2741		2760
2742	if (!OPTION (Opt_jumpScroll)	2761	if (!option (Opt_jumpScroll)
2743	|| (refresh_count >= refresh_limit * (nrow - 1)))	2762	|| (refresh_count >= refresh_limit * (nrow - 1)))
2744	{	2763	{
2745	refreshnow = true;	2764	refreshnow = true;
2746	refresh_count = 0;	2765	refresh_count = 0;
2747	ch = NOCHAR;	2766	ch = NOCHAR;
…		…
2787	* the number of pages between refreshes is refresh_limit, which	2806	* the number of pages between refreshes is refresh_limit, which
2788	* is incremented here because we must be doing flat-out scrolling.	2807	* is incremented here because we must be doing flat-out scrolling.
2789	*/	2808	*/
2790	if (refreshnow)	2809	if (refreshnow)
2791	{	2810	{
2792	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)	2811	if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2793	refresh_limit++;	2812	refresh_limit++;
2794	else	2813	else
2795	{	2814	{
2796	flag = true;	2815	flag = true;
		2816	//TODO: due to popular request, implement "skipscroll" option here
2797	scr_refresh ();	2817	scr_refresh ();
2798	want_refresh = 1;	2818	want_refresh = 1;
2799	}	2819	}
2800	}	2820	}
2801		2821
…		…
2820	return flag;	2840	return flag;
2821	}	2841	}
2822		2842
2823	// read the next character	2843	// read the next character
2824	wchar_t	2844	wchar_t
2825	rxvt_term::next_char ()	2845	rxvt_term::next_char () NOTHROW
2826	{	2846	{
2827	while (cmdbuf_ptr < cmdbuf_endp)	2847	while (cmdbuf_ptr < cmdbuf_endp)
2828	{	2848	{
2829	// assume 7-bit to be ascii ALWAYS	2849	// assume 7-bit to be ascii ALWAYS
2830	if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)	2850	if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
…		…
2851	return NOCHAR;	2871	return NOCHAR;
2852	}	2872	}
2853		2873
2854	// read the next octet	2874	// read the next octet
2855	uint32_t	2875	uint32_t
2856	rxvt_term::next_octet ()	2876	rxvt_term::next_octet () NOTHROW
2857	{	2877	{
2858	return cmdbuf_ptr < cmdbuf_endp	2878	return cmdbuf_ptr < cmdbuf_endp
2859	? (unsigned char)*cmdbuf_ptr++	2879	? (unsigned char)*cmdbuf_ptr++
2860	: NOCHAR;	2880	: NOCHAR;
2861	}	2881	}
		2882
		2883	static class out_of_input out_of_input;
2862		2884
2863	/* rxvt_cmd_getc () - Return next input character */	2885	/* rxvt_cmd_getc () - Return next input character */
2864	/*	2886	/*
2865	* Return the next input character after first passing any keyboard input	2887	* Return the next input character after first passing any keyboard input
2866	* to the command.	2888	* to the command.
2867	*/	2889	*/
2868	wchar_t	2890	wchar_t
2869	rxvt_term::cmd_getc ()	2891	rxvt_term::cmd_getc () THROW ((class out_of_input))
2870	{	2892	{
2871	wchar_t c = next_char ();	2893	wchar_t c = next_char ();
2872		2894
2873	if (c == NOCHAR)	2895	if (c == NOCHAR)
2874	throw out_of_input;	2896	throw out_of_input;
2875		2897
2876	return c;	2898	return c;
2877	}	2899	}
2878		2900
2879	uint32_t	2901	uint32_t
2880	rxvt_term::cmd_get8 ()	2902	rxvt_term::cmd_get8 () THROW ((class out_of_input))
2881	{	2903	{
2882	uint32_t c = next_octet ();	2904	uint32_t c = next_octet ();
2883		2905
2884	if (c == NOCHAR)	2906	if (c == NOCHAR)
2885	throw out_of_input;	2907	throw out_of_input;
…		…
3123	scr_charset_set (2, (unsigned int)cmd_getc ());	3145	scr_charset_set (2, (unsigned int)cmd_getc ());
3124	break;	3146	break;
3125	case '+':	3147	case '+':
3126	scr_charset_set (3, (unsigned int)cmd_getc ());	3148	scr_charset_set (3, (unsigned int)cmd_getc ());
3127	break;	3149	break;
3128	#if ENABLE_FRILLS	3150	#if !ENABLE_MINIMAL
3129	case '6':	3151	case '6':
3130	scr_backindex ();	3152	scr_backindex ();
3131	break;	3153	break;
3132	#endif	3154	#endif
3133	case '7':	3155	case '7':
3134	scr_cursor (SAVE);	3156	scr_cursor (SAVE);
3135	break;	3157	break;
3136	case '8':	3158	case '8':
3137	scr_cursor (RESTORE);	3159	scr_cursor (RESTORE);
3138	break;	3160	break;
3139	#if ENABLE_FRILLS	3161	#if !ENABLE_MINIMAL
3140	case '9':	3162	case '9':
3141	scr_forwardindex ();	3163	scr_forwardindex ();
3142	break;	3164	break;
3143	#endif	3165	#endif
3144	case '=':	3166	case '=':
…		…
3306	ndef = get_byte_array_bit (csi_defaults, i);	3328	ndef = get_byte_array_bit (csi_defaults, i);
3307	for (p = 0; p < nargs; p++)	3329	for (p = 0; p < nargs; p++)
3308	if (arg[p] == -1)	3330	if (arg[p] == -1)
3309	arg[p] = ndef;	3331	arg[p] = ndef;
3310		3332
3311	#ifdef DEBUG_CMD
3312	fprintf (stderr, "CSI ");
3313	for (p = 0; p < nargs; p++)
3314	fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3315	fprintf (stderr, "%c\n", ch);
3316	#endif
3317
3318	/*	3333	/*
3319	* private mode handling	3334	* private mode handling
3320	*/	3335	*/
3321	if (priv)	3336	if (priv)
3322	{	3337	{
3323	switch (priv)	3338	switch (priv)
3324	{	3339	{
3325	case '>':	3340	case '>':
3326	if (ch == CSI_DA) /* secondary device attributes */	3341	if (ch == CSI_DA) /* secondary device attributes */
3327	tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);	3342	{
		3343	// first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
		3344	// 'U' for rxvt-unicode != 7.[34] (where it was broken).
		3345	//
		3346	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
		3347	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
		3348	// that we do not support xterm mouse reporting (should be 95 when we do).
		3349	//
		3350	tt_printf ("\033[>%d;94;0c", 'U');
		3351	}
3328	break;	3352	break;
3329	case '?':	3353	case '?':
3330	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')	3354	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3331	process_terminal_mode (ch, priv, nargs, arg);	3355	process_terminal_mode (ch, priv, nargs, arg);
3332	break;	3356	break;
…		…
3458	break;	3482	break;
3459	case 6: /* CPR requested */	3483	case 6: /* CPR requested */
3460	scr_report_position ();	3484	scr_report_position ();
3461	break;	3485	break;
3462	case 7: /* unofficial extension */	3486	case 7: /* unofficial extension */
3463	if (OPTION (Opt_insecure))	3487	if (option (Opt_insecure))
3464	tt_printf ("%-.250s\012", rs[Rs_display_name]);	3488	tt_printf ("%-.250s\012", rs[Rs_display_name]);
3465	break;	3489	break;
3466	case 8: /* unofficial extension */	3490	case 8: /* unofficial extension */
3467	process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);	3491	process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3468	break;	3492	break;
…		…
3535	break;	3559	break;
3536	case CSI_75:	3560	case CSI_75:
3537	scr_cursor (RESTORE);	3561	scr_cursor (RESTORE);
3538	break;	3562	break;
3539		3563
3540	#if ENABLE_FRILLS	3564	#if !ENABLE_MINIMAL
3541	case CSI_74:	3565	case CSI_74:
3542	process_window_ops (arg, nargs);	3566	process_window_ops (arg, nargs);
3543	break;	3567	break;
3544	#endif	3568	#endif
3545		3569
…		…
3552	break;	3576	break;
3553	}	3577	}
3554	}	3578	}
3555	/*}}} */	3579	/*}}} */
3556		3580
3557	#if ENABLE_FRILLS	3581	#if !ENABLE_MINIMAL
3558	/* ARGSUSED */	3582	/* ARGSUSED */
3559	void	3583	void
3560	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3584	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3561	{	3585	{
3562	int x, y;	3586	int x, y;
3563	XWindowAttributes wattr;	3587	XWindowAttributes wattr;
3564	Window wdummy;	3588	Window wdummy;
3565	dDisp;	3589
		3590	dLocal (Display *, dpy);
3566		3591
3567	if (nargs == 0)	3592	if (nargs == 0)
3568	return;	3593	return;
3569		3594
3570	switch (args[0])	3595	switch (args[0])
3571	{	3596	{
3572	/*	3597	/*
3573	* commands	3598	* commands
3574	*/	3599	*/
3575	case 1: /* deiconify window */	3600	case 1: /* deiconify window */
3576	XMapWindow (disp, parent[0]);	3601	XMapWindow (dpy, parent[0]);
3577	break;	3602	break;
3578	case 2: /* iconify window */	3603	case 2: /* iconify window */
3579	XIconifyWindow (disp, parent[0], display->screen);	3604	XIconifyWindow (dpy, parent[0], display->screen);
3580	break;	3605	break;
3581	case 3: /* set position (pixels) */	3606	case 3: /* set position (pixels) */
3582	XMoveWindow (disp, parent[0], args[1], args[2]);	3607	XMoveWindow (dpy, parent[0], args[1], args[2]);
3583	break;	3608	break;
3584	case 4: /* set size (pixels) */	3609	case 4: /* set size (pixels) */
3585	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3610	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3586	break;	3611	break;
3587	case 5: /* raise window */	3612	case 5: /* raise window */
3588	XRaiseWindow (disp, parent[0]);	3613	XRaiseWindow (dpy, parent[0]);
3589	break;	3614	break;
3590	case 6: /* lower window */	3615	case 6: /* lower window */
3591	XLowerWindow (disp, parent[0]);	3616	XLowerWindow (dpy, parent[0]);
3592	break;	3617	break;
3593	case 7: /* refresh window */	3618	case 7: /* refresh window */
3594	scr_touch (true);	3619	scr_touch (true);
3595	break;	3620	break;
3596	case 8: /* set size (chars) */	3621	case 8: /* set size (chars) */
…		…
3603	if (args[0] >= 24) /* set height (chars) */	3628	if (args[0] >= 24) /* set height (chars) */
3604	set_widthheight ((unsigned int)width,	3629	set_widthheight ((unsigned int)width,
3605	(unsigned int) (args[1] * fheight));	3630	(unsigned int) (args[1] * fheight));
3606	break;	3631	break;
3607		3632
3608
3609	/*	3633	/*
3610	* reports - some output format copied from XTerm	3634	* reports - some output format copied from XTerm
3611	*/	3635	*/
3612	case 11: /* report window state */	3636	case 11: /* report window state */
3613	XGetWindowAttributes (disp, parent[0], &wattr);	3637	XGetWindowAttributes (dpy, parent[0], &wattr);
3614	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3638	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3615	break;	3639	break;
3616	case 13: /* report window position */	3640	case 13: /* report window position */
3617	XGetWindowAttributes (disp, parent[0], &wattr);	3641	XGetWindowAttributes (dpy, parent[0], &wattr);
3618	XTranslateCoordinates (disp, parent[0], wattr.root,	3642	XTranslateCoordinates (dpy, parent[0], wattr.root,
3619	-wattr.border_width, -wattr.border_width,	3643	-wattr.border_width, -wattr.border_width,
3620	&x, &y, &wdummy);	3644	&x, &y, &wdummy);
3621	tt_printf ("\033[3;%d;%dt", x, y);	3645	tt_printf ("\033[3;%d;%dt", x, y);
3622	break;	3646	break;
3623	case 14: /* report window size (pixels) */	3647	case 14: /* report window size (pixels) */
3624	XGetWindowAttributes (disp, parent[0], &wattr);	3648	XGetWindowAttributes (dpy, parent[0], &wattr);
3625	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3649	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3626	break;	3650	break;
3627	case 18: /* report text area size (chars) */	3651	case 18: /* report text area size (chars) */
3628	tt_printf ("\033[8;%d;%dt", nrow, ncol);	3652	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3629	break;	3653	break;
…		…
3631	tt_printf ("\033[9;%d;%dt", nrow, ncol);	3655	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3632	break;	3656	break;
3633	case 20: /* report icon label */	3657	case 20: /* report icon label */
3634	{	3658	{
3635	char *s;	3659	char *s;
3636	XGetIconName (disp, parent[0], &s);	3660	XGetIconName (dpy, parent[0], &s);
3637	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3661	tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3638	XFree (s);	3662	XFree (s);
3639	}	3663	}
3640	break;	3664	break;
3641	case 21: /* report window title */	3665	case 21: /* report window title */
3642	{	3666	{
3643	char *s;	3667	char *s;
3644	XFetchName (disp, parent[0], &s);	3668	XFetchName (dpy, parent[0], &s);
3645	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3669	tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3646	XFree (s);	3670	XFree (s);
3647	}	3671	}
3648	break;	3672	break;
3649	}	3673	}
3650	}	3674	}
…		…
3677	seen_esc = true;	3701	seen_esc = true;
3678	continue;	3702	continue;
3679	}	3703	}
3680	else if (ch == C0_BEL || ch == CHAR_ST)	3704	else if (ch == C0_BEL || ch == CHAR_ST)
3681	break;	3705	break;
		3706	else if (ch == C0_SYN)
		3707	ch = cmd_get8 ();
3682	else if (ch < 0x20)	3708	else if (ch < 0x20)
3683	return NULL; /* other control character - exit */	3709	return NULL; /* other control character - exit */
3684		3710
3685	seen_esc = false;	3711	seen_esc = false;
3686		3712
3687	if (n >= STRING_MAX - 1)	3713	if (n >= STRING_MAX - 1)
3688	// stop at some sane length	3714	// stop at some sane length
3689	return NULL;	3715	return NULL;
3690		3716
3691	if (ch == C0_SYN)
3692	string[n++] = cmd_get8 ();
3693	else
3694	string[n++] = ch;	3717	string[n++] = ch;
3695	}	3718	}
3696		3719
3697	string[n++] = '\0';	3720	string[n++] = '\0';
3698		3721
3699	ends_how = (ch == 0x5c ? C0_ESC : ch);	3722	ends_how = (ch == 0x5c ? C0_ESC : ch);
…		…
3750	void	3773	void
3751	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)	3774	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3752	{	3775	{
3753	if (str[0] == '?' && !str[1])	3776	if (str[0] == '?' && !str[1])
3754	{	3777	{
3755	unsigned short r, g, b;	3778	rgba c;
3756	pix_colors_focused[color].get (display, r, g, b);	3779	pix_colors_focused[color].get (c);
		3780
		3781	#if XFT
		3782	if (c.a != rgba::MAX_CC)
		3783	tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
		3784	else
		3785	#endif
3757	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);	3786	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3758	}	3787	}
3759	else	3788	else
3760	set_window_color (color, str);	3789	set_window_color (color, str);
3761	}	3790	}
3762		3791
…		…
3764	* XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)	3793	* XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3765	*/	3794	*/
3766	void	3795	void
3767	rxvt_term::process_xterm_seq (int op, const char *str, char resp)	3796	rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3768	{	3797	{
3769	int changed = 0;
3770	int color;	3798	int color;
3771	char *buf, *name;	3799	char *buf, *name;
3772	bool query = str[0] == '?' && !str[1];	3800	bool query = str[0] == '?' && !str[1];
3773	int saveop = op;	3801	int saveop = op;
3774	dDisp;	3802
		3803	dLocal (Display *, dpy);
3775		3804
3776	assert (str != NULL);	3805	assert (str != NULL);
		3806
		3807	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
		3808	return;
		3809
3777	switch (op)	3810	switch (op)
3778	{	3811	{
3779	case XTerm_name:	3812	case XTerm_name:
3780	set_title (str);	3813	set_title (str);
3781	/* FALLTHROUGH */	3814	/* FALLTHROUGH */
…		…
3795	unsigned long bytes_after;	3828	unsigned long bytes_after;
3796	unsigned char *value = 0;	3829	unsigned char *value = 0;
3797	const char *str = "";	3830	const char *str = "";
3798		3831
3799	if (prop	3832	if (prop
3800	&& XGetWindowProperty (disp, parent[0],	3833	&& XGetWindowProperty (dpy, parent[0],
3801	prop, 0, 1<<16, 0, AnyPropertyType,	3834	prop, 0, 1<<16, 0, AnyPropertyType,
3802	&actual_type, &actual_format,	3835	&actual_type, &actual_format,
3803	&nitems, &bytes_after, &value) == Success	3836	&nitems, &bytes_after, &value) == Success
3804	&& actual_type != None	3837	&& actual_type != None
3805	&& actual_format == 8)	3838	&& actual_format == 8)
3806	str = (const char *)(value);	3839	str = (const char *)(value);
3807		3840
3808	tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);	3841	tt_printf ("\033]%d;%s%c", op, str, resp);
3809		3842
3810	XFree (value);	3843	XFree (value);
3811	}	3844	}
3812	else	3845	else
3813	{	3846	{
…		…
3817	{	3850	{
3818	*eq = 0;	3851	*eq = 0;
3819	set_utf8_property (display->atom (str), eq + 1);	3852	set_utf8_property (display->atom (str), eq + 1);
3820	}	3853	}
3821	else	3854	else
3822	XDeleteProperty (disp, parent[0],	3855	XDeleteProperty (dpy, parent[0],
3823	display->atom (str));	3856	display->atom (str));
3824	}	3857	}
3825	break;	3858	break;
3826		3859
3827	case XTerm_Color:	3860	case XTerm_Color:
…		…
3837	break;	3870	break;
3838		3871
3839	if ((buf = strchr (name, ';')) != NULL)	3872	if ((buf = strchr (name, ';')) != NULL)
3840	*buf++ = '\0';	3873	*buf++ = '\0';
3841		3874
3842	if (name[0] == '?' && !name[1])	3875	process_color_seq (op, color, name, resp);
3843	{
3844	unsigned short r, g, b;
3845	pix_colors_focused[color].get (display, r, g, b);
3846	tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3847	}
3848	else
3849	set_window_color (color, name);
3850	}	3876	}
3851	break;	3877	break;
3852	case XTerm_Color00:	3878	case XTerm_Color00:
3853	process_color_seq (XTerm_Color00, Color_fg, str, resp);	3879	process_color_seq (op, Color_fg, str, resp);
3854	break;	3880	break;
3855	case XTerm_Color01:	3881	case XTerm_Color01:
3856	process_color_seq (XTerm_Color01, Color_bg, str, resp);	3882	process_color_seq (op, Color_bg, str, resp);
3857	break;	3883	break;
3858	#ifndef NO_CURSORCOLOR	3884	#ifndef NO_CURSORCOLOR
3859	case XTerm_Color_cursor:	3885	case XTerm_Color_cursor:
3860	process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);	3886	process_color_seq (op, Color_cursor, str, resp);
3861	break;	3887	break;
3862	#endif	3888	#endif
3863	case XTerm_Color_pointer_fg:	3889	case XTerm_Color_pointer_fg:
3864	process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);	3890	process_color_seq (op, Color_pointer_fg, str, resp);
3865	break;	3891	break;
3866	case XTerm_Color_pointer_bg:	3892	case XTerm_Color_pointer_bg:
3867	process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);	3893	process_color_seq (op, Color_pointer_bg, str, resp);
3868	break;	3894	break;
3869	#ifndef NO_BOLD_UNDERLINE_REVERSE	3895	#ifndef NO_BOLD_UNDERLINE_REVERSE
3870	case XTerm_Color_RV:	3896	case XTerm_Color_RV:
3871	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3897	process_color_seq (op, Color_RV, str, resp);
3872	break;	3898	break;
3873	case Rxvt_Color_BD:	3899	case Rxvt_Color_BD:
3874	case URxvt_Color_BD:	3900	case URxvt_Color_BD:
3875	process_color_seq (op, Color_BD, str, resp);	3901	process_color_seq (op, Color_BD, str, resp);
3876	break;	3902	break;
3877	case Rxvt_Color_UL:	3903	case Rxvt_Color_UL:
3878	case URxvt_Color_UL:	3904	case URxvt_Color_UL:
3879	process_color_seq (op, Color_UL, str, resp);	3905	process_color_seq (op, Color_UL, str, resp);
3880	break;	3906	break;
3881	case URxvt_Color_IT:	3907	case URxvt_Color_IT:
3882	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);	3908	process_color_seq (op, Color_IT, str, resp);
3883	break;	3909	break;
3884	#endif	3910	#endif
3885	#if TRANSPARENT && TINTING	3911	#if TRANSPARENT && TINTING
3886	case URxvt_Color_tint:	3912	case URxvt_Color_tint:
3887	process_color_seq (URxvt_Color_tint, Color_tint, str, resp);	3913	process_color_seq (op, Color_tint, str, resp);
		3914
3888	check_our_parents ();	3915	check_our_parents ();
		3916
3889	if (am_transparent)	3917	if (am_transparent)
3890	want_full_refresh = want_refresh = 1;	3918	want_full_refresh = want_refresh = 1;
		3919
3891	break;	3920	break;
3892	#endif	3921	#endif
3893		3922
3894	case Rxvt_Pixmap:	3923	case Rxvt_Pixmap:
		3924	{
3895	if (*str != ';')	3925	if (*str != ';')
3896	{	3926	{
3897	#if XPM_BACKGROUND	3927	#if XPM_BACKGROUND
3898	scale_pixmap (""); /* reset to default scaling */	3928	scale_pixmap (""); /* reset to default scaling */
3899	set_bgPixmap (str); /* change pixmap */	3929	set_bgPixmap (str); /* change pixmap */
3900	scr_touch (true);	3930	scr_touch (true);
3901	#endif	3931	#endif
3902	}	3932	}
3903		3933
		3934	int changed = 0;
		3935
3904	while ((str = strchr (str, ';')) != NULL)	3936	while ((str = strchr (str, ';')) != NULL)
3905	{	3937	{
3906	str++;	3938	str++;
3907	#if XPM_BACKGROUND	3939	#if XPM_BACKGROUND
3908	changed += scale_pixmap (str);	3940	changed += scale_pixmap (str);
3909	#endif	3941	#endif
3910	}	3942	}
3911		3943
3912	if (changed)	3944	if (changed)
3913	{	3945	{
3914	#ifdef XPM_BACKGROUND	3946	#ifdef XPM_BACKGROUND
3915	resize_pixmap ();	3947	resize_pixmap ();
3916	scr_touch (true);	3948	scr_touch (true);
3917	#endif	3949	#endif
3918	}	3950	}
		3951	}
3919	break;	3952	break;
3920		3953
3921	case Rxvt_restoreFG:	3954	case Rxvt_restoreFG:
3922	set_window_color (Color_fg, str);	3955	set_window_color (Color_fg, str);
3923	break;	3956	break;
…		…
3949	case URxvt_italicFont:	3982	case URxvt_italicFont:
3950	case URxvt_boldItalicFont:	3983	case URxvt_boldItalicFont:
3951	#endif	3984	#endif
3952	if (query)	3985	if (query)
3953	tt_printf ("\33]%d;%-.250s%c", saveop,	3986	tt_printf ("\33]%d;%-.250s%c", saveop,
3954	OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc	3987	option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3955	? fontset[op - URxvt_font]->fontdesc : "",	3988	? fontset[op - URxvt_font]->fontdesc : "",
3956	resp);	3989	resp);
3957	else	3990	else
3958	{	3991	{
3959	const char *&res = rs[Rs_font + (op - URxvt_font)];	3992	const char *&res = rs[Rs_font + (op - URxvt_font)];
…		…
3962	allocated.push_back ((void *)res);	3995	allocated.push_back ((void *)res);
3963	set_fonts ();	3996	set_fonts ();
3964	}	3997	}
3965	break;	3998	break;
3966		3999
3967	#if ENABLE_FRILLS	4000	case URxvt_version:
		4001	if (query)
		4002	tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
		4003	op,
		4004	rs[Rs_name], VERSION[0], VERSION[2],
		4005	resp);
		4006	break;
		4007
		4008	#if !ENABLE_MINIMAL
3968	case URxvt_locale:	4009	case URxvt_locale:
3969	if (query)	4010	if (query)
3970	tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);	4011	tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3971	else	4012	else
3972	{	4013	{
3973	set_locale (str);	4014	set_locale (str);
3974	pty.set_utf8_mode (enc_utf8);	4015	pty->set_utf8_mode (enc_utf8);
3975	init_xlocale ();	4016	init_xlocale ();
3976	}	4017	}
3977	break;	4018	break;
3978		4019
3979	case URxvt_view_up:	4020	case URxvt_view_up:
…		…
3990	break;	4031	break;
3991	#endif	4032	#endif
3992		4033
3993	#if ENABLE_PERL	4034	#if ENABLE_PERL
3994	case URxvt_perl:	4035	case URxvt_perl:
3995	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))	4036	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3996	; // no responses yet	4037	; // no responses yet
3997	break;	4038	break;
3998	#endif	4039	#endif
3999	}	4040	}
4000	}	4041	}
…		…
4032	return state;	4073	return state;
4033	}	4074	}
4034		4075
4035	/* we're not using priv _yet_ */	4076	/* we're not using priv _yet_ */
4036	void	4077	void
4037	rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)	4078	rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4038	{	4079	{
4039	unsigned int i, j;	4080	unsigned int i, j;
4040	int state;	4081	int state;
4041		4082
4042	static const struct	4083	static const struct
…		…
4116	scr_touch (true);	4157	scr_touch (true);
4117	break;	4158	break;
4118	#endif	4159	#endif
4119	case 1048: /* alternative cursor save */	4160	case 1048: /* alternative cursor save */
4120	case 1049:	4161	case 1049:
4121	if (OPTION (Opt_secondaryScreen))	4162	if (option (Opt_secondaryScreen))
4122	if (mode == 0)	4163	if (mode == 0)
4123	scr_cursor (RESTORE);	4164	scr_cursor (RESTORE);
4124	else if (mode == 1)	4165	else if (mode == 1)
4125	scr_cursor (SAVE);	4166	scr_cursor (SAVE);
4126	break;	4167	break;
…		…
4191	break;	4232	break;
4192	case 1011: /* scroll to bottom on key press */	4233	case 1011: /* scroll to bottom on key press */
4193	set_option (Opt_scrollTtyKeypress, state);	4234	set_option (Opt_scrollTtyKeypress, state);
4194	break;	4235	break;
4195	case 1047: /* secondary screen w/ clearing last */	4236	case 1047: /* secondary screen w/ clearing last */
4196	if (OPTION (Opt_secondaryScreen))	4237	if (option (Opt_secondaryScreen))
4197	if (current_screen != PRIMARY)	4238	if (current_screen != PRIMARY)
4198	scr_erase_screen (2);	4239	scr_erase_screen (2);
4199	scr_change_screen (state);	4240	scr_change_screen (state);
4200	break;	4241	break;
4201	case 1049: /* secondary screen w/ clearing first */	4242	case 1049: /* secondary screen w/ clearing first */
4202	scr_change_screen (state);	4243	scr_change_screen (state);
4203	if (OPTION (Opt_secondaryScreen))	4244	if (option (Opt_secondaryScreen))
4204	if (current_screen != PRIMARY)	4245	if (current_screen != PRIMARY)
4205	scr_erase_screen (2);	4246	scr_erase_screen (2);
4206	break;	4247	break;
4207	default:	4248	default:
4208	break;	4249	break;
…		…
4336	scr_color (Color_bg, Color_bg);	4377	scr_color (Color_bg, Color_bg);
4337	break;	4378	break;
4338		4379
4339	//case 50: // not variable spacing	4380	//case 50: // not variable spacing
4340		4381
4341	#if ENABLE_FRILLS	4382	#if !ENABLE_MINIMAL
4342	case 90:	4383	case 90:
4343	case 91: /* set bright fg color */	4384	case 91: /* set bright fg color */
4344	case 92:	4385	case 92:
4345	case 93:	4386	case 93:
4346	case 94:	4387	case 94:
…		…
4411	rxvt_term::tt_write (const char *data, unsigned int len)	4452	rxvt_term::tt_write (const char *data, unsigned int len)
4412	{	4453	{
4413	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))	4454	if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4414	return;	4455	return;
4415		4456
4416	if (pty.pty < 0)	4457	if (pty->pty < 0)
4417	return;	4458	return;
4418		4459
4419	if (v_buflen == 0)	4460	if (v_buflen == 0)
4420	{	4461	{
4421	ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));	4462	ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4422		4463
4423	if ((unsigned int)written == len)	4464	if ((unsigned int)written == len)
4424	return;	4465	return;
4425		4466
4426	data += written;	4467	data += written;
…		…
4435	pty_ev.set (EVENT_READ | EVENT_WRITE);	4476	pty_ev.set (EVENT_READ | EVENT_WRITE);
4436	}	4477	}
4437		4478
4438	void rxvt_term::pty_write ()	4479	void rxvt_term::pty_write ()
4439	{	4480	{
4440	int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));	4481	int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4441		4482
4442	if (written > 0)	4483	if (written > 0)
4443	{	4484	{
4444	v_buflen -= written;	4485	v_buflen -= written;
4445		4486

Diff Legend

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