[ViewVC] Diff of: 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.311 by root, Sat Mar 4 20:14:35 2006 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	*
…		…
905	{	909	{
906	const char ch = C0_ESC;	910	const char ch = C0_ESC;
907	tt_write (&ch, 1);	911	tt_write (&ch, 1);
908	}	912	}
909		913
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);	914	tt_write (kbuf, (unsigned int)len);
921	}	915	}
922	/}}} /	916
		917	void
		918	rxvt_term::key_release (XKeyEvent &ev)
		919	{
		920	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ISO_14755 \|\| ENABLE_PERL
		921	KeySym keysym;
		922
		923	keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
		924	#endif
		925
		926	#if ENABLE_FRILLS \|\| ISO_14755
		927	// ISO 14755 support
		928	if (iso14755buf)
		929	if (iso14755buf & ISO_14755_52)
		930	{
		931	# if ENABLE_OVERLAY
		932	scr_overlay_off ();
		933	# endif
		934	# if ISO_14755
		935	// iso14755 part 5.2 handling: release time
		936	// first: controls
		937	if ((ev.state & ControlMask)
		938	&& ((keysym >= 0x40 && keysym <= 0x5f)
		939	\|\| (keysym >= 0x61 && keysym <= 0x7f)))
		940	{
		941	iso14755buf = ISO_14755_51 \| 0x2400 \| (keysym & 0x1f);
		942	commit_iso14755 ();
		943
		944	return;
		945	}
		946
		947	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
		948	if (i[0] == keysym)
		949	{
		950	iso14755buf = ISO_14755_51 \| i[1];
		951	commit_iso14755 ();
		952
		953	return;
		954	}
		955
		956	scr_bell ();
		957	# endif
		958	iso14755buf = 0;
		959
		960	return;
		961	}
		962	else if ((ev.state & (ShiftMask \| ControlMask)) != (ShiftMask \| ControlMask))
		963	{
		964	# if ENABLE_OVERLAY
		965	scr_overlay_off ();
		966	# endif
		967	if (iso14755buf & ISO_14755_51)
		968	commit_iso14755 ();
		969	#if ISO_14755
		970	else if (iso14755buf & ISO_14755_STARTED)
		971	{
		972	iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
		973
		974	scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
		975	scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
		976	}
		977	# endif
		978	else
		979	iso14755buf = 0;
		980	}
		981	#endif
		982
		983	if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
		984	return;
		985
		986	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
		987	if (!(ev.state & ControlMask))
		988	slip_wheel_ev.stop ();
		989	else if (keysym == XK_Control_L \|\| keysym == XK_Control_R)
		990	mouse_slip_wheel_speed = 0;
		991	#endif
		992	}
923		993
924	#if defined (KEYSYM_RESOURCE)	994	#if defined (KEYSYM_RESOURCE)
925	unsigned int	995	unsigned int
926	rxvt_term::cmd_write (const char *str, unsigned int count)	996	rxvt_term::cmd_write (const char *str, unsigned int count)
927	{	997	{
…		…
1044	rxvt_term::cursor_blink_cb (time_watcher &w)	1114	rxvt_term::cursor_blink_cb (time_watcher &w)
1045	{	1115	{
1046	hidden_cursor = !hidden_cursor;	1116	hidden_cursor = !hidden_cursor;
1047	want_refresh = 1;	1117	want_refresh = 1;
1048		1118
1049	w.start (w.at + BLINK_INTERVAL);	1119	w.start (w.at + CURSOR_BLINK_INTERVAL);
1050	}	1120	}
1051	#endif	1121	#endif
1052		1122
1053	#ifdef TEXT_BLINK	1123	#ifdef TEXT_BLINK
1054	void	1124	void
…		…
1104	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1174	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1105	}	1175	}
1106	}	1176	}
1107	#endif	1177	#endif
1108		1178
1109	#if HAVE_SCHED_YIELD	1179	#if LINUX_YIELD_HACK
1110	static struct event_handler	1180	static struct event_handler
1111	{	1181	{
1112	check_watcher cw_yield;	1182	check_watcher yield_ev;
1113		1183
1114	void yield (check_watcher &w)	1184	void yield_cb (check_watcher &w)
1115	{	1185	{
1116	sched_yield ();	1186	// this should really be sched_yield(), but the linux guys thought
		1187	// that giving a process calling sched_yield () less cpu time than
		1188	// ones with high nice levels is a useful thing to do. It surely is is
		1189	// allowed by the sus... as is returning ENOSYS.
		1190
		1191	struct timespec ts = { 0, 0 };
		1192	nanosleep (&ts, 0);
		1193
1117	w.stop ();	1194	w.stop ();
1118	}	1195	}
1119		1196
1120	event_handler ()	1197	event_handler ()
1121	: cw_yield (this, &event_handler::yield)	1198	: yield_ev (this, &event_handler::yield_cb)
1122	{	1199	{
1123	}	1200	}
1124	} event_handler;	1201	} event_handler;
1125	#endif	1202	#endif
1126		1203
…		…
1146	cmdbuf_endp += r;	1223	cmdbuf_endp += r;
1147	return true;	1224	return true;
1148	}	1225	}
1149	else if (r < 0 && (errno == EAGAIN \|\| errno == EINTR))	1226	else if (r < 0 && (errno == EAGAIN \|\| errno == EINTR))
1150	{	1227	{
1151	#if HAVE_SCHED_YIELD	1228	#if LINUX_YIELD_HACK
1152	if (display->is_local)	1229	if (display->is_local)
1153	event_handler.cw_yield.start ();	1230	event_handler.yield_ev.start ();
1154	#endif	1231	#endif
1155	}	1232	}
1156	else	1233	else
1157	{	1234	{
1158	pty_ev.stop ();	1235	pty_ev.stop ();
…		…
1180	}	1257	}
1181		1258
1182	void	1259	void
1183	rxvt_term::pointer_unblank ()	1260	rxvt_term::pointer_unblank ()
1184	{	1261	{
1185	XDefineCursor (display->display, vt, TermWin_cursor);	1262	XDefineCursor (dpy, vt, TermWin_cursor);
1186	recolour_cursor ();	1263	recolour_cursor ();
1187		1264
1188	#ifdef POINTER_BLANK	1265	#ifdef POINTER_BLANK
1189	hidden_pointer = 0;	1266	hidden_pointer = 0;
1190		1267
…		…
1198	rxvt_term::pointer_blank ()	1275	rxvt_term::pointer_blank ()
1199	{	1276	{
1200	if (!OPTION (Opt_pointerBlank))	1277	if (!OPTION (Opt_pointerBlank))
1201	return;	1278	return;
1202		1279
1203	XDefineCursor (display->display, vt, display->blank_cursor);	1280	XDefineCursor (dpy, vt, display->blank_cursor);
1204	XFlush (display->display);	1281	XFlush (dpy);
1205		1282
1206	hidden_pointer = 1;	1283	hidden_pointer = 1;
1207	}	1284	}
1208		1285
1209	void	1286	void
…		…
1282	(32 + button_number + key_state),	1359	(32 + button_number + key_state),
1283	(32 + x + 1),	1360	(32 + x + 1),
1284	(32 + y + 1));	1361	(32 + y + 1));
1285	}	1362	}
1286		1363
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 /	1364	/{{{ process an X event /
1298	void	1365	void
1299	rxvt_term::x_cb (XEvent &ev)	1366	rxvt_term::x_cb (XEvent &ev)
1300	{	1367	{
1301	make_current ();	1368	make_current ();
1302		1369
1303	dDisp;	1370	dLocal (Display *, dpy);
1304		1371
1305	if (ev.xany.window == vt	1372	if (ev.xany.window == vt
1306	&& SHOULD_INVOKE (HOOK_X_EVENT)	1373	&& SHOULD_INVOKE (HOOK_X_EVENT)
1307	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))	1374	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1308	return;	1375	return;
…		…
1313	unsigned int unused_mask;	1380	unsigned int unused_mask;
1314		1381
1315	switch (ev.type)	1382	switch (ev.type)
1316	{	1383	{
1317	case KeyPress:	1384	case KeyPress:
1318	#if ISO_14755	1385	key_press (ev.xkey);
1319	if (!(iso14755buf & ISO_14755_52))
1320	#endif
1321	lookup_key (ev.xkey);
1322
1323	break;	1386	break;
1324		1387
1325	case KeyRelease:	1388	case KeyRelease:
1326	{	1389	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;	1390	break;
1398	}
1399		1391
1400	case ButtonPress:	1392	case ButtonPress:
1401	button_press (ev.xbutton);	1393	button_press (ev.xbutton);
1402	break;	1394	break;
1403		1395
…		…
1405	button_release (ev.xbutton);	1397	button_release (ev.xbutton);
1406	break;	1398	break;
1407		1399
1408	case ClientMessage:	1400	case ClientMessage:
1409	if (ev.xclient.format == 32	1401	if (ev.xclient.format == 32
1410	&& ev.xclient.message_type == xa[XA_WM_PROTOCOLS])	1402	&& !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1411	{	1403	{
		1404	if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
		1405	{
		1406	if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
		1407	{
1412	if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])	1408	if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
		1409	{
		1410	if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1413	destroy ();	1411	destroy ();
		1412	}
1414	#if ENABLE_EWMH	1413	#if ENABLE_EWMH
1415	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])	1414	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1416	XSendEvent (disp, ev.xclient.window = display->root,	1415	XSendEvent (dpy, ev.xclient.window = display->root,
1417	False, SubstructureRedirectMask \| SubstructureNotifyMask,	1416	False, SubstructureRedirectMask \| SubstructureNotifyMask,
1418	&ev);	1417	&ev);
		1418	#endif
		1419	}
		1420	}
		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	}
1419	#endif	1429	#endif
1420	}	1430	}
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;	1431	break;
1457		1432
1458	case MappingNotify:	1433	case MappingNotify:
1459	XRefreshKeyboardMapping (&ev.xmapping);	1434	XRefreshKeyboardMapping (&ev.xmapping);
1460	break;	1435	break;
…		…
1493	break;	1468	break;
1494		1469
1495	case ConfigureNotify:	1470	case ConfigureNotify:
1496	if (ev.xconfigure.window == parent[0])	1471	if (ev.xconfigure.window == parent[0])
1497	{	1472	{
1498	while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))	1473	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1499	;	1474	;
1500		1475
1501	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)	1476	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)
1502	{	1477	{
1503	seen_resize = 1;	1478	seen_resize = 1;
…		…
1512	#endif	1487	#endif
1513	}	1488	}
1514	break;	1489	break;
1515		1490
1516	case PropertyNotify:	1491	case PropertyNotify:
		1492	if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1517	if (ev.xproperty.atom == xa[XA_VT_SELECTION]	1493	if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1518	&& ev.xproperty.state == PropertyNewValue)	1494	&& ev.xproperty.state == PropertyNewValue)
1519	selection_property (ev.xproperty.window, ev.xproperty.atom);	1495	selection_property (ev.xproperty.window, ev.xproperty.atom);
1520		1496
1521	break;	1497	break;
1522		1498
1523	case SelectionClear:	1499	case SelectionClear:
1524	selection_clear ();	1500	selection_clear ();
…		…
1560	if (ev.xany.window == vt)	1536	if (ev.xany.window == vt)
1561	{	1537	{
1562	do	1538	do
1563	scr_expose (ev.xexpose.x, ev.xexpose.y,	1539	scr_expose (ev.xexpose.x, ev.xexpose.y,
1564	ev.xexpose.width, ev.xexpose.height, False);	1540	ev.xexpose.width, ev.xexpose.height, False);
1565	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));	1541	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1566		1542
1567	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1543	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1568		1544
1569	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))	1545	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1570	scr_expose (ev.xexpose.x, ev.xexpose.y,	1546	scr_expose (ev.xexpose.x, ev.xexpose.y,
1571	ev.xexpose.width, ev.xexpose.height, False);	1547	ev.xexpose.width, ev.xexpose.height, False);
1572		1548
1573	want_refresh = 1;	1549	want_refresh = 1;
1574	}	1550	}
1575	else	1551	else
1576	{	1552	{
1577	XEvent unused_event;	1553	XEvent unused_event;
1578		1554
1579	while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))	1555	while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1580	;	1556	;
1581	while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))	1557	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1582	;	1558	;
1583		1559
1584	if (isScrollbarWindow (ev.xany.window))	1560	if (isScrollbarWindow (ev.xany.window))
1585	{	1561	{
1586	scrollBar.setIdle ();	1562	scrollBar.setIdle ();
1587	scrollbar_show (0);	1563	scrollbar_show (0);
1588	}	1564	}
1589		1565
1590	#ifdef TRANSPARENT	1566	#ifdef TRANSPARENT
1591	if (am_transparent && ev.xany.window == parent[0])	1567	if (am_transparent && ev.xany.window == parent[0])
1592	XClearWindow (disp, ev.xany.window);	1568	XClearWindow (dpy, ev.xany.window);
1593	#endif	1569	#endif
1594	}	1570	}
1595	break;	1571	break;
1596		1572
1597	case MotionNotify:	1573	case MotionNotify:
…		…
1607	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)	1583	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1608	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))	1584	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1609	; // nop	1585	; // nop
1610	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))	1586	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))
1611	{	1587	{
1612	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))	1588	while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1613	;	1589	;
1614		1590
1615	XQueryPointer (disp, vt,	1591	XQueryPointer (dpy, vt,
1616	&unused_root, &unused_child,	1592	&unused_root, &unused_child,
1617	&unused_root_x, &unused_root_y,	1593	&unused_root_x, &unused_root_y,
1618	&ev.xbutton.x, &ev.xbutton.y,	1594	&ev.xbutton.x, &ev.xbutton.y,
1619	&ev.xbutton.state);	1595	&ev.xbutton.state);
1620	#ifdef MOUSE_THRESHOLD	1596	#ifdef MOUSE_THRESHOLD
…		…
1684	#endif	1660	#endif
1685	}	1661	}
1686	}	1662	}
1687	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1663	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1688	{	1664	{
1689	while (XCheckTypedWindowEvent (disp, scrollBar.win,	1665	while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1690	MotionNotify, &ev))	1666	MotionNotify, &ev))
1691	;	1667	;
1692		1668
1693	XQueryPointer (disp, scrollBar.win,	1669	XQueryPointer (dpy, scrollBar.win,
1694	&unused_root, &unused_child,	1670	&unused_root, &unused_child,
1695	&unused_root_x, &unused_root_y,	1671	&unused_root_x, &unused_root_y,
1696	&ev.xbutton.x, &ev.xbutton.y,	1672	&ev.xbutton.x, &ev.xbutton.y,
1697	&unused_mask);	1673	&unused_mask);
1698	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1674	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
…		…
1702	scrollbar_show (1);	1678	scrollbar_show (1);
1703	}	1679	}
1704	break;	1680	break;
1705	}	1681	}
1706		1682
1707	skip_switch: ;
1708
1709	#if defined(CURSOR_BLINK)	1683	#if defined(CURSOR_BLINK)
1710	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)	1684	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1711	{	1685	{
1712	if (hidden_cursor)	1686	if (hidden_cursor)
1713	{	1687	{
1714	hidden_cursor = 0;	1688	hidden_cursor = 0;
1715	want_refresh = 1;	1689	want_refresh = 1;
1716	}	1690	}
1717		1691
1718	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1692	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1719	}	1693	}
1720	#endif	1694	#endif
1721		1695
1722	#if defined(POINTER_BLANK)	1696	#if defined(POINTER_BLANK)
1723	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)	1697	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
…		…
1740	if (!focus)	1714	if (!focus)
1741	{	1715	{
1742	focus = 1;	1716	focus = 1;
1743	want_refresh = 1;	1717	want_refresh = 1;
1744		1718
1745	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));	1719	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1746		1720
1747	#if USE_XIM	1721	#if USE_XIM
1748	if (Input_Context != NULL)	1722	if (Input_Context != NULL)
1749	{	1723	{
1750	IMSetStatusPosition ();	1724	IMSetPosition ();
1751	XSetICFocus (Input_Context);	1725	XSetICFocus (Input_Context);
1752	}	1726	}
1753	#endif	1727	#endif
1754	#if CURSOR_BLINK	1728	#if CURSOR_BLINK
1755	if (OPTION (Opt_cursorBlink))	1729	if (OPTION (Opt_cursorBlink))
1756	cursor_blink_ev.start (NOW + BLINK_INTERVAL);	1730	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1757	#endif	1731	#endif
1758	#if OFF_FOCUS_FADING	1732	#if OFF_FOCUS_FADING
1759	if (rs[Rs_fade])	1733	if (rs[Rs_fade])
1760	{	1734	{
1761	pix_colors = pix_colors_focused;	1735	pix_colors = pix_colors_focused;
…		…
1842	/*	1816	/*
1843	* VT window processing of button press	1817	* VT window processing of button press
1844	*/	1818	*/
1845	if (ev.window == vt)	1819	if (ev.window == vt)
1846	{	1820	{
		1821	if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
		1822	return;
		1823
1847	#if ISO_14755	1824	#if ISO_14755
1848	// 5.4	1825	// 5.4
1849	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))	1826	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))
1850	{	1827	{
1851	iso14755_54 (ev.x, ev.y);	1828	iso14755_54 (ev.x, ev.y);
…		…
1893	else	1870	else
1894	{	1871	{
1895	if (ev.button != MEvent.button)	1872	if (ev.button != MEvent.button)
1896	MEvent.clicks = 0;	1873	MEvent.clicks = 0;
1897		1874
1898	if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1899	switch (ev.button)	1875	switch (ev.button)
1900	{	1876	{
1901	case Button1:	1877	case Button1:
1902	/* allow meta + click to select rectangular areas */	1878	/* allow meta + click to select rectangular areas */
1903	/* should be done in screen.C */	1879	/* should be done in screen.C */
1904	#if ENABLE_FRILLS	1880	#if ENABLE_FRILLS
1905	selection.rect = !!(ev.state & ModMetaMask);	1881	selection.rect = !!(ev.state & ModMetaMask);
1906	#else	1882	#else
1907	selection.rect = false;	1883	selection.rect = false;
1908	#endif	1884	#endif
1909		1885
1910	/* allow shift+left click to extend selection */	1886	/* allow shift+left click to extend selection */
1911	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))	1887	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1912	{	1888	{
1913	if (MEvent.button == Button1 && clickintime)	1889	if (MEvent.button == Button1 && clickintime)
1914	selection_rotate (ev.x, ev.y);	1890	selection_rotate (ev.x, ev.y);
1915	else	1891	else
1916	selection_extend (ev.x, ev.y, 1);	1892	selection_extend (ev.x, ev.y, 1);
1917	}	1893	}
1918	else	1894	else
1919	{	1895	{
1920	if (MEvent.button == Button1 && clickintime)	1896	if (MEvent.button == Button1 && clickintime)
1921	MEvent.clicks++;	1897	MEvent.clicks++;
1922	else	1898	else
1923	MEvent.clicks = 1;	1899	MEvent.clicks = 1;
1924		1900
1925	selection_click (MEvent.clicks, ev.x, ev.y);	1901	selection_click (MEvent.clicks, ev.x, ev.y);
1926	}	1902	}
1927		1903
1928	MEvent.button = Button1;	1904	MEvent.button = Button1;
1929	break;	1905	break;
1930		1906
1931	case Button3:	1907	case Button3:
1932	if (MEvent.button == Button3 && clickintime)	1908	if (MEvent.button == Button3 && clickintime)
1933	selection_rotate (ev.x, ev.y);	1909	selection_rotate (ev.x, ev.y);
1934	else	1910	else
1935	selection_extend (ev.x, ev.y, 1);	1911	selection_extend (ev.x, ev.y, 1);
1936		1912
1937	MEvent.button = Button3;	1913	MEvent.button = Button3;
1938	break;	1914	break;
1939	}	1915	}
1940	}	1916	}
1941		1917
1942	MEvent.time = ev.time;	1918	MEvent.time = ev.time;
1943	return;	1919	return;
1944	}	1920	}
1945		1921
…		…
2108	sel_scroll_ev.stop();	2084	sel_scroll_ev.stop();
2109	#endif	2085	#endif
2110		2086
2111	if (ev.window == vt)	2087	if (ev.window == vt)
2112	{	2088	{
		2089	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
		2090	return;
		2091
2113	#if ISO_14755	2092	#if ISO_14755
2114	// 5.4	2093	// 5.4
2115	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))	2094	if (iso14755buf & (ISO_14755_STARTED \| ISO_14755_54))
2116	return;	2095	return;
2117	#endif	2096	#endif
		2097
2118	if (reportmode)	2098	if (reportmode)
2119	{	2099	{
2120	/* mouse report from vt window */	2100	/* mouse report from vt window */
2121	/* don't report release of wheel "buttons" */	2101	/* don't report release of wheel "buttons" */
2122	if (ev.button >= 4)	2102	if (ev.button >= 4)
…		…
2146	if (priv_modes & PrivMode_mouse_report	2126	if (priv_modes & PrivMode_mouse_report
2147	&& bypass_keystate	2127	&& bypass_keystate
2148	&& ev.button == Button1 && MEvent.clicks <= 1)	2128	&& ev.button == Button1 && MEvent.clicks <= 1)
2149	selection_extend (ev.x, ev.y, 0);	2129	selection_extend (ev.x, ev.y, 0);
2150		2130
2151	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2152	return;
2153
2154	switch (ev.button)	2131	switch (ev.button)
2155	{	2132	{
2156	case Button1:	2133	case Button1:
2157	case Button3:	2134	case Button3:
2158	selection_make (ev.time);	2135	selection_make (ev.time);
2159	break;	2136	break;
2160		2137
2161	case Button2:	2138	case Button2:
2162	if (IN_RANGE_EXC (ev.x, 0, width)	2139	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?	2140	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2164	selection_request (ev.time);
2165
2166	break;	2141	break;
2167		2142
2168	#ifdef MOUSE_WHEEL	2143	#ifdef MOUSE_WHEEL
2169	case Button4:	2144	case Button4:
2170	case Button5:	2145	case Button5:
…		…
2212	#if TINTING	2187	#if TINTING
2213	/* taken from aterm-0.4.2 */	2188	/* taken from aterm-0.4.2 */
2214		2189
2215	typedef uint32_t RUINT32T;	2190	typedef uint32_t RUINT32T;
2216		2191
2217	void ShadeXImage(rxvt_display display, XImage srcImage, int shade, int rm, int gm, int bm)	2192	void ShadeXImage(rxvt_term term, XImage srcImage, int shade, int rm, int gm, int bm)
2218	{	2193	{
2219	int sh_r, sh_g, sh_b;	2194	int sh_r, sh_g, sh_b;
2220	RUINT32T mask_r, mask_g, mask_b;	2195	RUINT32T mask_r, mask_g, mask_b;
2221	RUINT32T lookup, lookup_r, lookup_g, lookup_b;	2196	RUINT32T lookup, lookup_r, lookup_g, lookup_b;
2222	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;	2197	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2223	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;	2198	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2224	int i;	2199	int i;
2225		2200
2226	Visual *visual = display->visual;	2201	Visual *visual = term->visual;
2227		2202
2228	if( visual->c_class != TrueColor \|\| srcImage->format != ZPixmap ) return ;	2203	if( visual->c_class != TrueColor \|\| srcImage->format != ZPixmap ) return ;
2229		2204
2230	/* for convenience */	2205	/* for convenience */
2231	mask_r = visual->red_mask;	2206	mask_r = visual->red_mask;
…		…
2452	Atom atype;	2427	Atom atype;
2453	unsigned char *prop = NULL;	2428	unsigned char *prop = NULL;
2454	Window root, oldp, *list;	2429	Window root, oldp, *list;
2455	Pixmap rootpixmap = None;	2430	Pixmap rootpixmap = None;
2456	XWindowAttributes wattr, wrootattr;	2431	XWindowAttributes wattr, wrootattr;
2457	dDisp;
2458		2432
2459	pchanged = 0;	2433	pchanged = 0;
2460		2434
2461	if (!OPTION (Opt_transparent))	2435	if (!OPTION (Opt_transparent))
2462	return pchanged; /* Don't try any more */	2436	return pchanged; /* Don't try any more */
2463		2437
2464	XGetWindowAttributes (disp, display->root, &wrootattr);	2438	XGetWindowAttributes (dpy, display->root, &wrootattr);
2465	rootdepth = wrootattr.depth;	2439	rootdepth = wrootattr.depth;
2466		2440
2467	XGetWindowAttributes (disp, parent[0], &wattr);	2441	XGetWindowAttributes (dpy, parent[0], &wattr);
2468		2442
2469	if (rootdepth != wattr.depth)	2443	if (rootdepth != wattr.depth)
2470	{	2444	{
2471	if (am_transparent)	2445	if (am_transparent)
2472	{	2446	{
2473	pchanged = 1;	2447	pchanged = 1;
2474	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2448	XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2475	am_transparent = am_pixmap_trans = 0;	2449	am_transparent = am_pixmap_trans = 0;
2476	}	2450	}
2477		2451
2478	return pchanged; /* Don't try any more */	2452	return pchanged; /* Don't try any more */
2479	}	2453	}
2480		2454
2481	/* Get all X ops out of the queue so that our information is up-to-date. */	2455	/* Get all X ops out of the queue so that our information is up-to-date. */
2482	XSync (disp, False);	2456	XSync (dpy, False);
2483		2457
2484	/*	2458	/*
2485	* Make the frame window set by the window manager have	2459	* Make the frame window set by the window manager have
2486	* the root background. Some window managers put multiple nested frame	2460	* the root background. Some window managers put multiple nested frame
2487	* windows for each client, so we have to take care about that.	2461	* windows for each client, so we have to take care about that.
2488	*/	2462	*/
2489	i = (xa[XA_XROOTPMAP_ID]	2463	i = (xa[XA_XROOTPMAP_ID]
2490	&& XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],	2464	&& XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2491	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2465	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2492	&nitems, &bytes_after, &prop) == Success);	2466	&nitems, &bytes_after, &prop) == Success);
2493		2467
2494	if (!i \|\| prop == NULL)	2468	if (!i \|\| prop == NULL)
2495	i = (xa[XA_ESETROOT_PMAP_ID]	2469	i = (xa[XA_ESETROOT_PMAP_ID]
2496	&& XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],	2470	&& XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2497	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2471	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2498	&nitems, &bytes_after, &prop) == Success);	2472	&nitems, &bytes_after, &prop) == Success);
2499		2473
2500	if (!i \|\| prop == NULL	2474	if (!i \|\| prop == NULL
2501	#if TINTING	2475	#if TINTING
2502	\|\| !rs[Rs_color + Color_tint]	2476	\|\| !ISSET_PIXCOLOR (Color_tint)
2503	#endif	2477	#endif
2504	)	2478	)
2505	have_pixmap = 0;	2479	have_pixmap = 0;
2506	else	2480	else
2507	{	2481	{
…		…
2520	Window cr;	2494	Window cr;
2521	XImage *image;	2495	XImage *image;
2522	GC gc;	2496	GC gc;
2523	XGCValues gcvalue;	2497	XGCValues gcvalue;
2524		2498
2525	XTranslateCoordinates (disp, parent[0], display->root,	2499	XTranslateCoordinates (dpy, parent[0], display->root,
2526	0, 0, &sx, &sy, &cr);	2500	0, 0, &sx, &sy, &cr);
2527	nw = (unsigned int)szHint.width;	2501	nw = (unsigned int)szHint.width;
2528	nh = (unsigned int)szHint.height;	2502	nh = (unsigned int)szHint.height;
2529	nx = ny = 0;	2503	nx = ny = 0;
2530		2504
…		…
2543	}	2517	}
2544		2518
2545	min_it (nw, (unsigned int) (wrootattr.width - sx));	2519	min_it (nw, (unsigned int) (wrootattr.width - sx));
2546	min_it (nh, (unsigned int) (wrootattr.height - sy));	2520	min_it (nh, (unsigned int) (wrootattr.height - sy));
2547		2521
2548	XSync (disp, False);	2522	XSync (dpy, False);
2549	allowedxerror = -1;	2523	allowedxerror = -1;
2550	image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);	2524	image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2551		2525
2552	/* XXX: handle BadMatch - usually because we're outside the pixmap */	2526	/* XXX: handle BadMatch - usually because we're outside the pixmap */
2553	/* XXX: may need a delay here? */	2527	/* XXX: may need a delay here? */
2554	allowedxerror = 0;	2528	allowedxerror = 0;
2555		2529
…		…
2558	if (am_transparent && am_pixmap_trans)	2532	if (am_transparent && am_pixmap_trans)
2559	{	2533	{
2560	pchanged = 1;	2534	pchanged = 1;
2561	if (pixmap != None)	2535	if (pixmap != None)
2562	{	2536	{
2563	XFreePixmap (disp, pixmap);	2537	XFreePixmap (dpy, pixmap);
2564	pixmap = None;	2538	pixmap = None;
2565	}	2539	}
2566	}	2540	}
2567		2541
2568	am_pixmap_trans = 0;	2542	am_pixmap_trans = 0;
2569	}	2543	}
2570	else	2544	else
2571	{	2545	{
2572	if (pixmap != None)	2546	if (pixmap != None)
2573	XFreePixmap (disp, pixmap);	2547	XFreePixmap (dpy, pixmap);
2574		2548
2575	#if TINTING	2549	#if TINTING
2576	if (ISSET_PIXCOLOR (Color_tint))	2550	if (ISSET_PIXCOLOR (Color_tint))
2577	{	2551	{
2578	unsigned short rm, gm, bm;
2579	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;	2552	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2580		2553
		2554	rgba c;
2581	pix_colors_focused[Color_tint].get (display, rm, gm, bm);	2555	pix_colors_focused [Color_tint].get (c);
2582		2556
2583	ShadeXImage (display, image, shade, rm, gm, bm);	2557	ShadeXImage (this, image, shade, c.r, c.g, c.b);
2584	}	2558	}
2585	#endif	2559	#endif
2586		2560
2587	pixmap = XCreatePixmap (disp, vt,	2561	pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2588	szHint.width, szHint.height, image->depth);
2589	gc = XCreateGC (disp, vt, 0UL, &gcvalue);	2562	gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2590	XPutImage (disp, pixmap, gc, image, 0, 0,	2563	XPutImage (dpy, pixmap, gc, image, 0, 0,
2591	nx, ny, image->width, image->height);	2564	nx, ny, image->width, image->height);
2592	XFreeGC (disp, gc);	2565	XFreeGC (dpy, gc);
2593	XDestroyImage (image);	2566	XDestroyImage (image);
2594	XSetWindowBackgroundPixmap (disp, parent[0], pixmap);	2567	XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2595	XClearWindow (disp, parent[0]);	2568	XClearWindow (dpy, parent[0]);
2596		2569
2597	if (!am_transparent \|\| !am_pixmap_trans)	2570	if (!am_transparent \|\| !am_pixmap_trans)
2598	pchanged = 1;	2571	pchanged = 1;
2599		2572
2600	am_transparent = am_pixmap_trans = 1;	2573	am_transparent = am_pixmap_trans = 1;
2601	}	2574	}
2602	}	2575	}
2603		2576
2604	if (am_pixmap_trans)	2577	if (am_pixmap_trans)
2605	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2578	XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2606	else	2579	else
2607	{	2580	{
2608	unsigned int n;	2581	unsigned int n;
2609	/*	2582	/*
2610	* InheritPixmap transparency	2583	* InheritPixmap transparency
2611	*/	2584	*/
2612	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2585	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2613	{	2586	{
2614	oldp = parent[i];	2587	oldp = parent[i];
2615	XQueryTree (disp, parent[i - 1], &root,	2588	XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2616	&parent[i], &list, &n);
2617	XFree (list);	2589	XFree (list);
2618		2590
2619	if (parent[i] == display->root)	2591	if (parent[i] == display->root)
2620	{	2592	{
2621	if (oldp != None)	2593	if (oldp != None)
…		…
2629	}	2601	}
2630		2602
2631	n = 0;	2603	n = 0;
2632		2604
2633	if (pchanged)	2605	if (pchanged)
2634	{
2635	for (; n < (unsigned int)i; n++)	2606	for (; n < (unsigned int)i; n++)
2636	{	2607	{
2637	XGetWindowAttributes (disp, parent[n], &wattr);	2608	XGetWindowAttributes (dpy, parent[n], &wattr);
		2609
2638	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)	2610	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)
2639	{	2611	{
2640	n = (int) (sizeof (parent) / sizeof (Window)) + 1;	2612	n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2641	break;	2613	break;
2642	}	2614	}
2643	}	2615	}
2644	}
2645		2616
2646	if (n > (int) (sizeof (parent) / sizeof (parent[0])))	2617	if (n > (sizeof (parent) / sizeof (parent[0])))
2647	{	2618	{
2648	XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);	2619	XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2649	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2620	XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2650	am_transparent = 0;	2621	am_transparent = 0;
2651	/* XXX: also turn off Opt_transparent? */	2622	/* XXX: also turn off Opt_transparent? */
2652	}	2623	}
2653	else	2624	else
2654	{	2625	{
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++)	2626	for (n = 0; n < (unsigned int)i; n++)
2661	{	2627	{
2662	XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);	2628	XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2663	XClearWindow (disp, parent[n]);	2629	XClearWindow (dpy, parent[n]);
2664	}	2630	}
2665		2631
2666	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2632	XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2667	am_transparent = 1;	2633	am_transparent = 1;
2668	}	2634	}
2669		2635
2670	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2636	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2671	parent[i] = None;	2637	parent[i] = None;
2672	}	2638	}
2673		2639
2674	if (scrollBar.win)	2640	if (scrollBar.win)
2675	{	2641	{
2676	XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);	2642	XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2677	scrollBar.setIdle ();	2643	scrollBar.setIdle ();
2678	scrollbar_show (0);	2644	scrollbar_show (0);
2679	}	2645	}
2680		2646
2681	if (am_transparent)	2647	if (am_transparent)
…		…
2799	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)	2765	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2800	refresh_limit++;	2766	refresh_limit++;
2801	else	2767	else
2802	{	2768	{
2803	flag = true;	2769	flag = true;
		2770	//TODO: due to popular request, implement "skipscroll" option here
2804	scr_refresh ();	2771	scr_refresh ();
2805	want_refresh = 1;	2772	want_refresh = 1;
2806	}	2773	}
2807	}	2774	}
2808		2775
…		…
2827	return flag;	2794	return flag;
2828	}	2795	}
2829		2796
2830	// read the next character	2797	// read the next character
2831	wchar_t	2798	wchar_t
2832	rxvt_term::next_char ()	2799	rxvt_term::next_char () NOTHROW
2833	{	2800	{
2834	while (cmdbuf_ptr < cmdbuf_endp)	2801	while (cmdbuf_ptr < cmdbuf_endp)
2835	{	2802	{
2836	// assume 7-bit to be ascii ALWAYS	2803	// assume 7-bit to be ascii ALWAYS
2837	if ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b)	2804	if ((unsigned char)cmdbuf_ptr <= 0x7f && cmdbuf_ptr != 0x1b)
…		…
2858	return NOCHAR;	2825	return NOCHAR;
2859	}	2826	}
2860		2827
2861	// read the next octet	2828	// read the next octet
2862	uint32_t	2829	uint32_t
2863	rxvt_term::next_octet ()	2830	rxvt_term::next_octet () NOTHROW
2864	{	2831	{
2865	return cmdbuf_ptr < cmdbuf_endp	2832	return cmdbuf_ptr < cmdbuf_endp
2866	? (unsigned char)*cmdbuf_ptr++	2833	? (unsigned char)*cmdbuf_ptr++
2867	: NOCHAR;	2834	: NOCHAR;
2868	}	2835	}
		2836
		2837	static class out_of_input out_of_input;
2869		2838
2870	/* rxvt_cmd_getc () - Return next input character */	2839	/* rxvt_cmd_getc () - Return next input character */
2871	/*	2840	/*
2872	* Return the next input character after first passing any keyboard input	2841	* Return the next input character after first passing any keyboard input
2873	* to the command.	2842	* to the command.
2874	*/	2843	*/
2875	wchar_t	2844	wchar_t
2876	rxvt_term::cmd_getc ()	2845	rxvt_term::cmd_getc () THROW ((class out_of_input))
2877	{	2846	{
2878	wchar_t c = next_char ();	2847	wchar_t c = next_char ();
2879		2848
2880	if (c == NOCHAR)	2849	if (c == NOCHAR)
2881	throw out_of_input;	2850	throw out_of_input;
2882		2851
2883	return c;	2852	return c;
2884	}	2853	}
2885		2854
2886	uint32_t	2855	uint32_t
2887	rxvt_term::cmd_get8 ()	2856	rxvt_term::cmd_get8 () THROW ((class out_of_input))
2888	{	2857	{
2889	uint32_t c = next_octet ();	2858	uint32_t c = next_octet ();
2890		2859
2891	if (c == NOCHAR)	2860	if (c == NOCHAR)
2892	throw out_of_input;	2861	throw out_of_input;
…		…
3130	scr_charset_set (2, (unsigned int)cmd_getc ());	3099	scr_charset_set (2, (unsigned int)cmd_getc ());
3131	break;	3100	break;
3132	case '+':	3101	case '+':
3133	scr_charset_set (3, (unsigned int)cmd_getc ());	3102	scr_charset_set (3, (unsigned int)cmd_getc ());
3134	break;	3103	break;
3135	#if ENABLE_FRILLS	3104	#if !ENABLE_MINIMAL
3136	case '6':	3105	case '6':
3137	scr_backindex ();	3106	scr_backindex ();
3138	break;	3107	break;
3139	#endif	3108	#endif
3140	case '7':	3109	case '7':
3141	scr_cursor (SAVE);	3110	scr_cursor (SAVE);
3142	break;	3111	break;
3143	case '8':	3112	case '8':
3144	scr_cursor (RESTORE);	3113	scr_cursor (RESTORE);
3145	break;	3114	break;
3146	#if ENABLE_FRILLS	3115	#if !ENABLE_MINIMAL
3147	case '9':	3116	case '9':
3148	scr_forwardindex ();	3117	scr_forwardindex ();
3149	break;	3118	break;
3150	#endif	3119	#endif
3151	case '=':	3120	case '=':
…		…
3313	ndef = get_byte_array_bit (csi_defaults, i);	3282	ndef = get_byte_array_bit (csi_defaults, i);
3314	for (p = 0; p < nargs; p++)	3283	for (p = 0; p < nargs; p++)
3315	if (arg[p] == -1)	3284	if (arg[p] == -1)
3316	arg[p] = ndef;	3285	arg[p] = ndef;
3317		3286
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	/*	3287	/*
3326	* private mode handling	3288	* private mode handling
3327	*/	3289	*/
3328	if (priv)	3290	if (priv)
3329	{	3291	{
3330	switch (priv)	3292	switch (priv)
3331	{	3293	{
3332	case '>':	3294	case '>':
3333	if (ch == CSI_DA) /* secondary device attributes */	3295	if (ch == CSI_DA) /* secondary device attributes */
3334	tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);	3296	{
		3297	// first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
		3298	// 'U' for rxvt-unicode != 7.[34] (where it was broken).
		3299	//
		3300	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
		3301	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
		3302	// that we do not support xterm mouse reporting (should be 95 when we do).
		3303	//
		3304	tt_printf ("\033[>%d;94;0c", 'U');
		3305	}
3335	break;	3306	break;
3336	case '?':	3307	case '?':
3337	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')	3308	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')
3338	process_terminal_mode (ch, priv, nargs, arg);	3309	process_terminal_mode (ch, priv, nargs, arg);
3339	break;	3310	break;
…		…
3542	break;	3513	break;
3543	case CSI_75:	3514	case CSI_75:
3544	scr_cursor (RESTORE);	3515	scr_cursor (RESTORE);
3545	break;	3516	break;
3546		3517
3547	#if ENABLE_FRILLS	3518	#if !ENABLE_MINIMAL
3548	case CSI_74:	3519	case CSI_74:
3549	process_window_ops (arg, nargs);	3520	process_window_ops (arg, nargs);
3550	break;	3521	break;
3551	#endif	3522	#endif
3552		3523
…		…
3559	break;	3530	break;
3560	}	3531	}
3561	}	3532	}
3562	/}}} /	3533	/}}} /
3563		3534
3564	#if ENABLE_FRILLS	3535	#if !ENABLE_MINIMAL
3565	/* ARGSUSED */	3536	/* ARGSUSED */
3566	void	3537	void
3567	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3538	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3568	{	3539	{
3569	int x, y;	3540	int x, y;
3570	XWindowAttributes wattr;	3541	XWindowAttributes wattr;
3571	Window wdummy;	3542	Window wdummy;
3572	dDisp;	3543
		3544	dLocal (Display *, dpy);
3573		3545
3574	if (nargs == 0)	3546	if (nargs == 0)
3575	return;	3547	return;
3576		3548
3577	switch (args[0])	3549	switch (args[0])
3578	{	3550	{
3579	/*	3551	/*
3580	* commands	3552	* commands
3581	*/	3553	*/
3582	case 1: /* deiconify window */	3554	case 1: /* deiconify window */
3583	XMapWindow (disp, parent[0]);	3555	XMapWindow (dpy, parent[0]);
3584	break;	3556	break;
3585	case 2: /* iconify window */	3557	case 2: /* iconify window */
3586	XIconifyWindow (disp, parent[0], display->screen);	3558	XIconifyWindow (dpy, parent[0], display->screen);
3587	break;	3559	break;
3588	case 3: /* set position (pixels) */	3560	case 3: /* set position (pixels) */
3589	XMoveWindow (disp, parent[0], args[1], args[2]);	3561	XMoveWindow (dpy, parent[0], args[1], args[2]);
3590	break;	3562	break;
3591	case 4: /* set size (pixels) */	3563	case 4: /* set size (pixels) */
3592	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3564	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3593	break;	3565	break;
3594	case 5: /* raise window */	3566	case 5: /* raise window */
3595	XRaiseWindow (disp, parent[0]);	3567	XRaiseWindow (dpy, parent[0]);
3596	break;	3568	break;
3597	case 6: /* lower window */	3569	case 6: /* lower window */
3598	XLowerWindow (disp, parent[0]);	3570	XLowerWindow (dpy, parent[0]);
3599	break;	3571	break;
3600	case 7: /* refresh window */	3572	case 7: /* refresh window */
3601	scr_touch (true);	3573	scr_touch (true);
3602	break;	3574	break;
3603	case 8: /* set size (chars) */	3575	case 8: /* set size (chars) */
…		…
3610	if (args[0] >= 24) /* set height (chars) */	3582	if (args[0] >= 24) /* set height (chars) */
3611	set_widthheight ((unsigned int)width,	3583	set_widthheight ((unsigned int)width,
3612	(unsigned int) (args[1] * fheight));	3584	(unsigned int) (args[1] * fheight));
3613	break;	3585	break;
3614		3586
3615
3616	/*	3587	/*
3617	* reports - some output format copied from XTerm	3588	* reports - some output format copied from XTerm
3618	*/	3589	*/
3619	case 11: /* report window state */	3590	case 11: /* report window state */
3620	XGetWindowAttributes (disp, parent[0], &wattr);	3591	XGetWindowAttributes (dpy, parent[0], &wattr);
3621	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3592	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3622	break;	3593	break;
3623	case 13: /* report window position */	3594	case 13: /* report window position */
3624	XGetWindowAttributes (disp, parent[0], &wattr);	3595	XGetWindowAttributes (dpy, parent[0], &wattr);
3625	XTranslateCoordinates (disp, parent[0], wattr.root,	3596	XTranslateCoordinates (dpy, parent[0], wattr.root,
3626	-wattr.border_width, -wattr.border_width,	3597	-wattr.border_width, -wattr.border_width,
3627	&x, &y, &wdummy);	3598	&x, &y, &wdummy);
3628	tt_printf ("\033[3;%d;%dt", x, y);	3599	tt_printf ("\033[3;%d;%dt", x, y);
3629	break;	3600	break;
3630	case 14: /* report window size (pixels) */	3601	case 14: /* report window size (pixels) */
3631	XGetWindowAttributes (disp, parent[0], &wattr);	3602	XGetWindowAttributes (dpy, parent[0], &wattr);
3632	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3603	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3633	break;	3604	break;
3634	case 18: /* report text area size (chars) */	3605	case 18: /* report text area size (chars) */
3635	tt_printf ("\033[8;%d;%dt", nrow, ncol);	3606	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3636	break;	3607	break;
…		…
3638	tt_printf ("\033[9;%d;%dt", nrow, ncol);	3609	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3639	break;	3610	break;
3640	case 20: /* report icon label */	3611	case 20: /* report icon label */
3641	{	3612	{
3642	char *s;	3613	char *s;
3643	XGetIconName (disp, parent[0], &s);	3614	XGetIconName (dpy, parent[0], &s);
3644	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3615	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3645	XFree (s);	3616	XFree (s);
3646	}	3617	}
3647	break;	3618	break;
3648	case 21: /* report window title */	3619	case 21: /* report window title */
3649	{	3620	{
3650	char *s;	3621	char *s;
3651	XFetchName (disp, parent[0], &s);	3622	XFetchName (dpy, parent[0], &s);
3652	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3623	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3653	XFree (s);	3624	XFree (s);
3654	}	3625	}
3655	break;	3626	break;
3656	}	3627	}
…		…
3757	void	3728	void
3758	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)	3729	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3759	{	3730	{
3760	if (str[0] == '?' && !str[1])	3731	if (str[0] == '?' && !str[1])
3761	{	3732	{
3762	unsigned short r, g, b;	3733	rgba c;
3763	pix_colors_focused[color].get (display, r, g, b);	3734	pix_colors_focused[color].get (c);
		3735
		3736	#if XFT
		3737	if (c.a != rgba::MAX_CC)
		3738	tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
		3739	else
		3740	#endif
3764	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);	3741	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3765	}	3742	}
3766	else	3743	else
3767	set_window_color (color, str);	3744	set_window_color (color, str);
3768	}	3745	}
3769		3746
…		…
3775	{	3752	{
3776	int color;	3753	int color;
3777	char buf, name;	3754	char buf, name;
3778	bool query = str[0] == '?' && !str[1];	3755	bool query = str[0] == '?' && !str[1];
3779	int saveop = op;	3756	int saveop = op;
3780	dDisp;	3757
		3758	dLocal (Display *, dpy);
3781		3759
3782	assert (str != NULL);	3760	assert (str != NULL);
		3761
		3762	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
		3763	; // no responses yet
		3764
3783	switch (op)	3765	switch (op)
3784	{	3766	{
3785	case XTerm_name:	3767	case XTerm_name:
3786	set_title (str);	3768	set_title (str);
3787	/* FALLTHROUGH */	3769	/* FALLTHROUGH */
…		…
3801	unsigned long bytes_after;	3783	unsigned long bytes_after;
3802	unsigned char *value = 0;	3784	unsigned char *value = 0;
3803	const char *str = "";	3785	const char *str = "";
3804		3786
3805	if (prop	3787	if (prop
3806	&& XGetWindowProperty (disp, parent[0],	3788	&& XGetWindowProperty (dpy, parent[0],
3807	prop, 0, 1<<16, 0, AnyPropertyType,	3789	prop, 0, 1<<16, 0, AnyPropertyType,
3808	&actual_type, &actual_format,	3790	&actual_type, &actual_format,
3809	&nitems, &bytes_after, &value) == Success	3791	&nitems, &bytes_after, &value) == Success
3810	&& actual_type != None	3792	&& actual_type != None
3811	&& actual_format == 8)	3793	&& actual_format == 8)
3812	str = (const char *)(value);	3794	str = (const char *)(value);
3813		3795
3814	tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);	3796	tt_printf ("\033]%d;%s%c", op, str, resp);
3815		3797
3816	XFree (value);	3798	XFree (value);
3817	}	3799	}
3818	else	3800	else
3819	{	3801	{
…		…
3823	{	3805	{
3824	*eq = 0;	3806	*eq = 0;
3825	set_utf8_property (display->atom (str), eq + 1);	3807	set_utf8_property (display->atom (str), eq + 1);
3826	}	3808	}
3827	else	3809	else
3828	XDeleteProperty (disp, parent[0],	3810	XDeleteProperty (dpy, parent[0],
3829	display->atom (str));	3811	display->atom (str));
3830	}	3812	}
3831	break;	3813	break;
3832		3814
3833	case XTerm_Color:	3815	case XTerm_Color:
…		…
3843	break;	3825	break;
3844		3826
3845	if ((buf = strchr (name, ';')) != NULL)	3827	if ((buf = strchr (name, ';')) != NULL)
3846	*buf++ = '\0';	3828	*buf++ = '\0';
3847		3829
3848	if (name[0] == '?' && !name[1])	3830	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	}	3831	}
3857	break;	3832	break;
3858	case XTerm_Color00:	3833	case XTerm_Color00:
3859	process_color_seq (XTerm_Color00, Color_fg, str, resp);	3834	process_color_seq (op, Color_fg, str, resp);
3860	break;	3835	break;
3861	case XTerm_Color01:	3836	case XTerm_Color01:
3862	process_color_seq (XTerm_Color01, Color_bg, str, resp);	3837	process_color_seq (op, Color_bg, str, resp);
3863	break;	3838	break;
3864	#ifndef NO_CURSORCOLOR	3839	#ifndef NO_CURSORCOLOR
3865	case XTerm_Color_cursor:	3840	case XTerm_Color_cursor:
3866	process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);	3841	process_color_seq (op, Color_cursor, str, resp);
3867	break;	3842	break;
3868	#endif	3843	#endif
3869	case XTerm_Color_pointer_fg:	3844	case XTerm_Color_pointer_fg:
3870	process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);	3845	process_color_seq (op, Color_pointer_fg, str, resp);
3871	break;	3846	break;
3872	case XTerm_Color_pointer_bg:	3847	case XTerm_Color_pointer_bg:
3873	process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);	3848	process_color_seq (op, Color_pointer_bg, str, resp);
3874	break;	3849	break;
3875	#ifndef NO_BOLD_UNDERLINE_REVERSE	3850	#ifndef NO_BOLD_UNDERLINE_REVERSE
3876	case XTerm_Color_RV:	3851	case XTerm_Color_RV:
3877	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3852	process_color_seq (op, Color_RV, str, resp);
3878	break;	3853	break;
3879	case Rxvt_Color_BD:	3854	case Rxvt_Color_BD:
3880	case URxvt_Color_BD:	3855	case URxvt_Color_BD:
3881	process_color_seq (op, Color_BD, str, resp);	3856	process_color_seq (op, Color_BD, str, resp);
3882	break;	3857	break;
3883	case Rxvt_Color_UL:	3858	case Rxvt_Color_UL:
3884	case URxvt_Color_UL:	3859	case URxvt_Color_UL:
3885	process_color_seq (op, Color_UL, str, resp);	3860	process_color_seq (op, Color_UL, str, resp);
3886	break;	3861	break;
3887	case URxvt_Color_IT:	3862	case URxvt_Color_IT:
3888	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);	3863	process_color_seq (op, Color_IT, str, resp);
3889	break;	3864	break;
3890	#endif	3865	#endif
3891	#if TRANSPARENT && TINTING	3866	#if TRANSPARENT && TINTING
3892	case URxvt_Color_tint:	3867	case URxvt_Color_tint:
3893	process_color_seq (URxvt_Color_tint, Color_tint, str, resp);	3868	process_color_seq (op, Color_tint, str, resp);
		3869
3894	check_our_parents ();	3870	check_our_parents ();
		3871
3895	if (am_transparent)	3872	if (am_transparent)
3896	want_full_refresh = want_refresh = 1;	3873	want_full_refresh = want_refresh = 1;
		3874
3897	break;	3875	break;
3898	#endif	3876	#endif
3899		3877
3900	case Rxvt_Pixmap:	3878	case Rxvt_Pixmap:
3901	{	3879	{
…		…
3972	allocated.push_back ((void *)res);	3950	allocated.push_back ((void *)res);
3973	set_fonts ();	3951	set_fonts ();
3974	}	3952	}
3975	break;	3953	break;
3976		3954
3977	#if ENABLE_FRILLS	3955	case URxvt_version:
		3956	if (query)
		3957	tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
		3958	op,
		3959	rs[Rs_name], VERSION[0], VERSION[2],
		3960	resp);
		3961	break;
		3962
		3963	#if !ENABLE_MINIMAL
3978	case URxvt_locale:	3964	case URxvt_locale:
3979	if (query)	3965	if (query)
3980	tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);	3966	tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
3981	else	3967	else
3982	{	3968	{
3983	set_locale (str);	3969	set_locale (str);
3984	pty->set_utf8_mode (enc_utf8);	3970	pty->set_utf8_mode (enc_utf8);
3985	init_xlocale ();	3971	init_xlocale ();
…		…
4000	break;	3986	break;
4001	#endif	3987	#endif
4002		3988
4003	#if ENABLE_PERL	3989	#if ENABLE_PERL
4004	case URxvt_perl:	3990	case URxvt_perl:
4005	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))	3991	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
4006	; // no responses yet	3992	; // no responses yet
4007	break;	3993	break;
4008	#endif	3994	#endif
4009	}	3995	}
4010	}	3996	}
…		…
4042	return state;	4028	return state;
4043	}	4029	}
4044		4030
4045	/* we're not using priv _yet_ */	4031	/* we're not using priv _yet_ */
4046	void	4032	void
4047	rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)	4033	rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4048	{	4034	{
4049	unsigned int i, j;	4035	unsigned int i, j;
4050	int state;	4036	int state;
4051		4037
4052	static const struct	4038	static const struct
…		…
4346	scr_color (Color_bg, Color_bg);	4332	scr_color (Color_bg, Color_bg);
4347	break;	4333	break;
4348		4334
4349	//case 50: // not variable spacing	4335	//case 50: // not variable spacing
4350		4336
4351	#if ENABLE_FRILLS	4337	#if !ENABLE_MINIMAL
4352	case 90:	4338	case 90:
4353	case 91: /* set bright fg color */	4339	case 91: /* set bright fg color */
4354	case 92:	4340	case 92:
4355	case 93:	4341	case 93:
4356	case 94:	4342	case 94:

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.272 by root, Thu Jan 19 16:22:12 2006 UTC vs. Revision 1.311 by root, Sat Mar 4 20:14:35 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.272 by root, Thu Jan 19 16:22:12 2006 UTC vs.
Revision 1.311 by root, Sat Mar 4 20:14:35 2006 UTC