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.272 by root, Thu Jan 19 16:22:12 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	*
…		…
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
…		…
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	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));	1496	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1508		1497
1509	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */	1498	#ifdef TRANSPARENT
1510	if (OPTION (Opt_transparent))	1499	if (option (Opt_transparent))
1511	check_our_parents ();	1500	check_our_parents ();
1512	#endif	1501	#endif
1513	}	1502	}
1514	break;	1503	break;
1515		1504
1516	case PropertyNotify:	1505	case PropertyNotify:
		1506	if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1517	if (ev.xproperty.atom == xa[XA_VT_SELECTION]	1507	if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1518	&& ev.xproperty.state == PropertyNewValue)	1508	&& ev.xproperty.state == PropertyNewValue)
1519	selection_property (ev.xproperty.window, ev.xproperty.atom);	1509	selection_property (ev.xproperty.window, ev.xproperty.atom);
1520		1510
1521	break;	1511	break;
1522		1512
1523	case SelectionClear:	1513	case SelectionClear:
1524	selection_clear ();	1514	selection_clear ();
…		…
1560	if (ev.xany.window == vt)	1550	if (ev.xany.window == vt)
1561	{	1551	{
1562	do	1552	do
1563	scr_expose (ev.xexpose.x, ev.xexpose.y,	1553	scr_expose (ev.xexpose.x, ev.xexpose.y,
1564	ev.xexpose.width, ev.xexpose.height, False);	1554	ev.xexpose.width, ev.xexpose.height, False);
1565	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));	1555	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1566		1556
1567	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1557	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1568		1558
1569	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))	1559	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1570	scr_expose (ev.xexpose.x, ev.xexpose.y,	1560	scr_expose (ev.xexpose.x, ev.xexpose.y,
1571	ev.xexpose.width, ev.xexpose.height, False);	1561	ev.xexpose.width, ev.xexpose.height, False);
1572		1562
1573	want_refresh = 1;	1563	want_refresh = 1;
1574	}	1564	}
1575	else	1565	else
1576	{	1566	{
1577	XEvent unused_event;	1567	XEvent unused_event;
1578		1568
1579	while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))	1569	while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1580	;	1570	;
1581	while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))	1571	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1582	;	1572	;
1583		1573
1584	if (isScrollbarWindow (ev.xany.window))	1574	if (isScrollbarWindow (ev.xany.window))
1585	{	1575	{
1586	scrollBar.setIdle ();	1576	scrollBar.setIdle ();
1587	scrollbar_show (0);	1577	scrollbar_show (0);
1588	}	1578	}
1589		1579
1590	#ifdef TRANSPARENT	1580	#ifdef TRANSPARENT
1591	if (am_transparent && ev.xany.window == parent[0])	1581	if (am_transparent && ev.xany.window == parent[0])
1592	XClearWindow (disp, ev.xany.window);	1582	XClearWindow (dpy, ev.xany.window);
1593	#endif	1583	#endif
1594	}	1584	}
1595	break;	1585	break;
1596		1586
1597	case MotionNotify:	1587	case MotionNotify:
…		…
1607	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)	1597	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1608	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))	1598	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1609	; // nop	1599	; // nop
1610	else if (ev.xbutton.state & (Button1Mask | Button3Mask))	1600	else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1611	{	1601	{
1612	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))	1602	while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1613	;	1603	;
1614		1604
1615	XQueryPointer (disp, vt,	1605	XQueryPointer (dpy, vt,
1616	&unused_root, &unused_child,	1606	&unused_root, &unused_child,
1617	&unused_root_x, &unused_root_y,	1607	&unused_root_x, &unused_root_y,
1618	&ev.xbutton.x, &ev.xbutton.y,	1608	&ev.xbutton.x, &ev.xbutton.y,
1619	&ev.xbutton.state);	1609	&ev.xbutton.state);
1620	#ifdef MOUSE_THRESHOLD	1610	#ifdef MOUSE_THRESHOLD
…		…
1684	#endif	1674	#endif
1685	}	1675	}
1686	}	1676	}
1687	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1677	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1688	{	1678	{
1689	while (XCheckTypedWindowEvent (disp, scrollBar.win,	1679	while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1690	MotionNotify, &ev))	1680	MotionNotify, &ev))
1691	;	1681	;
1692		1682
1693	XQueryPointer (disp, scrollBar.win,	1683	XQueryPointer (dpy, scrollBar.win,
1694	&unused_root, &unused_child,	1684	&unused_root, &unused_child,
1695	&unused_root_x, &unused_root_y,	1685	&unused_root_x, &unused_root_y,
1696	&ev.xbutton.x, &ev.xbutton.y,	1686	&ev.xbutton.x, &ev.xbutton.y,
1697	&unused_mask);	1687	&unused_mask);
1698	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1688	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
…		…
1702	scrollbar_show (1);	1692	scrollbar_show (1);
1703	}	1693	}
1704	break;	1694	break;
1705	}	1695	}
1706		1696
1707	skip_switch: ;
1708
1709	#if defined(CURSOR_BLINK)	1697	#if defined(CURSOR_BLINK)
1710	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)	1698	if (option (Opt_cursorBlink) && ev.type == KeyPress)
1711	{	1699	{
1712	if (hidden_cursor)	1700	if (hidden_cursor)
1713	{	1701	{
1714	hidden_cursor = 0;	1702	hidden_cursor = 0;
1715	want_refresh = 1;	1703	want_refresh = 1;
1716	}	1704	}
1717		1705
1718	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1706	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1719	}	1707	}
1720	#endif	1708	#endif
1721		1709
1722	#if defined(POINTER_BLANK)	1710	#if defined(POINTER_BLANK)
1723	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)	1711	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1724	{	1712	{
1725	if (ev.type == MotionNotify	1713	if (ev.type == MotionNotify
1726	|| ev.type == ButtonPress	1714	|| ev.type == ButtonPress
1727	|| ev.type == ButtonRelease)	1715	|| ev.type == ButtonRelease)
1728	if (hidden_pointer)	1716	if (hidden_pointer)
…		…
1740	if (!focus)	1728	if (!focus)
1741	{	1729	{
1742	focus = 1;	1730	focus = 1;
1743	want_refresh = 1;	1731	want_refresh = 1;
1744		1732
1745	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));	1733	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1746		1734
1747	#if USE_XIM	1735	#if USE_XIM
1748	if (Input_Context != NULL)	1736	if (Input_Context != NULL)
1749	{	1737	{
1750	IMSetStatusPosition ();	1738	IMSetPosition ();
1751	XSetICFocus (Input_Context);	1739	XSetICFocus (Input_Context);
1752	}	1740	}
1753	#endif	1741	#endif
1754	#if CURSOR_BLINK	1742	#if CURSOR_BLINK
1755	if (OPTION (Opt_cursorBlink))	1743	if (option (Opt_cursorBlink))
1756	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1744	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1757	#endif	1745	#endif
1758	#if OFF_FOCUS_FADING	1746	#if OFF_FOCUS_FADING
1759	if (rs[Rs_fade])	1747	if (rs[Rs_fade])
1760	{	1748	{
1761	pix_colors = pix_colors_focused;	1749	pix_colors = pix_colors_focused;
1762	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	}
1763	}	1764	}
1764	#endif	1765	#endif
1765	}	1766	}
1766	}	1767	}
1767		1768
…		…
1787	#if USE_XIM	1788	#if USE_XIM
1788	if (Input_Context != NULL)	1789	if (Input_Context != NULL)
1789	XUnsetICFocus (Input_Context);	1790	XUnsetICFocus (Input_Context);
1790	#endif	1791	#endif
1791	#if CURSOR_BLINK	1792	#if CURSOR_BLINK
1792	if (OPTION (Opt_cursorBlink))	1793	if (option (Opt_cursorBlink))
1793	cursor_blink_ev.stop ();	1794	cursor_blink_ev.stop ();
1794	hidden_cursor = 0;	1795	hidden_cursor = 0;
1795	#endif	1796	#endif
1796	#if OFF_FOCUS_FADING	1797	#if OFF_FOCUS_FADING
1797	if (rs[Rs_fade])	1798	if (rs[Rs_fade])
…		…
1801	}	1802	}
1802	#endif	1803	#endif
1803	}	1804	}
1804	}	1805	}
1805		1806
1806	#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
1807	void	1821	void
1808	rxvt_term::rootwin_cb (XEvent &ev)	1822	rxvt_term::rootwin_cb (XEvent &ev)
1809	{	1823	{
1810	make_current ();	1824	make_current ();
1811		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
1812	switch (ev.type)	1831	switch (ev.type)
1813	{	1832	{
1814	case PropertyNotify:	1833	case PropertyNotify:
1815	/*	1834	/*
1816	* 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,
…		…
1820	&& ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])	1839	&& ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1821	return;	1840	return;
1822		1841
1823	/* FALLTHROUGH */	1842	/* FALLTHROUGH */
1824	case ReparentNotify:	1843	case ReparentNotify:
1825	if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)	1844	if (option (Opt_transparent) && check_our_parents () && am_transparent)
1826	want_refresh = want_full_refresh = 1;	1845	want_refresh = want_full_refresh = 1;
1827	break;	1846	break;
1828	}	1847	}
		1848	# endif
1829	}	1849	}
1830	#endif	1850	#endif
1831		1851
1832	void	1852	void
1833	rxvt_term::button_press (XButtonEvent &ev)	1853	rxvt_term::button_press (XButtonEvent &ev)
…		…
1842	/*	1862	/*
1843	* VT window processing of button press	1863	* VT window processing of button press
1844	*/	1864	*/
1845	if (ev.window == vt)	1865	if (ev.window == vt)
1846	{	1866	{
		1867	if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
		1868	return;
		1869
1847	#if ISO_14755	1870	#if ISO_14755
1848	// 5.4	1871	// 5.4
1849	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))	1872	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1850	{	1873	{
1851	iso14755_54 (ev.x, ev.y);	1874	iso14755_54 (ev.x, ev.y);
…		…
1893	else	1916	else
1894	{	1917	{
1895	if (ev.button != MEvent.button)	1918	if (ev.button != MEvent.button)
1896	MEvent.clicks = 0;	1919	MEvent.clicks = 0;
1897		1920
1898	if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1899	switch (ev.button)	1921	switch (ev.button)
1900	{	1922	{
1901	case Button1:	1923	case Button1:
1902	/* allow meta + click to select rectangular areas */	1924	/* allow meta + click to select rectangular areas */
1903	/* should be done in screen.C */	1925	/* should be done in screen.C */
1904	#if ENABLE_FRILLS	1926	#if ENABLE_FRILLS
1905	selection.rect = !!(ev.state & ModMetaMask);	1927	selection.rect = !!(ev.state & ModMetaMask);
1906	#else	1928	#else
1907	selection.rect = false;	1929	selection.rect = false;
1908	#endif	1930	#endif
1909		1931
1910	/* allow shift+left click to extend selection */	1932	/* allow shift+left click to extend selection */
1911	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))	1933	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1912	{	1934	{
1913	if (MEvent.button == Button1 && clickintime)	1935	if (MEvent.button == Button1 && clickintime)
1914	selection_rotate (ev.x, ev.y);	1936	selection_rotate (ev.x, ev.y);
1915	else	1937	else
1916	selection_extend (ev.x, ev.y, 1);	1938	selection_extend (ev.x, ev.y, 1);
1917	}	1939	}
1918	else	1940	else
1919	{	1941	{
1920	if (MEvent.button == Button1 && clickintime)	1942	if (MEvent.button == Button1 && clickintime)
1921	MEvent.clicks++;	1943	MEvent.clicks++;
1922	else	1944	else
1923	MEvent.clicks = 1;	1945	MEvent.clicks = 1;
1924		1946
1925	selection_click (MEvent.clicks, ev.x, ev.y);	1947	selection_click (MEvent.clicks, ev.x, ev.y);
1926	}	1948	}
1927		1949
1928	MEvent.button = Button1;	1950	MEvent.button = Button1;
1929	break;	1951	break;
1930		1952
1931	case Button3:	1953	case Button3:
1932	if (MEvent.button == Button3 && clickintime)	1954	if (MEvent.button == Button3 && clickintime)
1933	selection_rotate (ev.x, ev.y);	1955	selection_rotate (ev.x, ev.y);
1934	else	1956	else
1935	selection_extend (ev.x, ev.y, 1);	1957	selection_extend (ev.x, ev.y, 1);
1936		1958
1937	MEvent.button = Button3;	1959	MEvent.button = Button3;
1938	break;	1960	break;
1939	}	1961	}
1940	}	1962	}
1941		1963
1942	MEvent.time = ev.time;	1964	MEvent.time = ev.time;
1943	return;	1965	return;
1944	}	1966	}
1945		1967
…		…
2108	sel_scroll_ev.stop();	2130	sel_scroll_ev.stop();
2109	#endif	2131	#endif
2110		2132
2111	if (ev.window == vt)	2133	if (ev.window == vt)
2112	{	2134	{
		2135	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
		2136	return;
		2137
2113	#if ISO_14755	2138	#if ISO_14755
2114	// 5.4	2139	// 5.4
2115	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))	2140	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2116	return;	2141	return;
2117	#endif	2142	#endif
		2143
2118	if (reportmode)	2144	if (reportmode)
2119	{	2145	{
2120	/* mouse report from vt window */	2146	/* mouse report from vt window */
2121	/* don't report release of wheel "buttons" */	2147	/* don't report release of wheel "buttons" */
2122	if (ev.button >= 4)	2148	if (ev.button >= 4)
…		…
2146	if (priv_modes & PrivMode_mouse_report	2172	if (priv_modes & PrivMode_mouse_report
2147	&& bypass_keystate	2173	&& bypass_keystate
2148	&& ev.button == Button1 && MEvent.clicks <= 1)	2174	&& ev.button == Button1 && MEvent.clicks <= 1)
2149	selection_extend (ev.x, ev.y, 0);	2175	selection_extend (ev.x, ev.y, 0);
2150		2176
2151	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2152	return;
2153
2154	switch (ev.button)	2177	switch (ev.button)
2155	{	2178	{
2156	case Button1:	2179	case Button1:
2157	case Button3:	2180	case Button3:
2158	selection_make (ev.time);	2181	selection_make (ev.time);
2159	break;	2182	break;
2160		2183
2161	case Button2:	2184	case Button2:
2162	if (IN_RANGE_EXC (ev.x, 0, width)	2185	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2163	&& IN_RANGE_EXC (ev.y, 0, height)) // inside window?	2186	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2164	selection_request (ev.time);
2165
2166	break;	2187	break;
2167		2188
2168	#ifdef MOUSE_WHEEL	2189	#ifdef MOUSE_WHEEL
2169	case Button4:	2190	case Button4:
2170	case Button5:	2191	case Button5:
…		…
2174		2195
2175	v = ev.button == Button4 ? UP : DN;	2196	v = ev.button == Button4 ? UP : DN;
2176		2197
2177	if (ev.state & ShiftMask)	2198	if (ev.state & ShiftMask)
2178	i = 1;	2199	i = 1;
2179	else if (OPTION (Opt_mouseWheelScrollPage))	2200	else if (option (Opt_mouseWheelScrollPage))
2180	i = nrow - 1;	2201	i = nrow - 1;
2181	else	2202	else
2182	i = 5;	2203	i = 5;
2183		2204
2184	# ifdef MOUSE_SLIP_WHEELING	2205	# ifdef MOUSE_SLIP_WHEELING
…		…
2212	#if TINTING	2233	#if TINTING
2213	/* taken from aterm-0.4.2 */	2234	/* taken from aterm-0.4.2 */
2214		2235
2215	typedef uint32_t RUINT32T;	2236	typedef uint32_t RUINT32T;
2216		2237
2217	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)
2218	{	2239	{
2219	int sh_r, sh_g, sh_b;	2240	int sh_r, sh_g, sh_b;
2220	RUINT32T mask_r, mask_g, mask_b;	2241	RUINT32T mask_r, mask_g, mask_b;
2221	RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;	2242	RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2222	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;	2243	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2223	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;	2244	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2224	int i;	2245	int i;
2225		2246
2226	Visual *visual = display->visual;	2247	Visual *visual = term->visual;
2227		2248
2228	if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;	2249	if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2229		2250
2230	/* for convenience */	2251	/* for convenience */
2231	mask_r = visual->red_mask;	2252	mask_r = visual->red_mask;
…		…
2452	Atom atype;	2473	Atom atype;
2453	unsigned char *prop = NULL;	2474	unsigned char *prop = NULL;
2454	Window root, oldp, *list;	2475	Window root, oldp, *list;
2455	Pixmap rootpixmap = None;	2476	Pixmap rootpixmap = None;
2456	XWindowAttributes wattr, wrootattr;	2477	XWindowAttributes wattr, wrootattr;
2457	dDisp;
2458		2478
2459	pchanged = 0;	2479	pchanged = 0;
2460		2480
2461	if (!OPTION (Opt_transparent))	2481	if (!option (Opt_transparent))
2462	return pchanged; /* Don't try any more */	2482	return pchanged; /* Don't try any more */
2463		2483
2464	XGetWindowAttributes (disp, display->root, &wrootattr);	2484	XGetWindowAttributes (dpy, display->root, &wrootattr);
2465	rootdepth = wrootattr.depth;	2485	rootdepth = wrootattr.depth;
2466		2486
2467	XGetWindowAttributes (disp, parent[0], &wattr);	2487	XGetWindowAttributes (dpy, parent[0], &wattr);
2468		2488
2469	if (rootdepth != wattr.depth)	2489	if (rootdepth != wattr.depth)
2470	{	2490	{
2471	if (am_transparent)	2491	if (am_transparent)
2472	{	2492	{
2473	pchanged = 1;	2493	pchanged = 1;
2474	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2494	XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2475	am_transparent = am_pixmap_trans = 0;	2495	am_transparent = am_pixmap_trans = 0;
2476	}	2496	}
2477		2497
2478	return pchanged; /* Don't try any more */	2498	return pchanged; /* Don't try any more */
2479	}	2499	}
2480		2500
2481	/* 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. */
2482	XSync (disp, False);	2502	XSync (dpy, False);
2483		2503
2484	/*	2504	/*
2485	* Make the frame window set by the window manager have	2505	* Make the frame window set by the window manager have
2486	* the root background. Some window managers put multiple nested frame	2506	* the root background. Some window managers put multiple nested frame
2487	* 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.
2488	*/	2508	*/
2489	i = (xa[XA_XROOTPMAP_ID]	2509	i = (xa[XA_XROOTPMAP_ID]
2490	&& XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],	2510	&& XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2491	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2511	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2492	&nitems, &bytes_after, &prop) == Success);	2512	&nitems, &bytes_after, &prop) == Success);
2493		2513
2494	if (!i || prop == NULL)	2514	if (!i || prop == NULL)
2495	i = (xa[XA_ESETROOT_PMAP_ID]	2515	i = (xa[XA_ESETROOT_PMAP_ID]
2496	&& XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],	2516	&& XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2497	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2517	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2498	&nitems, &bytes_after, &prop) == Success);	2518	&nitems, &bytes_after, &prop) == Success);
2499		2519
2500	if (!i || prop == NULL	2520	if (!i || prop == NULL
2501	#if TINTING	2521	#if TINTING
2502	|| !rs[Rs_color + Color_tint]	2522	|| !ISSET_PIXCOLOR (Color_tint)
2503	#endif	2523	#endif
2504	)	2524	)
2505	have_pixmap = 0;	2525	have_pixmap = 0;
2506	else	2526	else
2507	{	2527	{
…		…
2520	Window cr;	2540	Window cr;
2521	XImage *image;	2541	XImage *image;
2522	GC gc;	2542	GC gc;
2523	XGCValues gcvalue;	2543	XGCValues gcvalue;
2524		2544
2525	XTranslateCoordinates (disp, parent[0], display->root,	2545	XTranslateCoordinates (dpy, parent[0], display->root,
2526	0, 0, &sx, &sy, &cr);	2546	0, 0, &sx, &sy, &cr);
2527	nw = (unsigned int)szHint.width;	2547	nw = (unsigned int)szHint.width;
2528	nh = (unsigned int)szHint.height;	2548	nh = (unsigned int)szHint.height;
2529	nx = ny = 0;	2549	nx = ny = 0;
2530		2550
…		…
2543	}	2563	}
2544		2564
2545	min_it (nw, (unsigned int) (wrootattr.width - sx));	2565	min_it (nw, (unsigned int) (wrootattr.width - sx));
2546	min_it (nh, (unsigned int) (wrootattr.height - sy));	2566	min_it (nh, (unsigned int) (wrootattr.height - sy));
2547		2567
2548	XSync (disp, False);	2568	XSync (dpy, False);
2549	allowedxerror = -1;	2569	allowedxerror = -1;
2550	image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);	2570	image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2551		2571
2552	/* XXX: handle BadMatch - usually because we're outside the pixmap */	2572	/* XXX: handle BadMatch - usually because we're outside the pixmap */
2553	/* XXX: may need a delay here? */	2573	/* XXX: may need a delay here? */
2554	allowedxerror = 0;	2574	allowedxerror = 0;
2555		2575
…		…
2558	if (am_transparent && am_pixmap_trans)	2578	if (am_transparent && am_pixmap_trans)
2559	{	2579	{
2560	pchanged = 1;	2580	pchanged = 1;
2561	if (pixmap != None)	2581	if (pixmap != None)
2562	{	2582	{
2563	XFreePixmap (disp, pixmap);	2583	XFreePixmap (dpy, pixmap);
2564	pixmap = None;	2584	pixmap = None;
2565	}	2585	}
2566	}	2586	}
2567		2587
2568	am_pixmap_trans = 0;	2588	am_pixmap_trans = 0;
2569	}	2589	}
2570	else	2590	else
2571	{	2591	{
2572	if (pixmap != None)	2592	if (pixmap != None)
2573	XFreePixmap (disp, pixmap);	2593	XFreePixmap (dpy, pixmap);
2574		2594
2575	#if TINTING	2595	#if TINTING
2576	if (ISSET_PIXCOLOR (Color_tint))	2596	if (ISSET_PIXCOLOR (Color_tint))
2577	{	2597	{
2578	unsigned short rm, gm, bm;
2579	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;	2598	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2580		2599
		2600	rgba c;
2581	pix_colors_focused[Color_tint].get (display, rm, gm, bm);	2601	pix_colors_focused [Color_tint].get (c);
2582		2602
2583	ShadeXImage (display, image, shade, rm, gm, bm);	2603	ShadeXImage (this, image, shade, c.r, c.g, c.b);
2584	}	2604	}
2585	#endif	2605	#endif
2586		2606
2587	pixmap = XCreatePixmap (disp, vt,	2607	pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2588	szHint.width, szHint.height, image->depth);
2589	gc = XCreateGC (disp, vt, 0UL, &gcvalue);	2608	gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2590	XPutImage (disp, pixmap, gc, image, 0, 0,	2609	XPutImage (dpy, pixmap, gc, image, 0, 0,
2591	nx, ny, image->width, image->height);	2610	nx, ny, image->width, image->height);
2592	XFreeGC (disp, gc);	2611	XFreeGC (dpy, gc);
2593	XDestroyImage (image);	2612	XDestroyImage (image);
2594	XSetWindowBackgroundPixmap (disp, parent[0], pixmap);	2613	XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2595	XClearWindow (disp, parent[0]);	2614	XClearWindow (dpy, parent[0]);
2596		2615
2597	if (!am_transparent || !am_pixmap_trans)	2616	if (!am_transparent || !am_pixmap_trans)
2598	pchanged = 1;	2617	pchanged = 1;
2599		2618
2600	am_transparent = am_pixmap_trans = 1;	2619	am_transparent = am_pixmap_trans = 1;
2601	}	2620	}
2602	}	2621	}
2603		2622
2604	if (am_pixmap_trans)	2623	if (am_pixmap_trans)
2605	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2624	XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2606	else	2625	else
2607	{	2626	{
2608	unsigned int n;	2627	unsigned int n;
2609	/*	2628	/*
2610	* InheritPixmap transparency	2629	* InheritPixmap transparency
2611	*/	2630	*/
2612	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2631	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2613	{	2632	{
2614	oldp = parent[i];	2633	oldp = parent[i];
2615	XQueryTree (disp, parent[i - 1], &root,	2634	XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2616	&parent[i], &list, &n);
2617	XFree (list);	2635	XFree (list);
2618		2636
2619	if (parent[i] == display->root)	2637	if (parent[i] == display->root)
2620	{	2638	{
2621	if (oldp != None)	2639	if (oldp != None)
…		…
2629	}	2647	}
2630		2648
2631	n = 0;	2649	n = 0;
2632		2650
2633	if (pchanged)	2651	if (pchanged)
2634	{
2635	for (; n < (unsigned int)i; n++)	2652	for (; n < (unsigned int)i; n++)
2636	{	2653	{
2637	XGetWindowAttributes (disp, parent[n], &wattr);	2654	XGetWindowAttributes (dpy, parent[n], &wattr);
		2655
2638	if (wattr.depth != rootdepth || wattr.c_class == InputOnly)	2656	if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2639	{	2657	{
2640	n = (int) (sizeof (parent) / sizeof (Window)) + 1;	2658	n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2641	break;	2659	break;
2642	}	2660	}
2643	}	2661	}
2644	}
2645		2662
2646	if (n > (int) (sizeof (parent) / sizeof (parent[0])))	2663	if (n > (sizeof (parent) / sizeof (parent[0])))
2647	{	2664	{
2648	XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);	2665	XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2649	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2666	XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2650	am_transparent = 0;	2667	am_transparent = 0;
2651	/* XXX: also turn off Opt_transparent? */	2668	/* XXX: also turn off Opt_transparent? */
2652	}	2669	}
2653	else	2670	else
2654	{	2671	{
2655	#if WAIT_FOR_WM
2656	/* wait (an arbitrary period) for the WM to do its thing
2657	* needed for fvwm2.2.2 (and before?) */
2658	sleep (1);
2659	#endif
2660	for (n = 0; n < (unsigned int)i; n++)	2672	for (n = 0; n < (unsigned int)i; n++)
2661	{	2673	{
2662	XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);	2674	XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2663	XClearWindow (disp, parent[n]);	2675	XClearWindow (dpy, parent[n]);
2664	}	2676	}
2665		2677
2666	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2678	XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2667	am_transparent = 1;	2679	am_transparent = 1;
2668	}	2680	}
2669		2681
2670	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2682	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2671	parent[i] = None;	2683	parent[i] = None;
2672	}	2684	}
2673		2685
2674	if (scrollBar.win)	2686	if (scrollBar.win)
2675	{	2687	{
2676	XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);	2688	XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2677	scrollBar.setIdle ();	2689	scrollBar.setIdle ();
2678	scrollbar_show (0);	2690	scrollbar_show (0);
2679	}	2691	}
2680		2692
2681	if (am_transparent)	2693	if (am_transparent)
…		…
2744	if (ch == C0_LF)	2756	if (ch == C0_LF)
2745	nlines++;	2757	nlines++;
2746		2758
2747	refresh_count++;	2759	refresh_count++;
2748		2760
2749	if (!OPTION (Opt_jumpScroll)	2761	if (!option (Opt_jumpScroll)
2750	|| (refresh_count >= refresh_limit * (nrow - 1)))	2762	|| (refresh_count >= refresh_limit * (nrow - 1)))
2751	{	2763	{
2752	refreshnow = true;	2764	refreshnow = true;
2753	refresh_count = 0;	2765	refresh_count = 0;
2754	ch = NOCHAR;	2766	ch = NOCHAR;
…		…
2794	* the number of pages between refreshes is refresh_limit, which	2806	* the number of pages between refreshes is refresh_limit, which
2795	* is incremented here because we must be doing flat-out scrolling.	2807	* is incremented here because we must be doing flat-out scrolling.
2796	*/	2808	*/
2797	if (refreshnow)	2809	if (refreshnow)
2798	{	2810	{
2799	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)	2811	if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2800	refresh_limit++;	2812	refresh_limit++;
2801	else	2813	else
2802	{	2814	{
2803	flag = true;	2815	flag = true;
		2816	//TODO: due to popular request, implement "skipscroll" option here
2804	scr_refresh ();	2817	scr_refresh ();
2805	want_refresh = 1;	2818	want_refresh = 1;
2806	}	2819	}
2807	}	2820	}
2808		2821
…		…
2827	return flag;	2840	return flag;
2828	}	2841	}
2829		2842
2830	// read the next character	2843	// read the next character
2831	wchar_t	2844	wchar_t
2832	rxvt_term::next_char ()	2845	rxvt_term::next_char () NOTHROW
2833	{	2846	{
2834	while (cmdbuf_ptr < cmdbuf_endp)	2847	while (cmdbuf_ptr < cmdbuf_endp)
2835	{	2848	{
2836	// assume 7-bit to be ascii ALWAYS	2849	// assume 7-bit to be ascii ALWAYS
2837	if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)	2850	if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
…		…
2858	return NOCHAR;	2871	return NOCHAR;
2859	}	2872	}
2860		2873
2861	// read the next octet	2874	// read the next octet
2862	uint32_t	2875	uint32_t
2863	rxvt_term::next_octet ()	2876	rxvt_term::next_octet () NOTHROW
2864	{	2877	{
2865	return cmdbuf_ptr < cmdbuf_endp	2878	return cmdbuf_ptr < cmdbuf_endp
2866	? (unsigned char)*cmdbuf_ptr++	2879	? (unsigned char)*cmdbuf_ptr++
2867	: NOCHAR;	2880	: NOCHAR;
2868	}	2881	}
		2882
		2883	static class out_of_input out_of_input;
2869		2884
2870	/* rxvt_cmd_getc () - Return next input character */	2885	/* rxvt_cmd_getc () - Return next input character */
2871	/*	2886	/*
2872	* Return the next input character after first passing any keyboard input	2887	* Return the next input character after first passing any keyboard input
2873	* to the command.	2888	* to the command.
2874	*/	2889	*/
2875	wchar_t	2890	wchar_t
2876	rxvt_term::cmd_getc ()	2891	rxvt_term::cmd_getc () THROW ((class out_of_input))
2877	{	2892	{
2878	wchar_t c = next_char ();	2893	wchar_t c = next_char ();
2879		2894
2880	if (c == NOCHAR)	2895	if (c == NOCHAR)
2881	throw out_of_input;	2896	throw out_of_input;
2882		2897
2883	return c;	2898	return c;
2884	}	2899	}
2885		2900
2886	uint32_t	2901	uint32_t
2887	rxvt_term::cmd_get8 ()	2902	rxvt_term::cmd_get8 () THROW ((class out_of_input))
2888	{	2903	{
2889	uint32_t c = next_octet ();	2904	uint32_t c = next_octet ();
2890		2905
2891	if (c == NOCHAR)	2906	if (c == NOCHAR)
2892	throw out_of_input;	2907	throw out_of_input;
…		…
3130	scr_charset_set (2, (unsigned int)cmd_getc ());	3145	scr_charset_set (2, (unsigned int)cmd_getc ());
3131	break;	3146	break;
3132	case '+':	3147	case '+':
3133	scr_charset_set (3, (unsigned int)cmd_getc ());	3148	scr_charset_set (3, (unsigned int)cmd_getc ());
3134	break;	3149	break;
3135	#if ENABLE_FRILLS	3150	#if !ENABLE_MINIMAL
3136	case '6':	3151	case '6':
3137	scr_backindex ();	3152	scr_backindex ();
3138	break;	3153	break;
3139	#endif	3154	#endif
3140	case '7':	3155	case '7':
3141	scr_cursor (SAVE);	3156	scr_cursor (SAVE);
3142	break;	3157	break;
3143	case '8':	3158	case '8':
3144	scr_cursor (RESTORE);	3159	scr_cursor (RESTORE);
3145	break;	3160	break;
3146	#if ENABLE_FRILLS	3161	#if !ENABLE_MINIMAL
3147	case '9':	3162	case '9':
3148	scr_forwardindex ();	3163	scr_forwardindex ();
3149	break;	3164	break;
3150	#endif	3165	#endif
3151	case '=':	3166	case '=':
…		…
3313	ndef = get_byte_array_bit (csi_defaults, i);	3328	ndef = get_byte_array_bit (csi_defaults, i);
3314	for (p = 0; p < nargs; p++)	3329	for (p = 0; p < nargs; p++)
3315	if (arg[p] == -1)	3330	if (arg[p] == -1)
3316	arg[p] = ndef;	3331	arg[p] = ndef;
3317		3332
3318	#ifdef DEBUG_CMD
3319	fprintf (stderr, "CSI ");
3320	for (p = 0; p < nargs; p++)
3321	fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3322	fprintf (stderr, "%c\n", ch);
3323	#endif
3324
3325	/*	3333	/*
3326	* private mode handling	3334	* private mode handling
3327	*/	3335	*/
3328	if (priv)	3336	if (priv)
3329	{	3337	{
3330	switch (priv)	3338	switch (priv)
3331	{	3339	{
3332	case '>':	3340	case '>':
3333	if (ch == CSI_DA) /* secondary device attributes */	3341	if (ch == CSI_DA) /* secondary device attributes */
3334	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	}
3335	break;	3352	break;
3336	case '?':	3353	case '?':
3337	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')	3354	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3338	process_terminal_mode (ch, priv, nargs, arg);	3355	process_terminal_mode (ch, priv, nargs, arg);
3339	break;	3356	break;
…		…
3465	break;	3482	break;
3466	case 6: /* CPR requested */	3483	case 6: /* CPR requested */
3467	scr_report_position ();	3484	scr_report_position ();
3468	break;	3485	break;
3469	case 7: /* unofficial extension */	3486	case 7: /* unofficial extension */
3470	if (OPTION (Opt_insecure))	3487	if (option (Opt_insecure))
3471	tt_printf ("%-.250s\012", rs[Rs_display_name]);	3488	tt_printf ("%-.250s\012", rs[Rs_display_name]);
3472	break;	3489	break;
3473	case 8: /* unofficial extension */	3490	case 8: /* unofficial extension */
3474	process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);	3491	process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3475	break;	3492	break;
…		…
3542	break;	3559	break;
3543	case CSI_75:	3560	case CSI_75:
3544	scr_cursor (RESTORE);	3561	scr_cursor (RESTORE);
3545	break;	3562	break;
3546		3563
3547	#if ENABLE_FRILLS	3564	#if !ENABLE_MINIMAL
3548	case CSI_74:	3565	case CSI_74:
3549	process_window_ops (arg, nargs);	3566	process_window_ops (arg, nargs);
3550	break;	3567	break;
3551	#endif	3568	#endif
3552		3569
…		…
3559	break;	3576	break;
3560	}	3577	}
3561	}	3578	}
3562	/*}}} */	3579	/*}}} */
3563		3580
3564	#if ENABLE_FRILLS	3581	#if !ENABLE_MINIMAL
3565	/* ARGSUSED */	3582	/* ARGSUSED */
3566	void	3583	void
3567	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3584	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3568	{	3585	{
3569	int x, y;	3586	int x, y;
3570	XWindowAttributes wattr;	3587	XWindowAttributes wattr;
3571	Window wdummy;	3588	Window wdummy;
3572	dDisp;	3589
		3590	dLocal (Display *, dpy);
3573		3591
3574	if (nargs == 0)	3592	if (nargs == 0)
3575	return;	3593	return;
3576		3594
3577	switch (args[0])	3595	switch (args[0])
3578	{	3596	{
3579	/*	3597	/*
3580	* commands	3598	* commands
3581	*/	3599	*/
3582	case 1: /* deiconify window */	3600	case 1: /* deiconify window */
3583	XMapWindow (disp, parent[0]);	3601	XMapWindow (dpy, parent[0]);
3584	break;	3602	break;
3585	case 2: /* iconify window */	3603	case 2: /* iconify window */
3586	XIconifyWindow (disp, parent[0], display->screen);	3604	XIconifyWindow (dpy, parent[0], display->screen);
3587	break;	3605	break;
3588	case 3: /* set position (pixels) */	3606	case 3: /* set position (pixels) */
3589	XMoveWindow (disp, parent[0], args[1], args[2]);	3607	XMoveWindow (dpy, parent[0], args[1], args[2]);
3590	break;	3608	break;
3591	case 4: /* set size (pixels) */	3609	case 4: /* set size (pixels) */
3592	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3610	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3593	break;	3611	break;
3594	case 5: /* raise window */	3612	case 5: /* raise window */
3595	XRaiseWindow (disp, parent[0]);	3613	XRaiseWindow (dpy, parent[0]);
3596	break;	3614	break;
3597	case 6: /* lower window */	3615	case 6: /* lower window */
3598	XLowerWindow (disp, parent[0]);	3616	XLowerWindow (dpy, parent[0]);
3599	break;	3617	break;
3600	case 7: /* refresh window */	3618	case 7: /* refresh window */
3601	scr_touch (true);	3619	scr_touch (true);
3602	break;	3620	break;
3603	case 8: /* set size (chars) */	3621	case 8: /* set size (chars) */
…		…
3610	if (args[0] >= 24) /* set height (chars) */	3628	if (args[0] >= 24) /* set height (chars) */
3611	set_widthheight ((unsigned int)width,	3629	set_widthheight ((unsigned int)width,
3612	(unsigned int) (args[1] * fheight));	3630	(unsigned int) (args[1] * fheight));
3613	break;	3631	break;
3614		3632
3615
3616	/*	3633	/*
3617	* reports - some output format copied from XTerm	3634	* reports - some output format copied from XTerm
3618	*/	3635	*/
3619	case 11: /* report window state */	3636	case 11: /* report window state */
3620	XGetWindowAttributes (disp, parent[0], &wattr);	3637	XGetWindowAttributes (dpy, parent[0], &wattr);
3621	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3638	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3622	break;	3639	break;
3623	case 13: /* report window position */	3640	case 13: /* report window position */
3624	XGetWindowAttributes (disp, parent[0], &wattr);	3641	XGetWindowAttributes (dpy, parent[0], &wattr);
3625	XTranslateCoordinates (disp, parent[0], wattr.root,	3642	XTranslateCoordinates (dpy, parent[0], wattr.root,
3626	-wattr.border_width, -wattr.border_width,	3643	-wattr.border_width, -wattr.border_width,
3627	&x, &y, &wdummy);	3644	&x, &y, &wdummy);
3628	tt_printf ("\033[3;%d;%dt", x, y);	3645	tt_printf ("\033[3;%d;%dt", x, y);
3629	break;	3646	break;
3630	case 14: /* report window size (pixels) */	3647	case 14: /* report window size (pixels) */
3631	XGetWindowAttributes (disp, parent[0], &wattr);	3648	XGetWindowAttributes (dpy, parent[0], &wattr);
3632	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3649	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3633	break;	3650	break;
3634	case 18: /* report text area size (chars) */	3651	case 18: /* report text area size (chars) */
3635	tt_printf ("\033[8;%d;%dt", nrow, ncol);	3652	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3636	break;	3653	break;
…		…
3638	tt_printf ("\033[9;%d;%dt", nrow, ncol);	3655	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3639	break;	3656	break;
3640	case 20: /* report icon label */	3657	case 20: /* report icon label */
3641	{	3658	{
3642	char *s;	3659	char *s;
3643	XGetIconName (disp, parent[0], &s);	3660	XGetIconName (dpy, parent[0], &s);
3644	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 */
3645	XFree (s);	3662	XFree (s);
3646	}	3663	}
3647	break;	3664	break;
3648	case 21: /* report window title */	3665	case 21: /* report window title */
3649	{	3666	{
3650	char *s;	3667	char *s;
3651	XFetchName (disp, parent[0], &s);	3668	XFetchName (dpy, parent[0], &s);
3652	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 */
3653	XFree (s);	3670	XFree (s);
3654	}	3671	}
3655	break;	3672	break;
3656	}	3673	}
3657	}	3674	}
…		…
3684	seen_esc = true;	3701	seen_esc = true;
3685	continue;	3702	continue;
3686	}	3703	}
3687	else if (ch == C0_BEL || ch == CHAR_ST)	3704	else if (ch == C0_BEL || ch == CHAR_ST)
3688	break;	3705	break;
		3706	else if (ch == C0_SYN)
		3707	ch = cmd_get8 ();
3689	else if (ch < 0x20)	3708	else if (ch < 0x20)
3690	return NULL; /* other control character - exit */	3709	return NULL; /* other control character - exit */
3691		3710
3692	seen_esc = false;	3711	seen_esc = false;
3693		3712
3694	if (n >= STRING_MAX - 1)	3713	if (n >= STRING_MAX - 1)
3695	// stop at some sane length	3714	// stop at some sane length
3696	return NULL;	3715	return NULL;
3697		3716
3698	if (ch == C0_SYN)
3699	string[n++] = cmd_get8 ();
3700	else
3701	string[n++] = ch;	3717	string[n++] = ch;
3702	}	3718	}
3703		3719
3704	string[n++] = '\0';	3720	string[n++] = '\0';
3705		3721
3706	ends_how = (ch == 0x5c ? C0_ESC : ch);	3722	ends_how = (ch == 0x5c ? C0_ESC : ch);
…		…
3757	void	3773	void
3758	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)
3759	{	3775	{
3760	if (str[0] == '?' && !str[1])	3776	if (str[0] == '?' && !str[1])
3761	{	3777	{
3762	unsigned short r, g, b;	3778	rgba c;
3763	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
3764	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);
3765	}	3787	}
3766	else	3788	else
3767	set_window_color (color, str);	3789	set_window_color (color, str);
3768	}	3790	}
3769		3791
…		…
3775	{	3797	{
3776	int color;	3798	int color;
3777	char *buf, *name;	3799	char *buf, *name;
3778	bool query = str[0] == '?' && !str[1];	3800	bool query = str[0] == '?' && !str[1];
3779	int saveop = op;	3801	int saveop = op;
3780	dDisp;	3802
		3803	dLocal (Display *, dpy);
3781		3804
3782	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
3783	switch (op)	3810	switch (op)
3784	{	3811	{
3785	case XTerm_name:	3812	case XTerm_name:
3786	set_title (str);	3813	set_title (str);
3787	/* FALLTHROUGH */	3814	/* FALLTHROUGH */
…		…
3801	unsigned long bytes_after;	3828	unsigned long bytes_after;
3802	unsigned char *value = 0;	3829	unsigned char *value = 0;
3803	const char *str = "";	3830	const char *str = "";
3804		3831
3805	if (prop	3832	if (prop
3806	&& XGetWindowProperty (disp, parent[0],	3833	&& XGetWindowProperty (dpy, parent[0],
3807	prop, 0, 1<<16, 0, AnyPropertyType,	3834	prop, 0, 1<<16, 0, AnyPropertyType,
3808	&actual_type, &actual_format,	3835	&actual_type, &actual_format,
3809	&nitems, &bytes_after, &value) == Success	3836	&nitems, &bytes_after, &value) == Success
3810	&& actual_type != None	3837	&& actual_type != None
3811	&& actual_format == 8)	3838	&& actual_format == 8)
3812	str = (const char *)(value);	3839	str = (const char *)(value);
3813		3840
3814	tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);	3841	tt_printf ("\033]%d;%s%c", op, str, resp);
3815		3842
3816	XFree (value);	3843	XFree (value);
3817	}	3844	}
3818	else	3845	else
3819	{	3846	{
…		…
3823	{	3850	{
3824	*eq = 0;	3851	*eq = 0;
3825	set_utf8_property (display->atom (str), eq + 1);	3852	set_utf8_property (display->atom (str), eq + 1);
3826	}	3853	}
3827	else	3854	else
3828	XDeleteProperty (disp, parent[0],	3855	XDeleteProperty (dpy, parent[0],
3829	display->atom (str));	3856	display->atom (str));
3830	}	3857	}
3831	break;	3858	break;
3832		3859
3833	case XTerm_Color:	3860	case XTerm_Color:
…		…
3843	break;	3870	break;
3844		3871
3845	if ((buf = strchr (name, ';')) != NULL)	3872	if ((buf = strchr (name, ';')) != NULL)
3846	*buf++ = '\0';	3873	*buf++ = '\0';
3847		3874
3848	if (name[0] == '?' && !name[1])	3875	process_color_seq (op, color, name, resp);
3849	{
3850	unsigned short r, g, b;
3851	pix_colors_focused[color].get (display, r, g, b);
3852	tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3853	}
3854	else
3855	set_window_color (color, name);
3856	}	3876	}
3857	break;	3877	break;
3858	case XTerm_Color00:	3878	case XTerm_Color00:
3859	process_color_seq (XTerm_Color00, Color_fg, str, resp);	3879	process_color_seq (op, Color_fg, str, resp);
3860	break;	3880	break;
3861	case XTerm_Color01:	3881	case XTerm_Color01:
3862	process_color_seq (XTerm_Color01, Color_bg, str, resp);	3882	process_color_seq (op, Color_bg, str, resp);
3863	break;	3883	break;
3864	#ifndef NO_CURSORCOLOR	3884	#ifndef NO_CURSORCOLOR
3865	case XTerm_Color_cursor:	3885	case XTerm_Color_cursor:
3866	process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);	3886	process_color_seq (op, Color_cursor, str, resp);
3867	break;	3887	break;
3868	#endif	3888	#endif
3869	case XTerm_Color_pointer_fg:	3889	case XTerm_Color_pointer_fg:
3870	process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);	3890	process_color_seq (op, Color_pointer_fg, str, resp);
3871	break;	3891	break;
3872	case XTerm_Color_pointer_bg:	3892	case XTerm_Color_pointer_bg:
3873	process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);	3893	process_color_seq (op, Color_pointer_bg, str, resp);
3874	break;	3894	break;
3875	#ifndef NO_BOLD_UNDERLINE_REVERSE	3895	#ifndef NO_BOLD_UNDERLINE_REVERSE
3876	case XTerm_Color_RV:	3896	case XTerm_Color_RV:
3877	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3897	process_color_seq (op, Color_RV, str, resp);
3878	break;	3898	break;
3879	case Rxvt_Color_BD:	3899	case Rxvt_Color_BD:
3880	case URxvt_Color_BD:	3900	case URxvt_Color_BD:
3881	process_color_seq (op, Color_BD, str, resp);	3901	process_color_seq (op, Color_BD, str, resp);
3882	break;	3902	break;
3883	case Rxvt_Color_UL:	3903	case Rxvt_Color_UL:
3884	case URxvt_Color_UL:	3904	case URxvt_Color_UL:
3885	process_color_seq (op, Color_UL, str, resp);	3905	process_color_seq (op, Color_UL, str, resp);
3886	break;	3906	break;
3887	case URxvt_Color_IT:	3907	case URxvt_Color_IT:
3888	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);	3908	process_color_seq (op, Color_IT, str, resp);
3889	break;	3909	break;
3890	#endif	3910	#endif
3891	#if TRANSPARENT && TINTING	3911	#if TRANSPARENT && TINTING
3892	case URxvt_Color_tint:	3912	case URxvt_Color_tint:
3893	process_color_seq (URxvt_Color_tint, Color_tint, str, resp);	3913	process_color_seq (op, Color_tint, str, resp);
		3914
3894	check_our_parents ();	3915	check_our_parents ();
		3916
3895	if (am_transparent)	3917	if (am_transparent)
3896	want_full_refresh = want_refresh = 1;	3918	want_full_refresh = want_refresh = 1;
		3919
3897	break;	3920	break;
3898	#endif	3921	#endif
3899		3922
3900	case Rxvt_Pixmap:	3923	case Rxvt_Pixmap:
3901	{	3924	{
…		…
3959	case URxvt_italicFont:	3982	case URxvt_italicFont:
3960	case URxvt_boldItalicFont:	3983	case URxvt_boldItalicFont:
3961	#endif	3984	#endif
3962	if (query)	3985	if (query)
3963	tt_printf ("\33]%d;%-.250s%c", saveop,	3986	tt_printf ("\33]%d;%-.250s%c", saveop,
3964	OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc	3987	option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3965	? fontset[op - URxvt_font]->fontdesc : "",	3988	? fontset[op - URxvt_font]->fontdesc : "",
3966	resp);	3989	resp);
3967	else	3990	else
3968	{	3991	{
3969	const char *&res = rs[Rs_font + (op - URxvt_font)];	3992	const char *&res = rs[Rs_font + (op - URxvt_font)];
…		…
3972	allocated.push_back ((void *)res);	3995	allocated.push_back ((void *)res);
3973	set_fonts ();	3996	set_fonts ();
3974	}	3997	}
3975	break;	3998	break;
3976		3999
3977	#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
3978	case URxvt_locale:	4009	case URxvt_locale:
3979	if (query)	4010	if (query)
3980	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);
3981	else	4012	else
3982	{	4013	{
3983	set_locale (str);	4014	set_locale (str);
3984	pty->set_utf8_mode (enc_utf8);	4015	pty->set_utf8_mode (enc_utf8);
3985	init_xlocale ();	4016	init_xlocale ();
…		…
4000	break;	4031	break;
4001	#endif	4032	#endif
4002		4033
4003	#if ENABLE_PERL	4034	#if ENABLE_PERL
4004	case URxvt_perl:	4035	case URxvt_perl:
4005	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)))
4006	; // no responses yet	4037	; // no responses yet
4007	break;	4038	break;
4008	#endif	4039	#endif
4009	}	4040	}
4010	}	4041	}
…		…
4042	return state;	4073	return state;
4043	}	4074	}
4044		4075
4045	/* we're not using priv _yet_ */	4076	/* we're not using priv _yet_ */
4046	void	4077	void
4047	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)
4048	{	4079	{
4049	unsigned int i, j;	4080	unsigned int i, j;
4050	int state;	4081	int state;
4051		4082
4052	static const struct	4083	static const struct
…		…
4126	scr_touch (true);	4157	scr_touch (true);
4127	break;	4158	break;
4128	#endif	4159	#endif
4129	case 1048: /* alternative cursor save */	4160	case 1048: /* alternative cursor save */
4130	case 1049:	4161	case 1049:
4131	if (OPTION (Opt_secondaryScreen))	4162	if (option (Opt_secondaryScreen))
4132	if (mode == 0)	4163	if (mode == 0)
4133	scr_cursor (RESTORE);	4164	scr_cursor (RESTORE);
4134	else if (mode == 1)	4165	else if (mode == 1)
4135	scr_cursor (SAVE);	4166	scr_cursor (SAVE);
4136	break;	4167	break;
…		…
4201	break;	4232	break;
4202	case 1011: /* scroll to bottom on key press */	4233	case 1011: /* scroll to bottom on key press */
4203	set_option (Opt_scrollTtyKeypress, state);	4234	set_option (Opt_scrollTtyKeypress, state);
4204	break;	4235	break;
4205	case 1047: /* secondary screen w/ clearing last */	4236	case 1047: /* secondary screen w/ clearing last */
4206	if (OPTION (Opt_secondaryScreen))	4237	if (option (Opt_secondaryScreen))
4207	if (current_screen != PRIMARY)	4238	if (current_screen != PRIMARY)
4208	scr_erase_screen (2);	4239	scr_erase_screen (2);
4209	scr_change_screen (state);	4240	scr_change_screen (state);
4210	break;	4241	break;
4211	case 1049: /* secondary screen w/ clearing first */	4242	case 1049: /* secondary screen w/ clearing first */
4212	scr_change_screen (state);	4243	scr_change_screen (state);
4213	if (OPTION (Opt_secondaryScreen))	4244	if (option (Opt_secondaryScreen))
4214	if (current_screen != PRIMARY)	4245	if (current_screen != PRIMARY)
4215	scr_erase_screen (2);	4246	scr_erase_screen (2);
4216	break;	4247	break;
4217	default:	4248	default:
4218	break;	4249	break;
…		…
4346	scr_color (Color_bg, Color_bg);	4377	scr_color (Color_bg, Color_bg);
4347	break;	4378	break;
4348		4379
4349	//case 50: // not variable spacing	4380	//case 50: // not variable spacing
4350		4381
4351	#if ENABLE_FRILLS	4382	#if !ENABLE_MINIMAL
4352	case 90:	4383	case 90:
4353	case 91: /* set bright fg color */	4384	case 91: /* set bright fg color */
4354	case 92:	4385	case 92:
4355	case 93:	4386	case 93:
4356	case 94:	4387	case 94:

Diff Legend

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