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.310 by root, Thu Feb 23 19:26:56 2006 UTC vs.
Revision 1.382 by root, Fri Dec 14 06:04:56 2007 UTC

…		…
25	* - extensive modifications	25	* - extensive modifications
26	* Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>	26	* Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27	* Copyright (c) 2001 Marius Gedminas	27	* Copyright (c) 2001 Marius Gedminas
28	* - Ctrl/Mod4+Tab works like Meta+Tab (options)	28	* - Ctrl/Mod4+Tab works like Meta+Tab (options)
29	* Copyright (c) 2003 Rob McMullen <robm@flipturn.org>	29	* Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30	* Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>	30	* Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
31	*	31	*
32	* This program is free software; you can redistribute it and/or modify	32	* This program is free software; you can redistribute it and/or modify
33	* it under the terms of the GNU General Public License as published by	33	* it under the terms of the GNU General Public License as published by
34	* the Free Software Foundation; either version 2 of the License, or	34	* the Free Software Foundation; either version 2 of the License, or
35	* (at your option) any later version.	35	* (at your option) any later version.
…		…
94	XK_ISO_Left_Tab, 0x21e6,	94	XK_ISO_Left_Tab, 0x21e6,
95	XK_Shift_L, 0x21e7,	95	XK_Shift_L, 0x21e7,
96	XK_Shift_R, 0x21e7,	96	XK_Shift_R, 0x21e7,
97		97
98	XK_Shift_Lock, 0x21eb,	98	XK_Shift_Lock, 0x21eb,
99	XK_ISO_Lock, 0x21eb,
100	XK_ISO_Lock, 0x21eb,	99	XK_ISO_Lock, 0x21eb,
101	XK_Caps_Lock, 0x21ec,	100	XK_Caps_Lock, 0x21ec,
102	XK_Num_Lock, 0x21ed,	101	XK_Num_Lock, 0x21ed,
103	XK_ISO_Level3_Shift, 0x21ee,	102	XK_ISO_Level3_Shift, 0x21ee,
104	XK_ISO_Level3_Lock, 0x21ef,	103	XK_ISO_Level3_Lock, 0x21ef,
…		…
500	# if ISO_14755	499	# if ISO_14755
501	iso14755_51 (0);	500	iso14755_51 (0);
502	# endif	501	# endif
503	return;	502	return;
504	}	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	}
505	else if ((hv = hex_keyval (ev)) >= 0)	512	else if ((hv = hex_keyval (ev)) >= 0)
506	{	513	{
507	iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)	514	iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
508	| hv | ISO_14755_51;	515	| hv | ISO_14755_51;
509	# if ISO_14755	516	# if ISO_14755
…		…
511	# endif	518	# endif
512	return;	519	return;
513	}	520	}
514	else	521	else
515	{	522	{
516	# if ENABLE_OVERLAY	523	# if ISO_14755
517	scr_overlay_off ();	524	scr_overlay_off ();
518	# endif	525	# endif
519	iso14755buf = 0;	526	iso14755buf = 0;
520	}	527	}
521	}	528	}
522	else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))	529	else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
523	|| (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))	530	|| (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
524	if (!(iso14755buf & ISO_14755_STARTED))	531	if (!(iso14755buf & ISO_14755_STARTED))
525	{	532	{
526	iso14755buf |= ISO_14755_STARTED;	533	iso14755buf |= ISO_14755_STARTED;
527	# if ENABLE_OVERLAY	534	# if ISO_14755
528	scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);	535	scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
529	scr_overlay_set (0, 0, "ISO 14755 mode");	536	scr_overlay_set (0, 0, "ISO 14755 mode");
530	# endif	537	# endif
531	}	538	}
532	#endif	539	#endif
533		540
534	#ifdef PRINTPIPE	541	#ifdef PRINTPIPE
535	if (keysym == XK_Print)	542	if (keysym == XK_Print)
536	{	543	{
537	scr_printscreen (ctrl | shft);	544	scr_printscreen (ctrl | shft);
538	return;	545	return;
…		…
540	#endif	547	#endif
541		548
542	if (keysym >= 0xFF00 && keysym <= 0xFFFF)	549	if (keysym >= 0xFF00 && keysym <= 0xFFFF)
543	{	550	{
544	{	551	{
		552	bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
545	newlen = 1;	553	newlen = 1;
		554	#ifdef XK_KP_Home
		555	static const KeySym keypadtrans[] = {
		556	XK_KP_7, // XK_KP_Home
		557	XK_KP_4, // XK_KP_Left
		558	XK_KP_8, // XK_KP_Up
		559	XK_KP_6, // XK_KP_Right
		560	XK_KP_2, // XK_KP_Down
		561	#ifndef UNSHIFTED_SCROLLKEYS
		562	XK_KP_9, // XK_KP_Prior
		563	XK_KP_3, // XK_KP_Next
		564	#else
		565	XK_Prior,
		566	XK_Next,
		567	#endif
		568	XK_KP_1, // XK_KP_End
		569	XK_KP_5, // XK_KP_Begin
		570	};
		571
		572	if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
		573	{
		574	unsigned int index = keysym - XK_KP_Home;
		575	keysym = kp ? keypadtrans[index] : XK_Home + index;
		576	}
		577	else if (keysym == XK_KP_Insert)
		578	keysym = kp ? XK_KP_0 : XK_Insert;
		579	#ifndef NO_DELETE_KEY
		580	else if (keysym == XK_KP_Delete)
		581	keysym = kp ? XK_KP_Decimal : XK_Delete;
		582	#endif
		583	#endif
546	switch (keysym)	584	switch (keysym)
547	{	585	{
548	#ifndef NO_BACKSPACE_KEY	586	#ifndef NO_BACKSPACE_KEY
549	case XK_BackSpace:	587	case XK_BackSpace:
550	if (priv_modes & PrivMode_HaveBackSpace)	588	if (priv_modes & PrivMode_HaveBackSpace)
…		…
552	kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)	590	kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
553	^ !!ctrl) ? '\b' : '\177';	591	^ !!ctrl) ? '\b' : '\177';
554	kbuf[1] = '\0';	592	kbuf[1] = '\0';
555	}	593	}
556	else	594	else
557	strcpy (kbuf, key_backspace);	595	strcpy (kbuf, rs[Rs_backspace_key]);
558	break;	596	break;
559	#endif	597	#endif
560	#ifndef NO_DELETE_KEY	598	#ifndef NO_DELETE_KEY
561	# ifdef XK_KP_Prior
562	case XK_KP_Delete:
563	/* allow shift to override */
564	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
565	{
566	strcpy (kbuf, "\033On");
567	break;
568	}
569	/* FALLTHROUGH */
570	# endif
571	case XK_Delete:	599	case XK_Delete:
572	strcpy (kbuf, key_delete);	600	strcpy (kbuf, rs[Rs_delete_key]);
573	break;	601	break;
574	#endif	602	#endif
575	case XK_Tab:	603	case XK_Tab:
576	if (shft)	604	if (shft)
577	strcpy (kbuf, "\033[Z");	605	strcpy (kbuf, "\033[Z");
…		…
587	#endif	615	#endif
588	newlen = 0;	616	newlen = 0;
589	}	617	}
590	break;	618	break;
591		619
592	#ifdef XK_KP_Left
593	case XK_KP_Up: /* \033Ox or standard */
594	case XK_KP_Down: /* \033Or or standard */
595	case XK_KP_Right: /* \033Ov or standard */
596	case XK_KP_Left: /* \033Ot or standard */
597	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
598	{
599	strcpy (kbuf, "\033OZ");
600	kbuf[2] = "txvr"[keysym - XK_KP_Left];
601	break;
602	}
603	else
604	/* translate to std. cursor key */
605	keysym = XK_Left + (keysym - XK_KP_Left);
606	/* FALLTHROUGH */
607	#endif
608	case XK_Up: /* "\033[A" */	620	case XK_Up: /* "\033[A" */
609	case XK_Down: /* "\033[B" */	621	case XK_Down: /* "\033[B" */
610	case XK_Right: /* "\033[C" */	622	case XK_Right: /* "\033[C" */
611	case XK_Left: /* "\033[D" */	623	case XK_Left: /* "\033[D" */
612	strcpy (kbuf, "\033[Z");	624	strcpy (kbuf, "\033[Z");
…		…
622	else if (priv_modes & PrivMode_aplCUR)	634	else if (priv_modes & PrivMode_aplCUR)
623	kbuf[1] = 'O';	635	kbuf[1] = 'O';
624	break;	636	break;
625		637
626	#ifndef UNSHIFTED_SCROLLKEYS	638	#ifndef UNSHIFTED_SCROLLKEYS
627	# ifdef XK_KP_Prior
628	case XK_KP_Prior:
629	/* allow shift to override */
630	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
631	{
632	strcpy (kbuf, "\033Oy");
633	break;
634	}
635	/* FALLTHROUGH */
636	# endif
637	case XK_Prior:	639	case XK_Prior:
638	strcpy (kbuf, "\033[5~");	640	strcpy (kbuf, "\033[5~");
639	break;	641	break;
640	# ifdef XK_KP_Next
641	case XK_KP_Next:
642	/* allow shift to override */
643	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
644	{
645	strcpy (kbuf, "\033Os");
646	break;
647	}
648	/* FALLTHROUGH */
649	# endif
650	case XK_Next:	642	case XK_Next:
651	strcpy (kbuf, "\033[6~");	643	strcpy (kbuf, "\033[6~");
652	break;	644	break;
653	#endif	645	#endif
654	case XK_KP_Enter:	646	case XK_KP_Enter:
655	/* allow shift to override */	647	/* allow shift to override */
656	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)	648	if (kp)
657	{	649	{
658	strcpy (kbuf, "\033OM");	650	strcpy (kbuf, "\033OM");
659	break;	651	break;
660	}	652	}
661		653
…		…
673	kbuf[0] = '\015';	665	kbuf[0] = '\015';
674	kbuf[1] = '\0';	666	kbuf[1] = '\0';
675	}	667	}
676	break;	668	break;
677		669
678	#ifdef XK_KP_Begin
679	case XK_KP_Begin:
680	strcpy (kbuf, "\033Ou");
681	break;
682
683	#endif
684	case XK_KP_F1: /* "\033OP" */	670	case XK_KP_F1: /* "\033OP" */
685	case XK_KP_F2: /* "\033OQ" */	671	case XK_KP_F2: /* "\033OQ" */
686	case XK_KP_F3: /* "\033OR" */	672	case XK_KP_F3: /* "\033OR" */
687	case XK_KP_F4: /* "\033OS" */	673	case XK_KP_F4: /* "\033OS" */
688	strcpy (kbuf, "\033OP");	674	strcpy (kbuf, "\033OP");
…		…
704	case XK_KP_6: /* "\033Ov" : "6" */	690	case XK_KP_6: /* "\033Ov" : "6" */
705	case XK_KP_7: /* "\033Ow" : "7" */	691	case XK_KP_7: /* "\033Ow" : "7" */
706	case XK_KP_8: /* "\033Ox" : "8" */	692	case XK_KP_8: /* "\033Ox" : "8" */
707	case XK_KP_9: /* "\033Oy" : "9" */	693	case XK_KP_9: /* "\033Oy" : "9" */
708	/* allow shift to override */	694	/* allow shift to override */
709	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)	695	if (kp)
710	{	696	{
711	strcpy (kbuf, "\033Oj");	697	strcpy (kbuf, "\033Oj");
712	kbuf[2] += (keysym - XK_KP_Multiply);	698	kbuf[2] += (keysym - XK_KP_Multiply);
713	}	699	}
714	else	700	else
…		…
720		706
721	case XK_Find:	707	case XK_Find:
722	strcpy (kbuf, "\033[1~");	708	strcpy (kbuf, "\033[1~");
723	break;	709	break;
724		710
725	#ifdef XK_KP_End
726	case XK_KP_Insert:
727	/* allow shift to override */
728	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
729	{
730	strcpy (kbuf, "\033Op");
731	break;
732	}
733	/* FALLTHROUGH */
734	#endif
735	case XK_Insert:	711	case XK_Insert:
736	strcpy (kbuf, "\033[2~");	712	strcpy (kbuf, "\033[2~");
737	break;	713	break;
738	#ifdef DXK_Remove /* support for DEC remove like key */	714	#ifdef DXK_Remove /* support for DEC remove like key */
739	case DXK_Remove:	715	case DXK_Remove:
…		…
743	strcpy (kbuf, "\033[3~");	719	strcpy (kbuf, "\033[3~");
744	break;	720	break;
745	case XK_Select:	721	case XK_Select:
746	strcpy (kbuf, "\033[4~");	722	strcpy (kbuf, "\033[4~");
747	break;	723	break;
748	#ifdef XK_KP_End
749	case XK_KP_End:
750	/* allow shift to override */
751	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
752	{
753	strcpy (kbuf, "\033Oq");
754	break;
755	}
756	/* FALLTHROUGH */
757	#endif
758	case XK_End:	724	case XK_End:
759	strcpy (kbuf, KS_END);	725	strcpy (kbuf, KS_END);
760	break;	726	break;
761	#ifdef XK_KP_Home
762	case XK_KP_Home:
763	/* allow shift to override */
764	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
765	{
766	strcpy (kbuf, "\033Ow");
767	break;
768	}
769	/* FALLTHROUGH */
770	#endif
771	case XK_Home:	727	case XK_Home:
772	strcpy (kbuf, KS_HOME);	728	strcpy (kbuf, KS_HOME);
773	break;	729	break;
774		730
775	#define FKEY(n, fkey) \	731	#define FKEY(n, fkey) \
…		…
877	return;	833	return;
878		834
879	if (len <= 0)	835	if (len <= 0)
880	return; /* not mapped */	836	return; /* not mapped */
881		837
882	if (OPTION (Opt_scrollTtyKeypress))	838	if (option (Opt_scrollTtyKeypress))
883	if (view_start)	839	if (view_start)
884	{	840	{
885	view_start = 0;	841	view_start = 0;
886	want_refresh = 1;	842	want_refresh = 1;
887	}	843	}
…		…
926	#if ENABLE_FRILLS || ISO_14755	882	#if ENABLE_FRILLS || ISO_14755
927	// ISO 14755 support	883	// ISO 14755 support
928	if (iso14755buf)	884	if (iso14755buf)
929	if (iso14755buf & ISO_14755_52)	885	if (iso14755buf & ISO_14755_52)
930	{	886	{
931	# if ENABLE_OVERLAY	887	# if ISO_14755
932	scr_overlay_off ();	888	scr_overlay_off ();
933	# endif	889	# endif
934	# if ISO_14755	890	# if ISO_14755
935	// iso14755 part 5.2 handling: release time	891	// iso14755 part 5.2 handling: release time
936	// first: controls	892	// first: controls
…		…
959		915
960	return;	916	return;
961	}	917	}
962	else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))	918	else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
963	{	919	{
964	# if ENABLE_OVERLAY	920	# if ISO_14755
965	scr_overlay_off ();	921	scr_overlay_off ();
966	# endif	922	# endif
967	if (iso14755buf & ISO_14755_51)	923	if (iso14755buf & ISO_14755_51)
968	commit_iso14755 ();	924	commit_iso14755 ();
969	#if ISO_14755	925	#if ISO_14755
970	else if (iso14755buf & ISO_14755_STARTED)	926	else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
971	{	927	{
972	iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair	928	iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
973		929
974	scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);	930	scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
975	scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");	931	scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
…		…
1027	void	983	void
1028	rxvt_term::flush ()	984	rxvt_term::flush ()
1029	{	985	{
1030	flush_ev.stop ();	986	flush_ev.stop ();
1031		987
1032	#ifdef TRANSPARENT	988	#ifdef HAVE_BG_PIXMAP
1033	if (want_full_refresh)	989	if (bgPixmap.check_clearChanged ())
1034	{	990	{
1035	want_full_refresh = 0;	991	// scr_clear (true); This needs to be researched further!
1036	scr_clear ();
1037	scr_touch (false);	992	scr_touch (false);
1038	}	993	}
1039	#endif	994	#endif
1040		995
1041	if (want_refresh)	996	if (want_refresh)
…		…
1086	}	1041	}
1087		1042
1088	display->flush ();	1043	display->flush ();
1089	}	1044	}
1090		1045
		1046	/* checks wether a refresh is requested and starts the refresh timer */
1091	void	1047	void
1092	rxvt_term::check_cb (check_watcher &w)	1048	rxvt_term::refresh_check ()
		1049	{
		1050	if (want_refresh && !flush_ev.is_active ())
		1051	flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
		1052
		1053	display->flush ();
		1054	}
		1055
		1056	void
		1057	rxvt_term::flush_cb (ev::timer &w, int revents)
1093	{	1058	{
1094	make_current ();	1059	make_current ();
1095		1060
1096	display->flush ();
1097
1098	if (want_refresh && !flush_ev.active)
1099	flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1100	}
1101
1102	void
1103	rxvt_term::flush_cb (time_watcher &w)
1104	{
1105	make_current ();
1106
1107	refresh_limit = 1;
1108	refresh_count = 0;	1061	refresh_count = 0;
1109	flush ();	1062	flush ();
1110	}	1063	}
1111		1064
1112	#ifdef CURSOR_BLINK	1065	#ifdef CURSOR_BLINK
1113	void	1066	void
1114	rxvt_term::cursor_blink_cb (time_watcher &w)	1067	rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1115	{	1068	{
1116	hidden_cursor = !hidden_cursor;	1069	hidden_cursor = !hidden_cursor;
1117	want_refresh = 1;	1070	want_refresh = 1;
1118		1071	refresh_check ();
1119	w.start (w.at + CURSOR_BLINK_INTERVAL);
1120	}	1072	}
1121	#endif	1073	#endif
1122		1074
1123	#ifdef TEXT_BLINK	1075	#ifdef TEXT_BLINK
1124	void	1076	void
1125	rxvt_term::text_blink_cb (time_watcher &w)	1077	rxvt_term::text_blink_cb (ev::timer &w, int revents)
1126	{	1078	{
1127	if (scr_refresh_rend (RS_Blink, RS_Blink))	1079	if (scr_refresh_rend (RS_Blink, RS_Blink))
1128	{	1080	{
1129	hidden_text = !hidden_text;	1081	hidden_text = !hidden_text;
1130	want_refresh = 1;	1082	want_refresh = 1;
1131	w.start (w.at + TEXT_BLINK_INTERVAL);	1083	refresh_check ();
1132	}	1084	}
		1085	else
		1086	w.stop ();
1133	}	1087	}
1134	#endif	1088	#endif
1135		1089
1136	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	1090	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1137	void	1091	void
1138	rxvt_term::cont_scroll_cb (time_watcher &w)	1092	rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1139	{	1093	{
1140	if ((scrollbar_isUp() || scrollbar_isDn()) &&	1094	if ((scrollbar_isUp () || scrollbar_isDn ())
1141	scr_page (scrollbar_isUp() ? UP : DN, 1))	1095	&& scr_page (scrollbar_isUp () ? UP : DN, 1))
1142	{	1096	{
1143	want_refresh = 1;	1097	want_refresh = 1;
1144	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1098	refresh_check ();
1145	}	1099	}
		1100	else
		1101	w.stop ();
1146	}	1102	}
1147	#endif	1103	#endif
1148		1104
1149	#ifdef SELECTION_SCROLLING	1105	#ifdef SELECTION_SCROLLING
1150	void	1106	void
1151	rxvt_term::sel_scroll_cb (time_watcher &w)	1107	rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1152	{	1108	{
1153	if (scr_page (scroll_selection_dir, scroll_selection_lines))	1109	if (scr_page (scroll_selection_dir, scroll_selection_lines))
1154	{	1110	{
1155	selection_extend (selection_save_x, selection_save_y, selection_save_state);	1111	selection_extend (selection_save_x, selection_save_y, selection_save_state);
1156	want_refresh = 1;	1112	want_refresh = 1;
1157	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1113	refresh_check ();
1158	}	1114	}
		1115	else
		1116	w.stop ();
1159	}	1117	}
1160	#endif	1118	#endif
1161		1119
1162	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	1120	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1163	void	1121	void
1164	rxvt_term::slip_wheel_cb (time_watcher &w)	1122	rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1165	{	1123	{
1166	if (mouse_slip_wheel_speed == 0	1124	if (scr_changeview (view_start - mouse_slip_wheel_speed))
1167	|| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1168	: scr_page (UP, mouse_slip_wheel_speed))
1169	{	1125	{
1170	if (view_start == top_row || view_start == 0)
1171	mouse_slip_wheel_speed = 0;
1172
1173	want_refresh = 1;	1126	want_refresh = 1;
1174	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1127	refresh_check ();
		1128	}
		1129
		1130	if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
		1131	{
		1132	mouse_slip_wheel_speed = 0;
		1133	w.stop ();
1175	}	1134	}
1176	}	1135	}
1177	#endif	1136	#endif
1178		1137
1179	#if LINUX_YIELD_HACK	1138	#if LINUX_YIELD_HACK
1180	static struct event_handler	1139	static struct event_handler
1181	{	1140	{
1182	check_watcher yield_ev;	1141	ev::prepare yield_ev;
1183		1142
1184	void yield_cb (check_watcher &w)	1143	void yield_cb (ev::prepare &w, int revents)
1185	{	1144	{
1186	// this should really be sched_yield(), but the linux guys thought	1145	// this should really be sched_yield(), but the linux guys thought
1187	// that giving a process calling sched_yield () less cpu time than	1146	// that giving a process calling sched_yield () less cpu time than
1188	// ones with high nice levels is a useful thing to do. It surely is is	1147	// ones with high nice levels is a useful thing to do. It surely is is
1189	// allowed by the sus... as is returning ENOSYS.	1148	// allowed by the sus... as is returning ENOSYS.
…		…
1232	}	1191	}
1233	else	1192	else
1234	{	1193	{
1235	pty_ev.stop ();	1194	pty_ev.stop ();
1236		1195
1237	if (!OPTION (Opt_hold))	1196	if (!option (Opt_hold))
1238	destroy ();	1197	destroy ();
1239	}	1198	}
1240		1199
1241	return false;	1200	return false;
1242	}	1201	}
1243		1202
1244	void	1203	void
1245	rxvt_term::pty_cb (io_watcher &w, short revents)	1204	rxvt_term::pty_cb (ev::io &w, int revents)
1246	{	1205	{
1247	make_current ();	1206	make_current ();
1248		1207
1249	if (revents & EVENT_READ)	1208	if (revents & ev::READ)
1250	// loop, but don't allow a single term to monopolize us	1209	// loop, but don't allow a single term to monopolize us
1251	while (pty_fill ())	1210	while (pty_fill ())
1252	if (cmd_parse ())	1211	if (cmd_parse ())
1253	break;	1212	break;
1254		1213
1255	if (revents & EVENT_WRITE)	1214	if (revents & ev::WRITE)
1256	pty_write ();	1215	pty_write ();
1257	}	1216	}
1258		1217
1259	void	1218	void
1260	rxvt_term::pointer_unblank ()	1219	rxvt_term::pointer_unblank ()
…		…
1263	recolour_cursor ();	1222	recolour_cursor ();
1264		1223
1265	#ifdef POINTER_BLANK	1224	#ifdef POINTER_BLANK
1266	hidden_pointer = 0;	1225	hidden_pointer = 0;
1267		1226
1268	if (OPTION (Opt_pointerBlank))	1227	if (option (Opt_pointerBlank))
1269	pointer_ev.start (NOW + pointerBlankDelay);	1228	pointer_ev.start (pointerBlankDelay);
1270	#endif	1229	#endif
1271	}	1230	}
1272		1231
1273	#ifdef POINTER_BLANK	1232	#ifdef POINTER_BLANK
1274	void	1233	void
1275	rxvt_term::pointer_blank ()	1234	rxvt_term::pointer_blank ()
1276	{	1235	{
1277	if (!OPTION (Opt_pointerBlank))	1236	if (!option (Opt_pointerBlank))
1278	return;	1237	return;
1279		1238
1280	XDefineCursor (dpy, vt, display->blank_cursor);	1239	XDefineCursor (dpy, vt, display->blank_cursor);
1281	XFlush (dpy);	1240	XFlush (dpy);
1282		1241
1283	hidden_pointer = 1;	1242	hidden_pointer = 1;
1284	}	1243	}
1285		1244
1286	void	1245	void
1287	rxvt_term::pointer_cb (time_watcher &w)	1246	rxvt_term::pointer_cb (ev::timer &w, int revents)
1288	{	1247	{
1289	make_current ();	1248	make_current ();
1290		1249
1291	pointer_blank ();	1250	pointer_blank ();
1292	}	1251	}
…		…
1295	void	1254	void
1296	rxvt_term::mouse_report (XButtonEvent &ev)	1255	rxvt_term::mouse_report (XButtonEvent &ev)
1297	{	1256	{
1298	int button_number, key_state = 0;	1257	int button_number, key_state = 0;
1299	int x, y;	1258	int x, y;
		1259	int code = 32;
1300		1260
1301	x = ev.x;	1261	x = Pixel2Col (ev.x);
1302	y = ev.y;	1262	y = Pixel2Row (ev.y);
1303	pixel_position (&x, &y);	1263	if (ev.type == MotionNotify)
		1264	{
		1265	if (x == mouse_row && y == mouse_col)
		1266	return;
		1267	mouse_row = x;
		1268	mouse_col = y;
		1269	code += 32;
		1270	}
1304		1271
1305	if (MEvent.button == AnyButton)	1272	if (MEvent.button == AnyButton)
1306	button_number = 3;	1273	button_number = 3;
1307	else	1274	else
1308	{	1275	{
…		…
1354	x + 1,	1321	x + 1,
1355	y + 1);	1322	y + 1);
1356	#endif	1323	#endif
1357		1324
1358	tt_printf ("\033[M%c%c%c",	1325	tt_printf ("\033[M%c%c%c",
1359	(32 + button_number + key_state),	1326	(code + button_number + key_state),
1360	(32 + x + 1),	1327	(32 + x + 1),
1361	(32 + y + 1));	1328	(32 + y + 1));
1362	}	1329	}
1363		1330
1364	/*{{{ process an X event */	1331	/*{{{ process an X event */
…		…
1426	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)	1393	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1427	focus_out ();	1394	focus_out ();
1428	}	1395	}
1429	#endif	1396	#endif
1430	}	1397	}
1431	break;
1432
1433	case MappingNotify:
1434	XRefreshKeyboardMapping (&ev.xmapping);
1435	break;	1398	break;
1436		1399
1437	/*	1400	/*
1438	* XXX: this is not the _current_ arrangement	1401	* XXX: this is not the _current_ arrangement
1439	* Here's my conclusion:	1402	* Here's my conclusion:
…		…
1458	break;	1421	break;
1459	}	1422	}
1460	break;	1423	break;
1461		1424
1462	case FocusIn:	1425	case FocusIn:
		1426	if (ev.xfocus.detail != NotifyInferior
		1427	&& ev.xfocus.detail != NotifyPointer
		1428	&& ev.xfocus.mode != NotifyGrab)
1463	focus_in ();	1429	focus_in ();
1464	break;	1430	break;
1465		1431
1466	case FocusOut:	1432	case FocusOut:
		1433	if (ev.xfocus.detail != NotifyInferior
		1434	&& ev.xfocus.detail != NotifyPointer
		1435	&& ev.xfocus.mode != NotifyGrab)
1467	focus_out ();	1436	focus_out ();
1468	break;	1437	break;
1469		1438
1470	case ConfigureNotify:	1439	case ConfigureNotify:
		1440	/* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
		1441	ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
		1442	szHint.width, szHint.height); */
1471	if (ev.xconfigure.window == parent[0])	1443	if (ev.xconfigure.window == parent[0])
1472	{	1444	{
1473	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))	1445	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1474	;	1446	;
1475		1447
1476	if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)	1448	if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1477	{	1449	{
1478	seen_resize = 1;	1450	seen_resize = 1;
1479	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1451	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1480	}	1452	}
1481		1453	else
		1454	{
		1455	#ifdef HAVE_BG_PIXMAP
		1456	if (bgPixmap.window_position_sensitive ())
		1457	update_background ();
		1458	#endif
		1459	}
1482	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));	1460	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1483
1484	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1485	if (OPTION (Opt_transparent))
1486	check_our_parents ();
1487	#endif
1488	}	1461	}
1489	break;	1462	break;
1490		1463
1491	case PropertyNotify:	1464	case PropertyNotify:
1492	if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))	1465	if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
…		…
1510	break;	1483	break;
1511		1484
1512	case MapNotify:	1485	case MapNotify:
1513	mapped = 1;	1486	mapped = 1;
1514	#ifdef TEXT_BLINK	1487	#ifdef TEXT_BLINK
1515	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);	1488	text_blink_ev.start ();
1516	#endif	1489	#endif
1517	HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));	1490	HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1518	break;	1491	break;
1519		1492
1520	case UnmapNotify:	1493	case UnmapNotify:
…		…
1522	#ifdef TEXT_BLINK	1495	#ifdef TEXT_BLINK
1523	text_blink_ev.stop ();	1496	text_blink_ev.stop ();
1524	#endif	1497	#endif
1525	HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));	1498	HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1526	break;	1499	break;
1527
1528	#ifdef TRANSPARENT
1529	case ReparentNotify:
1530	rootwin_cb (ev);
1531	break;
1532	#endif /* TRANSPARENT */
1533		1500
1534	case GraphicsExpose:	1501	case GraphicsExpose:
1535	case Expose:	1502	case Expose:
1536	if (ev.xany.window == vt)	1503	if (ev.xany.window == vt)
1537	{	1504	{
1538	do	1505	do
		1506	{
1539	scr_expose (ev.xexpose.x, ev.xexpose.y,	1507	scr_expose (ev.xexpose.x, ev.xexpose.y,
1540	ev.xexpose.width, ev.xexpose.height, False);	1508	ev.xexpose.width, ev.xexpose.height, False);
		1509	}
1541	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));	1510	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1542		1511
1543	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1512	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1544		1513
1545	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))	1514	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
		1515	{
1546	scr_expose (ev.xexpose.x, ev.xexpose.y,	1516	scr_expose (ev.xexpose.x, ev.xexpose.y,
1547	ev.xexpose.width, ev.xexpose.height, False);	1517	ev.xexpose.width, ev.xexpose.height, False);
		1518	}
1548		1519
1549	want_refresh = 1;	1520	want_refresh = 1;
1550	}	1521	}
1551	else	1522	else
1552	{	1523	{
…		…
1560	if (isScrollbarWindow (ev.xany.window))	1531	if (isScrollbarWindow (ev.xany.window))
1561	{	1532	{
1562	scrollBar.setIdle ();	1533	scrollBar.setIdle ();
1563	scrollbar_show (0);	1534	scrollbar_show (0);
1564	}	1535	}
1565
1566	#ifdef TRANSPARENT
1567	if (am_transparent && ev.xany.window == parent[0])
1568	XClearWindow (dpy, ev.xany.window);
1569	#endif
1570	}	1536	}
1571	break;	1537	break;
1572		1538
1573	case MotionNotify:	1539	case MotionNotify:
1574	#ifdef POINTER_BLANK	1540	#ifdef POINTER_BLANK
1575	if (hidden_pointer)	1541	if (hidden_pointer)
1576	pointer_unblank ();	1542	pointer_unblank ();
1577	#endif	1543	#endif
		1544	if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
		1545	|| priv_modes & PrivMode_MouseAnyEvent)
		1546	mouse_report (ev.xbutton);
1578	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)	1547	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1579	break;	1548	break;
1580		1549
1581	if (ev.xany.window == vt)	1550	if (ev.xany.window == vt)
1582	{	1551	{
…		…
1616	int dist;	1585	int dist;
1617		1586
1618	/* don't clobber the current delay if we are	1587	/* don't clobber the current delay if we are
1619	* already in the middle of scrolling.	1588	* already in the middle of scrolling.
1620	*/	1589	*/
1621	if (!sel_scroll_ev.active)	1590	if (!sel_scroll_ev.is_active ())
1622	sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);	1591	sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1623		1592
1624	/* save the event params so we can highlight	1593	/* save the event params so we can highlight
1625	* the selection in the pending-scroll loop	1594	* the selection in the pending-scroll loop
1626	*/	1595	*/
1627	selection_save_x = ev.xbutton.x;	1596	selection_save_x = ev.xbutton.x;
…		…
1649	else	1618	else
1650	{	1619	{
1651	/* we are within the text window, so we	1620	/* we are within the text window, so we
1652	* shouldn't be scrolling	1621	* shouldn't be scrolling
1653	*/	1622	*/
1654	if (sel_scroll_ev.active)
1655	sel_scroll_ev.stop();	1623	sel_scroll_ev.stop();
1656	}	1624	}
1657	#endif	1625	#endif
1658	#ifdef MOUSE_THRESHOLD	1626	#ifdef MOUSE_THRESHOLD
1659	}	1627	}
1660	#endif	1628	#endif
…		…
1672	&ev.xbutton.x, &ev.xbutton.y,	1640	&ev.xbutton.x, &ev.xbutton.y,
1673	&unused_mask);	1641	&unused_mask);
1674	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1642	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1675	scrollbar_size ());	1643	scrollbar_size ());
1676	want_refresh = 1;	1644	want_refresh = 1;
1677	refresh_limit = 0;
1678	scrollbar_show (1);	1645	scrollbar_show (1);
1679	}	1646	}
1680	break;	1647	break;
1681	}	1648	}
1682		1649
1683	#if defined(CURSOR_BLINK)	1650	#if defined(CURSOR_BLINK)
1684	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)	1651	if (option (Opt_cursorBlink) && ev.type == KeyPress)
1685	{	1652	{
1686	if (hidden_cursor)	1653	if (hidden_cursor)
1687	{	1654	{
1688	hidden_cursor = 0;	1655	hidden_cursor = 0;
1689	want_refresh = 1;	1656	want_refresh = 1;
1690	}	1657	}
1691		1658
1692	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);	1659	cursor_blink_ev.again ();
1693	}	1660	}
1694	#endif	1661	#endif
1695		1662
1696	#if defined(POINTER_BLANK)	1663	#if defined(POINTER_BLANK)
1697	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)	1664	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1698	{	1665	{
1699	if (ev.type == MotionNotify	1666	if (ev.type == MotionNotify
1700	|| ev.type == ButtonPress	1667	|| ev.type == ButtonPress
1701	|| ev.type == ButtonRelease)	1668	|| ev.type == ButtonRelease)
1702	if (hidden_pointer)	1669	if (hidden_pointer)
…		…
1704		1671
1705	if (ev.type == KeyPress && hidden_pointer == 0)	1672	if (ev.type == KeyPress && hidden_pointer == 0)
1706	pointer_blank ();	1673	pointer_blank ();
1707	}	1674	}
1708	#endif	1675	#endif
		1676
		1677	refresh_check ();
1709	}	1678	}
1710		1679
1711	void	1680	void
1712	rxvt_term::focus_in ()	1681	rxvt_term::focus_in ()
1713	{	1682	{
…		…
1724	IMSetPosition ();	1693	IMSetPosition ();
1725	XSetICFocus (Input_Context);	1694	XSetICFocus (Input_Context);
1726	}	1695	}
1727	#endif	1696	#endif
1728	#if CURSOR_BLINK	1697	#if CURSOR_BLINK
1729	if (OPTION (Opt_cursorBlink))	1698	if (option (Opt_cursorBlink))
1730	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);	1699	cursor_blink_ev.again ();
1731	#endif	1700	#endif
1732	#if OFF_FOCUS_FADING	1701	#if OFF_FOCUS_FADING
1733	if (rs[Rs_fade])	1702	if (rs[Rs_fade])
1734	{	1703	{
1735	pix_colors = pix_colors_focused;	1704	pix_colors = pix_colors_focused;
1736	scr_recolour ();	1705	scr_recolour ();
1737	}	1706	}
1738	#endif	1707	#endif
		1708	#if ENABLE_FRILLS
		1709	if (option (Opt_urgentOnBell))
		1710	{
		1711	if (XWMHints *h = XGetWMHints(dpy, parent[0]))
		1712	{
		1713	h->flags &= ~XUrgencyHint;
		1714	XSetWMHints (dpy, parent[0], h);
		1715	}
		1716	}
		1717	#endif
1739	}	1718	}
1740	}	1719	}
1741		1720
1742	void	1721	void
1743	rxvt_term::focus_out ()	1722	rxvt_term::focus_out ()
…		…
1751		1730
1752	#if ENABLE_FRILLS || ISO_14755	1731	#if ENABLE_FRILLS || ISO_14755
1753	if (iso14755buf)	1732	if (iso14755buf)
1754	{	1733	{
1755	iso14755buf = 0;	1734	iso14755buf = 0;
1756	# if ENABLE_OVERLAY	1735	# if ISO_14755
1757	scr_overlay_off ();	1736	scr_overlay_off ();
1758	# endif	1737	# endif
1759	}	1738	}
1760	#endif	1739	#endif
1761	#if USE_XIM	1740	#if USE_XIM
1762	if (Input_Context != NULL)	1741	if (Input_Context != NULL)
1763	XUnsetICFocus (Input_Context);	1742	XUnsetICFocus (Input_Context);
1764	#endif	1743	#endif
1765	#if CURSOR_BLINK	1744	#if CURSOR_BLINK
1766	if (OPTION (Opt_cursorBlink))	1745	if (option (Opt_cursorBlink))
1767	cursor_blink_ev.stop ();	1746	cursor_blink_ev.stop ();
		1747
1768	hidden_cursor = 0;	1748	hidden_cursor = 0;
1769	#endif	1749	#endif
1770	#if OFF_FOCUS_FADING	1750	#if OFF_FOCUS_FADING
1771	if (rs[Rs_fade])	1751	if (rs[Rs_fade])
1772	{	1752	{
…		…
1775	}	1755	}
1776	#endif	1756	#endif
1777	}	1757	}
1778	}	1758	}
1779		1759
1780	#if TRANSPARENT	1760	void
		1761	rxvt_term::update_fade_color (unsigned int idx)
		1762	{
		1763	#if OFF_FOCUS_FADING
		1764	if (rs[Rs_fade])
		1765	{
		1766	rgba c;
		1767	pix_colors [Color_fade].get (c);
		1768	pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
		1769	}
		1770	#endif
		1771	}
		1772
		1773	#if ENABLE_TRANSPARENCY || ENABLE_PERL
1781	void	1774	void
1782	rxvt_term::rootwin_cb (XEvent &ev)	1775	rxvt_term::rootwin_cb (XEvent &ev)
1783	{	1776	{
1784	make_current ();	1777	make_current ();
1785		1778
		1779	if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
		1780	&& HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
		1781	return;
		1782
		1783	# if ENABLE_TRANSPARENCY
1786	switch (ev.type)	1784	switch (ev.type)
1787	{	1785	{
1788	case PropertyNotify:	1786	case PropertyNotify:
1789	/*	1787	/*
1790	* if user used some Esetroot compatible prog to set the root bg,	1788	* if user used some Esetroot compatible prog to set the root bg,
1791	* use the property to determine the pixmap. We use it later on.	1789	* use the property to determine the pixmap. We use it later on.
1792	*/	1790	*/
1793	if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]	1791	if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1794	&& ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])	1792	|| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1795	return;	1793	{
1796		1794	bgPixmap.set_root_pixmap ();
1797	/* FALLTHROUGH */	1795	update_background ();
1798	case ReparentNotify:	1796	}
1799	if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1800	want_refresh = want_full_refresh = 1;
1801	break;	1797	break;
1802	}	1798	}
		1799	# endif
		1800
		1801	refresh_check ();
1803	}	1802	}
1804	#endif	1803	#endif
1805		1804
1806	void	1805	void
1807	rxvt_term::button_press (XButtonEvent &ev)	1806	rxvt_term::button_press (XButtonEvent &ev)
…		…
1862	mouse_report (ev);	1861	mouse_report (ev);
1863	}	1862	}
1864	#else	1863	#else
1865	MEvent.button = ev.button;	1864	MEvent.button = ev.button;
1866	mouse_report (ev);	1865	mouse_report (ev);
1867	#endif /* MOUSE_REPORT_DOUBLECLICK */	1866	#endif /* MOUSE_REPORT_DOUBLECLICK */
1868		1867
1869	}	1868	}
1870	else	1869	else
1871	{	1870	{
1872	if (ev.button != MEvent.button)	1871	if (ev.button != MEvent.button)
…		…
1966	tt_printf ("\033[5~");	1965	tt_printf ("\033[5~");
1967	break;	1966	break;
1968	}	1967	}
1969	}	1968	}
1970	else	1969	else
1971	#endif /* NO_SCROLLBAR_REPORT */	1970	#endif /* NO_SCROLLBAR_REPORT */
1972		1971
1973	{	1972	{
1974	char upordown = 0;	1973	char upordown = 0;
1975		1974
1976	if (scrollBar.style == R_SB_NEXT)	1975	if (scrollBar.style == R_SB_NEXT)
1977	{	1976	{
1978	if (scrollbarnext_upButton (ev.y))	1977	if (scrollbarnext_upButton (ev.y))
1979	upordown = -1; /* up */	1978	upordown = -1; /* up */
…		…
1985	if (scrollbarrxvt_upButton (ev.y))	1984	if (scrollbarrxvt_upButton (ev.y))
1986	upordown = -1; /* up */	1985	upordown = -1; /* up */
1987	else if (scrollbarrxvt_dnButton (ev.y))	1986	else if (scrollbarrxvt_dnButton (ev.y))
1988	upordown = 1; /* down */	1987	upordown = 1; /* down */
1989	}	1988	}
		1989
1990	if (upordown)	1990	if (upordown)
1991	{	1991	{
1992	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	1992	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
		1993	if (!cont_scroll_ev.is_active ())
1993	cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);	1994	cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1994	#endif	1995	#endif
1995	if (scr_page (upordown < 0 ? UP : DN, 1))	1996	if (scr_page (upordown < 0 ? UP : DN, 1))
1996	{	1997	{
1997	if (upordown < 0)	1998	if (upordown < 0)
1998	scrollBar.setUp ();	1999	scrollBar.setUp ();
…		…
2078	scrollBar.setIdle ();	2079	scrollBar.setIdle ();
2079	scrollbar_show (0);	2080	scrollbar_show (0);
2080	}	2081	}
2081		2082
2082	#ifdef SELECTION_SCROLLING	2083	#ifdef SELECTION_SCROLLING
2083	if (sel_scroll_ev.active)
2084	sel_scroll_ev.stop();	2084	sel_scroll_ev.stop();
2085	#endif	2085	#endif
2086		2086
2087	if (ev.window == vt)	2087	if (ev.window == vt)
2088	{	2088	{
2089	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))	2089	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
…		…
2113	mouse_report (ev);	2113	mouse_report (ev);
2114	}	2114	}
2115	#else /* MOUSE_REPORT_DOUBLECLICK */	2115	#else /* MOUSE_REPORT_DOUBLECLICK */
2116	MEvent.button = AnyButton;	2116	MEvent.button = AnyButton;
2117	mouse_report (ev);	2117	mouse_report (ev);
2118	#endif /* MOUSE_REPORT_DOUBLECLICK */	2118	#endif /* MOUSE_REPORT_DOUBLECLICK */
2119	return;	2119	return;
2120	}	2120	}
2121		2121
2122	/*	2122	/*
2123	* dumb hack to compensate for the failure of click-and-drag	2123	* dumb hack to compensate for the failure of click-and-drag
…		…
2135	selection_make (ev.time);	2135	selection_make (ev.time);
2136	break;	2136	break;
2137		2137
2138	case Button2:	2138	case Button2:
2139	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?	2139	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2140	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);	2140	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2141	break;	2141	break;
2142		2142
2143	#ifdef MOUSE_WHEEL	2143	#ifdef MOUSE_WHEEL
2144	case Button4:	2144	case Button4:
2145	case Button5:	2145	case Button5:
…		…
2149		2149
2150	v = ev.button == Button4 ? UP : DN;	2150	v = ev.button == Button4 ? UP : DN;
2151		2151
2152	if (ev.state & ShiftMask)	2152	if (ev.state & ShiftMask)
2153	i = 1;	2153	i = 1;
2154	else if (OPTION (Opt_mouseWheelScrollPage))	2154	else if (option (Opt_mouseWheelScrollPage))
2155	i = nrow - 1;	2155	i = nrow - 1;
2156	else	2156	else
2157	i = 5;	2157	i = 5;
2158		2158
2159	# ifdef MOUSE_SLIP_WHEELING	2159	# ifdef MOUSE_SLIP_WHEELING
…		…
2161	{	2161	{
2162	mouse_slip_wheel_speed += v ? -1 : 1;	2162	mouse_slip_wheel_speed += v ? -1 : 1;
2163	if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;	2163	if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2164	if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;	2164	if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2165		2165
2166	if (slip_wheel_ev.at < NOW)	2166	if (!slip_wheel_ev.is_active ())
2167	slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;	2167	slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2168
2169	slip_wheel_ev.start ();
2170	}	2168	}
2171	else	2169	else
2172	{	2170	{
2173	# endif	2171	# endif
2174	scr_page (v, i);	2172	scr_page (v, i);
…		…
2180	break;	2178	break;
2181	#endif	2179	#endif
2182	}	2180	}
2183	}	2181	}
2184	}	2182	}
2185
2186	#ifdef TRANSPARENT
2187	#if TINTING
2188	/* taken from aterm-0.4.2 */
2189
2190	typedef uint32_t RUINT32T;
2191
2192	void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2193	{
2194	int sh_r, sh_g, sh_b;
2195	RUINT32T mask_r, mask_g, mask_b;
2196	RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2197	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2198	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2199	int i;
2200
2201	Visual *visual = term->visual;
2202
2203	if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2204
2205	/* for convenience */
2206	mask_r = visual->red_mask;
2207	mask_g = visual->green_mask;
2208	mask_b = visual->blue_mask;
2209
2210	/* boring lookup table pre-initialization */
2211	switch (srcImage->bits_per_pixel) {
2212	case 15:
2213	if ((mask_r != 0x7c00) ||
2214	(mask_g != 0x03e0) ||
2215	(mask_b != 0x001f))
2216	return;
2217	lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2218	lookup_r = lookup;
2219	lookup_g = lookup+32;
2220	lookup_b = lookup+32+32;
2221	sh_r = 10;
2222	sh_g = 5;
2223	sh_b = 0;
2224	break;
2225	case 16:
2226	if ((mask_r != 0xf800) ||
2227	(mask_g != 0x07e0) ||
2228	(mask_b != 0x001f))
2229	return;
2230	lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2231	lookup_r = lookup;
2232	lookup_g = lookup+32;
2233	lookup_b = lookup+32+64;
2234	sh_r = 11;
2235	sh_g = 5;
2236	sh_b = 0;
2237	break;
2238	case 24:
2239	if ((mask_r != 0xff0000) ||
2240	(mask_g != 0x00ff00) ||
2241	(mask_b != 0x0000ff))
2242	return;
2243	lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2244	lookup_r = lookup;
2245	lookup_g = lookup+256;
2246	lookup_b = lookup+256+256;
2247	sh_r = 16;
2248	sh_g = 8;
2249	sh_b = 0;
2250	break;
2251	case 32:
2252	if ((mask_r != 0xff0000) ||
2253	(mask_g != 0x00ff00) ||
2254	(mask_b != 0x0000ff))
2255	return;
2256	lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2257	lookup_r = lookup;
2258	lookup_g = lookup+256;
2259	lookup_b = lookup+256+256;
2260	sh_r = 16;
2261	sh_g = 8;
2262	sh_b = 0;
2263	break;
2264	default:
2265	return; /* we do not support this color depth */
2266	}
2267
2268	/* prepare limits for color transformation (each channel is handled separately) */
2269	if (shade < 0) {
2270	shade = -shade;
2271	if (shade < 0) shade = 0;
2272	if (shade > 100) shade = 100;
2273
2274	lower_lim_r = 65535-rm;
2275	lower_lim_g = 65535-gm;
2276	lower_lim_b = 65535-bm;
2277
2278	lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2279	lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2280	lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2281
2282	upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2283	} else {
2284	if (shade < 0) shade = 0;
2285	if (shade > 100) shade = 100;
2286
2287	lower_lim_r = lower_lim_g = lower_lim_b = 0;
2288
2289	upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2290	upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2291	upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2292	}
2293
2294	/* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2295	if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2296	{
2297	unsigned int tmp;
2298
2299	tmp = lower_lim_r;
2300	lower_lim_r = lower_lim_b;
2301	lower_lim_b = tmp;
2302
2303	tmp = upper_lim_r;
2304	upper_lim_r = upper_lim_b;
2305	upper_lim_b = tmp;
2306	}
2307
2308	/* fill our lookup tables */
2309	for (i = 0; i <= mask_r>>sh_r; i++)
2310	{
2311	RUINT32T tmp;
2312	tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2313	tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2314	lookup_r[i] = (tmp/65535)<<sh_r;
2315	}
2316	for (i = 0; i <= mask_g>>sh_g; i++)
2317	{
2318	RUINT32T tmp;
2319	tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2320	tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2321	lookup_g[i] = (tmp/65535)<<sh_g;
2322	}
2323	for (i = 0; i <= mask_b>>sh_b; i++)
2324	{
2325	RUINT32T tmp;
2326	tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2327	tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2328	lookup_b[i] = (tmp/65535)<<sh_b;
2329	}
2330
2331	/* apply table to input image (replacing colors by newly calculated ones) */
2332	switch (srcImage->bits_per_pixel)
2333	{
2334	case 15:
2335	{
2336	unsigned short *p1, *pf, *p, *pl;
2337	p1 = (unsigned short *) srcImage->data;
2338	pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2339	while (p1 < pf)
2340	{
2341	p = p1;
2342	pl = p1 + srcImage->width;
2343	for (; p < pl; p++)
2344	{
2345	*p = lookup_r[(*p & 0x7c00)>>10] |
2346	lookup_g[(*p & 0x03e0)>> 5] |
2347	lookup_b[(*p & 0x001f)];
2348	}
2349	p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2350	}
2351	break;
2352	}
2353	case 16:
2354	{
2355	unsigned short *p1, *pf, *p, *pl;
2356	p1 = (unsigned short *) srcImage->data;
2357	pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2358	while (p1 < pf)
2359	{
2360	p = p1;
2361	pl = p1 + srcImage->width;
2362	for (; p < pl; p++)
2363	{
2364	*p = lookup_r[(*p & 0xf800)>>11] |
2365	lookup_g[(*p & 0x07e0)>> 5] |
2366	lookup_b[(*p & 0x001f)];
2367	}
2368	p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2369	}
2370	break;
2371	}
2372	case 24:
2373	{
2374	unsigned char *p1, *pf, *p, *pl;
2375	p1 = (unsigned char *) srcImage->data;
2376	pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2377	while (p1 < pf)
2378	{
2379	p = p1;
2380	pl = p1 + srcImage->width * 3;
2381	for (; p < pl; p += 3)
2382	{
2383	p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2384	p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2385	p[2] = lookup_r[(p[2] & 0x0000ff)];
2386	}
2387	p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2388	}
2389	break;
2390	}
2391	case 32:
2392	{
2393	RUINT32T *p1, *pf, *p, *pl;
2394	p1 = (RUINT32T *) srcImage->data;
2395	pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2396
2397	while (p1 < pf)
2398	{
2399	p = p1;
2400	pl = p1 + srcImage->width;
2401	for (; p < pl; p++)
2402	{
2403	*p = lookup_r[(*p & 0xff0000)>>16] |
2404	lookup_g[(*p & 0x00ff00)>> 8] |
2405	lookup_b[(*p & 0x0000ff)] |
2406	(*p & ~0xffffff);
2407	}
2408	p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2409	}
2410	break;
2411	}
2412	}
2413
2414	free (lookup);
2415	}
2416	#endif
2417
2418	/*
2419	* Check our parents are still who we think they are.
2420	* Do transparency updates if required
2421	*/
2422	int
2423	rxvt_term::check_our_parents ()
2424	{
2425	int i, pchanged, aformat, have_pixmap, rootdepth;
2426	unsigned long nitems, bytes_after;
2427	Atom atype;
2428	unsigned char *prop = NULL;
2429	Window root, oldp, *list;
2430	Pixmap rootpixmap = None;
2431	XWindowAttributes wattr, wrootattr;
2432
2433	pchanged = 0;
2434
2435	if (!OPTION (Opt_transparent))
2436	return pchanged; /* Don't try any more */
2437
2438	XGetWindowAttributes (dpy, display->root, &wrootattr);
2439	rootdepth = wrootattr.depth;
2440
2441	XGetWindowAttributes (dpy, parent[0], &wattr);
2442
2443	if (rootdepth != wattr.depth)
2444	{
2445	if (am_transparent)
2446	{
2447	pchanged = 1;
2448	XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2449	am_transparent = am_pixmap_trans = 0;
2450	}
2451
2452	return pchanged; /* Don't try any more */
2453	}
2454
2455	/* Get all X ops out of the queue so that our information is up-to-date. */
2456	XSync (dpy, False);
2457
2458	/*
2459	* Make the frame window set by the window manager have
2460	* the root background. Some window managers put multiple nested frame
2461	* windows for each client, so we have to take care about that.
2462	*/
2463	i = (xa[XA_XROOTPMAP_ID]
2464	&& XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2465	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2466	&nitems, &bytes_after, &prop) == Success);
2467
2468	if (!i || prop == NULL)
2469	i = (xa[XA_ESETROOT_PMAP_ID]
2470	&& XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2471	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2472	&nitems, &bytes_after, &prop) == Success);
2473
2474	if (!i || prop == NULL
2475	#if TINTING
2476	|| !ISSET_PIXCOLOR (Color_tint)
2477	#endif
2478	)
2479	have_pixmap = 0;
2480	else
2481	{
2482	have_pixmap = 1;
2483	rootpixmap = *(Pixmap *)prop;
2484	XFree (prop);
2485	}
2486
2487	if (have_pixmap)
2488	{
2489	/*
2490	* Copy display->root pixmap transparency
2491	*/
2492	int sx, sy, nx, ny;
2493	unsigned int nw, nh;
2494	Window cr;
2495	XImage *image;
2496	GC gc;
2497	XGCValues gcvalue;
2498
2499	XTranslateCoordinates (dpy, parent[0], display->root,
2500	0, 0, &sx, &sy, &cr);
2501	nw = (unsigned int)szHint.width;
2502	nh = (unsigned int)szHint.height;
2503	nx = ny = 0;
2504
2505	if (sx < 0)
2506	{
2507	nw += sx;
2508	nx = -sx;
2509	sx = 0;
2510	}
2511
2512	if (sy < 0)
2513	{
2514	nh += sy;
2515	ny = -sy;
2516	sy = 0;
2517	}
2518
2519	min_it (nw, (unsigned int) (wrootattr.width - sx));
2520	min_it (nh, (unsigned int) (wrootattr.height - sy));
2521
2522	XSync (dpy, False);
2523	allowedxerror = -1;
2524	image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2525
2526	/* XXX: handle BadMatch - usually because we're outside the pixmap */
2527	/* XXX: may need a delay here? */
2528	allowedxerror = 0;
2529
2530	if (image == NULL)
2531	{
2532	if (am_transparent && am_pixmap_trans)
2533	{
2534	pchanged = 1;
2535	if (pixmap != None)
2536	{
2537	XFreePixmap (dpy, pixmap);
2538	pixmap = None;
2539	}
2540	}
2541
2542	am_pixmap_trans = 0;
2543	}
2544	else
2545	{
2546	if (pixmap != None)
2547	XFreePixmap (dpy, pixmap);
2548
2549	#if TINTING
2550	if (ISSET_PIXCOLOR (Color_tint))
2551	{
2552	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2553
2554	rgba c;
2555	pix_colors_focused [Color_tint].get (c);
2556
2557	ShadeXImage (this, image, shade, c.r, c.g, c.b);
2558	}
2559	#endif
2560
2561	pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2562	gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2563	XPutImage (dpy, pixmap, gc, image, 0, 0,
2564	nx, ny, image->width, image->height);
2565	XFreeGC (dpy, gc);
2566	XDestroyImage (image);
2567	XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2568	XClearWindow (dpy, parent[0]);
2569
2570	if (!am_transparent || !am_pixmap_trans)
2571	pchanged = 1;
2572
2573	am_transparent = am_pixmap_trans = 1;
2574	}
2575	}
2576
2577	if (am_pixmap_trans)
2578	XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2579	else
2580	{
2581	unsigned int n;
2582	/*
2583	* InheritPixmap transparency
2584	*/
2585	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2586	{
2587	oldp = parent[i];
2588	XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2589	XFree (list);
2590
2591	if (parent[i] == display->root)
2592	{
2593	if (oldp != None)
2594	pchanged = 1;
2595
2596	break;
2597	}
2598
2599	if (oldp != parent[i])
2600	pchanged = 1;
2601	}
2602
2603	n = 0;
2604
2605	if (pchanged)
2606	for (; n < (unsigned int)i; n++)
2607	{
2608	XGetWindowAttributes (dpy, parent[n], &wattr);
2609
2610	if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2611	{
2612	n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2613	break;
2614	}
2615	}
2616
2617	if (n > (sizeof (parent) / sizeof (parent[0])))
2618	{
2619	XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2620	XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2621	am_transparent = 0;
2622	/* XXX: also turn off Opt_transparent? */
2623	}
2624	else
2625	{
2626	for (n = 0; n < (unsigned int)i; n++)
2627	{
2628	XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2629	XClearWindow (dpy, parent[n]);
2630	}
2631
2632	XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2633	am_transparent = 1;
2634	}
2635
2636	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2637	parent[i] = None;
2638	}
2639
2640	if (scrollBar.win)
2641	{
2642	XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2643	scrollBar.setIdle ();
2644	scrollbar_show (0);
2645	}
2646
2647	if (am_transparent)
2648	{
2649	want_refresh = want_full_refresh = 1;
2650	if (am_pixmap_trans)
2651	flush ();
2652	}
2653
2654	return pchanged;
2655	}
2656	#endif
2657		2183
2658	/*}}} */	2184	/*}}} */
2659		2185
2660	bool	2186	bool
2661	rxvt_term::cmd_parse ()	2187	rxvt_term::cmd_parse ()
…		…
2710	if (ch == C0_LF)	2236	if (ch == C0_LF)
2711	nlines++;	2237	nlines++;
2712		2238
2713	refresh_count++;	2239	refresh_count++;
2714		2240
2715	if (!OPTION (Opt_jumpScroll)	2241	if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2716	|| (refresh_count >= refresh_limit * (nrow - 1)))
2717	{	2242	{
2718	refreshnow = true;
2719	refresh_count = 0;	2243	refresh_count = 0;
		2244
		2245	if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
		2246	{
		2247	refreshnow = true;
2720	ch = NOCHAR;	2248	ch = NOCHAR;
2721	break;	2249	break;
		2250	}
2722	}	2251	}
2723		2252
2724	// scr_add_lines only works for nlines <= nrow - 1.	2253	// scr_add_lines only works for nlines <= nrow - 1.
2725	if (nlines >= nrow - 1)	2254	if (nlines >= nrow - 1)
2726	{	2255	{
…		…
2754	&& HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))	2283	&& HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2755	scr_add_lines (buf, str - buf, nlines);	2284	scr_add_lines (buf, str - buf, nlines);
2756		2285
2757	/*	2286	/*
2758	* If there have been a lot of new lines, then update the screen	2287	* If there have been a lot of new lines, then update the screen
2759	* What the heck I'll cheat and only refresh less than every page-full.	2288	* What the heck we'll cheat and only refresh less than every page-full.
2760	* the number of pages between refreshes is refresh_limit, which	2289	* if skipScroll is enabled.
2761	* is incremented here because we must be doing flat-out scrolling.
2762	*/	2290	*/
2763	if (refreshnow)	2291	if (refreshnow)
2764	{	2292	{
2765	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2766	refresh_limit++;
2767	else
2768	{
2769	flag = true;	2293	flag = true;
2770	//TODO: due to popular request, implement "skipscroll" option here
2771	scr_refresh ();	2294	scr_refresh ();
2772	want_refresh = 1;	2295	want_refresh = 1;
2773	}
2774	}	2296	}
2775		2297
2776	}	2298	}
2777	else	2299	else
2778	{	2300	{
…		…
2788	}	2310	}
2789		2311
2790	ch = NOCHAR;	2312	ch = NOCHAR;
2791	}	2313	}
2792	}	2314	}
		2315
		2316	refresh_check ();
2793		2317
2794	return flag;	2318	return flag;
2795	}	2319	}
2796		2320
2797	// read the next character	2321	// read the next character
…		…
2927	{	2451	{
2928	if ((buf[len++] = cmd_getc ()) == 'i')	2452	if ((buf[len++] = cmd_getc ()) == 'i')
2929	break; /* done = 1 */	2453	break; /* done = 1 */
2930	}	2454	}
2931	}	2455	}
2932		2456
2933	for (i = 0; i < len; i++)	2457	for (i = 0; i < len; i++)
2934	if (putc (buf[i], fd) == EOF)	2458	if (putc (buf[i], fd) == EOF)
2935	{	2459	{
2936	done = 1;	2460	done = 1;
2937	break;	2461	break;
…		…
2939	}	2463	}
2940	}	2464	}
2941		2465
2942	pclose_printer (fd);	2466	pclose_printer (fd);
2943	}	2467	}
2944	#endif /* PRINTPIPE */	2468	#endif /* PRINTPIPE */
2945	/*}}} */	2469	/*}}} */
2946		2470
2947	/* *INDENT-OFF* */	2471	/* *INDENT-OFF* */
2948	enum {	2472	enum {
2949	C1_40 = 0x40,	2473	C1_40 = 0x40,
…		…
2999	process_dcs_seq ();	2523	process_dcs_seq ();
3000	break;	2524	break;
3001	case 0x9b: /* CSI */	2525	case 0x9b: /* CSI */
3002	process_csi_seq ();	2526	process_csi_seq ();
3003	break;	2527	break;
3004	case 0x9d: /* CSI */	2528	case 0x9d: /* OSC */
3005	process_osc_seq ();	2529	process_osc_seq ();
3006	break;	2530	break;
3007	#endif	2531	#endif
3008	}	2532	}
3009	}	2533	}
…		…
3235	rxvt_term::process_csi_seq ()	2759	rxvt_term::process_csi_seq ()
3236	{	2760	{
3237	unicode_t ch, priv, i;	2761	unicode_t ch, priv, i;
3238	unsigned int nargs, p;	2762	unsigned int nargs, p;
3239	int n, ndef;	2763	int n, ndef;
3240	int arg[ESC_ARGS];	2764	int arg[ESC_ARGS] = { };
3241		2765
3242	for (nargs = ESC_ARGS; nargs > 0;)	2766	nargs = 0;
3243	arg[--nargs] = 0;
3244		2767
3245	priv = 0;	2768	priv = 0;
3246	ch = cmd_getc ();	2769	ch = cmd_getc ();
3247	if (ch >= '<' && ch <= '?')	2770	if (ch >= '<' && ch <= '?')
		2771	{
3248	{ /* '<' '=' '>' '?' */	2772	/* '<' '=' '>' '?' */
3249	priv = ch;	2773	priv = ch;
3250	ch = cmd_getc ();	2774	ch = cmd_getc ();
3251	}	2775	}
3252		2776
3253	/* read any numerical arguments */	2777	/* read any numerical arguments */
…		…
3292	switch (priv)	2816	switch (priv)
3293	{	2817	{
3294	case '>':	2818	case '>':
3295	if (ch == CSI_DA) /* secondary device attributes */	2819	if (ch == CSI_DA) /* secondary device attributes */
3296	{	2820	{
3297	// first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,	2821	// first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
3298	// 'U' for rxvt-unicode != 7.[34] (where it was broken).	2822	// 'U' for rxvt-unicode != 7.[34] (where it was broken).
3299	//	2823	//
3300	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt	2824	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3301	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify	2825	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
3302	// that we do not support xterm mouse reporting (should be 95 when we do).	2826	// versions.
3303	//	2827	//
3304	tt_printf ("\033[>%d;94;0c", 'U');	2828	tt_printf ("\033[>%d;95;0c", 'U');
3305	}	2829	}
3306	break;	2830	break;
3307	case '?':	2831	case '?':
3308	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')	2832	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3309	process_terminal_mode (ch, priv, nargs, arg);	2833	process_terminal_mode (ch, priv, nargs, arg);
…		…
3436	break;	2960	break;
3437	case 6: /* CPR requested */	2961	case 6: /* CPR requested */
3438	scr_report_position ();	2962	scr_report_position ();
3439	break;	2963	break;
3440	case 7: /* unofficial extension */	2964	case 7: /* unofficial extension */
3441	if (OPTION (Opt_insecure))	2965	if (option (Opt_insecure))
3442	tt_printf ("%-.250s\012", rs[Rs_display_name]);	2966	tt_printf ("%-.250s\012", rs[Rs_display_name]);
3443	break;	2967	break;
3444	case 8: /* unofficial extension */	2968	case 8: /* unofficial extension */
3445	process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);	2969	process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3446	break;	2970	break;
…		…
3610	break;	3134	break;
3611	case 20: /* report icon label */	3135	case 20: /* report icon label */
3612	{	3136	{
3613	char *s;	3137	char *s;
3614	XGetIconName (dpy, parent[0], &s);	3138	XGetIconName (dpy, parent[0], &s);
3615	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3139	tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3616	XFree (s);	3140	XFree (s);
3617	}	3141	}
3618	break;	3142	break;
3619	case 21: /* report window title */	3143	case 21: /* report window title */
3620	{	3144	{
3621	char *s;	3145	char *s;
3622	XFetchName (dpy, parent[0], &s);	3146	XFetchName (dpy, parent[0], &s);
3623	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3147	tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3624	XFree (s);	3148	XFree (s);
3625	}	3149	}
3626	break;	3150	break;
3627	}	3151	}
3628	}	3152	}
…		…
3655	seen_esc = true;	3179	seen_esc = true;
3656	continue;	3180	continue;
3657	}	3181	}
3658	else if (ch == C0_BEL || ch == CHAR_ST)	3182	else if (ch == C0_BEL || ch == CHAR_ST)
3659	break;	3183	break;
		3184	else if (ch == C0_SYN)
		3185	ch = cmd_get8 ();
3660	else if (ch < 0x20)	3186	else if (ch < 0x20)
3661	return NULL; /* other control character - exit */	3187	return NULL; /* other control character - exit */
3662		3188
3663	seen_esc = false;	3189	seen_esc = false;
3664		3190
3665	if (n >= STRING_MAX - 1)	3191	if (n >= STRING_MAX - 1)
3666	// stop at some sane length	3192	// stop at some sane length
3667	return NULL;	3193	return NULL;
3668		3194
3669	if (ch == C0_SYN)
3670	string[n++] = cmd_get8 ();
3671	else
3672	string[n++] = ch;	3195	string[n++] = ch;
3673	}	3196	}
3674		3197
3675	string[n++] = '\0';	3198	string[n++] = '\0';
3676		3199
3677	ends_how = (ch == 0x5c ? C0_ESC : ch);	3200	ends_how = (ch == 0x5c ? C0_ESC : ch);
…		…
3756	int saveop = op;	3279	int saveop = op;
3757		3280
3758	dLocal (Display *, dpy);	3281	dLocal (Display *, dpy);
3759		3282
3760	assert (str != NULL);	3283	assert (str != NULL);
		3284
		3285	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
		3286	return;
		3287
3761	switch (op)	3288	switch (op)
3762	{	3289	{
3763	case XTerm_name:	3290	case XTerm_name:
3764	set_title (str);	3291	set_title (str);
3765	/* FALLTHROUGH */	3292	/* FALLTHROUGH */
…		…
3857	break;	3384	break;
3858	case URxvt_Color_IT:	3385	case URxvt_Color_IT:
3859	process_color_seq (op, Color_IT, str, resp);	3386	process_color_seq (op, Color_IT, str, resp);
3860	break;	3387	break;
3861	#endif	3388	#endif
3862	#if TRANSPARENT && TINTING	3389	#if ENABLE_TRANSPARENCY
3863	case URxvt_Color_tint:	3390	case URxvt_Color_tint:
3864	process_color_seq (op, Color_tint, str, resp);	3391	process_color_seq (op, Color_tint, str, resp);
		3392	{
		3393	bool changed = false;
		3394	if (ISSET_PIXCOLOR (Color_tint))
		3395	changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
		3396	else
		3397	changed = bgPixmap.unset_tint ();
		3398	if (changed)
		3399	update_background ();
		3400	}
3865		3401
3866	check_our_parents ();
3867
3868	if (am_transparent)
3869	want_full_refresh = want_refresh = 1;
3870
3871	break;	3402	break;
3872	#endif	3403	#endif
3873		3404
		3405	#if BG_IMAGE_FROM_FILE
3874	case Rxvt_Pixmap:	3406	case Rxvt_Pixmap:
3875	{	3407	if (!strcmp (str, "?"))
3876	if (*str != ';')
3877	{	3408	{
3878	#if XPM_BACKGROUND	3409	char str[256];
3879	scale_pixmap (""); /* reset to default scaling */	3410
3880	set_bgPixmap (str); /* change pixmap */	3411	sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3881	scr_touch (true);	3412	min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3882	#endif	3413	min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
		3414	process_xterm_seq (XTerm_title, str, CHAR_ST);
3883	}	3415	}
3884		3416	else
		3417	{
3885	int changed = 0;	3418	int changed = 0;
3886		3419
3887	while ((str = strchr (str, ';')) != NULL)	3420	if (*str != ';')
3888	{	3421	{
		3422	/* reset to default scaling :*/
		3423	bgPixmap.unset_geometry ();
		3424	if (bgPixmap.set_file (str)) /* change pixmap */
		3425	changed++;
		3426	str = strchr (str, ';');
		3427	if (str == NULL)
		3428	bgPixmap.set_defaultGeometry ();
		3429	}
		3430	while (str)
		3431	{
3889	str++;	3432	str++;
3890	#if XPM_BACKGROUND	3433	if (bgPixmap.set_geometry (str))
3891	changed += scale_pixmap (str);	3434	changed++;
3892	#endif	3435	str = strchr (str, ';');
3893	}	3436	}
3894
3895	if (changed)	3437	if (changed)
3896	{	3438	update_background ();
3897	#ifdef XPM_BACKGROUND
3898	resize_pixmap ();
3899	scr_touch (true);
3900	#endif
3901	}	3439	}
3902	}
3903	break;	3440	break;
		3441	#endif
3904		3442
3905	case Rxvt_restoreFG:	3443	case Rxvt_restoreFG:
3906	set_window_color (Color_fg, str);	3444	set_window_color (Color_fg, str);
3907	break;	3445	break;
3908	case Rxvt_restoreBG:	3446	case Rxvt_restoreBG:
…		…
3933	case URxvt_italicFont:	3471	case URxvt_italicFont:
3934	case URxvt_boldItalicFont:	3472	case URxvt_boldItalicFont:
3935	#endif	3473	#endif
3936	if (query)	3474	if (query)
3937	tt_printf ("\33]%d;%-.250s%c", saveop,	3475	tt_printf ("\33]%d;%-.250s%c", saveop,
3938	OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc	3476	option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3939	? fontset[op - URxvt_font]->fontdesc : "",	3477	? fontset[op - URxvt_font]->fontdesc : "",
3940	resp);	3478	resp);
3941	else	3479	else
3942	{	3480	{
3943	const char *&res = rs[Rs_font + (op - URxvt_font)];	3481	const char *&res = rs[Rs_font + (op - URxvt_font)];
…		…
3957	break;	3495	break;
3958		3496
3959	#if !ENABLE_MINIMAL	3497	#if !ENABLE_MINIMAL
3960	case URxvt_locale:	3498	case URxvt_locale:
3961	if (query)	3499	if (query)
3962	tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);	3500	tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3963	else	3501	else
3964	{	3502	{
3965	set_locale (str);	3503	set_locale (str);
3966	pty->set_utf8_mode (enc_utf8);	3504	pty->set_utf8_mode (enc_utf8);
3967	init_xlocale ();	3505	init_xlocale ();
…		…
3982	break;	3520	break;
3983	#endif	3521	#endif
3984		3522
3985	#if ENABLE_PERL	3523	#if ENABLE_PERL
3986	case URxvt_perl:	3524	case URxvt_perl:
3987	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))	3525	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3988	; // no responses yet	3526	; // no responses yet
3989	break;	3527	break;
3990	#endif	3528	#endif
3991	}	3529	}
3992	}	3530	}
…		…
4030	{	3568	{
4031	unsigned int i, j;	3569	unsigned int i, j;
4032	int state;	3570	int state;
4033		3571
4034	static const struct	3572	static const struct
4035	{	3573	{
4036	const int argval;	3574	const int argval;
4037	const unsigned long bit;	3575	const unsigned long bit;
4038	}
4039
4040	argtopriv[] = {	3576	} argtopriv[] = {
4041	{ 1, PrivMode_aplCUR },	3577	{ 1, PrivMode_aplCUR },
4042	{ 2, PrivMode_vt52 },	3578	{ 2, PrivMode_vt52 },
4043	{ 3, PrivMode_132 },	3579	{ 3, PrivMode_132 },
4044	{ 4, PrivMode_smoothScroll },	3580	{ 4, PrivMode_smoothScroll },
4045	{ 5, PrivMode_rVideo },	3581	{ 5, PrivMode_rVideo },
…		…
4061	{ 66, PrivMode_aplKP },	3597	{ 66, PrivMode_aplKP },
4062	#ifndef NO_BACKSPACE_KEY	3598	#ifndef NO_BACKSPACE_KEY
4063	{ 67, PrivMode_BackSpace },	3599	{ 67, PrivMode_BackSpace },
4064	#endif	3600	#endif
4065	{ 1000, PrivMode_MouseX11 },	3601	{ 1000, PrivMode_MouseX11 },
4066	// 1001 Use Hilite Mouse Tracking. NYI, TODO	3602	{ 1002, PrivMode_MouseBtnEvent },
4067	// 1002 Use Cell Motion Mouse Tracking. NYI, TODO	3603	{ 1003, PrivMode_MouseAnyEvent },
4068	// 1003 Use All Motion Mouse Tracking. NYI, TODO
4069	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension	3604	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension
4070	{ 1011, PrivMode_Keypress }, // rxvt extension	3605	{ 1011, PrivMode_Keypress }, // rxvt extension
4071	// 1035 enable modifiers for alt, numlock NYI	3606	// 1035 enable modifiers for alt, numlock NYI
4072	// 1036 send ESC for meta keys NYI	3607	// 1036 send ESC for meta keys NYI
4073	// 1037 send DEL for keypad delete NYI	3608	// 1037 send DEL for keypad delete NYI
…		…
4108	scr_touch (true);	3643	scr_touch (true);
4109	break;	3644	break;
4110	#endif	3645	#endif
4111	case 1048: /* alternative cursor save */	3646	case 1048: /* alternative cursor save */
4112	case 1049:	3647	case 1049:
4113	if (OPTION (Opt_secondaryScreen))	3648	if (option (Opt_secondaryScreen))
4114	if (mode == 0)	3649	if (mode == 0)
4115	scr_cursor (RESTORE);	3650	scr_cursor (RESTORE);
4116	else if (mode == 1)	3651	else if (mode == 1)
4117	scr_cursor (SAVE);	3652	scr_cursor (SAVE);
4118	break;	3653	break;
…		…
4147	scr_autowrap (state);	3682	scr_autowrap (state);
4148	break;	3683	break;
4149	/* case 8: - auto repeat, can't do on a per window basis */	3684	/* case 8: - auto repeat, can't do on a per window basis */
4150	case 9: /* X10 mouse reporting */	3685	case 9: /* X10 mouse reporting */
4151	if (state) /* orthogonal */	3686	if (state) /* orthogonal */
4152	priv_modes &= ~PrivMode_MouseX11;	3687	priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4153	break;	3688	break;
4154	#ifdef scrollBar_esc	3689	#ifdef scrollBar_esc
4155	case scrollBar_esc:	3690	case scrollBar_esc:
4156	if (scrollbar_mapping (state))	3691	if (scrollbar_mapping (state))
4157	{	3692	{
…		…
4170	break;	3705	break;
4171	/* case 66: - application key pad */	3706	/* case 66: - application key pad */
4172	/* case 67: - backspace key */	3707	/* case 67: - backspace key */
4173	case 1000: /* X11 mouse reporting */	3708	case 1000: /* X11 mouse reporting */
4174	if (state) /* orthogonal */	3709	if (state) /* orthogonal */
4175	priv_modes &= ~PrivMode_MouseX10;	3710	priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4176	break;	3711	break;
4177	#if 0
4178	case 1001:	3712	case 1002:
4179	break; /* X11 mouse highlighting */	3713	case 1003:
4180	#endif	3714	if (state)
		3715	{
		3716	priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
		3717	priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
		3718	vt_emask_mouse = PointerMotionMask;
		3719	}
		3720	else
		3721	vt_emask_mouse = NoEventMask;
		3722	vt_select_input ();
		3723	break;
4181	case 1010: /* scroll to bottom on TTY output inhibit */	3724	case 1010: /* scroll to bottom on TTY output inhibit */
4182	set_option (Opt_scrollTtyOutput, !state);	3725	set_option (Opt_scrollTtyOutput, !state);
4183	break;	3726	break;
4184	case 1011: /* scroll to bottom on key press */	3727	case 1011: /* scroll to bottom on key press */
4185	set_option (Opt_scrollTtyKeypress, state);	3728	set_option (Opt_scrollTtyKeypress, state);
4186	break;	3729	break;
4187	case 1047: /* secondary screen w/ clearing last */	3730	case 1047: /* secondary screen w/ clearing last */
4188	if (OPTION (Opt_secondaryScreen))	3731	if (option (Opt_secondaryScreen))
4189	if (current_screen != PRIMARY)	3732	if (current_screen != PRIMARY)
4190	scr_erase_screen (2);	3733	scr_erase_screen (2);
4191	scr_change_screen (state);	3734	scr_change_screen (state);
4192	break;	3735	break;
4193	case 1049: /* secondary screen w/ clearing first */	3736	case 1049: /* secondary screen w/ clearing first */
4194	scr_change_screen (state);	3737	scr_change_screen (state);
4195	if (OPTION (Opt_secondaryScreen))	3738	if (option (Opt_secondaryScreen))
4196	if (current_screen != PRIMARY)	3739	if (current_screen != PRIMARY)
4197	scr_erase_screen (2);	3740	scr_erase_screen (2);
4198	break;	3741	break;
4199	default:	3742	default:
4200	break;	3743	break;
…		…
4362	rxvt_term::process_graphics ()	3905	rxvt_term::process_graphics ()
4363	{	3906	{
4364	unicode_t ch, cmd = cmd_getc ();	3907	unicode_t ch, cmd = cmd_getc ();
4365		3908
4366	if (cmd == 'Q')	3909	if (cmd == 'Q')
		3910	{
4367	{ /* query graphics */	3911	/* query graphics */
4368	tt_printf ("\033G0\012"); /* no graphics */	3912	tt_printf ("\033G0\012"); /* no graphics */
4369	return;	3913	return;
4370	}	3914	}
4371	/* swallow other graphics sequences until terminating ':' */	3915	/* swallow other graphics sequences until terminating ':' */
4372	do	3916	do
…		…
4422	v_buffer = (char *)realloc (v_buffer, v_buflen + len);	3966	v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4423		3967
4424	memcpy (v_buffer + v_buflen, data, len);	3968	memcpy (v_buffer + v_buflen, data, len);
4425	v_buflen += len;	3969	v_buflen += len;
4426		3970
4427	pty_ev.set (EVENT_READ | EVENT_WRITE);	3971	pty_ev.set (ev::READ | ev::WRITE);
4428	}	3972	}
4429		3973
4430	void rxvt_term::pty_write ()	3974	void rxvt_term::pty_write ()
4431	{	3975	{
4432	int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));	3976	int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
…		…
4437		3981
4438	if (v_buflen == 0)	3982	if (v_buflen == 0)
4439	{	3983	{
4440	free (v_buffer);	3984	free (v_buffer);
4441	v_buffer = 0;	3985	v_buffer = 0;
4442	v_buflen = 0;
4443		3986
4444	pty_ev.set (EVENT_READ);	3987	pty_ev.set (ev::READ);
4445	return;	3988	return;
4446	}	3989	}
4447		3990
4448	memmove (v_buffer, v_buffer + written, v_buflen);	3991	memmove (v_buffer, v_buffer + written, v_buflen);
4449	}	3992	}
4450	else if (written != -1 || (errno != EAGAIN && errno != EINTR))	3993	else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4451	pty_ev.set (EVENT_READ);	3994	pty_ev.set (ev::READ);
4452	}	3995	}
4453		3996
4454	/*----------------------- end-of-file (C source) -----------------------*/	3997	/*----------------------- end-of-file (C source) -----------------------*/
4455		3998

Diff Legend

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