[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.323 by ayin, Mon May 28 18:38:03 2007 UTC

…		…
1	/---------------------------------C----------------------------------	1	/----------------------------------------------------------------------
2	* File: command.C	2	* File: command.C
3	----------------------------------------------------------------------	3	----------------------------------------------------------------------
4	*	4	*
5	* All portions of code are copyright by their respective author/s.	5	* All portions of code are copyright by their respective author/s.
6	* Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>	6	* Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
49	#include "rxvt.h"	49	#include "rxvt.h"
50	#include "rxvtperl.h"	50	#include "rxvtperl.h"
51	#include "version.h"	51	#include "version.h"
52	#include "command.h"	52	#include "command.h"
53		53
54	#if HAVE_SCHED_YIELD
55	#undef HAVE_SCHED_YIELD // disabled for the time being
56	//# include <sched.h>
57	#endif
58
59	#ifdef KEYSYM_RESOURCE	54	#ifdef KEYSYM_RESOURCE
60	# include "keyboard.h"	55	# include "keyboard.h"
61	#endif	56	#endif
62		57
63	#include <csignal>	58	#include <csignal>
		59
		60	#if LINUX_YIELD_HACK
		61	# include <ctime>
		62	#endif
64		63
65	/----------------------------------------------------------------------/	64	/----------------------------------------------------------------------/
66		65
67	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)	66	#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68		67
…		…
227	# if !UNICODE3	226	# if !UNICODE3
228	if (ch >= 0x10000)	227	if (ch >= 0x10000)
229	ch = 0xfffd;	228	ch = 0xfffd;
230	# endif	229	# endif
231	scr_overlay_set (11, y, ch, r);	230	scr_overlay_set (11, y, ch, r);
		231
		232	if (WCWIDTH (ch) >= 2)
232	scr_overlay_set (12, y, NOCHAR, r);	233	scr_overlay_set (12, y, NOCHAR, r);
233	}	234	}
234		235
		236	// {
		237	// char buf[4+4+3+1];
		238	// snprintf (buf, sizeof (buf), "(%.4d\|%.4d)", x, y);
		239	// scr_overlay_set (0, 0, buf);
		240	// }
235	scr_overlay_set (0, len , attr);	241	scr_overlay_set (0, len , attr);
236	scr_overlay_set (0, len + 1, fname);	242	scr_overlay_set (0, len + 1, fname);
237		243
238	free (fname);	244	free (fname);
239		245
…		…
292		298
293	return -1;	299	return -1;
294	}	300	}
295	#endif	301	#endif
296		302
297	/{{{ Convert the keypress event into a string /
298	void	303	void
299	rxvt_term::lookup_key (XKeyEvent &ev)	304	rxvt_term::key_press (XKeyEvent &ev)
300	{	305	{
301	int ctrl, meta, shft, len;	306	int ctrl, meta, shft, len;
302	unsigned int newlen;	307	unsigned int newlen;
303	KeySym keysym;	308	KeySym keysym;
304	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	*
…		…
487	{	497	{
488	commit_iso14755 ();	498	commit_iso14755 ();
489	iso14755buf = ISO_14755_51;	499	iso14755buf = ISO_14755_51;
490	# if ISO_14755	500	# if ISO_14755
491	iso14755_51 (0);	501	iso14755_51 (0);
		502	# endif
		503	return;
		504	}
		505	else if (keysym == XK_BackSpace)
		506	{
		507	iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) \| ISO_14755_51;
		508	# if ISO_14755
		509	iso14755_51 (iso14755buf & ISO_14755_MASK);
492	# endif	510	# endif
493	return;	511	return;
494	}	512	}
495	else if ((hv = hex_keyval (ev)) >= 0)	513	else if ((hv = hex_keyval (ev)) >= 0)
496	{	514	{
…		…
867	return;	885	return;
868		886
869	if (len <= 0)	887	if (len <= 0)
870	return; /* not mapped */	888	return; /* not mapped */
871		889
872	if (OPTION (Opt_scrollTtyKeypress))	890	if (option (Opt_scrollTtyKeypress))
873	if (view_start)	891	if (view_start)
874	{	892	{
875	view_start = 0;	893	view_start = 0;
876	want_refresh = 1;	894	want_refresh = 1;
877	}	895	}
…		…
901	tt_write (&ch, 1);	919	tt_write (&ch, 1);
902	}	920	}
903		921
904	tt_write (kbuf, (unsigned int)len);	922	tt_write (kbuf, (unsigned int)len);
905	}	923	}
906	/}}} /	924
		925	void
		926	rxvt_term::key_release (XKeyEvent &ev)
		927	{
		928	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) \|\| ISO_14755 \|\| ENABLE_PERL
		929	KeySym keysym;
		930
		931	keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
		932	#endif
		933
		934	#if ENABLE_FRILLS \|\| ISO_14755
		935	// ISO 14755 support
		936	if (iso14755buf)
		937	if (iso14755buf & ISO_14755_52)
		938	{
		939	# if ENABLE_OVERLAY
		940	scr_overlay_off ();
		941	# endif
		942	# if ISO_14755
		943	// iso14755 part 5.2 handling: release time
		944	// first: controls
		945	if ((ev.state & ControlMask)
		946	&& ((keysym >= 0x40 && keysym <= 0x5f)
		947	\|\| (keysym >= 0x61 && keysym <= 0x7f)))
		948	{
		949	iso14755buf = ISO_14755_51 \| 0x2400 \| (keysym & 0x1f);
		950	commit_iso14755 ();
		951
		952	return;
		953	}
		954
		955	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
		956	if (i[0] == keysym)
		957	{
		958	iso14755buf = ISO_14755_51 \| i[1];
		959	commit_iso14755 ();
		960
		961	return;
		962	}
		963
		964	scr_bell ();
		965	# endif
		966	iso14755buf = 0;
		967
		968	return;
		969	}
		970	else if ((ev.state & (ShiftMask \| ControlMask)) != (ShiftMask \| ControlMask))
		971	{
		972	# if ENABLE_OVERLAY
		973	scr_overlay_off ();
		974	# endif
		975	if (iso14755buf & ISO_14755_51)
		976	commit_iso14755 ();
		977	#if ISO_14755
		978	else if (iso14755buf & ISO_14755_STARTED)
		979	{
		980	iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
		981
		982	scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
		983	scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
		984	}
		985	# endif
		986	else
		987	iso14755buf = 0;
		988	}
		989	#endif
		990
		991	if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
		992	return;
		993
		994	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
		995	if (!(ev.state & ControlMask))
		996	slip_wheel_ev.stop ();
		997	else if (keysym == XK_Control_L \|\| keysym == XK_Control_R)
		998	mouse_slip_wheel_speed = 0;
		999	#endif
		1000	}
907		1001
908	#if defined (KEYSYM_RESOURCE)	1002	#if defined (KEYSYM_RESOURCE)
909	unsigned int	1003	unsigned int
910	rxvt_term::cmd_write (const char *str, unsigned int count)	1004	rxvt_term::cmd_write (const char *str, unsigned int count)
911	{	1005	{
…		…
1088	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1182	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1089	}	1183	}
1090	}	1184	}
1091	#endif	1185	#endif
1092		1186
1093	#if HAVE_SCHED_YIELD	1187	#if LINUX_YIELD_HACK
1094	static struct event_handler	1188	static struct event_handler
1095	{	1189	{
1096	check_watcher cw_yield;	1190	check_watcher yield_ev;
1097		1191
1098	void yield (check_watcher &w)	1192	void yield_cb (check_watcher &w)
1099	{	1193	{
1100	sched_yield ();	1194	// this should really be sched_yield(), but the linux guys thought
		1195	// that giving a process calling sched_yield () less cpu time than
		1196	// ones with high nice levels is a useful thing to do. It surely is is
		1197	// allowed by the sus... as is returning ENOSYS.
		1198
		1199	struct timespec ts = { 0, 0 };
		1200	nanosleep (&ts, 0);
		1201
1101	w.stop ();	1202	w.stop ();
1102	}	1203	}
1103		1204
1104	event_handler ()	1205	event_handler ()
1105	: cw_yield (this, &event_handler::yield)	1206	: yield_ev (this, &event_handler::yield_cb)
1106	{	1207	{
1107	}	1208	}
1108	} event_handler;	1209	} event_handler;
1109	#endif	1210	#endif
1110		1211
…		…
1130	cmdbuf_endp += r;	1231	cmdbuf_endp += r;
1131	return true;	1232	return true;
1132	}	1233	}
1133	else if (r < 0 && (errno == EAGAIN \|\| errno == EINTR))	1234	else if (r < 0 && (errno == EAGAIN \|\| errno == EINTR))
1134	{	1235	{
1135	#if HAVE_SCHED_YIELD	1236	#if LINUX_YIELD_HACK
1136	if (display->is_local)	1237	if (display->is_local)
1137	event_handler.cw_yield.start ();	1238	event_handler.yield_ev.start ();
1138	#endif	1239	#endif
1139	}	1240	}
1140	else	1241	else
1141	{	1242	{
1142	pty_ev.stop ();	1243	pty_ev.stop ();
1143		1244
1144	if (!OPTION (Opt_hold))	1245	if (!option (Opt_hold))
1145	destroy ();	1246	destroy ();
1146	}	1247	}
1147		1248
1148	return false;	1249	return false;
1149	}	1250	}
…		…
1164	}	1265	}
1165		1266
1166	void	1267	void
1167	rxvt_term::pointer_unblank ()	1268	rxvt_term::pointer_unblank ()
1168	{	1269	{
1169	XDefineCursor (display->display, vt, TermWin_cursor);	1270	XDefineCursor (dpy, vt, TermWin_cursor);
1170	recolour_cursor ();	1271	recolour_cursor ();
1171		1272
1172	#ifdef POINTER_BLANK	1273	#ifdef POINTER_BLANK
1173	hidden_pointer = 0;	1274	hidden_pointer = 0;
1174		1275
1175	if (OPTION (Opt_pointerBlank))	1276	if (option (Opt_pointerBlank))
1176	pointer_ev.start (NOW + pointerBlankDelay);	1277	pointer_ev.start (NOW + pointerBlankDelay);
1177	#endif	1278	#endif
1178	}	1279	}
1179		1280
1180	#ifdef POINTER_BLANK	1281	#ifdef POINTER_BLANK
1181	void	1282	void
1182	rxvt_term::pointer_blank ()	1283	rxvt_term::pointer_blank ()
1183	{	1284	{
1184	if (!OPTION (Opt_pointerBlank))	1285	if (!option (Opt_pointerBlank))
1185	return;	1286	return;
1186		1287
1187	XDefineCursor (display->display, vt, display->blank_cursor);	1288	XDefineCursor (dpy, vt, display->blank_cursor);
1188	XFlush (display->display);	1289	XFlush (dpy);
1189		1290
1190	hidden_pointer = 1;	1291	hidden_pointer = 1;
1191	}	1292	}
1192		1293
1193	void	1294	void
…		…
1266	(32 + button_number + key_state),	1367	(32 + button_number + key_state),
1267	(32 + x + 1),	1368	(32 + x + 1),
1268	(32 + y + 1));	1369	(32 + y + 1));
1269	}	1370	}
1270		1371
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 /	1372	/{{{ process an X event /
1282	void	1373	void
1283	rxvt_term::x_cb (XEvent &ev)	1374	rxvt_term::x_cb (XEvent &ev)
1284	{	1375	{
1285	make_current ();	1376	make_current ();
1286		1377
1287	dDisp;	1378	dLocal (Display *, dpy);
1288		1379
1289	if (ev.xany.window == vt	1380	if (ev.xany.window == vt
1290	&& SHOULD_INVOKE (HOOK_X_EVENT)	1381	&& SHOULD_INVOKE (HOOK_X_EVENT)
1291	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))	1382	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1292	return;	1383	return;
…		…
1297	unsigned int unused_mask;	1388	unsigned int unused_mask;
1298		1389
1299	switch (ev.type)	1390	switch (ev.type)
1300	{	1391	{
1301	case KeyPress:	1392	case KeyPress:
1302	#if ISO_14755	1393	key_press (ev.xkey);
1303	if (!(iso14755buf & ISO_14755_52))
1304	#endif
1305	lookup_key (ev.xkey);
1306
1307	break;	1394	break;
1308		1395
1309	case KeyRelease:	1396	case KeyRelease:
1310	{	1397	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;	1398	break;
1382	}
1383		1399
1384	case ButtonPress:	1400	case ButtonPress:
1385	button_press (ev.xbutton);	1401	button_press (ev.xbutton);
1386	break;	1402	break;
1387		1403
…		…
1402	if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))	1418	if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1403	destroy ();	1419	destroy ();
1404	}	1420	}
1405	#if ENABLE_EWMH	1421	#if ENABLE_EWMH
1406	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])	1422	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1407	XSendEvent (disp, ev.xclient.window = display->root,	1423	XSendEvent (dpy, ev.xclient.window = display->root,
1408	False, SubstructureRedirectMask \| SubstructureNotifyMask,	1424	False, SubstructureRedirectMask \| SubstructureNotifyMask,
1409	&ev);	1425	&ev);
1410	#endif	1426	#endif
1411	}	1427	}
1412	}	1428	}
…		…
1450	break;	1466	break;
1451	}	1467	}
1452	break;	1468	break;
1453		1469
1454	case FocusIn:	1470	case FocusIn:
		1471	if (ev.xfocus.detail != NotifyInferior
		1472	&& ev.xfocus.detail != NotifyPointer
		1473	&& ev.xfocus.mode != NotifyGrab)
1455	focus_in ();	1474	focus_in ();
1456	break;	1475	break;
1457		1476
1458	case FocusOut:	1477	case FocusOut:
		1478	if (ev.xfocus.detail != NotifyInferior
		1479	&& ev.xfocus.detail != NotifyPointer
		1480	&& ev.xfocus.mode != NotifyGrab)
1459	focus_out ();	1481	focus_out ();
1460	break;	1482	break;
1461		1483
1462	case ConfigureNotify:	1484	case ConfigureNotify:
1463	if (ev.xconfigure.window == parent[0])	1485	if (ev.xconfigure.window == parent[0])
1464	{	1486	{
1465	while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))	1487	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1466	;	1488	;
1467		1489
1468	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)	1490	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)
1469	{	1491	{
1470	seen_resize = 1;	1492	seen_resize = 1;
1471	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1493	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1472	}	1494	}
1473		1495
1474	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));	1496	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1475		1497
1476	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */	1498	#ifdef TRANSPARENT
1477	if (OPTION (Opt_transparent))	1499	if (option (Opt_transparent))
1478	check_our_parents ();	1500	check_our_parents ();
1479	#endif	1501	#endif
1480	}	1502	}
1481	break;	1503	break;
1482		1504
…		…
1528	if (ev.xany.window == vt)	1550	if (ev.xany.window == vt)
1529	{	1551	{
1530	do	1552	do
1531	scr_expose (ev.xexpose.x, ev.xexpose.y,	1553	scr_expose (ev.xexpose.x, ev.xexpose.y,
1532	ev.xexpose.width, ev.xexpose.height, False);	1554	ev.xexpose.width, ev.xexpose.height, False);
1533	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));	1555	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1534		1556
1535	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1557	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1536		1558
1537	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))	1559	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1538	scr_expose (ev.xexpose.x, ev.xexpose.y,	1560	scr_expose (ev.xexpose.x, ev.xexpose.y,
1539	ev.xexpose.width, ev.xexpose.height, False);	1561	ev.xexpose.width, ev.xexpose.height, False);
1540		1562
1541	want_refresh = 1;	1563	want_refresh = 1;
1542	}	1564	}
1543	else	1565	else
1544	{	1566	{
1545	XEvent unused_event;	1567	XEvent unused_event;
1546		1568
1547	while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))	1569	while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1548	;	1570	;
1549	while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))	1571	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1550	;	1572	;
1551		1573
1552	if (isScrollbarWindow (ev.xany.window))	1574	if (isScrollbarWindow (ev.xany.window))
1553	{	1575	{
1554	scrollBar.setIdle ();	1576	scrollBar.setIdle ();
1555	scrollbar_show (0);	1577	scrollbar_show (0);
1556	}	1578	}
1557		1579
1558	#ifdef TRANSPARENT	1580	#ifdef TRANSPARENT
1559	if (am_transparent && ev.xany.window == parent[0])	1581	if (am_transparent && ev.xany.window == parent[0])
1560	XClearWindow (disp, ev.xany.window);	1582	XClearWindow (dpy, ev.xany.window);
1561	#endif	1583	#endif
1562	}	1584	}
1563	break;	1585	break;
1564		1586
1565	case MotionNotify:	1587	case MotionNotify:
…		…
1575	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)	1597	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1576	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))	1598	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1577	; // nop	1599	; // nop
1578	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))	1600	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))
1579	{	1601	{
1580	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))	1602	while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1581	;	1603	;
1582		1604
1583	XQueryPointer (disp, vt,	1605	XQueryPointer (dpy, vt,
1584	&unused_root, &unused_child,	1606	&unused_root, &unused_child,
1585	&unused_root_x, &unused_root_y,	1607	&unused_root_x, &unused_root_y,
1586	&ev.xbutton.x, &ev.xbutton.y,	1608	&ev.xbutton.x, &ev.xbutton.y,
1587	&ev.xbutton.state);	1609	&ev.xbutton.state);
1588	#ifdef MOUSE_THRESHOLD	1610	#ifdef MOUSE_THRESHOLD
…		…
1652	#endif	1674	#endif
1653	}	1675	}
1654	}	1676	}
1655	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1677	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1656	{	1678	{
1657	while (XCheckTypedWindowEvent (disp, scrollBar.win,	1679	while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1658	MotionNotify, &ev))	1680	MotionNotify, &ev))
1659	;	1681	;
1660		1682
1661	XQueryPointer (disp, scrollBar.win,	1683	XQueryPointer (dpy, scrollBar.win,
1662	&unused_root, &unused_child,	1684	&unused_root, &unused_child,
1663	&unused_root_x, &unused_root_y,	1685	&unused_root_x, &unused_root_y,
1664	&ev.xbutton.x, &ev.xbutton.y,	1686	&ev.xbutton.x, &ev.xbutton.y,
1665	&unused_mask);	1687	&unused_mask);
1666	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1688	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
…		…
1670	scrollbar_show (1);	1692	scrollbar_show (1);
1671	}	1693	}
1672	break;	1694	break;
1673	}	1695	}
1674		1696
1675	skip_switch: ;
1676
1677	#if defined(CURSOR_BLINK)	1697	#if defined(CURSOR_BLINK)
1678	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)	1698	if (option (Opt_cursorBlink) && ev.type == KeyPress)
1679	{	1699	{
1680	if (hidden_cursor)	1700	if (hidden_cursor)
1681	{	1701	{
1682	hidden_cursor = 0;	1702	hidden_cursor = 0;
1683	want_refresh = 1;	1703	want_refresh = 1;
…		…
1686	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);	1706	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1687	}	1707	}
1688	#endif	1708	#endif
1689		1709
1690	#if defined(POINTER_BLANK)	1710	#if defined(POINTER_BLANK)
1691	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)	1711	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1692	{	1712	{
1693	if (ev.type == MotionNotify	1713	if (ev.type == MotionNotify
1694	\|\| ev.type == ButtonPress	1714	\|\| ev.type == ButtonPress
1695	\|\| ev.type == ButtonRelease)	1715	\|\| ev.type == ButtonRelease)
1696	if (hidden_pointer)	1716	if (hidden_pointer)
…		…
1708	if (!focus)	1728	if (!focus)
1709	{	1729	{
1710	focus = 1;	1730	focus = 1;
1711	want_refresh = 1;	1731	want_refresh = 1;
1712		1732
1713	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));	1733	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1714		1734
1715	#if USE_XIM	1735	#if USE_XIM
1716	if (Input_Context != NULL)	1736	if (Input_Context != NULL)
1717	{	1737	{
1718	IMSetStatusPosition ();	1738	IMSetPosition ();
1719	XSetICFocus (Input_Context);	1739	XSetICFocus (Input_Context);
1720	}	1740	}
1721	#endif	1741	#endif
1722	#if CURSOR_BLINK	1742	#if CURSOR_BLINK
1723	if (OPTION (Opt_cursorBlink))	1743	if (option (Opt_cursorBlink))
1724	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);	1744	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1725	#endif	1745	#endif
1726	#if OFF_FOCUS_FADING	1746	#if OFF_FOCUS_FADING
1727	if (rs[Rs_fade])	1747	if (rs[Rs_fade])
1728	{	1748	{
1729	pix_colors = pix_colors_focused;	1749	pix_colors = pix_colors_focused;
1730	scr_recolour ();	1750	scr_recolour ();
		1751	}
		1752	#endif
		1753	#if ENABLE_FRILLS
		1754	if (option (Opt_urgentOnBell))
		1755	{
		1756	XWMHints *h;
		1757
		1758	h = XGetWMHints(dpy, parent[0]);
		1759	if (h != NULL)
		1760	{
		1761	h->flags &= ~XUrgencyHint;
		1762	XSetWMHints(dpy, parent[0], h);
		1763	}
1731	}	1764	}
1732	#endif	1765	#endif
1733	}	1766	}
1734	}	1767	}
1735		1768
…		…
1755	#if USE_XIM	1788	#if USE_XIM
1756	if (Input_Context != NULL)	1789	if (Input_Context != NULL)
1757	XUnsetICFocus (Input_Context);	1790	XUnsetICFocus (Input_Context);
1758	#endif	1791	#endif
1759	#if CURSOR_BLINK	1792	#if CURSOR_BLINK
1760	if (OPTION (Opt_cursorBlink))	1793	if (option (Opt_cursorBlink))
1761	cursor_blink_ev.stop ();	1794	cursor_blink_ev.stop ();
1762	hidden_cursor = 0;	1795	hidden_cursor = 0;
1763	#endif	1796	#endif
1764	#if OFF_FOCUS_FADING	1797	#if OFF_FOCUS_FADING
1765	if (rs[Rs_fade])	1798	if (rs[Rs_fade])
…		…
1769	}	1802	}
1770	#endif	1803	#endif
1771	}	1804	}
1772	}	1805	}
1773		1806
1774	#if TRANSPARENT	1807	void
		1808	rxvt_term::update_fade_color (unsigned int idx)
		1809	{
		1810	#if OFF_FOCUS_FADING
		1811	if (rs[Rs_fade])
		1812	{
		1813	rgba c;
		1814	pix_colors [Color_fade].get (c);
		1815	pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
		1816	}
		1817	#endif
		1818	}
		1819
		1820	#if TRANSPARENT \|\| ENABLE_PERL
1775	void	1821	void
1776	rxvt_term::rootwin_cb (XEvent &ev)	1822	rxvt_term::rootwin_cb (XEvent &ev)
1777	{	1823	{
1778	make_current ();	1824	make_current ();
1779		1825
		1826	if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
		1827	&& HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
		1828	return;
		1829
		1830	# if TRANSPARENT
1780	switch (ev.type)	1831	switch (ev.type)
1781	{	1832	{
1782	case PropertyNotify:	1833	case PropertyNotify:
1783	/*	1834	/*
1784	* if user used some Esetroot compatible prog to set the root bg,	1835	* if user used some Esetroot compatible prog to set the root bg,
…		…
1788	&& ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])	1839	&& ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1789	return;	1840	return;
1790		1841
1791	/* FALLTHROUGH */	1842	/* FALLTHROUGH */
1792	case ReparentNotify:	1843	case ReparentNotify:
1793	if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)	1844	if (option (Opt_transparent) && check_our_parents () && am_transparent)
1794	want_refresh = want_full_refresh = 1;	1845	want_refresh = want_full_refresh = 1;
1795	break;	1846	break;
1796	}	1847	}
		1848	# endif
1797	}	1849	}
1798	#endif	1850	#endif
1799		1851
1800	void	1852	void
1801	rxvt_term::button_press (XButtonEvent &ev)	1853	rxvt_term::button_press (XButtonEvent &ev)
…		…
2129	selection_make (ev.time);	2181	selection_make (ev.time);
2130	break;	2182	break;
2131		2183
2132	case Button2:	2184	case Button2:
2133	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?	2185	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2134	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);	2186	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2135	break;	2187	break;
2136		2188
2137	#ifdef MOUSE_WHEEL	2189	#ifdef MOUSE_WHEEL
2138	case Button4:	2190	case Button4:
2139	case Button5:	2191	case Button5:
…		…
2143		2195
2144	v = ev.button == Button4 ? UP : DN;	2196	v = ev.button == Button4 ? UP : DN;
2145		2197
2146	if (ev.state & ShiftMask)	2198	if (ev.state & ShiftMask)
2147	i = 1;	2199	i = 1;
2148	else if (OPTION (Opt_mouseWheelScrollPage))	2200	else if (option (Opt_mouseWheelScrollPage))
2149	i = nrow - 1;	2201	i = nrow - 1;
2150	else	2202	else
2151	i = 5;	2203	i = 5;
2152		2204
2153	# ifdef MOUSE_SLIP_WHEELING	2205	# ifdef MOUSE_SLIP_WHEELING
…		…
2181	#if TINTING	2233	#if TINTING
2182	/* taken from aterm-0.4.2 */	2234	/* taken from aterm-0.4.2 */
2183		2235
2184	typedef uint32_t RUINT32T;	2236	typedef uint32_t RUINT32T;
2185		2237
2186	void ShadeXImage(rxvt_display display, XImage srcImage, int shade, int rm, int gm, int bm)	2238	void ShadeXImage(rxvt_term term, XImage srcImage, int shade, int rm, int gm, int bm)
2187	{	2239	{
2188	int sh_r, sh_g, sh_b;	2240	int sh_r, sh_g, sh_b;
2189	RUINT32T mask_r, mask_g, mask_b;	2241	RUINT32T mask_r, mask_g, mask_b;
2190	RUINT32T lookup, lookup_r, lookup_g, lookup_b;	2242	RUINT32T lookup, lookup_r, lookup_g, lookup_b;
2191	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;	2243	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2192	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;	2244	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2193	int i;	2245	int i;
2194		2246
2195	Visual *visual = display->visual;	2247	Visual *visual = term->visual;
2196		2248
2197	if( visual->c_class != TrueColor \|\| srcImage->format != ZPixmap ) return ;	2249	if( visual->c_class != TrueColor \|\| srcImage->format != ZPixmap ) return ;
2198		2250
2199	/* for convenience */	2251	/* for convenience */
2200	mask_r = visual->red_mask;	2252	mask_r = visual->red_mask;
…		…
2421	Atom atype;	2473	Atom atype;
2422	unsigned char *prop = NULL;	2474	unsigned char *prop = NULL;
2423	Window root, oldp, *list;	2475	Window root, oldp, *list;
2424	Pixmap rootpixmap = None;	2476	Pixmap rootpixmap = None;
2425	XWindowAttributes wattr, wrootattr;	2477	XWindowAttributes wattr, wrootattr;
2426	dDisp;
2427		2478
2428	pchanged = 0;	2479	pchanged = 0;
2429		2480
2430	if (!OPTION (Opt_transparent))	2481	if (!option (Opt_transparent))
2431	return pchanged; /* Don't try any more */	2482	return pchanged; /* Don't try any more */
2432		2483
2433	XGetWindowAttributes (disp, display->root, &wrootattr);	2484	XGetWindowAttributes (dpy, display->root, &wrootattr);
2434	rootdepth = wrootattr.depth;	2485	rootdepth = wrootattr.depth;
2435		2486
2436	XGetWindowAttributes (disp, parent[0], &wattr);	2487	XGetWindowAttributes (dpy, parent[0], &wattr);
2437		2488
2438	if (rootdepth != wattr.depth)	2489	if (rootdepth != wattr.depth)
2439	{	2490	{
2440	if (am_transparent)	2491	if (am_transparent)
2441	{	2492	{
2442	pchanged = 1;	2493	pchanged = 1;
2443	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2494	XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2444	am_transparent = am_pixmap_trans = 0;	2495	am_transparent = am_pixmap_trans = 0;
2445	}	2496	}
2446		2497
2447	return pchanged; /* Don't try any more */	2498	return pchanged; /* Don't try any more */
2448	}	2499	}
2449		2500
2450	/* Get all X ops out of the queue so that our information is up-to-date. */	2501	/* Get all X ops out of the queue so that our information is up-to-date. */
2451	XSync (disp, False);	2502	XSync (dpy, False);
2452		2503
2453	/*	2504	/*
2454	* Make the frame window set by the window manager have	2505	* Make the frame window set by the window manager have
2455	* the root background. Some window managers put multiple nested frame	2506	* the root background. Some window managers put multiple nested frame
2456	* windows for each client, so we have to take care about that.	2507	* windows for each client, so we have to take care about that.
2457	*/	2508	*/
2458	i = (xa[XA_XROOTPMAP_ID]	2509	i = (xa[XA_XROOTPMAP_ID]
2459	&& XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],	2510	&& XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2460	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2511	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2461	&nitems, &bytes_after, &prop) == Success);	2512	&nitems, &bytes_after, &prop) == Success);
2462		2513
2463	if (!i \|\| prop == NULL)	2514	if (!i \|\| prop == NULL)
2464	i = (xa[XA_ESETROOT_PMAP_ID]	2515	i = (xa[XA_ESETROOT_PMAP_ID]
2465	&& XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],	2516	&& XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2466	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2517	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2467	&nitems, &bytes_after, &prop) == Success);	2518	&nitems, &bytes_after, &prop) == Success);
2468		2519
2469	if (!i \|\| prop == NULL	2520	if (!i \|\| prop == NULL
2470	#if TINTING	2521	#if TINTING
2471	\|\| !rs[Rs_color + Color_tint]	2522	\|\| !ISSET_PIXCOLOR (Color_tint)
2472	#endif	2523	#endif
2473	)	2524	)
2474	have_pixmap = 0;	2525	have_pixmap = 0;
2475	else	2526	else
2476	{	2527	{
…		…
2489	Window cr;	2540	Window cr;
2490	XImage *image;	2541	XImage *image;
2491	GC gc;	2542	GC gc;
2492	XGCValues gcvalue;	2543	XGCValues gcvalue;
2493		2544
2494	XTranslateCoordinates (disp, parent[0], display->root,	2545	XTranslateCoordinates (dpy, parent[0], display->root,
2495	0, 0, &sx, &sy, &cr);	2546	0, 0, &sx, &sy, &cr);
2496	nw = (unsigned int)szHint.width;	2547	nw = (unsigned int)szHint.width;
2497	nh = (unsigned int)szHint.height;	2548	nh = (unsigned int)szHint.height;
2498	nx = ny = 0;	2549	nx = ny = 0;
2499		2550
…		…
2512	}	2563	}
2513		2564
2514	min_it (nw, (unsigned int) (wrootattr.width - sx));	2565	min_it (nw, (unsigned int) (wrootattr.width - sx));
2515	min_it (nh, (unsigned int) (wrootattr.height - sy));	2566	min_it (nh, (unsigned int) (wrootattr.height - sy));
2516		2567
2517	XSync (disp, False);	2568	XSync (dpy, False);
2518	allowedxerror = -1;	2569	allowedxerror = -1;
2519	image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);	2570	image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2520		2571
2521	/* XXX: handle BadMatch - usually because we're outside the pixmap */	2572	/* XXX: handle BadMatch - usually because we're outside the pixmap */
2522	/* XXX: may need a delay here? */	2573	/* XXX: may need a delay here? */
2523	allowedxerror = 0;	2574	allowedxerror = 0;
2524		2575
…		…
2527	if (am_transparent && am_pixmap_trans)	2578	if (am_transparent && am_pixmap_trans)
2528	{	2579	{
2529	pchanged = 1;	2580	pchanged = 1;
2530	if (pixmap != None)	2581	if (pixmap != None)
2531	{	2582	{
2532	XFreePixmap (disp, pixmap);	2583	XFreePixmap (dpy, pixmap);
2533	pixmap = None;	2584	pixmap = None;
2534	}	2585	}
2535	}	2586	}
2536		2587
2537	am_pixmap_trans = 0;	2588	am_pixmap_trans = 0;
2538	}	2589	}
2539	else	2590	else
2540	{	2591	{
2541	if (pixmap != None)	2592	if (pixmap != None)
2542	XFreePixmap (disp, pixmap);	2593	XFreePixmap (dpy, pixmap);
2543		2594
2544	#if TINTING	2595	#if TINTING
2545	if (ISSET_PIXCOLOR (Color_tint))	2596	if (ISSET_PIXCOLOR (Color_tint))
2546	{	2597	{
2547	unsigned short rm, gm, bm;
2548	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;	2598	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2549		2599
		2600	rgba c;
2550	pix_colors_focused[Color_tint].get (display, rm, gm, bm);	2601	pix_colors_focused [Color_tint].get (c);
2551		2602
2552	ShadeXImage (display, image, shade, rm, gm, bm);	2603	ShadeXImage (this, image, shade, c.r, c.g, c.b);
2553	}	2604	}
2554	#endif	2605	#endif
2555		2606
2556	pixmap = XCreatePixmap (disp, vt,	2607	pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2557	szHint.width, szHint.height, image->depth);
2558	gc = XCreateGC (disp, vt, 0UL, &gcvalue);	2608	gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2559	XPutImage (disp, pixmap, gc, image, 0, 0,	2609	XPutImage (dpy, pixmap, gc, image, 0, 0,
2560	nx, ny, image->width, image->height);	2610	nx, ny, image->width, image->height);
2561	XFreeGC (disp, gc);	2611	XFreeGC (dpy, gc);
2562	XDestroyImage (image);	2612	XDestroyImage (image);
2563	XSetWindowBackgroundPixmap (disp, parent[0], pixmap);	2613	XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2564	XClearWindow (disp, parent[0]);	2614	XClearWindow (dpy, parent[0]);
2565		2615
2566	if (!am_transparent \|\| !am_pixmap_trans)	2616	if (!am_transparent \|\| !am_pixmap_trans)
2567	pchanged = 1;	2617	pchanged = 1;
2568		2618
2569	am_transparent = am_pixmap_trans = 1;	2619	am_transparent = am_pixmap_trans = 1;
2570	}	2620	}
2571	}	2621	}
2572		2622
2573	if (am_pixmap_trans)	2623	if (am_pixmap_trans)
2574	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2624	XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2575	else	2625	else
2576	{	2626	{
2577	unsigned int n;	2627	unsigned int n;
2578	/*	2628	/*
2579	* InheritPixmap transparency	2629	* InheritPixmap transparency
2580	*/	2630	*/
2581	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2631	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2582	{	2632	{
2583	oldp = parent[i];	2633	oldp = parent[i];
2584	XQueryTree (disp, parent[i - 1], &root,	2634	XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2585	&parent[i], &list, &n);
2586	XFree (list);	2635	XFree (list);
2587		2636
2588	if (parent[i] == display->root)	2637	if (parent[i] == display->root)
2589	{	2638	{
2590	if (oldp != None)	2639	if (oldp != None)
…		…
2598	}	2647	}
2599		2648
2600	n = 0;	2649	n = 0;
2601		2650
2602	if (pchanged)	2651	if (pchanged)
2603	{
2604	for (; n < (unsigned int)i; n++)	2652	for (; n < (unsigned int)i; n++)
2605	{	2653	{
2606	XGetWindowAttributes (disp, parent[n], &wattr);	2654	XGetWindowAttributes (dpy, parent[n], &wattr);
		2655
2607	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)	2656	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)
2608	{	2657	{
2609	n = (int) (sizeof (parent) / sizeof (Window)) + 1;	2658	n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2610	break;	2659	break;
2611	}	2660	}
2612	}	2661	}
2613	}
2614		2662
2615	if (n > (int) (sizeof (parent) / sizeof (parent[0])))	2663	if (n > (sizeof (parent) / sizeof (parent[0])))
2616	{	2664	{
2617	XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);	2665	XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2618	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2666	XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2619	am_transparent = 0;	2667	am_transparent = 0;
2620	/* XXX: also turn off Opt_transparent? */	2668	/* XXX: also turn off Opt_transparent? */
2621	}	2669	}
2622	else	2670	else
2623	{	2671	{
2624	for (n = 0; n < (unsigned int)i; n++)	2672	for (n = 0; n < (unsigned int)i; n++)
2625	{	2673	{
2626	XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);	2674	XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2627	XClearWindow (disp, parent[n]);	2675	XClearWindow (dpy, parent[n]);
2628	}	2676	}
2629		2677
2630	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2678	XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2631	am_transparent = 1;	2679	am_transparent = 1;
2632	}	2680	}
2633		2681
2634	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2682	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2635	parent[i] = None;	2683	parent[i] = None;
2636	}	2684	}
2637		2685
2638	if (scrollBar.win)	2686	if (scrollBar.win)
2639	{	2687	{
2640	XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);	2688	XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2641	scrollBar.setIdle ();	2689	scrollBar.setIdle ();
2642	scrollbar_show (0);	2690	scrollbar_show (0);
2643	}	2691	}
2644		2692
2645	if (am_transparent)	2693	if (am_transparent)
…		…
2708	if (ch == C0_LF)	2756	if (ch == C0_LF)
2709	nlines++;	2757	nlines++;
2710		2758
2711	refresh_count++;	2759	refresh_count++;
2712		2760
2713	if (!OPTION (Opt_jumpScroll)	2761	if (!option (Opt_jumpScroll)
2714	\|\| (refresh_count >= refresh_limit * (nrow - 1)))	2762	\|\| (refresh_count >= refresh_limit * (nrow - 1)))
2715	{	2763	{
2716	refreshnow = true;	2764	refreshnow = true;
2717	refresh_count = 0;	2765	refresh_count = 0;
2718	ch = NOCHAR;	2766	ch = NOCHAR;
…		…
2758	* the number of pages between refreshes is refresh_limit, which	2806	* the number of pages between refreshes is refresh_limit, which
2759	* is incremented here because we must be doing flat-out scrolling.	2807	* is incremented here because we must be doing flat-out scrolling.
2760	*/	2808	*/
2761	if (refreshnow)	2809	if (refreshnow)
2762	{	2810	{
2763	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)	2811	if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2764	refresh_limit++;	2812	refresh_limit++;
2765	else	2813	else
2766	{	2814	{
2767	flag = true;	2815	flag = true;
		2816	//TODO: due to popular request, implement "skipscroll" option here
2768	scr_refresh ();	2817	scr_refresh ();
2769	want_refresh = 1;	2818	want_refresh = 1;
2770	}	2819	}
2771	}	2820	}
2772		2821
…		…
3096	scr_charset_set (2, (unsigned int)cmd_getc ());	3145	scr_charset_set (2, (unsigned int)cmd_getc ());
3097	break;	3146	break;
3098	case '+':	3147	case '+':
3099	scr_charset_set (3, (unsigned int)cmd_getc ());	3148	scr_charset_set (3, (unsigned int)cmd_getc ());
3100	break;	3149	break;
3101	#if ENABLE_FRILLS	3150	#if !ENABLE_MINIMAL
3102	case '6':	3151	case '6':
3103	scr_backindex ();	3152	scr_backindex ();
3104	break;	3153	break;
3105	#endif	3154	#endif
3106	case '7':	3155	case '7':
3107	scr_cursor (SAVE);	3156	scr_cursor (SAVE);
3108	break;	3157	break;
3109	case '8':	3158	case '8':
3110	scr_cursor (RESTORE);	3159	scr_cursor (RESTORE);
3111	break;	3160	break;
3112	#if ENABLE_FRILLS	3161	#if !ENABLE_MINIMAL
3113	case '9':	3162	case '9':
3114	scr_forwardindex ();	3163	scr_forwardindex ();
3115	break;	3164	break;
3116	#endif	3165	#endif
3117	case '=':	3166	case '=':
…		…
3290	{	3339	{
3291	case '>':	3340	case '>':
3292	if (ch == CSI_DA) /* secondary device attributes */	3341	if (ch == CSI_DA) /* secondary device attributes */
3293	{	3342	{
3294	// first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,	3343	// 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.	3344	// 'U' for rxvt-unicode != 7.[34] (where it was broken).
3296	//	3345	//
3297	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt	3346	// 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	3347	// 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).	3348	// that we do not support xterm mouse reporting (should be 95 when we do).
3300	//	3349	//
3301	tt_printf ("\033[>%c%c85;94;0c", VERSION[0], VERSION[1]);	3350	tt_printf ("\033[>%d;94;0c", 'U');
3302	}	3351	}
3303	break;	3352	break;
3304	case '?':	3353	case '?':
3305	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')	3354	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')
3306	process_terminal_mode (ch, priv, nargs, arg);	3355	process_terminal_mode (ch, priv, nargs, arg);
…		…
3433	break;	3482	break;
3434	case 6: /* CPR requested */	3483	case 6: /* CPR requested */
3435	scr_report_position ();	3484	scr_report_position ();
3436	break;	3485	break;
3437	case 7: /* unofficial extension */	3486	case 7: /* unofficial extension */
3438	if (OPTION (Opt_insecure))	3487	if (option (Opt_insecure))
3439	tt_printf ("%-.250s\012", rs[Rs_display_name]);	3488	tt_printf ("%-.250s\012", rs[Rs_display_name]);
3440	break;	3489	break;
3441	case 8: /* unofficial extension */	3490	case 8: /* unofficial extension */
3442	process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);	3491	process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3443	break;	3492	break;
…		…
3510	break;	3559	break;
3511	case CSI_75:	3560	case CSI_75:
3512	scr_cursor (RESTORE);	3561	scr_cursor (RESTORE);
3513	break;	3562	break;
3514		3563
3515	#if ENABLE_FRILLS	3564	#if !ENABLE_MINIMAL
3516	case CSI_74:	3565	case CSI_74:
3517	process_window_ops (arg, nargs);	3566	process_window_ops (arg, nargs);
3518	break;	3567	break;
3519	#endif	3568	#endif
3520		3569
…		…
3527	break;	3576	break;
3528	}	3577	}
3529	}	3578	}
3530	/}}} /	3579	/}}} /
3531		3580
3532	#if ENABLE_FRILLS	3581	#if !ENABLE_MINIMAL
3533	/* ARGSUSED */	3582	/* ARGSUSED */
3534	void	3583	void
3535	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3584	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3536	{	3585	{
3537	int x, y;	3586	int x, y;
3538	XWindowAttributes wattr;	3587	XWindowAttributes wattr;
3539	Window wdummy;	3588	Window wdummy;
3540	dDisp;	3589
		3590	dLocal (Display *, dpy);
3541		3591
3542	if (nargs == 0)	3592	if (nargs == 0)
3543	return;	3593	return;
3544		3594
3545	switch (args[0])	3595	switch (args[0])
3546	{	3596	{
3547	/*	3597	/*
3548	* commands	3598	* commands
3549	*/	3599	*/
3550	case 1: /* deiconify window */	3600	case 1: /* deiconify window */
3551	XMapWindow (disp, parent[0]);	3601	XMapWindow (dpy, parent[0]);
3552	break;	3602	break;
3553	case 2: /* iconify window */	3603	case 2: /* iconify window */
3554	XIconifyWindow (disp, parent[0], display->screen);	3604	XIconifyWindow (dpy, parent[0], display->screen);
3555	break;	3605	break;
3556	case 3: /* set position (pixels) */	3606	case 3: /* set position (pixels) */
3557	XMoveWindow (disp, parent[0], args[1], args[2]);	3607	XMoveWindow (dpy, parent[0], args[1], args[2]);
3558	break;	3608	break;
3559	case 4: /* set size (pixels) */	3609	case 4: /* set size (pixels) */
3560	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3610	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3561	break;	3611	break;
3562	case 5: /* raise window */	3612	case 5: /* raise window */
3563	XRaiseWindow (disp, parent[0]);	3613	XRaiseWindow (dpy, parent[0]);
3564	break;	3614	break;
3565	case 6: /* lower window */	3615	case 6: /* lower window */
3566	XLowerWindow (disp, parent[0]);	3616	XLowerWindow (dpy, parent[0]);
3567	break;	3617	break;
3568	case 7: /* refresh window */	3618	case 7: /* refresh window */
3569	scr_touch (true);	3619	scr_touch (true);
3570	break;	3620	break;
3571	case 8: /* set size (chars) */	3621	case 8: /* set size (chars) */
…		…
3578	if (args[0] >= 24) /* set height (chars) */	3628	if (args[0] >= 24) /* set height (chars) */
3579	set_widthheight ((unsigned int)width,	3629	set_widthheight ((unsigned int)width,
3580	(unsigned int) (args[1] * fheight));	3630	(unsigned int) (args[1] * fheight));
3581	break;	3631	break;
3582		3632
3583
3584	/*	3633	/*
3585	* reports - some output format copied from XTerm	3634	* reports - some output format copied from XTerm
3586	*/	3635	*/
3587	case 11: /* report window state */	3636	case 11: /* report window state */
3588	XGetWindowAttributes (disp, parent[0], &wattr);	3637	XGetWindowAttributes (dpy, parent[0], &wattr);
3589	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3638	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3590	break;	3639	break;
3591	case 13: /* report window position */	3640	case 13: /* report window position */
3592	XGetWindowAttributes (disp, parent[0], &wattr);	3641	XGetWindowAttributes (dpy, parent[0], &wattr);
3593	XTranslateCoordinates (disp, parent[0], wattr.root,	3642	XTranslateCoordinates (dpy, parent[0], wattr.root,
3594	-wattr.border_width, -wattr.border_width,	3643	-wattr.border_width, -wattr.border_width,
3595	&x, &y, &wdummy);	3644	&x, &y, &wdummy);
3596	tt_printf ("\033[3;%d;%dt", x, y);	3645	tt_printf ("\033[3;%d;%dt", x, y);
3597	break;	3646	break;
3598	case 14: /* report window size (pixels) */	3647	case 14: /* report window size (pixels) */
3599	XGetWindowAttributes (disp, parent[0], &wattr);	3648	XGetWindowAttributes (dpy, parent[0], &wattr);
3600	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3649	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3601	break;	3650	break;
3602	case 18: /* report text area size (chars) */	3651	case 18: /* report text area size (chars) */
3603	tt_printf ("\033[8;%d;%dt", nrow, ncol);	3652	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3604	break;	3653	break;
…		…
3606	tt_printf ("\033[9;%d;%dt", nrow, ncol);	3655	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3607	break;	3656	break;
3608	case 20: /* report icon label */	3657	case 20: /* report icon label */
3609	{	3658	{
3610	char *s;	3659	char *s;
3611	XGetIconName (disp, parent[0], &s);	3660	XGetIconName (dpy, parent[0], &s);
3612	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 */
3613	XFree (s);	3662	XFree (s);
3614	}	3663	}
3615	break;	3664	break;
3616	case 21: /* report window title */	3665	case 21: /* report window title */
3617	{	3666	{
3618	char *s;	3667	char *s;
3619	XFetchName (disp, parent[0], &s);	3668	XFetchName (dpy, parent[0], &s);
3620	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3669	tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3621	XFree (s);	3670	XFree (s);
3622	}	3671	}
3623	break;	3672	break;
3624	}	3673	}
3625	}	3674	}
…		…
3652	seen_esc = true;	3701	seen_esc = true;
3653	continue;	3702	continue;
3654	}	3703	}
3655	else if (ch == C0_BEL \|\| ch == CHAR_ST)	3704	else if (ch == C0_BEL \|\| ch == CHAR_ST)
3656	break;	3705	break;
		3706	else if (ch == C0_SYN)
		3707	ch = cmd_get8 ();
3657	else if (ch < 0x20)	3708	else if (ch < 0x20)
3658	return NULL; /* other control character - exit */	3709	return NULL; /* other control character - exit */
3659		3710
3660	seen_esc = false;	3711	seen_esc = false;
3661		3712
3662	if (n >= STRING_MAX - 1)	3713	if (n >= STRING_MAX - 1)
3663	// stop at some sane length	3714	// stop at some sane length
3664	return NULL;	3715	return NULL;
3665		3716
3666	if (ch == C0_SYN)
3667	string[n++] = cmd_get8 ();
3668	else
3669	string[n++] = ch;	3717	string[n++] = ch;
3670	}	3718	}
3671		3719
3672	string[n++] = '\0';	3720	string[n++] = '\0';
3673		3721
3674	ends_how = (ch == 0x5c ? C0_ESC : ch);	3722	ends_how = (ch == 0x5c ? C0_ESC : ch);
…		…
3725	void	3773	void
3726	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)	3774	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3727	{	3775	{
3728	if (str[0] == '?' && !str[1])	3776	if (str[0] == '?' && !str[1])
3729	{	3777	{
3730	unsigned short r, g, b;	3778	rgba c;
3731	pix_colors_focused[color].get (display, r, g, b);	3779	pix_colors_focused[color].get (c);
		3780
		3781	#if XFT
		3782	if (c.a != rgba::MAX_CC)
		3783	tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
		3784	else
		3785	#endif
3732	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);	3786	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3733	}	3787	}
3734	else	3788	else
3735	set_window_color (color, str);	3789	set_window_color (color, str);
3736	}	3790	}
3737		3791
…		…
3743	{	3797	{
3744	int color;	3798	int color;
3745	char buf, name;	3799	char buf, name;
3746	bool query = str[0] == '?' && !str[1];	3800	bool query = str[0] == '?' && !str[1];
3747	int saveop = op;	3801	int saveop = op;
3748	dDisp;	3802
		3803	dLocal (Display *, dpy);
3749		3804
3750	assert (str != NULL);	3805	assert (str != NULL);
		3806
		3807	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
		3808	return;
		3809
3751	switch (op)	3810	switch (op)
3752	{	3811	{
3753	case XTerm_name:	3812	case XTerm_name:
3754	set_title (str);	3813	set_title (str);
3755	/* FALLTHROUGH */	3814	/* FALLTHROUGH */
…		…
3769	unsigned long bytes_after;	3828	unsigned long bytes_after;
3770	unsigned char *value = 0;	3829	unsigned char *value = 0;
3771	const char *str = "";	3830	const char *str = "";
3772		3831
3773	if (prop	3832	if (prop
3774	&& XGetWindowProperty (disp, parent[0],	3833	&& XGetWindowProperty (dpy, parent[0],
3775	prop, 0, 1<<16, 0, AnyPropertyType,	3834	prop, 0, 1<<16, 0, AnyPropertyType,
3776	&actual_type, &actual_format,	3835	&actual_type, &actual_format,
3777	&nitems, &bytes_after, &value) == Success	3836	&nitems, &bytes_after, &value) == Success
3778	&& actual_type != None	3837	&& actual_type != None
3779	&& actual_format == 8)	3838	&& actual_format == 8)
3780	str = (const char *)(value);	3839	str = (const char *)(value);
3781		3840
3782	tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);	3841	tt_printf ("\033]%d;%s%c", op, str, resp);
3783		3842
3784	XFree (value);	3843	XFree (value);
3785	}	3844	}
3786	else	3845	else
3787	{	3846	{
…		…
3791	{	3850	{
3792	*eq = 0;	3851	*eq = 0;
3793	set_utf8_property (display->atom (str), eq + 1);	3852	set_utf8_property (display->atom (str), eq + 1);
3794	}	3853	}
3795	else	3854	else
3796	XDeleteProperty (disp, parent[0],	3855	XDeleteProperty (dpy, parent[0],
3797	display->atom (str));	3856	display->atom (str));
3798	}	3857	}
3799	break;	3858	break;
3800		3859
3801	case XTerm_Color:	3860	case XTerm_Color:
…		…
3811	break;	3870	break;
3812		3871
3813	if ((buf = strchr (name, ';')) != NULL)	3872	if ((buf = strchr (name, ';')) != NULL)
3814	*buf++ = '\0';	3873	*buf++ = '\0';
3815		3874
3816	if (name[0] == '?' && !name[1])	3875	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	}	3876	}
3825	break;	3877	break;
3826	case XTerm_Color00:	3878	case XTerm_Color00:
3827	process_color_seq (XTerm_Color00, Color_fg, str, resp);	3879	process_color_seq (op, Color_fg, str, resp);
3828	break;	3880	break;
3829	case XTerm_Color01:	3881	case XTerm_Color01:
3830	process_color_seq (XTerm_Color01, Color_bg, str, resp);	3882	process_color_seq (op, Color_bg, str, resp);
3831	break;	3883	break;
3832	#ifndef NO_CURSORCOLOR	3884	#ifndef NO_CURSORCOLOR
3833	case XTerm_Color_cursor:	3885	case XTerm_Color_cursor:
3834	process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);	3886	process_color_seq (op, Color_cursor, str, resp);
3835	break;	3887	break;
3836	#endif	3888	#endif
3837	case XTerm_Color_pointer_fg:	3889	case XTerm_Color_pointer_fg:
3838	process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);	3890	process_color_seq (op, Color_pointer_fg, str, resp);
3839	break;	3891	break;
3840	case XTerm_Color_pointer_bg:	3892	case XTerm_Color_pointer_bg:
3841	process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);	3893	process_color_seq (op, Color_pointer_bg, str, resp);
3842	break;	3894	break;
3843	#ifndef NO_BOLD_UNDERLINE_REVERSE	3895	#ifndef NO_BOLD_UNDERLINE_REVERSE
3844	case XTerm_Color_RV:	3896	case XTerm_Color_RV:
3845	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3897	process_color_seq (op, Color_RV, str, resp);
3846	break;	3898	break;
3847	case Rxvt_Color_BD:	3899	case Rxvt_Color_BD:
3848	case URxvt_Color_BD:	3900	case URxvt_Color_BD:
3849	process_color_seq (op, Color_BD, str, resp);	3901	process_color_seq (op, Color_BD, str, resp);
3850	break;	3902	break;
3851	case Rxvt_Color_UL:	3903	case Rxvt_Color_UL:
3852	case URxvt_Color_UL:	3904	case URxvt_Color_UL:
3853	process_color_seq (op, Color_UL, str, resp);	3905	process_color_seq (op, Color_UL, str, resp);
3854	break;	3906	break;
3855	case URxvt_Color_IT:	3907	case URxvt_Color_IT:
3856	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);	3908	process_color_seq (op, Color_IT, str, resp);
3857	break;	3909	break;
3858	#endif	3910	#endif
3859	#if TRANSPARENT && TINTING	3911	#if TRANSPARENT && TINTING
3860	case URxvt_Color_tint:	3912	case URxvt_Color_tint:
3861	process_color_seq (URxvt_Color_tint, Color_tint, str, resp);	3913	process_color_seq (op, Color_tint, str, resp);
		3914
3862	check_our_parents ();	3915	check_our_parents ();
		3916
3863	if (am_transparent)	3917	if (am_transparent)
3864	want_full_refresh = want_refresh = 1;	3918	want_full_refresh = want_refresh = 1;
		3919
3865	break;	3920	break;
3866	#endif	3921	#endif
3867		3922
3868	case Rxvt_Pixmap:	3923	case Rxvt_Pixmap:
3869	{	3924	{
…		…
3927	case URxvt_italicFont:	3982	case URxvt_italicFont:
3928	case URxvt_boldItalicFont:	3983	case URxvt_boldItalicFont:
3929	#endif	3984	#endif
3930	if (query)	3985	if (query)
3931	tt_printf ("\33]%d;%-.250s%c", saveop,	3986	tt_printf ("\33]%d;%-.250s%c", saveop,
3932	OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc	3987	option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3933	? fontset[op - URxvt_font]->fontdesc : "",	3988	? fontset[op - URxvt_font]->fontdesc : "",
3934	resp);	3989	resp);
3935	else	3990	else
3936	{	3991	{
3937	const char *&res = rs[Rs_font + (op - URxvt_font)];	3992	const char *&res = rs[Rs_font + (op - URxvt_font)];
…		…
3940	allocated.push_back ((void *)res);	3995	allocated.push_back ((void *)res);
3941	set_fonts ();	3996	set_fonts ();
3942	}	3997	}
3943	break;	3998	break;
3944		3999
3945	#if ENABLE_FRILLS	4000	case URxvt_version:
		4001	if (query)
		4002	tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
		4003	op,
		4004	rs[Rs_name], VERSION[0], VERSION[2],
		4005	resp);
		4006	break;
		4007
		4008	#if !ENABLE_MINIMAL
3946	case URxvt_locale:	4009	case URxvt_locale:
3947	if (query)	4010	if (query)
3948	tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);	4011	tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3949	else	4012	else
3950	{	4013	{
3951	set_locale (str);	4014	set_locale (str);
3952	pty->set_utf8_mode (enc_utf8);	4015	pty->set_utf8_mode (enc_utf8);
3953	init_xlocale ();	4016	init_xlocale ();
…		…
3968	break;	4031	break;
3969	#endif	4032	#endif
3970		4033
3971	#if ENABLE_PERL	4034	#if ENABLE_PERL
3972	case URxvt_perl:	4035	case URxvt_perl:
3973	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))	4036	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3974	; // no responses yet	4037	; // no responses yet
3975	break;	4038	break;
3976	#endif	4039	#endif
3977	}	4040	}
3978	}	4041	}
…		…
4094	scr_touch (true);	4157	scr_touch (true);
4095	break;	4158	break;
4096	#endif	4159	#endif
4097	case 1048: /* alternative cursor save */	4160	case 1048: /* alternative cursor save */
4098	case 1049:	4161	case 1049:
4099	if (OPTION (Opt_secondaryScreen))	4162	if (option (Opt_secondaryScreen))
4100	if (mode == 0)	4163	if (mode == 0)
4101	scr_cursor (RESTORE);	4164	scr_cursor (RESTORE);
4102	else if (mode == 1)	4165	else if (mode == 1)
4103	scr_cursor (SAVE);	4166	scr_cursor (SAVE);
4104	break;	4167	break;
…		…
4169	break;	4232	break;
4170	case 1011: /* scroll to bottom on key press */	4233	case 1011: /* scroll to bottom on key press */
4171	set_option (Opt_scrollTtyKeypress, state);	4234	set_option (Opt_scrollTtyKeypress, state);
4172	break;	4235	break;
4173	case 1047: /* secondary screen w/ clearing last */	4236	case 1047: /* secondary screen w/ clearing last */
4174	if (OPTION (Opt_secondaryScreen))	4237	if (option (Opt_secondaryScreen))
4175	if (current_screen != PRIMARY)	4238	if (current_screen != PRIMARY)
4176	scr_erase_screen (2);	4239	scr_erase_screen (2);
4177	scr_change_screen (state);	4240	scr_change_screen (state);
4178	break;	4241	break;
4179	case 1049: /* secondary screen w/ clearing first */	4242	case 1049: /* secondary screen w/ clearing first */
4180	scr_change_screen (state);	4243	scr_change_screen (state);
4181	if (OPTION (Opt_secondaryScreen))	4244	if (option (Opt_secondaryScreen))
4182	if (current_screen != PRIMARY)	4245	if (current_screen != PRIMARY)
4183	scr_erase_screen (2);	4246	scr_erase_screen (2);
4184	break;	4247	break;
4185	default:	4248	default:
4186	break;	4249	break;
…		…
4314	scr_color (Color_bg, Color_bg);	4377	scr_color (Color_bg, Color_bg);
4315	break;	4378	break;
4316		4379
4317	//case 50: // not variable spacing	4380	//case 50: // not variable spacing
4318		4381
4319	#if ENABLE_FRILLS	4382	#if !ENABLE_MINIMAL
4320	case 90:	4383	case 90:
4321	case 91: /* set bright fg color */	4384	case 91: /* set bright fg color */
4322	case 92:	4385	case 92:
4323	case 93:	4386	case 93:
4324	case 94:	4387	case 94:

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.283 by root, Tue Jan 24 19:40:12 2006 UTC vs. Revision 1.323 by ayin, Mon May 28 18:38:03 2007 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.283 by root, Tue Jan 24 19:40:12 2006 UTC vs.
Revision 1.323 by ayin, Mon May 28 18:38:03 2007 UTC