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.281 by root, Tue Jan 24 17:28:06 2006 UTC vs.
Revision 1.356 by root, Mon Sep 17 08:31:54 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;
…		…
533	#endif	547	#endif
534		548
535	if (keysym >= 0xFF00 && keysym <= 0xFFFF)	549	if (keysym >= 0xFF00 && keysym <= 0xFFFF)
536	{	550	{
537	{	551	{
		552	bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
538	newlen = 1;	553	newlen = 1;
539	switch (keysym)	554	switch (keysym)
540	{	555	{
541	#ifndef NO_BACKSPACE_KEY	556	#ifndef NO_BACKSPACE_KEY
542	case XK_BackSpace:	557	case XK_BackSpace:
…		…
545	kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)	560	kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
546	^ !!ctrl) ? '\b' : '\177';	561	^ !!ctrl) ? '\b' : '\177';
547	kbuf[1] = '\0';	562	kbuf[1] = '\0';
548	}	563	}
549	else	564	else
550	strcpy (kbuf, key_backspace);	565	strcpy (kbuf, rs[Rs_backspace_key]);
551	break;	566	break;
552	#endif	567	#endif
553	#ifndef NO_DELETE_KEY	568	#ifndef NO_DELETE_KEY
554	# ifdef XK_KP_Prior	569	# ifdef XK_KP_Delete
555	case XK_KP_Delete:	570	case XK_KP_Delete:
556	/* allow shift to override */	571	/* allow shift to override */
557	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)	572	if (kp)
558	{	573	{
559	strcpy (kbuf, "\033On");	574	strcpy (kbuf, "\033On");
560	break;	575	break;
561	}	576	}
562	/* FALLTHROUGH */	577	/* FALLTHROUGH */
563	# endif	578	# endif
564	case XK_Delete:	579	case XK_Delete:
565	strcpy (kbuf, key_delete);	580	strcpy (kbuf, rs[Rs_delete_key]);
566	break;	581	break;
567	#endif	582	#endif
568	case XK_Tab:	583	case XK_Tab:
569	if (shft)	584	if (shft)
570	strcpy (kbuf, "\033[Z");	585	strcpy (kbuf, "\033[Z");
…		…
585	#ifdef XK_KP_Left	600	#ifdef XK_KP_Left
586	case XK_KP_Up: /* \033Ox or standard */	601	case XK_KP_Up: /* \033Ox or standard */
587	case XK_KP_Down: /* \033Or or standard */	602	case XK_KP_Down: /* \033Or or standard */
588	case XK_KP_Right: /* \033Ov or standard */	603	case XK_KP_Right: /* \033Ov or standard */
589	case XK_KP_Left: /* \033Ot or standard */	604	case XK_KP_Left: /* \033Ot or standard */
590	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)	605	if (kp)
591	{	606	{
592	strcpy (kbuf, "\033OZ");	607	strcpy (kbuf, "\033OZ");
593	kbuf[2] = "txvr"[keysym - XK_KP_Left];	608	kbuf[2] = "txvr"[keysym - XK_KP_Left];
594	break;	609	break;
595	}	610	}
…		…
618		633
619	#ifndef UNSHIFTED_SCROLLKEYS	634	#ifndef UNSHIFTED_SCROLLKEYS
620	# ifdef XK_KP_Prior	635	# ifdef XK_KP_Prior
621	case XK_KP_Prior:	636	case XK_KP_Prior:
622	/* allow shift to override */	637	/* allow shift to override */
623	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)	638	if (kp)
624	{	639	{
625	strcpy (kbuf, "\033Oy");	640	strcpy (kbuf, "\033Oy");
626	break;	641	break;
627	}	642	}
628	/* FALLTHROUGH */	643	/* FALLTHROUGH */
…		…
631	strcpy (kbuf, "\033[5~");	646	strcpy (kbuf, "\033[5~");
632	break;	647	break;
633	# ifdef XK_KP_Next	648	# ifdef XK_KP_Next
634	case XK_KP_Next:	649	case XK_KP_Next:
635	/* allow shift to override */	650	/* allow shift to override */
636	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)	651	if (kp)
637	{	652	{
638	strcpy (kbuf, "\033Os");	653	strcpy (kbuf, "\033Os");
639	break;	654	break;
640	}	655	}
641	/* FALLTHROUGH */	656	/* FALLTHROUGH */
…		…
644	strcpy (kbuf, "\033[6~");	659	strcpy (kbuf, "\033[6~");
645	break;	660	break;
646	#endif	661	#endif
647	case XK_KP_Enter:	662	case XK_KP_Enter:
648	/* allow shift to override */	663	/* allow shift to override */
649	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)	664	if (kp)
650	{	665	{
651	strcpy (kbuf, "\033OM");	666	strcpy (kbuf, "\033OM");
652	break;	667	break;
653	}	668	}
654		669
…		…
697	case XK_KP_6: /* "\033Ov" : "6" */	712	case XK_KP_6: /* "\033Ov" : "6" */
698	case XK_KP_7: /* "\033Ow" : "7" */	713	case XK_KP_7: /* "\033Ow" : "7" */
699	case XK_KP_8: /* "\033Ox" : "8" */	714	case XK_KP_8: /* "\033Ox" : "8" */
700	case XK_KP_9: /* "\033Oy" : "9" */	715	case XK_KP_9: /* "\033Oy" : "9" */
701	/* allow shift to override */	716	/* allow shift to override */
702	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)	717	if (kp)
703	{	718	{
704	strcpy (kbuf, "\033Oj");	719	strcpy (kbuf, "\033Oj");
705	kbuf[2] += (keysym - XK_KP_Multiply);	720	kbuf[2] += (keysym - XK_KP_Multiply);
706	}	721	}
707	else	722	else
…		…
713		728
714	case XK_Find:	729	case XK_Find:
715	strcpy (kbuf, "\033[1~");	730	strcpy (kbuf, "\033[1~");
716	break;	731	break;
717		732
718	#ifdef XK_KP_End	733	#ifdef XK_KP_Insert
719	case XK_KP_Insert:	734	case XK_KP_Insert:
720	/* allow shift to override */	735	/* allow shift to override */
721	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)	736	if (kp)
722	{	737	{
723	strcpy (kbuf, "\033Op");	738	strcpy (kbuf, "\033Op");
724	break;	739	break;
725	}	740	}
726	/* FALLTHROUGH */	741	/* FALLTHROUGH */
…		…
739	strcpy (kbuf, "\033[4~");	754	strcpy (kbuf, "\033[4~");
740	break;	755	break;
741	#ifdef XK_KP_End	756	#ifdef XK_KP_End
742	case XK_KP_End:	757	case XK_KP_End:
743	/* allow shift to override */	758	/* allow shift to override */
744	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)	759	if (kp)
745	{	760	{
746	strcpy (kbuf, "\033Oq");	761	strcpy (kbuf, "\033Oq");
747	break;	762	break;
748	}	763	}
749	/* FALLTHROUGH */	764	/* FALLTHROUGH */
…		…
752	strcpy (kbuf, KS_END);	767	strcpy (kbuf, KS_END);
753	break;	768	break;
754	#ifdef XK_KP_Home	769	#ifdef XK_KP_Home
755	case XK_KP_Home:	770	case XK_KP_Home:
756	/* allow shift to override */	771	/* allow shift to override */
757	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)	772	if (kp)
758	{	773	{
759	strcpy (kbuf, "\033Ow");	774	strcpy (kbuf, "\033Ow");
760	break;	775	break;
761	}	776	}
762	/* FALLTHROUGH */	777	/* FALLTHROUGH */
…		…
870	return;	885	return;
871		886
872	if (len <= 0)	887	if (len <= 0)
873	return; /* not mapped */	888	return; /* not mapped */
874		889
875	if (OPTION (Opt_scrollTtyKeypress))	890	if (option (Opt_scrollTtyKeypress))
876	if (view_start)	891	if (view_start)
877	{	892	{
878	view_start = 0;	893	view_start = 0;
879	want_refresh = 1;	894	want_refresh = 1;
880	}	895	}
…		…
902	{	917	{
903	const char ch = C0_ESC;	918	const char ch = C0_ESC;
904	tt_write (&ch, 1);	919	tt_write (&ch, 1);
905	}	920	}
906		921
907	#if defined(DEBUG_CMD)
908	/* Display keyboard buffer contents */
909	unsigned char *p;
910	int i;
911
912	fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
913	for (i = 0, p = kbuf; i < len; i++, p++)
914	fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
915	fprintf (stderr, "'\n");
916	#endif /* DEBUG_CMD */
917	tt_write (kbuf, (unsigned int)len);	922	tt_write (kbuf, (unsigned int)len);
918	}	923	}
919	/*}}} */	924
		925	void
		926	rxvt_term::key_release (XKeyEvent &ev)
		927	{
		928	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
		929	KeySym keysym;
		930
		931	keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
		932	#endif
		933
		934	#if ENABLE_FRILLS || ISO_14755
		935	// ISO 14755 support
		936	if (iso14755buf)
		937	if (iso14755buf & ISO_14755_52)
		938	{
		939	# if ISO_14755
		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 ISO_14755
		973	scr_overlay_off ();
		974	# endif
		975	if (iso14755buf & ISO_14755_51)
		976	commit_iso14755 ();
		977	#if ISO_14755
		978	else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
		979	{
		980	iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
		981
		982	scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
		983	scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
		984	}
		985	# endif
		986	else
		987	iso14755buf = 0;
		988	}
		989	#endif
		990
		991	if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
		992	return;
		993
		994	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
		995	if (!(ev.state & ControlMask))
		996	slip_wheel_ev.stop ();
		997	else if (keysym == XK_Control_L || keysym == XK_Control_R)
		998	mouse_slip_wheel_speed = 0;
		999	#endif
		1000	}
920		1001
921	#if defined (KEYSYM_RESOURCE)	1002	#if defined (KEYSYM_RESOURCE)
922	unsigned int	1003	unsigned int
923	rxvt_term::cmd_write (const char *str, unsigned int count)	1004	rxvt_term::cmd_write (const char *str, unsigned int count)
924	{	1005	{
…		…
953		1034
954	void	1035	void
955	rxvt_term::flush ()	1036	rxvt_term::flush ()
956	{	1037	{
957	flush_ev.stop ();	1038	flush_ev.stop ();
958
959	#ifdef TRANSPARENT
960	if (want_full_refresh)
961	{
962	want_full_refresh = 0;
963	scr_clear ();
964	scr_touch (false);
965	}
966	#endif
967		1039
968	if (want_refresh)	1040	if (want_refresh)
969	{	1041	{
970	if (SHOULD_INVOKE (HOOK_LINE_UPDATE))	1042	if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
971	{	1043	{
…		…
1029	void	1101	void
1030	rxvt_term::flush_cb (time_watcher &w)	1102	rxvt_term::flush_cb (time_watcher &w)
1031	{	1103	{
1032	make_current ();	1104	make_current ();
1033		1105
1034	refresh_limit = 1;
1035	refresh_count = 0;	1106	refresh_count = 0;
1036	flush ();	1107	flush ();
1037	}	1108	}
1038		1109
1039	#ifdef CURSOR_BLINK	1110	#ifdef CURSOR_BLINK
…		…
1101	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1172	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1102	}	1173	}
1103	}	1174	}
1104	#endif	1175	#endif
1105		1176
1106	#if HAVE_SCHED_YIELD	1177	#if LINUX_YIELD_HACK
1107	static struct event_handler	1178	static struct event_handler
1108	{	1179	{
1109	check_watcher cw_yield;	1180	check_watcher yield_ev;
1110		1181
1111	void yield (check_watcher &w)	1182	void yield_cb (check_watcher &w)
1112	{	1183	{
1113	sched_yield ();	1184	// this should really be sched_yield(), but the linux guys thought
		1185	// that giving a process calling sched_yield () less cpu time than
		1186	// ones with high nice levels is a useful thing to do. It surely is is
		1187	// allowed by the sus... as is returning ENOSYS.
		1188
		1189	struct timespec ts = { 0, 0 };
		1190	nanosleep (&ts, 0);
		1191
1114	w.stop ();	1192	w.stop ();
1115	}	1193	}
1116		1194
1117	event_handler ()	1195	event_handler ()
1118	: cw_yield (this, &event_handler::yield)	1196	: yield_ev (this, &event_handler::yield_cb)
1119	{	1197	{
1120	}	1198	}
1121	} event_handler;	1199	} event_handler;
1122	#endif	1200	#endif
1123		1201
…		…
1143	cmdbuf_endp += r;	1221	cmdbuf_endp += r;
1144	return true;	1222	return true;
1145	}	1223	}
1146	else if (r < 0 && (errno == EAGAIN || errno == EINTR))	1224	else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1147	{	1225	{
1148	#if HAVE_SCHED_YIELD	1226	#if LINUX_YIELD_HACK
1149	if (display->is_local)	1227	if (display->is_local)
1150	event_handler.cw_yield.start ();	1228	event_handler.yield_ev.start ();
1151	#endif	1229	#endif
1152	}	1230	}
1153	else	1231	else
1154	{	1232	{
1155	pty_ev.stop ();	1233	pty_ev.stop ();
1156		1234
1157	if (!OPTION (Opt_hold))	1235	if (!option (Opt_hold))
1158	destroy ();	1236	destroy ();
1159	}	1237	}
1160		1238
1161	return false;	1239	return false;
1162	}	1240	}
1163		1241
1164	void	1242	void
1165	rxvt_term::pty_cb (io_watcher &w, short revents)	1243	rxvt_term::pty_cb (io_watcher &w, short revents)
…		…
1177	}	1255	}
1178		1256
1179	void	1257	void
1180	rxvt_term::pointer_unblank ()	1258	rxvt_term::pointer_unblank ()
1181	{	1259	{
1182	XDefineCursor (display->display, vt, TermWin_cursor);	1260	XDefineCursor (dpy, vt, TermWin_cursor);
1183	recolour_cursor ();	1261	recolour_cursor ();
1184		1262
1185	#ifdef POINTER_BLANK	1263	#ifdef POINTER_BLANK
1186	hidden_pointer = 0;	1264	hidden_pointer = 0;
1187		1265
1188	if (OPTION (Opt_pointerBlank))	1266	if (option (Opt_pointerBlank))
1189	pointer_ev.start (NOW + pointerBlankDelay);	1267	pointer_ev.start (NOW + pointerBlankDelay);
1190	#endif	1268	#endif
1191	}	1269	}
1192		1270
1193	#ifdef POINTER_BLANK	1271	#ifdef POINTER_BLANK
1194	void	1272	void
1195	rxvt_term::pointer_blank ()	1273	rxvt_term::pointer_blank ()
1196	{	1274	{
1197	if (!OPTION (Opt_pointerBlank))	1275	if (!option (Opt_pointerBlank))
1198	return;	1276	return;
1199		1277
1200	XDefineCursor (display->display, vt, display->blank_cursor);	1278	XDefineCursor (dpy, vt, display->blank_cursor);
1201	XFlush (display->display);	1279	XFlush (dpy);
1202		1280
1203	hidden_pointer = 1;	1281	hidden_pointer = 1;
1204	}	1282	}
1205		1283
1206	void	1284	void
…		…
1279	(32 + button_number + key_state),	1357	(32 + button_number + key_state),
1280	(32 + x + 1),	1358	(32 + x + 1),
1281	(32 + y + 1));	1359	(32 + y + 1));
1282	}	1360	}
1283		1361
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 */	1362	/*{{{ process an X event */
1295	void	1363	void
1296	rxvt_term::x_cb (XEvent &ev)	1364	rxvt_term::x_cb (XEvent &ev)
1297	{	1365	{
1298	make_current ();	1366	make_current ();
1299		1367
1300	dDisp;	1368	dLocal (Display *, dpy);
1301		1369
1302	if (ev.xany.window == vt	1370	if (ev.xany.window == vt
1303	&& SHOULD_INVOKE (HOOK_X_EVENT)	1371	&& SHOULD_INVOKE (HOOK_X_EVENT)
1304	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))	1372	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1305	return;	1373	return;
…		…
1310	unsigned int unused_mask;	1378	unsigned int unused_mask;
1311		1379
1312	switch (ev.type)	1380	switch (ev.type)
1313	{	1381	{
1314	case KeyPress:	1382	case KeyPress:
1315	#if ISO_14755	1383	key_press (ev.xkey);
1316	if (!(iso14755buf & ISO_14755_52))
1317	#endif
1318	lookup_key (ev.xkey);
1319
1320	break;	1384	break;
1321		1385
1322	case KeyRelease:	1386	case KeyRelease:
1323	{	1387	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;	1388	break;
1395	}
1396		1389
1397	case ButtonPress:	1390	case ButtonPress:
1398	button_press (ev.xbutton);	1391	button_press (ev.xbutton);
1399	break;	1392	break;
1400		1393
…		…
1415	if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))	1408	if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1416	destroy ();	1409	destroy ();
1417	}	1410	}
1418	#if ENABLE_EWMH	1411	#if ENABLE_EWMH
1419	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])	1412	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1420	XSendEvent (disp, ev.xclient.window = display->root,	1413	XSendEvent (dpy, ev.xclient.window = display->root,
1421	False, SubstructureRedirectMask | SubstructureNotifyMask,	1414	False, SubstructureRedirectMask | SubstructureNotifyMask,
1422	&ev);	1415	&ev);
1423	#endif	1416	#endif
1424	}	1417	}
1425	}	1418	}
…		…
1431	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)	1424	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1432	focus_out ();	1425	focus_out ();
1433	}	1426	}
1434	#endif	1427	#endif
1435	}	1428	}
1436	break;
1437
1438	case MappingNotify:
1439	XRefreshKeyboardMapping (&ev.xmapping);
1440	break;	1429	break;
1441		1430
1442	/*	1431	/*
1443	* XXX: this is not the _current_ arrangement	1432	* XXX: this is not the _current_ arrangement
1444	* Here's my conclusion:	1433	* Here's my conclusion:
…		…
1463	break;	1452	break;
1464	}	1453	}
1465	break;	1454	break;
1466		1455
1467	case FocusIn:	1456	case FocusIn:
		1457	if (ev.xfocus.detail != NotifyInferior
		1458	&& ev.xfocus.detail != NotifyPointer
		1459	&& ev.xfocus.mode != NotifyGrab)
1468	focus_in ();	1460	focus_in ();
1469	break;	1461	break;
1470		1462
1471	case FocusOut:	1463	case FocusOut:
		1464	if (ev.xfocus.detail != NotifyInferior
		1465	&& ev.xfocus.detail != NotifyPointer
		1466	&& ev.xfocus.mode != NotifyGrab)
1472	focus_out ();	1467	focus_out ();
1473	break;	1468	break;
1474		1469
1475	case ConfigureNotify:	1470	case ConfigureNotify:
		1471	/* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
		1472	ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
		1473	szHint.width, szHint.height);*/
1476	if (ev.xconfigure.window == parent[0])	1474	if (ev.xconfigure.window == parent[0])
1477	{	1475	{
1478	while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))	1476	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1479	;	1477	;
1480		1478
1481	if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)	1479	if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1482	{	1480	{
1483	seen_resize = 1;	1481	seen_resize = 1;
1484	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1482	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1485	}	1483	}
1486		1484	else
		1485	{
		1486	#ifdef HAVE_BG_PIXMAP
		1487	if (bgPixmap.window_position_sensitive ())
		1488	update_background ();
		1489	#endif
		1490	}
1487	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));	1491	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	}	1492	}
1494	break;	1493	break;
1495		1494
1496	case PropertyNotify:	1495	case PropertyNotify:
1497	if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))	1496	if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
…		…
1527	#ifdef TEXT_BLINK	1526	#ifdef TEXT_BLINK
1528	text_blink_ev.stop ();	1527	text_blink_ev.stop ();
1529	#endif	1528	#endif
1530	HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));	1529	HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1531	break;	1530	break;
1532
1533	#ifdef TRANSPARENT
1534	case ReparentNotify:
1535	rootwin_cb (ev);
1536	break;
1537	#endif /* TRANSPARENT */
1538		1531
1539	case GraphicsExpose:	1532	case GraphicsExpose:
1540	case Expose:	1533	case Expose:
1541	if (ev.xany.window == vt)	1534	if (ev.xany.window == vt)
1542	{	1535	{
1543	do	1536	do
1544	scr_expose (ev.xexpose.x, ev.xexpose.y,	1537	scr_expose (ev.xexpose.x, ev.xexpose.y,
1545	ev.xexpose.width, ev.xexpose.height, False);	1538	ev.xexpose.width, ev.xexpose.height, False);
1546	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));	1539	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1547		1540
1548	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1541	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1549		1542
1550	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))	1543	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1551	scr_expose (ev.xexpose.x, ev.xexpose.y,	1544	scr_expose (ev.xexpose.x, ev.xexpose.y,
1552	ev.xexpose.width, ev.xexpose.height, False);	1545	ev.xexpose.width, ev.xexpose.height, False);
1553		1546
1554	want_refresh = 1;	1547	want_refresh = 1;
1555	}	1548	}
1556	else	1549	else
1557	{	1550	{
1558	XEvent unused_event;	1551	XEvent unused_event;
1559		1552
1560	while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))	1553	while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1561	;	1554	;
1562	while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))	1555	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1563	;	1556	;
1564		1557
1565	if (isScrollbarWindow (ev.xany.window))	1558	if (isScrollbarWindow (ev.xany.window))
1566	{	1559	{
1567	scrollBar.setIdle ();	1560	scrollBar.setIdle ();
1568	scrollbar_show (0);	1561	scrollbar_show (0);
1569	}	1562	}
1570
1571	#ifdef TRANSPARENT
1572	if (am_transparent && ev.xany.window == parent[0])
1573	XClearWindow (disp, ev.xany.window);
1574	#endif
1575	}	1563	}
1576	break;	1564	break;
1577		1565
1578	case MotionNotify:	1566	case MotionNotify:
1579	#ifdef POINTER_BLANK	1567	#ifdef POINTER_BLANK
…		…
1588	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)	1576	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1589	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))	1577	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1590	; // nop	1578	; // nop
1591	else if (ev.xbutton.state & (Button1Mask | Button3Mask))	1579	else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1592	{	1580	{
1593	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))	1581	while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1594	;	1582	;
1595		1583
1596	XQueryPointer (disp, vt,	1584	XQueryPointer (dpy, vt,
1597	&unused_root, &unused_child,	1585	&unused_root, &unused_child,
1598	&unused_root_x, &unused_root_y,	1586	&unused_root_x, &unused_root_y,
1599	&ev.xbutton.x, &ev.xbutton.y,	1587	&ev.xbutton.x, &ev.xbutton.y,
1600	&ev.xbutton.state);	1588	&ev.xbutton.state);
1601	#ifdef MOUSE_THRESHOLD	1589	#ifdef MOUSE_THRESHOLD
…		…
1665	#endif	1653	#endif
1666	}	1654	}
1667	}	1655	}
1668	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1656	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1669	{	1657	{
1670	while (XCheckTypedWindowEvent (disp, scrollBar.win,	1658	while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1671	MotionNotify, &ev))	1659	MotionNotify, &ev))
1672	;	1660	;
1673		1661
1674	XQueryPointer (disp, scrollBar.win,	1662	XQueryPointer (dpy, scrollBar.win,
1675	&unused_root, &unused_child,	1663	&unused_root, &unused_child,
1676	&unused_root_x, &unused_root_y,	1664	&unused_root_x, &unused_root_y,
1677	&ev.xbutton.x, &ev.xbutton.y,	1665	&ev.xbutton.x, &ev.xbutton.y,
1678	&unused_mask);	1666	&unused_mask);
1679	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1667	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1680	scrollbar_size ());	1668	scrollbar_size ());
1681	want_refresh = 1;	1669	want_refresh = 1;
1682	refresh_limit = 0;
1683	scrollbar_show (1);	1670	scrollbar_show (1);
1684	}	1671	}
1685	break;	1672	break;
1686	}	1673	}
1687		1674
1688	skip_switch: ;
1689
1690	#if defined(CURSOR_BLINK)	1675	#if defined(CURSOR_BLINK)
1691	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)	1676	if (option (Opt_cursorBlink) && ev.type == KeyPress)
1692	{	1677	{
1693	if (hidden_cursor)	1678	if (hidden_cursor)
1694	{	1679	{
1695	hidden_cursor = 0;	1680	hidden_cursor = 0;
1696	want_refresh = 1;	1681	want_refresh = 1;
…		…
1699	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);	1684	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1700	}	1685	}
1701	#endif	1686	#endif
1702		1687
1703	#if defined(POINTER_BLANK)	1688	#if defined(POINTER_BLANK)
1704	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)	1689	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1705	{	1690	{
1706	if (ev.type == MotionNotify	1691	if (ev.type == MotionNotify
1707	|| ev.type == ButtonPress	1692	|| ev.type == ButtonPress
1708	|| ev.type == ButtonRelease)	1693	|| ev.type == ButtonRelease)
1709	if (hidden_pointer)	1694	if (hidden_pointer)
…		…
1721	if (!focus)	1706	if (!focus)
1722	{	1707	{
1723	focus = 1;	1708	focus = 1;
1724	want_refresh = 1;	1709	want_refresh = 1;
1725		1710
1726	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));	1711	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1727		1712
1728	#if USE_XIM	1713	#if USE_XIM
1729	if (Input_Context != NULL)	1714	if (Input_Context != NULL)
1730	{	1715	{
1731	IMSetStatusPosition ();	1716	IMSetPosition ();
1732	XSetICFocus (Input_Context);	1717	XSetICFocus (Input_Context);
1733	}	1718	}
1734	#endif	1719	#endif
1735	#if CURSOR_BLINK	1720	#if CURSOR_BLINK
1736	if (OPTION (Opt_cursorBlink))	1721	if (option (Opt_cursorBlink))
1737	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);	1722	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1738	#endif	1723	#endif
1739	#if OFF_FOCUS_FADING	1724	#if OFF_FOCUS_FADING
1740	if (rs[Rs_fade])	1725	if (rs[Rs_fade])
1741	{	1726	{
1742	pix_colors = pix_colors_focused;	1727	pix_colors = pix_colors_focused;
1743	scr_recolour ();	1728	scr_recolour ();
1744	}	1729	}
1745	#endif	1730	#endif
		1731	#if ENABLE_FRILLS
		1732	if (option (Opt_urgentOnBell))
		1733	{
		1734	if (XWMHints *h = XGetWMHints(dpy, parent[0]))
		1735	{
		1736	h->flags &= ~XUrgencyHint;
		1737	XSetWMHints (dpy, parent[0], h);
		1738	}
		1739	}
		1740	#endif
1746	}	1741	}
1747	}	1742	}
1748		1743
1749	void	1744	void
1750	rxvt_term::focus_out ()	1745	rxvt_term::focus_out ()
…		…
1758		1753
1759	#if ENABLE_FRILLS || ISO_14755	1754	#if ENABLE_FRILLS || ISO_14755
1760	if (iso14755buf)	1755	if (iso14755buf)
1761	{	1756	{
1762	iso14755buf = 0;	1757	iso14755buf = 0;
1763	# if ENABLE_OVERLAY	1758	# if ISO_14755
1764	scr_overlay_off ();	1759	scr_overlay_off ();
1765	# endif	1760	# endif
1766	}	1761	}
1767	#endif	1762	#endif
1768	#if USE_XIM	1763	#if USE_XIM
1769	if (Input_Context != NULL)	1764	if (Input_Context != NULL)
1770	XUnsetICFocus (Input_Context);	1765	XUnsetICFocus (Input_Context);
1771	#endif	1766	#endif
1772	#if CURSOR_BLINK	1767	#if CURSOR_BLINK
1773	if (OPTION (Opt_cursorBlink))	1768	if (option (Opt_cursorBlink))
1774	cursor_blink_ev.stop ();	1769	cursor_blink_ev.stop ();
1775	hidden_cursor = 0;	1770	hidden_cursor = 0;
1776	#endif	1771	#endif
1777	#if OFF_FOCUS_FADING	1772	#if OFF_FOCUS_FADING
1778	if (rs[Rs_fade])	1773	if (rs[Rs_fade])
…		…
1782	}	1777	}
1783	#endif	1778	#endif
1784	}	1779	}
1785	}	1780	}
1786		1781
1787	#if TRANSPARENT	1782	void
		1783	rxvt_term::update_fade_color (unsigned int idx)
		1784	{
		1785	#if OFF_FOCUS_FADING
		1786	if (rs[Rs_fade])
		1787	{
		1788	rgba c;
		1789	pix_colors [Color_fade].get (c);
		1790	pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
		1791	}
		1792	#endif
		1793	}
		1794
		1795	#if ENABLE_TRANSPARENCY || ENABLE_PERL
1788	void	1796	void
1789	rxvt_term::rootwin_cb (XEvent &ev)	1797	rxvt_term::rootwin_cb (XEvent &ev)
1790	{	1798	{
1791	make_current ();	1799	make_current ();
1792		1800
		1801	if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
		1802	&& HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
		1803	return;
		1804
		1805	# if ENABLE_TRANSPARENCY
1793	switch (ev.type)	1806	switch (ev.type)
1794	{	1807	{
1795	case PropertyNotify:	1808	case PropertyNotify:
1796	/*	1809	/*
1797	* if user used some Esetroot compatible prog to set the root bg,	1810	* if user used some Esetroot compatible prog to set the root bg,
1798	* use the property to determine the pixmap. We use it later on.	1811	* use the property to determine the pixmap. We use it later on.
1799	*/	1812	*/
1800	if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]	1813	if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1801	&& ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])	1814	|| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1802	return;	1815	{
1803		1816	bgPixmap.set_root_pixmap ();
1804	/* FALLTHROUGH */	1817	update_background ();
1805	case ReparentNotify:	1818	}
1806	if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1807	want_refresh = want_full_refresh = 1;
1808	break;	1819	break;
1809	}	1820	}
		1821	# endif
1810	}	1822	}
1811	#endif	1823	#endif
1812		1824
1813	void	1825	void
1814	rxvt_term::button_press (XButtonEvent &ev)	1826	rxvt_term::button_press (XButtonEvent &ev)
…		…
2142	selection_make (ev.time);	2154	selection_make (ev.time);
2143	break;	2155	break;
2144		2156
2145	case Button2:	2157	case Button2:
2146	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?	2158	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2147	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);	2159	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2148	break;	2160	break;
2149		2161
2150	#ifdef MOUSE_WHEEL	2162	#ifdef MOUSE_WHEEL
2151	case Button4:	2163	case Button4:
2152	case Button5:	2164	case Button5:
…		…
2156		2168
2157	v = ev.button == Button4 ? UP : DN;	2169	v = ev.button == Button4 ? UP : DN;
2158		2170
2159	if (ev.state & ShiftMask)	2171	if (ev.state & ShiftMask)
2160	i = 1;	2172	i = 1;
2161	else if (OPTION (Opt_mouseWheelScrollPage))	2173	else if (option (Opt_mouseWheelScrollPage))
2162	i = nrow - 1;	2174	i = nrow - 1;
2163	else	2175	else
2164	i = 5;	2176	i = 5;
2165		2177
2166	# ifdef MOUSE_SLIP_WHEELING	2178	# ifdef MOUSE_SLIP_WHEELING
…		…
2187	break;	2199	break;
2188	#endif	2200	#endif
2189	}	2201	}
2190	}	2202	}
2191	}	2203	}
2192
2193	#ifdef TRANSPARENT
2194	#if TINTING
2195	/* taken from aterm-0.4.2 */
2196
2197	typedef uint32_t RUINT32T;
2198
2199	void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2200	{
2201	int sh_r, sh_g, sh_b;
2202	RUINT32T mask_r, mask_g, mask_b;
2203	RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2204	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2205	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2206	int i;
2207
2208	Visual *visual = display->visual;
2209
2210	if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2211
2212	/* for convenience */
2213	mask_r = visual->red_mask;
2214	mask_g = visual->green_mask;
2215	mask_b = visual->blue_mask;
2216
2217	/* boring lookup table pre-initialization */
2218	switch (srcImage->bits_per_pixel) {
2219	case 15:
2220	if ((mask_r != 0x7c00) ||
2221	(mask_g != 0x03e0) ||
2222	(mask_b != 0x001f))
2223	return;
2224	lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2225	lookup_r = lookup;
2226	lookup_g = lookup+32;
2227	lookup_b = lookup+32+32;
2228	sh_r = 10;
2229	sh_g = 5;
2230	sh_b = 0;
2231	break;
2232	case 16:
2233	if ((mask_r != 0xf800) ||
2234	(mask_g != 0x07e0) ||
2235	(mask_b != 0x001f))
2236	return;
2237	lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2238	lookup_r = lookup;
2239	lookup_g = lookup+32;
2240	lookup_b = lookup+32+64;
2241	sh_r = 11;
2242	sh_g = 5;
2243	sh_b = 0;
2244	break;
2245	case 24:
2246	if ((mask_r != 0xff0000) ||
2247	(mask_g != 0x00ff00) ||
2248	(mask_b != 0x0000ff))
2249	return;
2250	lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2251	lookup_r = lookup;
2252	lookup_g = lookup+256;
2253	lookup_b = lookup+256+256;
2254	sh_r = 16;
2255	sh_g = 8;
2256	sh_b = 0;
2257	break;
2258	case 32:
2259	if ((mask_r != 0xff0000) ||
2260	(mask_g != 0x00ff00) ||
2261	(mask_b != 0x0000ff))
2262	return;
2263	lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2264	lookup_r = lookup;
2265	lookup_g = lookup+256;
2266	lookup_b = lookup+256+256;
2267	sh_r = 16;
2268	sh_g = 8;
2269	sh_b = 0;
2270	break;
2271	default:
2272	return; /* we do not support this color depth */
2273	}
2274
2275	/* prepare limits for color transformation (each channel is handled separately) */
2276	if (shade < 0) {
2277	shade = -shade;
2278	if (shade < 0) shade = 0;
2279	if (shade > 100) shade = 100;
2280
2281	lower_lim_r = 65535-rm;
2282	lower_lim_g = 65535-gm;
2283	lower_lim_b = 65535-bm;
2284
2285	lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2286	lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2287	lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2288
2289	upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2290	} else {
2291	if (shade < 0) shade = 0;
2292	if (shade > 100) shade = 100;
2293
2294	lower_lim_r = lower_lim_g = lower_lim_b = 0;
2295
2296	upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2297	upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2298	upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2299	}
2300
2301	/* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2302	if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2303	{
2304	unsigned int tmp;
2305
2306	tmp = lower_lim_r;
2307	lower_lim_r = lower_lim_b;
2308	lower_lim_b = tmp;
2309
2310	tmp = upper_lim_r;
2311	upper_lim_r = upper_lim_b;
2312	upper_lim_b = tmp;
2313	}
2314
2315	/* fill our lookup tables */
2316	for (i = 0; i <= mask_r>>sh_r; i++)
2317	{
2318	RUINT32T tmp;
2319	tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2320	tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2321	lookup_r[i] = (tmp/65535)<<sh_r;
2322	}
2323	for (i = 0; i <= mask_g>>sh_g; i++)
2324	{
2325	RUINT32T tmp;
2326	tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2327	tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2328	lookup_g[i] = (tmp/65535)<<sh_g;
2329	}
2330	for (i = 0; i <= mask_b>>sh_b; i++)
2331	{
2332	RUINT32T tmp;
2333	tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2334	tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2335	lookup_b[i] = (tmp/65535)<<sh_b;
2336	}
2337
2338	/* apply table to input image (replacing colors by newly calculated ones) */
2339	switch (srcImage->bits_per_pixel)
2340	{
2341	case 15:
2342	{
2343	unsigned short *p1, *pf, *p, *pl;
2344	p1 = (unsigned short *) srcImage->data;
2345	pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2346	while (p1 < pf)
2347	{
2348	p = p1;
2349	pl = p1 + srcImage->width;
2350	for (; p < pl; p++)
2351	{
2352	*p = lookup_r[(*p & 0x7c00)>>10] |
2353	lookup_g[(*p & 0x03e0)>> 5] |
2354	lookup_b[(*p & 0x001f)];
2355	}
2356	p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2357	}
2358	break;
2359	}
2360	case 16:
2361	{
2362	unsigned short *p1, *pf, *p, *pl;
2363	p1 = (unsigned short *) srcImage->data;
2364	pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2365	while (p1 < pf)
2366	{
2367	p = p1;
2368	pl = p1 + srcImage->width;
2369	for (; p < pl; p++)
2370	{
2371	*p = lookup_r[(*p & 0xf800)>>11] |
2372	lookup_g[(*p & 0x07e0)>> 5] |
2373	lookup_b[(*p & 0x001f)];
2374	}
2375	p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2376	}
2377	break;
2378	}
2379	case 24:
2380	{
2381	unsigned char *p1, *pf, *p, *pl;
2382	p1 = (unsigned char *) srcImage->data;
2383	pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2384	while (p1 < pf)
2385	{
2386	p = p1;
2387	pl = p1 + srcImage->width * 3;
2388	for (; p < pl; p += 3)
2389	{
2390	p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2391	p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2392	p[2] = lookup_r[(p[2] & 0x0000ff)];
2393	}
2394	p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2395	}
2396	break;
2397	}
2398	case 32:
2399	{
2400	RUINT32T *p1, *pf, *p, *pl;
2401	p1 = (RUINT32T *) srcImage->data;
2402	pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2403
2404	while (p1 < pf)
2405	{
2406	p = p1;
2407	pl = p1 + srcImage->width;
2408	for (; p < pl; p++)
2409	{
2410	*p = lookup_r[(*p & 0xff0000)>>16] |
2411	lookup_g[(*p & 0x00ff00)>> 8] |
2412	lookup_b[(*p & 0x0000ff)] |
2413	(*p & ~0xffffff);
2414	}
2415	p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2416	}
2417	break;
2418	}
2419	}
2420
2421	free (lookup);
2422	}
2423	#endif
2424
2425	/*
2426	* Check our parents are still who we think they are.
2427	* Do transparency updates if required
2428	*/
2429	int
2430	rxvt_term::check_our_parents ()
2431	{
2432	int i, pchanged, aformat, have_pixmap, rootdepth;
2433	unsigned long nitems, bytes_after;
2434	Atom atype;
2435	unsigned char *prop = NULL;
2436	Window root, oldp, *list;
2437	Pixmap rootpixmap = None;
2438	XWindowAttributes wattr, wrootattr;
2439	dDisp;
2440
2441	pchanged = 0;
2442
2443	if (!OPTION (Opt_transparent))
2444	return pchanged; /* Don't try any more */
2445
2446	XGetWindowAttributes (disp, display->root, &wrootattr);
2447	rootdepth = wrootattr.depth;
2448
2449	XGetWindowAttributes (disp, parent[0], &wattr);
2450
2451	if (rootdepth != wattr.depth)
2452	{
2453	if (am_transparent)
2454	{
2455	pchanged = 1;
2456	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2457	am_transparent = am_pixmap_trans = 0;
2458	}
2459
2460	return pchanged; /* Don't try any more */
2461	}
2462
2463	/* Get all X ops out of the queue so that our information is up-to-date. */
2464	XSync (disp, False);
2465
2466	/*
2467	* Make the frame window set by the window manager have
2468	* the root background. Some window managers put multiple nested frame
2469	* windows for each client, so we have to take care about that.
2470	*/
2471	i = (xa[XA_XROOTPMAP_ID]
2472	&& XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2473	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2474	&nitems, &bytes_after, &prop) == Success);
2475
2476	if (!i || prop == NULL)
2477	i = (xa[XA_ESETROOT_PMAP_ID]
2478	&& XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2479	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2480	&nitems, &bytes_after, &prop) == Success);
2481
2482	if (!i || prop == NULL
2483	#if TINTING
2484	|| !rs[Rs_color + Color_tint]
2485	#endif
2486	)
2487	have_pixmap = 0;
2488	else
2489	{
2490	have_pixmap = 1;
2491	rootpixmap = *(Pixmap *)prop;
2492	XFree (prop);
2493	}
2494
2495	if (have_pixmap)
2496	{
2497	/*
2498	* Copy display->root pixmap transparency
2499	*/
2500	int sx, sy, nx, ny;
2501	unsigned int nw, nh;
2502	Window cr;
2503	XImage *image;
2504	GC gc;
2505	XGCValues gcvalue;
2506
2507	XTranslateCoordinates (disp, parent[0], display->root,
2508	0, 0, &sx, &sy, &cr);
2509	nw = (unsigned int)szHint.width;
2510	nh = (unsigned int)szHint.height;
2511	nx = ny = 0;
2512
2513	if (sx < 0)
2514	{
2515	nw += sx;
2516	nx = -sx;
2517	sx = 0;
2518	}
2519
2520	if (sy < 0)
2521	{
2522	nh += sy;
2523	ny = -sy;
2524	sy = 0;
2525	}
2526
2527	min_it (nw, (unsigned int) (wrootattr.width - sx));
2528	min_it (nh, (unsigned int) (wrootattr.height - sy));
2529
2530	XSync (disp, False);
2531	allowedxerror = -1;
2532	image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2533
2534	/* XXX: handle BadMatch - usually because we're outside the pixmap */
2535	/* XXX: may need a delay here? */
2536	allowedxerror = 0;
2537
2538	if (image == NULL)
2539	{
2540	if (am_transparent && am_pixmap_trans)
2541	{
2542	pchanged = 1;
2543	if (pixmap != None)
2544	{
2545	XFreePixmap (disp, pixmap);
2546	pixmap = None;
2547	}
2548	}
2549
2550	am_pixmap_trans = 0;
2551	}
2552	else
2553	{
2554	if (pixmap != None)
2555	XFreePixmap (disp, pixmap);
2556
2557	#if TINTING
2558	if (ISSET_PIXCOLOR (Color_tint))
2559	{
2560	unsigned short rm, gm, bm;
2561	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2562
2563	pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2564
2565	ShadeXImage (display, image, shade, rm, gm, bm);
2566	}
2567	#endif
2568
2569	pixmap = XCreatePixmap (disp, vt,
2570	szHint.width, szHint.height, image->depth);
2571	gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2572	XPutImage (disp, pixmap, gc, image, 0, 0,
2573	nx, ny, image->width, image->height);
2574	XFreeGC (disp, gc);
2575	XDestroyImage (image);
2576	XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2577	XClearWindow (disp, parent[0]);
2578
2579	if (!am_transparent || !am_pixmap_trans)
2580	pchanged = 1;
2581
2582	am_transparent = am_pixmap_trans = 1;
2583	}
2584	}
2585
2586	if (am_pixmap_trans)
2587	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2588	else
2589	{
2590	unsigned int n;
2591	/*
2592	* InheritPixmap transparency
2593	*/
2594	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2595	{
2596	oldp = parent[i];
2597	XQueryTree (disp, parent[i - 1], &root,
2598	&parent[i], &list, &n);
2599	XFree (list);
2600
2601	if (parent[i] == display->root)
2602	{
2603	if (oldp != None)
2604	pchanged = 1;
2605
2606	break;
2607	}
2608
2609	if (oldp != parent[i])
2610	pchanged = 1;
2611	}
2612
2613	n = 0;
2614
2615	if (pchanged)
2616	{
2617	for (; n < (unsigned int)i; n++)
2618	{
2619	XGetWindowAttributes (disp, parent[n], &wattr);
2620	if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2621	{
2622	n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2623	break;
2624	}
2625	}
2626	}
2627
2628	if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2629	{
2630	XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2631	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2632	am_transparent = 0;
2633	/* XXX: also turn off Opt_transparent? */
2634	}
2635	else
2636	{
2637	for (n = 0; n < (unsigned int)i; n++)
2638	{
2639	XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2640	XClearWindow (disp, parent[n]);
2641	}
2642
2643	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2644	am_transparent = 1;
2645	}
2646
2647	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2648	parent[i] = None;
2649	}
2650
2651	if (scrollBar.win)
2652	{
2653	XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2654	scrollBar.setIdle ();
2655	scrollbar_show (0);
2656	}
2657
2658	if (am_transparent)
2659	{
2660	want_refresh = want_full_refresh = 1;
2661	if (am_pixmap_trans)
2662	flush ();
2663	}
2664
2665	return pchanged;
2666	}
2667	#endif
2668		2204
2669	/*}}} */	2205	/*}}} */
2670		2206
2671	bool	2207	bool
2672	rxvt_term::cmd_parse ()	2208	rxvt_term::cmd_parse ()
…		…
2721	if (ch == C0_LF)	2257	if (ch == C0_LF)
2722	nlines++;	2258	nlines++;
2723		2259
2724	refresh_count++;	2260	refresh_count++;
2725		2261
2726	if (!OPTION (Opt_jumpScroll)	2262	if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2727	|| (refresh_count >= refresh_limit * (nrow - 1)))
2728	{	2263	{
2729	refreshnow = true;
2730	refresh_count = 0;	2264	refresh_count = 0;
		2265
		2266	if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.)
		2267	{
		2268	refreshnow = true;
2731	ch = NOCHAR;	2269	ch = NOCHAR;
2732	break;	2270	break;
		2271	}
2733	}	2272	}
2734		2273
2735	// scr_add_lines only works for nlines <= nrow - 1.	2274	// scr_add_lines only works for nlines <= nrow - 1.
2736	if (nlines >= nrow - 1)	2275	if (nlines >= nrow - 1)
2737	{	2276	{
…		…
2765	&& HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))	2304	&& HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2766	scr_add_lines (buf, str - buf, nlines);	2305	scr_add_lines (buf, str - buf, nlines);
2767		2306
2768	/*	2307	/*
2769	* If there have been a lot of new lines, then update the screen	2308	* If there have been a lot of new lines, then update the screen
2770	* What the heck I'll cheat and only refresh less than every page-full.	2309	* What the heck we'll cheat and only refresh less than every page-full.
2771	* the number of pages between refreshes is refresh_limit, which	2310	* if skipScroll is enabled.
2772	* is incremented here because we must be doing flat-out scrolling.
2773	*/	2311	*/
2774	if (refreshnow)	2312	if (refreshnow)
2775	{	2313	{
2776	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2777	refresh_limit++;
2778	else
2779	{
2780	flag = true;	2314	flag = true;
2781	scr_refresh ();	2315	scr_refresh ();
2782	want_refresh = 1;	2316	want_refresh = 1;
2783	}
2784	}	2317	}
2785		2318
2786	}	2319	}
2787	else	2320	else
2788	{	2321	{
…		…
2937	{	2470	{
2938	if ((buf[len++] = cmd_getc ()) == 'i')	2471	if ((buf[len++] = cmd_getc ()) == 'i')
2939	break; /* done = 1 */	2472	break; /* done = 1 */
2940	}	2473	}
2941	}	2474	}
2942		2475
2943	for (i = 0; i < len; i++)	2476	for (i = 0; i < len; i++)
2944	if (putc (buf[i], fd) == EOF)	2477	if (putc (buf[i], fd) == EOF)
2945	{	2478	{
2946	done = 1;	2479	done = 1;
2947	break;	2480	break;
…		…
3009	process_dcs_seq ();	2542	process_dcs_seq ();
3010	break;	2543	break;
3011	case 0x9b: /* CSI */	2544	case 0x9b: /* CSI */
3012	process_csi_seq ();	2545	process_csi_seq ();
3013	break;	2546	break;
3014	case 0x9d: /* CSI */	2547	case 0x9d: /* OSC */
3015	process_osc_seq ();	2548	process_osc_seq ();
3016	break;	2549	break;
3017	#endif	2550	#endif
3018	}	2551	}
3019	}	2552	}
…		…
3109	scr_charset_set (2, (unsigned int)cmd_getc ());	2642	scr_charset_set (2, (unsigned int)cmd_getc ());
3110	break;	2643	break;
3111	case '+':	2644	case '+':
3112	scr_charset_set (3, (unsigned int)cmd_getc ());	2645	scr_charset_set (3, (unsigned int)cmd_getc ());
3113	break;	2646	break;
3114	#if ENABLE_FRILLS	2647	#if !ENABLE_MINIMAL
3115	case '6':	2648	case '6':
3116	scr_backindex ();	2649	scr_backindex ();
3117	break;	2650	break;
3118	#endif	2651	#endif
3119	case '7':	2652	case '7':
3120	scr_cursor (SAVE);	2653	scr_cursor (SAVE);
3121	break;	2654	break;
3122	case '8':	2655	case '8':
3123	scr_cursor (RESTORE);	2656	scr_cursor (RESTORE);
3124	break;	2657	break;
3125	#if ENABLE_FRILLS	2658	#if !ENABLE_MINIMAL
3126	case '9':	2659	case '9':
3127	scr_forwardindex ();	2660	scr_forwardindex ();
3128	break;	2661	break;
3129	#endif	2662	#endif
3130	case '=':	2663	case '=':
…		…
3245	rxvt_term::process_csi_seq ()	2778	rxvt_term::process_csi_seq ()
3246	{	2779	{
3247	unicode_t ch, priv, i;	2780	unicode_t ch, priv, i;
3248	unsigned int nargs, p;	2781	unsigned int nargs, p;
3249	int n, ndef;	2782	int n, ndef;
3250	int arg[ESC_ARGS];	2783	int arg[ESC_ARGS] = { };
3251		2784
3252	for (nargs = ESC_ARGS; nargs > 0;)	2785	nargs = 0;
3253	arg[--nargs] = 0;
3254		2786
3255	priv = 0;	2787	priv = 0;
3256	ch = cmd_getc ();	2788	ch = cmd_getc ();
3257	if (ch >= '<' && ch <= '?')	2789	if (ch >= '<' && ch <= '?')
3258	{ /* '<' '=' '>' '?' */	2790	{ /* '<' '=' '>' '?' */
…		…
3292	ndef = get_byte_array_bit (csi_defaults, i);	2824	ndef = get_byte_array_bit (csi_defaults, i);
3293	for (p = 0; p < nargs; p++)	2825	for (p = 0; p < nargs; p++)
3294	if (arg[p] == -1)	2826	if (arg[p] == -1)
3295	arg[p] = ndef;	2827	arg[p] = ndef;
3296		2828
3297	#ifdef DEBUG_CMD
3298	fprintf (stderr, "CSI ");
3299	for (p = 0; p < nargs; p++)
3300	fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3301	fprintf (stderr, "%c\n", ch);
3302	#endif
3303
3304	/*	2829	/*
3305	* private mode handling	2830	* private mode handling
3306	*/	2831	*/
3307	if (priv)	2832	if (priv)
3308	{	2833	{
3309	switch (priv)	2834	switch (priv)
3310	{	2835	{
3311	case '>':	2836	case '>':
3312	if (ch == CSI_DA) /* secondary device attributes */	2837	if (ch == CSI_DA) /* secondary device attributes */
3313	tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);	2838	{
		2839	// first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
		2840	// 'U' for rxvt-unicode != 7.[34] (where it was broken).
		2841	//
		2842	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
		2843	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
		2844	// that we do not support xterm mouse reporting (should be 95 when we do).
		2845	//
		2846	tt_printf ("\033[>%d;94;0c", 'U');
		2847	}
3314	break;	2848	break;
3315	case '?':	2849	case '?':
3316	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')	2850	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3317	process_terminal_mode (ch, priv, nargs, arg);	2851	process_terminal_mode (ch, priv, nargs, arg);
3318	break;	2852	break;
…		…
3444	break;	2978	break;
3445	case 6: /* CPR requested */	2979	case 6: /* CPR requested */
3446	scr_report_position ();	2980	scr_report_position ();
3447	break;	2981	break;
3448	case 7: /* unofficial extension */	2982	case 7: /* unofficial extension */
3449	if (OPTION (Opt_insecure))	2983	if (option (Opt_insecure))
3450	tt_printf ("%-.250s\012", rs[Rs_display_name]);	2984	tt_printf ("%-.250s\012", rs[Rs_display_name]);
3451	break;	2985	break;
3452	case 8: /* unofficial extension */	2986	case 8: /* unofficial extension */
3453	process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);	2987	process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3454	break;	2988	break;
…		…
3521	break;	3055	break;
3522	case CSI_75:	3056	case CSI_75:
3523	scr_cursor (RESTORE);	3057	scr_cursor (RESTORE);
3524	break;	3058	break;
3525		3059
3526	#if ENABLE_FRILLS	3060	#if !ENABLE_MINIMAL
3527	case CSI_74:	3061	case CSI_74:
3528	process_window_ops (arg, nargs);	3062	process_window_ops (arg, nargs);
3529	break;	3063	break;
3530	#endif	3064	#endif
3531		3065
…		…
3538	break;	3072	break;
3539	}	3073	}
3540	}	3074	}
3541	/*}}} */	3075	/*}}} */
3542		3076
3543	#if ENABLE_FRILLS	3077	#if !ENABLE_MINIMAL
3544	/* ARGSUSED */	3078	/* ARGSUSED */
3545	void	3079	void
3546	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3080	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3547	{	3081	{
3548	int x, y;	3082	int x, y;
3549	XWindowAttributes wattr;	3083	XWindowAttributes wattr;
3550	Window wdummy;	3084	Window wdummy;
3551	dDisp;	3085
		3086	dLocal (Display *, dpy);
3552		3087
3553	if (nargs == 0)	3088	if (nargs == 0)
3554	return;	3089	return;
3555		3090
3556	switch (args[0])	3091	switch (args[0])
3557	{	3092	{
3558	/*	3093	/*
3559	* commands	3094	* commands
3560	*/	3095	*/
3561	case 1: /* deiconify window */	3096	case 1: /* deiconify window */
3562	XMapWindow (disp, parent[0]);	3097	XMapWindow (dpy, parent[0]);
3563	break;	3098	break;
3564	case 2: /* iconify window */	3099	case 2: /* iconify window */
3565	XIconifyWindow (disp, parent[0], display->screen);	3100	XIconifyWindow (dpy, parent[0], display->screen);
3566	break;	3101	break;
3567	case 3: /* set position (pixels) */	3102	case 3: /* set position (pixels) */
3568	XMoveWindow (disp, parent[0], args[1], args[2]);	3103	XMoveWindow (dpy, parent[0], args[1], args[2]);
3569	break;	3104	break;
3570	case 4: /* set size (pixels) */	3105	case 4: /* set size (pixels) */
3571	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3106	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3572	break;	3107	break;
3573	case 5: /* raise window */	3108	case 5: /* raise window */
3574	XRaiseWindow (disp, parent[0]);	3109	XRaiseWindow (dpy, parent[0]);
3575	break;	3110	break;
3576	case 6: /* lower window */	3111	case 6: /* lower window */
3577	XLowerWindow (disp, parent[0]);	3112	XLowerWindow (dpy, parent[0]);
3578	break;	3113	break;
3579	case 7: /* refresh window */	3114	case 7: /* refresh window */
3580	scr_touch (true);	3115	scr_touch (true);
3581	break;	3116	break;
3582	case 8: /* set size (chars) */	3117	case 8: /* set size (chars) */
…		…
3589	if (args[0] >= 24) /* set height (chars) */	3124	if (args[0] >= 24) /* set height (chars) */
3590	set_widthheight ((unsigned int)width,	3125	set_widthheight ((unsigned int)width,
3591	(unsigned int) (args[1] * fheight));	3126	(unsigned int) (args[1] * fheight));
3592	break;	3127	break;
3593		3128
3594
3595	/*	3129	/*
3596	* reports - some output format copied from XTerm	3130	* reports - some output format copied from XTerm
3597	*/	3131	*/
3598	case 11: /* report window state */	3132	case 11: /* report window state */
3599	XGetWindowAttributes (disp, parent[0], &wattr);	3133	XGetWindowAttributes (dpy, parent[0], &wattr);
3600	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3134	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3601	break;	3135	break;
3602	case 13: /* report window position */	3136	case 13: /* report window position */
3603	XGetWindowAttributes (disp, parent[0], &wattr);	3137	XGetWindowAttributes (dpy, parent[0], &wattr);
3604	XTranslateCoordinates (disp, parent[0], wattr.root,	3138	XTranslateCoordinates (dpy, parent[0], wattr.root,
3605	-wattr.border_width, -wattr.border_width,	3139	-wattr.border_width, -wattr.border_width,
3606	&x, &y, &wdummy);	3140	&x, &y, &wdummy);
3607	tt_printf ("\033[3;%d;%dt", x, y);	3141	tt_printf ("\033[3;%d;%dt", x, y);
3608	break;	3142	break;
3609	case 14: /* report window size (pixels) */	3143	case 14: /* report window size (pixels) */
3610	XGetWindowAttributes (disp, parent[0], &wattr);	3144	XGetWindowAttributes (dpy, parent[0], &wattr);
3611	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3145	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3612	break;	3146	break;
3613	case 18: /* report text area size (chars) */	3147	case 18: /* report text area size (chars) */
3614	tt_printf ("\033[8;%d;%dt", nrow, ncol);	3148	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3615	break;	3149	break;
…		…
3617	tt_printf ("\033[9;%d;%dt", nrow, ncol);	3151	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3618	break;	3152	break;
3619	case 20: /* report icon label */	3153	case 20: /* report icon label */
3620	{	3154	{
3621	char *s;	3155	char *s;
3622	XGetIconName (disp, parent[0], &s);	3156	XGetIconName (dpy, parent[0], &s);
3623	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3157	tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3624	XFree (s);	3158	XFree (s);
3625	}	3159	}
3626	break;	3160	break;
3627	case 21: /* report window title */	3161	case 21: /* report window title */
3628	{	3162	{
3629	char *s;	3163	char *s;
3630	XFetchName (disp, parent[0], &s);	3164	XFetchName (dpy, parent[0], &s);
3631	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3165	tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3632	XFree (s);	3166	XFree (s);
3633	}	3167	}
3634	break;	3168	break;
3635	}	3169	}
3636	}	3170	}
…		…
3663	seen_esc = true;	3197	seen_esc = true;
3664	continue;	3198	continue;
3665	}	3199	}
3666	else if (ch == C0_BEL || ch == CHAR_ST)	3200	else if (ch == C0_BEL || ch == CHAR_ST)
3667	break;	3201	break;
		3202	else if (ch == C0_SYN)
		3203	ch = cmd_get8 ();
3668	else if (ch < 0x20)	3204	else if (ch < 0x20)
3669	return NULL; /* other control character - exit */	3205	return NULL; /* other control character - exit */
3670		3206
3671	seen_esc = false;	3207	seen_esc = false;
3672		3208
3673	if (n >= STRING_MAX - 1)	3209	if (n >= STRING_MAX - 1)
3674	// stop at some sane length	3210	// stop at some sane length
3675	return NULL;	3211	return NULL;
3676		3212
3677	if (ch == C0_SYN)
3678	string[n++] = cmd_get8 ();
3679	else
3680	string[n++] = ch;	3213	string[n++] = ch;
3681	}	3214	}
3682		3215
3683	string[n++] = '\0';	3216	string[n++] = '\0';
3684		3217
3685	ends_how = (ch == 0x5c ? C0_ESC : ch);	3218	ends_how = (ch == 0x5c ? C0_ESC : ch);
…		…
3736	void	3269	void
3737	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)	3270	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3738	{	3271	{
3739	if (str[0] == '?' && !str[1])	3272	if (str[0] == '?' && !str[1])
3740	{	3273	{
3741	unsigned short r, g, b;	3274	rgba c;
3742	pix_colors_focused[color].get (display, r, g, b);	3275	pix_colors_focused[color].get (c);
		3276
		3277	#if XFT
		3278	if (c.a != rgba::MAX_CC)
		3279	tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
		3280	else
		3281	#endif
3743	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);	3282	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3744	}	3283	}
3745	else	3284	else
3746	set_window_color (color, str);	3285	set_window_color (color, str);
3747	}	3286	}
3748		3287
…		…
3754	{	3293	{
3755	int color;	3294	int color;
3756	char *buf, *name;	3295	char *buf, *name;
3757	bool query = str[0] == '?' && !str[1];	3296	bool query = str[0] == '?' && !str[1];
3758	int saveop = op;	3297	int saveop = op;
3759	dDisp;	3298
		3299	dLocal (Display *, dpy);
3760		3300
3761	assert (str != NULL);	3301	assert (str != NULL);
		3302
		3303	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
		3304	return;
		3305
3762	switch (op)	3306	switch (op)
3763	{	3307	{
3764	case XTerm_name:	3308	case XTerm_name:
3765	set_title (str);	3309	set_title (str);
3766	/* FALLTHROUGH */	3310	/* FALLTHROUGH */
…		…
3780	unsigned long bytes_after;	3324	unsigned long bytes_after;
3781	unsigned char *value = 0;	3325	unsigned char *value = 0;
3782	const char *str = "";	3326	const char *str = "";
3783		3327
3784	if (prop	3328	if (prop
3785	&& XGetWindowProperty (disp, parent[0],	3329	&& XGetWindowProperty (dpy, parent[0],
3786	prop, 0, 1<<16, 0, AnyPropertyType,	3330	prop, 0, 1<<16, 0, AnyPropertyType,
3787	&actual_type, &actual_format,	3331	&actual_type, &actual_format,
3788	&nitems, &bytes_after, &value) == Success	3332	&nitems, &bytes_after, &value) == Success
3789	&& actual_type != None	3333	&& actual_type != None
3790	&& actual_format == 8)	3334	&& actual_format == 8)
3791	str = (const char *)(value);	3335	str = (const char *)(value);
3792		3336
3793	tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);	3337	tt_printf ("\033]%d;%s%c", op, str, resp);
3794		3338
3795	XFree (value);	3339	XFree (value);
3796	}	3340	}
3797	else	3341	else
3798	{	3342	{
…		…
3802	{	3346	{
3803	*eq = 0;	3347	*eq = 0;
3804	set_utf8_property (display->atom (str), eq + 1);	3348	set_utf8_property (display->atom (str), eq + 1);
3805	}	3349	}
3806	else	3350	else
3807	XDeleteProperty (disp, parent[0],	3351	XDeleteProperty (dpy, parent[0],
3808	display->atom (str));	3352	display->atom (str));
3809	}	3353	}
3810	break;	3354	break;
3811		3355
3812	case XTerm_Color:	3356	case XTerm_Color:
…		…
3822	break;	3366	break;
3823		3367
3824	if ((buf = strchr (name, ';')) != NULL)	3368	if ((buf = strchr (name, ';')) != NULL)
3825	*buf++ = '\0';	3369	*buf++ = '\0';
3826		3370
3827	if (name[0] == '?' && !name[1])	3371	process_color_seq (op, color, name, resp);
3828	{
3829	unsigned short r, g, b;
3830	pix_colors_focused[color].get (display, r, g, b);
3831	tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3832	}
3833	else
3834	set_window_color (color, name);
3835	}	3372	}
3836	break;	3373	break;
3837	case XTerm_Color00:	3374	case XTerm_Color00:
3838	process_color_seq (XTerm_Color00, Color_fg, str, resp);	3375	process_color_seq (op, Color_fg, str, resp);
3839	break;	3376	break;
3840	case XTerm_Color01:	3377	case XTerm_Color01:
3841	process_color_seq (XTerm_Color01, Color_bg, str, resp);	3378	process_color_seq (op, Color_bg, str, resp);
3842	break;	3379	break;
3843	#ifndef NO_CURSORCOLOR	3380	#ifndef NO_CURSORCOLOR
3844	case XTerm_Color_cursor:	3381	case XTerm_Color_cursor:
3845	process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);	3382	process_color_seq (op, Color_cursor, str, resp);
3846	break;	3383	break;
3847	#endif	3384	#endif
3848	case XTerm_Color_pointer_fg:	3385	case XTerm_Color_pointer_fg:
3849	process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);	3386	process_color_seq (op, Color_pointer_fg, str, resp);
3850	break;	3387	break;
3851	case XTerm_Color_pointer_bg:	3388	case XTerm_Color_pointer_bg:
3852	process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);	3389	process_color_seq (op, Color_pointer_bg, str, resp);
3853	break;	3390	break;
3854	#ifndef NO_BOLD_UNDERLINE_REVERSE	3391	#ifndef NO_BOLD_UNDERLINE_REVERSE
3855	case XTerm_Color_RV:	3392	case XTerm_Color_RV:
3856	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3393	process_color_seq (op, Color_RV, str, resp);
3857	break;	3394	break;
3858	case Rxvt_Color_BD:	3395	case Rxvt_Color_BD:
3859	case URxvt_Color_BD:	3396	case URxvt_Color_BD:
3860	process_color_seq (op, Color_BD, str, resp);	3397	process_color_seq (op, Color_BD, str, resp);
3861	break;	3398	break;
3862	case Rxvt_Color_UL:	3399	case Rxvt_Color_UL:
3863	case URxvt_Color_UL:	3400	case URxvt_Color_UL:
3864	process_color_seq (op, Color_UL, str, resp);	3401	process_color_seq (op, Color_UL, str, resp);
3865	break;	3402	break;
3866	case URxvt_Color_IT:	3403	case URxvt_Color_IT:
3867	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);	3404	process_color_seq (op, Color_IT, str, resp);
3868	break;	3405	break;
3869	#endif	3406	#endif
3870	#if TRANSPARENT && TINTING	3407	#if ENABLE_TRANSPARENCY
3871	case URxvt_Color_tint:	3408	case URxvt_Color_tint:
3872	process_color_seq (URxvt_Color_tint, Color_tint, str, resp);	3409	process_color_seq (op, Color_tint, str, resp);
3873	check_our_parents ();	3410	{
3874	if (am_transparent)	3411	bool changed = false;
3875	want_full_refresh = want_refresh = 1;	3412	if (ISSET_PIXCOLOR (Color_tint))
3876	break;	3413	changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3877	#endif	3414	else
		3415	changed = bgPixmap.unset_tint ();
		3416	if (changed)
		3417	update_background ();
		3418	}
3878		3419
		3420	break;
		3421	#endif
		3422
		3423	#if BG_IMAGE_FROM_FILE
3879	case Rxvt_Pixmap:	3424	case Rxvt_Pixmap:
3880	{	3425	if (!strcmp (str, "?"))
3881	if (*str != ';')
3882	{	3426	{
3883	#if XPM_BACKGROUND	3427	char str[256];
3884	scale_pixmap (""); /* reset to default scaling */	3428
3885	set_bgPixmap (str); /* change pixmap */	3429	sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3886	scr_touch (true);	3430	min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3887	#endif	3431	min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
		3432	process_xterm_seq (XTerm_title, str, CHAR_ST);
3888	}	3433	}
3889		3434	else
		3435	{
3890	int changed = 0;	3436	int changed = 0;
3891		3437
3892	while ((str = strchr (str, ';')) != NULL)	3438	if (*str != ';')
3893	{	3439	{
		3440	/* reset to default scaling :*/
		3441	bgPixmap.unset_geometry ();
		3442	if (bgPixmap.set_file (str)) /* change pixmap */
		3443	changed++;
		3444	str = strchr (str, ';');
		3445	if (str == NULL)
		3446	bgPixmap.set_defaultGeometry ();
		3447	}
		3448	while (str)
		3449	{
3894	str++;	3450	str++;
3895	#if XPM_BACKGROUND	3451	if (bgPixmap.set_geometry (str))
3896	changed += scale_pixmap (str);	3452	changed++;
3897	#endif	3453	str = strchr (str, ';');
3898	}	3454	}
3899
3900	if (changed)	3455	if (changed)
3901	{	3456	update_background ();
3902	#ifdef XPM_BACKGROUND
3903	resize_pixmap ();
3904	scr_touch (true);
3905	#endif
3906	}	3457	}
3907	}
3908	break;	3458	break;
		3459	#endif
3909		3460
3910	case Rxvt_restoreFG:	3461	case Rxvt_restoreFG:
3911	set_window_color (Color_fg, str);	3462	set_window_color (Color_fg, str);
3912	break;	3463	break;
3913	case Rxvt_restoreBG:	3464	case Rxvt_restoreBG:
…		…
3938	case URxvt_italicFont:	3489	case URxvt_italicFont:
3939	case URxvt_boldItalicFont:	3490	case URxvt_boldItalicFont:
3940	#endif	3491	#endif
3941	if (query)	3492	if (query)
3942	tt_printf ("\33]%d;%-.250s%c", saveop,	3493	tt_printf ("\33]%d;%-.250s%c", saveop,
3943	OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc	3494	option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3944	? fontset[op - URxvt_font]->fontdesc : "",	3495	? fontset[op - URxvt_font]->fontdesc : "",
3945	resp);	3496	resp);
3946	else	3497	else
3947	{	3498	{
3948	const char *&res = rs[Rs_font + (op - URxvt_font)];	3499	const char *&res = rs[Rs_font + (op - URxvt_font)];
…		…
3951	allocated.push_back ((void *)res);	3502	allocated.push_back ((void *)res);
3952	set_fonts ();	3503	set_fonts ();
3953	}	3504	}
3954	break;	3505	break;
3955		3506
3956	#if ENABLE_FRILLS	3507	case URxvt_version:
		3508	if (query)
		3509	tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
		3510	op,
		3511	rs[Rs_name], VERSION[0], VERSION[2],
		3512	resp);
		3513	break;
		3514
		3515	#if !ENABLE_MINIMAL
3957	case URxvt_locale:	3516	case URxvt_locale:
3958	if (query)	3517	if (query)
3959	tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);	3518	tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3960	else	3519	else
3961	{	3520	{
3962	set_locale (str);	3521	set_locale (str);
3963	pty->set_utf8_mode (enc_utf8);	3522	pty->set_utf8_mode (enc_utf8);
3964	init_xlocale ();	3523	init_xlocale ();
…		…
3979	break;	3538	break;
3980	#endif	3539	#endif
3981		3540
3982	#if ENABLE_PERL	3541	#if ENABLE_PERL
3983	case URxvt_perl:	3542	case URxvt_perl:
3984	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))	3543	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3985	; // no responses yet	3544	; // no responses yet
3986	break;	3545	break;
3987	#endif	3546	#endif
3988	}	3547	}
3989	}	3548	}
…		…
4027	{	3586	{
4028	unsigned int i, j;	3587	unsigned int i, j;
4029	int state;	3588	int state;
4030		3589
4031	static const struct	3590	static const struct
4032	{	3591	{
4033	const int argval;	3592	const int argval;
4034	const unsigned long bit;	3593	const unsigned long bit;
4035	}
4036
4037	argtopriv[] = {	3594	} argtopriv[] = {
4038	{ 1, PrivMode_aplCUR },	3595	{ 1, PrivMode_aplCUR },
4039	{ 2, PrivMode_vt52 },	3596	{ 2, PrivMode_vt52 },
4040	{ 3, PrivMode_132 },	3597	{ 3, PrivMode_132 },
4041	{ 4, PrivMode_smoothScroll },	3598	{ 4, PrivMode_smoothScroll },
4042	{ 5, PrivMode_rVideo },	3599	{ 5, PrivMode_rVideo },
…		…
4105	scr_touch (true);	3662	scr_touch (true);
4106	break;	3663	break;
4107	#endif	3664	#endif
4108	case 1048: /* alternative cursor save */	3665	case 1048: /* alternative cursor save */
4109	case 1049:	3666	case 1049:
4110	if (OPTION (Opt_secondaryScreen))	3667	if (option (Opt_secondaryScreen))
4111	if (mode == 0)	3668	if (mode == 0)
4112	scr_cursor (RESTORE);	3669	scr_cursor (RESTORE);
4113	else if (mode == 1)	3670	else if (mode == 1)
4114	scr_cursor (SAVE);	3671	scr_cursor (SAVE);
4115	break;	3672	break;
…		…
4180	break;	3737	break;
4181	case 1011: /* scroll to bottom on key press */	3738	case 1011: /* scroll to bottom on key press */
4182	set_option (Opt_scrollTtyKeypress, state);	3739	set_option (Opt_scrollTtyKeypress, state);
4183	break;	3740	break;
4184	case 1047: /* secondary screen w/ clearing last */	3741	case 1047: /* secondary screen w/ clearing last */
4185	if (OPTION (Opt_secondaryScreen))	3742	if (option (Opt_secondaryScreen))
4186	if (current_screen != PRIMARY)	3743	if (current_screen != PRIMARY)
4187	scr_erase_screen (2);	3744	scr_erase_screen (2);
4188	scr_change_screen (state);	3745	scr_change_screen (state);
4189	break;	3746	break;
4190	case 1049: /* secondary screen w/ clearing first */	3747	case 1049: /* secondary screen w/ clearing first */
4191	scr_change_screen (state);	3748	scr_change_screen (state);
4192	if (OPTION (Opt_secondaryScreen))	3749	if (option (Opt_secondaryScreen))
4193	if (current_screen != PRIMARY)	3750	if (current_screen != PRIMARY)
4194	scr_erase_screen (2);	3751	scr_erase_screen (2);
4195	break;	3752	break;
4196	default:	3753	default:
4197	break;	3754	break;
…		…
4325	scr_color (Color_bg, Color_bg);	3882	scr_color (Color_bg, Color_bg);
4326	break;	3883	break;
4327		3884
4328	//case 50: // not variable spacing	3885	//case 50: // not variable spacing
4329		3886
4330	#if ENABLE_FRILLS	3887	#if !ENABLE_MINIMAL
4331	case 90:	3888	case 90:
4332	case 91: /* set bright fg color */	3889	case 91: /* set bright fg color */
4333	case 92:	3890	case 92:
4334	case 93:	3891	case 93:
4335	case 94:	3892	case 94:
…		…
4434		3991
4435	if (v_buflen == 0)	3992	if (v_buflen == 0)
4436	{	3993	{
4437	free (v_buffer);	3994	free (v_buffer);
4438	v_buffer = 0;	3995	v_buffer = 0;
4439	v_buflen = 0;
4440		3996
4441	pty_ev.set (EVENT_READ);	3997	pty_ev.set (EVENT_READ);
4442	return;	3998	return;
4443	}	3999	}
4444		4000

Diff Legend

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