[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.321 by root, Tue May 1 21:30:01 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	*
…		…
870	return;	877	return;
871		878
872	if (len <= 0)	879	if (len <= 0)
873	return; /* not mapped */	880	return; /* not mapped */
874		881
875	if (OPTION (Opt_scrollTtyKeypress))	882	if (option (Opt_scrollTtyKeypress))
876	if (view_start)	883	if (view_start)
877	{	884	{
878	view_start = 0;	885	view_start = 0;
879	want_refresh = 1;	886	want_refresh = 1;
880	}	887	}
…		…
902	{	909	{
903	const char ch = C0_ESC;	910	const char ch = C0_ESC;
904	tt_write (&ch, 1);	911	tt_write (&ch, 1);
905	}	912	}
906		913
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);	914	tt_write (kbuf, (unsigned int)len);
918	}	915	}
919	/}}} /	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	}
920		993
921	#if defined (KEYSYM_RESOURCE)	994	#if defined (KEYSYM_RESOURCE)
922	unsigned int	995	unsigned int
923	rxvt_term::cmd_write (const char *str, unsigned int count)	996	rxvt_term::cmd_write (const char *str, unsigned int count)
924	{	997	{
…		…
1101	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1174	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1102	}	1175	}
1103	}	1176	}
1104	#endif	1177	#endif
1105		1178
1106	#if HAVE_SCHED_YIELD	1179	#if LINUX_YIELD_HACK
1107	static struct event_handler	1180	static struct event_handler
1108	{	1181	{
1109	check_watcher cw_yield;	1182	check_watcher yield_ev;
1110		1183
1111	void yield (check_watcher &w)	1184	void yield_cb (check_watcher &w)
1112	{	1185	{
1113	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
1114	w.stop ();	1194	w.stop ();
1115	}	1195	}
1116		1196
1117	event_handler ()	1197	event_handler ()
1118	: cw_yield (this, &event_handler::yield)	1198	: yield_ev (this, &event_handler::yield_cb)
1119	{	1199	{
1120	}	1200	}
1121	} event_handler;	1201	} event_handler;
1122	#endif	1202	#endif
1123		1203
…		…
1143	cmdbuf_endp += r;	1223	cmdbuf_endp += r;
1144	return true;	1224	return true;
1145	}	1225	}
1146	else if (r < 0 && (errno == EAGAIN \|\| errno == EINTR))	1226	else if (r < 0 && (errno == EAGAIN \|\| errno == EINTR))
1147	{	1227	{
1148	#if HAVE_SCHED_YIELD	1228	#if LINUX_YIELD_HACK
1149	if (display->is_local)	1229	if (display->is_local)
1150	event_handler.cw_yield.start ();	1230	event_handler.yield_ev.start ();
1151	#endif	1231	#endif
1152	}	1232	}
1153	else	1233	else
1154	{	1234	{
1155	pty_ev.stop ();	1235	pty_ev.stop ();
1156		1236
1157	if (!OPTION (Opt_hold))	1237	if (!option (Opt_hold))
1158	destroy ();	1238	destroy ();
1159	}	1239	}
1160		1240
1161	return false;	1241	return false;
1162	}	1242	}
…		…
1177	}	1257	}
1178		1258
1179	void	1259	void
1180	rxvt_term::pointer_unblank ()	1260	rxvt_term::pointer_unblank ()
1181	{	1261	{
1182	XDefineCursor (display->display, vt, TermWin_cursor);	1262	XDefineCursor (dpy, vt, TermWin_cursor);
1183	recolour_cursor ();	1263	recolour_cursor ();
1184		1264
1185	#ifdef POINTER_BLANK	1265	#ifdef POINTER_BLANK
1186	hidden_pointer = 0;	1266	hidden_pointer = 0;
1187		1267
1188	if (OPTION (Opt_pointerBlank))	1268	if (option (Opt_pointerBlank))
1189	pointer_ev.start (NOW + pointerBlankDelay);	1269	pointer_ev.start (NOW + pointerBlankDelay);
1190	#endif	1270	#endif
1191	}	1271	}
1192		1272
1193	#ifdef POINTER_BLANK	1273	#ifdef POINTER_BLANK
1194	void	1274	void
1195	rxvt_term::pointer_blank ()	1275	rxvt_term::pointer_blank ()
1196	{	1276	{
1197	if (!OPTION (Opt_pointerBlank))	1277	if (!option (Opt_pointerBlank))
1198	return;	1278	return;
1199		1279
1200	XDefineCursor (display->display, vt, display->blank_cursor);	1280	XDefineCursor (dpy, vt, display->blank_cursor);
1201	XFlush (display->display);	1281	XFlush (dpy);
1202		1282
1203	hidden_pointer = 1;	1283	hidden_pointer = 1;
1204	}	1284	}
1205		1285
1206	void	1286	void
…		…
1279	(32 + button_number + key_state),	1359	(32 + button_number + key_state),
1280	(32 + x + 1),	1360	(32 + x + 1),
1281	(32 + y + 1));	1361	(32 + y + 1));
1282	}	1362	}
1283		1363
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 /	1364	/{{{ process an X event /
1295	void	1365	void
1296	rxvt_term::x_cb (XEvent &ev)	1366	rxvt_term::x_cb (XEvent &ev)
1297	{	1367	{
1298	make_current ();	1368	make_current ();
1299		1369
1300	dDisp;	1370	dLocal (Display *, dpy);
1301		1371
1302	if (ev.xany.window == vt	1372	if (ev.xany.window == vt
1303	&& SHOULD_INVOKE (HOOK_X_EVENT)	1373	&& SHOULD_INVOKE (HOOK_X_EVENT)
1304	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))	1374	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1305	return;	1375	return;
…		…
1310	unsigned int unused_mask;	1380	unsigned int unused_mask;
1311		1381
1312	switch (ev.type)	1382	switch (ev.type)
1313	{	1383	{
1314	case KeyPress:	1384	case KeyPress:
1315	#if ISO_14755	1385	key_press (ev.xkey);
1316	if (!(iso14755buf & ISO_14755_52))
1317	#endif
1318	lookup_key (ev.xkey);
1319
1320	break;	1386	break;
1321		1387
1322	case KeyRelease:	1388	case KeyRelease:
1323	{	1389	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;	1390	break;
1395	}
1396		1391
1397	case ButtonPress:	1392	case ButtonPress:
1398	button_press (ev.xbutton);	1393	button_press (ev.xbutton);
1399	break;	1394	break;
1400		1395
…		…
1415	if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))	1410	if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1416	destroy ();	1411	destroy ();
1417	}	1412	}
1418	#if ENABLE_EWMH	1413	#if ENABLE_EWMH
1419	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])
1420	XSendEvent (disp, ev.xclient.window = display->root,	1415	XSendEvent (dpy, ev.xclient.window = display->root,
1421	False, SubstructureRedirectMask \| SubstructureNotifyMask,	1416	False, SubstructureRedirectMask \| SubstructureNotifyMask,
1422	&ev);	1417	&ev);
1423	#endif	1418	#endif
1424	}	1419	}
1425	}	1420	}
…		…
1463	break;	1458	break;
1464	}	1459	}
1465	break;	1460	break;
1466		1461
1467	case FocusIn:	1462	case FocusIn:
		1463	if (ev.xfocus.detail != NotifyInferior
		1464	&& ev.xfocus.detail != NotifyPointer
		1465	&& ev.xfocus.mode != NotifyGrab)
1468	focus_in ();	1466	focus_in ();
1469	break;	1467	break;
1470		1468
1471	case FocusOut:	1469	case FocusOut:
		1470	if (ev.xfocus.detail != NotifyInferior
		1471	&& ev.xfocus.detail != NotifyPointer
		1472	&& ev.xfocus.mode != NotifyGrab)
1472	focus_out ();	1473	focus_out ();
1473	break;	1474	break;
1474		1475
1475	case ConfigureNotify:	1476	case ConfigureNotify:
1476	if (ev.xconfigure.window == parent[0])	1477	if (ev.xconfigure.window == parent[0])
1477	{	1478	{
1478	while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))	1479	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1479	;	1480	;
1480		1481
1481	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)	1482	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)
1482	{	1483	{
1483	seen_resize = 1;	1484	seen_resize = 1;
1484	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1485	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1485	}	1486	}
1486		1487
1487	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));	1488	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1488		1489
1489	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */	1490	#ifdef TRANSPARENT
1490	if (OPTION (Opt_transparent))	1491	if (option (Opt_transparent))
1491	check_our_parents ();	1492	check_our_parents ();
1492	#endif	1493	#endif
1493	}	1494	}
1494	break;	1495	break;
1495		1496
…		…
1541	if (ev.xany.window == vt)	1542	if (ev.xany.window == vt)
1542	{	1543	{
1543	do	1544	do
1544	scr_expose (ev.xexpose.x, ev.xexpose.y,	1545	scr_expose (ev.xexpose.x, ev.xexpose.y,
1545	ev.xexpose.width, ev.xexpose.height, False);	1546	ev.xexpose.width, ev.xexpose.height, False);
1546	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));	1547	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1547		1548
1548	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1549	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1549		1550
1550	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))	1551	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1551	scr_expose (ev.xexpose.x, ev.xexpose.y,	1552	scr_expose (ev.xexpose.x, ev.xexpose.y,
1552	ev.xexpose.width, ev.xexpose.height, False);	1553	ev.xexpose.width, ev.xexpose.height, False);
1553		1554
1554	want_refresh = 1;	1555	want_refresh = 1;
1555	}	1556	}
1556	else	1557	else
1557	{	1558	{
1558	XEvent unused_event;	1559	XEvent unused_event;
1559		1560
1560	while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))	1561	while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1561	;	1562	;
1562	while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))	1563	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1563	;	1564	;
1564		1565
1565	if (isScrollbarWindow (ev.xany.window))	1566	if (isScrollbarWindow (ev.xany.window))
1566	{	1567	{
1567	scrollBar.setIdle ();	1568	scrollBar.setIdle ();
1568	scrollbar_show (0);	1569	scrollbar_show (0);
1569	}	1570	}
1570		1571
1571	#ifdef TRANSPARENT	1572	#ifdef TRANSPARENT
1572	if (am_transparent && ev.xany.window == parent[0])	1573	if (am_transparent && ev.xany.window == parent[0])
1573	XClearWindow (disp, ev.xany.window);	1574	XClearWindow (dpy, ev.xany.window);
1574	#endif	1575	#endif
1575	}	1576	}
1576	break;	1577	break;
1577		1578
1578	case MotionNotify:	1579	case MotionNotify:
…		…
1588	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)	1589	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1589	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))	1590	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1590	; // nop	1591	; // nop
1591	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))	1592	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))
1592	{	1593	{
1593	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))	1594	while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1594	;	1595	;
1595		1596
1596	XQueryPointer (disp, vt,	1597	XQueryPointer (dpy, vt,
1597	&unused_root, &unused_child,	1598	&unused_root, &unused_child,
1598	&unused_root_x, &unused_root_y,	1599	&unused_root_x, &unused_root_y,
1599	&ev.xbutton.x, &ev.xbutton.y,	1600	&ev.xbutton.x, &ev.xbutton.y,
1600	&ev.xbutton.state);	1601	&ev.xbutton.state);
1601	#ifdef MOUSE_THRESHOLD	1602	#ifdef MOUSE_THRESHOLD
…		…
1665	#endif	1666	#endif
1666	}	1667	}
1667	}	1668	}
1668	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1669	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1669	{	1670	{
1670	while (XCheckTypedWindowEvent (disp, scrollBar.win,	1671	while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1671	MotionNotify, &ev))	1672	MotionNotify, &ev))
1672	;	1673	;
1673		1674
1674	XQueryPointer (disp, scrollBar.win,	1675	XQueryPointer (dpy, scrollBar.win,
1675	&unused_root, &unused_child,	1676	&unused_root, &unused_child,
1676	&unused_root_x, &unused_root_y,	1677	&unused_root_x, &unused_root_y,
1677	&ev.xbutton.x, &ev.xbutton.y,	1678	&ev.xbutton.x, &ev.xbutton.y,
1678	&unused_mask);	1679	&unused_mask);
1679	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1680	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
…		…
1683	scrollbar_show (1);	1684	scrollbar_show (1);
1684	}	1685	}
1685	break;	1686	break;
1686	}	1687	}
1687		1688
1688	skip_switch: ;
1689
1690	#if defined(CURSOR_BLINK)	1689	#if defined(CURSOR_BLINK)
1691	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)	1690	if (option (Opt_cursorBlink) && ev.type == KeyPress)
1692	{	1691	{
1693	if (hidden_cursor)	1692	if (hidden_cursor)
1694	{	1693	{
1695	hidden_cursor = 0;	1694	hidden_cursor = 0;
1696	want_refresh = 1;	1695	want_refresh = 1;
…		…
1699	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);	1698	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1700	}	1699	}
1701	#endif	1700	#endif
1702		1701
1703	#if defined(POINTER_BLANK)	1702	#if defined(POINTER_BLANK)
1704	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)	1703	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1705	{	1704	{
1706	if (ev.type == MotionNotify	1705	if (ev.type == MotionNotify
1707	\|\| ev.type == ButtonPress	1706	\|\| ev.type == ButtonPress
1708	\|\| ev.type == ButtonRelease)	1707	\|\| ev.type == ButtonRelease)
1709	if (hidden_pointer)	1708	if (hidden_pointer)
…		…
1721	if (!focus)	1720	if (!focus)
1722	{	1721	{
1723	focus = 1;	1722	focus = 1;
1724	want_refresh = 1;	1723	want_refresh = 1;
1725		1724
1726	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));	1725	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1727		1726
1728	#if USE_XIM	1727	#if USE_XIM
1729	if (Input_Context != NULL)	1728	if (Input_Context != NULL)
1730	{	1729	{
1731	IMSetStatusPosition ();	1730	IMSetPosition ();
1732	XSetICFocus (Input_Context);	1731	XSetICFocus (Input_Context);
1733	}	1732	}
1734	#endif	1733	#endif
1735	#if CURSOR_BLINK	1734	#if CURSOR_BLINK
1736	if (OPTION (Opt_cursorBlink))	1735	if (option (Opt_cursorBlink))
1737	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);	1736	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1738	#endif	1737	#endif
1739	#if OFF_FOCUS_FADING	1738	#if OFF_FOCUS_FADING
1740	if (rs[Rs_fade])	1739	if (rs[Rs_fade])
1741	{	1740	{
…		…
1768	#if USE_XIM	1767	#if USE_XIM
1769	if (Input_Context != NULL)	1768	if (Input_Context != NULL)
1770	XUnsetICFocus (Input_Context);	1769	XUnsetICFocus (Input_Context);
1771	#endif	1770	#endif
1772	#if CURSOR_BLINK	1771	#if CURSOR_BLINK
1773	if (OPTION (Opt_cursorBlink))	1772	if (option (Opt_cursorBlink))
1774	cursor_blink_ev.stop ();	1773	cursor_blink_ev.stop ();
1775	hidden_cursor = 0;	1774	hidden_cursor = 0;
1776	#endif	1775	#endif
1777	#if OFF_FOCUS_FADING	1776	#if OFF_FOCUS_FADING
1778	if (rs[Rs_fade])	1777	if (rs[Rs_fade])
…		…
1782	}	1781	}
1783	#endif	1782	#endif
1784	}	1783	}
1785	}	1784	}
1786		1785
1787	#if TRANSPARENT	1786	void
		1787	rxvt_term::update_fade_color (unsigned int idx)
		1788	{
		1789	#if OFF_FOCUS_FADING
		1790	if (rs[Rs_fade])
		1791	{
		1792	rgba c;
		1793	pix_colors [Color_fade].get (c);
		1794	pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
		1795	}
		1796	#endif
		1797	}
		1798
		1799	#if TRANSPARENT \|\| ENABLE_PERL
1788	void	1800	void
1789	rxvt_term::rootwin_cb (XEvent &ev)	1801	rxvt_term::rootwin_cb (XEvent &ev)
1790	{	1802	{
1791	make_current ();	1803	make_current ();
1792		1804
		1805	if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
		1806	&& HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
		1807	return;
		1808
		1809	# if TRANSPARENT
1793	switch (ev.type)	1810	switch (ev.type)
1794	{	1811	{
1795	case PropertyNotify:	1812	case PropertyNotify:
1796	/*	1813	/*
1797	* if user used some Esetroot compatible prog to set the root bg,	1814	* if user used some Esetroot compatible prog to set the root bg,
…		…
1801	&& ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])	1818	&& ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1802	return;	1819	return;
1803		1820
1804	/* FALLTHROUGH */	1821	/* FALLTHROUGH */
1805	case ReparentNotify:	1822	case ReparentNotify:
1806	if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)	1823	if (option (Opt_transparent) && check_our_parents () && am_transparent)
1807	want_refresh = want_full_refresh = 1;	1824	want_refresh = want_full_refresh = 1;
1808	break;	1825	break;
1809	}	1826	}
		1827	# endif
1810	}	1828	}
1811	#endif	1829	#endif
1812		1830
1813	void	1831	void
1814	rxvt_term::button_press (XButtonEvent &ev)	1832	rxvt_term::button_press (XButtonEvent &ev)
…		…
2142	selection_make (ev.time);	2160	selection_make (ev.time);
2143	break;	2161	break;
2144		2162
2145	case Button2:	2163	case Button2:
2146	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?	2164	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);	2165	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2148	break;	2166	break;
2149		2167
2150	#ifdef MOUSE_WHEEL	2168	#ifdef MOUSE_WHEEL
2151	case Button4:	2169	case Button4:
2152	case Button5:	2170	case Button5:
…		…
2156		2174
2157	v = ev.button == Button4 ? UP : DN;	2175	v = ev.button == Button4 ? UP : DN;
2158		2176
2159	if (ev.state & ShiftMask)	2177	if (ev.state & ShiftMask)
2160	i = 1;	2178	i = 1;
2161	else if (OPTION (Opt_mouseWheelScrollPage))	2179	else if (option (Opt_mouseWheelScrollPage))
2162	i = nrow - 1;	2180	i = nrow - 1;
2163	else	2181	else
2164	i = 5;	2182	i = 5;
2165		2183
2166	# ifdef MOUSE_SLIP_WHEELING	2184	# ifdef MOUSE_SLIP_WHEELING
…		…
2194	#if TINTING	2212	#if TINTING
2195	/* taken from aterm-0.4.2 */	2213	/* taken from aterm-0.4.2 */
2196		2214
2197	typedef uint32_t RUINT32T;	2215	typedef uint32_t RUINT32T;
2198		2216
2199	void ShadeXImage(rxvt_display display, XImage srcImage, int shade, int rm, int gm, int bm)	2217	void ShadeXImage(rxvt_term term, XImage srcImage, int shade, int rm, int gm, int bm)
2200	{	2218	{
2201	int sh_r, sh_g, sh_b;	2219	int sh_r, sh_g, sh_b;
2202	RUINT32T mask_r, mask_g, mask_b;	2220	RUINT32T mask_r, mask_g, mask_b;
2203	RUINT32T lookup, lookup_r, lookup_g, lookup_b;	2221	RUINT32T lookup, lookup_r, lookup_g, lookup_b;
2204	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;	2222	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2205	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;	2223	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2206	int i;	2224	int i;
2207		2225
2208	Visual *visual = display->visual;	2226	Visual *visual = term->visual;
2209		2227
2210	if( visual->c_class != TrueColor \|\| srcImage->format != ZPixmap ) return ;	2228	if( visual->c_class != TrueColor \|\| srcImage->format != ZPixmap ) return ;
2211		2229
2212	/* for convenience */	2230	/* for convenience */
2213	mask_r = visual->red_mask;	2231	mask_r = visual->red_mask;
…		…
2434	Atom atype;	2452	Atom atype;
2435	unsigned char *prop = NULL;	2453	unsigned char *prop = NULL;
2436	Window root, oldp, *list;	2454	Window root, oldp, *list;
2437	Pixmap rootpixmap = None;	2455	Pixmap rootpixmap = None;
2438	XWindowAttributes wattr, wrootattr;	2456	XWindowAttributes wattr, wrootattr;
2439	dDisp;
2440		2457
2441	pchanged = 0;	2458	pchanged = 0;
2442		2459
2443	if (!OPTION (Opt_transparent))	2460	if (!option (Opt_transparent))
2444	return pchanged; /* Don't try any more */	2461	return pchanged; /* Don't try any more */
2445		2462
2446	XGetWindowAttributes (disp, display->root, &wrootattr);	2463	XGetWindowAttributes (dpy, display->root, &wrootattr);
2447	rootdepth = wrootattr.depth;	2464	rootdepth = wrootattr.depth;
2448		2465
2449	XGetWindowAttributes (disp, parent[0], &wattr);	2466	XGetWindowAttributes (dpy, parent[0], &wattr);
2450		2467
2451	if (rootdepth != wattr.depth)	2468	if (rootdepth != wattr.depth)
2452	{	2469	{
2453	if (am_transparent)	2470	if (am_transparent)
2454	{	2471	{
2455	pchanged = 1;	2472	pchanged = 1;
2456	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2473	XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2457	am_transparent = am_pixmap_trans = 0;	2474	am_transparent = am_pixmap_trans = 0;
2458	}	2475	}
2459		2476
2460	return pchanged; /* Don't try any more */	2477	return pchanged; /* Don't try any more */
2461	}	2478	}
2462		2479
2463	/* Get all X ops out of the queue so that our information is up-to-date. */	2480	/* Get all X ops out of the queue so that our information is up-to-date. */
2464	XSync (disp, False);	2481	XSync (dpy, False);
2465		2482
2466	/*	2483	/*
2467	* Make the frame window set by the window manager have	2484	* Make the frame window set by the window manager have
2468	* the root background. Some window managers put multiple nested frame	2485	* the root background. Some window managers put multiple nested frame
2469	* windows for each client, so we have to take care about that.	2486	* windows for each client, so we have to take care about that.
2470	*/	2487	*/
2471	i = (xa[XA_XROOTPMAP_ID]	2488	i = (xa[XA_XROOTPMAP_ID]
2472	&& XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],	2489	&& XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2473	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2490	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2474	&nitems, &bytes_after, &prop) == Success);	2491	&nitems, &bytes_after, &prop) == Success);
2475		2492
2476	if (!i \|\| prop == NULL)	2493	if (!i \|\| prop == NULL)
2477	i = (xa[XA_ESETROOT_PMAP_ID]	2494	i = (xa[XA_ESETROOT_PMAP_ID]
2478	&& XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],	2495	&& XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2479	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2496	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2480	&nitems, &bytes_after, &prop) == Success);	2497	&nitems, &bytes_after, &prop) == Success);
2481		2498
2482	if (!i \|\| prop == NULL	2499	if (!i \|\| prop == NULL
2483	#if TINTING	2500	#if TINTING
2484	\|\| !rs[Rs_color + Color_tint]	2501	\|\| !ISSET_PIXCOLOR (Color_tint)
2485	#endif	2502	#endif
2486	)	2503	)
2487	have_pixmap = 0;	2504	have_pixmap = 0;
2488	else	2505	else
2489	{	2506	{
…		…
2502	Window cr;	2519	Window cr;
2503	XImage *image;	2520	XImage *image;
2504	GC gc;	2521	GC gc;
2505	XGCValues gcvalue;	2522	XGCValues gcvalue;
2506		2523
2507	XTranslateCoordinates (disp, parent[0], display->root,	2524	XTranslateCoordinates (dpy, parent[0], display->root,
2508	0, 0, &sx, &sy, &cr);	2525	0, 0, &sx, &sy, &cr);
2509	nw = (unsigned int)szHint.width;	2526	nw = (unsigned int)szHint.width;
2510	nh = (unsigned int)szHint.height;	2527	nh = (unsigned int)szHint.height;
2511	nx = ny = 0;	2528	nx = ny = 0;
2512		2529
…		…
2525	}	2542	}
2526		2543
2527	min_it (nw, (unsigned int) (wrootattr.width - sx));	2544	min_it (nw, (unsigned int) (wrootattr.width - sx));
2528	min_it (nh, (unsigned int) (wrootattr.height - sy));	2545	min_it (nh, (unsigned int) (wrootattr.height - sy));
2529		2546
2530	XSync (disp, False);	2547	XSync (dpy, False);
2531	allowedxerror = -1;	2548	allowedxerror = -1;
2532	image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);	2549	image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2533		2550
2534	/* XXX: handle BadMatch - usually because we're outside the pixmap */	2551	/* XXX: handle BadMatch - usually because we're outside the pixmap */
2535	/* XXX: may need a delay here? */	2552	/* XXX: may need a delay here? */
2536	allowedxerror = 0;	2553	allowedxerror = 0;
2537		2554
…		…
2540	if (am_transparent && am_pixmap_trans)	2557	if (am_transparent && am_pixmap_trans)
2541	{	2558	{
2542	pchanged = 1;	2559	pchanged = 1;
2543	if (pixmap != None)	2560	if (pixmap != None)
2544	{	2561	{
2545	XFreePixmap (disp, pixmap);	2562	XFreePixmap (dpy, pixmap);
2546	pixmap = None;	2563	pixmap = None;
2547	}	2564	}
2548	}	2565	}
2549		2566
2550	am_pixmap_trans = 0;	2567	am_pixmap_trans = 0;
2551	}	2568	}
2552	else	2569	else
2553	{	2570	{
2554	if (pixmap != None)	2571	if (pixmap != None)
2555	XFreePixmap (disp, pixmap);	2572	XFreePixmap (dpy, pixmap);
2556		2573
2557	#if TINTING	2574	#if TINTING
2558	if (ISSET_PIXCOLOR (Color_tint))	2575	if (ISSET_PIXCOLOR (Color_tint))
2559	{	2576	{
2560	unsigned short rm, gm, bm;
2561	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;	2577	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2562		2578
		2579	rgba c;
2563	pix_colors_focused[Color_tint].get (display, rm, gm, bm);	2580	pix_colors_focused [Color_tint].get (c);
2564		2581
2565	ShadeXImage (display, image, shade, rm, gm, bm);	2582	ShadeXImage (this, image, shade, c.r, c.g, c.b);
2566	}	2583	}
2567	#endif	2584	#endif
2568		2585
2569	pixmap = XCreatePixmap (disp, vt,	2586	pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2570	szHint.width, szHint.height, image->depth);
2571	gc = XCreateGC (disp, vt, 0UL, &gcvalue);	2587	gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2572	XPutImage (disp, pixmap, gc, image, 0, 0,	2588	XPutImage (dpy, pixmap, gc, image, 0, 0,
2573	nx, ny, image->width, image->height);	2589	nx, ny, image->width, image->height);
2574	XFreeGC (disp, gc);	2590	XFreeGC (dpy, gc);
2575	XDestroyImage (image);	2591	XDestroyImage (image);
2576	XSetWindowBackgroundPixmap (disp, parent[0], pixmap);	2592	XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2577	XClearWindow (disp, parent[0]);	2593	XClearWindow (dpy, parent[0]);
2578		2594
2579	if (!am_transparent \|\| !am_pixmap_trans)	2595	if (!am_transparent \|\| !am_pixmap_trans)
2580	pchanged = 1;	2596	pchanged = 1;
2581		2597
2582	am_transparent = am_pixmap_trans = 1;	2598	am_transparent = am_pixmap_trans = 1;
2583	}	2599	}
2584	}	2600	}
2585		2601
2586	if (am_pixmap_trans)	2602	if (am_pixmap_trans)
2587	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2603	XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2588	else	2604	else
2589	{	2605	{
2590	unsigned int n;	2606	unsigned int n;
2591	/*	2607	/*
2592	* InheritPixmap transparency	2608	* InheritPixmap transparency
2593	*/	2609	*/
2594	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2610	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2595	{	2611	{
2596	oldp = parent[i];	2612	oldp = parent[i];
2597	XQueryTree (disp, parent[i - 1], &root,	2613	XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2598	&parent[i], &list, &n);
2599	XFree (list);	2614	XFree (list);
2600		2615
2601	if (parent[i] == display->root)	2616	if (parent[i] == display->root)
2602	{	2617	{
2603	if (oldp != None)	2618	if (oldp != None)
…		…
2611	}	2626	}
2612		2627
2613	n = 0;	2628	n = 0;
2614		2629
2615	if (pchanged)	2630	if (pchanged)
2616	{
2617	for (; n < (unsigned int)i; n++)	2631	for (; n < (unsigned int)i; n++)
2618	{	2632	{
2619	XGetWindowAttributes (disp, parent[n], &wattr);	2633	XGetWindowAttributes (dpy, parent[n], &wattr);
		2634
2620	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)	2635	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)
2621	{	2636	{
2622	n = (int) (sizeof (parent) / sizeof (Window)) + 1;	2637	n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2623	break;	2638	break;
2624	}	2639	}
2625	}	2640	}
2626	}
2627		2641
2628	if (n > (int) (sizeof (parent) / sizeof (parent[0])))	2642	if (n > (sizeof (parent) / sizeof (parent[0])))
2629	{	2643	{
2630	XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);	2644	XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2631	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2645	XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2632	am_transparent = 0;	2646	am_transparent = 0;
2633	/* XXX: also turn off Opt_transparent? */	2647	/* XXX: also turn off Opt_transparent? */
2634	}	2648	}
2635	else	2649	else
2636	{	2650	{
2637	for (n = 0; n < (unsigned int)i; n++)	2651	for (n = 0; n < (unsigned int)i; n++)
2638	{	2652	{
2639	XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);	2653	XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2640	XClearWindow (disp, parent[n]);	2654	XClearWindow (dpy, parent[n]);
2641	}	2655	}
2642		2656
2643	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2657	XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2644	am_transparent = 1;	2658	am_transparent = 1;
2645	}	2659	}
2646		2660
2647	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2661	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2648	parent[i] = None;	2662	parent[i] = None;
2649	}	2663	}
2650		2664
2651	if (scrollBar.win)	2665	if (scrollBar.win)
2652	{	2666	{
2653	XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);	2667	XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2654	scrollBar.setIdle ();	2668	scrollBar.setIdle ();
2655	scrollbar_show (0);	2669	scrollbar_show (0);
2656	}	2670	}
2657		2671
2658	if (am_transparent)	2672	if (am_transparent)
…		…
2721	if (ch == C0_LF)	2735	if (ch == C0_LF)
2722	nlines++;	2736	nlines++;
2723		2737
2724	refresh_count++;	2738	refresh_count++;
2725		2739
2726	if (!OPTION (Opt_jumpScroll)	2740	if (!option (Opt_jumpScroll)
2727	\|\| (refresh_count >= refresh_limit * (nrow - 1)))	2741	\|\| (refresh_count >= refresh_limit * (nrow - 1)))
2728	{	2742	{
2729	refreshnow = true;	2743	refreshnow = true;
2730	refresh_count = 0;	2744	refresh_count = 0;
2731	ch = NOCHAR;	2745	ch = NOCHAR;
…		…
2771	* the number of pages between refreshes is refresh_limit, which	2785	* the number of pages between refreshes is refresh_limit, which
2772	* is incremented here because we must be doing flat-out scrolling.	2786	* is incremented here because we must be doing flat-out scrolling.
2773	*/	2787	*/
2774	if (refreshnow)	2788	if (refreshnow)
2775	{	2789	{
2776	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)	2790	if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2777	refresh_limit++;	2791	refresh_limit++;
2778	else	2792	else
2779	{	2793	{
2780	flag = true;	2794	flag = true;
		2795	//TODO: due to popular request, implement "skipscroll" option here
2781	scr_refresh ();	2796	scr_refresh ();
2782	want_refresh = 1;	2797	want_refresh = 1;
2783	}	2798	}
2784	}	2799	}
2785		2800
…		…
3109	scr_charset_set (2, (unsigned int)cmd_getc ());	3124	scr_charset_set (2, (unsigned int)cmd_getc ());
3110	break;	3125	break;
3111	case '+':	3126	case '+':
3112	scr_charset_set (3, (unsigned int)cmd_getc ());	3127	scr_charset_set (3, (unsigned int)cmd_getc ());
3113	break;	3128	break;
3114	#if ENABLE_FRILLS	3129	#if !ENABLE_MINIMAL
3115	case '6':	3130	case '6':
3116	scr_backindex ();	3131	scr_backindex ();
3117	break;	3132	break;
3118	#endif	3133	#endif
3119	case '7':	3134	case '7':
3120	scr_cursor (SAVE);	3135	scr_cursor (SAVE);
3121	break;	3136	break;
3122	case '8':	3137	case '8':
3123	scr_cursor (RESTORE);	3138	scr_cursor (RESTORE);
3124	break;	3139	break;
3125	#if ENABLE_FRILLS	3140	#if !ENABLE_MINIMAL
3126	case '9':	3141	case '9':
3127	scr_forwardindex ();	3142	scr_forwardindex ();
3128	break;	3143	break;
3129	#endif	3144	#endif
3130	case '=':	3145	case '=':
…		…
3292	ndef = get_byte_array_bit (csi_defaults, i);	3307	ndef = get_byte_array_bit (csi_defaults, i);
3293	for (p = 0; p < nargs; p++)	3308	for (p = 0; p < nargs; p++)
3294	if (arg[p] == -1)	3309	if (arg[p] == -1)
3295	arg[p] = ndef;	3310	arg[p] = ndef;
3296		3311
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	/*	3312	/*
3305	* private mode handling	3313	* private mode handling
3306	*/	3314	*/
3307	if (priv)	3315	if (priv)
3308	{	3316	{
3309	switch (priv)	3317	switch (priv)
3310	{	3318	{
3311	case '>':	3319	case '>':
3312	if (ch == CSI_DA) /* secondary device attributes */	3320	if (ch == CSI_DA) /* secondary device attributes */
3313	tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);	3321	{
		3322	// first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
		3323	// 'U' for rxvt-unicode != 7.[34] (where it was broken).
		3324	//
		3325	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
		3326	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
		3327	// that we do not support xterm mouse reporting (should be 95 when we do).
		3328	//
		3329	tt_printf ("\033[>%d;94;0c", 'U');
		3330	}
3314	break;	3331	break;
3315	case '?':	3332	case '?':
3316	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')	3333	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')
3317	process_terminal_mode (ch, priv, nargs, arg);	3334	process_terminal_mode (ch, priv, nargs, arg);
3318	break;	3335	break;
…		…
3444	break;	3461	break;
3445	case 6: /* CPR requested */	3462	case 6: /* CPR requested */
3446	scr_report_position ();	3463	scr_report_position ();
3447	break;	3464	break;
3448	case 7: /* unofficial extension */	3465	case 7: /* unofficial extension */
3449	if (OPTION (Opt_insecure))	3466	if (option (Opt_insecure))
3450	tt_printf ("%-.250s\012", rs[Rs_display_name]);	3467	tt_printf ("%-.250s\012", rs[Rs_display_name]);
3451	break;	3468	break;
3452	case 8: /* unofficial extension */	3469	case 8: /* unofficial extension */
3453	process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);	3470	process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3454	break;	3471	break;
…		…
3521	break;	3538	break;
3522	case CSI_75:	3539	case CSI_75:
3523	scr_cursor (RESTORE);	3540	scr_cursor (RESTORE);
3524	break;	3541	break;
3525		3542
3526	#if ENABLE_FRILLS	3543	#if !ENABLE_MINIMAL
3527	case CSI_74:	3544	case CSI_74:
3528	process_window_ops (arg, nargs);	3545	process_window_ops (arg, nargs);
3529	break;	3546	break;
3530	#endif	3547	#endif
3531		3548
…		…
3538	break;	3555	break;
3539	}	3556	}
3540	}	3557	}
3541	/}}} /	3558	/}}} /
3542		3559
3543	#if ENABLE_FRILLS	3560	#if !ENABLE_MINIMAL
3544	/* ARGSUSED */	3561	/* ARGSUSED */
3545	void	3562	void
3546	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3563	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3547	{	3564	{
3548	int x, y;	3565	int x, y;
3549	XWindowAttributes wattr;	3566	XWindowAttributes wattr;
3550	Window wdummy;	3567	Window wdummy;
3551	dDisp;	3568
		3569	dLocal (Display *, dpy);
3552		3570
3553	if (nargs == 0)	3571	if (nargs == 0)
3554	return;	3572	return;
3555		3573
3556	switch (args[0])	3574	switch (args[0])
3557	{	3575	{
3558	/*	3576	/*
3559	* commands	3577	* commands
3560	*/	3578	*/
3561	case 1: /* deiconify window */	3579	case 1: /* deiconify window */
3562	XMapWindow (disp, parent[0]);	3580	XMapWindow (dpy, parent[0]);
3563	break;	3581	break;
3564	case 2: /* iconify window */	3582	case 2: /* iconify window */
3565	XIconifyWindow (disp, parent[0], display->screen);	3583	XIconifyWindow (dpy, parent[0], display->screen);
3566	break;	3584	break;
3567	case 3: /* set position (pixels) */	3585	case 3: /* set position (pixels) */
3568	XMoveWindow (disp, parent[0], args[1], args[2]);	3586	XMoveWindow (dpy, parent[0], args[1], args[2]);
3569	break;	3587	break;
3570	case 4: /* set size (pixels) */	3588	case 4: /* set size (pixels) */
3571	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3589	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3572	break;	3590	break;
3573	case 5: /* raise window */	3591	case 5: /* raise window */
3574	XRaiseWindow (disp, parent[0]);	3592	XRaiseWindow (dpy, parent[0]);
3575	break;	3593	break;
3576	case 6: /* lower window */	3594	case 6: /* lower window */
3577	XLowerWindow (disp, parent[0]);	3595	XLowerWindow (dpy, parent[0]);
3578	break;	3596	break;
3579	case 7: /* refresh window */	3597	case 7: /* refresh window */
3580	scr_touch (true);	3598	scr_touch (true);
3581	break;	3599	break;
3582	case 8: /* set size (chars) */	3600	case 8: /* set size (chars) */
…		…
3589	if (args[0] >= 24) /* set height (chars) */	3607	if (args[0] >= 24) /* set height (chars) */
3590	set_widthheight ((unsigned int)width,	3608	set_widthheight ((unsigned int)width,
3591	(unsigned int) (args[1] * fheight));	3609	(unsigned int) (args[1] * fheight));
3592	break;	3610	break;
3593		3611
3594
3595	/*	3612	/*
3596	* reports - some output format copied from XTerm	3613	* reports - some output format copied from XTerm
3597	*/	3614	*/
3598	case 11: /* report window state */	3615	case 11: /* report window state */
3599	XGetWindowAttributes (disp, parent[0], &wattr);	3616	XGetWindowAttributes (dpy, parent[0], &wattr);
3600	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3617	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3601	break;	3618	break;
3602	case 13: /* report window position */	3619	case 13: /* report window position */
3603	XGetWindowAttributes (disp, parent[0], &wattr);	3620	XGetWindowAttributes (dpy, parent[0], &wattr);
3604	XTranslateCoordinates (disp, parent[0], wattr.root,	3621	XTranslateCoordinates (dpy, parent[0], wattr.root,
3605	-wattr.border_width, -wattr.border_width,	3622	-wattr.border_width, -wattr.border_width,
3606	&x, &y, &wdummy);	3623	&x, &y, &wdummy);
3607	tt_printf ("\033[3;%d;%dt", x, y);	3624	tt_printf ("\033[3;%d;%dt", x, y);
3608	break;	3625	break;
3609	case 14: /* report window size (pixels) */	3626	case 14: /* report window size (pixels) */
3610	XGetWindowAttributes (disp, parent[0], &wattr);	3627	XGetWindowAttributes (dpy, parent[0], &wattr);
3611	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3628	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3612	break;	3629	break;
3613	case 18: /* report text area size (chars) */	3630	case 18: /* report text area size (chars) */
3614	tt_printf ("\033[8;%d;%dt", nrow, ncol);	3631	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3615	break;	3632	break;
…		…
3617	tt_printf ("\033[9;%d;%dt", nrow, ncol);	3634	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3618	break;	3635	break;
3619	case 20: /* report icon label */	3636	case 20: /* report icon label */
3620	{	3637	{
3621	char *s;	3638	char *s;
3622	XGetIconName (disp, parent[0], &s);	3639	XGetIconName (dpy, parent[0], &s);
3623	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3640	tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3624	XFree (s);	3641	XFree (s);
3625	}	3642	}
3626	break;	3643	break;
3627	case 21: /* report window title */	3644	case 21: /* report window title */
3628	{	3645	{
3629	char *s;	3646	char *s;
3630	XFetchName (disp, parent[0], &s);	3647	XFetchName (dpy, parent[0], &s);
3631	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3648	tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3632	XFree (s);	3649	XFree (s);
3633	}	3650	}
3634	break;	3651	break;
3635	}	3652	}
3636	}	3653	}
…		…
3663	seen_esc = true;	3680	seen_esc = true;
3664	continue;	3681	continue;
3665	}	3682	}
3666	else if (ch == C0_BEL \|\| ch == CHAR_ST)	3683	else if (ch == C0_BEL \|\| ch == CHAR_ST)
3667	break;	3684	break;
		3685	else if (ch == C0_SYN)
		3686	ch = cmd_get8 ();
3668	else if (ch < 0x20)	3687	else if (ch < 0x20)
3669	return NULL; /* other control character - exit */	3688	return NULL; /* other control character - exit */
3670		3689
3671	seen_esc = false;	3690	seen_esc = false;
3672		3691
3673	if (n >= STRING_MAX - 1)	3692	if (n >= STRING_MAX - 1)
3674	// stop at some sane length	3693	// stop at some sane length
3675	return NULL;	3694	return NULL;
3676		3695
3677	if (ch == C0_SYN)
3678	string[n++] = cmd_get8 ();
3679	else
3680	string[n++] = ch;	3696	string[n++] = ch;
3681	}	3697	}
3682		3698
3683	string[n++] = '\0';	3699	string[n++] = '\0';
3684		3700
3685	ends_how = (ch == 0x5c ? C0_ESC : ch);	3701	ends_how = (ch == 0x5c ? C0_ESC : ch);
…		…
3736	void	3752	void
3737	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)	3753	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3738	{	3754	{
3739	if (str[0] == '?' && !str[1])	3755	if (str[0] == '?' && !str[1])
3740	{	3756	{
3741	unsigned short r, g, b;	3757	rgba c;
3742	pix_colors_focused[color].get (display, r, g, b);	3758	pix_colors_focused[color].get (c);
		3759
		3760	#if XFT
		3761	if (c.a != rgba::MAX_CC)
		3762	tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
		3763	else
		3764	#endif
3743	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);	3765	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3744	}	3766	}
3745	else	3767	else
3746	set_window_color (color, str);	3768	set_window_color (color, str);
3747	}	3769	}
3748		3770
…		…
3754	{	3776	{
3755	int color;	3777	int color;
3756	char buf, name;	3778	char buf, name;
3757	bool query = str[0] == '?' && !str[1];	3779	bool query = str[0] == '?' && !str[1];
3758	int saveop = op;	3780	int saveop = op;
3759	dDisp;	3781
		3782	dLocal (Display *, dpy);
3760		3783
3761	assert (str != NULL);	3784	assert (str != NULL);
		3785
		3786	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
		3787	return;
		3788
3762	switch (op)	3789	switch (op)
3763	{	3790	{
3764	case XTerm_name:	3791	case XTerm_name:
3765	set_title (str);	3792	set_title (str);
3766	/* FALLTHROUGH */	3793	/* FALLTHROUGH */
…		…
3780	unsigned long bytes_after;	3807	unsigned long bytes_after;
3781	unsigned char *value = 0;	3808	unsigned char *value = 0;
3782	const char *str = "";	3809	const char *str = "";
3783		3810
3784	if (prop	3811	if (prop
3785	&& XGetWindowProperty (disp, parent[0],	3812	&& XGetWindowProperty (dpy, parent[0],
3786	prop, 0, 1<<16, 0, AnyPropertyType,	3813	prop, 0, 1<<16, 0, AnyPropertyType,
3787	&actual_type, &actual_format,	3814	&actual_type, &actual_format,
3788	&nitems, &bytes_after, &value) == Success	3815	&nitems, &bytes_after, &value) == Success
3789	&& actual_type != None	3816	&& actual_type != None
3790	&& actual_format == 8)	3817	&& actual_format == 8)
3791	str = (const char *)(value);	3818	str = (const char *)(value);
3792		3819
3793	tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);	3820	tt_printf ("\033]%d;%s%c", op, str, resp);
3794		3821
3795	XFree (value);	3822	XFree (value);
3796	}	3823	}
3797	else	3824	else
3798	{	3825	{
…		…
3802	{	3829	{
3803	*eq = 0;	3830	*eq = 0;
3804	set_utf8_property (display->atom (str), eq + 1);	3831	set_utf8_property (display->atom (str), eq + 1);
3805	}	3832	}
3806	else	3833	else
3807	XDeleteProperty (disp, parent[0],	3834	XDeleteProperty (dpy, parent[0],
3808	display->atom (str));	3835	display->atom (str));
3809	}	3836	}
3810	break;	3837	break;
3811		3838
3812	case XTerm_Color:	3839	case XTerm_Color:
…		…
3822	break;	3849	break;
3823		3850
3824	if ((buf = strchr (name, ';')) != NULL)	3851	if ((buf = strchr (name, ';')) != NULL)
3825	*buf++ = '\0';	3852	*buf++ = '\0';
3826		3853
3827	if (name[0] == '?' && !name[1])	3854	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	}	3855	}
3836	break;	3856	break;
3837	case XTerm_Color00:	3857	case XTerm_Color00:
3838	process_color_seq (XTerm_Color00, Color_fg, str, resp);	3858	process_color_seq (op, Color_fg, str, resp);
3839	break;	3859	break;
3840	case XTerm_Color01:	3860	case XTerm_Color01:
3841	process_color_seq (XTerm_Color01, Color_bg, str, resp);	3861	process_color_seq (op, Color_bg, str, resp);
3842	break;	3862	break;
3843	#ifndef NO_CURSORCOLOR	3863	#ifndef NO_CURSORCOLOR
3844	case XTerm_Color_cursor:	3864	case XTerm_Color_cursor:
3845	process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);	3865	process_color_seq (op, Color_cursor, str, resp);
3846	break;	3866	break;
3847	#endif	3867	#endif
3848	case XTerm_Color_pointer_fg:	3868	case XTerm_Color_pointer_fg:
3849	process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);	3869	process_color_seq (op, Color_pointer_fg, str, resp);
3850	break;	3870	break;
3851	case XTerm_Color_pointer_bg:	3871	case XTerm_Color_pointer_bg:
3852	process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);	3872	process_color_seq (op, Color_pointer_bg, str, resp);
3853	break;	3873	break;
3854	#ifndef NO_BOLD_UNDERLINE_REVERSE	3874	#ifndef NO_BOLD_UNDERLINE_REVERSE
3855	case XTerm_Color_RV:	3875	case XTerm_Color_RV:
3856	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3876	process_color_seq (op, Color_RV, str, resp);
3857	break;	3877	break;
3858	case Rxvt_Color_BD:	3878	case Rxvt_Color_BD:
3859	case URxvt_Color_BD:	3879	case URxvt_Color_BD:
3860	process_color_seq (op, Color_BD, str, resp);	3880	process_color_seq (op, Color_BD, str, resp);
3861	break;	3881	break;
3862	case Rxvt_Color_UL:	3882	case Rxvt_Color_UL:
3863	case URxvt_Color_UL:	3883	case URxvt_Color_UL:
3864	process_color_seq (op, Color_UL, str, resp);	3884	process_color_seq (op, Color_UL, str, resp);
3865	break;	3885	break;
3866	case URxvt_Color_IT:	3886	case URxvt_Color_IT:
3867	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);	3887	process_color_seq (op, Color_IT, str, resp);
3868	break;	3888	break;
3869	#endif	3889	#endif
3870	#if TRANSPARENT && TINTING	3890	#if TRANSPARENT && TINTING
3871	case URxvt_Color_tint:	3891	case URxvt_Color_tint:
3872	process_color_seq (URxvt_Color_tint, Color_tint, str, resp);	3892	process_color_seq (op, Color_tint, str, resp);
		3893
3873	check_our_parents ();	3894	check_our_parents ();
		3895
3874	if (am_transparent)	3896	if (am_transparent)
3875	want_full_refresh = want_refresh = 1;	3897	want_full_refresh = want_refresh = 1;
		3898
3876	break;	3899	break;
3877	#endif	3900	#endif
3878		3901
3879	case Rxvt_Pixmap:	3902	case Rxvt_Pixmap:
3880	{	3903	{
…		…
3938	case URxvt_italicFont:	3961	case URxvt_italicFont:
3939	case URxvt_boldItalicFont:	3962	case URxvt_boldItalicFont:
3940	#endif	3963	#endif
3941	if (query)	3964	if (query)
3942	tt_printf ("\33]%d;%-.250s%c", saveop,	3965	tt_printf ("\33]%d;%-.250s%c", saveop,
3943	OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc	3966	option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3944	? fontset[op - URxvt_font]->fontdesc : "",	3967	? fontset[op - URxvt_font]->fontdesc : "",
3945	resp);	3968	resp);
3946	else	3969	else
3947	{	3970	{
3948	const char *&res = rs[Rs_font + (op - URxvt_font)];	3971	const char *&res = rs[Rs_font + (op - URxvt_font)];
…		…
3951	allocated.push_back ((void *)res);	3974	allocated.push_back ((void *)res);
3952	set_fonts ();	3975	set_fonts ();
3953	}	3976	}
3954	break;	3977	break;
3955		3978
3956	#if ENABLE_FRILLS	3979	case URxvt_version:
		3980	if (query)
		3981	tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
		3982	op,
		3983	rs[Rs_name], VERSION[0], VERSION[2],
		3984	resp);
		3985	break;
		3986
		3987	#if !ENABLE_MINIMAL
3957	case URxvt_locale:	3988	case URxvt_locale:
3958	if (query)	3989	if (query)
3959	tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);	3990	tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3960	else	3991	else
3961	{	3992	{
3962	set_locale (str);	3993	set_locale (str);
3963	pty->set_utf8_mode (enc_utf8);	3994	pty->set_utf8_mode (enc_utf8);
3964	init_xlocale ();	3995	init_xlocale ();
…		…
3979	break;	4010	break;
3980	#endif	4011	#endif
3981		4012
3982	#if ENABLE_PERL	4013	#if ENABLE_PERL
3983	case URxvt_perl:	4014	case URxvt_perl:
3984	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))	4015	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3985	; // no responses yet	4016	; // no responses yet
3986	break;	4017	break;
3987	#endif	4018	#endif
3988	}	4019	}
3989	}	4020	}
…		…
4105	scr_touch (true);	4136	scr_touch (true);
4106	break;	4137	break;
4107	#endif	4138	#endif
4108	case 1048: /* alternative cursor save */	4139	case 1048: /* alternative cursor save */
4109	case 1049:	4140	case 1049:
4110	if (OPTION (Opt_secondaryScreen))	4141	if (option (Opt_secondaryScreen))
4111	if (mode == 0)	4142	if (mode == 0)
4112	scr_cursor (RESTORE);	4143	scr_cursor (RESTORE);
4113	else if (mode == 1)	4144	else if (mode == 1)
4114	scr_cursor (SAVE);	4145	scr_cursor (SAVE);
4115	break;	4146	break;
…		…
4180	break;	4211	break;
4181	case 1011: /* scroll to bottom on key press */	4212	case 1011: /* scroll to bottom on key press */
4182	set_option (Opt_scrollTtyKeypress, state);	4213	set_option (Opt_scrollTtyKeypress, state);
4183	break;	4214	break;
4184	case 1047: /* secondary screen w/ clearing last */	4215	case 1047: /* secondary screen w/ clearing last */
4185	if (OPTION (Opt_secondaryScreen))	4216	if (option (Opt_secondaryScreen))
4186	if (current_screen != PRIMARY)	4217	if (current_screen != PRIMARY)
4187	scr_erase_screen (2);	4218	scr_erase_screen (2);
4188	scr_change_screen (state);	4219	scr_change_screen (state);
4189	break;	4220	break;
4190	case 1049: /* secondary screen w/ clearing first */	4221	case 1049: /* secondary screen w/ clearing first */
4191	scr_change_screen (state);	4222	scr_change_screen (state);
4192	if (OPTION (Opt_secondaryScreen))	4223	if (option (Opt_secondaryScreen))
4193	if (current_screen != PRIMARY)	4224	if (current_screen != PRIMARY)
4194	scr_erase_screen (2);	4225	scr_erase_screen (2);
4195	break;	4226	break;
4196	default:	4227	default:
4197	break;	4228	break;
…		…
4325	scr_color (Color_bg, Color_bg);	4356	scr_color (Color_bg, Color_bg);
4326	break;	4357	break;
4327		4358
4328	//case 50: // not variable spacing	4359	//case 50: // not variable spacing
4329		4360
4330	#if ENABLE_FRILLS	4361	#if !ENABLE_MINIMAL
4331	case 90:	4362	case 90:
4332	case 91: /* set bright fg color */	4363	case 91: /* set bright fg color */
4333	case 92:	4364	case 92:
4334	case 93:	4365	case 93:
4335	case 94:	4366	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.321 by root, Tue May 1 21:30:01 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.321 by root, Tue May 1 21:30:01 2007 UTC