[ViewVC] Diff of: cvs/rxvt-unicode/src/command.C

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.280 by root, Mon Jan 23 23:33:58 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>
		59
		60	#if LINUX_YIELD_HACK
		61	# include <ctime>
		62	#endif
64		63
65	/----------------------------------------------------------------------/	64	/----------------------------------------------------------------------/
66		65
67	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)	66	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68		67
…		…
227	# if !UNICODE3	226	# if !UNICODE3
228	if (ch >= 0x10000)	227	if (ch >= 0x10000)
229	ch = 0xfffd;	228	ch = 0xfffd;
230	# endif	229	# endif
231	scr_overlay_set (11, y, ch, r);	230	scr_overlay_set (11, y, ch, r);
		231
		232	if (WCWIDTH (ch) >= 2)
232	scr_overlay_set (12, y, NOCHAR, r);	233	scr_overlay_set (12, y, NOCHAR, r);
233	}	234	}
234		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	// }
235	scr_overlay_set (0, len , attr);	241	scr_overlay_set (0, len , attr);
236	scr_overlay_set (0, len + 1, fname);	242	scr_overlay_set (0, len + 1, fname);
237		243
238	free (fname);	244	free (fname);
239		245
…		…
292		298
293	return -1;	299	return -1;
294	}	300	}
295	#endif	301	#endif
296		302
297	/{{{ Convert the keypress event into a string /
298	void	303	void
299	rxvt_term::lookup_key (XKeyEvent &ev)	304	rxvt_term::key_press (XKeyEvent &ev)
300	{	305	{
301	int ctrl, meta, shft, len;	306	int ctrl, meta, shft, len;
302	unsigned int newlen;	307	unsigned int newlen;
303	KeySym keysym;	308	KeySym keysym;
304	#ifdef DEBUG_CMD
305	static int debug_key = 1; /* accessible by a debugger only */
306	#endif
307	int valid_keysym;	309	int valid_keysym;
308	char kbuf[KBUFSZ];	310	char kbuf[KBUFSZ];
		311
		312	#if ISO_14755
		313	if (iso14755buf & ISO_14755_52)
		314	return;
		315	#endif
309		316
310	/*	317	/*
311	* 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
312	* escape sequence to toggle the Keypad.	319	* escape sequence to toggle the Keypad.
313	*	320	*
…		…
490	{	497	{
491	commit_iso14755 ();	498	commit_iso14755 ();
492	iso14755buf = ISO_14755_51;	499	iso14755buf = ISO_14755_51;
493	# if ISO_14755	500	# if ISO_14755
494	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);
495	# endif	510	# endif
496	return;	511	return;
497	}	512	}
498	else if ((hv = hex_keyval (ev)) >= 0)	513	else if ((hv = hex_keyval (ev)) >= 0)
499	{	514	{
…		…
870	return;	885	return;
871		886
872	if (len <= 0)	887	if (len <= 0)
873	return; /* not mapped */	888	return; /* not mapped */
874		889
875	if (OPTION (Opt_scrollTtyKeypress))	890	if (option (Opt_scrollTtyKeypress))
876	if (view_start)	891	if (view_start)
877	{	892	{
878	view_start = 0;	893	view_start = 0;
879	want_refresh = 1;	894	want_refresh = 1;
880	}	895	}
…		…
902	{	917	{
903	const char ch = C0_ESC;	918	const char ch = C0_ESC;
904	tt_write (&ch, 1);	919	tt_write (&ch, 1);
905	}	920	}
906		921
907	#if defined(DEBUG_CMD)
908	/* Display keyboard buffer contents */
909	unsigned char *p;
910	int i;
911
912	fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
913	for (i = 0, p = kbuf; i < len; i++, p++)
914	fprintf (stderr, (p >= ' ' && p < '\177' ? "%c" : "\\%03o"), *p);
915	fprintf (stderr, "'\n");
916	#endif /* DEBUG_CMD */
917	tt_write (kbuf, (unsigned int)len);	922	tt_write (kbuf, (unsigned int)len);
918	}	923	}
919	/}}} /	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	}
920		1001
921	#if defined (KEYSYM_RESOURCE)	1002	#if defined (KEYSYM_RESOURCE)
922	unsigned int	1003	unsigned int
923	rxvt_term::cmd_write (const char *str, unsigned int count)	1004	rxvt_term::cmd_write (const char *str, unsigned int count)
924	{	1005	{
…		…
1101	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1182	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1102	}	1183	}
1103	}	1184	}
1104	#endif	1185	#endif
1105		1186
1106	#if HAVE_SCHED_YIELD	1187	#if LINUX_YIELD_HACK
1107	static struct event_handler	1188	static struct event_handler
1108	{	1189	{
1109	check_watcher cw_yield;	1190	check_watcher yield_ev;
1110		1191
1111	void yield (check_watcher &w)	1192	void yield_cb (check_watcher &w)
1112	{	1193	{
1113	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
1114	w.stop ();	1202	w.stop ();
1115	}	1203	}
1116		1204
1117	event_handler ()	1205	event_handler ()
1118	: cw_yield (this, &event_handler::yield)	1206	: yield_ev (this, &event_handler::yield_cb)
1119	{	1207	{
1120	}	1208	}
1121	} event_handler;	1209	} event_handler;
1122	#endif	1210	#endif
1123		1211
…		…
1143	cmdbuf_endp += r;	1231	cmdbuf_endp += r;
1144	return true;	1232	return true;
1145	}	1233	}
1146	else if (r < 0 && (errno == EAGAIN \|\| errno == EINTR))	1234	else if (r < 0 && (errno == EAGAIN \|\| errno == EINTR))
1147	{	1235	{
1148	#if HAVE_SCHED_YIELD	1236	#if LINUX_YIELD_HACK
1149	if (display->is_local)	1237	if (display->is_local)
1150	event_handler.cw_yield.start ();	1238	event_handler.yield_ev.start ();
1151	#endif	1239	#endif
1152	}	1240	}
1153	else	1241	else
1154	{	1242	{
1155	pty_ev.stop ();	1243	pty_ev.stop ();
1156		1244
1157	if (!OPTION (Opt_hold))	1245	if (!option (Opt_hold))
1158	destroy ();	1246	destroy ();
1159	}	1247	}
1160		1248
1161	return false;	1249	return false;
1162	}	1250	}
…		…
1177	}	1265	}
1178		1266
1179	void	1267	void
1180	rxvt_term::pointer_unblank ()	1268	rxvt_term::pointer_unblank ()
1181	{	1269	{
1182	XDefineCursor (display->display, vt, TermWin_cursor);	1270	XDefineCursor (dpy, vt, TermWin_cursor);
1183	recolour_cursor ();	1271	recolour_cursor ();
1184		1272
1185	#ifdef POINTER_BLANK	1273	#ifdef POINTER_BLANK
1186	hidden_pointer = 0;	1274	hidden_pointer = 0;
1187		1275
1188	if (OPTION (Opt_pointerBlank))	1276	if (option (Opt_pointerBlank))
1189	pointer_ev.start (NOW + pointerBlankDelay);	1277	pointer_ev.start (NOW + pointerBlankDelay);
1190	#endif	1278	#endif
1191	}	1279	}
1192		1280
1193	#ifdef POINTER_BLANK	1281	#ifdef POINTER_BLANK
1194	void	1282	void
1195	rxvt_term::pointer_blank ()	1283	rxvt_term::pointer_blank ()
1196	{	1284	{
1197	if (!OPTION (Opt_pointerBlank))	1285	if (!option (Opt_pointerBlank))
1198	return;	1286	return;
1199		1287
1200	XDefineCursor (display->display, vt, display->blank_cursor);	1288	XDefineCursor (dpy, vt, display->blank_cursor);
1201	XFlush (display->display);	1289	XFlush (dpy);
1202		1290
1203	hidden_pointer = 1;	1291	hidden_pointer = 1;
1204	}	1292	}
1205		1293
1206	void	1294	void
…		…
1279	(32 + button_number + key_state),	1367	(32 + button_number + key_state),
1280	(32 + x + 1),	1368	(32 + x + 1),
1281	(32 + y + 1));	1369	(32 + y + 1));
1282	}	1370	}
1283		1371
1284	#ifdef USING_W11LIB
1285	void
1286	rxvt_W11_process_x_event (XEvent *ev)
1287	{
1288	rxvt_t *r = rxvt_get_r ();
1289
1290	x_cb (*ev);
1291	}
1292	#endif
1293
1294	/{{{ process an X event /	1372	/{{{ process an X event /
1295	void	1373	void
1296	rxvt_term::x_cb (XEvent &ev)	1374	rxvt_term::x_cb (XEvent &ev)
1297	{	1375	{
1298	make_current ();	1376	make_current ();
1299		1377
1300	dDisp;	1378	dLocal (Display *, dpy);
1301		1379
1302	if (ev.xany.window == vt	1380	if (ev.xany.window == vt
1303	&& SHOULD_INVOKE (HOOK_X_EVENT)	1381	&& SHOULD_INVOKE (HOOK_X_EVENT)
1304	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))	1382	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1305	return;	1383	return;
…		…
1310	unsigned int unused_mask;	1388	unsigned int unused_mask;
1311		1389
1312	switch (ev.type)	1390	switch (ev.type)
1313	{	1391	{
1314	case KeyPress:	1392	case KeyPress:
1315	#if ISO_14755	1393	key_press (ev.xkey);
1316	if (!(iso14755buf & ISO_14755_52))
1317	#endif
1318	lookup_key (ev.xkey);
1319
1320	break;	1394	break;
1321		1395
1322	case KeyRelease:	1396	case KeyRelease:
1323	{	1397	key_release (ev.xkey);
1324	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ISO_14755 \|\| ENABLE_PERL
1325	KeySym keysym;
1326
1327	keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1328	#endif
1329
1330	#if ENABLE_FRILLS \|\| ISO_14755
1331	// ISO 14755 support
1332	if (iso14755buf)
1333	if (iso14755buf & ISO_14755_52)
1334	{
1335	# if ENABLE_OVERLAY
1336	scr_overlay_off ();
1337	# endif
1338	# if ISO_14755
1339	// iso14755 part 5.2 handling: release time
1340	// first: controls
1341	if ((ev.xkey.state & ControlMask)
1342	&& ((keysym >= 0x40 && keysym <= 0x5f)
1343	\|\| (keysym >= 0x61 && keysym <= 0x7f)))
1344	{
1345	iso14755buf = ISO_14755_51 \| 0x2400 \| (keysym & 0x1f);
1346	commit_iso14755 ();
1347	goto skip_switch;
1348	}
1349
1350	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1351	if (i[0] == keysym)
1352	{
1353	iso14755buf = ISO_14755_51 \| i[1];
1354	commit_iso14755 ();
1355	goto skip_switch;
1356	}
1357
1358	scr_bell ();
1359	# endif
1360	iso14755buf = 0;
1361	break;
1362	}
1363	else if ((ev.xkey.state & (ShiftMask \| ControlMask)) != (ShiftMask \| ControlMask))
1364	{
1365	# if ENABLE_OVERLAY
1366	scr_overlay_off ();
1367	# endif
1368	if (iso14755buf & ISO_14755_51)
1369	commit_iso14755 ();
1370	#if ISO_14755
1371	else if (iso14755buf & ISO_14755_STARTED)
1372	{
1373	iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1374
1375	scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1376	scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1377	}
1378	# endif
1379	else
1380	iso14755buf = 0;
1381	}
1382	#endif
1383
1384	if (ev.xany.window == vt
1385	&& HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1386	break;
1387
1388	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1389	if (!(ev.xkey.state & ControlMask))
1390	slip_wheel_ev.stop ();
1391	else if (keysym == XK_Control_L \|\| keysym == XK_Control_R)
1392	mouse_slip_wheel_speed = 0;
1393	#endif
1394	break;	1398	break;
1395	}
1396		1399
1397	case ButtonPress:	1400	case ButtonPress:
1398	button_press (ev.xbutton);	1401	button_press (ev.xbutton);
1399	break;	1402	break;
1400		1403
…		…
1415	if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))	1418	if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1416	destroy ();	1419	destroy ();
1417	}	1420	}
1418	#if ENABLE_EWMH	1421	#if ENABLE_EWMH
1419	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])
1420	XSendEvent (disp, ev.xclient.window = display->root,	1423	XSendEvent (dpy, ev.xclient.window = display->root,
1421	False, SubstructureRedirectMask \| SubstructureNotifyMask,	1424	False, SubstructureRedirectMask \| SubstructureNotifyMask,
1422	&ev);	1425	&ev);
1423	#endif	1426	#endif
1424	}	1427	}
1425	}	1428	}
…		…
1463	break;	1466	break;
1464	}	1467	}
1465	break;	1468	break;
1466		1469
1467	case FocusIn:	1470	case FocusIn:
		1471	if (ev.xfocus.detail != NotifyInferior
		1472	&& ev.xfocus.detail != NotifyPointer
		1473	&& ev.xfocus.mode != NotifyGrab)
1468	focus_in ();	1474	focus_in ();
1469	break;	1475	break;
1470		1476
1471	case FocusOut:	1477	case FocusOut:
		1478	if (ev.xfocus.detail != NotifyInferior
		1479	&& ev.xfocus.detail != NotifyPointer
		1480	&& ev.xfocus.mode != NotifyGrab)
1472	focus_out ();	1481	focus_out ();
1473	break;	1482	break;
1474		1483
1475	case ConfigureNotify:	1484	case ConfigureNotify:
1476	if (ev.xconfigure.window == parent[0])	1485	if (ev.xconfigure.window == parent[0])
1477	{	1486	{
1478	while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))	1487	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1479	;	1488	;
1480		1489
1481	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)	1490	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)
1482	{	1491	{
1483	seen_resize = 1;	1492	seen_resize = 1;
1484	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1493	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1485	}	1494	}
1486		1495
1487	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));	1496	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1488		1497
1489	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */	1498	#ifdef TRANSPARENT
1490	if (OPTION (Opt_transparent))	1499	if (option (Opt_transparent))
1491	check_our_parents ();	1500	check_our_parents ();
1492	#endif	1501	#endif
1493	}	1502	}
1494	break;	1503	break;
1495		1504
…		…
1541	if (ev.xany.window == vt)	1550	if (ev.xany.window == vt)
1542	{	1551	{
1543	do	1552	do
1544	scr_expose (ev.xexpose.x, ev.xexpose.y,	1553	scr_expose (ev.xexpose.x, ev.xexpose.y,
1545	ev.xexpose.width, ev.xexpose.height, False);	1554	ev.xexpose.width, ev.xexpose.height, False);
1546	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));	1555	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1547		1556
1548	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1557	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1549		1558
1550	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))	1559	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1551	scr_expose (ev.xexpose.x, ev.xexpose.y,	1560	scr_expose (ev.xexpose.x, ev.xexpose.y,
1552	ev.xexpose.width, ev.xexpose.height, False);	1561	ev.xexpose.width, ev.xexpose.height, False);
1553		1562
1554	want_refresh = 1;	1563	want_refresh = 1;
1555	}	1564	}
1556	else	1565	else
1557	{	1566	{
1558	XEvent unused_event;	1567	XEvent unused_event;
1559		1568
1560	while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))	1569	while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1561	;	1570	;
1562	while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))	1571	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1563	;	1572	;
1564		1573
1565	if (isScrollbarWindow (ev.xany.window))	1574	if (isScrollbarWindow (ev.xany.window))
1566	{	1575	{
1567	scrollBar.setIdle ();	1576	scrollBar.setIdle ();
1568	scrollbar_show (0);	1577	scrollbar_show (0);
1569	}	1578	}
1570		1579
1571	#ifdef TRANSPARENT	1580	#ifdef TRANSPARENT
1572	if (am_transparent && ev.xany.window == parent[0])	1581	if (am_transparent && ev.xany.window == parent[0])
1573	XClearWindow (disp, ev.xany.window);	1582	XClearWindow (dpy, ev.xany.window);
1574	#endif	1583	#endif
1575	}	1584	}
1576	break;	1585	break;
1577		1586
1578	case MotionNotify:	1587	case MotionNotify:
…		…
1588	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)	1597	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1589	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))	1598	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1590	; // nop	1599	; // nop
1591	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))	1600	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))
1592	{	1601	{
1593	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))	1602	while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1594	;	1603	;
1595		1604
1596	XQueryPointer (disp, vt,	1605	XQueryPointer (dpy, vt,
1597	&unused_root, &unused_child,	1606	&unused_root, &unused_child,
1598	&unused_root_x, &unused_root_y,	1607	&unused_root_x, &unused_root_y,
1599	&ev.xbutton.x, &ev.xbutton.y,	1608	&ev.xbutton.x, &ev.xbutton.y,
1600	&ev.xbutton.state);	1609	&ev.xbutton.state);
1601	#ifdef MOUSE_THRESHOLD	1610	#ifdef MOUSE_THRESHOLD
…		…
1665	#endif	1674	#endif
1666	}	1675	}
1667	}	1676	}
1668	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1677	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1669	{	1678	{
1670	while (XCheckTypedWindowEvent (disp, scrollBar.win,	1679	while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1671	MotionNotify, &ev))	1680	MotionNotify, &ev))
1672	;	1681	;
1673		1682
1674	XQueryPointer (disp, scrollBar.win,	1683	XQueryPointer (dpy, scrollBar.win,
1675	&unused_root, &unused_child,	1684	&unused_root, &unused_child,
1676	&unused_root_x, &unused_root_y,	1685	&unused_root_x, &unused_root_y,
1677	&ev.xbutton.x, &ev.xbutton.y,	1686	&ev.xbutton.x, &ev.xbutton.y,
1678	&unused_mask);	1687	&unused_mask);
1679	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1688	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
…		…
1683	scrollbar_show (1);	1692	scrollbar_show (1);
1684	}	1693	}
1685	break;	1694	break;
1686	}	1695	}
1687		1696
1688	skip_switch: ;
1689
1690	#if defined(CURSOR_BLINK)	1697	#if defined(CURSOR_BLINK)
1691	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)	1698	if (option (Opt_cursorBlink) && ev.type == KeyPress)
1692	{	1699	{
1693	if (hidden_cursor)	1700	if (hidden_cursor)
1694	{	1701	{
1695	hidden_cursor = 0;	1702	hidden_cursor = 0;
1696	want_refresh = 1;	1703	want_refresh = 1;
…		…
1699	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);	1706	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1700	}	1707	}
1701	#endif	1708	#endif
1702		1709
1703	#if defined(POINTER_BLANK)	1710	#if defined(POINTER_BLANK)
1704	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)	1711	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1705	{	1712	{
1706	if (ev.type == MotionNotify	1713	if (ev.type == MotionNotify
1707	\|\| ev.type == ButtonPress	1714	\|\| ev.type == ButtonPress
1708	\|\| ev.type == ButtonRelease)	1715	\|\| ev.type == ButtonRelease)
1709	if (hidden_pointer)	1716	if (hidden_pointer)
…		…
1721	if (!focus)	1728	if (!focus)
1722	{	1729	{
1723	focus = 1;	1730	focus = 1;
1724	want_refresh = 1;	1731	want_refresh = 1;
1725		1732
1726	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));	1733	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1727		1734
1728	#if USE_XIM	1735	#if USE_XIM
1729	if (Input_Context != NULL)	1736	if (Input_Context != NULL)
1730	{	1737	{
1731	IMSetStatusPosition ();	1738	IMSetPosition ();
1732	XSetICFocus (Input_Context);	1739	XSetICFocus (Input_Context);
1733	}	1740	}
1734	#endif	1741	#endif
1735	#if CURSOR_BLINK	1742	#if CURSOR_BLINK
1736	if (OPTION (Opt_cursorBlink))	1743	if (option (Opt_cursorBlink))
1737	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);	1744	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1738	#endif	1745	#endif
1739	#if OFF_FOCUS_FADING	1746	#if OFF_FOCUS_FADING
1740	if (rs[Rs_fade])	1747	if (rs[Rs_fade])
1741	{	1748	{
1742	pix_colors = pix_colors_focused;	1749	pix_colors = pix_colors_focused;
1743	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	}
1744	}	1764	}
1745	#endif	1765	#endif
1746	}	1766	}
1747	}	1767	}
1748		1768
…		…
1768	#if USE_XIM	1788	#if USE_XIM
1769	if (Input_Context != NULL)	1789	if (Input_Context != NULL)
1770	XUnsetICFocus (Input_Context);	1790	XUnsetICFocus (Input_Context);
1771	#endif	1791	#endif
1772	#if CURSOR_BLINK	1792	#if CURSOR_BLINK
1773	if (OPTION (Opt_cursorBlink))	1793	if (option (Opt_cursorBlink))
1774	cursor_blink_ev.stop ();	1794	cursor_blink_ev.stop ();
1775	hidden_cursor = 0;	1795	hidden_cursor = 0;
1776	#endif	1796	#endif
1777	#if OFF_FOCUS_FADING	1797	#if OFF_FOCUS_FADING
1778	if (rs[Rs_fade])	1798	if (rs[Rs_fade])
…		…
1782	}	1802	}
1783	#endif	1803	#endif
1784	}	1804	}
1785	}	1805	}
1786		1806
1787	#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
1788	void	1821	void
1789	rxvt_term::rootwin_cb (XEvent &ev)	1822	rxvt_term::rootwin_cb (XEvent &ev)
1790	{	1823	{
1791	make_current ();	1824	make_current ();
1792		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
1793	switch (ev.type)	1831	switch (ev.type)
1794	{	1832	{
1795	case PropertyNotify:	1833	case PropertyNotify:
1796	/*	1834	/*
1797	* 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,
…		…
1801	&& ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])	1839	&& ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1802	return;	1840	return;
1803		1841
1804	/* FALLTHROUGH */	1842	/* FALLTHROUGH */
1805	case ReparentNotify:	1843	case ReparentNotify:
1806	if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)	1844	if (option (Opt_transparent) && check_our_parents () && am_transparent)
1807	want_refresh = want_full_refresh = 1;	1845	want_refresh = want_full_refresh = 1;
1808	break;	1846	break;
1809	}	1847	}
		1848	# endif
1810	}	1849	}
1811	#endif	1850	#endif
1812		1851
1813	void	1852	void
1814	rxvt_term::button_press (XButtonEvent &ev)	1853	rxvt_term::button_press (XButtonEvent &ev)
…		…
2142	selection_make (ev.time);	2181	selection_make (ev.time);
2143	break;	2182	break;
2144		2183
2145	case Button2:	2184	case Button2:
2146	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?	2185	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2147	selection_request (ev.time, ev.state & ShiftMask ? Sel_Clipboard : Sel_Primary);	2186	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2148	break;	2187	break;
2149		2188
2150	#ifdef MOUSE_WHEEL	2189	#ifdef MOUSE_WHEEL
2151	case Button4:	2190	case Button4:
2152	case Button5:	2191	case Button5:
…		…
2156		2195
2157	v = ev.button == Button4 ? UP : DN;	2196	v = ev.button == Button4 ? UP : DN;
2158		2197
2159	if (ev.state & ShiftMask)	2198	if (ev.state & ShiftMask)
2160	i = 1;	2199	i = 1;
2161	else if (OPTION (Opt_mouseWheelScrollPage))	2200	else if (option (Opt_mouseWheelScrollPage))
2162	i = nrow - 1;	2201	i = nrow - 1;
2163	else	2202	else
2164	i = 5;	2203	i = 5;
2165		2204
2166	# ifdef MOUSE_SLIP_WHEELING	2205	# ifdef MOUSE_SLIP_WHEELING
…		…
2194	#if TINTING	2233	#if TINTING
2195	/* taken from aterm-0.4.2 */	2234	/* taken from aterm-0.4.2 */
2196		2235
2197	typedef uint32_t RUINT32T;	2236	typedef uint32_t RUINT32T;
2198		2237
2199	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)
2200	{	2239	{
2201	int sh_r, sh_g, sh_b;	2240	int sh_r, sh_g, sh_b;
2202	RUINT32T mask_r, mask_g, mask_b;	2241	RUINT32T mask_r, mask_g, mask_b;
2203	RUINT32T lookup, lookup_r, lookup_g, lookup_b;	2242	RUINT32T lookup, lookup_r, lookup_g, lookup_b;
2204	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;	2243	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2205	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;	2244	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2206	int i;	2245	int i;
2207		2246
2208	Visual *visual = display->visual;	2247	Visual *visual = term->visual;
2209		2248
2210	if( visual->c_class != TrueColor \|\| srcImage->format != ZPixmap ) return ;	2249	if( visual->c_class != TrueColor \|\| srcImage->format != ZPixmap ) return ;
2211		2250
2212	/* for convenience */	2251	/* for convenience */
2213	mask_r = visual->red_mask;	2252	mask_r = visual->red_mask;
…		…
2434	Atom atype;	2473	Atom atype;
2435	unsigned char *prop = NULL;	2474	unsigned char *prop = NULL;
2436	Window root, oldp, *list;	2475	Window root, oldp, *list;
2437	Pixmap rootpixmap = None;	2476	Pixmap rootpixmap = None;
2438	XWindowAttributes wattr, wrootattr;	2477	XWindowAttributes wattr, wrootattr;
2439	dDisp;
2440		2478
2441	pchanged = 0;	2479	pchanged = 0;
2442		2480
2443	if (!OPTION (Opt_transparent))	2481	if (!option (Opt_transparent))
2444	return pchanged; /* Don't try any more */	2482	return pchanged; /* Don't try any more */
2445		2483
2446	XGetWindowAttributes (disp, display->root, &wrootattr);	2484	XGetWindowAttributes (dpy, display->root, &wrootattr);
2447	rootdepth = wrootattr.depth;	2485	rootdepth = wrootattr.depth;
2448		2486
2449	XGetWindowAttributes (disp, parent[0], &wattr);	2487	XGetWindowAttributes (dpy, parent[0], &wattr);
2450		2488
2451	if (rootdepth != wattr.depth)	2489	if (rootdepth != wattr.depth)
2452	{	2490	{
2453	if (am_transparent)	2491	if (am_transparent)
2454	{	2492	{
2455	pchanged = 1;	2493	pchanged = 1;
2456	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2494	XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2457	am_transparent = am_pixmap_trans = 0;	2495	am_transparent = am_pixmap_trans = 0;
2458	}	2496	}
2459		2497
2460	return pchanged; /* Don't try any more */	2498	return pchanged; /* Don't try any more */
2461	}	2499	}
2462		2500
2463	/* 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. */
2464	XSync (disp, False);	2502	XSync (dpy, False);
2465		2503
2466	/*	2504	/*
2467	* Make the frame window set by the window manager have	2505	* Make the frame window set by the window manager have
2468	* the root background. Some window managers put multiple nested frame	2506	* the root background. Some window managers put multiple nested frame
2469	* 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.
2470	*/	2508	*/
2471	i = (xa[XA_XROOTPMAP_ID]	2509	i = (xa[XA_XROOTPMAP_ID]
2472	&& XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],	2510	&& XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2473	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2511	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2474	&nitems, &bytes_after, &prop) == Success);	2512	&nitems, &bytes_after, &prop) == Success);
2475		2513
2476	if (!i \|\| prop == NULL)	2514	if (!i \|\| prop == NULL)
2477	i = (xa[XA_ESETROOT_PMAP_ID]	2515	i = (xa[XA_ESETROOT_PMAP_ID]
2478	&& XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],	2516	&& XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2479	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2517	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2480	&nitems, &bytes_after, &prop) == Success);	2518	&nitems, &bytes_after, &prop) == Success);
2481		2519
2482	if (!i \|\| prop == NULL	2520	if (!i \|\| prop == NULL
2483	#if TINTING	2521	#if TINTING
2484	\|\| !rs[Rs_color + Color_tint]	2522	\|\| !ISSET_PIXCOLOR (Color_tint)
2485	#endif	2523	#endif
2486	)	2524	)
2487	have_pixmap = 0;	2525	have_pixmap = 0;
2488	else	2526	else
2489	{	2527	{
…		…
2502	Window cr;	2540	Window cr;
2503	XImage *image;	2541	XImage *image;
2504	GC gc;	2542	GC gc;
2505	XGCValues gcvalue;	2543	XGCValues gcvalue;
2506		2544
2507	XTranslateCoordinates (disp, parent[0], display->root,	2545	XTranslateCoordinates (dpy, parent[0], display->root,
2508	0, 0, &sx, &sy, &cr);	2546	0, 0, &sx, &sy, &cr);
2509	nw = (unsigned int)szHint.width;	2547	nw = (unsigned int)szHint.width;
2510	nh = (unsigned int)szHint.height;	2548	nh = (unsigned int)szHint.height;
2511	nx = ny = 0;	2549	nx = ny = 0;
2512		2550
…		…
2525	}	2563	}
2526		2564
2527	min_it (nw, (unsigned int) (wrootattr.width - sx));	2565	min_it (nw, (unsigned int) (wrootattr.width - sx));
2528	min_it (nh, (unsigned int) (wrootattr.height - sy));	2566	min_it (nh, (unsigned int) (wrootattr.height - sy));
2529		2567
2530	XSync (disp, False);	2568	XSync (dpy, False);
2531	allowedxerror = -1;	2569	allowedxerror = -1;
2532	image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);	2570	image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2533		2571
2534	/* XXX: handle BadMatch - usually because we're outside the pixmap */	2572	/* XXX: handle BadMatch - usually because we're outside the pixmap */
2535	/* XXX: may need a delay here? */	2573	/* XXX: may need a delay here? */
2536	allowedxerror = 0;	2574	allowedxerror = 0;
2537		2575
…		…
2540	if (am_transparent && am_pixmap_trans)	2578	if (am_transparent && am_pixmap_trans)
2541	{	2579	{
2542	pchanged = 1;	2580	pchanged = 1;
2543	if (pixmap != None)	2581	if (pixmap != None)
2544	{	2582	{
2545	XFreePixmap (disp, pixmap);	2583	XFreePixmap (dpy, pixmap);
2546	pixmap = None;	2584	pixmap = None;
2547	}	2585	}
2548	}	2586	}
2549		2587
2550	am_pixmap_trans = 0;	2588	am_pixmap_trans = 0;
2551	}	2589	}
2552	else	2590	else
2553	{	2591	{
2554	if (pixmap != None)	2592	if (pixmap != None)
2555	XFreePixmap (disp, pixmap);	2593	XFreePixmap (dpy, pixmap);
2556		2594
2557	#if TINTING	2595	#if TINTING
2558	if (ISSET_PIXCOLOR (Color_tint))	2596	if (ISSET_PIXCOLOR (Color_tint))
2559	{	2597	{
2560	unsigned short rm, gm, bm;
2561	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;	2598	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2562		2599
		2600	rgba c;
2563	pix_colors_focused[Color_tint].get (display, rm, gm, bm);	2601	pix_colors_focused [Color_tint].get (c);
2564		2602
2565	ShadeXImage (display, image, shade, rm, gm, bm);	2603	ShadeXImage (this, image, shade, c.r, c.g, c.b);
2566	}	2604	}
2567	#endif	2605	#endif
2568		2606
2569	pixmap = XCreatePixmap (disp, vt,	2607	pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2570	szHint.width, szHint.height, image->depth);
2571	gc = XCreateGC (disp, vt, 0UL, &gcvalue);	2608	gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2572	XPutImage (disp, pixmap, gc, image, 0, 0,	2609	XPutImage (dpy, pixmap, gc, image, 0, 0,
2573	nx, ny, image->width, image->height);	2610	nx, ny, image->width, image->height);
2574	XFreeGC (disp, gc);	2611	XFreeGC (dpy, gc);
2575	XDestroyImage (image);	2612	XDestroyImage (image);
2576	XSetWindowBackgroundPixmap (disp, parent[0], pixmap);	2613	XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2577	XClearWindow (disp, parent[0]);	2614	XClearWindow (dpy, parent[0]);
2578		2615
2579	if (!am_transparent \|\| !am_pixmap_trans)	2616	if (!am_transparent \|\| !am_pixmap_trans)
2580	pchanged = 1;	2617	pchanged = 1;
2581		2618
2582	am_transparent = am_pixmap_trans = 1;	2619	am_transparent = am_pixmap_trans = 1;
2583	}	2620	}
2584	}	2621	}
2585		2622
2586	if (am_pixmap_trans)	2623	if (am_pixmap_trans)
2587	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2624	XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2588	else	2625	else
2589	{	2626	{
2590	unsigned int n;	2627	unsigned int n;
2591	/*	2628	/*
2592	* InheritPixmap transparency	2629	* InheritPixmap transparency
2593	*/	2630	*/
2594	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2631	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2595	{	2632	{
2596	oldp = parent[i];	2633	oldp = parent[i];
2597	XQueryTree (disp, parent[i - 1], &root,	2634	XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2598	&parent[i], &list, &n);
2599	XFree (list);	2635	XFree (list);
2600		2636
2601	if (parent[i] == display->root)	2637	if (parent[i] == display->root)
2602	{	2638	{
2603	if (oldp != None)	2639	if (oldp != None)
…		…
2611	}	2647	}
2612		2648
2613	n = 0;	2649	n = 0;
2614		2650
2615	if (pchanged)	2651	if (pchanged)
2616	{
2617	for (; n < (unsigned int)i; n++)	2652	for (; n < (unsigned int)i; n++)
2618	{	2653	{
2619	XGetWindowAttributes (disp, parent[n], &wattr);	2654	XGetWindowAttributes (dpy, parent[n], &wattr);
		2655
2620	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)	2656	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)
2621	{	2657	{
2622	n = (int) (sizeof (parent) / sizeof (Window)) + 1;	2658	n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2623	break;	2659	break;
2624	}	2660	}
2625	}	2661	}
2626	}
2627		2662
2628	if (n > (int) (sizeof (parent) / sizeof (parent[0])))	2663	if (n > (sizeof (parent) / sizeof (parent[0])))
2629	{	2664	{
2630	XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);	2665	XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2631	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2666	XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2632	am_transparent = 0;	2667	am_transparent = 0;
2633	/* XXX: also turn off Opt_transparent? */	2668	/* XXX: also turn off Opt_transparent? */
2634	}	2669	}
2635	else	2670	else
2636	{	2671	{
2637	for (n = 0; n < (unsigned int)i; n++)	2672	for (n = 0; n < (unsigned int)i; n++)
2638	{	2673	{
2639	XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);	2674	XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2640	XClearWindow (disp, parent[n]);	2675	XClearWindow (dpy, parent[n]);
2641	}	2676	}
2642		2677
2643	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2678	XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2644	am_transparent = 1;	2679	am_transparent = 1;
2645	}	2680	}
2646		2681
2647	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2682	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2648	parent[i] = None;	2683	parent[i] = None;
2649	}	2684	}
2650		2685
2651	if (scrollBar.win)	2686	if (scrollBar.win)
2652	{	2687	{
2653	XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);	2688	XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2654	scrollBar.setIdle ();	2689	scrollBar.setIdle ();
2655	scrollbar_show (0);	2690	scrollbar_show (0);
2656	}	2691	}
2657		2692
2658	if (am_transparent)	2693	if (am_transparent)
…		…
2721	if (ch == C0_LF)	2756	if (ch == C0_LF)
2722	nlines++;	2757	nlines++;
2723		2758
2724	refresh_count++;	2759	refresh_count++;
2725		2760
2726	if (!OPTION (Opt_jumpScroll)	2761	if (!option (Opt_jumpScroll)
2727	\|\| (refresh_count >= refresh_limit * (nrow - 1)))	2762	\|\| (refresh_count >= refresh_limit * (nrow - 1)))
2728	{	2763	{
2729	refreshnow = true;	2764	refreshnow = true;
2730	refresh_count = 0;	2765	refresh_count = 0;
2731	ch = NOCHAR;	2766	ch = NOCHAR;
…		…
2771	* the number of pages between refreshes is refresh_limit, which	2806	* the number of pages between refreshes is refresh_limit, which
2772	* is incremented here because we must be doing flat-out scrolling.	2807	* is incremented here because we must be doing flat-out scrolling.
2773	*/	2808	*/
2774	if (refreshnow)	2809	if (refreshnow)
2775	{	2810	{
2776	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)	2811	if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2777	refresh_limit++;	2812	refresh_limit++;
2778	else	2813	else
2779	{	2814	{
2780	flag = true;	2815	flag = true;
		2816	//TODO: due to popular request, implement "skipscroll" option here
2781	scr_refresh ();	2817	scr_refresh ();
2782	want_refresh = 1;	2818	want_refresh = 1;
2783	}	2819	}
2784	}	2820	}
2785		2821
…		…
3109	scr_charset_set (2, (unsigned int)cmd_getc ());	3145	scr_charset_set (2, (unsigned int)cmd_getc ());
3110	break;	3146	break;
3111	case '+':	3147	case '+':
3112	scr_charset_set (3, (unsigned int)cmd_getc ());	3148	scr_charset_set (3, (unsigned int)cmd_getc ());
3113	break;	3149	break;
3114	#if ENABLE_FRILLS	3150	#if !ENABLE_MINIMAL
3115	case '6':	3151	case '6':
3116	scr_backindex ();	3152	scr_backindex ();
3117	break;	3153	break;
3118	#endif	3154	#endif
3119	case '7':	3155	case '7':
3120	scr_cursor (SAVE);	3156	scr_cursor (SAVE);
3121	break;	3157	break;
3122	case '8':	3158	case '8':
3123	scr_cursor (RESTORE);	3159	scr_cursor (RESTORE);
3124	break;	3160	break;
3125	#if ENABLE_FRILLS	3161	#if !ENABLE_MINIMAL
3126	case '9':	3162	case '9':
3127	scr_forwardindex ();	3163	scr_forwardindex ();
3128	break;	3164	break;
3129	#endif	3165	#endif
3130	case '=':	3166	case '=':
…		…
3292	ndef = get_byte_array_bit (csi_defaults, i);	3328	ndef = get_byte_array_bit (csi_defaults, i);
3293	for (p = 0; p < nargs; p++)	3329	for (p = 0; p < nargs; p++)
3294	if (arg[p] == -1)	3330	if (arg[p] == -1)
3295	arg[p] = ndef;	3331	arg[p] = ndef;
3296		3332
3297	#ifdef DEBUG_CMD
3298	fprintf (stderr, "CSI ");
3299	for (p = 0; p < nargs; p++)
3300	fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3301	fprintf (stderr, "%c\n", ch);
3302	#endif
3303
3304	/*	3333	/*
3305	* private mode handling	3334	* private mode handling
3306	*/	3335	*/
3307	if (priv)	3336	if (priv)
3308	{	3337	{
3309	switch (priv)	3338	switch (priv)
3310	{	3339	{
3311	case '>':	3340	case '>':
3312	if (ch == CSI_DA) /* secondary device attributes */	3341	if (ch == CSI_DA) /* secondary device attributes */
3313	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	}
3314	break;	3352	break;
3315	case '?':	3353	case '?':
3316	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')	3354	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')
3317	process_terminal_mode (ch, priv, nargs, arg);	3355	process_terminal_mode (ch, priv, nargs, arg);
3318	break;	3356	break;
…		…
3444	break;	3482	break;
3445	case 6: /* CPR requested */	3483	case 6: /* CPR requested */
3446	scr_report_position ();	3484	scr_report_position ();
3447	break;	3485	break;
3448	case 7: /* unofficial extension */	3486	case 7: /* unofficial extension */
3449	if (OPTION (Opt_insecure))	3487	if (option (Opt_insecure))
3450	tt_printf ("%-.250s\012", rs[Rs_display_name]);	3488	tt_printf ("%-.250s\012", rs[Rs_display_name]);
3451	break;	3489	break;
3452	case 8: /* unofficial extension */	3490	case 8: /* unofficial extension */
3453	process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);	3491	process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3454	break;	3492	break;
…		…
3521	break;	3559	break;
3522	case CSI_75:	3560	case CSI_75:
3523	scr_cursor (RESTORE);	3561	scr_cursor (RESTORE);
3524	break;	3562	break;
3525		3563
3526	#if ENABLE_FRILLS	3564	#if !ENABLE_MINIMAL
3527	case CSI_74:	3565	case CSI_74:
3528	process_window_ops (arg, nargs);	3566	process_window_ops (arg, nargs);
3529	break;	3567	break;
3530	#endif	3568	#endif
3531		3569
…		…
3538	break;	3576	break;
3539	}	3577	}
3540	}	3578	}
3541	/}}} /	3579	/}}} /
3542		3580
3543	#if ENABLE_FRILLS	3581	#if !ENABLE_MINIMAL
3544	/* ARGSUSED */	3582	/* ARGSUSED */
3545	void	3583	void
3546	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3584	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3547	{	3585	{
3548	int x, y;	3586	int x, y;
3549	XWindowAttributes wattr;	3587	XWindowAttributes wattr;
3550	Window wdummy;	3588	Window wdummy;
3551	dDisp;	3589
		3590	dLocal (Display *, dpy);
3552		3591
3553	if (nargs == 0)	3592	if (nargs == 0)
3554	return;	3593	return;
3555		3594
3556	switch (args[0])	3595	switch (args[0])
3557	{	3596	{
3558	/*	3597	/*
3559	* commands	3598	* commands
3560	*/	3599	*/
3561	case 1: /* deiconify window */	3600	case 1: /* deiconify window */
3562	XMapWindow (disp, parent[0]);	3601	XMapWindow (dpy, parent[0]);
3563	break;	3602	break;
3564	case 2: /* iconify window */	3603	case 2: /* iconify window */
3565	XIconifyWindow (disp, parent[0], display->screen);	3604	XIconifyWindow (dpy, parent[0], display->screen);
3566	break;	3605	break;
3567	case 3: /* set position (pixels) */	3606	case 3: /* set position (pixels) */
3568	XMoveWindow (disp, parent[0], args[1], args[2]);	3607	XMoveWindow (dpy, parent[0], args[1], args[2]);
3569	break;	3608	break;
3570	case 4: /* set size (pixels) */	3609	case 4: /* set size (pixels) */
3571	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3610	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3572	break;	3611	break;
3573	case 5: /* raise window */	3612	case 5: /* raise window */
3574	XRaiseWindow (disp, parent[0]);	3613	XRaiseWindow (dpy, parent[0]);
3575	break;	3614	break;
3576	case 6: /* lower window */	3615	case 6: /* lower window */
3577	XLowerWindow (disp, parent[0]);	3616	XLowerWindow (dpy, parent[0]);
3578	break;	3617	break;
3579	case 7: /* refresh window */	3618	case 7: /* refresh window */
3580	scr_touch (true);	3619	scr_touch (true);
3581	break;	3620	break;
3582	case 8: /* set size (chars) */	3621	case 8: /* set size (chars) */
…		…
3589	if (args[0] >= 24) /* set height (chars) */	3628	if (args[0] >= 24) /* set height (chars) */
3590	set_widthheight ((unsigned int)width,	3629	set_widthheight ((unsigned int)width,
3591	(unsigned int) (args[1] * fheight));	3630	(unsigned int) (args[1] * fheight));
3592	break;	3631	break;
3593		3632
3594
3595	/*	3633	/*
3596	* reports - some output format copied from XTerm	3634	* reports - some output format copied from XTerm
3597	*/	3635	*/
3598	case 11: /* report window state */	3636	case 11: /* report window state */
3599	XGetWindowAttributes (disp, parent[0], &wattr);	3637	XGetWindowAttributes (dpy, parent[0], &wattr);
3600	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3638	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3601	break;	3639	break;
3602	case 13: /* report window position */	3640	case 13: /* report window position */
3603	XGetWindowAttributes (disp, parent[0], &wattr);	3641	XGetWindowAttributes (dpy, parent[0], &wattr);
3604	XTranslateCoordinates (disp, parent[0], wattr.root,	3642	XTranslateCoordinates (dpy, parent[0], wattr.root,
3605	-wattr.border_width, -wattr.border_width,	3643	-wattr.border_width, -wattr.border_width,
3606	&x, &y, &wdummy);	3644	&x, &y, &wdummy);
3607	tt_printf ("\033[3;%d;%dt", x, y);	3645	tt_printf ("\033[3;%d;%dt", x, y);
3608	break;	3646	break;
3609	case 14: /* report window size (pixels) */	3647	case 14: /* report window size (pixels) */
3610	XGetWindowAttributes (disp, parent[0], &wattr);	3648	XGetWindowAttributes (dpy, parent[0], &wattr);
3611	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3649	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3612	break;	3650	break;
3613	case 18: /* report text area size (chars) */	3651	case 18: /* report text area size (chars) */
3614	tt_printf ("\033[8;%d;%dt", nrow, ncol);	3652	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3615	break;	3653	break;
…		…
3617	tt_printf ("\033[9;%d;%dt", nrow, ncol);	3655	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3618	break;	3656	break;
3619	case 20: /* report icon label */	3657	case 20: /* report icon label */
3620	{	3658	{
3621	char *s;	3659	char *s;
3622	XGetIconName (disp, parent[0], &s);	3660	XGetIconName (dpy, parent[0], &s);
3623	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 */
3624	XFree (s);	3662	XFree (s);
3625	}	3663	}
3626	break;	3664	break;
3627	case 21: /* report window title */	3665	case 21: /* report window title */
3628	{	3666	{
3629	char *s;	3667	char *s;
3630	XFetchName (disp, parent[0], &s);	3668	XFetchName (dpy, parent[0], &s);
3631	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 */
3632	XFree (s);	3670	XFree (s);
3633	}	3671	}
3634	break;	3672	break;
3635	}	3673	}
3636	}	3674	}
…		…
3663	seen_esc = true;	3701	seen_esc = true;
3664	continue;	3702	continue;
3665	}	3703	}
3666	else if (ch == C0_BEL \|\| ch == CHAR_ST)	3704	else if (ch == C0_BEL \|\| ch == CHAR_ST)
3667	break;	3705	break;
		3706	else if (ch == C0_SYN)
		3707	ch = cmd_get8 ();
3668	else if (ch < 0x20)	3708	else if (ch < 0x20)
3669	return NULL; /* other control character - exit */	3709	return NULL; /* other control character - exit */
3670		3710
3671	seen_esc = false;	3711	seen_esc = false;
3672		3712
3673	if (n >= STRING_MAX - 1)	3713	if (n >= STRING_MAX - 1)
3674	// stop at some sane length	3714	// stop at some sane length
3675	return NULL;	3715	return NULL;
3676		3716
3677	if (ch == C0_SYN)
3678	string[n++] = cmd_get8 ();
3679	else
3680	string[n++] = ch;	3717	string[n++] = ch;
3681	}	3718	}
3682		3719
3683	string[n++] = '\0';	3720	string[n++] = '\0';
3684		3721
3685	ends_how = (ch == 0x5c ? C0_ESC : ch);	3722	ends_how = (ch == 0x5c ? C0_ESC : ch);
…		…
3736	void	3773	void
3737	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)
3738	{	3775	{
3739	if (str[0] == '?' && !str[1])	3776	if (str[0] == '?' && !str[1])
3740	{	3777	{
3741	unsigned short r, g, b;	3778	rgba c;
3742	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
3743	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);
3744	}	3787	}
3745	else	3788	else
3746	set_window_color (color, str);	3789	set_window_color (color, str);
3747	}	3790	}
3748		3791
…		…
3754	{	3797	{
3755	int color;	3798	int color;
3756	char buf, name;	3799	char buf, name;
3757	bool query = str[0] == '?' && !str[1];	3800	bool query = str[0] == '?' && !str[1];
3758	int saveop = op;	3801	int saveop = op;
3759	dDisp;	3802
		3803	dLocal (Display *, dpy);
3760		3804
3761	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
3762	switch (op)	3810	switch (op)
3763	{	3811	{
3764	case XTerm_name:	3812	case XTerm_name:
3765	set_title (str);	3813	set_title (str);
3766	/* FALLTHROUGH */	3814	/* FALLTHROUGH */
…		…
3780	unsigned long bytes_after;	3828	unsigned long bytes_after;
3781	unsigned char *value = 0;	3829	unsigned char *value = 0;
3782	const char *str = "";	3830	const char *str = "";
3783		3831
3784	if (prop	3832	if (prop
3785	&& XGetWindowProperty (disp, parent[0],	3833	&& XGetWindowProperty (dpy, parent[0],
3786	prop, 0, 1<<16, 0, AnyPropertyType,	3834	prop, 0, 1<<16, 0, AnyPropertyType,
3787	&actual_type, &actual_format,	3835	&actual_type, &actual_format,
3788	&nitems, &bytes_after, &value) == Success	3836	&nitems, &bytes_after, &value) == Success
3789	&& actual_type != None	3837	&& actual_type != None
3790	&& actual_format == 8)	3838	&& actual_format == 8)
3791	str = (const char *)(value);	3839	str = (const char *)(value);
3792		3840
3793	tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);	3841	tt_printf ("\033]%d;%s%c", op, str, resp);
3794		3842
3795	XFree (value);	3843	XFree (value);
3796	}	3844	}
3797	else	3845	else
3798	{	3846	{
…		…
3802	{	3850	{
3803	*eq = 0;	3851	*eq = 0;
3804	set_utf8_property (display->atom (str), eq + 1);	3852	set_utf8_property (display->atom (str), eq + 1);
3805	}	3853	}
3806	else	3854	else
3807	XDeleteProperty (disp, parent[0],	3855	XDeleteProperty (dpy, parent[0],
3808	display->atom (str));	3856	display->atom (str));
3809	}	3857	}
3810	break;	3858	break;
3811		3859
3812	case XTerm_Color:	3860	case XTerm_Color:
…		…
3822	break;	3870	break;
3823		3871
3824	if ((buf = strchr (name, ';')) != NULL)	3872	if ((buf = strchr (name, ';')) != NULL)
3825	*buf++ = '\0';	3873	*buf++ = '\0';
3826		3874
3827	if (name[0] == '?' && !name[1])	3875	process_color_seq (op, color, name, resp);
3828	{
3829	unsigned short r, g, b;
3830	pix_colors_focused[color].get (display, r, g, b);
3831	tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3832	}
3833	else
3834	set_window_color (color, name);
3835	}	3876	}
3836	break;	3877	break;
3837	case XTerm_Color00:	3878	case XTerm_Color00:
3838	process_color_seq (XTerm_Color00, Color_fg, str, resp);	3879	process_color_seq (op, Color_fg, str, resp);
3839	break;	3880	break;
3840	case XTerm_Color01:	3881	case XTerm_Color01:
3841	process_color_seq (XTerm_Color01, Color_bg, str, resp);	3882	process_color_seq (op, Color_bg, str, resp);
3842	break;	3883	break;
3843	#ifndef NO_CURSORCOLOR	3884	#ifndef NO_CURSORCOLOR
3844	case XTerm_Color_cursor:	3885	case XTerm_Color_cursor:
3845	process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);	3886	process_color_seq (op, Color_cursor, str, resp);
3846	break;	3887	break;
3847	#endif	3888	#endif
3848	case XTerm_Color_pointer_fg:	3889	case XTerm_Color_pointer_fg:
3849	process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);	3890	process_color_seq (op, Color_pointer_fg, str, resp);
3850	break;	3891	break;
3851	case XTerm_Color_pointer_bg:	3892	case XTerm_Color_pointer_bg:
3852	process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);	3893	process_color_seq (op, Color_pointer_bg, str, resp);
3853	break;	3894	break;
3854	#ifndef NO_BOLD_UNDERLINE_REVERSE	3895	#ifndef NO_BOLD_UNDERLINE_REVERSE
3855	case XTerm_Color_RV:	3896	case XTerm_Color_RV:
3856	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3897	process_color_seq (op, Color_RV, str, resp);
3857	break;	3898	break;
3858	case Rxvt_Color_BD:	3899	case Rxvt_Color_BD:
3859	case URxvt_Color_BD:	3900	case URxvt_Color_BD:
3860	process_color_seq (op, Color_BD, str, resp);	3901	process_color_seq (op, Color_BD, str, resp);
3861	break;	3902	break;
3862	case Rxvt_Color_UL:	3903	case Rxvt_Color_UL:
3863	case URxvt_Color_UL:	3904	case URxvt_Color_UL:
3864	process_color_seq (op, Color_UL, str, resp);	3905	process_color_seq (op, Color_UL, str, resp);
3865	break;	3906	break;
3866	case URxvt_Color_IT:	3907	case URxvt_Color_IT:
3867	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);	3908	process_color_seq (op, Color_IT, str, resp);
3868	break;	3909	break;
3869	#endif	3910	#endif
3870	#if TRANSPARENT && TINTING	3911	#if TRANSPARENT && TINTING
3871	case URxvt_Color_tint:	3912	case URxvt_Color_tint:
3872	process_color_seq (URxvt_Color_tint, Color_tint, str, resp);	3913	process_color_seq (op, Color_tint, str, resp);
		3914
3873	check_our_parents ();	3915	check_our_parents ();
		3916
3874	if (am_transparent)	3917	if (am_transparent)
3875	want_full_refresh = want_refresh = 1;	3918	want_full_refresh = want_refresh = 1;
		3919
3876	break;	3920	break;
3877	#endif	3921	#endif
3878		3922
3879	case Rxvt_Pixmap:	3923	case Rxvt_Pixmap:
3880	{	3924	{
…		…
3938	case URxvt_italicFont:	3982	case URxvt_italicFont:
3939	case URxvt_boldItalicFont:	3983	case URxvt_boldItalicFont:
3940	#endif	3984	#endif
3941	if (query)	3985	if (query)
3942	tt_printf ("\33]%d;%-.250s%c", saveop,	3986	tt_printf ("\33]%d;%-.250s%c", saveop,
3943	OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc	3987	option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3944	? fontset[op - URxvt_font]->fontdesc : "",	3988	? fontset[op - URxvt_font]->fontdesc : "",
3945	resp);	3989	resp);
3946	else	3990	else
3947	{	3991	{
3948	const char *&res = rs[Rs_font + (op - URxvt_font)];	3992	const char *&res = rs[Rs_font + (op - URxvt_font)];
…		…
3951	allocated.push_back ((void *)res);	3995	allocated.push_back ((void *)res);
3952	set_fonts ();	3996	set_fonts ();
3953	}	3997	}
3954	break;	3998	break;
3955		3999
3956	#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
3957	case URxvt_locale:	4009	case URxvt_locale:
3958	if (query)	4010	if (query)
3959	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);
3960	else	4012	else
3961	{	4013	{
3962	set_locale (str);	4014	set_locale (str);
3963	pty->set_utf8_mode (enc_utf8);	4015	pty->set_utf8_mode (enc_utf8);
3964	init_xlocale ();	4016	init_xlocale ();
…		…
3979	break;	4031	break;
3980	#endif	4032	#endif
3981		4033
3982	#if ENABLE_PERL	4034	#if ENABLE_PERL
3983	case URxvt_perl:	4035	case URxvt_perl:
3984	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)))
3985	; // no responses yet	4037	; // no responses yet
3986	break;	4038	break;
3987	#endif	4039	#endif
3988	}	4040	}
3989	}	4041	}
…		…
4105	scr_touch (true);	4157	scr_touch (true);
4106	break;	4158	break;
4107	#endif	4159	#endif
4108	case 1048: /* alternative cursor save */	4160	case 1048: /* alternative cursor save */
4109	case 1049:	4161	case 1049:
4110	if (OPTION (Opt_secondaryScreen))	4162	if (option (Opt_secondaryScreen))
4111	if (mode == 0)	4163	if (mode == 0)
4112	scr_cursor (RESTORE);	4164	scr_cursor (RESTORE);
4113	else if (mode == 1)	4165	else if (mode == 1)
4114	scr_cursor (SAVE);	4166	scr_cursor (SAVE);
4115	break;	4167	break;
…		…
4180	break;	4232	break;
4181	case 1011: /* scroll to bottom on key press */	4233	case 1011: /* scroll to bottom on key press */
4182	set_option (Opt_scrollTtyKeypress, state);	4234	set_option (Opt_scrollTtyKeypress, state);
4183	break;	4235	break;
4184	case 1047: /* secondary screen w/ clearing last */	4236	case 1047: /* secondary screen w/ clearing last */
4185	if (OPTION (Opt_secondaryScreen))	4237	if (option (Opt_secondaryScreen))
4186	if (current_screen != PRIMARY)	4238	if (current_screen != PRIMARY)
4187	scr_erase_screen (2);	4239	scr_erase_screen (2);
4188	scr_change_screen (state);	4240	scr_change_screen (state);
4189	break;	4241	break;
4190	case 1049: /* secondary screen w/ clearing first */	4242	case 1049: /* secondary screen w/ clearing first */
4191	scr_change_screen (state);	4243	scr_change_screen (state);
4192	if (OPTION (Opt_secondaryScreen))	4244	if (option (Opt_secondaryScreen))
4193	if (current_screen != PRIMARY)	4245	if (current_screen != PRIMARY)
4194	scr_erase_screen (2);	4246	scr_erase_screen (2);
4195	break;	4247	break;
4196	default:	4248	default:
4197	break;	4249	break;
…		…
4325	scr_color (Color_bg, Color_bg);	4377	scr_color (Color_bg, Color_bg);
4326	break;	4378	break;
4327		4379
4328	//case 50: // not variable spacing	4380	//case 50: // not variable spacing
4329		4381
4330	#if ENABLE_FRILLS	4382	#if !ENABLE_MINIMAL
4331	case 90:	4383	case 90:
4332	case 91: /* set bright fg color */	4384	case 91: /* set bright fg color */
4333	case 92:	4385	case 92:
4334	case 93:	4386	case 93:
4335	case 94:	4387	case 94:

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.280 by root, Mon Jan 23 23:33:58 2006 UTC vs. Revision 1.323 by ayin, Mon May 28 18:38:03 2007 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.280 by root, Mon Jan 23 23:33:58 2006 UTC vs.
Revision 1.323 by ayin, Mon May 28 18:38:03 2007 UTC