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.291 by root, Sun Jan 29 20:51:27 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	int valid_keysym;	308	int valid_keysym;
305	char kbuf[KBUFSZ];	309	char kbuf[KBUFSZ];
		310
		311	#if ISO_14755
		312	if (iso14755buf & ISO_14755_52)
		313	return;
		314	#endif
306		315
307	/*	316	/*
308	* 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
309	* escape sequence to toggle the Keypad.	318	* escape sequence to toggle the Keypad.
310	*	319	*
…		…
490	# if ISO_14755	499	# if ISO_14755
491	iso14755_51 (0);	500	iso14755_51 (0);
492	# endif	501	# endif
493	return;	502	return;
494	}	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	}
495	else if ((hv = hex_keyval (ev)) >= 0)	512	else if ((hv = hex_keyval (ev)) >= 0)
496	{	513	{
497	iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)	514	iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
498	| hv | ISO_14755_51;	515	| hv | ISO_14755_51;
499	# if ISO_14755	516	# if ISO_14755
…		…
501	# endif	518	# endif
502	return;	519	return;
503	}	520	}
504	else	521	else
505	{	522	{
506	# if ENABLE_OVERLAY	523	# if ISO_14755
507	scr_overlay_off ();	524	scr_overlay_off ();
508	# endif	525	# endif
509	iso14755buf = 0;	526	iso14755buf = 0;
510	}	527	}
511	}	528	}
512	else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))	529	else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
513	|| (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))	530	|| (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
514	if (!(iso14755buf & ISO_14755_STARTED))	531	if (!(iso14755buf & ISO_14755_STARTED))
515	{	532	{
516	iso14755buf |= ISO_14755_STARTED;	533	iso14755buf |= ISO_14755_STARTED;
517	# if ENABLE_OVERLAY	534	# if ISO_14755
518	scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);	535	scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
519	scr_overlay_set (0, 0, "ISO 14755 mode");	536	scr_overlay_set (0, 0, "ISO 14755 mode");
520	# endif	537	# endif
521	}	538	}
522	#endif	539	#endif
523		540
524	#ifdef PRINTPIPE	541	#ifdef PRINTPIPE
525	if (keysym == XK_Print)	542	if (keysym == XK_Print)
526	{	543	{
527	scr_printscreen (ctrl | shft);	544	scr_printscreen (ctrl | shft);
528	return;	545	return;
…		…
530	#endif	547	#endif
531		548
532	if (keysym >= 0xFF00 && keysym <= 0xFFFF)	549	if (keysym >= 0xFF00 && keysym <= 0xFFFF)
533	{	550	{
534	{	551	{
		552	bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
535	newlen = 1;	553	newlen = 1;
536	switch (keysym)	554	switch (keysym)
537	{	555	{
538	#ifndef NO_BACKSPACE_KEY	556	#ifndef NO_BACKSPACE_KEY
539	case XK_BackSpace:	557	case XK_BackSpace:
…		…
542	kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)	560	kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
543	^ !!ctrl) ? '\b' : '\177';	561	^ !!ctrl) ? '\b' : '\177';
544	kbuf[1] = '\0';	562	kbuf[1] = '\0';
545	}	563	}
546	else	564	else
547	strcpy (kbuf, key_backspace);	565	strcpy (kbuf, rs[Rs_backspace_key]);
548	break;	566	break;
549	#endif	567	#endif
550	#ifndef NO_DELETE_KEY	568	#ifndef NO_DELETE_KEY
551	# ifdef XK_KP_Prior	569	# ifdef XK_KP_Delete
552	case XK_KP_Delete:	570	case XK_KP_Delete:
553	/* allow shift to override */	571	/* allow shift to override */
554	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)	572	if (kp)
555	{	573	{
556	strcpy (kbuf, "\033On");	574	strcpy (kbuf, "\033On");
557	break;	575	break;
558	}	576	}
559	/* FALLTHROUGH */	577	/* FALLTHROUGH */
560	# endif	578	# endif
561	case XK_Delete:	579	case XK_Delete:
562	strcpy (kbuf, key_delete);	580	strcpy (kbuf, rs[Rs_delete_key]);
563	break;	581	break;
564	#endif	582	#endif
565	case XK_Tab:	583	case XK_Tab:
566	if (shft)	584	if (shft)
567	strcpy (kbuf, "\033[Z");	585	strcpy (kbuf, "\033[Z");
…		…
582	#ifdef XK_KP_Left	600	#ifdef XK_KP_Left
583	case XK_KP_Up: /* \033Ox or standard */	601	case XK_KP_Up: /* \033Ox or standard */
584	case XK_KP_Down: /* \033Or or standard */	602	case XK_KP_Down: /* \033Or or standard */
585	case XK_KP_Right: /* \033Ov or standard */	603	case XK_KP_Right: /* \033Ov or standard */
586	case XK_KP_Left: /* \033Ot or standard */	604	case XK_KP_Left: /* \033Ot or standard */
587	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)	605	if (kp)
588	{	606	{
589	strcpy (kbuf, "\033OZ");	607	strcpy (kbuf, "\033OZ");
590	kbuf[2] = "txvr"[keysym - XK_KP_Left];	608	kbuf[2] = "txvr"[keysym - XK_KP_Left];
591	break;	609	break;
592	}	610	}
…		…
615		633
616	#ifndef UNSHIFTED_SCROLLKEYS	634	#ifndef UNSHIFTED_SCROLLKEYS
617	# ifdef XK_KP_Prior	635	# ifdef XK_KP_Prior
618	case XK_KP_Prior:	636	case XK_KP_Prior:
619	/* allow shift to override */	637	/* allow shift to override */
620	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)	638	if (kp)
621	{	639	{
622	strcpy (kbuf, "\033Oy");	640	strcpy (kbuf, "\033Oy");
623	break;	641	break;
624	}	642	}
625	/* FALLTHROUGH */	643	/* FALLTHROUGH */
…		…
628	strcpy (kbuf, "\033[5~");	646	strcpy (kbuf, "\033[5~");
629	break;	647	break;
630	# ifdef XK_KP_Next	648	# ifdef XK_KP_Next
631	case XK_KP_Next:	649	case XK_KP_Next:
632	/* allow shift to override */	650	/* allow shift to override */
633	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)	651	if (kp)
634	{	652	{
635	strcpy (kbuf, "\033Os");	653	strcpy (kbuf, "\033Os");
636	break;	654	break;
637	}	655	}
638	/* FALLTHROUGH */	656	/* FALLTHROUGH */
…		…
641	strcpy (kbuf, "\033[6~");	659	strcpy (kbuf, "\033[6~");
642	break;	660	break;
643	#endif	661	#endif
644	case XK_KP_Enter:	662	case XK_KP_Enter:
645	/* allow shift to override */	663	/* allow shift to override */
646	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)	664	if (kp)
647	{	665	{
648	strcpy (kbuf, "\033OM");	666	strcpy (kbuf, "\033OM");
649	break;	667	break;
650	}	668	}
651		669
…		…
694	case XK_KP_6: /* "\033Ov" : "6" */	712	case XK_KP_6: /* "\033Ov" : "6" */
695	case XK_KP_7: /* "\033Ow" : "7" */	713	case XK_KP_7: /* "\033Ow" : "7" */
696	case XK_KP_8: /* "\033Ox" : "8" */	714	case XK_KP_8: /* "\033Ox" : "8" */
697	case XK_KP_9: /* "\033Oy" : "9" */	715	case XK_KP_9: /* "\033Oy" : "9" */
698	/* allow shift to override */	716	/* allow shift to override */
699	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)	717	if (kp)
700	{	718	{
701	strcpy (kbuf, "\033Oj");	719	strcpy (kbuf, "\033Oj");
702	kbuf[2] += (keysym - XK_KP_Multiply);	720	kbuf[2] += (keysym - XK_KP_Multiply);
703	}	721	}
704	else	722	else
…		…
710		728
711	case XK_Find:	729	case XK_Find:
712	strcpy (kbuf, "\033[1~");	730	strcpy (kbuf, "\033[1~");
713	break;	731	break;
714		732
715	#ifdef XK_KP_End	733	#ifdef XK_KP_Insert
716	case XK_KP_Insert:	734	case XK_KP_Insert:
717	/* allow shift to override */	735	/* allow shift to override */
718	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)	736	if (kp)
719	{	737	{
720	strcpy (kbuf, "\033Op");	738	strcpy (kbuf, "\033Op");
721	break;	739	break;
722	}	740	}
723	/* FALLTHROUGH */	741	/* FALLTHROUGH */
…		…
736	strcpy (kbuf, "\033[4~");	754	strcpy (kbuf, "\033[4~");
737	break;	755	break;
738	#ifdef XK_KP_End	756	#ifdef XK_KP_End
739	case XK_KP_End:	757	case XK_KP_End:
740	/* allow shift to override */	758	/* allow shift to override */
741	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)	759	if (kp)
742	{	760	{
743	strcpy (kbuf, "\033Oq");	761	strcpy (kbuf, "\033Oq");
744	break;	762	break;
745	}	763	}
746	/* FALLTHROUGH */	764	/* FALLTHROUGH */
…		…
749	strcpy (kbuf, KS_END);	767	strcpy (kbuf, KS_END);
750	break;	768	break;
751	#ifdef XK_KP_Home	769	#ifdef XK_KP_Home
752	case XK_KP_Home:	770	case XK_KP_Home:
753	/* allow shift to override */	771	/* allow shift to override */
754	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)	772	if (kp)
755	{	773	{
756	strcpy (kbuf, "\033Ow");	774	strcpy (kbuf, "\033Ow");
757	break;	775	break;
758	}	776	}
759	/* FALLTHROUGH */	777	/* FALLTHROUGH */
…		…
867	return;	885	return;
868		886
869	if (len <= 0)	887	if (len <= 0)
870	return; /* not mapped */	888	return; /* not mapped */
871		889
872	if (OPTION (Opt_scrollTtyKeypress))	890	if (option (Opt_scrollTtyKeypress))
873	if (view_start)	891	if (view_start)
874	{	892	{
875	view_start = 0;	893	view_start = 0;
876	want_refresh = 1;	894	want_refresh = 1;
877	}	895	}
…		…
901	tt_write (&ch, 1);	919	tt_write (&ch, 1);
902	}	920	}
903		921
904	tt_write (kbuf, (unsigned int)len);	922	tt_write (kbuf, (unsigned int)len);
905	}	923	}
906	/*}}} */	924
		925	void
		926	rxvt_term::key_release (XKeyEvent &ev)
		927	{
		928	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
		929	KeySym keysym;
		930
		931	keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
		932	#endif
		933
		934	#if ENABLE_FRILLS || ISO_14755
		935	// ISO 14755 support
		936	if (iso14755buf)
		937	if (iso14755buf & ISO_14755_52)
		938	{
		939	# if 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	}
907		1001
908	#if defined (KEYSYM_RESOURCE)	1002	#if defined (KEYSYM_RESOURCE)
909	unsigned int	1003	unsigned int
910	rxvt_term::cmd_write (const char *str, unsigned int count)	1004	rxvt_term::cmd_write (const char *str, unsigned int count)
911	{	1005	{
…		…
940		1034
941	void	1035	void
942	rxvt_term::flush ()	1036	rxvt_term::flush ()
943	{	1037	{
944	flush_ev.stop ();	1038	flush_ev.stop ();
945
946	#ifdef TRANSPARENT
947	if (want_full_refresh)
948	{
949	want_full_refresh = 0;
950	scr_clear ();
951	scr_touch (false);
952	}
953	#endif
954		1039
955	if (want_refresh)	1040	if (want_refresh)
956	{	1041	{
957	if (SHOULD_INVOKE (HOOK_LINE_UPDATE))	1042	if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
958	{	1043	{
…		…
1016	void	1101	void
1017	rxvt_term::flush_cb (time_watcher &w)	1102	rxvt_term::flush_cb (time_watcher &w)
1018	{	1103	{
1019	make_current ();	1104	make_current ();
1020		1105
1021	refresh_limit = 1;
1022	refresh_count = 0;	1106	refresh_count = 0;
1023	flush ();	1107	flush ();
1024	}	1108	}
1025		1109
1026	#ifdef CURSOR_BLINK	1110	#ifdef CURSOR_BLINK
…		…
1088	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1172	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1089	}	1173	}
1090	}	1174	}
1091	#endif	1175	#endif
1092		1176
1093	#if HAVE_SCHED_YIELD	1177	#if LINUX_YIELD_HACK
1094	static struct event_handler	1178	static struct event_handler
1095	{	1179	{
1096	check_watcher cw_yield;	1180	check_watcher yield_ev;
1097		1181
1098	void yield (check_watcher &w)	1182	void yield_cb (check_watcher &w)
1099	{	1183	{
1100	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
1101	w.stop ();	1192	w.stop ();
1102	}	1193	}
1103		1194
1104	event_handler ()	1195	event_handler ()
1105	: cw_yield (this, &event_handler::yield)	1196	: yield_ev (this, &event_handler::yield_cb)
1106	{	1197	{
1107	}	1198	}
1108	} event_handler;	1199	} event_handler;
1109	#endif	1200	#endif
1110		1201
…		…
1130	cmdbuf_endp += r;	1221	cmdbuf_endp += r;
1131	return true;	1222	return true;
1132	}	1223	}
1133	else if (r < 0 && (errno == EAGAIN || errno == EINTR))	1224	else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1134	{	1225	{
1135	#if HAVE_SCHED_YIELD	1226	#if LINUX_YIELD_HACK
1136	if (display->is_local)	1227	if (display->is_local)
1137	event_handler.cw_yield.start ();	1228	event_handler.yield_ev.start ();
1138	#endif	1229	#endif
1139	}	1230	}
1140	else	1231	else
1141	{	1232	{
1142	pty_ev.stop ();	1233	pty_ev.stop ();
1143		1234
1144	if (!OPTION (Opt_hold))	1235	if (!option (Opt_hold))
1145	destroy ();	1236	destroy ();
1146	}	1237	}
1147		1238
1148	return false;	1239	return false;
1149	}	1240	}
1150		1241
1151	void	1242	void
1152	rxvt_term::pty_cb (io_watcher &w, short revents)	1243	rxvt_term::pty_cb (io_watcher &w, short revents)
…		…
1164	}	1255	}
1165		1256
1166	void	1257	void
1167	rxvt_term::pointer_unblank ()	1258	rxvt_term::pointer_unblank ()
1168	{	1259	{
1169	XDefineCursor (xdisp, vt, TermWin_cursor);	1260	XDefineCursor (dpy, vt, TermWin_cursor);
1170	recolour_cursor ();	1261	recolour_cursor ();
1171		1262
1172	#ifdef POINTER_BLANK	1263	#ifdef POINTER_BLANK
1173	hidden_pointer = 0;	1264	hidden_pointer = 0;
1174		1265
1175	if (OPTION (Opt_pointerBlank))	1266	if (option (Opt_pointerBlank))
1176	pointer_ev.start (NOW + pointerBlankDelay);	1267	pointer_ev.start (NOW + pointerBlankDelay);
1177	#endif	1268	#endif
1178	}	1269	}
1179		1270
1180	#ifdef POINTER_BLANK	1271	#ifdef POINTER_BLANK
1181	void	1272	void
1182	rxvt_term::pointer_blank ()	1273	rxvt_term::pointer_blank ()
1183	{	1274	{
1184	if (!OPTION (Opt_pointerBlank))	1275	if (!option (Opt_pointerBlank))
1185	return;	1276	return;
1186		1277
1187	XDefineCursor (xdisp, vt, display->blank_cursor);	1278	XDefineCursor (dpy, vt, display->blank_cursor);
1188	XFlush (xdisp);	1279	XFlush (dpy);
1189		1280
1190	hidden_pointer = 1;	1281	hidden_pointer = 1;
1191	}	1282	}
1192		1283
1193	void	1284	void
…		…
1272	void	1363	void
1273	rxvt_term::x_cb (XEvent &ev)	1364	rxvt_term::x_cb (XEvent &ev)
1274	{	1365	{
1275	make_current ();	1366	make_current ();
1276		1367
1277	dLocal (Display *, xdisp);	1368	dLocal (Display *, dpy);
1278		1369
1279	if (ev.xany.window == vt	1370	if (ev.xany.window == vt
1280	&& SHOULD_INVOKE (HOOK_X_EVENT)	1371	&& SHOULD_INVOKE (HOOK_X_EVENT)
1281	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))	1372	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1282	return;	1373	return;
…		…
1287	unsigned int unused_mask;	1378	unsigned int unused_mask;
1288		1379
1289	switch (ev.type)	1380	switch (ev.type)
1290	{	1381	{
1291	case KeyPress:	1382	case KeyPress:
1292	#if ISO_14755	1383	key_press (ev.xkey);
1293	if (!(iso14755buf & ISO_14755_52))
1294	#endif
1295	lookup_key (ev.xkey);
1296
1297	break;	1384	break;
1298		1385
1299	case KeyRelease:	1386	case KeyRelease:
1300	{	1387	key_release (ev.xkey);
1301	#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1302	KeySym keysym;
1303
1304	keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1305	#endif
1306
1307	#if ENABLE_FRILLS || ISO_14755
1308	// ISO 14755 support
1309	if (iso14755buf)
1310	if (iso14755buf & ISO_14755_52)
1311	{
1312	# if ENABLE_OVERLAY
1313	scr_overlay_off ();
1314	# endif
1315	# if ISO_14755
1316	// iso14755 part 5.2 handling: release time
1317	// first: controls
1318	if ((ev.xkey.state & ControlMask)
1319	&& ((keysym >= 0x40 && keysym <= 0x5f)
1320	|| (keysym >= 0x61 && keysym <= 0x7f)))
1321	{
1322	iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1323	commit_iso14755 ();
1324	goto skip_switch;
1325	}
1326
1327	for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1328	if (i[0] == keysym)
1329	{
1330	iso14755buf = ISO_14755_51 | i[1];
1331	commit_iso14755 ();
1332	goto skip_switch;
1333	}
1334
1335	scr_bell ();
1336	# endif
1337	iso14755buf = 0;
1338	break;
1339	}
1340	else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1341	{
1342	# if ENABLE_OVERLAY
1343	scr_overlay_off ();
1344	# endif
1345	if (iso14755buf & ISO_14755_51)
1346	commit_iso14755 ();
1347	#if ISO_14755
1348	else if (iso14755buf & ISO_14755_STARTED)
1349	{
1350	iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1351
1352	scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1353	scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1354	}
1355	# endif
1356	else
1357	iso14755buf = 0;
1358	}
1359	#endif
1360
1361	if (ev.xany.window == vt
1362	&& HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1363	break;
1364
1365	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1366	if (!(ev.xkey.state & ControlMask))
1367	slip_wheel_ev.stop ();
1368	else if (keysym == XK_Control_L || keysym == XK_Control_R)
1369	mouse_slip_wheel_speed = 0;
1370	#endif
1371	break;	1388	break;
1372	}
1373		1389
1374	case ButtonPress:	1390	case ButtonPress:
1375	button_press (ev.xbutton);	1391	button_press (ev.xbutton);
1376	break;	1392	break;
1377		1393
…		…
1392	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)))
1393	destroy ();	1409	destroy ();
1394	}	1410	}
1395	#if ENABLE_EWMH	1411	#if ENABLE_EWMH
1396	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])
1397	XSendEvent (xdisp, ev.xclient.window = display->root,	1413	XSendEvent (dpy, ev.xclient.window = display->root,
1398	False, SubstructureRedirectMask | SubstructureNotifyMask,	1414	False, SubstructureRedirectMask | SubstructureNotifyMask,
1399	&ev);	1415	&ev);
1400	#endif	1416	#endif
1401	}	1417	}
1402	}	1418	}
…		…
1408	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)	1424	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1409	focus_out ();	1425	focus_out ();
1410	}	1426	}
1411	#endif	1427	#endif
1412	}	1428	}
1413	break;
1414
1415	case MappingNotify:
1416	XRefreshKeyboardMapping (&ev.xmapping);
1417	break;	1429	break;
1418		1430
1419	/*	1431	/*
1420	* XXX: this is not the _current_ arrangement	1432	* XXX: this is not the _current_ arrangement
1421	* Here's my conclusion:	1433	* Here's my conclusion:
…		…
1440	break;	1452	break;
1441	}	1453	}
1442	break;	1454	break;
1443		1455
1444	case FocusIn:	1456	case FocusIn:
		1457	if (ev.xfocus.detail != NotifyInferior
		1458	&& ev.xfocus.detail != NotifyPointer
		1459	&& ev.xfocus.mode != NotifyGrab)
1445	focus_in ();	1460	focus_in ();
1446	break;	1461	break;
1447		1462
1448	case FocusOut:	1463	case FocusOut:
		1464	if (ev.xfocus.detail != NotifyInferior
		1465	&& ev.xfocus.detail != NotifyPointer
		1466	&& ev.xfocus.mode != NotifyGrab)
1449	focus_out ();	1467	focus_out ();
1450	break;	1468	break;
1451		1469
1452	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);*/
1453	if (ev.xconfigure.window == parent[0])	1474	if (ev.xconfigure.window == parent[0])
1454	{	1475	{
1455	while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev))	1476	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1456	;	1477	;
1457		1478
1458	if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)	1479	if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1459	{	1480	{
1460	seen_resize = 1;	1481	seen_resize = 1;
1461	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1482	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1462	}	1483	}
1463		1484	else
		1485	{
		1486	#ifdef HAVE_BG_PIXMAP
		1487	if (bgPixmap.window_position_sensitive ())
		1488	update_background ();
		1489	#endif
		1490	}
1464	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));	1491	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1465
1466	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1467	if (OPTION (Opt_transparent))
1468	check_our_parents ();
1469	#endif
1470	}	1492	}
1471	break;	1493	break;
1472		1494
1473	case PropertyNotify:	1495	case PropertyNotify:
1474	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)))
…		…
1504	#ifdef TEXT_BLINK	1526	#ifdef TEXT_BLINK
1505	text_blink_ev.stop ();	1527	text_blink_ev.stop ();
1506	#endif	1528	#endif
1507	HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));	1529	HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1508	break;	1530	break;
1509
1510	#ifdef TRANSPARENT
1511	case ReparentNotify:
1512	rootwin_cb (ev);
1513	break;
1514	#endif /* TRANSPARENT */
1515		1531
1516	case GraphicsExpose:	1532	case GraphicsExpose:
1517	case Expose:	1533	case Expose:
1518	if (ev.xany.window == vt)	1534	if (ev.xany.window == vt)
1519	{	1535	{
1520	do	1536	do
1521	scr_expose (ev.xexpose.x, ev.xexpose.y,	1537	scr_expose (ev.xexpose.x, ev.xexpose.y,
1522	ev.xexpose.width, ev.xexpose.height, False);	1538	ev.xexpose.width, ev.xexpose.height, False);
1523	while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev));	1539	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1524		1540
1525	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1541	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1526		1542
1527	while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev))	1543	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1528	scr_expose (ev.xexpose.x, ev.xexpose.y,	1544	scr_expose (ev.xexpose.x, ev.xexpose.y,
1529	ev.xexpose.width, ev.xexpose.height, False);	1545	ev.xexpose.width, ev.xexpose.height, False);
1530		1546
1531	want_refresh = 1;	1547	want_refresh = 1;
1532	}	1548	}
1533	else	1549	else
1534	{	1550	{
1535	XEvent unused_event;	1551	XEvent unused_event;
1536		1552
1537	while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event))	1553	while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1538	;	1554	;
1539	while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event))	1555	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1540	;	1556	;
1541		1557
1542	if (isScrollbarWindow (ev.xany.window))	1558	if (isScrollbarWindow (ev.xany.window))
1543	{	1559	{
1544	scrollBar.setIdle ();	1560	scrollBar.setIdle ();
1545	scrollbar_show (0);	1561	scrollbar_show (0);
1546	}	1562	}
1547
1548	#ifdef TRANSPARENT
1549	if (am_transparent && ev.xany.window == parent[0])
1550	XClearWindow (xdisp, ev.xany.window);
1551	#endif
1552	}	1563	}
1553	break;	1564	break;
1554		1565
1555	case MotionNotify:	1566	case MotionNotify:
1556	#ifdef POINTER_BLANK	1567	#ifdef POINTER_BLANK
…		…
1565	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)	1576	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1566	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))	1577	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1567	; // nop	1578	; // nop
1568	else if (ev.xbutton.state & (Button1Mask | Button3Mask))	1579	else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1569	{	1580	{
1570	while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev))	1581	while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1571	;	1582	;
1572		1583
1573	XQueryPointer (xdisp, vt,	1584	XQueryPointer (dpy, vt,
1574	&unused_root, &unused_child,	1585	&unused_root, &unused_child,
1575	&unused_root_x, &unused_root_y,	1586	&unused_root_x, &unused_root_y,
1576	&ev.xbutton.x, &ev.xbutton.y,	1587	&ev.xbutton.x, &ev.xbutton.y,
1577	&ev.xbutton.state);	1588	&ev.xbutton.state);
1578	#ifdef MOUSE_THRESHOLD	1589	#ifdef MOUSE_THRESHOLD
…		…
1642	#endif	1653	#endif
1643	}	1654	}
1644	}	1655	}
1645	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1656	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1646	{	1657	{
1647	while (XCheckTypedWindowEvent (xdisp, scrollBar.win,	1658	while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1648	MotionNotify, &ev))	1659	MotionNotify, &ev))
1649	;	1660	;
1650		1661
1651	XQueryPointer (xdisp, scrollBar.win,	1662	XQueryPointer (dpy, scrollBar.win,
1652	&unused_root, &unused_child,	1663	&unused_root, &unused_child,
1653	&unused_root_x, &unused_root_y,	1664	&unused_root_x, &unused_root_y,
1654	&ev.xbutton.x, &ev.xbutton.y,	1665	&ev.xbutton.x, &ev.xbutton.y,
1655	&unused_mask);	1666	&unused_mask);
1656	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1667	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1657	scrollbar_size ());	1668	scrollbar_size ());
1658	want_refresh = 1;	1669	want_refresh = 1;
1659	refresh_limit = 0;
1660	scrollbar_show (1);	1670	scrollbar_show (1);
1661	}	1671	}
1662	break;	1672	break;
1663	}	1673	}
1664		1674
1665	skip_switch: ;
1666
1667	#if defined(CURSOR_BLINK)	1675	#if defined(CURSOR_BLINK)
1668	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)	1676	if (option (Opt_cursorBlink) && ev.type == KeyPress)
1669	{	1677	{
1670	if (hidden_cursor)	1678	if (hidden_cursor)
1671	{	1679	{
1672	hidden_cursor = 0;	1680	hidden_cursor = 0;
1673	want_refresh = 1;	1681	want_refresh = 1;
…		…
1676	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);	1684	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1677	}	1685	}
1678	#endif	1686	#endif
1679		1687
1680	#if defined(POINTER_BLANK)	1688	#if defined(POINTER_BLANK)
1681	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)	1689	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1682	{	1690	{
1683	if (ev.type == MotionNotify	1691	if (ev.type == MotionNotify
1684	|| ev.type == ButtonPress	1692	|| ev.type == ButtonPress
1685	|| ev.type == ButtonRelease)	1693	|| ev.type == ButtonRelease)
1686	if (hidden_pointer)	1694	if (hidden_pointer)
…		…
1698	if (!focus)	1706	if (!focus)
1699	{	1707	{
1700	focus = 1;	1708	focus = 1;
1701	want_refresh = 1;	1709	want_refresh = 1;
1702		1710
1703	HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));	1711	HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1704		1712
1705	#if USE_XIM	1713	#if USE_XIM
1706	if (Input_Context != NULL)	1714	if (Input_Context != NULL)
1707	{	1715	{
1708	IMSetStatusPosition ();	1716	IMSetPosition ();
1709	XSetICFocus (Input_Context);	1717	XSetICFocus (Input_Context);
1710	}	1718	}
1711	#endif	1719	#endif
1712	#if CURSOR_BLINK	1720	#if CURSOR_BLINK
1713	if (OPTION (Opt_cursorBlink))	1721	if (option (Opt_cursorBlink))
1714	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);	1722	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1715	#endif	1723	#endif
1716	#if OFF_FOCUS_FADING	1724	#if OFF_FOCUS_FADING
1717	if (rs[Rs_fade])	1725	if (rs[Rs_fade])
1718	{	1726	{
1719	pix_colors = pix_colors_focused;	1727	pix_colors = pix_colors_focused;
1720	scr_recolour ();	1728	scr_recolour ();
1721	}	1729	}
1722	#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
1723	}	1741	}
1724	}	1742	}
1725		1743
1726	void	1744	void
1727	rxvt_term::focus_out ()	1745	rxvt_term::focus_out ()
…		…
1735		1753
1736	#if ENABLE_FRILLS || ISO_14755	1754	#if ENABLE_FRILLS || ISO_14755
1737	if (iso14755buf)	1755	if (iso14755buf)
1738	{	1756	{
1739	iso14755buf = 0;	1757	iso14755buf = 0;
1740	# if ENABLE_OVERLAY	1758	# if ISO_14755
1741	scr_overlay_off ();	1759	scr_overlay_off ();
1742	# endif	1760	# endif
1743	}	1761	}
1744	#endif	1762	#endif
1745	#if USE_XIM	1763	#if USE_XIM
1746	if (Input_Context != NULL)	1764	if (Input_Context != NULL)
1747	XUnsetICFocus (Input_Context);	1765	XUnsetICFocus (Input_Context);
1748	#endif	1766	#endif
1749	#if CURSOR_BLINK	1767	#if CURSOR_BLINK
1750	if (OPTION (Opt_cursorBlink))	1768	if (option (Opt_cursorBlink))
1751	cursor_blink_ev.stop ();	1769	cursor_blink_ev.stop ();
1752	hidden_cursor = 0;	1770	hidden_cursor = 0;
1753	#endif	1771	#endif
1754	#if OFF_FOCUS_FADING	1772	#if OFF_FOCUS_FADING
1755	if (rs[Rs_fade])	1773	if (rs[Rs_fade])
…		…
1759	}	1777	}
1760	#endif	1778	#endif
1761	}	1779	}
1762	}	1780	}
1763		1781
1764	#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
1765	void	1796	void
1766	rxvt_term::rootwin_cb (XEvent &ev)	1797	rxvt_term::rootwin_cb (XEvent &ev)
1767	{	1798	{
1768	make_current ();	1799	make_current ();
1769		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
1770	switch (ev.type)	1806	switch (ev.type)
1771	{	1807	{
1772	case PropertyNotify:	1808	case PropertyNotify:
1773	/*	1809	/*
1774	* 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,
1775	* 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.
1776	*/	1812	*/
1777	if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]	1813	if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1778	&& ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])	1814	|| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1779	return;	1815	{
1780		1816	bgPixmap.set_root_pixmap ();
1781	/* FALLTHROUGH */	1817	update_background ();
1782	case ReparentNotify:	1818	}
1783	if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1784	want_refresh = want_full_refresh = 1;
1785	break;	1819	break;
1786	}	1820	}
		1821	# endif
1787	}	1822	}
1788	#endif	1823	#endif
1789		1824
1790	void	1825	void
1791	rxvt_term::button_press (XButtonEvent &ev)	1826	rxvt_term::button_press (XButtonEvent &ev)
…		…
2119	selection_make (ev.time);	2154	selection_make (ev.time);
2120	break;	2155	break;
2121		2156
2122	case Button2:	2157	case Button2:
2123	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?
2124	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);	2159	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2125	break;	2160	break;
2126		2161
2127	#ifdef MOUSE_WHEEL	2162	#ifdef MOUSE_WHEEL
2128	case Button4:	2163	case Button4:
2129	case Button5:	2164	case Button5:
…		…
2133		2168
2134	v = ev.button == Button4 ? UP : DN;	2169	v = ev.button == Button4 ? UP : DN;
2135		2170
2136	if (ev.state & ShiftMask)	2171	if (ev.state & ShiftMask)
2137	i = 1;	2172	i = 1;
2138	else if (OPTION (Opt_mouseWheelScrollPage))	2173	else if (option (Opt_mouseWheelScrollPage))
2139	i = nrow - 1;	2174	i = nrow - 1;
2140	else	2175	else
2141	i = 5;	2176	i = 5;
2142		2177
2143	# ifdef MOUSE_SLIP_WHEELING	2178	# ifdef MOUSE_SLIP_WHEELING
…		…
2164	break;	2199	break;
2165	#endif	2200	#endif
2166	}	2201	}
2167	}	2202	}
2168	}	2203	}
2169
2170	#ifdef TRANSPARENT
2171	#if TINTING
2172	/* taken from aterm-0.4.2 */
2173
2174	typedef uint32_t RUINT32T;
2175
2176	void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2177	{
2178	int sh_r, sh_g, sh_b;
2179	RUINT32T mask_r, mask_g, mask_b;
2180	RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2181	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2182	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2183	int i;
2184
2185	Visual *visual = term->visual;
2186
2187	if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2188
2189	/* for convenience */
2190	mask_r = visual->red_mask;
2191	mask_g = visual->green_mask;
2192	mask_b = visual->blue_mask;
2193
2194	/* boring lookup table pre-initialization */
2195	switch (srcImage->bits_per_pixel) {
2196	case 15:
2197	if ((mask_r != 0x7c00) ||
2198	(mask_g != 0x03e0) ||
2199	(mask_b != 0x001f))
2200	return;
2201	lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2202	lookup_r = lookup;
2203	lookup_g = lookup+32;
2204	lookup_b = lookup+32+32;
2205	sh_r = 10;
2206	sh_g = 5;
2207	sh_b = 0;
2208	break;
2209	case 16:
2210	if ((mask_r != 0xf800) ||
2211	(mask_g != 0x07e0) ||
2212	(mask_b != 0x001f))
2213	return;
2214	lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2215	lookup_r = lookup;
2216	lookup_g = lookup+32;
2217	lookup_b = lookup+32+64;
2218	sh_r = 11;
2219	sh_g = 5;
2220	sh_b = 0;
2221	break;
2222	case 24:
2223	if ((mask_r != 0xff0000) ||
2224	(mask_g != 0x00ff00) ||
2225	(mask_b != 0x0000ff))
2226	return;
2227	lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2228	lookup_r = lookup;
2229	lookup_g = lookup+256;
2230	lookup_b = lookup+256+256;
2231	sh_r = 16;
2232	sh_g = 8;
2233	sh_b = 0;
2234	break;
2235	case 32:
2236	if ((mask_r != 0xff0000) ||
2237	(mask_g != 0x00ff00) ||
2238	(mask_b != 0x0000ff))
2239	return;
2240	lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2241	lookup_r = lookup;
2242	lookup_g = lookup+256;
2243	lookup_b = lookup+256+256;
2244	sh_r = 16;
2245	sh_g = 8;
2246	sh_b = 0;
2247	break;
2248	default:
2249	return; /* we do not support this color depth */
2250	}
2251
2252	/* prepare limits for color transformation (each channel is handled separately) */
2253	if (shade < 0) {
2254	shade = -shade;
2255	if (shade < 0) shade = 0;
2256	if (shade > 100) shade = 100;
2257
2258	lower_lim_r = 65535-rm;
2259	lower_lim_g = 65535-gm;
2260	lower_lim_b = 65535-bm;
2261
2262	lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2263	lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2264	lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2265
2266	upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2267	} else {
2268	if (shade < 0) shade = 0;
2269	if (shade > 100) shade = 100;
2270
2271	lower_lim_r = lower_lim_g = lower_lim_b = 0;
2272
2273	upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2274	upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2275	upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2276	}
2277
2278	/* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2279	if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2280	{
2281	unsigned int tmp;
2282
2283	tmp = lower_lim_r;
2284	lower_lim_r = lower_lim_b;
2285	lower_lim_b = tmp;
2286
2287	tmp = upper_lim_r;
2288	upper_lim_r = upper_lim_b;
2289	upper_lim_b = tmp;
2290	}
2291
2292	/* fill our lookup tables */
2293	for (i = 0; i <= mask_r>>sh_r; i++)
2294	{
2295	RUINT32T tmp;
2296	tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2297	tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2298	lookup_r[i] = (tmp/65535)<<sh_r;
2299	}
2300	for (i = 0; i <= mask_g>>sh_g; i++)
2301	{
2302	RUINT32T tmp;
2303	tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2304	tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2305	lookup_g[i] = (tmp/65535)<<sh_g;
2306	}
2307	for (i = 0; i <= mask_b>>sh_b; i++)
2308	{
2309	RUINT32T tmp;
2310	tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2311	tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2312	lookup_b[i] = (tmp/65535)<<sh_b;
2313	}
2314
2315	/* apply table to input image (replacing colors by newly calculated ones) */
2316	switch (srcImage->bits_per_pixel)
2317	{
2318	case 15:
2319	{
2320	unsigned short *p1, *pf, *p, *pl;
2321	p1 = (unsigned short *) srcImage->data;
2322	pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2323	while (p1 < pf)
2324	{
2325	p = p1;
2326	pl = p1 + srcImage->width;
2327	for (; p < pl; p++)
2328	{
2329	*p = lookup_r[(*p & 0x7c00)>>10] |
2330	lookup_g[(*p & 0x03e0)>> 5] |
2331	lookup_b[(*p & 0x001f)];
2332	}
2333	p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2334	}
2335	break;
2336	}
2337	case 16:
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 & 0xf800)>>11] |
2349	lookup_g[(*p & 0x07e0)>> 5] |
2350	lookup_b[(*p & 0x001f)];
2351	}
2352	p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2353	}
2354	break;
2355	}
2356	case 24:
2357	{
2358	unsigned char *p1, *pf, *p, *pl;
2359	p1 = (unsigned char *) srcImage->data;
2360	pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2361	while (p1 < pf)
2362	{
2363	p = p1;
2364	pl = p1 + srcImage->width * 3;
2365	for (; p < pl; p += 3)
2366	{
2367	p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2368	p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2369	p[2] = lookup_r[(p[2] & 0x0000ff)];
2370	}
2371	p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2372	}
2373	break;
2374	}
2375	case 32:
2376	{
2377	RUINT32T *p1, *pf, *p, *pl;
2378	p1 = (RUINT32T *) srcImage->data;
2379	pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2380
2381	while (p1 < pf)
2382	{
2383	p = p1;
2384	pl = p1 + srcImage->width;
2385	for (; p < pl; p++)
2386	{
2387	*p = lookup_r[(*p & 0xff0000)>>16] |
2388	lookup_g[(*p & 0x00ff00)>> 8] |
2389	lookup_b[(*p & 0x0000ff)] |
2390	(*p & ~0xffffff);
2391	}
2392	p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2393	}
2394	break;
2395	}
2396	}
2397
2398	free (lookup);
2399	}
2400	#endif
2401
2402	/*
2403	* Check our parents are still who we think they are.
2404	* Do transparency updates if required
2405	*/
2406	int
2407	rxvt_term::check_our_parents ()
2408	{
2409	int i, pchanged, aformat, have_pixmap, rootdepth;
2410	unsigned long nitems, bytes_after;
2411	Atom atype;
2412	unsigned char *prop = NULL;
2413	Window root, oldp, *list;
2414	Pixmap rootpixmap = None;
2415	XWindowAttributes wattr, wrootattr;
2416
2417	pchanged = 0;
2418
2419	if (!OPTION (Opt_transparent))
2420	return pchanged; /* Don't try any more */
2421
2422	XGetWindowAttributes (xdisp, display->root, &wrootattr);
2423	rootdepth = wrootattr.depth;
2424
2425	XGetWindowAttributes (xdisp, parent[0], &wattr);
2426
2427	if (rootdepth != wattr.depth)
2428	{
2429	if (am_transparent)
2430	{
2431	pchanged = 1;
2432	XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2433	am_transparent = am_pixmap_trans = 0;
2434	}
2435
2436	return pchanged; /* Don't try any more */
2437	}
2438
2439	/* Get all X ops out of the queue so that our information is up-to-date. */
2440	XSync (xdisp, False);
2441
2442	/*
2443	* Make the frame window set by the window manager have
2444	* the root background. Some window managers put multiple nested frame
2445	* windows for each client, so we have to take care about that.
2446	*/
2447	i = (xa[XA_XROOTPMAP_ID]
2448	&& XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2449	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2450	&nitems, &bytes_after, &prop) == Success);
2451
2452	if (!i || prop == NULL)
2453	i = (xa[XA_ESETROOT_PMAP_ID]
2454	&& XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2455	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2456	&nitems, &bytes_after, &prop) == Success);
2457
2458	if (!i || prop == NULL
2459	#if TINTING
2460	|| !rs[Rs_color + Color_tint]
2461	#endif
2462	)
2463	have_pixmap = 0;
2464	else
2465	{
2466	have_pixmap = 1;
2467	rootpixmap = *(Pixmap *)prop;
2468	XFree (prop);
2469	}
2470
2471	if (have_pixmap)
2472	{
2473	/*
2474	* Copy display->root pixmap transparency
2475	*/
2476	int sx, sy, nx, ny;
2477	unsigned int nw, nh;
2478	Window cr;
2479	XImage *image;
2480	GC gc;
2481	XGCValues gcvalue;
2482
2483	XTranslateCoordinates (xdisp, parent[0], display->root,
2484	0, 0, &sx, &sy, &cr);
2485	nw = (unsigned int)szHint.width;
2486	nh = (unsigned int)szHint.height;
2487	nx = ny = 0;
2488
2489	if (sx < 0)
2490	{
2491	nw += sx;
2492	nx = -sx;
2493	sx = 0;
2494	}
2495
2496	if (sy < 0)
2497	{
2498	nh += sy;
2499	ny = -sy;
2500	sy = 0;
2501	}
2502
2503	min_it (nw, (unsigned int) (wrootattr.width - sx));
2504	min_it (nh, (unsigned int) (wrootattr.height - sy));
2505
2506	XSync (xdisp, False);
2507	allowedxerror = -1;
2508	image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2509
2510	/* XXX: handle BadMatch - usually because we're outside the pixmap */
2511	/* XXX: may need a delay here? */
2512	allowedxerror = 0;
2513
2514	if (image == NULL)
2515	{
2516	if (am_transparent && am_pixmap_trans)
2517	{
2518	pchanged = 1;
2519	if (pixmap != None)
2520	{
2521	XFreePixmap (xdisp, pixmap);
2522	pixmap = None;
2523	}
2524	}
2525
2526	am_pixmap_trans = 0;
2527	}
2528	else
2529	{
2530	if (pixmap != None)
2531	XFreePixmap (xdisp, pixmap);
2532
2533	#if TINTING
2534	if (ISSET_PIXCOLOR (Color_tint))
2535	{
2536	rxvt_rgba c;
2537	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2538
2539	pix_colors_focused[Color_tint].get (this, c);
2540
2541	ShadeXImage (this, image, shade, c.r, c.g, c.b);
2542	}
2543	#endif
2544
2545	pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2546	gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2547	XPutImage (xdisp, pixmap, gc, image, 0, 0,
2548	nx, ny, image->width, image->height);
2549	XFreeGC (xdisp, gc);
2550	XDestroyImage (image);
2551	XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2552	XClearWindow (xdisp, parent[0]);
2553
2554	if (!am_transparent || !am_pixmap_trans)
2555	pchanged = 1;
2556
2557	am_transparent = am_pixmap_trans = 1;
2558	}
2559	}
2560
2561	if (am_pixmap_trans)
2562	XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2563	else
2564	{
2565	unsigned int n;
2566	/*
2567	* InheritPixmap transparency
2568	*/
2569	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2570	{
2571	oldp = parent[i];
2572	XQueryTree (xdisp, parent[i - 1], &root,
2573	&parent[i], &list, &n);
2574	XFree (list);
2575
2576	if (parent[i] == display->root)
2577	{
2578	if (oldp != None)
2579	pchanged = 1;
2580
2581	break;
2582	}
2583
2584	if (oldp != parent[i])
2585	pchanged = 1;
2586	}
2587
2588	n = 0;
2589
2590	if (pchanged)
2591	{
2592	for (; n < (unsigned int)i; n++)
2593	{
2594	XGetWindowAttributes (xdisp, parent[n], &wattr);
2595	if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2596	{
2597	n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2598	break;
2599	}
2600	}
2601	}
2602
2603	if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2604	{
2605	XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2606	XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2607	am_transparent = 0;
2608	/* XXX: also turn off Opt_transparent? */
2609	}
2610	else
2611	{
2612	for (n = 0; n < (unsigned int)i; n++)
2613	{
2614	XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2615	XClearWindow (xdisp, parent[n]);
2616	}
2617
2618	XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2619	am_transparent = 1;
2620	}
2621
2622	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2623	parent[i] = None;
2624	}
2625
2626	if (scrollBar.win)
2627	{
2628	XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2629	scrollBar.setIdle ();
2630	scrollbar_show (0);
2631	}
2632
2633	if (am_transparent)
2634	{
2635	want_refresh = want_full_refresh = 1;
2636	if (am_pixmap_trans)
2637	flush ();
2638	}
2639
2640	return pchanged;
2641	}
2642	#endif
2643		2204
2644	/*}}} */	2205	/*}}} */
2645		2206
2646	bool	2207	bool
2647	rxvt_term::cmd_parse ()	2208	rxvt_term::cmd_parse ()
…		…
2696	if (ch == C0_LF)	2257	if (ch == C0_LF)
2697	nlines++;	2258	nlines++;
2698		2259
2699	refresh_count++;	2260	refresh_count++;
2700		2261
2701	if (!OPTION (Opt_jumpScroll)	2262	if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2702	|| (refresh_count >= refresh_limit * (nrow - 1)))
2703	{	2263	{
2704	refreshnow = true;
2705	refresh_count = 0;	2264	refresh_count = 0;
		2265
		2266	if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.)
		2267	{
		2268	refreshnow = true;
2706	ch = NOCHAR;	2269	ch = NOCHAR;
2707	break;	2270	break;
		2271	}
2708	}	2272	}
2709		2273
2710	// scr_add_lines only works for nlines <= nrow - 1.	2274	// scr_add_lines only works for nlines <= nrow - 1.
2711	if (nlines >= nrow - 1)	2275	if (nlines >= nrow - 1)
2712	{	2276	{
…		…
2740	&& 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))))
2741	scr_add_lines (buf, str - buf, nlines);	2305	scr_add_lines (buf, str - buf, nlines);
2742		2306
2743	/*	2307	/*
2744	* 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
2745	* 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.
2746	* the number of pages between refreshes is refresh_limit, which	2310	* if skipScroll is enabled.
2747	* is incremented here because we must be doing flat-out scrolling.
2748	*/	2311	*/
2749	if (refreshnow)	2312	if (refreshnow)
2750	{	2313	{
2751	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2752	refresh_limit++;
2753	else
2754	{
2755	flag = true;	2314	flag = true;
2756	scr_refresh ();	2315	scr_refresh ();
2757	want_refresh = 1;	2316	want_refresh = 1;
2758	}
2759	}	2317	}
2760		2318
2761	}	2319	}
2762	else	2320	else
2763	{	2321	{
…		…
2912	{	2470	{
2913	if ((buf[len++] = cmd_getc ()) == 'i')	2471	if ((buf[len++] = cmd_getc ()) == 'i')
2914	break; /* done = 1 */	2472	break; /* done = 1 */
2915	}	2473	}
2916	}	2474	}
2917		2475
2918	for (i = 0; i < len; i++)	2476	for (i = 0; i < len; i++)
2919	if (putc (buf[i], fd) == EOF)	2477	if (putc (buf[i], fd) == EOF)
2920	{	2478	{
2921	done = 1;	2479	done = 1;
2922	break;	2480	break;
…		…
2984	process_dcs_seq ();	2542	process_dcs_seq ();
2985	break;	2543	break;
2986	case 0x9b: /* CSI */	2544	case 0x9b: /* CSI */
2987	process_csi_seq ();	2545	process_csi_seq ();
2988	break;	2546	break;
2989	case 0x9d: /* CSI */	2547	case 0x9d: /* OSC */
2990	process_osc_seq ();	2548	process_osc_seq ();
2991	break;	2549	break;
2992	#endif	2550	#endif
2993	}	2551	}
2994	}	2552	}
…		…
3084	scr_charset_set (2, (unsigned int)cmd_getc ());	2642	scr_charset_set (2, (unsigned int)cmd_getc ());
3085	break;	2643	break;
3086	case '+':	2644	case '+':
3087	scr_charset_set (3, (unsigned int)cmd_getc ());	2645	scr_charset_set (3, (unsigned int)cmd_getc ());
3088	break;	2646	break;
3089	#if ENABLE_FRILLS	2647	#if !ENABLE_MINIMAL
3090	case '6':	2648	case '6':
3091	scr_backindex ();	2649	scr_backindex ();
3092	break;	2650	break;
3093	#endif	2651	#endif
3094	case '7':	2652	case '7':
3095	scr_cursor (SAVE);	2653	scr_cursor (SAVE);
3096	break;	2654	break;
3097	case '8':	2655	case '8':
3098	scr_cursor (RESTORE);	2656	scr_cursor (RESTORE);
3099	break;	2657	break;
3100	#if ENABLE_FRILLS	2658	#if !ENABLE_MINIMAL
3101	case '9':	2659	case '9':
3102	scr_forwardindex ();	2660	scr_forwardindex ();
3103	break;	2661	break;
3104	#endif	2662	#endif
3105	case '=':	2663	case '=':
…		…
3220	rxvt_term::process_csi_seq ()	2778	rxvt_term::process_csi_seq ()
3221	{	2779	{
3222	unicode_t ch, priv, i;	2780	unicode_t ch, priv, i;
3223	unsigned int nargs, p;	2781	unsigned int nargs, p;
3224	int n, ndef;	2782	int n, ndef;
3225	int arg[ESC_ARGS];	2783	int arg[ESC_ARGS] = { };
3226		2784
3227	for (nargs = ESC_ARGS; nargs > 0;)	2785	nargs = 0;
3228	arg[--nargs] = 0;
3229		2786
3230	priv = 0;	2787	priv = 0;
3231	ch = cmd_getc ();	2788	ch = cmd_getc ();
3232	if (ch >= '<' && ch <= '?')	2789	if (ch >= '<' && ch <= '?')
3233	{ /* '<' '=' '>' '?' */	2790	{ /* '<' '=' '>' '?' */
…		…
3277	switch (priv)	2834	switch (priv)
3278	{	2835	{
3279	case '>':	2836	case '>':
3280	if (ch == CSI_DA) /* secondary device attributes */	2837	if (ch == CSI_DA) /* secondary device attributes */
3281	{	2838	{
3282	// first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,	2839	// first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
3283	// 'U' for rxvt-unicode != 7.[34] (where it was broken).	2840	// 'U' for rxvt-unicode != 7.[34] (where it was broken).
3284	//	2841	//
3285	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt	2842	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3286	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify	2843	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3287	// that we do not support xterm mouse reporting (should be 95 when we do).	2844	// that we do not support xterm mouse reporting (should be 95 when we do).
…		…
3421	break;	2978	break;
3422	case 6: /* CPR requested */	2979	case 6: /* CPR requested */
3423	scr_report_position ();	2980	scr_report_position ();
3424	break;	2981	break;
3425	case 7: /* unofficial extension */	2982	case 7: /* unofficial extension */
3426	if (OPTION (Opt_insecure))	2983	if (option (Opt_insecure))
3427	tt_printf ("%-.250s\012", rs[Rs_display_name]);	2984	tt_printf ("%-.250s\012", rs[Rs_display_name]);
3428	break;	2985	break;
3429	case 8: /* unofficial extension */	2986	case 8: /* unofficial extension */
3430	process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);	2987	process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3431	break;	2988	break;
…		…
3498	break;	3055	break;
3499	case CSI_75:	3056	case CSI_75:
3500	scr_cursor (RESTORE);	3057	scr_cursor (RESTORE);
3501	break;	3058	break;
3502		3059
3503	#if ENABLE_FRILLS	3060	#if !ENABLE_MINIMAL
3504	case CSI_74:	3061	case CSI_74:
3505	process_window_ops (arg, nargs);	3062	process_window_ops (arg, nargs);
3506	break;	3063	break;
3507	#endif	3064	#endif
3508		3065
…		…
3515	break;	3072	break;
3516	}	3073	}
3517	}	3074	}
3518	/*}}} */	3075	/*}}} */
3519		3076
3520	#if ENABLE_FRILLS	3077	#if !ENABLE_MINIMAL
3521	/* ARGSUSED */	3078	/* ARGSUSED */
3522	void	3079	void
3523	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3080	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3524	{	3081	{
3525	int x, y;	3082	int x, y;
3526	XWindowAttributes wattr;	3083	XWindowAttributes wattr;
3527	Window wdummy;	3084	Window wdummy;
3528		3085
3529	dLocal (Display *, xdisp);	3086	dLocal (Display *, dpy);
3530		3087
3531	if (nargs == 0)	3088	if (nargs == 0)
3532	return;	3089	return;
3533		3090
3534	switch (args[0])	3091	switch (args[0])
3535	{	3092	{
3536	/*	3093	/*
3537	* commands	3094	* commands
3538	*/	3095	*/
3539	case 1: /* deiconify window */	3096	case 1: /* deiconify window */
3540	XMapWindow (xdisp, parent[0]);	3097	XMapWindow (dpy, parent[0]);
3541	break;	3098	break;
3542	case 2: /* iconify window */	3099	case 2: /* iconify window */
3543	XIconifyWindow (xdisp, parent[0], display->screen);	3100	XIconifyWindow (dpy, parent[0], display->screen);
3544	break;	3101	break;
3545	case 3: /* set position (pixels) */	3102	case 3: /* set position (pixels) */
3546	XMoveWindow (xdisp, parent[0], args[1], args[2]);	3103	XMoveWindow (dpy, parent[0], args[1], args[2]);
3547	break;	3104	break;
3548	case 4: /* set size (pixels) */	3105	case 4: /* set size (pixels) */
3549	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3106	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3550	break;	3107	break;
3551	case 5: /* raise window */	3108	case 5: /* raise window */
3552	XRaiseWindow (xdisp, parent[0]);	3109	XRaiseWindow (dpy, parent[0]);
3553	break;	3110	break;
3554	case 6: /* lower window */	3111	case 6: /* lower window */
3555	XLowerWindow (xdisp, parent[0]);	3112	XLowerWindow (dpy, parent[0]);
3556	break;	3113	break;
3557	case 7: /* refresh window */	3114	case 7: /* refresh window */
3558	scr_touch (true);	3115	scr_touch (true);
3559	break;	3116	break;
3560	case 8: /* set size (chars) */	3117	case 8: /* set size (chars) */
…		…
3567	if (args[0] >= 24) /* set height (chars) */	3124	if (args[0] >= 24) /* set height (chars) */
3568	set_widthheight ((unsigned int)width,	3125	set_widthheight ((unsigned int)width,
3569	(unsigned int) (args[1] * fheight));	3126	(unsigned int) (args[1] * fheight));
3570	break;	3127	break;
3571		3128
3572
3573	/*	3129	/*
3574	* reports - some output format copied from XTerm	3130	* reports - some output format copied from XTerm
3575	*/	3131	*/
3576	case 11: /* report window state */	3132	case 11: /* report window state */
3577	XGetWindowAttributes (xdisp, parent[0], &wattr);	3133	XGetWindowAttributes (dpy, parent[0], &wattr);
3578	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3134	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3579	break;	3135	break;
3580	case 13: /* report window position */	3136	case 13: /* report window position */
3581	XGetWindowAttributes (xdisp, parent[0], &wattr);	3137	XGetWindowAttributes (dpy, parent[0], &wattr);
3582	XTranslateCoordinates (xdisp, parent[0], wattr.root,	3138	XTranslateCoordinates (dpy, parent[0], wattr.root,
3583	-wattr.border_width, -wattr.border_width,	3139	-wattr.border_width, -wattr.border_width,
3584	&x, &y, &wdummy);	3140	&x, &y, &wdummy);
3585	tt_printf ("\033[3;%d;%dt", x, y);	3141	tt_printf ("\033[3;%d;%dt", x, y);
3586	break;	3142	break;
3587	case 14: /* report window size (pixels) */	3143	case 14: /* report window size (pixels) */
3588	XGetWindowAttributes (xdisp, parent[0], &wattr);	3144	XGetWindowAttributes (dpy, parent[0], &wattr);
3589	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3145	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3590	break;	3146	break;
3591	case 18: /* report text area size (chars) */	3147	case 18: /* report text area size (chars) */
3592	tt_printf ("\033[8;%d;%dt", nrow, ncol);	3148	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3593	break;	3149	break;
…		…
3595	tt_printf ("\033[9;%d;%dt", nrow, ncol);	3151	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3596	break;	3152	break;
3597	case 20: /* report icon label */	3153	case 20: /* report icon label */
3598	{	3154	{
3599	char *s;	3155	char *s;
3600	XGetIconName (xdisp, parent[0], &s);	3156	XGetIconName (dpy, parent[0], &s);
3601	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 */
3602	XFree (s);	3158	XFree (s);
3603	}	3159	}
3604	break;	3160	break;
3605	case 21: /* report window title */	3161	case 21: /* report window title */
3606	{	3162	{
3607	char *s;	3163	char *s;
3608	XFetchName (xdisp, parent[0], &s);	3164	XFetchName (dpy, parent[0], &s);
3609	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 */
3610	XFree (s);	3166	XFree (s);
3611	}	3167	}
3612	break;	3168	break;
3613	}	3169	}
3614	}	3170	}
…		…
3641	seen_esc = true;	3197	seen_esc = true;
3642	continue;	3198	continue;
3643	}	3199	}
3644	else if (ch == C0_BEL || ch == CHAR_ST)	3200	else if (ch == C0_BEL || ch == CHAR_ST)
3645	break;	3201	break;
		3202	else if (ch == C0_SYN)
		3203	ch = cmd_get8 ();
3646	else if (ch < 0x20)	3204	else if (ch < 0x20)
3647	return NULL; /* other control character - exit */	3205	return NULL; /* other control character - exit */
3648		3206
3649	seen_esc = false;	3207	seen_esc = false;
3650		3208
3651	if (n >= STRING_MAX - 1)	3209	if (n >= STRING_MAX - 1)
3652	// stop at some sane length	3210	// stop at some sane length
3653	return NULL;	3211	return NULL;
3654		3212
3655	if (ch == C0_SYN)
3656	string[n++] = cmd_get8 ();
3657	else
3658	string[n++] = ch;	3213	string[n++] = ch;
3659	}	3214	}
3660		3215
3661	string[n++] = '\0';	3216	string[n++] = '\0';
3662		3217
3663	ends_how = (ch == 0x5c ? C0_ESC : ch);	3218	ends_how = (ch == 0x5c ? C0_ESC : ch);
…		…
3714	void	3269	void
3715	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)
3716	{	3271	{
3717	if (str[0] == '?' && !str[1])	3272	if (str[0] == '?' && !str[1])
3718	{	3273	{
3719	rxvt_rgba c;	3274	rgba c;
3720	pix_colors_focused[color].get (this, c);	3275	pix_colors_focused[color].get (c);
3721		3276
3722	#if XFT	3277	#if XFT
3723	if (c.a != rxvt_rgba::MAX_CC)	3278	if (c.a != rgba::MAX_CC)
3724	tt_printf ("\033]%d;#%04x%04x%04x%04x%c", report, c.a, c.r, c.g, c.b, resp);	3279	tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3725	else	3280	else
3726	#endif	3281	#endif
3727	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);	3282	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3728	}	3283	}
3729	else	3284	else
…		…
3739	int color;	3294	int color;
3740	char *buf, *name;	3295	char *buf, *name;
3741	bool query = str[0] == '?' && !str[1];	3296	bool query = str[0] == '?' && !str[1];
3742	int saveop = op;	3297	int saveop = op;
3743		3298
3744	dLocal (Display *, xdisp);	3299	dLocal (Display *, dpy);
3745		3300
3746	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
3747	switch (op)	3306	switch (op)
3748	{	3307	{
3749	case XTerm_name:	3308	case XTerm_name:
3750	set_title (str);	3309	set_title (str);
3751	/* FALLTHROUGH */	3310	/* FALLTHROUGH */
…		…
3765	unsigned long bytes_after;	3324	unsigned long bytes_after;
3766	unsigned char *value = 0;	3325	unsigned char *value = 0;
3767	const char *str = "";	3326	const char *str = "";
3768		3327
3769	if (prop	3328	if (prop
3770	&& XGetWindowProperty (xdisp, parent[0],	3329	&& XGetWindowProperty (dpy, parent[0],
3771	prop, 0, 1<<16, 0, AnyPropertyType,	3330	prop, 0, 1<<16, 0, AnyPropertyType,
3772	&actual_type, &actual_format,	3331	&actual_type, &actual_format,
3773	&nitems, &bytes_after, &value) == Success	3332	&nitems, &bytes_after, &value) == Success
3774	&& actual_type != None	3333	&& actual_type != None
3775	&& actual_format == 8)	3334	&& actual_format == 8)
…		…
3787	{	3346	{
3788	*eq = 0;	3347	*eq = 0;
3789	set_utf8_property (display->atom (str), eq + 1);	3348	set_utf8_property (display->atom (str), eq + 1);
3790	}	3349	}
3791	else	3350	else
3792	XDeleteProperty (xdisp, parent[0],	3351	XDeleteProperty (dpy, parent[0],
3793	display->atom (str));	3352	display->atom (str));
3794	}	3353	}
3795	break;	3354	break;
3796		3355
3797	case XTerm_Color:	3356	case XTerm_Color:
…		…
3843	break;	3402	break;
3844	case URxvt_Color_IT:	3403	case URxvt_Color_IT:
3845	process_color_seq (op, Color_IT, str, resp);	3404	process_color_seq (op, Color_IT, str, resp);
3846	break;	3405	break;
3847	#endif	3406	#endif
3848	#if TRANSPARENT && TINTING	3407	#if ENABLE_TRANSPARENCY
3849	case URxvt_Color_tint:	3408	case URxvt_Color_tint:
3850	process_color_seq (op, Color_tint, str, resp);	3409	process_color_seq (op, Color_tint, str, resp);
3851	check_our_parents ();	3410	{
3852	if (am_transparent)	3411	bool changed = false;
3853	want_full_refresh = want_refresh = 1;	3412	if (ISSET_PIXCOLOR (Color_tint))
3854	break;	3413	changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3855	#endif	3414	else
		3415	changed = bgPixmap.unset_tint ();
		3416	if (changed)
		3417	update_background ();
		3418	}
3856		3419
		3420	break;
		3421	#endif
		3422
		3423	#if BG_IMAGE_FROM_FILE
3857	case Rxvt_Pixmap:	3424	case Rxvt_Pixmap:
3858	{	3425	if (!strcmp (str, "?"))
3859	if (*str != ';')
3860	{	3426	{
3861	#if XPM_BACKGROUND	3427	char str[256];
3862	scale_pixmap (""); /* reset to default scaling */	3428
3863	set_bgPixmap (str); /* change pixmap */	3429	sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3864	scr_touch (true);	3430	min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3865	#endif	3431	min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
		3432	process_xterm_seq (XTerm_title, str, CHAR_ST);
3866	}	3433	}
3867		3434	else
		3435	{
3868	int changed = 0;	3436	int changed = 0;
3869		3437
3870	while ((str = strchr (str, ';')) != NULL)	3438	if (*str != ';')
3871	{	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	{
3872	str++;	3450	str++;
3873	#if XPM_BACKGROUND	3451	if (bgPixmap.set_geometry (str))
3874	changed += scale_pixmap (str);	3452	changed++;
3875	#endif	3453	str = strchr (str, ';');
3876	}	3454	}
3877
3878	if (changed)	3455	if (changed)
3879	{	3456	update_background ();
3880	#ifdef XPM_BACKGROUND
3881	resize_pixmap ();
3882	scr_touch (true);
3883	#endif
3884	}	3457	}
3885	}
3886	break;	3458	break;
		3459	#endif
3887		3460
3888	case Rxvt_restoreFG:	3461	case Rxvt_restoreFG:
3889	set_window_color (Color_fg, str);	3462	set_window_color (Color_fg, str);
3890	break;	3463	break;
3891	case Rxvt_restoreBG:	3464	case Rxvt_restoreBG:
…		…
3916	case URxvt_italicFont:	3489	case URxvt_italicFont:
3917	case URxvt_boldItalicFont:	3490	case URxvt_boldItalicFont:
3918	#endif	3491	#endif
3919	if (query)	3492	if (query)
3920	tt_printf ("\33]%d;%-.250s%c", saveop,	3493	tt_printf ("\33]%d;%-.250s%c", saveop,
3921	OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc	3494	option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3922	? fontset[op - URxvt_font]->fontdesc : "",	3495	? fontset[op - URxvt_font]->fontdesc : "",
3923	resp);	3496	resp);
3924	else	3497	else
3925	{	3498	{
3926	const char *&res = rs[Rs_font + (op - URxvt_font)];	3499	const char *&res = rs[Rs_font + (op - URxvt_font)];
…		…
3937	op,	3510	op,
3938	rs[Rs_name], VERSION[0], VERSION[2],	3511	rs[Rs_name], VERSION[0], VERSION[2],
3939	resp);	3512	resp);
3940	break;	3513	break;
3941		3514
3942	#if ENABLE_FRILLS	3515	#if !ENABLE_MINIMAL
3943	case URxvt_locale:	3516	case URxvt_locale:
3944	if (query)	3517	if (query)
3945	tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);	3518	tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3946	else	3519	else
3947	{	3520	{
3948	set_locale (str);	3521	set_locale (str);
3949	pty->set_utf8_mode (enc_utf8);	3522	pty->set_utf8_mode (enc_utf8);
3950	init_xlocale ();	3523	init_xlocale ();
…		…
3965	break;	3538	break;
3966	#endif	3539	#endif
3967		3540
3968	#if ENABLE_PERL	3541	#if ENABLE_PERL
3969	case URxvt_perl:	3542	case URxvt_perl:
3970	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)))
3971	; // no responses yet	3544	; // no responses yet
3972	break;	3545	break;
3973	#endif	3546	#endif
3974	}	3547	}
3975	}	3548	}
…		…
4013	{	3586	{
4014	unsigned int i, j;	3587	unsigned int i, j;
4015	int state;	3588	int state;
4016		3589
4017	static const struct	3590	static const struct
4018	{	3591	{
4019	const int argval;	3592	const int argval;
4020	const unsigned long bit;	3593	const unsigned long bit;
4021	}
4022
4023	argtopriv[] = {	3594	} argtopriv[] = {
4024	{ 1, PrivMode_aplCUR },	3595	{ 1, PrivMode_aplCUR },
4025	{ 2, PrivMode_vt52 },	3596	{ 2, PrivMode_vt52 },
4026	{ 3, PrivMode_132 },	3597	{ 3, PrivMode_132 },
4027	{ 4, PrivMode_smoothScroll },	3598	{ 4, PrivMode_smoothScroll },
4028	{ 5, PrivMode_rVideo },	3599	{ 5, PrivMode_rVideo },
…		…
4091	scr_touch (true);	3662	scr_touch (true);
4092	break;	3663	break;
4093	#endif	3664	#endif
4094	case 1048: /* alternative cursor save */	3665	case 1048: /* alternative cursor save */
4095	case 1049:	3666	case 1049:
4096	if (OPTION (Opt_secondaryScreen))	3667	if (option (Opt_secondaryScreen))
4097	if (mode == 0)	3668	if (mode == 0)
4098	scr_cursor (RESTORE);	3669	scr_cursor (RESTORE);
4099	else if (mode == 1)	3670	else if (mode == 1)
4100	scr_cursor (SAVE);	3671	scr_cursor (SAVE);
4101	break;	3672	break;
…		…
4166	break;	3737	break;
4167	case 1011: /* scroll to bottom on key press */	3738	case 1011: /* scroll to bottom on key press */
4168	set_option (Opt_scrollTtyKeypress, state);	3739	set_option (Opt_scrollTtyKeypress, state);
4169	break;	3740	break;
4170	case 1047: /* secondary screen w/ clearing last */	3741	case 1047: /* secondary screen w/ clearing last */
4171	if (OPTION (Opt_secondaryScreen))	3742	if (option (Opt_secondaryScreen))
4172	if (current_screen != PRIMARY)	3743	if (current_screen != PRIMARY)
4173	scr_erase_screen (2);	3744	scr_erase_screen (2);
4174	scr_change_screen (state);	3745	scr_change_screen (state);
4175	break;	3746	break;
4176	case 1049: /* secondary screen w/ clearing first */	3747	case 1049: /* secondary screen w/ clearing first */
4177	scr_change_screen (state);	3748	scr_change_screen (state);
4178	if (OPTION (Opt_secondaryScreen))	3749	if (option (Opt_secondaryScreen))
4179	if (current_screen != PRIMARY)	3750	if (current_screen != PRIMARY)
4180	scr_erase_screen (2);	3751	scr_erase_screen (2);
4181	break;	3752	break;
4182	default:	3753	default:
4183	break;	3754	break;
…		…
4311	scr_color (Color_bg, Color_bg);	3882	scr_color (Color_bg, Color_bg);
4312	break;	3883	break;
4313		3884
4314	//case 50: // not variable spacing	3885	//case 50: // not variable spacing
4315		3886
4316	#if ENABLE_FRILLS	3887	#if !ENABLE_MINIMAL
4317	case 90:	3888	case 90:
4318	case 91: /* set bright fg color */	3889	case 91: /* set bright fg color */
4319	case 92:	3890	case 92:
4320	case 93:	3891	case 93:
4321	case 94:	3892	case 94:
…		…
4420		3991
4421	if (v_buflen == 0)	3992	if (v_buflen == 0)
4422	{	3993	{
4423	free (v_buffer);	3994	free (v_buffer);
4424	v_buffer = 0;	3995	v_buffer = 0;
4425	v_buflen = 0;
4426		3996
4427	pty_ev.set (EVENT_READ);	3997	pty_ev.set (EVENT_READ);
4428	return;	3998	return;
4429	}	3999	}
4430		4000

Diff Legend

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