ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/rxvt-unicode/src/command.C

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.277 by root, Fri Jan 20 12:16:28 2006 UTC vs.
Revision 1.347 by sasha, Wed Aug 15 22:41:52 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
…		…
96	XK_Shift_L, 0x21e7,	95	XK_Shift_L, 0x21e7,
97	XK_Shift_R, 0x21e7,	96	XK_Shift_R, 0x21e7,
98		97
99	XK_Shift_Lock, 0x21eb,	98	XK_Shift_Lock, 0x21eb,
100	XK_ISO_Lock, 0x21eb,	99	XK_ISO_Lock, 0x21eb,
101	XK_ISO_Lock, 0x21eb,
102	XK_Caps_Lock, 0x21ec,	100	XK_Caps_Lock, 0x21ec,
103	XK_Num_Lock, 0x21ed,	101	XK_Num_Lock, 0x21ed,
104	XK_ISO_Level3_Shift, 0x21ee,	102	XK_ISO_Level3_Shift, 0x21ee,
105	XK_ISO_Level3_Lock, 0x21ef,	103	XK_ISO_Level3_Lock, 0x21ef,
106	XK_ISO_Group_Lock, 0x21f0,	104	XK_ISO_Group_Lock, 0x21f0,
…		…
227	# if !UNICODE3	225	# if !UNICODE3
228	if (ch >= 0x10000)	226	if (ch >= 0x10000)
229	ch = 0xfffd;	227	ch = 0xfffd;
230	# endif	228	# endif
231	scr_overlay_set (11, y, ch, r);	229	scr_overlay_set (11, y, ch, r);
		230
		231	if (WCWIDTH (ch) >= 2)
232	scr_overlay_set (12, y, NOCHAR, r);	232	scr_overlay_set (12, y, NOCHAR, r);
233	}	233	}
234		234
		235	// {
		236	// char buf[4+4+3+1];
		237	// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
		238	// scr_overlay_set (0, 0, buf);
		239	// }
235	scr_overlay_set (0, len , attr);	240	scr_overlay_set (0, len , attr);
236	scr_overlay_set (0, len + 1, fname);	241	scr_overlay_set (0, len + 1, fname);
237		242
238	free (fname);	243	free (fname);
239		244
…		…
292		297
293	return -1;	298	return -1;
294	}	299	}
295	#endif	300	#endif
296		301
297	/*{{{ Convert the keypress event into a string */
298	void	302	void
299	rxvt_term::lookup_key (XKeyEvent &ev)	303	rxvt_term::key_press (XKeyEvent &ev)
300	{	304	{
301	int ctrl, meta, shft, len;	305	int ctrl, meta, shft, len;
302	unsigned int newlen;	306	unsigned int newlen;
303	KeySym keysym;	307	KeySym keysym;
304	#ifdef DEBUG_CMD
305	static int debug_key = 1; /* accessible by a debugger only */
306	#endif
307	int valid_keysym;	308	int valid_keysym;
308	char kbuf[KBUFSZ];	309	char kbuf[KBUFSZ];
		310
		311	#if ISO_14755
		312	if (iso14755buf & ISO_14755_52)
		313	return;
		314	#endif
309		315
310	/*	316	/*
311	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an	317	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
312	* escape sequence to toggle the Keypad.	318	* escape sequence to toggle the Keypad.
313	*	319	*
…		…
493	# if ISO_14755	499	# if ISO_14755
494	iso14755_51 (0);	500	iso14755_51 (0);
495	# endif	501	# endif
496	return;	502	return;
497	}	503	}
		504	else if (keysym == XK_BackSpace)
		505	{
		506	iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
		507	# if ISO_14755
		508	iso14755_51 (iso14755buf & ISO_14755_MASK);
		509	# endif
		510	return;
		511	}
498	else if ((hv = hex_keyval (ev)) >= 0)	512	else if ((hv = hex_keyval (ev)) >= 0)
499	{	513	{
500	iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)	514	iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
501	| hv | ISO_14755_51;	515	| hv | ISO_14755_51;
502	# if ISO_14755	516	# if ISO_14755
…		…
504	# endif	518	# endif
505	return;	519	return;
506	}	520	}
507	else	521	else
508	{	522	{
509	# if ENABLE_OVERLAY	523	# if ISO_14755
510	scr_overlay_off ();	524	scr_overlay_off ();
511	# endif	525	# endif
512	iso14755buf = 0;	526	iso14755buf = 0;
513	}	527	}
514	}	528	}
515	else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))	529	else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
516	|| (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))	530	|| (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
517	if (!(iso14755buf & ISO_14755_STARTED))	531	if (!(iso14755buf & ISO_14755_STARTED))
518	{	532	{
519	iso14755buf |= ISO_14755_STARTED;	533	iso14755buf |= ISO_14755_STARTED;
520	# if ENABLE_OVERLAY	534	# if ISO_14755
521	scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);	535	scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
522	scr_overlay_set (0, 0, "ISO 14755 mode");	536	scr_overlay_set (0, 0, "ISO 14755 mode");
523	# endif	537	# endif
524	}	538	}
525	#endif	539	#endif
526		540
527	#ifdef PRINTPIPE	541	#ifdef PRINTPIPE
528	if (keysym == XK_Print)	542	if (keysym == XK_Print)
529	{	543	{
530	scr_printscreen (ctrl | shft);	544	scr_printscreen (ctrl | shft);
531	return;	545	return;
…		…
713		727
714	case XK_Find:	728	case XK_Find:
715	strcpy (kbuf, "\033[1~");	729	strcpy (kbuf, "\033[1~");
716	break;	730	break;
717		731
718	#ifdef XK_KP_End	732	#ifdef XK_KP_Insert
719	case XK_KP_Insert:	733	case XK_KP_Insert:
720	/* allow shift to override */	734	/* allow shift to override */
721	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)	735	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
722	{	736	{
723	strcpy (kbuf, "\033Op");	737	strcpy (kbuf, "\033Op");
…		…
870	return;	884	return;
871		885
872	if (len <= 0)	886	if (len <= 0)
873	return; /* not mapped */	887	return; /* not mapped */
874		888
875	if (OPTION (Opt_scrollTtyKeypress))	889	if (option (Opt_scrollTtyKeypress))
876	if (view_start)	890	if (view_start)
877	{	891	{
878	view_start = 0;	892	view_start = 0;
879	want_refresh = 1;	893	want_refresh = 1;
880	}	894	}
…		…
902	{	916	{
903	const char ch = C0_ESC;	917	const char ch = C0_ESC;
904	tt_write (&ch, 1);	918	tt_write (&ch, 1);
905	}	919	}
906		920
907	#if defined(DEBUG_CMD)
908	/* Display keyboard buffer contents */
909	unsigned char *p;
910	int i;
911
912	fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
913	for (i = 0, p = kbuf; i < len; i++, p++)
914	fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
915	fprintf (stderr, "'\n");
916	#endif /* DEBUG_CMD */
917	tt_write (kbuf, (unsigned int)len);	921	tt_write (kbuf, (unsigned int)len);
918	}	922	}
919	/*}}} */	923
		924	void
		925	rxvt_term::key_release (XKeyEvent &ev)
		926	{
		927	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
		928	KeySym keysym;
		929
		930	keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
		931	#endif
		932
		933	#if ENABLE_FRILLS || ISO_14755
		934	// ISO 14755 support
		935	if (iso14755buf)
		936	if (iso14755buf & ISO_14755_52)
		937	{
		938	# if ISO_14755
		939	scr_overlay_off ();
		940	# endif
		941	# if ISO_14755
		942	// iso14755 part 5.2 handling: release time
		943	// first: controls
		944	if ((ev.state & ControlMask)
		945	&& ((keysym >= 0x40 && keysym <= 0x5f)
		946	|| (keysym >= 0x61 && keysym <= 0x7f)))
		947	{
		948	iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
		949	commit_iso14755 ();
		950
		951	return;
		952	}
		953
		954	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
		955	if (i[0] == keysym)
		956	{
		957	iso14755buf = ISO_14755_51 | i[1];
		958	commit_iso14755 ();
		959
		960	return;
		961	}
		962
		963	scr_bell ();
		964	# endif
		965	iso14755buf = 0;
		966
		967	return;
		968	}
		969	else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
		970	{
		971	# if ISO_14755
		972	scr_overlay_off ();
		973	# endif
		974	if (iso14755buf & ISO_14755_51)
		975	commit_iso14755 ();
		976	#if ISO_14755
		977	else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
		978	{
		979	iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
		980
		981	scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
		982	scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
		983	}
		984	# endif
		985	else
		986	iso14755buf = 0;
		987	}
		988	#endif
		989
		990	if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
		991	return;
		992
		993	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
		994	if (!(ev.state & ControlMask))
		995	slip_wheel_ev.stop ();
		996	else if (keysym == XK_Control_L || keysym == XK_Control_R)
		997	mouse_slip_wheel_speed = 0;
		998	#endif
		999	}
920		1000
921	#if defined (KEYSYM_RESOURCE)	1001	#if defined (KEYSYM_RESOURCE)
922	unsigned int	1002	unsigned int
923	rxvt_term::cmd_write (const char *str, unsigned int count)	1003	rxvt_term::cmd_write (const char *str, unsigned int count)
924	{	1004	{
…		…
954	void	1034	void
955	rxvt_term::flush ()	1035	rxvt_term::flush ()
956	{	1036	{
957	flush_ev.stop ();	1037	flush_ev.stop ();
958		1038
959	#ifdef TRANSPARENT	1039	#ifdef ENABLE_TRANSPARENCY
960	if (want_full_refresh)	1040	if (want_full_refresh)
961	{	1041	{
962	want_full_refresh = 0;	1042	want_full_refresh = 0;
963	scr_clear ();	1043	scr_clear ();
964	scr_touch (false);	1044	scr_touch (false);
…		…
1029	void	1109	void
1030	rxvt_term::flush_cb (time_watcher &w)	1110	rxvt_term::flush_cb (time_watcher &w)
1031	{	1111	{
1032	make_current ();	1112	make_current ();
1033		1113
1034	refresh_limit = 1;
1035	refresh_count = 0;	1114	refresh_count = 0;
1036	flush ();	1115	flush ();
1037	}	1116	}
1038		1117
1039	#ifdef CURSOR_BLINK	1118	#ifdef CURSOR_BLINK
…		…
1101	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1180	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1102	}	1181	}
1103	}	1182	}
1104	#endif	1183	#endif
1105		1184
1106	#if HAVE_SCHED_YIELD	1185	#if LINUX_YIELD_HACK
1107	static struct event_handler	1186	static struct event_handler
1108	{	1187	{
1109	check_watcher cw_yield;	1188	check_watcher yield_ev;
1110		1189
1111	void yield (check_watcher &w)	1190	void yield_cb (check_watcher &w)
1112	{	1191	{
1113	sched_yield ();	1192	// this should really be sched_yield(), but the linux guys thought
		1193	// that giving a process calling sched_yield () less cpu time than
		1194	// ones with high nice levels is a useful thing to do. It surely is is
		1195	// allowed by the sus... as is returning ENOSYS.
		1196
		1197	struct timespec ts = { 0, 0 };
		1198	nanosleep (&ts, 0);
		1199
1114	w.stop ();	1200	w.stop ();
1115	}	1201	}
1116		1202
1117	event_handler ()	1203	event_handler ()
1118	: cw_yield (this, &event_handler::yield)	1204	: yield_ev (this, &event_handler::yield_cb)
1119	{	1205	{
1120	}	1206	}
1121	} event_handler;	1207	} event_handler;
1122	#endif	1208	#endif
1123		1209
…		…
1143	cmdbuf_endp += r;	1229	cmdbuf_endp += r;
1144	return true;	1230	return true;
1145	}	1231	}
1146	else if (r < 0 && (errno == EAGAIN || errno == EINTR))	1232	else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1147	{	1233	{
1148	#if HAVE_SCHED_YIELD	1234	#if LINUX_YIELD_HACK
1149	if (display->is_local)	1235	if (display->is_local)
1150	event_handler.cw_yield.start ();	1236	event_handler.yield_ev.start ();
1151	#endif	1237	#endif
1152	}	1238	}
1153	else	1239	else
1154	{	1240	{
1155	pty_ev.stop ();	1241	pty_ev.stop ();
1156		1242
1157	if (!OPTION (Opt_hold))	1243	if (!option (Opt_hold))
1158	destroy ();	1244	destroy ();
1159	}	1245	}
1160		1246
1161	return false;	1247	return false;
1162	}	1248	}
1163		1249
1164	void	1250	void
1165	rxvt_term::pty_cb (io_watcher &w, short revents)	1251	rxvt_term::pty_cb (io_watcher &w, short revents)
…		…
1177	}	1263	}
1178		1264
1179	void	1265	void
1180	rxvt_term::pointer_unblank ()	1266	rxvt_term::pointer_unblank ()
1181	{	1267	{
1182	XDefineCursor (display->display, vt, TermWin_cursor);	1268	XDefineCursor (dpy, vt, TermWin_cursor);
1183	recolour_cursor ();	1269	recolour_cursor ();
1184		1270
1185	#ifdef POINTER_BLANK	1271	#ifdef POINTER_BLANK
1186	hidden_pointer = 0;	1272	hidden_pointer = 0;
1187		1273
1188	if (OPTION (Opt_pointerBlank))	1274	if (option (Opt_pointerBlank))
1189	pointer_ev.start (NOW + pointerBlankDelay);	1275	pointer_ev.start (NOW + pointerBlankDelay);
1190	#endif	1276	#endif
1191	}	1277	}
1192		1278
1193	#ifdef POINTER_BLANK	1279	#ifdef POINTER_BLANK
1194	void	1280	void
1195	rxvt_term::pointer_blank ()	1281	rxvt_term::pointer_blank ()
1196	{	1282	{
1197	if (!OPTION (Opt_pointerBlank))	1283	if (!option (Opt_pointerBlank))
1198	return;	1284	return;
1199		1285
1200	XDefineCursor (display->display, vt, display->blank_cursor);	1286	XDefineCursor (dpy, vt, display->blank_cursor);
1201	XFlush (display->display);	1287	XFlush (dpy);
1202		1288
1203	hidden_pointer = 1;	1289	hidden_pointer = 1;
1204	}	1290	}
1205		1291
1206	void	1292	void
…		…
1279	(32 + button_number + key_state),	1365	(32 + button_number + key_state),
1280	(32 + x + 1),	1366	(32 + x + 1),
1281	(32 + y + 1));	1367	(32 + y + 1));
1282	}	1368	}
1283		1369
1284	#ifdef USING_W11LIB
1285	void
1286	rxvt_W11_process_x_event (XEvent *ev)
1287	{
1288	rxvt_t *r = rxvt_get_r ();
1289
1290	x_cb (*ev);
1291	}
1292	#endif
1293
1294	/*{{{ process an X event */	1370	/*{{{ process an X event */
1295	void	1371	void
1296	rxvt_term::x_cb (XEvent &ev)	1372	rxvt_term::x_cb (XEvent &ev)
1297	{	1373	{
1298	make_current ();	1374	make_current ();
1299		1375
1300	dDisp;	1376	dLocal (Display *, dpy);
1301		1377
1302	if (ev.xany.window == vt	1378	if (ev.xany.window == vt
1303	&& SHOULD_INVOKE (HOOK_X_EVENT)	1379	&& SHOULD_INVOKE (HOOK_X_EVENT)
1304	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))	1380	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1305	return;	1381	return;
…		…
1310	unsigned int unused_mask;	1386	unsigned int unused_mask;
1311		1387
1312	switch (ev.type)	1388	switch (ev.type)
1313	{	1389	{
1314	case KeyPress:	1390	case KeyPress:
1315	#if ISO_14755	1391	key_press (ev.xkey);
1316	if (!(iso14755buf & ISO_14755_52))
1317	#endif
1318	lookup_key (ev.xkey);
1319
1320	break;	1392	break;
1321		1393
1322	case KeyRelease:	1394	case KeyRelease:
1323	{	1395	key_release (ev.xkey);
1324	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1325	KeySym keysym;
1326
1327	keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1328	#endif
1329
1330	#if ENABLE_FRILLS || ISO_14755
1331	// ISO 14755 support
1332	if (iso14755buf)
1333	if (iso14755buf & ISO_14755_52)
1334	{
1335	# if ENABLE_OVERLAY
1336	scr_overlay_off ();
1337	# endif
1338	# if ISO_14755
1339	// iso14755 part 5.2 handling: release time
1340	// first: controls
1341	if ((ev.xkey.state & ControlMask)
1342	&& ((keysym >= 0x40 && keysym <= 0x5f)
1343	|| (keysym >= 0x61 && keysym <= 0x7f)))
1344	{
1345	iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1346	commit_iso14755 ();
1347	goto skip_switch;
1348	}
1349
1350	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1351	if (i[0] == keysym)
1352	{
1353	iso14755buf = ISO_14755_51 | i[1];
1354	commit_iso14755 ();
1355	goto skip_switch;
1356	}
1357
1358	scr_bell ();
1359	# endif
1360	iso14755buf = 0;
1361	break;
1362	}
1363	else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1364	{
1365	# if ENABLE_OVERLAY
1366	scr_overlay_off ();
1367	# endif
1368	if (iso14755buf & ISO_14755_51)
1369	commit_iso14755 ();
1370	#if ISO_14755
1371	else if (iso14755buf & ISO_14755_STARTED)
1372	{
1373	iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1374
1375	scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1376	scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1377	}
1378	# endif
1379	else
1380	iso14755buf = 0;
1381	}
1382	#endif
1383
1384	if (ev.xany.window == vt
1385	&& HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1386	break;
1387
1388	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1389	if (!(ev.xkey.state & ControlMask))
1390	slip_wheel_ev.stop ();
1391	else if (keysym == XK_Control_L || keysym == XK_Control_R)
1392	mouse_slip_wheel_speed = 0;
1393	#endif
1394	break;	1396	break;
1395	}
1396		1397
1397	case ButtonPress:	1398	case ButtonPress:
1398	button_press (ev.xbutton);	1399	button_press (ev.xbutton);
1399	break;	1400	break;
1400		1401
…		…
1415	if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))	1416	if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1416	destroy ();	1417	destroy ();
1417	}	1418	}
1418	#if ENABLE_EWMH	1419	#if ENABLE_EWMH
1419	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])	1420	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1420	XSendEvent (disp, ev.xclient.window = display->root,	1421	XSendEvent (dpy, ev.xclient.window = display->root,
1421	False, SubstructureRedirectMask | SubstructureNotifyMask,	1422	False, SubstructureRedirectMask | SubstructureNotifyMask,
1422	&ev);	1423	&ev);
1423	#endif	1424	#endif
1424	}	1425	}
1425	}	1426	}
…		…
1431	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)	1432	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1432	focus_out ();	1433	focus_out ();
1433	}	1434	}
1434	#endif	1435	#endif
1435	}	1436	}
1436	break;
1437
1438	case MappingNotify:
1439	XRefreshKeyboardMapping (&ev.xmapping);
1440	break;	1437	break;
1441		1438
1442	/*	1439	/*
1443	* XXX: this is not the _current_ arrangement	1440	* XXX: this is not the _current_ arrangement
1444	* Here's my conclusion:	1441	* Here's my conclusion:
…		…
1463	break;	1460	break;
1464	}	1461	}
1465	break;	1462	break;
1466		1463
1467	case FocusIn:	1464	case FocusIn:
		1465	if (ev.xfocus.detail != NotifyInferior
		1466	&& ev.xfocus.detail != NotifyPointer
		1467	&& ev.xfocus.mode != NotifyGrab)
1468	focus_in ();	1468	focus_in ();
1469	break;	1469	break;
1470		1470
1471	case FocusOut:	1471	case FocusOut:
		1472	if (ev.xfocus.detail != NotifyInferior
		1473	&& ev.xfocus.detail != NotifyPointer
		1474	&& ev.xfocus.mode != NotifyGrab)
1472	focus_out ();	1475	focus_out ();
1473	break;	1476	break;
1474		1477
1475	case ConfigureNotify:	1478	case ConfigureNotify:
1476	if (ev.xconfigure.window == parent[0])	1479	if (ev.xconfigure.window == parent[0])
1477	{	1480	{
1478	while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))	1481	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1479	;	1482	;
1480		1483
1481	if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)	1484	if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1482	{	1485	{
1483	seen_resize = 1;	1486	seen_resize = 1;
1484	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1487	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1485	}	1488	}
1486		1489	else
		1490	{
		1491	#ifdef ENABLE_TRANSPARENCY
		1492	if (option (Opt_transparent))
		1493	if (bgPixmap.render ())
		1494	scr_touch (false);
		1495	#endif
		1496	}
1487	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));	1497	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1488
1489	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1490	if (OPTION (Opt_transparent))
1491	check_our_parents ();
1492	#endif
1493	}	1498	}
1494	break;	1499	break;
1495		1500
1496	case PropertyNotify:	1501	case PropertyNotify:
		1502	if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1497	if (ev.xproperty.atom == xa[XA_VT_SELECTION]	1503	if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1498	&& ev.xproperty.state == PropertyNewValue)	1504	&& ev.xproperty.state == PropertyNewValue)
1499	selection_property (ev.xproperty.window, ev.xproperty.atom);	1505	selection_property (ev.xproperty.window, ev.xproperty.atom);
1500		1506
1501	break;	1507	break;
1502		1508
1503	case SelectionClear:	1509	case SelectionClear:
1504	selection_clear ();	1510	selection_clear ();
…		…
1527	text_blink_ev.stop ();	1533	text_blink_ev.stop ();
1528	#endif	1534	#endif
1529	HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));	1535	HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1530	break;	1536	break;
1531		1537
1532	#ifdef TRANSPARENT	1538	#ifdef ENABLE_TRANSPARENCY
1533	case ReparentNotify:	1539	case ReparentNotify:
1534	rootwin_cb (ev);	1540	rootwin_cb (ev);
1535	break;	1541	break;
1536	#endif /* TRANSPARENT */	1542	#endif /* ENABLE_TRANSPARENCY */
1537		1543
1538	case GraphicsExpose:	1544	case GraphicsExpose:
1539	case Expose:	1545	case Expose:
1540	if (ev.xany.window == vt)	1546	if (ev.xany.window == vt)
1541	{	1547	{
1542	do	1548	do
1543	scr_expose (ev.xexpose.x, ev.xexpose.y,	1549	scr_expose (ev.xexpose.x, ev.xexpose.y,
1544	ev.xexpose.width, ev.xexpose.height, False);	1550	ev.xexpose.width, ev.xexpose.height, False);
1545	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));	1551	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1546		1552
1547	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1553	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1548		1554
1549	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))	1555	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1550	scr_expose (ev.xexpose.x, ev.xexpose.y,	1556	scr_expose (ev.xexpose.x, ev.xexpose.y,
1551	ev.xexpose.width, ev.xexpose.height, False);	1557	ev.xexpose.width, ev.xexpose.height, False);
1552		1558
1553	want_refresh = 1;	1559	want_refresh = 1;
1554	}	1560	}
1555	else	1561	else
1556	{	1562	{
1557	XEvent unused_event;	1563	XEvent unused_event;
1558		1564
1559	while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))	1565	while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1560	;	1566	;
1561	while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))	1567	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1562	;	1568	;
1563		1569
1564	if (isScrollbarWindow (ev.xany.window))	1570	if (isScrollbarWindow (ev.xany.window))
1565	{	1571	{
1566	scrollBar.setIdle ();	1572	scrollBar.setIdle ();
1567	scrollbar_show (0);	1573	scrollbar_show (0);
1568	}	1574	}
1569
1570	#ifdef TRANSPARENT
1571	if (am_transparent && ev.xany.window == parent[0])
1572	XClearWindow (disp, ev.xany.window);
1573	#endif
1574	}	1575	}
1575	break;	1576	break;
1576		1577
1577	case MotionNotify:	1578	case MotionNotify:
1578	#ifdef POINTER_BLANK	1579	#ifdef POINTER_BLANK
…		…
1587	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)	1588	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1588	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))	1589	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1589	; // nop	1590	; // nop
1590	else if (ev.xbutton.state & (Button1Mask | Button3Mask))	1591	else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1591	{	1592	{
1592	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))	1593	while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1593	;	1594	;
1594		1595
1595	XQueryPointer (disp, vt,	1596	XQueryPointer (dpy, vt,
1596	&unused_root, &unused_child,	1597	&unused_root, &unused_child,
1597	&unused_root_x, &unused_root_y,	1598	&unused_root_x, &unused_root_y,
1598	&ev.xbutton.x, &ev.xbutton.y,	1599	&ev.xbutton.x, &ev.xbutton.y,
1599	&ev.xbutton.state);	1600	&ev.xbutton.state);
1600	#ifdef MOUSE_THRESHOLD	1601	#ifdef MOUSE_THRESHOLD
…		…
1664	#endif	1665	#endif
1665	}	1666	}
1666	}	1667	}
1667	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1668	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1668	{	1669	{
1669	while (XCheckTypedWindowEvent (disp, scrollBar.win,	1670	while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1670	MotionNotify, &ev))	1671	MotionNotify, &ev))
1671	;	1672	;
1672		1673
1673	XQueryPointer (disp, scrollBar.win,	1674	XQueryPointer (dpy, scrollBar.win,
1674	&unused_root, &unused_child,	1675	&unused_root, &unused_child,
1675	&unused_root_x, &unused_root_y,	1676	&unused_root_x, &unused_root_y,
1676	&ev.xbutton.x, &ev.xbutton.y,	1677	&ev.xbutton.x, &ev.xbutton.y,
1677	&unused_mask);	1678	&unused_mask);
1678	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1679	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1679	scrollbar_size ());	1680	scrollbar_size ());
1680	want_refresh = 1;	1681	want_refresh = 1;
1681	refresh_limit = 0;
1682	scrollbar_show (1);	1682	scrollbar_show (1);
1683	}	1683	}
1684	break;	1684	break;
1685	}	1685	}
1686		1686
1687	skip_switch: ;
1688
1689	#if defined(CURSOR_BLINK)	1687	#if defined(CURSOR_BLINK)
1690	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)	1688	if (option (Opt_cursorBlink) && ev.type == KeyPress)
1691	{	1689	{
1692	if (hidden_cursor)	1690	if (hidden_cursor)
1693	{	1691	{
1694	hidden_cursor = 0;	1692	hidden_cursor = 0;
1695	want_refresh = 1;	1693	want_refresh = 1;
…		…
1698	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);	1696	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1699	}	1697	}
1700	#endif	1698	#endif
1701		1699
1702	#if defined(POINTER_BLANK)	1700	#if defined(POINTER_BLANK)
1703	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)	1701	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1704	{	1702	{
1705	if (ev.type == MotionNotify	1703	if (ev.type == MotionNotify
1706	|| ev.type == ButtonPress	1704	|| ev.type == ButtonPress
1707	|| ev.type == ButtonRelease)	1705	|| ev.type == ButtonRelease)
1708	if (hidden_pointer)	1706	if (hidden_pointer)
…		…
1720	if (!focus)	1718	if (!focus)
1721	{	1719	{
1722	focus = 1;	1720	focus = 1;
1723	want_refresh = 1;	1721	want_refresh = 1;
1724		1722
1725	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));	1723	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1726		1724
1727	#if USE_XIM	1725	#if USE_XIM
1728	if (Input_Context != NULL)	1726	if (Input_Context != NULL)
1729	{	1727	{
1730	IMSetStatusPosition ();	1728	IMSetPosition ();
1731	XSetICFocus (Input_Context);	1729	XSetICFocus (Input_Context);
1732	}	1730	}
1733	#endif	1731	#endif
1734	#if CURSOR_BLINK	1732	#if CURSOR_BLINK
1735	if (OPTION (Opt_cursorBlink))	1733	if (option (Opt_cursorBlink))
1736	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);	1734	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1737	#endif	1735	#endif
1738	#if OFF_FOCUS_FADING	1736	#if OFF_FOCUS_FADING
1739	if (rs[Rs_fade])	1737	if (rs[Rs_fade])
1740	{	1738	{
1741	pix_colors = pix_colors_focused;	1739	pix_colors = pix_colors_focused;
1742	scr_recolour ();	1740	scr_recolour ();
1743	}	1741	}
1744	#endif	1742	#endif
		1743	#if ENABLE_FRILLS
		1744	if (option (Opt_urgentOnBell))
		1745	{
		1746	XWMHints *h;
		1747
		1748	h = XGetWMHints(dpy, parent[0]);
		1749	if (h != NULL)
		1750	{
		1751	h->flags &= ~XUrgencyHint;
		1752	XSetWMHints(dpy, parent[0], h);
		1753	}
		1754	}
		1755	#endif
1745	}	1756	}
1746	}	1757	}
1747		1758
1748	void	1759	void
1749	rxvt_term::focus_out ()	1760	rxvt_term::focus_out ()
…		…
1757		1768
1758	#if ENABLE_FRILLS || ISO_14755	1769	#if ENABLE_FRILLS || ISO_14755
1759	if (iso14755buf)	1770	if (iso14755buf)
1760	{	1771	{
1761	iso14755buf = 0;	1772	iso14755buf = 0;
1762	# if ENABLE_OVERLAY	1773	# if ISO_14755
1763	scr_overlay_off ();	1774	scr_overlay_off ();
1764	# endif	1775	# endif
1765	}	1776	}
1766	#endif	1777	#endif
1767	#if USE_XIM	1778	#if USE_XIM
1768	if (Input_Context != NULL)	1779	if (Input_Context != NULL)
1769	XUnsetICFocus (Input_Context);	1780	XUnsetICFocus (Input_Context);
1770	#endif	1781	#endif
1771	#if CURSOR_BLINK	1782	#if CURSOR_BLINK
1772	if (OPTION (Opt_cursorBlink))	1783	if (option (Opt_cursorBlink))
1773	cursor_blink_ev.stop ();	1784	cursor_blink_ev.stop ();
1774	hidden_cursor = 0;	1785	hidden_cursor = 0;
1775	#endif	1786	#endif
1776	#if OFF_FOCUS_FADING	1787	#if OFF_FOCUS_FADING
1777	if (rs[Rs_fade])	1788	if (rs[Rs_fade])
…		…
1781	}	1792	}
1782	#endif	1793	#endif
1783	}	1794	}
1784	}	1795	}
1785		1796
1786	#if TRANSPARENT	1797	void
		1798	rxvt_term::update_fade_color (unsigned int idx)
		1799	{
		1800	#if OFF_FOCUS_FADING
		1801	if (rs[Rs_fade])
		1802	{
		1803	rgba c;
		1804	pix_colors [Color_fade].get (c);
		1805	pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
		1806	}
		1807	#endif
		1808	}
		1809
		1810	#if ENABLE_TRANSPARENCY || ENABLE_PERL
1787	void	1811	void
1788	rxvt_term::rootwin_cb (XEvent &ev)	1812	rxvt_term::rootwin_cb (XEvent &ev)
1789	{	1813	{
1790	make_current ();	1814	make_current ();
1791		1815
		1816	if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
		1817	&& HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
		1818	return;
		1819
		1820	# if ENABLE_TRANSPARENCY
1792	switch (ev.type)	1821	switch (ev.type)
1793	{	1822	{
1794	case PropertyNotify:	1823	case PropertyNotify:
1795	/*	1824	/*
1796	* if user used some Esetroot compatible prog to set the root bg,	1825	* if user used some Esetroot compatible prog to set the root bg,
1797	* use the property to determine the pixmap. We use it later on.	1826	* use the property to determine the pixmap. We use it later on.
1798	*/	1827	*/
1799	if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]	1828	if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1800	&& ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])	1829	|| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1801	return;	1830	{
1802		1831	bgPixmap.set_root_pixmap ();
1803	/* FALLTHROUGH */	1832	bgPixmap.render ();
1804	case ReparentNotify:	1833	}
1805	if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1806	want_refresh = want_full_refresh = 1;
1807	break;	1834	break;
1808	}	1835	}
		1836	# endif
1809	}	1837	}
1810	#endif	1838	#endif
1811		1839
1812	void	1840	void
1813	rxvt_term::button_press (XButtonEvent &ev)	1841	rxvt_term::button_press (XButtonEvent &ev)
…		…
1822	/*	1850	/*
1823	* VT window processing of button press	1851	* VT window processing of button press
1824	*/	1852	*/
1825	if (ev.window == vt)	1853	if (ev.window == vt)
1826	{	1854	{
		1855	if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
		1856	return;
		1857
1827	#if ISO_14755	1858	#if ISO_14755
1828	// 5.4	1859	// 5.4
1829	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))	1860	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1830	{	1861	{
1831	iso14755_54 (ev.x, ev.y);	1862	iso14755_54 (ev.x, ev.y);
…		…
1873	else	1904	else
1874	{	1905	{
1875	if (ev.button != MEvent.button)	1906	if (ev.button != MEvent.button)
1876	MEvent.clicks = 0;	1907	MEvent.clicks = 0;
1877		1908
1878	if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1879	switch (ev.button)	1909	switch (ev.button)
1880	{	1910	{
1881	case Button1:	1911	case Button1:
1882	/* allow meta + click to select rectangular areas */	1912	/* allow meta + click to select rectangular areas */
1883	/* should be done in screen.C */	1913	/* should be done in screen.C */
1884	#if ENABLE_FRILLS	1914	#if ENABLE_FRILLS
1885	selection.rect = !!(ev.state & ModMetaMask);	1915	selection.rect = !!(ev.state & ModMetaMask);
1886	#else	1916	#else
1887	selection.rect = false;	1917	selection.rect = false;
1888	#endif	1918	#endif
1889		1919
1890	/* allow shift+left click to extend selection */	1920	/* allow shift+left click to extend selection */
1891	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))	1921	if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1892	{	1922	{
1893	if (MEvent.button == Button1 && clickintime)	1923	if (MEvent.button == Button1 && clickintime)
1894	selection_rotate (ev.x, ev.y);	1924	selection_rotate (ev.x, ev.y);
1895	else	1925	else
1896	selection_extend (ev.x, ev.y, 1);	1926	selection_extend (ev.x, ev.y, 1);
1897	}	1927	}
1898	else	1928	else
1899	{	1929	{
1900	if (MEvent.button == Button1 && clickintime)	1930	if (MEvent.button == Button1 && clickintime)
1901	MEvent.clicks++;	1931	MEvent.clicks++;
1902	else	1932	else
1903	MEvent.clicks = 1;	1933	MEvent.clicks = 1;
1904		1934
1905	selection_click (MEvent.clicks, ev.x, ev.y);	1935	selection_click (MEvent.clicks, ev.x, ev.y);
1906	}	1936	}
1907		1937
1908	MEvent.button = Button1;	1938	MEvent.button = Button1;
1909	break;	1939	break;
1910		1940
1911	case Button3:	1941	case Button3:
1912	if (MEvent.button == Button3 && clickintime)	1942	if (MEvent.button == Button3 && clickintime)
1913	selection_rotate (ev.x, ev.y);	1943	selection_rotate (ev.x, ev.y);
1914	else	1944	else
1915	selection_extend (ev.x, ev.y, 1);	1945	selection_extend (ev.x, ev.y, 1);
1916		1946
1917	MEvent.button = Button3;	1947	MEvent.button = Button3;
1918	break;	1948	break;
1919	}	1949	}
1920	}	1950	}
1921		1951
1922	MEvent.time = ev.time;	1952	MEvent.time = ev.time;
1923	return;	1953	return;
1924	}	1954	}
1925		1955
…		…
2088	sel_scroll_ev.stop();	2118	sel_scroll_ev.stop();
2089	#endif	2119	#endif
2090		2120
2091	if (ev.window == vt)	2121	if (ev.window == vt)
2092	{	2122	{
		2123	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
		2124	return;
		2125
2093	#if ISO_14755	2126	#if ISO_14755
2094	// 5.4	2127	// 5.4
2095	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))	2128	if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2096	return;	2129	return;
2097	#endif	2130	#endif
		2131
2098	if (reportmode)	2132	if (reportmode)
2099	{	2133	{
2100	/* mouse report from vt window */	2134	/* mouse report from vt window */
2101	/* don't report release of wheel "buttons" */	2135	/* don't report release of wheel "buttons" */
2102	if (ev.button >= 4)	2136	if (ev.button >= 4)
…		…
2126	if (priv_modes & PrivMode_mouse_report	2160	if (priv_modes & PrivMode_mouse_report
2127	&& bypass_keystate	2161	&& bypass_keystate
2128	&& ev.button == Button1 && MEvent.clicks <= 1)	2162	&& ev.button == Button1 && MEvent.clicks <= 1)
2129	selection_extend (ev.x, ev.y, 0);	2163	selection_extend (ev.x, ev.y, 0);
2130		2164
2131	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2132	return;
2133
2134	switch (ev.button)	2165	switch (ev.button)
2135	{	2166	{
2136	case Button1:	2167	case Button1:
2137	case Button3:	2168	case Button3:
2138	selection_make (ev.time);	2169	selection_make (ev.time);
2139	break;	2170	break;
2140		2171
2141	case Button2:	2172	case Button2:
2142	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?	2173	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2143	selection_request (ev.time, ev.state & ShiftMask ? Sel_Clipboard : Sel_Primary);	2174	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2144	break;	2175	break;
2145		2176
2146	#ifdef MOUSE_WHEEL	2177	#ifdef MOUSE_WHEEL
2147	case Button4:	2178	case Button4:
2148	case Button5:	2179	case Button5:
…		…
2152		2183
2153	v = ev.button == Button4 ? UP : DN;	2184	v = ev.button == Button4 ? UP : DN;
2154		2185
2155	if (ev.state & ShiftMask)	2186	if (ev.state & ShiftMask)
2156	i = 1;	2187	i = 1;
2157	else if (OPTION (Opt_mouseWheelScrollPage))	2188	else if (option (Opt_mouseWheelScrollPage))
2158	i = nrow - 1;	2189	i = nrow - 1;
2159	else	2190	else
2160	i = 5;	2191	i = 5;
2161		2192
2162	# ifdef MOUSE_SLIP_WHEELING	2193	# ifdef MOUSE_SLIP_WHEELING
…		…
2183	break;	2214	break;
2184	#endif	2215	#endif
2185	}	2216	}
2186	}	2217	}
2187	}	2218	}
2188
2189	#ifdef TRANSPARENT
2190	#if TINTING
2191	/* taken from aterm-0.4.2 */
2192
2193	typedef uint32_t RUINT32T;
2194
2195	void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2196	{
2197	int sh_r, sh_g, sh_b;
2198	RUINT32T mask_r, mask_g, mask_b;
2199	RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2200	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2201	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2202	int i;
2203
2204	Visual *visual = display->visual;
2205
2206	if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2207
2208	/* for convenience */
2209	mask_r = visual->red_mask;
2210	mask_g = visual->green_mask;
2211	mask_b = visual->blue_mask;
2212
2213	/* boring lookup table pre-initialization */
2214	switch (srcImage->bits_per_pixel) {
2215	case 15:
2216	if ((mask_r != 0x7c00) ||
2217	(mask_g != 0x03e0) ||
2218	(mask_b != 0x001f))
2219	return;
2220	lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2221	lookup_r = lookup;
2222	lookup_g = lookup+32;
2223	lookup_b = lookup+32+32;
2224	sh_r = 10;
2225	sh_g = 5;
2226	sh_b = 0;
2227	break;
2228	case 16:
2229	if ((mask_r != 0xf800) ||
2230	(mask_g != 0x07e0) ||
2231	(mask_b != 0x001f))
2232	return;
2233	lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2234	lookup_r = lookup;
2235	lookup_g = lookup+32;
2236	lookup_b = lookup+32+64;
2237	sh_r = 11;
2238	sh_g = 5;
2239	sh_b = 0;
2240	break;
2241	case 24:
2242	if ((mask_r != 0xff0000) ||
2243	(mask_g != 0x00ff00) ||
2244	(mask_b != 0x0000ff))
2245	return;
2246	lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2247	lookup_r = lookup;
2248	lookup_g = lookup+256;
2249	lookup_b = lookup+256+256;
2250	sh_r = 16;
2251	sh_g = 8;
2252	sh_b = 0;
2253	break;
2254	case 32:
2255	if ((mask_r != 0xff0000) ||
2256	(mask_g != 0x00ff00) ||
2257	(mask_b != 0x0000ff))
2258	return;
2259	lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2260	lookup_r = lookup;
2261	lookup_g = lookup+256;
2262	lookup_b = lookup+256+256;
2263	sh_r = 16;
2264	sh_g = 8;
2265	sh_b = 0;
2266	break;
2267	default:
2268	return; /* we do not support this color depth */
2269	}
2270
2271	/* prepare limits for color transformation (each channel is handled separately) */
2272	if (shade < 0) {
2273	shade = -shade;
2274	if (shade < 0) shade = 0;
2275	if (shade > 100) shade = 100;
2276
2277	lower_lim_r = 65535-rm;
2278	lower_lim_g = 65535-gm;
2279	lower_lim_b = 65535-bm;
2280
2281	lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2282	lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2283	lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2284
2285	upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2286	} else {
2287	if (shade < 0) shade = 0;
2288	if (shade > 100) shade = 100;
2289
2290	lower_lim_r = lower_lim_g = lower_lim_b = 0;
2291
2292	upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2293	upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2294	upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2295	}
2296
2297	/* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2298	if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2299	{
2300	unsigned int tmp;
2301
2302	tmp = lower_lim_r;
2303	lower_lim_r = lower_lim_b;
2304	lower_lim_b = tmp;
2305
2306	tmp = upper_lim_r;
2307	upper_lim_r = upper_lim_b;
2308	upper_lim_b = tmp;
2309	}
2310
2311	/* fill our lookup tables */
2312	for (i = 0; i <= mask_r>>sh_r; i++)
2313	{
2314	RUINT32T tmp;
2315	tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2316	tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2317	lookup_r[i] = (tmp/65535)<<sh_r;
2318	}
2319	for (i = 0; i <= mask_g>>sh_g; i++)
2320	{
2321	RUINT32T tmp;
2322	tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2323	tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2324	lookup_g[i] = (tmp/65535)<<sh_g;
2325	}
2326	for (i = 0; i <= mask_b>>sh_b; i++)
2327	{
2328	RUINT32T tmp;
2329	tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2330	tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2331	lookup_b[i] = (tmp/65535)<<sh_b;
2332	}
2333
2334	/* apply table to input image (replacing colors by newly calculated ones) */
2335	switch (srcImage->bits_per_pixel)
2336	{
2337	case 15:
2338	{
2339	unsigned short *p1, *pf, *p, *pl;
2340	p1 = (unsigned short *) srcImage->data;
2341	pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2342	while (p1 < pf)
2343	{
2344	p = p1;
2345	pl = p1 + srcImage->width;
2346	for (; p < pl; p++)
2347	{
2348	*p = lookup_r[(*p & 0x7c00)>>10] |
2349	lookup_g[(*p & 0x03e0)>> 5] |
2350	lookup_b[(*p & 0x001f)];
2351	}
2352	p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2353	}
2354	break;
2355	}
2356	case 16:
2357	{
2358	unsigned short *p1, *pf, *p, *pl;
2359	p1 = (unsigned short *) srcImage->data;
2360	pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2361	while (p1 < pf)
2362	{
2363	p = p1;
2364	pl = p1 + srcImage->width;
2365	for (; p < pl; p++)
2366	{
2367	*p = lookup_r[(*p & 0xf800)>>11] |
2368	lookup_g[(*p & 0x07e0)>> 5] |
2369	lookup_b[(*p & 0x001f)];
2370	}
2371	p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2372	}
2373	break;
2374	}
2375	case 24:
2376	{
2377	unsigned char *p1, *pf, *p, *pl;
2378	p1 = (unsigned char *) srcImage->data;
2379	pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2380	while (p1 < pf)
2381	{
2382	p = p1;
2383	pl = p1 + srcImage->width * 3;
2384	for (; p < pl; p += 3)
2385	{
2386	p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2387	p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2388	p[2] = lookup_r[(p[2] & 0x0000ff)];
2389	}
2390	p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2391	}
2392	break;
2393	}
2394	case 32:
2395	{
2396	RUINT32T *p1, *pf, *p, *pl;
2397	p1 = (RUINT32T *) srcImage->data;
2398	pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2399
2400	while (p1 < pf)
2401	{
2402	p = p1;
2403	pl = p1 + srcImage->width;
2404	for (; p < pl; p++)
2405	{
2406	*p = lookup_r[(*p & 0xff0000)>>16] |
2407	lookup_g[(*p & 0x00ff00)>> 8] |
2408	lookup_b[(*p & 0x0000ff)] |
2409	(*p & ~0xffffff);
2410	}
2411	p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2412	}
2413	break;
2414	}
2415	}
2416
2417	free (lookup);
2418	}
2419	#endif
2420
2421	/*
2422	* Check our parents are still who we think they are.
2423	* Do transparency updates if required
2424	*/
2425	int
2426	rxvt_term::check_our_parents ()
2427	{
2428	int i, pchanged, aformat, have_pixmap, rootdepth;
2429	unsigned long nitems, bytes_after;
2430	Atom atype;
2431	unsigned char *prop = NULL;
2432	Window root, oldp, *list;
2433	Pixmap rootpixmap = None;
2434	XWindowAttributes wattr, wrootattr;
2435	dDisp;
2436
2437	pchanged = 0;
2438
2439	if (!OPTION (Opt_transparent))
2440	return pchanged; /* Don't try any more */
2441
2442	XGetWindowAttributes (disp, display->root, &wrootattr);
2443	rootdepth = wrootattr.depth;
2444
2445	XGetWindowAttributes (disp, parent[0], &wattr);
2446
2447	if (rootdepth != wattr.depth)
2448	{
2449	if (am_transparent)
2450	{
2451	pchanged = 1;
2452	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2453	am_transparent = am_pixmap_trans = 0;
2454	}
2455
2456	return pchanged; /* Don't try any more */
2457	}
2458
2459	/* Get all X ops out of the queue so that our information is up-to-date. */
2460	XSync (disp, False);
2461
2462	/*
2463	* Make the frame window set by the window manager have
2464	* the root background. Some window managers put multiple nested frame
2465	* windows for each client, so we have to take care about that.
2466	*/
2467	i = (xa[XA_XROOTPMAP_ID]
2468	&& XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2469	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2470	&nitems, &bytes_after, &prop) == Success);
2471
2472	if (!i || prop == NULL)
2473	i = (xa[XA_ESETROOT_PMAP_ID]
2474	&& XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2475	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2476	&nitems, &bytes_after, &prop) == Success);
2477
2478	if (!i || prop == NULL
2479	#if TINTING
2480	|| !rs[Rs_color + Color_tint]
2481	#endif
2482	)
2483	have_pixmap = 0;
2484	else
2485	{
2486	have_pixmap = 1;
2487	rootpixmap = *(Pixmap *)prop;
2488	XFree (prop);
2489	}
2490
2491	if (have_pixmap)
2492	{
2493	/*
2494	* Copy display->root pixmap transparency
2495	*/
2496	int sx, sy, nx, ny;
2497	unsigned int nw, nh;
2498	Window cr;
2499	XImage *image;
2500	GC gc;
2501	XGCValues gcvalue;
2502
2503	XTranslateCoordinates (disp, parent[0], display->root,
2504	0, 0, &sx, &sy, &cr);
2505	nw = (unsigned int)szHint.width;
2506	nh = (unsigned int)szHint.height;
2507	nx = ny = 0;
2508
2509	if (sx < 0)
2510	{
2511	nw += sx;
2512	nx = -sx;
2513	sx = 0;
2514	}
2515
2516	if (sy < 0)
2517	{
2518	nh += sy;
2519	ny = -sy;
2520	sy = 0;
2521	}
2522
2523	min_it (nw, (unsigned int) (wrootattr.width - sx));
2524	min_it (nh, (unsigned int) (wrootattr.height - sy));
2525
2526	XSync (disp, False);
2527	allowedxerror = -1;
2528	image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2529
2530	/* XXX: handle BadMatch - usually because we're outside the pixmap */
2531	/* XXX: may need a delay here? */
2532	allowedxerror = 0;
2533
2534	if (image == NULL)
2535	{
2536	if (am_transparent && am_pixmap_trans)
2537	{
2538	pchanged = 1;
2539	if (pixmap != None)
2540	{
2541	XFreePixmap (disp, pixmap);
2542	pixmap = None;
2543	}
2544	}
2545
2546	am_pixmap_trans = 0;
2547	}
2548	else
2549	{
2550	if (pixmap != None)
2551	XFreePixmap (disp, pixmap);
2552
2553	#if TINTING
2554	if (ISSET_PIXCOLOR (Color_tint))
2555	{
2556	unsigned short rm, gm, bm;
2557	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2558
2559	pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2560
2561	ShadeXImage (display, image, shade, rm, gm, bm);
2562	}
2563	#endif
2564
2565	pixmap = XCreatePixmap (disp, vt,
2566	szHint.width, szHint.height, image->depth);
2567	gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2568	XPutImage (disp, pixmap, gc, image, 0, 0,
2569	nx, ny, image->width, image->height);
2570	XFreeGC (disp, gc);
2571	XDestroyImage (image);
2572	XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2573	XClearWindow (disp, parent[0]);
2574
2575	if (!am_transparent || !am_pixmap_trans)
2576	pchanged = 1;
2577
2578	am_transparent = am_pixmap_trans = 1;
2579	}
2580	}
2581
2582	if (am_pixmap_trans)
2583	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2584	else
2585	{
2586	unsigned int n;
2587	/*
2588	* InheritPixmap transparency
2589	*/
2590	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2591	{
2592	oldp = parent[i];
2593	XQueryTree (disp, parent[i - 1], &root,
2594	&parent[i], &list, &n);
2595	XFree (list);
2596
2597	if (parent[i] == display->root)
2598	{
2599	if (oldp != None)
2600	pchanged = 1;
2601
2602	break;
2603	}
2604
2605	if (oldp != parent[i])
2606	pchanged = 1;
2607	}
2608
2609	n = 0;
2610
2611	if (pchanged)
2612	{
2613	for (; n < (unsigned int)i; n++)
2614	{
2615	XGetWindowAttributes (disp, parent[n], &wattr);
2616	if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2617	{
2618	n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2619	break;
2620	}
2621	}
2622	}
2623
2624	if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2625	{
2626	XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2627	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2628	am_transparent = 0;
2629	/* XXX: also turn off Opt_transparent? */
2630	}
2631	else
2632	{
2633	#if WAIT_FOR_WM
2634	/* wait (an arbitrary period) for the WM to do its thing
2635	* needed for fvwm2.2.2 (and before?) */
2636	sleep (1);
2637	#endif
2638	for (n = 0; n < (unsigned int)i; n++)
2639	{
2640	XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2641	XClearWindow (disp, parent[n]);
2642	}
2643
2644	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2645	am_transparent = 1;
2646	}
2647
2648	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2649	parent[i] = None;
2650	}
2651
2652	if (scrollBar.win)
2653	{
2654	XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2655	scrollBar.setIdle ();
2656	scrollbar_show (0);
2657	}
2658
2659	if (am_transparent)
2660	{
2661	want_refresh = want_full_refresh = 1;
2662	if (am_pixmap_trans)
2663	flush ();
2664	}
2665
2666	return pchanged;
2667	}
2668	#endif
2669		2219
2670	/*}}} */	2220	/*}}} */
2671		2221
2672	bool	2222	bool
2673	rxvt_term::cmd_parse ()	2223	rxvt_term::cmd_parse ()
…		…
2722	if (ch == C0_LF)	2272	if (ch == C0_LF)
2723	nlines++;	2273	nlines++;
2724		2274
2725	refresh_count++;	2275	refresh_count++;
2726		2276
2727	if (!OPTION (Opt_jumpScroll)	2277	if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2728	|| (refresh_count >= refresh_limit * (nrow - 1)))
2729	{	2278	{
2730	refreshnow = true;
2731	refresh_count = 0;	2279	refresh_count = 0;
		2280
		2281	if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.)
		2282	{
		2283	refreshnow = true;
2732	ch = NOCHAR;	2284	ch = NOCHAR;
2733	break;	2285	break;
		2286	}
2734	}	2287	}
2735		2288
2736	// scr_add_lines only works for nlines <= nrow - 1.	2289	// scr_add_lines only works for nlines <= nrow - 1.
2737	if (nlines >= nrow - 1)	2290	if (nlines >= nrow - 1)
2738	{	2291	{
…		…
2766	&& HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))	2319	&& HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2767	scr_add_lines (buf, str - buf, nlines);	2320	scr_add_lines (buf, str - buf, nlines);
2768		2321
2769	/*	2322	/*
2770	* If there have been a lot of new lines, then update the screen	2323	* If there have been a lot of new lines, then update the screen
2771	* What the heck I'll cheat and only refresh less than every page-full.	2324	* What the heck we'll cheat and only refresh less than every page-full.
2772	* the number of pages between refreshes is refresh_limit, which	2325	* if skipScroll is enabled.
2773	* is incremented here because we must be doing flat-out scrolling.
2774	*/	2326	*/
2775	if (refreshnow)	2327	if (refreshnow)
2776	{	2328	{
2777	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2778	refresh_limit++;
2779	else
2780	{
2781	flag = true;	2329	flag = true;
2782	scr_refresh ();	2330	scr_refresh ();
2783	want_refresh = 1;	2331	want_refresh = 1;
2784	}
2785	}	2332	}
2786		2333
2787	}	2334	}
2788	else	2335	else
2789	{	2336	{
…		…
2938	{	2485	{
2939	if ((buf[len++] = cmd_getc ()) == 'i')	2486	if ((buf[len++] = cmd_getc ()) == 'i')
2940	break; /* done = 1 */	2487	break; /* done = 1 */
2941	}	2488	}
2942	}	2489	}
2943		2490
2944	for (i = 0; i < len; i++)	2491	for (i = 0; i < len; i++)
2945	if (putc (buf[i], fd) == EOF)	2492	if (putc (buf[i], fd) == EOF)
2946	{	2493	{
2947	done = 1;	2494	done = 1;
2948	break;	2495	break;
…		…
3010	process_dcs_seq ();	2557	process_dcs_seq ();
3011	break;	2558	break;
3012	case 0x9b: /* CSI */	2559	case 0x9b: /* CSI */
3013	process_csi_seq ();	2560	process_csi_seq ();
3014	break;	2561	break;
3015	case 0x9d: /* CSI */	2562	case 0x9d: /* OSC */
3016	process_osc_seq ();	2563	process_osc_seq ();
3017	break;	2564	break;
3018	#endif	2565	#endif
3019	}	2566	}
3020	}	2567	}
…		…
3110	scr_charset_set (2, (unsigned int)cmd_getc ());	2657	scr_charset_set (2, (unsigned int)cmd_getc ());
3111	break;	2658	break;
3112	case '+':	2659	case '+':
3113	scr_charset_set (3, (unsigned int)cmd_getc ());	2660	scr_charset_set (3, (unsigned int)cmd_getc ());
3114	break;	2661	break;
3115	#if ENABLE_FRILLS	2662	#if !ENABLE_MINIMAL
3116	case '6':	2663	case '6':
3117	scr_backindex ();	2664	scr_backindex ();
3118	break;	2665	break;
3119	#endif	2666	#endif
3120	case '7':	2667	case '7':
3121	scr_cursor (SAVE);	2668	scr_cursor (SAVE);
3122	break;	2669	break;
3123	case '8':	2670	case '8':
3124	scr_cursor (RESTORE);	2671	scr_cursor (RESTORE);
3125	break;	2672	break;
3126	#if ENABLE_FRILLS	2673	#if !ENABLE_MINIMAL
3127	case '9':	2674	case '9':
3128	scr_forwardindex ();	2675	scr_forwardindex ();
3129	break;	2676	break;
3130	#endif	2677	#endif
3131	case '=':	2678	case '=':
…		…
3248	unicode_t ch, priv, i;	2795	unicode_t ch, priv, i;
3249	unsigned int nargs, p;	2796	unsigned int nargs, p;
3250	int n, ndef;	2797	int n, ndef;
3251	int arg[ESC_ARGS];	2798	int arg[ESC_ARGS];
3252		2799
3253	for (nargs = ESC_ARGS; nargs > 0;)	2800	memset (arg, 0, sizeof (arg));
3254	arg[--nargs] = 0;	2801	nargs = 0;
3255		2802
3256	priv = 0;	2803	priv = 0;
3257	ch = cmd_getc ();	2804	ch = cmd_getc ();
3258	if (ch >= '<' && ch <= '?')	2805	if (ch >= '<' && ch <= '?')
3259	{ /* '<' '=' '>' '?' */	2806	{ /* '<' '=' '>' '?' */
…		…
3293	ndef = get_byte_array_bit (csi_defaults, i);	2840	ndef = get_byte_array_bit (csi_defaults, i);
3294	for (p = 0; p < nargs; p++)	2841	for (p = 0; p < nargs; p++)
3295	if (arg[p] == -1)	2842	if (arg[p] == -1)
3296	arg[p] = ndef;	2843	arg[p] = ndef;
3297		2844
3298	#ifdef DEBUG_CMD
3299	fprintf (stderr, "CSI ");
3300	for (p = 0; p < nargs; p++)
3301	fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3302	fprintf (stderr, "%c\n", ch);
3303	#endif
3304
3305	/*	2845	/*
3306	* private mode handling	2846	* private mode handling
3307	*/	2847	*/
3308	if (priv)	2848	if (priv)
3309	{	2849	{
3310	switch (priv)	2850	switch (priv)
3311	{	2851	{
3312	case '>':	2852	case '>':
3313	if (ch == CSI_DA) /* secondary device attributes */	2853	if (ch == CSI_DA) /* secondary device attributes */
3314	tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);	2854	{
		2855	// first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
		2856	// 'U' for rxvt-unicode != 7.[34] (where it was broken).
		2857	//
		2858	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
		2859	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
		2860	// that we do not support xterm mouse reporting (should be 95 when we do).
		2861	//
		2862	tt_printf ("\033[>%d;94;0c", 'U');
		2863	}
3315	break;	2864	break;
3316	case '?':	2865	case '?':
3317	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')	2866	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3318	process_terminal_mode (ch, priv, nargs, arg);	2867	process_terminal_mode (ch, priv, nargs, arg);
3319	break;	2868	break;
…		…
3445	break;	2994	break;
3446	case 6: /* CPR requested */	2995	case 6: /* CPR requested */
3447	scr_report_position ();	2996	scr_report_position ();
3448	break;	2997	break;
3449	case 7: /* unofficial extension */	2998	case 7: /* unofficial extension */
3450	if (OPTION (Opt_insecure))	2999	if (option (Opt_insecure))
3451	tt_printf ("%-.250s\012", rs[Rs_display_name]);	3000	tt_printf ("%-.250s\012", rs[Rs_display_name]);
3452	break;	3001	break;
3453	case 8: /* unofficial extension */	3002	case 8: /* unofficial extension */
3454	process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);	3003	process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3455	break;	3004	break;
…		…
3522	break;	3071	break;
3523	case CSI_75:	3072	case CSI_75:
3524	scr_cursor (RESTORE);	3073	scr_cursor (RESTORE);
3525	break;	3074	break;
3526		3075
3527	#if ENABLE_FRILLS	3076	#if !ENABLE_MINIMAL
3528	case CSI_74:	3077	case CSI_74:
3529	process_window_ops (arg, nargs);	3078	process_window_ops (arg, nargs);
3530	break;	3079	break;
3531	#endif	3080	#endif
3532		3081
…		…
3539	break;	3088	break;
3540	}	3089	}
3541	}	3090	}
3542	/*}}} */	3091	/*}}} */
3543		3092
3544	#if ENABLE_FRILLS	3093	#if !ENABLE_MINIMAL
3545	/* ARGSUSED */	3094	/* ARGSUSED */
3546	void	3095	void
3547	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3096	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3548	{	3097	{
3549	int x, y;	3098	int x, y;
3550	XWindowAttributes wattr;	3099	XWindowAttributes wattr;
3551	Window wdummy;	3100	Window wdummy;
3552	dDisp;	3101
		3102	dLocal (Display *, dpy);
3553		3103
3554	if (nargs == 0)	3104	if (nargs == 0)
3555	return;	3105	return;
3556		3106
3557	switch (args[0])	3107	switch (args[0])
3558	{	3108	{
3559	/*	3109	/*
3560	* commands	3110	* commands
3561	*/	3111	*/
3562	case 1: /* deiconify window */	3112	case 1: /* deiconify window */
3563	XMapWindow (disp, parent[0]);	3113	XMapWindow (dpy, parent[0]);
3564	break;	3114	break;
3565	case 2: /* iconify window */	3115	case 2: /* iconify window */
3566	XIconifyWindow (disp, parent[0], display->screen);	3116	XIconifyWindow (dpy, parent[0], display->screen);
3567	break;	3117	break;
3568	case 3: /* set position (pixels) */	3118	case 3: /* set position (pixels) */
3569	XMoveWindow (disp, parent[0], args[1], args[2]);	3119	XMoveWindow (dpy, parent[0], args[1], args[2]);
3570	break;	3120	break;
3571	case 4: /* set size (pixels) */	3121	case 4: /* set size (pixels) */
3572	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3122	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3573	break;	3123	break;
3574	case 5: /* raise window */	3124	case 5: /* raise window */
3575	XRaiseWindow (disp, parent[0]);	3125	XRaiseWindow (dpy, parent[0]);
3576	break;	3126	break;
3577	case 6: /* lower window */	3127	case 6: /* lower window */
3578	XLowerWindow (disp, parent[0]);	3128	XLowerWindow (dpy, parent[0]);
3579	break;	3129	break;
3580	case 7: /* refresh window */	3130	case 7: /* refresh window */
3581	scr_touch (true);	3131	scr_touch (true);
3582	break;	3132	break;
3583	case 8: /* set size (chars) */	3133	case 8: /* set size (chars) */
…		…
3590	if (args[0] >= 24) /* set height (chars) */	3140	if (args[0] >= 24) /* set height (chars) */
3591	set_widthheight ((unsigned int)width,	3141	set_widthheight ((unsigned int)width,
3592	(unsigned int) (args[1] * fheight));	3142	(unsigned int) (args[1] * fheight));
3593	break;	3143	break;
3594		3144
3595
3596	/*	3145	/*
3597	* reports - some output format copied from XTerm	3146	* reports - some output format copied from XTerm
3598	*/	3147	*/
3599	case 11: /* report window state */	3148	case 11: /* report window state */
3600	XGetWindowAttributes (disp, parent[0], &wattr);	3149	XGetWindowAttributes (dpy, parent[0], &wattr);
3601	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3150	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3602	break;	3151	break;
3603	case 13: /* report window position */	3152	case 13: /* report window position */
3604	XGetWindowAttributes (disp, parent[0], &wattr);	3153	XGetWindowAttributes (dpy, parent[0], &wattr);
3605	XTranslateCoordinates (disp, parent[0], wattr.root,	3154	XTranslateCoordinates (dpy, parent[0], wattr.root,
3606	-wattr.border_width, -wattr.border_width,	3155	-wattr.border_width, -wattr.border_width,
3607	&x, &y, &wdummy);	3156	&x, &y, &wdummy);
3608	tt_printf ("\033[3;%d;%dt", x, y);	3157	tt_printf ("\033[3;%d;%dt", x, y);
3609	break;	3158	break;
3610	case 14: /* report window size (pixels) */	3159	case 14: /* report window size (pixels) */
3611	XGetWindowAttributes (disp, parent[0], &wattr);	3160	XGetWindowAttributes (dpy, parent[0], &wattr);
3612	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3161	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3613	break;	3162	break;
3614	case 18: /* report text area size (chars) */	3163	case 18: /* report text area size (chars) */
3615	tt_printf ("\033[8;%d;%dt", nrow, ncol);	3164	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3616	break;	3165	break;
…		…
3618	tt_printf ("\033[9;%d;%dt", nrow, ncol);	3167	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3619	break;	3168	break;
3620	case 20: /* report icon label */	3169	case 20: /* report icon label */
3621	{	3170	{
3622	char *s;	3171	char *s;
3623	XGetIconName (disp, parent[0], &s);	3172	XGetIconName (dpy, parent[0], &s);
3624	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3173	tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3625	XFree (s);	3174	XFree (s);
3626	}	3175	}
3627	break;	3176	break;
3628	case 21: /* report window title */	3177	case 21: /* report window title */
3629	{	3178	{
3630	char *s;	3179	char *s;
3631	XFetchName (disp, parent[0], &s);	3180	XFetchName (dpy, parent[0], &s);
3632	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3181	tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3633	XFree (s);	3182	XFree (s);
3634	}	3183	}
3635	break;	3184	break;
3636	}	3185	}
3637	}	3186	}
…		…
3664	seen_esc = true;	3213	seen_esc = true;
3665	continue;	3214	continue;
3666	}	3215	}
3667	else if (ch == C0_BEL || ch == CHAR_ST)	3216	else if (ch == C0_BEL || ch == CHAR_ST)
3668	break;	3217	break;
		3218	else if (ch == C0_SYN)
		3219	ch = cmd_get8 ();
3669	else if (ch < 0x20)	3220	else if (ch < 0x20)
3670	return NULL; /* other control character - exit */	3221	return NULL; /* other control character - exit */
3671		3222
3672	seen_esc = false;	3223	seen_esc = false;
3673		3224
3674	if (n >= STRING_MAX - 1)	3225	if (n >= STRING_MAX - 1)
3675	// stop at some sane length	3226	// stop at some sane length
3676	return NULL;	3227	return NULL;
3677		3228
3678	if (ch == C0_SYN)
3679	string[n++] = cmd_get8 ();
3680	else
3681	string[n++] = ch;	3229	string[n++] = ch;
3682	}	3230	}
3683		3231
3684	string[n++] = '\0';	3232	string[n++] = '\0';
3685		3233
3686	ends_how = (ch == 0x5c ? C0_ESC : ch);	3234	ends_how = (ch == 0x5c ? C0_ESC : ch);
…		…
3737	void	3285	void
3738	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)	3286	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3739	{	3287	{
3740	if (str[0] == '?' && !str[1])	3288	if (str[0] == '?' && !str[1])
3741	{	3289	{
3742	unsigned short r, g, b;	3290	rgba c;
3743	pix_colors_focused[color].get (display, r, g, b);	3291	pix_colors_focused[color].get (c);
		3292
		3293	#if XFT
		3294	if (c.a != rgba::MAX_CC)
		3295	tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
		3296	else
		3297	#endif
3744	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);	3298	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3745	}	3299	}
3746	else	3300	else
3747	set_window_color (color, str);	3301	set_window_color (color, str);
3748	}	3302	}
3749		3303
…		…
3755	{	3309	{
3756	int color;	3310	int color;
3757	char *buf, *name;	3311	char *buf, *name;
3758	bool query = str[0] == '?' && !str[1];	3312	bool query = str[0] == '?' && !str[1];
3759	int saveop = op;	3313	int saveop = op;
3760	dDisp;	3314
		3315	dLocal (Display *, dpy);
3761		3316
3762	assert (str != NULL);	3317	assert (str != NULL);
		3318
		3319	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
		3320	return;
		3321
3763	switch (op)	3322	switch (op)
3764	{	3323	{
3765	case XTerm_name:	3324	case XTerm_name:
3766	set_title (str);	3325	set_title (str);
3767	/* FALLTHROUGH */	3326	/* FALLTHROUGH */
…		…
3781	unsigned long bytes_after;	3340	unsigned long bytes_after;
3782	unsigned char *value = 0;	3341	unsigned char *value = 0;
3783	const char *str = "";	3342	const char *str = "";
3784		3343
3785	if (prop	3344	if (prop
3786	&& XGetWindowProperty (disp, parent[0],	3345	&& XGetWindowProperty (dpy, parent[0],
3787	prop, 0, 1<<16, 0, AnyPropertyType,	3346	prop, 0, 1<<16, 0, AnyPropertyType,
3788	&actual_type, &actual_format,	3347	&actual_type, &actual_format,
3789	&nitems, &bytes_after, &value) == Success	3348	&nitems, &bytes_after, &value) == Success
3790	&& actual_type != None	3349	&& actual_type != None
3791	&& actual_format == 8)	3350	&& actual_format == 8)
3792	str = (const char *)(value);	3351	str = (const char *)(value);
3793		3352
3794	tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);	3353	tt_printf ("\033]%d;%s%c", op, str, resp);
3795		3354
3796	XFree (value);	3355	XFree (value);
3797	}	3356	}
3798	else	3357	else
3799	{	3358	{
…		…
3803	{	3362	{
3804	*eq = 0;	3363	*eq = 0;
3805	set_utf8_property (display->atom (str), eq + 1);	3364	set_utf8_property (display->atom (str), eq + 1);
3806	}	3365	}
3807	else	3366	else
3808	XDeleteProperty (disp, parent[0],	3367	XDeleteProperty (dpy, parent[0],
3809	display->atom (str));	3368	display->atom (str));
3810	}	3369	}
3811	break;	3370	break;
3812		3371
3813	case XTerm_Color:	3372	case XTerm_Color:
…		…
3823	break;	3382	break;
3824		3383
3825	if ((buf = strchr (name, ';')) != NULL)	3384	if ((buf = strchr (name, ';')) != NULL)
3826	*buf++ = '\0';	3385	*buf++ = '\0';
3827		3386
3828	if (name[0] == '?' && !name[1])	3387	process_color_seq (op, color, name, resp);
3829	{
3830	unsigned short r, g, b;
3831	pix_colors_focused[color].get (display, r, g, b);
3832	tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3833	}
3834	else
3835	set_window_color (color, name);
3836	}	3388	}
3837	break;	3389	break;
3838	case XTerm_Color00:	3390	case XTerm_Color00:
3839	process_color_seq (XTerm_Color00, Color_fg, str, resp);	3391	process_color_seq (op, Color_fg, str, resp);
3840	break;	3392	break;
3841	case XTerm_Color01:	3393	case XTerm_Color01:
3842	process_color_seq (XTerm_Color01, Color_bg, str, resp);	3394	process_color_seq (op, Color_bg, str, resp);
3843	break;	3395	break;
3844	#ifndef NO_CURSORCOLOR	3396	#ifndef NO_CURSORCOLOR
3845	case XTerm_Color_cursor:	3397	case XTerm_Color_cursor:
3846	process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);	3398	process_color_seq (op, Color_cursor, str, resp);
3847	break;	3399	break;
3848	#endif	3400	#endif
3849	case XTerm_Color_pointer_fg:	3401	case XTerm_Color_pointer_fg:
3850	process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);	3402	process_color_seq (op, Color_pointer_fg, str, resp);
3851	break;	3403	break;
3852	case XTerm_Color_pointer_bg:	3404	case XTerm_Color_pointer_bg:
3853	process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);	3405	process_color_seq (op, Color_pointer_bg, str, resp);
3854	break;	3406	break;
3855	#ifndef NO_BOLD_UNDERLINE_REVERSE	3407	#ifndef NO_BOLD_UNDERLINE_REVERSE
3856	case XTerm_Color_RV:	3408	case XTerm_Color_RV:
3857	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3409	process_color_seq (op, Color_RV, str, resp);
3858	break;	3410	break;
3859	case Rxvt_Color_BD:	3411	case Rxvt_Color_BD:
3860	case URxvt_Color_BD:	3412	case URxvt_Color_BD:
3861	process_color_seq (op, Color_BD, str, resp);	3413	process_color_seq (op, Color_BD, str, resp);
3862	break;	3414	break;
3863	case Rxvt_Color_UL:	3415	case Rxvt_Color_UL:
3864	case URxvt_Color_UL:	3416	case URxvt_Color_UL:
3865	process_color_seq (op, Color_UL, str, resp);	3417	process_color_seq (op, Color_UL, str, resp);
3866	break;	3418	break;
3867	case URxvt_Color_IT:	3419	case URxvt_Color_IT:
3868	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);	3420	process_color_seq (op, Color_IT, str, resp);
3869	break;	3421	break;
3870	#endif	3422	#endif
3871	#if TRANSPARENT && TINTING	3423	#if ENABLE_TRANSPARENCY
3872	case URxvt_Color_tint:	3424	case URxvt_Color_tint:
3873	process_color_seq (URxvt_Color_tint, Color_tint, str, resp);	3425	process_color_seq (op, Color_tint, str, resp);
3874	check_our_parents ();	3426	{
3875	if (am_transparent)	3427	bool changed = false;
3876	want_full_refresh = want_refresh = 1;	3428	if (ISSET_PIXCOLOR (Color_tint))
3877	break;	3429	changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3878	#endif	3430	else
		3431	changed = bgPixmap.unset_tint ();
		3432	if (changed)
		3433	bgPixmap.render ();
		3434	}
3879		3435
		3436	break;
		3437	#endif
		3438
		3439	#if XPM_BACKGROUND
3880	case Rxvt_Pixmap:	3440	case Rxvt_Pixmap:
		3441	if (!strcmp (str, "?"))
3881	{	3442	{
		3443	char str[256];
		3444
		3445	sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
		3446	min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
		3447	min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
		3448	process_xterm_seq (XTerm_title, str, CHAR_ST);
		3449	}
		3450	else
		3451	{
		3452	int changed = 0;
		3453
3882	if (*str != ';')	3454	if (*str != ';')
3883	{	3455	{
3884	#if XPM_BACKGROUND
3885	scale_pixmap (""); /* reset to default scaling */	3456	/* reset to default scaling :*/
		3457	bgPixmap.unset_geometry ();
3886	set_bgPixmap (str); /* change pixmap */	3458	if (bgPixmap.set_file (str)) /* change pixmap */
		3459	changed++;
		3460	str = strchr (str, ';');
		3461	if (str == NULL)
		3462	bgPixmap.set_defaultGeometry ();
		3463	}
		3464	while (str)
		3465	{
		3466	str++;
		3467	if (bgPixmap.set_geometry (str))
		3468	changed++;
		3469	str = strchr (str, ';');
		3470	}
		3471	if (changed)
		3472	{
		3473	bgPixmap.render ();
3887	scr_touch (true);	3474	scr_touch (true);
3888	#endif
3889	}	3475	}
3890
3891	int changed = 0;
3892
3893	while ((str = strchr (str, ';')) != NULL)
3894	{
3895	str++;
3896	#if XPM_BACKGROUND
3897	changed += scale_pixmap (str);
3898	#endif
3899	}	3476	}
3900
3901	if (changed)
3902	{
3903	#ifdef XPM_BACKGROUND
3904	resize_pixmap ();
3905	scr_touch (true);
3906	#endif
3907	}
3908	}
3909	break;	3477	break;
		3478	#endif
3910		3479
3911	case Rxvt_restoreFG:	3480	case Rxvt_restoreFG:
3912	set_window_color (Color_fg, str);	3481	set_window_color (Color_fg, str);
3913	break;	3482	break;
3914	case Rxvt_restoreBG:	3483	case Rxvt_restoreBG:
…		…
3939	case URxvt_italicFont:	3508	case URxvt_italicFont:
3940	case URxvt_boldItalicFont:	3509	case URxvt_boldItalicFont:
3941	#endif	3510	#endif
3942	if (query)	3511	if (query)
3943	tt_printf ("\33]%d;%-.250s%c", saveop,	3512	tt_printf ("\33]%d;%-.250s%c", saveop,
3944	OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc	3513	option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3945	? fontset[op - URxvt_font]->fontdesc : "",	3514	? fontset[op - URxvt_font]->fontdesc : "",
3946	resp);	3515	resp);
3947	else	3516	else
3948	{	3517	{
3949	const char *&res = rs[Rs_font + (op - URxvt_font)];	3518	const char *&res = rs[Rs_font + (op - URxvt_font)];
…		…
3952	allocated.push_back ((void *)res);	3521	allocated.push_back ((void *)res);
3953	set_fonts ();	3522	set_fonts ();
3954	}	3523	}
3955	break;	3524	break;
3956		3525
3957	#if ENABLE_FRILLS	3526	case URxvt_version:
		3527	if (query)
		3528	tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
		3529	op,
		3530	rs[Rs_name], VERSION[0], VERSION[2],
		3531	resp);
		3532	break;
		3533
		3534	#if !ENABLE_MINIMAL
3958	case URxvt_locale:	3535	case URxvt_locale:
3959	if (query)	3536	if (query)
3960	tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);	3537	tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3961	else	3538	else
3962	{	3539	{
3963	set_locale (str);	3540	set_locale (str);
3964	pty->set_utf8_mode (enc_utf8);	3541	pty->set_utf8_mode (enc_utf8);
3965	init_xlocale ();	3542	init_xlocale ();
…		…
3980	break;	3557	break;
3981	#endif	3558	#endif
3982		3559
3983	#if ENABLE_PERL	3560	#if ENABLE_PERL
3984	case URxvt_perl:	3561	case URxvt_perl:
3985	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))	3562	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3986	; // no responses yet	3563	; // no responses yet
3987	break;	3564	break;
3988	#endif	3565	#endif
3989	}	3566	}
3990	}	3567	}
…		…
4028	{	3605	{
4029	unsigned int i, j;	3606	unsigned int i, j;
4030	int state;	3607	int state;
4031		3608
4032	static const struct	3609	static const struct
4033	{	3610	{
4034	const int argval;	3611	const int argval;
4035	const unsigned long bit;	3612	const unsigned long bit;
4036	}
4037
4038	argtopriv[] = {	3613	} argtopriv[] = {
4039	{ 1, PrivMode_aplCUR },	3614	{ 1, PrivMode_aplCUR },
4040	{ 2, PrivMode_vt52 },	3615	{ 2, PrivMode_vt52 },
4041	{ 3, PrivMode_132 },	3616	{ 3, PrivMode_132 },
4042	{ 4, PrivMode_smoothScroll },	3617	{ 4, PrivMode_smoothScroll },
4043	{ 5, PrivMode_rVideo },	3618	{ 5, PrivMode_rVideo },
…		…
4106	scr_touch (true);	3681	scr_touch (true);
4107	break;	3682	break;
4108	#endif	3683	#endif
4109	case 1048: /* alternative cursor save */	3684	case 1048: /* alternative cursor save */
4110	case 1049:	3685	case 1049:
4111	if (OPTION (Opt_secondaryScreen))	3686	if (option (Opt_secondaryScreen))
4112	if (mode == 0)	3687	if (mode == 0)
4113	scr_cursor (RESTORE);	3688	scr_cursor (RESTORE);
4114	else if (mode == 1)	3689	else if (mode == 1)
4115	scr_cursor (SAVE);	3690	scr_cursor (SAVE);
4116	break;	3691	break;
…		…
4181	break;	3756	break;
4182	case 1011: /* scroll to bottom on key press */	3757	case 1011: /* scroll to bottom on key press */
4183	set_option (Opt_scrollTtyKeypress, state);	3758	set_option (Opt_scrollTtyKeypress, state);
4184	break;	3759	break;
4185	case 1047: /* secondary screen w/ clearing last */	3760	case 1047: /* secondary screen w/ clearing last */
4186	if (OPTION (Opt_secondaryScreen))	3761	if (option (Opt_secondaryScreen))
4187	if (current_screen != PRIMARY)	3762	if (current_screen != PRIMARY)
4188	scr_erase_screen (2);	3763	scr_erase_screen (2);
4189	scr_change_screen (state);	3764	scr_change_screen (state);
4190	break;	3765	break;
4191	case 1049: /* secondary screen w/ clearing first */	3766	case 1049: /* secondary screen w/ clearing first */
4192	scr_change_screen (state);	3767	scr_change_screen (state);
4193	if (OPTION (Opt_secondaryScreen))	3768	if (option (Opt_secondaryScreen))
4194	if (current_screen != PRIMARY)	3769	if (current_screen != PRIMARY)
4195	scr_erase_screen (2);	3770	scr_erase_screen (2);
4196	break;	3771	break;
4197	default:	3772	default:
4198	break;	3773	break;
…		…
4326	scr_color (Color_bg, Color_bg);	3901	scr_color (Color_bg, Color_bg);
4327	break;	3902	break;
4328		3903
4329	//case 50: // not variable spacing	3904	//case 50: // not variable spacing
4330		3905
4331	#if ENABLE_FRILLS	3906	#if !ENABLE_MINIMAL
4332	case 90:	3907	case 90:
4333	case 91: /* set bright fg color */	3908	case 91: /* set bright fg color */
4334	case 92:	3909	case 92:
4335	case 93:	3910	case 93:
4336	case 94:	3911	case 94:

Diff Legend

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