[ViewVC] Diff of: cvs/rxvt-unicode/src/command.C

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.333 by ayin, Tue Jun 26 09:55:22 2007 UTC vs.
Revision 1.388 by ayin, Mon Dec 31 01:16:47 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	* Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
31	*	32	*
32	* This program is free software; you can redistribute it and/or modify	33	* 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	34	* 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	35	* the Free Software Foundation; either version 2 of the License, or
35	* (at your option) any later version.	36	* (at your option) any later version.
…		…
95	XK_Shift_L, 0x21e7,	96	XK_Shift_L, 0x21e7,
96	XK_Shift_R, 0x21e7,	97	XK_Shift_R, 0x21e7,
97		98
98	XK_Shift_Lock, 0x21eb,	99	XK_Shift_Lock, 0x21eb,
99	XK_ISO_Lock, 0x21eb,	100	XK_ISO_Lock, 0x21eb,
100	XK_ISO_Lock, 0x21eb,
101	XK_Caps_Lock, 0x21ec,	101	XK_Caps_Lock, 0x21ec,
102	XK_Num_Lock, 0x21ed,	102	XK_Num_Lock, 0x21ed,
103	XK_ISO_Level3_Shift, 0x21ee,	103	XK_ISO_Level3_Shift, 0x21ee,
104	XK_ISO_Level3_Lock, 0x21ef,	104	XK_ISO_Level3_Lock, 0x21ef,
105	XK_ISO_Group_Lock, 0x21f0,	105	XK_ISO_Group_Lock, 0x21f0,
…		…
199	r & RS_Uline ? " uline" : "",	199	r & RS_Uline ? " uline" : "",
200	r & RS_Careful ? " careful" : "");	200	r & RS_Careful ? " careful" : "");
201		201
202	int width = wcswidth (fname, wcslen (fname));	202	int width = wcswidth (fname, wcslen (fname));
203		203
204	max_it (width, 8+5); // for char + hey	204	max_it (width, 8+5); // for char + hex
205	max_it (width, strlen (attr));	205	max_it (width, strlen (attr));
206		206
207	if (y >= 0)	207	if (y >= 0)
208	{	208	{
209	y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;	209	y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
…		…
221	ch = *chr++;	221	ch = *chr++;
222		222
223	sprintf (buf, "%8x", ch);	223	sprintf (buf, "%8x", ch);
224	scr_overlay_set (0, y, buf);	224	scr_overlay_set (0, y, buf);
225	scr_overlay_set (9, y, '=');	225	scr_overlay_set (9, y, '=');
226	# if !UNICODE3	226	# if !UNICODE_3
227	if (ch >= 0x10000)	227	if (ch >= 0x10000)
228	ch = 0xfffd;	228	ch = 0xfffd;
229	# endif	229	# endif
230	scr_overlay_set (11, y, ch, r);	230	scr_overlay_set (11, y, ch, r);
231		231
…		…
519	# endif	519	# endif
520	return;	520	return;
521	}	521	}
522	else	522	else
523	{	523	{
524	# if ENABLE_OVERLAY	524	# if ISO_14755
525	scr_overlay_off ();	525	scr_overlay_off ();
526	# endif	526	# endif
527	iso14755buf = 0;	527	iso14755buf = 0;
528	}	528	}
529	}	529	}
530	else if ((ctrl && (keysym == XK_Shift_L \|\| keysym == XK_Shift_R))	530	else if ((ctrl && (keysym == XK_Shift_L \|\| keysym == XK_Shift_R))
531	\|\| (shft && (keysym == XK_Control_L \|\| keysym == XK_Control_R)))	531	\|\| (shft && (keysym == XK_Control_L \|\| keysym == XK_Control_R)))
532	if (!(iso14755buf & ISO_14755_STARTED))	532	if (!(iso14755buf & ISO_14755_STARTED))
533	{	533	{
534	iso14755buf \|= ISO_14755_STARTED;	534	iso14755buf \|= ISO_14755_STARTED;
535	# if ENABLE_OVERLAY	535	# if ISO_14755
536	scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);	536	scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
537	scr_overlay_set (0, 0, "ISO 14755 mode");	537	scr_overlay_set (0, 0, "ISO 14755 mode");
538	# endif	538	# endif
539	}	539	}
540	#endif	540	#endif
…		…
548	#endif	548	#endif
549		549
550	if (keysym >= 0xFF00 && keysym <= 0xFFFF)	550	if (keysym >= 0xFF00 && keysym <= 0xFFFF)
551	{	551	{
552	{	552	{
		553	bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
553	newlen = 1;	554	newlen = 1;
		555	#ifdef XK_KP_Home
		556	static const KeySym keypadtrans[] = {
		557	XK_KP_7, // XK_KP_Home
		558	XK_KP_4, // XK_KP_Left
		559	XK_KP_8, // XK_KP_Up
		560	XK_KP_6, // XK_KP_Right
		561	XK_KP_2, // XK_KP_Down
		562	#ifndef UNSHIFTED_SCROLLKEYS
		563	XK_KP_9, // XK_KP_Prior
		564	XK_KP_3, // XK_KP_Next
		565	#else
		566	XK_Prior,
		567	XK_Next,
		568	#endif
		569	XK_KP_1, // XK_KP_End
		570	XK_KP_5, // XK_KP_Begin
		571	};
		572
		573	if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
		574	{
		575	unsigned int index = keysym - XK_KP_Home;
		576	keysym = kp ? keypadtrans[index] : XK_Home + index;
		577	}
		578	else if (keysym == XK_KP_Insert)
		579	keysym = kp ? XK_KP_0 : XK_Insert;
		580	#ifndef NO_DELETE_KEY
		581	else if (keysym == XK_KP_Delete)
		582	keysym = kp ? XK_KP_Decimal : XK_Delete;
		583	#endif
		584	#endif
554	switch (keysym)	585	switch (keysym)
555	{	586	{
556	#ifndef NO_BACKSPACE_KEY	587	#ifndef NO_BACKSPACE_KEY
557	case XK_BackSpace:	588	case XK_BackSpace:
558	if (priv_modes & PrivMode_HaveBackSpace)	589	if (priv_modes & PrivMode_HaveBackSpace)
…		…
560	kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)	591	kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
561	^ !!ctrl) ? '\b' : '\177';	592	^ !!ctrl) ? '\b' : '\177';
562	kbuf[1] = '\0';	593	kbuf[1] = '\0';
563	}	594	}
564	else	595	else
565	strcpy (kbuf, key_backspace);	596	strcpy (kbuf, rs[Rs_backspace_key]);
566	break;	597	break;
567	#endif	598	#endif
568	#ifndef NO_DELETE_KEY	599	#ifndef NO_DELETE_KEY
569	# ifdef XK_KP_Prior
570	case XK_KP_Delete:
571	/* allow shift to override */
572	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
573	{
574	strcpy (kbuf, "\033On");
575	break;
576	}
577	/* FALLTHROUGH */
578	# endif
579	case XK_Delete:	600	case XK_Delete:
580	strcpy (kbuf, key_delete);	601	strcpy (kbuf, rs[Rs_delete_key]);
581	break;	602	break;
582	#endif	603	#endif
583	case XK_Tab:	604	case XK_Tab:
584	if (shft)	605	if (shft)
585	strcpy (kbuf, "\033[Z");	606	strcpy (kbuf, "\033[Z");
…		…
595	#endif	616	#endif
596	newlen = 0;	617	newlen = 0;
597	}	618	}
598	break;	619	break;
599		620
600	#ifdef XK_KP_Left
601	case XK_KP_Up: /* \033Ox or standard */
602	case XK_KP_Down: /* \033Or or standard */
603	case XK_KP_Right: /* \033Ov or standard */
604	case XK_KP_Left: /* \033Ot or standard */
605	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
606	{
607	strcpy (kbuf, "\033OZ");
608	kbuf[2] = "txvr"[keysym - XK_KP_Left];
609	break;
610	}
611	else
612	/* translate to std. cursor key */
613	keysym = XK_Left + (keysym - XK_KP_Left);
614	/* FALLTHROUGH */
615	#endif
616	case XK_Up: /* "\033[A" */	621	case XK_Up: /* "\033[A" */
617	case XK_Down: /* "\033[B" */	622	case XK_Down: /* "\033[B" */
618	case XK_Right: /* "\033[C" */	623	case XK_Right: /* "\033[C" */
619	case XK_Left: /* "\033[D" */	624	case XK_Left: /* "\033[D" */
620	strcpy (kbuf, "\033[Z");	625	strcpy (kbuf, "\033[Z");
…		…
630	else if (priv_modes & PrivMode_aplCUR)	635	else if (priv_modes & PrivMode_aplCUR)
631	kbuf[1] = 'O';	636	kbuf[1] = 'O';
632	break;	637	break;
633		638
634	#ifndef UNSHIFTED_SCROLLKEYS	639	#ifndef UNSHIFTED_SCROLLKEYS
635	# ifdef XK_KP_Prior
636	case XK_KP_Prior:
637	/* allow shift to override */
638	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
639	{
640	strcpy (kbuf, "\033Oy");
641	break;
642	}
643	/* FALLTHROUGH */
644	# endif
645	case XK_Prior:	640	case XK_Prior:
646	strcpy (kbuf, "\033[5~");	641	strcpy (kbuf, "\033[5~");
647	break;	642	break;
648	# ifdef XK_KP_Next
649	case XK_KP_Next:
650	/* allow shift to override */
651	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
652	{
653	strcpy (kbuf, "\033Os");
654	break;
655	}
656	/* FALLTHROUGH */
657	# endif
658	case XK_Next:	643	case XK_Next:
659	strcpy (kbuf, "\033[6~");	644	strcpy (kbuf, "\033[6~");
660	break;	645	break;
661	#endif	646	#endif
662	case XK_KP_Enter:	647	case XK_KP_Enter:
663	/* allow shift to override */	648	/* allow shift to override */
664	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)	649	if (kp)
665	{	650	{
666	strcpy (kbuf, "\033OM");	651	strcpy (kbuf, "\033OM");
667	break;	652	break;
668	}	653	}
669		654
…		…
681	kbuf[0] = '\015';	666	kbuf[0] = '\015';
682	kbuf[1] = '\0';	667	kbuf[1] = '\0';
683	}	668	}
684	break;	669	break;
685		670
686	#ifdef XK_KP_Begin
687	case XK_KP_Begin:
688	strcpy (kbuf, "\033Ou");
689	break;
690
691	#endif
692	case XK_KP_F1: /* "\033OP" */	671	case XK_KP_F1: /* "\033OP" */
693	case XK_KP_F2: /* "\033OQ" */	672	case XK_KP_F2: /* "\033OQ" */
694	case XK_KP_F3: /* "\033OR" */	673	case XK_KP_F3: /* "\033OR" */
695	case XK_KP_F4: /* "\033OS" */	674	case XK_KP_F4: /* "\033OS" */
696	strcpy (kbuf, "\033OP");	675	strcpy (kbuf, "\033OP");
…		…
712	case XK_KP_6: /* "\033Ov" : "6" */	691	case XK_KP_6: /* "\033Ov" : "6" */
713	case XK_KP_7: /* "\033Ow" : "7" */	692	case XK_KP_7: /* "\033Ow" : "7" */
714	case XK_KP_8: /* "\033Ox" : "8" */	693	case XK_KP_8: /* "\033Ox" : "8" */
715	case XK_KP_9: /* "\033Oy" : "9" */	694	case XK_KP_9: /* "\033Oy" : "9" */
716	/* allow shift to override */	695	/* allow shift to override */
717	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)	696	if (kp)
718	{	697	{
719	strcpy (kbuf, "\033Oj");	698	strcpy (kbuf, "\033Oj");
720	kbuf[2] += (keysym - XK_KP_Multiply);	699	kbuf[2] += (keysym - XK_KP_Multiply);
721	}	700	}
722	else	701	else
…		…
728		707
729	case XK_Find:	708	case XK_Find:
730	strcpy (kbuf, "\033[1~");	709	strcpy (kbuf, "\033[1~");
731	break;	710	break;
732		711
733	#ifdef XK_KP_End
734	case XK_KP_Insert:
735	/* allow shift to override */
736	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
737	{
738	strcpy (kbuf, "\033Op");
739	break;
740	}
741	/* FALLTHROUGH */
742	#endif
743	case XK_Insert:	712	case XK_Insert:
744	strcpy (kbuf, "\033[2~");	713	strcpy (kbuf, "\033[2~");
745	break;	714	break;
746	#ifdef DXK_Remove /* support for DEC remove like key */	715	#ifdef DXK_Remove /* support for DEC remove like key */
747	case DXK_Remove:	716	case DXK_Remove:
…		…
751	strcpy (kbuf, "\033[3~");	720	strcpy (kbuf, "\033[3~");
752	break;	721	break;
753	case XK_Select:	722	case XK_Select:
754	strcpy (kbuf, "\033[4~");	723	strcpy (kbuf, "\033[4~");
755	break;	724	break;
756	#ifdef XK_KP_End
757	case XK_KP_End:
758	/* allow shift to override */
759	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
760	{
761	strcpy (kbuf, "\033Oq");
762	break;
763	}
764	/* FALLTHROUGH */
765	#endif
766	case XK_End:	725	case XK_End:
767	strcpy (kbuf, KS_END);	726	strcpy (kbuf, KS_END);
768	break;	727	break;
769	#ifdef XK_KP_Home
770	case XK_KP_Home:
771	/* allow shift to override */
772	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
773	{
774	strcpy (kbuf, "\033Ow");
775	break;
776	}
777	/* FALLTHROUGH */
778	#endif
779	case XK_Home:	728	case XK_Home:
780	strcpy (kbuf, KS_HOME);	729	strcpy (kbuf, KS_HOME);
781	break;	730	break;
782		731
783	#define FKEY(n, fkey) \	732	#define FKEY(n, fkey) \
…		…
934	#if ENABLE_FRILLS \|\| ISO_14755	883	#if ENABLE_FRILLS \|\| ISO_14755
935	// ISO 14755 support	884	// ISO 14755 support
936	if (iso14755buf)	885	if (iso14755buf)
937	if (iso14755buf & ISO_14755_52)	886	if (iso14755buf & ISO_14755_52)
938	{	887	{
939	# if ENABLE_OVERLAY	888	# if ISO_14755
940	scr_overlay_off ();	889	scr_overlay_off ();
941	# endif	890	# endif
942	# if ISO_14755	891	# if ISO_14755
943	// iso14755 part 5.2 handling: release time	892	// iso14755 part 5.2 handling: release time
944	// first: controls	893	// first: controls
…		…
967		916
968	return;	917	return;
969	}	918	}
970	else if ((ev.state & (ShiftMask \| ControlMask)) != (ShiftMask \| ControlMask))	919	else if ((ev.state & (ShiftMask \| ControlMask)) != (ShiftMask \| ControlMask))
971	{	920	{
972	# if ENABLE_OVERLAY	921	# if ISO_14755
973	scr_overlay_off ();	922	scr_overlay_off ();
974	# endif	923	# endif
975	if (iso14755buf & ISO_14755_51)	924	if (iso14755buf & ISO_14755_51)
976	commit_iso14755 ();	925	commit_iso14755 ();
977	#if ISO_14755	926	#if ISO_14755
…		…
1035	void	984	void
1036	rxvt_term::flush ()	985	rxvt_term::flush ()
1037	{	986	{
1038	flush_ev.stop ();	987	flush_ev.stop ();
1039		988
1040	#ifdef ENABLE_TRANSPARENCY	989	#ifdef HAVE_BG_PIXMAP
1041	if (want_full_refresh)	990	if (bgPixmap.check_clearChanged ())
1042	{	991	{
1043	want_full_refresh = 0;	992	// scr_clear (true); This needs to be researched further!
1044	scr_clear ();
1045	scr_touch (false);	993	scr_touch (false);
1046	}	994	}
1047	#endif	995	#endif
1048		996
1049	if (want_refresh)	997	if (want_refresh)
…		…
1094	}	1042	}
1095		1043
1096	display->flush ();	1044	display->flush ();
1097	}	1045	}
1098		1046
		1047	/* checks wether a refresh is requested and starts the refresh timer */
1099	void	1048	void
1100	rxvt_term::check_cb (check_watcher &w)	1049	rxvt_term::refresh_check ()
1101	{	1050	{
1102	make_current ();	1051	if (want_refresh && !flush_ev.is_active ())
		1052	flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1103		1053
1104	display->flush ();	1054	display->flush ();
1105
1106	if (want_refresh && !flush_ev.active)
1107	flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1108	}	1055	}
1109		1056
1110	void	1057	void
1111	rxvt_term::flush_cb (time_watcher &w)	1058	rxvt_term::flush_cb (ev::timer &w, int revents)
1112	{	1059	{
1113	make_current ();	1060	make_current ();
1114		1061
1115	refresh_count = 0;	1062	refresh_count = 0;
1116	flush ();	1063	flush ();
1117	}	1064	}
1118		1065
1119	#ifdef CURSOR_BLINK	1066	#ifdef CURSOR_BLINK
1120	void	1067	void
1121	rxvt_term::cursor_blink_cb (time_watcher &w)	1068	rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1122	{	1069	{
1123	hidden_cursor = !hidden_cursor;	1070	hidden_cursor = !hidden_cursor;
1124	want_refresh = 1;	1071	want_refresh = 1;
1125		1072	refresh_check ();
1126	w.start (w.at + CURSOR_BLINK_INTERVAL);
1127	}	1073	}
1128	#endif	1074	#endif
1129		1075
1130	#ifdef TEXT_BLINK	1076	#ifdef TEXT_BLINK
1131	void	1077	void
1132	rxvt_term::text_blink_cb (time_watcher &w)	1078	rxvt_term::text_blink_cb (ev::timer &w, int revents)
1133	{	1079	{
1134	if (scr_refresh_rend (RS_Blink, RS_Blink))	1080	if (scr_refresh_rend (RS_Blink, RS_Blink))
1135	{	1081	{
1136	hidden_text = !hidden_text;	1082	hidden_text = !hidden_text;
1137	want_refresh = 1;	1083	want_refresh = 1;
1138	w.start (w.at + TEXT_BLINK_INTERVAL);	1084	refresh_check ();
1139	}	1085	}
		1086	else
		1087	w.stop ();
1140	}	1088	}
1141	#endif	1089	#endif
1142		1090
1143	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	1091	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1144	void	1092	void
1145	rxvt_term::cont_scroll_cb (time_watcher &w)	1093	rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1146	{	1094	{
1147	if ((scrollbar_isUp() \|\| scrollbar_isDn()) &&	1095	if ((scrollbar_isUp () \|\| scrollbar_isDn ())
1148	scr_page (scrollbar_isUp() ? UP : DN, 1))	1096	&& scr_page (scrollbar_isUp () ? UP : DN, 1))
1149	{	1097	{
1150	want_refresh = 1;	1098	want_refresh = 1;
1151	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1099	refresh_check ();
1152	}	1100	}
		1101	else
		1102	w.stop ();
1153	}	1103	}
1154	#endif	1104	#endif
1155		1105
1156	#ifdef SELECTION_SCROLLING	1106	#ifdef SELECTION_SCROLLING
1157	void	1107	void
1158	rxvt_term::sel_scroll_cb (time_watcher &w)	1108	rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1159	{	1109	{
1160	if (scr_page (scroll_selection_dir, scroll_selection_lines))	1110	if (scr_page (scroll_selection_dir, scroll_selection_lines))
1161	{	1111	{
1162	selection_extend (selection_save_x, selection_save_y, selection_save_state);	1112	selection_extend (selection_save_x, selection_save_y, selection_save_state);
1163	want_refresh = 1;	1113	want_refresh = 1;
1164	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1114	refresh_check ();
1165	}	1115	}
		1116	else
		1117	w.stop ();
1166	}	1118	}
1167	#endif	1119	#endif
1168		1120
1169	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	1121	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1170	void	1122	void
1171	rxvt_term::slip_wheel_cb (time_watcher &w)	1123	rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1172	{	1124	{
1173	if (mouse_slip_wheel_speed == 0	1125	if (scr_changeview (view_start - mouse_slip_wheel_speed))
1174	\|\| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1175	: scr_page (UP, mouse_slip_wheel_speed))
1176	{	1126	{
1177	if (view_start == top_row \|\| view_start == 0)
1178	mouse_slip_wheel_speed = 0;
1179
1180	want_refresh = 1;	1127	want_refresh = 1;
1181	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1128	refresh_check ();
		1129	}
		1130
		1131	if (view_start == top_row \|\| view_start == 0 \|\| mouse_slip_wheel_speed == 0)
		1132	{
		1133	mouse_slip_wheel_speed = 0;
		1134	w.stop ();
1182	}	1135	}
1183	}	1136	}
1184	#endif	1137	#endif
1185		1138
1186	#if LINUX_YIELD_HACK	1139	#if LINUX_YIELD_HACK
1187	static struct event_handler	1140	static struct event_handler
1188	{	1141	{
1189	check_watcher yield_ev;	1142	ev::prepare yield_ev;
1190		1143
1191	void yield_cb (check_watcher &w)	1144	void yield_cb (ev::prepare &w, int revents)
1192	{	1145	{
1193	// this should really be sched_yield(), but the linux guys thought	1146	// this should really be sched_yield(), but the linux guys thought
1194	// that giving a process calling sched_yield () less cpu time than	1147	// that giving a process calling sched_yield () less cpu time than
1195	// ones with high nice levels is a useful thing to do. It surely is is	1148	// ones with high nice levels is a useful thing to do. It surely is is
1196	// allowed by the sus... as is returning ENOSYS.	1149	// allowed by the sus... as is returning ENOSYS.
…		…
1247		1200
1248	return false;	1201	return false;
1249	}	1202	}
1250		1203
1251	void	1204	void
1252	rxvt_term::pty_cb (io_watcher &w, short revents)	1205	rxvt_term::pty_cb (ev::io &w, int revents)
1253	{	1206	{
1254	make_current ();	1207	make_current ();
1255		1208
1256	if (revents & EVENT_READ)	1209	if (revents & ev::READ)
1257	// loop, but don't allow a single term to monopolize us	1210	// loop, but don't allow a single term to monopolize us
1258	while (pty_fill ())	1211	while (pty_fill ())
1259	if (cmd_parse ())	1212	if (cmd_parse ())
1260	break;	1213	break;
1261		1214
1262	if (revents & EVENT_WRITE)	1215	if (revents & ev::WRITE)
1263	pty_write ();	1216	pty_write ();
		1217
		1218	refresh_check ();
1264	}	1219	}
1265		1220
1266	void	1221	void
1267	rxvt_term::pointer_unblank ()	1222	rxvt_term::pointer_unblank ()
1268	{	1223	{
…		…
1271		1226
1272	#ifdef POINTER_BLANK	1227	#ifdef POINTER_BLANK
1273	hidden_pointer = 0;	1228	hidden_pointer = 0;
1274		1229
1275	if (option (Opt_pointerBlank))	1230	if (option (Opt_pointerBlank))
1276	pointer_ev.start (NOW + pointerBlankDelay);	1231	pointer_ev.start (pointerBlankDelay);
1277	#endif	1232	#endif
1278	}	1233	}
1279		1234
1280	#ifdef POINTER_BLANK	1235	#ifdef POINTER_BLANK
1281	void	1236	void
…		…
1289		1244
1290	hidden_pointer = 1;	1245	hidden_pointer = 1;
1291	}	1246	}
1292		1247
1293	void	1248	void
1294	rxvt_term::pointer_cb (time_watcher &w)	1249	rxvt_term::pointer_cb (ev::timer &w, int revents)
1295	{	1250	{
1296	make_current ();	1251	make_current ();
1297		1252
1298	pointer_blank ();	1253	pointer_blank ();
1299	}	1254	}
…		…
1302	void	1257	void
1303	rxvt_term::mouse_report (XButtonEvent &ev)	1258	rxvt_term::mouse_report (XButtonEvent &ev)
1304	{	1259	{
1305	int button_number, key_state = 0;	1260	int button_number, key_state = 0;
1306	int x, y;	1261	int x, y;
		1262	int code = 32;
1307		1263
1308	x = ev.x;	1264	x = Pixel2Col (ev.x);
1309	y = ev.y;	1265	y = Pixel2Row (ev.y);
1310	pixel_position (&x, &y);	1266	if (ev.type == MotionNotify)
		1267	{
		1268	if (x == mouse_row && y == mouse_col)
		1269	return;
		1270	mouse_row = x;
		1271	mouse_col = y;
		1272	code += 32;
		1273	}
1311		1274
1312	if (MEvent.button == AnyButton)	1275	if (MEvent.button == AnyButton)
1313	button_number = 3;	1276	button_number = 3;
1314	else	1277	else
1315	{	1278	{
…		…
1361	x + 1,	1324	x + 1,
1362	y + 1);	1325	y + 1);
1363	#endif	1326	#endif
1364		1327
1365	tt_printf ("\033[M%c%c%c",	1328	tt_printf ("\033[M%c%c%c",
1366	(32 + button_number + key_state),	1329	(code + button_number + key_state),
1367	(32 + x + 1),	1330	(32 + x + 1),
1368	(32 + y + 1));	1331	(32 + y + 1));
1369	}	1332	}
1370		1333
1371	/{{{ process an X event /	1334	/{{{ process an X event /
…		…
1433	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)	1396	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1434	focus_out ();	1397	focus_out ();
1435	}	1398	}
1436	#endif	1399	#endif
1437	}	1400	}
1438	break;
1439
1440	case MappingNotify:
1441	XRefreshKeyboardMapping (&ev.xmapping);
1442	break;	1401	break;
1443		1402
1444	/*	1403	/*
1445	* XXX: this is not the _current_ arrangement	1404	* XXX: this is not the _current_ arrangement
1446	* Here's my conclusion:	1405	* Here's my conclusion:
…		…
1479	&& ev.xfocus.mode != NotifyGrab)	1438	&& ev.xfocus.mode != NotifyGrab)
1480	focus_out ();	1439	focus_out ();
1481	break;	1440	break;
1482		1441
1483	case ConfigureNotify:	1442	case ConfigureNotify:
		1443	/* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
		1444	ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
		1445	szHint.width, szHint.height); */
1484	if (ev.xconfigure.window == parent[0])	1446	if (ev.xconfigure.window == parent[0])
1485	{	1447	{
1486	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))	1448	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1487	;	1449	;
1488		1450
1489	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)	1451	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)
1490	{	1452	{
1491	seen_resize = 1;	1453	seen_resize = 1;
1492	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1454	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1493	#ifdef XPM_BACKGROUND
1494	if (!option (Opt_transparent) && bgPixmap.auto_resize)
1495	{
1496	resize_pixmap ();
1497	scr_touch (true);
1498	}
1499	#endif
1500	}	1455	}
		1456	else
		1457	{
		1458	#ifdef HAVE_BG_PIXMAP
		1459	if (bgPixmap.window_position_sensitive ())
		1460	update_background ();
		1461	#endif
		1462	}
1501		1463
1502	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));	1464	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1503
1504	#ifdef ENABLE_TRANSPARENCY
1505	if (option (Opt_transparent))
1506	check_our_parents ();
1507	#endif
1508	}	1465	}
1509	break;	1466	break;
1510		1467
1511	case PropertyNotify:	1468	case PropertyNotify:
1512	if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))	1469	if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
…		…
1530	break;	1487	break;
1531		1488
1532	case MapNotify:	1489	case MapNotify:
1533	mapped = 1;	1490	mapped = 1;
1534	#ifdef TEXT_BLINK	1491	#ifdef TEXT_BLINK
1535	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);	1492	text_blink_ev.start ();
1536	#endif	1493	#endif
1537	HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));	1494	HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1538	break;	1495	break;
1539		1496
1540	case UnmapNotify:	1497	case UnmapNotify:
…		…
1542	#ifdef TEXT_BLINK	1499	#ifdef TEXT_BLINK
1543	text_blink_ev.stop ();	1500	text_blink_ev.stop ();
1544	#endif	1501	#endif
1545	HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));	1502	HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1546	break;	1503	break;
1547
1548	#ifdef ENABLE_TRANSPARENCY
1549	case ReparentNotify:
1550	rootwin_cb (ev);
1551	break;
1552	#endif /* ENABLE_TRANSPARENCY */
1553		1504
1554	case GraphicsExpose:	1505	case GraphicsExpose:
1555	case Expose:	1506	case Expose:
1556	if (ev.xany.window == vt)	1507	if (ev.xany.window == vt)
1557	{	1508	{
1558	do	1509	do
		1510	{
1559	scr_expose (ev.xexpose.x, ev.xexpose.y,	1511	scr_expose (ev.xexpose.x, ev.xexpose.y,
1560	ev.xexpose.width, ev.xexpose.height, False);	1512	ev.xexpose.width, ev.xexpose.height, False);
		1513	}
1561	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));	1514	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1562		1515
1563	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1516	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1564		1517
1565	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))	1518	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
		1519	{
1566	scr_expose (ev.xexpose.x, ev.xexpose.y,	1520	scr_expose (ev.xexpose.x, ev.xexpose.y,
1567	ev.xexpose.width, ev.xexpose.height, False);	1521	ev.xexpose.width, ev.xexpose.height, False);
		1522	}
1568		1523
1569	want_refresh = 1;	1524	want_refresh = 1;
1570	}	1525	}
1571	else	1526	else
1572	{	1527	{
…		…
1580	if (isScrollbarWindow (ev.xany.window))	1535	if (isScrollbarWindow (ev.xany.window))
1581	{	1536	{
1582	scrollBar.setIdle ();	1537	scrollBar.setIdle ();
1583	scrollbar_show (0);	1538	scrollbar_show (0);
1584	}	1539	}
1585
1586	#ifdef ENABLE_TRANSPARENCY
1587	if (am_transparent && ev.xany.window == parent[0])
1588	XClearWindow (dpy, ev.xany.window);
1589	#endif
1590	}	1540	}
1591	break;	1541	break;
1592		1542
1593	case MotionNotify:	1543	case MotionNotify:
1594	#ifdef POINTER_BLANK	1544	#ifdef POINTER_BLANK
1595	if (hidden_pointer)	1545	if (hidden_pointer)
1596	pointer_unblank ();	1546	pointer_unblank ();
1597	#endif	1547	#endif
		1548	if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask\|Button2Mask\|Button3Mask))
		1549	\|\| priv_modes & PrivMode_MouseAnyEvent)
		1550	mouse_report (ev.xbutton);
1598	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)	1551	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1599	break;	1552	break;
1600		1553
1601	if (ev.xany.window == vt)	1554	if (ev.xany.window == vt)
1602	{	1555	{
…		…
1636	int dist;	1589	int dist;
1637		1590
1638	/* don't clobber the current delay if we are	1591	/* don't clobber the current delay if we are
1639	* already in the middle of scrolling.	1592	* already in the middle of scrolling.
1640	*/	1593	*/
1641	if (!sel_scroll_ev.active)	1594	if (!sel_scroll_ev.is_active ())
1642	sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);	1595	sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1643		1596
1644	/* save the event params so we can highlight	1597	/* save the event params so we can highlight
1645	* the selection in the pending-scroll loop	1598	* the selection in the pending-scroll loop
1646	*/	1599	*/
1647	selection_save_x = ev.xbutton.x;	1600	selection_save_x = ev.xbutton.x;
…		…
1669	else	1622	else
1670	{	1623	{
1671	/* we are within the text window, so we	1624	/* we are within the text window, so we
1672	* shouldn't be scrolling	1625	* shouldn't be scrolling
1673	*/	1626	*/
1674	if (sel_scroll_ev.active)
1675	sel_scroll_ev.stop();	1627	sel_scroll_ev.stop();
1676	}	1628	}
1677	#endif	1629	#endif
1678	#ifdef MOUSE_THRESHOLD	1630	#ifdef MOUSE_THRESHOLD
1679	}	1631	}
1680	#endif	1632	#endif
…		…
1706	{	1658	{
1707	hidden_cursor = 0;	1659	hidden_cursor = 0;
1708	want_refresh = 1;	1660	want_refresh = 1;
1709	}	1661	}
1710		1662
1711	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);	1663	cursor_blink_ev.again ();
1712	}	1664	}
1713	#endif	1665	#endif
1714		1666
1715	#if defined(POINTER_BLANK)	1667	#if defined(POINTER_BLANK)
1716	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)	1668	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
…		…
1723		1675
1724	if (ev.type == KeyPress && hidden_pointer == 0)	1676	if (ev.type == KeyPress && hidden_pointer == 0)
1725	pointer_blank ();	1677	pointer_blank ();
1726	}	1678	}
1727	#endif	1679	#endif
		1680
		1681	refresh_check ();
1728	}	1682	}
1729		1683
1730	void	1684	void
1731	rxvt_term::focus_in ()	1685	rxvt_term::focus_in ()
1732	{	1686	{
…		…
1744	XSetICFocus (Input_Context);	1698	XSetICFocus (Input_Context);
1745	}	1699	}
1746	#endif	1700	#endif
1747	#if CURSOR_BLINK	1701	#if CURSOR_BLINK
1748	if (option (Opt_cursorBlink))	1702	if (option (Opt_cursorBlink))
1749	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);	1703	cursor_blink_ev.again ();
1750	#endif	1704	#endif
1751	#if OFF_FOCUS_FADING	1705	#if OFF_FOCUS_FADING
1752	if (rs[Rs_fade])	1706	if (rs[Rs_fade])
1753	{	1707	{
1754	pix_colors = pix_colors_focused;	1708	pix_colors = pix_colors_focused;
…		…
1756	}	1710	}
1757	#endif	1711	#endif
1758	#if ENABLE_FRILLS	1712	#if ENABLE_FRILLS
1759	if (option (Opt_urgentOnBell))	1713	if (option (Opt_urgentOnBell))
1760	{	1714	{
1761	XWMHints *h;
1762
1763	h = XGetWMHints(dpy, parent[0]);	1715	if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1764	if (h != NULL)
1765	{	1716	{
1766	h->flags &= ~XUrgencyHint;	1717	h->flags &= ~XUrgencyHint;
1767	XSetWMHints(dpy, parent[0], h);	1718	XSetWMHints (dpy, parent[0], h);
1768	}	1719	}
1769	}	1720	}
1770	#endif	1721	#endif
1771	}	1722	}
1772	}	1723	}
…		…
1783		1734
1784	#if ENABLE_FRILLS \|\| ISO_14755	1735	#if ENABLE_FRILLS \|\| ISO_14755
1785	if (iso14755buf)	1736	if (iso14755buf)
1786	{	1737	{
1787	iso14755buf = 0;	1738	iso14755buf = 0;
1788	# if ENABLE_OVERLAY	1739	# if ISO_14755
1789	scr_overlay_off ();	1740	scr_overlay_off ();
1790	# endif	1741	# endif
1791	}	1742	}
1792	#endif	1743	#endif
1793	#if USE_XIM	1744	#if USE_XIM
…		…
1795	XUnsetICFocus (Input_Context);	1746	XUnsetICFocus (Input_Context);
1796	#endif	1747	#endif
1797	#if CURSOR_BLINK	1748	#if CURSOR_BLINK
1798	if (option (Opt_cursorBlink))	1749	if (option (Opt_cursorBlink))
1799	cursor_blink_ev.stop ();	1750	cursor_blink_ev.stop ();
		1751
1800	hidden_cursor = 0;	1752	hidden_cursor = 0;
1801	#endif	1753	#endif
1802	#if OFF_FOCUS_FADING	1754	#if OFF_FOCUS_FADING
1803	if (rs[Rs_fade])	1755	if (rs[Rs_fade])
1804	{	1756	{
…		…
1838	case PropertyNotify:	1790	case PropertyNotify:
1839	/*	1791	/*
1840	* if user used some Esetroot compatible prog to set the root bg,	1792	* if user used some Esetroot compatible prog to set the root bg,
1841	* use the property to determine the pixmap. We use it later on.	1793	* use the property to determine the pixmap. We use it later on.
1842	*/	1794	*/
1843	if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]	1795	if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1844	&& ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])	1796	\|\| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1845	return;	1797	{
		1798	bgPixmap.set_root_pixmap ();
		1799	update_background ();
		1800	}
1846		1801
1847	/* FALLTHROUGH */
1848	case ReparentNotify:
1849	if (option (Opt_transparent))
1850	check_our_parents ();
1851	break;	1802	break;
1852	}	1803	}
1853	# endif	1804	# endif
		1805
		1806	refresh_check ();
1854	}	1807	}
1855	#endif	1808	#endif
1856		1809
1857	void	1810	void
1858	rxvt_term::button_press (XButtonEvent &ev)	1811	rxvt_term::button_press (XButtonEvent &ev)
…		…
1913	mouse_report (ev);	1866	mouse_report (ev);
1914	}	1867	}
1915	#else	1868	#else
1916	MEvent.button = ev.button;	1869	MEvent.button = ev.button;
1917	mouse_report (ev);	1870	mouse_report (ev);
1918	#endif /* MOUSE_REPORT_DOUBLECLICK */	1871	#endif /* MOUSE_REPORT_DOUBLECLICK */
1919		1872
1920	}	1873	}
1921	else	1874	else
1922	{	1875	{
1923	if (ev.button != MEvent.button)	1876	if (ev.button != MEvent.button)
…		…
2017	tt_printf ("\033[5~");	1970	tt_printf ("\033[5~");
2018	break;	1971	break;
2019	}	1972	}
2020	}	1973	}
2021	else	1974	else
2022	#endif /* NO_SCROLLBAR_REPORT */	1975	#endif /* NO_SCROLLBAR_REPORT */
2023		1976
2024	{	1977	{
2025	char upordown = 0;	1978	char upordown = 0;
2026		1979
2027	if (scrollBar.style == R_SB_NEXT)	1980	if (scrollBar.style == R_SB_NEXT)
2028	{	1981	{
2029	if (scrollbarnext_upButton (ev.y))	1982	if (scrollbarnext_upButton (ev.y))
2030	upordown = -1; /* up */	1983	upordown = -1; /* up */
…		…
2036	if (scrollbarrxvt_upButton (ev.y))	1989	if (scrollbarrxvt_upButton (ev.y))
2037	upordown = -1; /* up */	1990	upordown = -1; /* up */
2038	else if (scrollbarrxvt_dnButton (ev.y))	1991	else if (scrollbarrxvt_dnButton (ev.y))
2039	upordown = 1; /* down */	1992	upordown = 1; /* down */
2040	}	1993	}
		1994
2041	if (upordown)	1995	if (upordown)
2042	{	1996	{
2043	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	1997	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
		1998	if (!cont_scroll_ev.is_active ())
2044	cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);	1999	cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2045	#endif	2000	#endif
2046	if (scr_page (upordown < 0 ? UP : DN, 1))	2001	if (scr_page (upordown < 0 ? UP : DN, 1))
2047	{	2002	{
2048	if (upordown < 0)	2003	if (upordown < 0)
2049	scrollBar.setUp ();	2004	scrollBar.setUp ();
…		…
2053	}	2008	}
2054	else	2009	else
2055	switch (ev.button)	2010	switch (ev.button)
2056	{	2011	{
2057	case Button2:	2012	case Button2:
2058	switch (scrollbar_align)	2013	switch (scrollBar.align)
2059	{	2014	{
2060	case R_SB_ALIGN_TOP:	2015	case R_SB_ALIGN_TOP:
2061	csrO = 0;	2016	csrO = 0;
2062	break;	2017	break;
2063	case R_SB_ALIGN_CENTRE:	2018	case R_SB_ALIGN_CENTRE:
…		…
2075		2030
2076	scrollBar.setMotion ();	2031	scrollBar.setMotion ();
2077	break;	2032	break;
2078		2033
2079	case Button1:	2034	case Button1:
2080	if (scrollbar_align == R_SB_ALIGN_CENTRE)	2035	if (scrollBar.align == R_SB_ALIGN_CENTRE)
2081	csrO = ev.y - scrollBar.top;	2036	csrO = ev.y - scrollBar.top;
2082	/* FALLTHROUGH */	2037	/* FALLTHROUGH */
2083		2038
2084	case Button3:	2039	case Button3:
2085	if (scrollBar.style != R_SB_XTERM)	2040	if (scrollBar.style != R_SB_XTERM)
…		…
2129	scrollBar.setIdle ();	2084	scrollBar.setIdle ();
2130	scrollbar_show (0);	2085	scrollbar_show (0);
2131	}	2086	}
2132		2087
2133	#ifdef SELECTION_SCROLLING	2088	#ifdef SELECTION_SCROLLING
2134	if (sel_scroll_ev.active)
2135	sel_scroll_ev.stop();	2089	sel_scroll_ev.stop();
2136	#endif	2090	#endif
2137		2091
2138	if (ev.window == vt)	2092	if (ev.window == vt)
2139	{	2093	{
2140	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))	2094	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
…		…
2164	mouse_report (ev);	2118	mouse_report (ev);
2165	}	2119	}
2166	#else /* MOUSE_REPORT_DOUBLECLICK */	2120	#else /* MOUSE_REPORT_DOUBLECLICK */
2167	MEvent.button = AnyButton;	2121	MEvent.button = AnyButton;
2168	mouse_report (ev);	2122	mouse_report (ev);
2169	#endif /* MOUSE_REPORT_DOUBLECLICK */	2123	#endif /* MOUSE_REPORT_DOUBLECLICK */
2170	return;	2124	return;
2171	}	2125	}
2172		2126
2173	/*	2127	/*
2174	* dumb hack to compensate for the failure of click-and-drag	2128	* dumb hack to compensate for the failure of click-and-drag
…		…
2212	{	2166	{
2213	mouse_slip_wheel_speed += v ? -1 : 1;	2167	mouse_slip_wheel_speed += v ? -1 : 1;
2214	if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;	2168	if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2215	if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;	2169	if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2216		2170
2217	if (slip_wheel_ev.at < NOW)	2171	if (!slip_wheel_ev.is_active ())
2218	slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;	2172	slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2219
2220	slip_wheel_ev.start ();
2221	}	2173	}
2222	else	2174	else
2223	{	2175	{
2224	# endif	2176	# endif
2225	scr_page (v, i);	2177	scr_page (v, i);
…		…
2293		2245
2294	if (!option (Opt_jumpScroll) \|\| refresh_count >= nrow - 1)	2246	if (!option (Opt_jumpScroll) \|\| refresh_count >= nrow - 1)
2295	{	2247	{
2296	refresh_count = 0;	2248	refresh_count = 0;
2297		2249
2298	if (!option (Opt_skipScroll) \|\| io_manager::now () > NOW + 1. / 60.)	2250	if (!option (Opt_skipScroll) \|\| ev_time () > ev::now () + 1. / 60.)
2299	{	2251	{
2300	refreshnow = true;	2252	refreshnow = true;
2301	ch = NOCHAR;	2253	ch = NOCHAR;
2302	break;	2254	break;
2303	}	2255	}
…		…
2514	}	2466	}
2515	}	2467	}
2516		2468
2517	pclose_printer (fd);	2469	pclose_printer (fd);
2518	}	2470	}
2519	#endif /* PRINTPIPE */	2471	#endif /* PRINTPIPE */
2520	/}}} /	2472	/}}} /
2521		2473
2522	/* INDENT-OFF */	2474	/* INDENT-OFF */
2523	enum {	2475	enum {
2524	C1_40 = 0x40,	2476	C1_40 = 0x40,
…		…
2810	rxvt_term::process_csi_seq ()	2762	rxvt_term::process_csi_seq ()
2811	{	2763	{
2812	unicode_t ch, priv, i;	2764	unicode_t ch, priv, i;
2813	unsigned int nargs, p;	2765	unsigned int nargs, p;
2814	int n, ndef;	2766	int n, ndef;
2815	int arg[ESC_ARGS];	2767	int arg[ESC_ARGS] = { };
2816		2768
2817	for (nargs = ESC_ARGS; nargs > 0;)	2769	nargs = 0;
2818	arg[--nargs] = 0;
2819		2770
2820	priv = 0;	2771	priv = 0;
2821	ch = cmd_getc ();	2772	ch = cmd_getc ();
2822	if (ch >= '<' && ch <= '?')	2773	if (ch >= '<' && ch <= '?')
		2774	{
2823	{ /* '<' '=' '>' '?' */	2775	/* '<' '=' '>' '?' */
2824	priv = ch;	2776	priv = ch;
2825	ch = cmd_getc ();	2777	ch = cmd_getc ();
2826	}	2778	}
2827		2779
2828	/* read any numerical arguments */	2780	/* read any numerical arguments */
…		…
2867	switch (priv)	2819	switch (priv)
2868	{	2820	{
2869	case '>':	2821	case '>':
2870	if (ch == CSI_DA) /* secondary device attributes */	2822	if (ch == CSI_DA) /* secondary device attributes */
2871	{	2823	{
2872	// first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,	2824	// first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2873	// 'U' for rxvt-unicode != 7.[34] (where it was broken).	2825	// 'U' for rxvt-unicode != 7.[34] (where it was broken).
2874	//	2826	//
2875	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt	2827	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2876	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify	2828	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2877	// that we do not support xterm mouse reporting (should be 95 when we do).	2829	// versions.
2878	//	2830	//
2879	tt_printf ("\033[>%d;94;0c", 'U');	2831	tt_printf ("\033[>%d;95;0c", 'U');
2880	}	2832	}
2881	break;	2833	break;
2882	case '?':	2834	case '?':
2883	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')	2835	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')
2884	process_terminal_mode (ch, priv, nargs, arg);	2836	process_terminal_mode (ch, priv, nargs, arg);
…		…
3435	break;	3387	break;
3436	case URxvt_Color_IT:	3388	case URxvt_Color_IT:
3437	process_color_seq (op, Color_IT, str, resp);	3389	process_color_seq (op, Color_IT, str, resp);
3438	break;	3390	break;
3439	#endif	3391	#endif
3440	#if ENABLE_TRANSPARENCY && TINTING	3392	#if ENABLE_TRANSPARENCY
3441	case URxvt_Color_tint:	3393	case URxvt_Color_tint:
3442	process_color_seq (op, Color_tint, str, resp);	3394	process_color_seq (op, Color_tint, str, resp);
		3395	{
		3396	bool changed = false;
3443		3397
3444	check_our_parents ();	3398	if (ISSET_PIXCOLOR (Color_tint))
		3399	changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
		3400	else
		3401	changed = bgPixmap.unset_tint ();
3445		3402
3446	if (am_transparent)	3403	if (changed)
3447	want_full_refresh = want_refresh = 1;	3404	update_background ();
		3405	}
3448		3406
3449	break;	3407	break;
3450	#endif	3408	#endif
3451		3409
		3410	#if BG_IMAGE_FROM_FILE
3452	case Rxvt_Pixmap:	3411	case Rxvt_Pixmap:
3453	{	3412	if (!strcmp (str, "?"))
3454	if (*str != ';')
3455	{	3413	{
3456	#if XPM_BACKGROUND	3414	char str[256];
3457	scale_pixmap (""); /* reset to default scaling */	3415
3458	set_bgPixmap (str); /* change pixmap */	3416	sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3459	scr_touch (true);	3417	min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3460	#endif	3418	min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
		3419	process_xterm_seq (XTerm_title, str, CHAR_ST);
3461	}	3420	}
3462		3421	else
		3422	{
3463	int changed = 0;	3423	int changed = 0;
3464		3424
3465	while ((str = strchr (str, ';')) != NULL)	3425	if (*str != ';')
3466	{	3426	{
		3427	/* reset to default scaling :*/
		3428	bgPixmap.unset_geometry ();
		3429	if (bgPixmap.set_file (str)) /* change pixmap */
		3430	changed++;
		3431	str = strchr (str, ';');
		3432	if (str == NULL)
		3433	bgPixmap.set_defaultGeometry ();
		3434	}
		3435
		3436	while (str)
		3437	{
3467	str++;	3438	str++;
3468	#if XPM_BACKGROUND	3439	if (bgPixmap.set_geometry (str))
3469	changed += scale_pixmap (str);	3440	changed++;
3470	#endif	3441	str = strchr (str, ';');
3471	}	3442	}
3472		3443
3473	if (changed)	3444	if (changed)
3474	{	3445	update_background ();
3475	#ifdef XPM_BACKGROUND
3476	resize_pixmap ();
3477	scr_touch (true);
3478	#endif
3479	}	3446	}
3480	#if ENABLE_TRANSPARENCY && defined(HAVE_AFTERIMAGE)
3481	if (option (Opt_transparent))
3482	check_our_parents ();
3483	#endif
3484	}
3485	break;	3447	break;
		3448	#endif
3486		3449
3487	case Rxvt_restoreFG:	3450	case Rxvt_restoreFG:
3488	set_window_color (Color_fg, str);	3451	set_window_color (Color_fg, str);
3489	break;	3452	break;
3490	case Rxvt_restoreBG:	3453	case Rxvt_restoreBG:
…		…
3612	{	3575	{
3613	unsigned int i, j;	3576	unsigned int i, j;
3614	int state;	3577	int state;
3615		3578
3616	static const struct	3579	static const struct
3617	{	3580	{
3618	const int argval;	3581	const int argval;
3619	const unsigned long bit;	3582	const unsigned long bit;
3620	}
3621
3622	argtopriv[] = {	3583	} argtopriv[] = {
3623	{ 1, PrivMode_aplCUR },	3584	{ 1, PrivMode_aplCUR },
3624	{ 2, PrivMode_vt52 },	3585	{ 2, PrivMode_vt52 },
3625	{ 3, PrivMode_132 },	3586	{ 3, PrivMode_132 },
3626	{ 4, PrivMode_smoothScroll },	3587	{ 4, PrivMode_smoothScroll },
3627	{ 5, PrivMode_rVideo },	3588	{ 5, PrivMode_rVideo },
…		…
3643	{ 66, PrivMode_aplKP },	3604	{ 66, PrivMode_aplKP },
3644	#ifndef NO_BACKSPACE_KEY	3605	#ifndef NO_BACKSPACE_KEY
3645	{ 67, PrivMode_BackSpace },	3606	{ 67, PrivMode_BackSpace },
3646	#endif	3607	#endif
3647	{ 1000, PrivMode_MouseX11 },	3608	{ 1000, PrivMode_MouseX11 },
3648	// 1001 Use Hilite Mouse Tracking. NYI, TODO	3609	{ 1002, PrivMode_MouseBtnEvent },
3649	// 1002 Use Cell Motion Mouse Tracking. NYI, TODO	3610	{ 1003, PrivMode_MouseAnyEvent },
3650	// 1003 Use All Motion Mouse Tracking. NYI, TODO
3651	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension	3611	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension
3652	{ 1011, PrivMode_Keypress }, // rxvt extension	3612	{ 1011, PrivMode_Keypress }, // rxvt extension
3653	// 1035 enable modifiers for alt, numlock NYI	3613	// 1035 enable modifiers for alt, numlock NYI
3654	// 1036 send ESC for meta keys NYI	3614	// 1036 send ESC for meta keys NYI
3655	// 1037 send DEL for keypad delete NYI	3615	// 1037 send DEL for keypad delete NYI
…		…
3729	scr_autowrap (state);	3689	scr_autowrap (state);
3730	break;	3690	break;
3731	/* case 8: - auto repeat, can't do on a per window basis */	3691	/* case 8: - auto repeat, can't do on a per window basis */
3732	case 9: /* X10 mouse reporting */	3692	case 9: /* X10 mouse reporting */
3733	if (state) /* orthogonal */	3693	if (state) /* orthogonal */
3734	priv_modes &= ~PrivMode_MouseX11;	3694	priv_modes &= ~(PrivMode_MouseX11\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);
3735	break;	3695	break;
3736	#ifdef scrollBar_esc	3696	#ifdef scrollBar_esc
3737	case scrollBar_esc:	3697	case scrollBar_esc:
3738	if (scrollbar_mapping (state))	3698	if (scrollbar_mapping (state))
3739	{	3699	{
…		…
3752	break;	3712	break;
3753	/* case 66: - application key pad */	3713	/* case 66: - application key pad */
3754	/* case 67: - backspace key */	3714	/* case 67: - backspace key */
3755	case 1000: /* X11 mouse reporting */	3715	case 1000: /* X11 mouse reporting */
3756	if (state) /* orthogonal */	3716	if (state) /* orthogonal */
3757	priv_modes &= ~PrivMode_MouseX10;	3717	priv_modes &= ~(PrivMode_MouseX10\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);
3758	break;	3718	break;
3759	#if 0
3760	case 1001:	3719	case 1002:
3761	break; /* X11 mouse highlighting */	3720	case 1003:
3762	#endif	3721	if (state)
		3722	{
		3723	priv_modes &= ~(PrivMode_MouseX10\|PrivMode_MouseX11);
		3724	priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
		3725	vt_emask_mouse = PointerMotionMask;
		3726	}
		3727	else
		3728	vt_emask_mouse = NoEventMask;
		3729	vt_select_input ();
		3730	break;
3763	case 1010: /* scroll to bottom on TTY output inhibit */	3731	case 1010: /* scroll to bottom on TTY output inhibit */
3764	set_option (Opt_scrollTtyOutput, !state);	3732	set_option (Opt_scrollTtyOutput, !state);
3765	break;	3733	break;
3766	case 1011: /* scroll to bottom on key press */	3734	case 1011: /* scroll to bottom on key press */
3767	set_option (Opt_scrollTtyKeypress, state);	3735	set_option (Opt_scrollTtyKeypress, state);
…		…
3944	rxvt_term::process_graphics ()	3912	rxvt_term::process_graphics ()
3945	{	3913	{
3946	unicode_t ch, cmd = cmd_getc ();	3914	unicode_t ch, cmd = cmd_getc ();
3947		3915
3948	if (cmd == 'Q')	3916	if (cmd == 'Q')
		3917	{
3949	{ /* query graphics */	3918	/* query graphics */
3950	tt_printf ("\033G0\012"); /* no graphics */	3919	tt_printf ("\033G0\012"); /* no graphics */
3951	return;	3920	return;
3952	}	3921	}
3953	/* swallow other graphics sequences until terminating ':' */	3922	/* swallow other graphics sequences until terminating ':' */
3954	do	3923	do
…		…
4004	v_buffer = (char *)realloc (v_buffer, v_buflen + len);	3973	v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4005		3974
4006	memcpy (v_buffer + v_buflen, data, len);	3975	memcpy (v_buffer + v_buflen, data, len);
4007	v_buflen += len;	3976	v_buflen += len;
4008		3977
4009	pty_ev.set (EVENT_READ \| EVENT_WRITE);	3978	pty_ev.set (ev::READ \| ev::WRITE);
4010	}	3979	}
4011		3980
4012	void rxvt_term::pty_write ()	3981	void rxvt_term::pty_write ()
4013	{	3982	{
4014	int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));	3983	int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
…		…
4019		3988
4020	if (v_buflen == 0)	3989	if (v_buflen == 0)
4021	{	3990	{
4022	free (v_buffer);	3991	free (v_buffer);
4023	v_buffer = 0;	3992	v_buffer = 0;
4024	v_buflen = 0;
4025		3993
4026	pty_ev.set (EVENT_READ);	3994	pty_ev.set (ev::READ);
4027	return;	3995	return;
4028	}	3996	}
4029		3997
4030	memmove (v_buffer, v_buffer + written, v_buflen);	3998	memmove (v_buffer, v_buffer + written, v_buflen);
4031	}	3999	}
4032	else if (written != -1 \|\| (errno != EAGAIN && errno != EINTR))	4000	else if (written != -1 \|\| (errno != EAGAIN && errno != EINTR))
4033	pty_ev.set (EVENT_READ);	4001	pty_ev.set (ev::READ);
4034	}	4002	}
4035		4003
4036	/----------------------- end-of-file (C source) -----------------------/	4004	/----------------------- end-of-file (C source) -----------------------/
4037		4005

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.333 by ayin, Tue Jun 26 09:55:22 2007 UTC vs. Revision 1.388 by ayin, Mon Dec 31 01:16:47 2007 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.333 by ayin, Tue Jun 26 09:55:22 2007 UTC vs.
Revision 1.388 by ayin, Mon Dec 31 01:16:47 2007 UTC