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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.283 by root, Tue Jan 24 19:40:12 2006 UTC vs.
Revision 1.322 by ayin, Wed May 2 23:06:32 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	int valid_keysym;	309	int valid_keysym;
305	char kbuf[KBUFSZ];	310	char kbuf[KBUFSZ];
		311
		312	#if ISO_14755
		313	if (iso14755buf & ISO_14755_52)
		314	return;
		315	#endif
306		316
307	/*	317	/*
308	* 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
309	* escape sequence to toggle the Keypad.	319	* escape sequence to toggle the Keypad.
310	*	320	*
…		…
867	return;	877	return;
868		878
869	if (len <= 0)	879	if (len <= 0)
870	return; /* not mapped */	880	return; /* not mapped */
871		881
872	if (OPTION (Opt_scrollTtyKeypress))	882	if (option (Opt_scrollTtyKeypress))
873	if (view_start)	883	if (view_start)
874	{	884	{
875	view_start = 0;	885	view_start = 0;
876	want_refresh = 1;	886	want_refresh = 1;
877	}	887	}
…		…
901	tt_write (&ch, 1);	911	tt_write (&ch, 1);
902	}	912	}
903		913
904	tt_write (kbuf, (unsigned int)len);	914	tt_write (kbuf, (unsigned int)len);
905	}	915	}
906	/}}} /	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	}
907		993
908	#if defined (KEYSYM_RESOURCE)	994	#if defined (KEYSYM_RESOURCE)
909	unsigned int	995	unsigned int
910	rxvt_term::cmd_write (const char *str, unsigned int count)	996	rxvt_term::cmd_write (const char *str, unsigned int count)
911	{	997	{
…		…
1088	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1174	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1089	}	1175	}
1090	}	1176	}
1091	#endif	1177	#endif
1092		1178
1093	#if HAVE_SCHED_YIELD	1179	#if LINUX_YIELD_HACK
1094	static struct event_handler	1180	static struct event_handler
1095	{	1181	{
1096	check_watcher cw_yield;	1182	check_watcher yield_ev;
1097		1183
1098	void yield (check_watcher &w)	1184	void yield_cb (check_watcher &w)
1099	{	1185	{
1100	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
1101	w.stop ();	1194	w.stop ();
1102	}	1195	}
1103		1196
1104	event_handler ()	1197	event_handler ()
1105	: cw_yield (this, &event_handler::yield)	1198	: yield_ev (this, &event_handler::yield_cb)
1106	{	1199	{
1107	}	1200	}
1108	} event_handler;	1201	} event_handler;
1109	#endif	1202	#endif
1110		1203
…		…
1130	cmdbuf_endp += r;	1223	cmdbuf_endp += r;
1131	return true;	1224	return true;
1132	}	1225	}
1133	else if (r < 0 && (errno == EAGAIN \|\| errno == EINTR))	1226	else if (r < 0 && (errno == EAGAIN \|\| errno == EINTR))
1134	{	1227	{
1135	#if HAVE_SCHED_YIELD	1228	#if LINUX_YIELD_HACK
1136	if (display->is_local)	1229	if (display->is_local)
1137	event_handler.cw_yield.start ();	1230	event_handler.yield_ev.start ();
1138	#endif	1231	#endif
1139	}	1232	}
1140	else	1233	else
1141	{	1234	{
1142	pty_ev.stop ();	1235	pty_ev.stop ();
1143		1236
1144	if (!OPTION (Opt_hold))	1237	if (!option (Opt_hold))
1145	destroy ();	1238	destroy ();
1146	}	1239	}
1147		1240
1148	return false;	1241	return false;
1149	}	1242	}
…		…
1164	}	1257	}
1165		1258
1166	void	1259	void
1167	rxvt_term::pointer_unblank ()	1260	rxvt_term::pointer_unblank ()
1168	{	1261	{
1169	XDefineCursor (display->display, vt, TermWin_cursor);	1262	XDefineCursor (dpy, vt, TermWin_cursor);
1170	recolour_cursor ();	1263	recolour_cursor ();
1171		1264
1172	#ifdef POINTER_BLANK	1265	#ifdef POINTER_BLANK
1173	hidden_pointer = 0;	1266	hidden_pointer = 0;
1174		1267
1175	if (OPTION (Opt_pointerBlank))	1268	if (option (Opt_pointerBlank))
1176	pointer_ev.start (NOW + pointerBlankDelay);	1269	pointer_ev.start (NOW + pointerBlankDelay);
1177	#endif	1270	#endif
1178	}	1271	}
1179		1272
1180	#ifdef POINTER_BLANK	1273	#ifdef POINTER_BLANK
1181	void	1274	void
1182	rxvt_term::pointer_blank ()	1275	rxvt_term::pointer_blank ()
1183	{	1276	{
1184	if (!OPTION (Opt_pointerBlank))	1277	if (!option (Opt_pointerBlank))
1185	return;	1278	return;
1186		1279
1187	XDefineCursor (display->display, vt, display->blank_cursor);	1280	XDefineCursor (dpy, vt, display->blank_cursor);
1188	XFlush (display->display);	1281	XFlush (dpy);
1189		1282
1190	hidden_pointer = 1;	1283	hidden_pointer = 1;
1191	}	1284	}
1192		1285
1193	void	1286	void
…		…
1266	(32 + button_number + key_state),	1359	(32 + button_number + key_state),
1267	(32 + x + 1),	1360	(32 + x + 1),
1268	(32 + y + 1));	1361	(32 + y + 1));
1269	}	1362	}
1270		1363
1271	#ifdef USING_W11LIB
1272	void
1273	rxvt_W11_process_x_event (XEvent *ev)
1274	{
1275	rxvt_t *r = rxvt_get_r ();
1276
1277	x_cb (*ev);
1278	}
1279	#endif
1280
1281	/{{{ process an X event /	1364	/{{{ process an X event /
1282	void	1365	void
1283	rxvt_term::x_cb (XEvent &ev)	1366	rxvt_term::x_cb (XEvent &ev)
1284	{	1367	{
1285	make_current ();	1368	make_current ();
1286		1369
1287	dDisp;	1370	dLocal (Display *, dpy);
1288		1371
1289	if (ev.xany.window == vt	1372	if (ev.xany.window == vt
1290	&& SHOULD_INVOKE (HOOK_X_EVENT)	1373	&& SHOULD_INVOKE (HOOK_X_EVENT)
1291	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))	1374	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1292	return;	1375	return;
…		…
1297	unsigned int unused_mask;	1380	unsigned int unused_mask;
1298		1381
1299	switch (ev.type)	1382	switch (ev.type)
1300	{	1383	{
1301	case KeyPress:	1384	case KeyPress:
1302	#if ISO_14755	1385	key_press (ev.xkey);
1303	if (!(iso14755buf & ISO_14755_52))
1304	#endif
1305	lookup_key (ev.xkey);
1306
1307	break;	1386	break;
1308		1387
1309	case KeyRelease:	1388	case KeyRelease:
1310	{	1389	key_release (ev.xkey);
1311	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ISO_14755 \|\| ENABLE_PERL
1312	KeySym keysym;
1313
1314	keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1315	#endif
1316
1317	#if ENABLE_FRILLS \|\| ISO_14755
1318	// ISO 14755 support
1319	if (iso14755buf)
1320	if (iso14755buf & ISO_14755_52)
1321	{
1322	# if ENABLE_OVERLAY
1323	scr_overlay_off ();
1324	# endif
1325	# if ISO_14755
1326	// iso14755 part 5.2 handling: release time
1327	// first: controls
1328	if ((ev.xkey.state & ControlMask)
1329	&& ((keysym >= 0x40 && keysym <= 0x5f)
1330	\|\| (keysym >= 0x61 && keysym <= 0x7f)))
1331	{
1332	iso14755buf = ISO_14755_51 \| 0x2400 \| (keysym & 0x1f);
1333	commit_iso14755 ();
1334	goto skip_switch;
1335	}
1336
1337	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1338	if (i[0] == keysym)
1339	{
1340	iso14755buf = ISO_14755_51 \| i[1];
1341	commit_iso14755 ();
1342	goto skip_switch;
1343	}
1344
1345	scr_bell ();
1346	# endif
1347	iso14755buf = 0;
1348	break;
1349	}
1350	else if ((ev.xkey.state & (ShiftMask \| ControlMask)) != (ShiftMask \| ControlMask))
1351	{
1352	# if ENABLE_OVERLAY
1353	scr_overlay_off ();
1354	# endif
1355	if (iso14755buf & ISO_14755_51)
1356	commit_iso14755 ();
1357	#if ISO_14755
1358	else if (iso14755buf & ISO_14755_STARTED)
1359	{
1360	iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1361
1362	scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1363	scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1364	}
1365	# endif
1366	else
1367	iso14755buf = 0;
1368	}
1369	#endif
1370
1371	if (ev.xany.window == vt
1372	&& HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1373	break;
1374
1375	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1376	if (!(ev.xkey.state & ControlMask))
1377	slip_wheel_ev.stop ();
1378	else if (keysym == XK_Control_L \|\| keysym == XK_Control_R)
1379	mouse_slip_wheel_speed = 0;
1380	#endif
1381	break;	1390	break;
1382	}
1383		1391
1384	case ButtonPress:	1392	case ButtonPress:
1385	button_press (ev.xbutton);	1393	button_press (ev.xbutton);
1386	break;	1394	break;
1387		1395
…		…
1402	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)))
1403	destroy ();	1411	destroy ();
1404	}	1412	}
1405	#if ENABLE_EWMH	1413	#if ENABLE_EWMH
1406	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])
1407	XSendEvent (disp, ev.xclient.window = display->root,	1415	XSendEvent (dpy, ev.xclient.window = display->root,
1408	False, SubstructureRedirectMask \| SubstructureNotifyMask,	1416	False, SubstructureRedirectMask \| SubstructureNotifyMask,
1409	&ev);	1417	&ev);
1410	#endif	1418	#endif
1411	}	1419	}
1412	}	1420	}
…		…
1450	break;	1458	break;
1451	}	1459	}
1452	break;	1460	break;
1453		1461
1454	case FocusIn:	1462	case FocusIn:
		1463	if (ev.xfocus.detail != NotifyInferior
		1464	&& ev.xfocus.detail != NotifyPointer
		1465	&& ev.xfocus.mode != NotifyGrab)
1455	focus_in ();	1466	focus_in ();
1456	break;	1467	break;
1457		1468
1458	case FocusOut:	1469	case FocusOut:
		1470	if (ev.xfocus.detail != NotifyInferior
		1471	&& ev.xfocus.detail != NotifyPointer
		1472	&& ev.xfocus.mode != NotifyGrab)
1459	focus_out ();	1473	focus_out ();
1460	break;	1474	break;
1461		1475
1462	case ConfigureNotify:	1476	case ConfigureNotify:
1463	if (ev.xconfigure.window == parent[0])	1477	if (ev.xconfigure.window == parent[0])
1464	{	1478	{
1465	while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))	1479	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1466	;	1480	;
1467		1481
1468	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)	1482	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)
1469	{	1483	{
1470	seen_resize = 1;	1484	seen_resize = 1;
1471	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1485	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1472	}	1486	}
1473		1487
1474	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));	1488	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1475		1489
1476	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */	1490	#ifdef TRANSPARENT
1477	if (OPTION (Opt_transparent))	1491	if (option (Opt_transparent))
1478	check_our_parents ();	1492	check_our_parents ();
1479	#endif	1493	#endif
1480	}	1494	}
1481	break;	1495	break;
1482		1496
…		…
1528	if (ev.xany.window == vt)	1542	if (ev.xany.window == vt)
1529	{	1543	{
1530	do	1544	do
1531	scr_expose (ev.xexpose.x, ev.xexpose.y,	1545	scr_expose (ev.xexpose.x, ev.xexpose.y,
1532	ev.xexpose.width, ev.xexpose.height, False);	1546	ev.xexpose.width, ev.xexpose.height, False);
1533	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));	1547	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1534		1548
1535	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1549	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1536		1550
1537	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))	1551	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1538	scr_expose (ev.xexpose.x, ev.xexpose.y,	1552	scr_expose (ev.xexpose.x, ev.xexpose.y,
1539	ev.xexpose.width, ev.xexpose.height, False);	1553	ev.xexpose.width, ev.xexpose.height, False);
1540		1554
1541	want_refresh = 1;	1555	want_refresh = 1;
1542	}	1556	}
1543	else	1557	else
1544	{	1558	{
1545	XEvent unused_event;	1559	XEvent unused_event;
1546		1560
1547	while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))	1561	while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1548	;	1562	;
1549	while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))	1563	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1550	;	1564	;
1551		1565
1552	if (isScrollbarWindow (ev.xany.window))	1566	if (isScrollbarWindow (ev.xany.window))
1553	{	1567	{
1554	scrollBar.setIdle ();	1568	scrollBar.setIdle ();
1555	scrollbar_show (0);	1569	scrollbar_show (0);
1556	}	1570	}
1557		1571
1558	#ifdef TRANSPARENT	1572	#ifdef TRANSPARENT
1559	if (am_transparent && ev.xany.window == parent[0])	1573	if (am_transparent && ev.xany.window == parent[0])
1560	XClearWindow (disp, ev.xany.window);	1574	XClearWindow (dpy, ev.xany.window);
1561	#endif	1575	#endif
1562	}	1576	}
1563	break;	1577	break;
1564		1578
1565	case MotionNotify:	1579	case MotionNotify:
…		…
1575	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)	1589	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1576	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))	1590	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1577	; // nop	1591	; // nop
1578	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))	1592	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))
1579	{	1593	{
1580	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))	1594	while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1581	;	1595	;
1582		1596
1583	XQueryPointer (disp, vt,	1597	XQueryPointer (dpy, vt,
1584	&unused_root, &unused_child,	1598	&unused_root, &unused_child,
1585	&unused_root_x, &unused_root_y,	1599	&unused_root_x, &unused_root_y,
1586	&ev.xbutton.x, &ev.xbutton.y,	1600	&ev.xbutton.x, &ev.xbutton.y,
1587	&ev.xbutton.state);	1601	&ev.xbutton.state);
1588	#ifdef MOUSE_THRESHOLD	1602	#ifdef MOUSE_THRESHOLD
…		…
1652	#endif	1666	#endif
1653	}	1667	}
1654	}	1668	}
1655	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1669	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1656	{	1670	{
1657	while (XCheckTypedWindowEvent (disp, scrollBar.win,	1671	while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1658	MotionNotify, &ev))	1672	MotionNotify, &ev))
1659	;	1673	;
1660		1674
1661	XQueryPointer (disp, scrollBar.win,	1675	XQueryPointer (dpy, scrollBar.win,
1662	&unused_root, &unused_child,	1676	&unused_root, &unused_child,
1663	&unused_root_x, &unused_root_y,	1677	&unused_root_x, &unused_root_y,
1664	&ev.xbutton.x, &ev.xbutton.y,	1678	&ev.xbutton.x, &ev.xbutton.y,
1665	&unused_mask);	1679	&unused_mask);
1666	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1680	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
…		…
1670	scrollbar_show (1);	1684	scrollbar_show (1);
1671	}	1685	}
1672	break;	1686	break;
1673	}	1687	}
1674		1688
1675	skip_switch: ;
1676
1677	#if defined(CURSOR_BLINK)	1689	#if defined(CURSOR_BLINK)
1678	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)	1690	if (option (Opt_cursorBlink) && ev.type == KeyPress)
1679	{	1691	{
1680	if (hidden_cursor)	1692	if (hidden_cursor)
1681	{	1693	{
1682	hidden_cursor = 0;	1694	hidden_cursor = 0;
1683	want_refresh = 1;	1695	want_refresh = 1;
…		…
1686	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);	1698	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1687	}	1699	}
1688	#endif	1700	#endif
1689		1701
1690	#if defined(POINTER_BLANK)	1702	#if defined(POINTER_BLANK)
1691	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)	1703	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1692	{	1704	{
1693	if (ev.type == MotionNotify	1705	if (ev.type == MotionNotify
1694	\|\| ev.type == ButtonPress	1706	\|\| ev.type == ButtonPress
1695	\|\| ev.type == ButtonRelease)	1707	\|\| ev.type == ButtonRelease)
1696	if (hidden_pointer)	1708	if (hidden_pointer)
…		…
1708	if (!focus)	1720	if (!focus)
1709	{	1721	{
1710	focus = 1;	1722	focus = 1;
1711	want_refresh = 1;	1723	want_refresh = 1;
1712		1724
1713	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));	1725	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1714		1726
1715	#if USE_XIM	1727	#if USE_XIM
1716	if (Input_Context != NULL)	1728	if (Input_Context != NULL)
1717	{	1729	{
1718	IMSetStatusPosition ();	1730	IMSetPosition ();
1719	XSetICFocus (Input_Context);	1731	XSetICFocus (Input_Context);
1720	}	1732	}
1721	#endif	1733	#endif
1722	#if CURSOR_BLINK	1734	#if CURSOR_BLINK
1723	if (OPTION (Opt_cursorBlink))	1735	if (option (Opt_cursorBlink))
1724	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);	1736	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1725	#endif	1737	#endif
1726	#if OFF_FOCUS_FADING	1738	#if OFF_FOCUS_FADING
1727	if (rs[Rs_fade])	1739	if (rs[Rs_fade])
1728	{	1740	{
1729	pix_colors = pix_colors_focused;	1741	pix_colors = pix_colors_focused;
1730	scr_recolour ();	1742	scr_recolour ();
		1743	}
		1744	#endif
		1745	#if ENABLE_FRILLS
		1746	if (option (Opt_urgentOnBell))
		1747	{
		1748	XWMHints *h;
		1749
		1750	h = XGetWMHints(dpy, parent[0]);
		1751	if (h != NULL)
		1752	{
		1753	h->flags &= ~XUrgencyHint;
		1754	XSetWMHints(dpy, parent[0], h);
		1755	}
1731	}	1756	}
1732	#endif	1757	#endif
1733	}	1758	}
1734	}	1759	}
1735		1760
…		…
1755	#if USE_XIM	1780	#if USE_XIM
1756	if (Input_Context != NULL)	1781	if (Input_Context != NULL)
1757	XUnsetICFocus (Input_Context);	1782	XUnsetICFocus (Input_Context);
1758	#endif	1783	#endif
1759	#if CURSOR_BLINK	1784	#if CURSOR_BLINK
1760	if (OPTION (Opt_cursorBlink))	1785	if (option (Opt_cursorBlink))
1761	cursor_blink_ev.stop ();	1786	cursor_blink_ev.stop ();
1762	hidden_cursor = 0;	1787	hidden_cursor = 0;
1763	#endif	1788	#endif
1764	#if OFF_FOCUS_FADING	1789	#if OFF_FOCUS_FADING
1765	if (rs[Rs_fade])	1790	if (rs[Rs_fade])
…		…
1769	}	1794	}
1770	#endif	1795	#endif
1771	}	1796	}
1772	}	1797	}
1773		1798
1774	#if TRANSPARENT	1799	void
		1800	rxvt_term::update_fade_color (unsigned int idx)
		1801	{
		1802	#if OFF_FOCUS_FADING
		1803	if (rs[Rs_fade])
		1804	{
		1805	rgba c;
		1806	pix_colors [Color_fade].get (c);
		1807	pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
		1808	}
		1809	#endif
		1810	}
		1811
		1812	#if TRANSPARENT \|\| ENABLE_PERL
1775	void	1813	void
1776	rxvt_term::rootwin_cb (XEvent &ev)	1814	rxvt_term::rootwin_cb (XEvent &ev)
1777	{	1815	{
1778	make_current ();	1816	make_current ();
1779		1817
		1818	if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
		1819	&& HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
		1820	return;
		1821
		1822	# if TRANSPARENT
1780	switch (ev.type)	1823	switch (ev.type)
1781	{	1824	{
1782	case PropertyNotify:	1825	case PropertyNotify:
1783	/*	1826	/*
1784	* if user used some Esetroot compatible prog to set the root bg,	1827	* if user used some Esetroot compatible prog to set the root bg,
…		…
1788	&& ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])	1831	&& ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1789	return;	1832	return;
1790		1833
1791	/* FALLTHROUGH */	1834	/* FALLTHROUGH */
1792	case ReparentNotify:	1835	case ReparentNotify:
1793	if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)	1836	if (option (Opt_transparent) && check_our_parents () && am_transparent)
1794	want_refresh = want_full_refresh = 1;	1837	want_refresh = want_full_refresh = 1;
1795	break;	1838	break;
1796	}	1839	}
		1840	# endif
1797	}	1841	}
1798	#endif	1842	#endif
1799		1843
1800	void	1844	void
1801	rxvt_term::button_press (XButtonEvent &ev)	1845	rxvt_term::button_press (XButtonEvent &ev)
…		…
2129	selection_make (ev.time);	2173	selection_make (ev.time);
2130	break;	2174	break;
2131		2175
2132	case Button2:	2176	case Button2:
2133	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?	2177	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2134	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);	2178	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2135	break;	2179	break;
2136		2180
2137	#ifdef MOUSE_WHEEL	2181	#ifdef MOUSE_WHEEL
2138	case Button4:	2182	case Button4:
2139	case Button5:	2183	case Button5:
…		…
2143		2187
2144	v = ev.button == Button4 ? UP : DN;	2188	v = ev.button == Button4 ? UP : DN;
2145		2189
2146	if (ev.state & ShiftMask)	2190	if (ev.state & ShiftMask)
2147	i = 1;	2191	i = 1;
2148	else if (OPTION (Opt_mouseWheelScrollPage))	2192	else if (option (Opt_mouseWheelScrollPage))
2149	i = nrow - 1;	2193	i = nrow - 1;
2150	else	2194	else
2151	i = 5;	2195	i = 5;
2152		2196
2153	# ifdef MOUSE_SLIP_WHEELING	2197	# ifdef MOUSE_SLIP_WHEELING
…		…
2181	#if TINTING	2225	#if TINTING
2182	/* taken from aterm-0.4.2 */	2226	/* taken from aterm-0.4.2 */
2183		2227
2184	typedef uint32_t RUINT32T;	2228	typedef uint32_t RUINT32T;
2185		2229
2186	void ShadeXImage(rxvt_display display, XImage srcImage, int shade, int rm, int gm, int bm)	2230	void ShadeXImage(rxvt_term term, XImage srcImage, int shade, int rm, int gm, int bm)
2187	{	2231	{
2188	int sh_r, sh_g, sh_b;	2232	int sh_r, sh_g, sh_b;
2189	RUINT32T mask_r, mask_g, mask_b;	2233	RUINT32T mask_r, mask_g, mask_b;
2190	RUINT32T lookup, lookup_r, lookup_g, lookup_b;	2234	RUINT32T lookup, lookup_r, lookup_g, lookup_b;
2191	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;	2235	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2192	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;	2236	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2193	int i;	2237	int i;
2194		2238
2195	Visual *visual = display->visual;	2239	Visual *visual = term->visual;
2196		2240
2197	if( visual->c_class != TrueColor \|\| srcImage->format != ZPixmap ) return ;	2241	if( visual->c_class != TrueColor \|\| srcImage->format != ZPixmap ) return ;
2198		2242
2199	/* for convenience */	2243	/* for convenience */
2200	mask_r = visual->red_mask;	2244	mask_r = visual->red_mask;
…		…
2421	Atom atype;	2465	Atom atype;
2422	unsigned char *prop = NULL;	2466	unsigned char *prop = NULL;
2423	Window root, oldp, *list;	2467	Window root, oldp, *list;
2424	Pixmap rootpixmap = None;	2468	Pixmap rootpixmap = None;
2425	XWindowAttributes wattr, wrootattr;	2469	XWindowAttributes wattr, wrootattr;
2426	dDisp;
2427		2470
2428	pchanged = 0;	2471	pchanged = 0;
2429		2472
2430	if (!OPTION (Opt_transparent))	2473	if (!option (Opt_transparent))
2431	return pchanged; /* Don't try any more */	2474	return pchanged; /* Don't try any more */
2432		2475
2433	XGetWindowAttributes (disp, display->root, &wrootattr);	2476	XGetWindowAttributes (dpy, display->root, &wrootattr);
2434	rootdepth = wrootattr.depth;	2477	rootdepth = wrootattr.depth;
2435		2478
2436	XGetWindowAttributes (disp, parent[0], &wattr);	2479	XGetWindowAttributes (dpy, parent[0], &wattr);
2437		2480
2438	if (rootdepth != wattr.depth)	2481	if (rootdepth != wattr.depth)
2439	{	2482	{
2440	if (am_transparent)	2483	if (am_transparent)
2441	{	2484	{
2442	pchanged = 1;	2485	pchanged = 1;
2443	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2486	XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2444	am_transparent = am_pixmap_trans = 0;	2487	am_transparent = am_pixmap_trans = 0;
2445	}	2488	}
2446		2489
2447	return pchanged; /* Don't try any more */	2490	return pchanged; /* Don't try any more */
2448	}	2491	}
2449		2492
2450	/* Get all X ops out of the queue so that our information is up-to-date. */	2493	/* Get all X ops out of the queue so that our information is up-to-date. */
2451	XSync (disp, False);	2494	XSync (dpy, False);
2452		2495
2453	/*	2496	/*
2454	* Make the frame window set by the window manager have	2497	* Make the frame window set by the window manager have
2455	* the root background. Some window managers put multiple nested frame	2498	* the root background. Some window managers put multiple nested frame
2456	* windows for each client, so we have to take care about that.	2499	* windows for each client, so we have to take care about that.
2457	*/	2500	*/
2458	i = (xa[XA_XROOTPMAP_ID]	2501	i = (xa[XA_XROOTPMAP_ID]
2459	&& XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],	2502	&& XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2460	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2503	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2461	&nitems, &bytes_after, &prop) == Success);	2504	&nitems, &bytes_after, &prop) == Success);
2462		2505
2463	if (!i \|\| prop == NULL)	2506	if (!i \|\| prop == NULL)
2464	i = (xa[XA_ESETROOT_PMAP_ID]	2507	i = (xa[XA_ESETROOT_PMAP_ID]
2465	&& XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],	2508	&& XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2466	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2509	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2467	&nitems, &bytes_after, &prop) == Success);	2510	&nitems, &bytes_after, &prop) == Success);
2468		2511
2469	if (!i \|\| prop == NULL	2512	if (!i \|\| prop == NULL
2470	#if TINTING	2513	#if TINTING
2471	\|\| !rs[Rs_color + Color_tint]	2514	\|\| !ISSET_PIXCOLOR (Color_tint)
2472	#endif	2515	#endif
2473	)	2516	)
2474	have_pixmap = 0;	2517	have_pixmap = 0;
2475	else	2518	else
2476	{	2519	{
…		…
2489	Window cr;	2532	Window cr;
2490	XImage *image;	2533	XImage *image;
2491	GC gc;	2534	GC gc;
2492	XGCValues gcvalue;	2535	XGCValues gcvalue;
2493		2536
2494	XTranslateCoordinates (disp, parent[0], display->root,	2537	XTranslateCoordinates (dpy, parent[0], display->root,
2495	0, 0, &sx, &sy, &cr);	2538	0, 0, &sx, &sy, &cr);
2496	nw = (unsigned int)szHint.width;	2539	nw = (unsigned int)szHint.width;
2497	nh = (unsigned int)szHint.height;	2540	nh = (unsigned int)szHint.height;
2498	nx = ny = 0;	2541	nx = ny = 0;
2499		2542
…		…
2512	}	2555	}
2513		2556
2514	min_it (nw, (unsigned int) (wrootattr.width - sx));	2557	min_it (nw, (unsigned int) (wrootattr.width - sx));
2515	min_it (nh, (unsigned int) (wrootattr.height - sy));	2558	min_it (nh, (unsigned int) (wrootattr.height - sy));
2516		2559
2517	XSync (disp, False);	2560	XSync (dpy, False);
2518	allowedxerror = -1;	2561	allowedxerror = -1;
2519	image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);	2562	image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2520		2563
2521	/* XXX: handle BadMatch - usually because we're outside the pixmap */	2564	/* XXX: handle BadMatch - usually because we're outside the pixmap */
2522	/* XXX: may need a delay here? */	2565	/* XXX: may need a delay here? */
2523	allowedxerror = 0;	2566	allowedxerror = 0;
2524		2567
…		…
2527	if (am_transparent && am_pixmap_trans)	2570	if (am_transparent && am_pixmap_trans)
2528	{	2571	{
2529	pchanged = 1;	2572	pchanged = 1;
2530	if (pixmap != None)	2573	if (pixmap != None)
2531	{	2574	{
2532	XFreePixmap (disp, pixmap);	2575	XFreePixmap (dpy, pixmap);
2533	pixmap = None;	2576	pixmap = None;
2534	}	2577	}
2535	}	2578	}
2536		2579
2537	am_pixmap_trans = 0;	2580	am_pixmap_trans = 0;
2538	}	2581	}
2539	else	2582	else
2540	{	2583	{
2541	if (pixmap != None)	2584	if (pixmap != None)
2542	XFreePixmap (disp, pixmap);	2585	XFreePixmap (dpy, pixmap);
2543		2586
2544	#if TINTING	2587	#if TINTING
2545	if (ISSET_PIXCOLOR (Color_tint))	2588	if (ISSET_PIXCOLOR (Color_tint))
2546	{	2589	{
2547	unsigned short rm, gm, bm;
2548	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;	2590	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2549		2591
		2592	rgba c;
2550	pix_colors_focused[Color_tint].get (display, rm, gm, bm);	2593	pix_colors_focused [Color_tint].get (c);
2551		2594
2552	ShadeXImage (display, image, shade, rm, gm, bm);	2595	ShadeXImage (this, image, shade, c.r, c.g, c.b);
2553	}	2596	}
2554	#endif	2597	#endif
2555		2598
2556	pixmap = XCreatePixmap (disp, vt,	2599	pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2557	szHint.width, szHint.height, image->depth);
2558	gc = XCreateGC (disp, vt, 0UL, &gcvalue);	2600	gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2559	XPutImage (disp, pixmap, gc, image, 0, 0,	2601	XPutImage (dpy, pixmap, gc, image, 0, 0,
2560	nx, ny, image->width, image->height);	2602	nx, ny, image->width, image->height);
2561	XFreeGC (disp, gc);	2603	XFreeGC (dpy, gc);
2562	XDestroyImage (image);	2604	XDestroyImage (image);
2563	XSetWindowBackgroundPixmap (disp, parent[0], pixmap);	2605	XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2564	XClearWindow (disp, parent[0]);	2606	XClearWindow (dpy, parent[0]);
2565		2607
2566	if (!am_transparent \|\| !am_pixmap_trans)	2608	if (!am_transparent \|\| !am_pixmap_trans)
2567	pchanged = 1;	2609	pchanged = 1;
2568		2610
2569	am_transparent = am_pixmap_trans = 1;	2611	am_transparent = am_pixmap_trans = 1;
2570	}	2612	}
2571	}	2613	}
2572		2614
2573	if (am_pixmap_trans)	2615	if (am_pixmap_trans)
2574	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2616	XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2575	else	2617	else
2576	{	2618	{
2577	unsigned int n;	2619	unsigned int n;
2578	/*	2620	/*
2579	* InheritPixmap transparency	2621	* InheritPixmap transparency
2580	*/	2622	*/
2581	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2623	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2582	{	2624	{
2583	oldp = parent[i];	2625	oldp = parent[i];
2584	XQueryTree (disp, parent[i - 1], &root,	2626	XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2585	&parent[i], &list, &n);
2586	XFree (list);	2627	XFree (list);
2587		2628
2588	if (parent[i] == display->root)	2629	if (parent[i] == display->root)
2589	{	2630	{
2590	if (oldp != None)	2631	if (oldp != None)
…		…
2598	}	2639	}
2599		2640
2600	n = 0;	2641	n = 0;
2601		2642
2602	if (pchanged)	2643	if (pchanged)
2603	{
2604	for (; n < (unsigned int)i; n++)	2644	for (; n < (unsigned int)i; n++)
2605	{	2645	{
2606	XGetWindowAttributes (disp, parent[n], &wattr);	2646	XGetWindowAttributes (dpy, parent[n], &wattr);
		2647
2607	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)	2648	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)
2608	{	2649	{
2609	n = (int) (sizeof (parent) / sizeof (Window)) + 1;	2650	n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2610	break;	2651	break;
2611	}	2652	}
2612	}	2653	}
2613	}
2614		2654
2615	if (n > (int) (sizeof (parent) / sizeof (parent[0])))	2655	if (n > (sizeof (parent) / sizeof (parent[0])))
2616	{	2656	{
2617	XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);	2657	XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2618	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2658	XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2619	am_transparent = 0;	2659	am_transparent = 0;
2620	/* XXX: also turn off Opt_transparent? */	2660	/* XXX: also turn off Opt_transparent? */
2621	}	2661	}
2622	else	2662	else
2623	{	2663	{
2624	for (n = 0; n < (unsigned int)i; n++)	2664	for (n = 0; n < (unsigned int)i; n++)
2625	{	2665	{
2626	XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);	2666	XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2627	XClearWindow (disp, parent[n]);	2667	XClearWindow (dpy, parent[n]);
2628	}	2668	}
2629		2669
2630	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2670	XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2631	am_transparent = 1;	2671	am_transparent = 1;
2632	}	2672	}
2633		2673
2634	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2674	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2635	parent[i] = None;	2675	parent[i] = None;
2636	}	2676	}
2637		2677
2638	if (scrollBar.win)	2678	if (scrollBar.win)
2639	{	2679	{
2640	XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);	2680	XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2641	scrollBar.setIdle ();	2681	scrollBar.setIdle ();
2642	scrollbar_show (0);	2682	scrollbar_show (0);
2643	}	2683	}
2644		2684
2645	if (am_transparent)	2685	if (am_transparent)
…		…
2708	if (ch == C0_LF)	2748	if (ch == C0_LF)
2709	nlines++;	2749	nlines++;
2710		2750
2711	refresh_count++;	2751	refresh_count++;
2712		2752
2713	if (!OPTION (Opt_jumpScroll)	2753	if (!option (Opt_jumpScroll)
2714	\|\| (refresh_count >= refresh_limit * (nrow - 1)))	2754	\|\| (refresh_count >= refresh_limit * (nrow - 1)))
2715	{	2755	{
2716	refreshnow = true;	2756	refreshnow = true;
2717	refresh_count = 0;	2757	refresh_count = 0;
2718	ch = NOCHAR;	2758	ch = NOCHAR;
…		…
2758	* the number of pages between refreshes is refresh_limit, which	2798	* the number of pages between refreshes is refresh_limit, which
2759	* is incremented here because we must be doing flat-out scrolling.	2799	* is incremented here because we must be doing flat-out scrolling.
2760	*/	2800	*/
2761	if (refreshnow)	2801	if (refreshnow)
2762	{	2802	{
2763	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)	2803	if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2764	refresh_limit++;	2804	refresh_limit++;
2765	else	2805	else
2766	{	2806	{
2767	flag = true;	2807	flag = true;
		2808	//TODO: due to popular request, implement "skipscroll" option here
2768	scr_refresh ();	2809	scr_refresh ();
2769	want_refresh = 1;	2810	want_refresh = 1;
2770	}	2811	}
2771	}	2812	}
2772		2813
…		…
3096	scr_charset_set (2, (unsigned int)cmd_getc ());	3137	scr_charset_set (2, (unsigned int)cmd_getc ());
3097	break;	3138	break;
3098	case '+':	3139	case '+':
3099	scr_charset_set (3, (unsigned int)cmd_getc ());	3140	scr_charset_set (3, (unsigned int)cmd_getc ());
3100	break;	3141	break;
3101	#if ENABLE_FRILLS	3142	#if !ENABLE_MINIMAL
3102	case '6':	3143	case '6':
3103	scr_backindex ();	3144	scr_backindex ();
3104	break;	3145	break;
3105	#endif	3146	#endif
3106	case '7':	3147	case '7':
3107	scr_cursor (SAVE);	3148	scr_cursor (SAVE);
3108	break;	3149	break;
3109	case '8':	3150	case '8':
3110	scr_cursor (RESTORE);	3151	scr_cursor (RESTORE);
3111	break;	3152	break;
3112	#if ENABLE_FRILLS	3153	#if !ENABLE_MINIMAL
3113	case '9':	3154	case '9':
3114	scr_forwardindex ();	3155	scr_forwardindex ();
3115	break;	3156	break;
3116	#endif	3157	#endif
3117	case '=':	3158	case '=':
…		…
3290	{	3331	{
3291	case '>':	3332	case '>':
3292	if (ch == CSI_DA) /* secondary device attributes */	3333	if (ch == CSI_DA) /* secondary device attributes */
3293	{	3334	{
3294	// first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,	3335	// first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3295	// 'U' for rxvt-unicode <= 7.2, and Mm85 (e.g. 7385 for 7.3) for later versions.	3336	// 'U' for rxvt-unicode != 7.[34] (where it was broken).
3296	//	3337	//
3297	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt	3338	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3298	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify	3339	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3299	// that we do not support xterm mouse reporting (should be 95 when we do).	3340	// that we do not support xterm mouse reporting (should be 95 when we do).
3300	//	3341	//
3301	tt_printf ("\033[>%c%c85;94;0c", VERSION[0], VERSION[1]);	3342	tt_printf ("\033[>%d;94;0c", 'U');
3302	}	3343	}
3303	break;	3344	break;
3304	case '?':	3345	case '?':
3305	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')	3346	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')
3306	process_terminal_mode (ch, priv, nargs, arg);	3347	process_terminal_mode (ch, priv, nargs, arg);
…		…
3433	break;	3474	break;
3434	case 6: /* CPR requested */	3475	case 6: /* CPR requested */
3435	scr_report_position ();	3476	scr_report_position ();
3436	break;	3477	break;
3437	case 7: /* unofficial extension */	3478	case 7: /* unofficial extension */
3438	if (OPTION (Opt_insecure))	3479	if (option (Opt_insecure))
3439	tt_printf ("%-.250s\012", rs[Rs_display_name]);	3480	tt_printf ("%-.250s\012", rs[Rs_display_name]);
3440	break;	3481	break;
3441	case 8: /* unofficial extension */	3482	case 8: /* unofficial extension */
3442	process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);	3483	process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3443	break;	3484	break;
…		…
3510	break;	3551	break;
3511	case CSI_75:	3552	case CSI_75:
3512	scr_cursor (RESTORE);	3553	scr_cursor (RESTORE);
3513	break;	3554	break;
3514		3555
3515	#if ENABLE_FRILLS	3556	#if !ENABLE_MINIMAL
3516	case CSI_74:	3557	case CSI_74:
3517	process_window_ops (arg, nargs);	3558	process_window_ops (arg, nargs);
3518	break;	3559	break;
3519	#endif	3560	#endif
3520		3561
…		…
3527	break;	3568	break;
3528	}	3569	}
3529	}	3570	}
3530	/}}} /	3571	/}}} /
3531		3572
3532	#if ENABLE_FRILLS	3573	#if !ENABLE_MINIMAL
3533	/* ARGSUSED */	3574	/* ARGSUSED */
3534	void	3575	void
3535	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3576	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3536	{	3577	{
3537	int x, y;	3578	int x, y;
3538	XWindowAttributes wattr;	3579	XWindowAttributes wattr;
3539	Window wdummy;	3580	Window wdummy;
3540	dDisp;	3581
		3582	dLocal (Display *, dpy);
3541		3583
3542	if (nargs == 0)	3584	if (nargs == 0)
3543	return;	3585	return;
3544		3586
3545	switch (args[0])	3587	switch (args[0])
3546	{	3588	{
3547	/*	3589	/*
3548	* commands	3590	* commands
3549	*/	3591	*/
3550	case 1: /* deiconify window */	3592	case 1: /* deiconify window */
3551	XMapWindow (disp, parent[0]);	3593	XMapWindow (dpy, parent[0]);
3552	break;	3594	break;
3553	case 2: /* iconify window */	3595	case 2: /* iconify window */
3554	XIconifyWindow (disp, parent[0], display->screen);	3596	XIconifyWindow (dpy, parent[0], display->screen);
3555	break;	3597	break;
3556	case 3: /* set position (pixels) */	3598	case 3: /* set position (pixels) */
3557	XMoveWindow (disp, parent[0], args[1], args[2]);	3599	XMoveWindow (dpy, parent[0], args[1], args[2]);
3558	break;	3600	break;
3559	case 4: /* set size (pixels) */	3601	case 4: /* set size (pixels) */
3560	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3602	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3561	break;	3603	break;
3562	case 5: /* raise window */	3604	case 5: /* raise window */
3563	XRaiseWindow (disp, parent[0]);	3605	XRaiseWindow (dpy, parent[0]);
3564	break;	3606	break;
3565	case 6: /* lower window */	3607	case 6: /* lower window */
3566	XLowerWindow (disp, parent[0]);	3608	XLowerWindow (dpy, parent[0]);
3567	break;	3609	break;
3568	case 7: /* refresh window */	3610	case 7: /* refresh window */
3569	scr_touch (true);	3611	scr_touch (true);
3570	break;	3612	break;
3571	case 8: /* set size (chars) */	3613	case 8: /* set size (chars) */
…		…
3578	if (args[0] >= 24) /* set height (chars) */	3620	if (args[0] >= 24) /* set height (chars) */
3579	set_widthheight ((unsigned int)width,	3621	set_widthheight ((unsigned int)width,
3580	(unsigned int) (args[1] * fheight));	3622	(unsigned int) (args[1] * fheight));
3581	break;	3623	break;
3582		3624
3583
3584	/*	3625	/*
3585	* reports - some output format copied from XTerm	3626	* reports - some output format copied from XTerm
3586	*/	3627	*/
3587	case 11: /* report window state */	3628	case 11: /* report window state */
3588	XGetWindowAttributes (disp, parent[0], &wattr);	3629	XGetWindowAttributes (dpy, parent[0], &wattr);
3589	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3630	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3590	break;	3631	break;
3591	case 13: /* report window position */	3632	case 13: /* report window position */
3592	XGetWindowAttributes (disp, parent[0], &wattr);	3633	XGetWindowAttributes (dpy, parent[0], &wattr);
3593	XTranslateCoordinates (disp, parent[0], wattr.root,	3634	XTranslateCoordinates (dpy, parent[0], wattr.root,
3594	-wattr.border_width, -wattr.border_width,	3635	-wattr.border_width, -wattr.border_width,
3595	&x, &y, &wdummy);	3636	&x, &y, &wdummy);
3596	tt_printf ("\033[3;%d;%dt", x, y);	3637	tt_printf ("\033[3;%d;%dt", x, y);
3597	break;	3638	break;
3598	case 14: /* report window size (pixels) */	3639	case 14: /* report window size (pixels) */
3599	XGetWindowAttributes (disp, parent[0], &wattr);	3640	XGetWindowAttributes (dpy, parent[0], &wattr);
3600	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3641	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3601	break;	3642	break;
3602	case 18: /* report text area size (chars) */	3643	case 18: /* report text area size (chars) */
3603	tt_printf ("\033[8;%d;%dt", nrow, ncol);	3644	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3604	break;	3645	break;
…		…
3606	tt_printf ("\033[9;%d;%dt", nrow, ncol);	3647	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3607	break;	3648	break;
3608	case 20: /* report icon label */	3649	case 20: /* report icon label */
3609	{	3650	{
3610	char *s;	3651	char *s;
3611	XGetIconName (disp, parent[0], &s);	3652	XGetIconName (dpy, parent[0], &s);
3612	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3653	tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3613	XFree (s);	3654	XFree (s);
3614	}	3655	}
3615	break;	3656	break;
3616	case 21: /* report window title */	3657	case 21: /* report window title */
3617	{	3658	{
3618	char *s;	3659	char *s;
3619	XFetchName (disp, parent[0], &s);	3660	XFetchName (dpy, parent[0], &s);
3620	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 */
3621	XFree (s);	3662	XFree (s);
3622	}	3663	}
3623	break;	3664	break;
3624	}	3665	}
3625	}	3666	}
…		…
3652	seen_esc = true;	3693	seen_esc = true;
3653	continue;	3694	continue;
3654	}	3695	}
3655	else if (ch == C0_BEL \|\| ch == CHAR_ST)	3696	else if (ch == C0_BEL \|\| ch == CHAR_ST)
3656	break;	3697	break;
		3698	else if (ch == C0_SYN)
		3699	ch = cmd_get8 ();
3657	else if (ch < 0x20)	3700	else if (ch < 0x20)
3658	return NULL; /* other control character - exit */	3701	return NULL; /* other control character - exit */
3659		3702
3660	seen_esc = false;	3703	seen_esc = false;
3661		3704
3662	if (n >= STRING_MAX - 1)	3705	if (n >= STRING_MAX - 1)
3663	// stop at some sane length	3706	// stop at some sane length
3664	return NULL;	3707	return NULL;
3665		3708
3666	if (ch == C0_SYN)
3667	string[n++] = cmd_get8 ();
3668	else
3669	string[n++] = ch;	3709	string[n++] = ch;
3670	}	3710	}
3671		3711
3672	string[n++] = '\0';	3712	string[n++] = '\0';
3673		3713
3674	ends_how = (ch == 0x5c ? C0_ESC : ch);	3714	ends_how = (ch == 0x5c ? C0_ESC : ch);
…		…
3725	void	3765	void
3726	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)	3766	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3727	{	3767	{
3728	if (str[0] == '?' && !str[1])	3768	if (str[0] == '?' && !str[1])
3729	{	3769	{
3730	unsigned short r, g, b;	3770	rgba c;
3731	pix_colors_focused[color].get (display, r, g, b);	3771	pix_colors_focused[color].get (c);
		3772
		3773	#if XFT
		3774	if (c.a != rgba::MAX_CC)
		3775	tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
		3776	else
		3777	#endif
3732	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);	3778	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3733	}	3779	}
3734	else	3780	else
3735	set_window_color (color, str);	3781	set_window_color (color, str);
3736	}	3782	}
3737		3783
…		…
3743	{	3789	{
3744	int color;	3790	int color;
3745	char buf, name;	3791	char buf, name;
3746	bool query = str[0] == '?' && !str[1];	3792	bool query = str[0] == '?' && !str[1];
3747	int saveop = op;	3793	int saveop = op;
3748	dDisp;	3794
		3795	dLocal (Display *, dpy);
3749		3796
3750	assert (str != NULL);	3797	assert (str != NULL);
		3798
		3799	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
		3800	return;
		3801
3751	switch (op)	3802	switch (op)
3752	{	3803	{
3753	case XTerm_name:	3804	case XTerm_name:
3754	set_title (str);	3805	set_title (str);
3755	/* FALLTHROUGH */	3806	/* FALLTHROUGH */
…		…
3769	unsigned long bytes_after;	3820	unsigned long bytes_after;
3770	unsigned char *value = 0;	3821	unsigned char *value = 0;
3771	const char *str = "";	3822	const char *str = "";
3772		3823
3773	if (prop	3824	if (prop
3774	&& XGetWindowProperty (disp, parent[0],	3825	&& XGetWindowProperty (dpy, parent[0],
3775	prop, 0, 1<<16, 0, AnyPropertyType,	3826	prop, 0, 1<<16, 0, AnyPropertyType,
3776	&actual_type, &actual_format,	3827	&actual_type, &actual_format,
3777	&nitems, &bytes_after, &value) == Success	3828	&nitems, &bytes_after, &value) == Success
3778	&& actual_type != None	3829	&& actual_type != None
3779	&& actual_format == 8)	3830	&& actual_format == 8)
3780	str = (const char *)(value);	3831	str = (const char *)(value);
3781		3832
3782	tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);	3833	tt_printf ("\033]%d;%s%c", op, str, resp);
3783		3834
3784	XFree (value);	3835	XFree (value);
3785	}	3836	}
3786	else	3837	else
3787	{	3838	{
…		…
3791	{	3842	{
3792	*eq = 0;	3843	*eq = 0;
3793	set_utf8_property (display->atom (str), eq + 1);	3844	set_utf8_property (display->atom (str), eq + 1);
3794	}	3845	}
3795	else	3846	else
3796	XDeleteProperty (disp, parent[0],	3847	XDeleteProperty (dpy, parent[0],
3797	display->atom (str));	3848	display->atom (str));
3798	}	3849	}
3799	break;	3850	break;
3800		3851
3801	case XTerm_Color:	3852	case XTerm_Color:
…		…
3811	break;	3862	break;
3812		3863
3813	if ((buf = strchr (name, ';')) != NULL)	3864	if ((buf = strchr (name, ';')) != NULL)
3814	*buf++ = '\0';	3865	*buf++ = '\0';
3815		3866
3816	if (name[0] == '?' && !name[1])	3867	process_color_seq (op, color, name, resp);
3817	{
3818	unsigned short r, g, b;
3819	pix_colors_focused[color].get (display, r, g, b);
3820	tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3821	}
3822	else
3823	set_window_color (color, name);
3824	}	3868	}
3825	break;	3869	break;
3826	case XTerm_Color00:	3870	case XTerm_Color00:
3827	process_color_seq (XTerm_Color00, Color_fg, str, resp);	3871	process_color_seq (op, Color_fg, str, resp);
3828	break;	3872	break;
3829	case XTerm_Color01:	3873	case XTerm_Color01:
3830	process_color_seq (XTerm_Color01, Color_bg, str, resp);	3874	process_color_seq (op, Color_bg, str, resp);
3831	break;	3875	break;
3832	#ifndef NO_CURSORCOLOR	3876	#ifndef NO_CURSORCOLOR
3833	case XTerm_Color_cursor:	3877	case XTerm_Color_cursor:
3834	process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);	3878	process_color_seq (op, Color_cursor, str, resp);
3835	break;	3879	break;
3836	#endif	3880	#endif
3837	case XTerm_Color_pointer_fg:	3881	case XTerm_Color_pointer_fg:
3838	process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);	3882	process_color_seq (op, Color_pointer_fg, str, resp);
3839	break;	3883	break;
3840	case XTerm_Color_pointer_bg:	3884	case XTerm_Color_pointer_bg:
3841	process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);	3885	process_color_seq (op, Color_pointer_bg, str, resp);
3842	break;	3886	break;
3843	#ifndef NO_BOLD_UNDERLINE_REVERSE	3887	#ifndef NO_BOLD_UNDERLINE_REVERSE
3844	case XTerm_Color_RV:	3888	case XTerm_Color_RV:
3845	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3889	process_color_seq (op, Color_RV, str, resp);
3846	break;	3890	break;
3847	case Rxvt_Color_BD:	3891	case Rxvt_Color_BD:
3848	case URxvt_Color_BD:	3892	case URxvt_Color_BD:
3849	process_color_seq (op, Color_BD, str, resp);	3893	process_color_seq (op, Color_BD, str, resp);
3850	break;	3894	break;
3851	case Rxvt_Color_UL:	3895	case Rxvt_Color_UL:
3852	case URxvt_Color_UL:	3896	case URxvt_Color_UL:
3853	process_color_seq (op, Color_UL, str, resp);	3897	process_color_seq (op, Color_UL, str, resp);
3854	break;	3898	break;
3855	case URxvt_Color_IT:	3899	case URxvt_Color_IT:
3856	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);	3900	process_color_seq (op, Color_IT, str, resp);
3857	break;	3901	break;
3858	#endif	3902	#endif
3859	#if TRANSPARENT && TINTING	3903	#if TRANSPARENT && TINTING
3860	case URxvt_Color_tint:	3904	case URxvt_Color_tint:
3861	process_color_seq (URxvt_Color_tint, Color_tint, str, resp);	3905	process_color_seq (op, Color_tint, str, resp);
		3906
3862	check_our_parents ();	3907	check_our_parents ();
		3908
3863	if (am_transparent)	3909	if (am_transparent)
3864	want_full_refresh = want_refresh = 1;	3910	want_full_refresh = want_refresh = 1;
		3911
3865	break;	3912	break;
3866	#endif	3913	#endif
3867		3914
3868	case Rxvt_Pixmap:	3915	case Rxvt_Pixmap:
3869	{	3916	{
…		…
3927	case URxvt_italicFont:	3974	case URxvt_italicFont:
3928	case URxvt_boldItalicFont:	3975	case URxvt_boldItalicFont:
3929	#endif	3976	#endif
3930	if (query)	3977	if (query)
3931	tt_printf ("\33]%d;%-.250s%c", saveop,	3978	tt_printf ("\33]%d;%-.250s%c", saveop,
3932	OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc	3979	option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3933	? fontset[op - URxvt_font]->fontdesc : "",	3980	? fontset[op - URxvt_font]->fontdesc : "",
3934	resp);	3981	resp);
3935	else	3982	else
3936	{	3983	{
3937	const char *&res = rs[Rs_font + (op - URxvt_font)];	3984	const char *&res = rs[Rs_font + (op - URxvt_font)];
…		…
3940	allocated.push_back ((void *)res);	3987	allocated.push_back ((void *)res);
3941	set_fonts ();	3988	set_fonts ();
3942	}	3989	}
3943	break;	3990	break;
3944		3991
3945	#if ENABLE_FRILLS	3992	case URxvt_version:
		3993	if (query)
		3994	tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
		3995	op,
		3996	rs[Rs_name], VERSION[0], VERSION[2],
		3997	resp);
		3998	break;
		3999
		4000	#if !ENABLE_MINIMAL
3946	case URxvt_locale:	4001	case URxvt_locale:
3947	if (query)	4002	if (query)
3948	tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);	4003	tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3949	else	4004	else
3950	{	4005	{
3951	set_locale (str);	4006	set_locale (str);
3952	pty->set_utf8_mode (enc_utf8);	4007	pty->set_utf8_mode (enc_utf8);
3953	init_xlocale ();	4008	init_xlocale ();
…		…
3968	break;	4023	break;
3969	#endif	4024	#endif
3970		4025
3971	#if ENABLE_PERL	4026	#if ENABLE_PERL
3972	case URxvt_perl:	4027	case URxvt_perl:
3973	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))	4028	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3974	; // no responses yet	4029	; // no responses yet
3975	break;	4030	break;
3976	#endif	4031	#endif
3977	}	4032	}
3978	}	4033	}
…		…
4094	scr_touch (true);	4149	scr_touch (true);
4095	break;	4150	break;
4096	#endif	4151	#endif
4097	case 1048: /* alternative cursor save */	4152	case 1048: /* alternative cursor save */
4098	case 1049:	4153	case 1049:
4099	if (OPTION (Opt_secondaryScreen))	4154	if (option (Opt_secondaryScreen))
4100	if (mode == 0)	4155	if (mode == 0)
4101	scr_cursor (RESTORE);	4156	scr_cursor (RESTORE);
4102	else if (mode == 1)	4157	else if (mode == 1)
4103	scr_cursor (SAVE);	4158	scr_cursor (SAVE);
4104	break;	4159	break;
…		…
4169	break;	4224	break;
4170	case 1011: /* scroll to bottom on key press */	4225	case 1011: /* scroll to bottom on key press */
4171	set_option (Opt_scrollTtyKeypress, state);	4226	set_option (Opt_scrollTtyKeypress, state);
4172	break;	4227	break;
4173	case 1047: /* secondary screen w/ clearing last */	4228	case 1047: /* secondary screen w/ clearing last */
4174	if (OPTION (Opt_secondaryScreen))	4229	if (option (Opt_secondaryScreen))
4175	if (current_screen != PRIMARY)	4230	if (current_screen != PRIMARY)
4176	scr_erase_screen (2);	4231	scr_erase_screen (2);
4177	scr_change_screen (state);	4232	scr_change_screen (state);
4178	break;	4233	break;
4179	case 1049: /* secondary screen w/ clearing first */	4234	case 1049: /* secondary screen w/ clearing first */
4180	scr_change_screen (state);	4235	scr_change_screen (state);
4181	if (OPTION (Opt_secondaryScreen))	4236	if (option (Opt_secondaryScreen))
4182	if (current_screen != PRIMARY)	4237	if (current_screen != PRIMARY)
4183	scr_erase_screen (2);	4238	scr_erase_screen (2);
4184	break;	4239	break;
4185	default:	4240	default:
4186	break;	4241	break;
…		…
4314	scr_color (Color_bg, Color_bg);	4369	scr_color (Color_bg, Color_bg);
4315	break;	4370	break;
4316		4371
4317	//case 50: // not variable spacing	4372	//case 50: // not variable spacing
4318		4373
4319	#if ENABLE_FRILLS	4374	#if !ENABLE_MINIMAL
4320	case 90:	4375	case 90:
4321	case 91: /* set bright fg color */	4376	case 91: /* set bright fg color */
4322	case 92:	4377	case 92:
4323	case 93:	4378	case 93:
4324	case 94:	4379	case 94:

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.283 by root, Tue Jan 24 19:40:12 2006 UTC vs. Revision 1.322 by ayin, Wed May 2 23:06:32 2007 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.283 by root, Tue Jan 24 19:40:12 2006 UTC vs.
Revision 1.322 by ayin, Wed May 2 23:06:32 2007 UTC