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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.359 by ayin, Mon Oct 15 14:56:06 2007 UTC vs.
Revision 1.409 by ayin, Sat Feb 16 15:39:20 2008 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.
…		…
198	r & RS_Uline ? " uline" : "",	199	r & RS_Uline ? " uline" : "",
199	r & RS_Careful ? " careful" : "");	200	r & RS_Careful ? " careful" : "");
200		201
201	int width = wcswidth (fname, wcslen (fname));	202	int width = wcswidth (fname, wcslen (fname));
202		203
203	max_it (width, 8+5); // for char + hey	204	max_it (width, 8+5); // for char + hex
204	max_it (width, strlen (attr));	205	max_it (width, strlen (attr));
205		206
206	if (y >= 0)	207	if (y >= 0)
207	{	208	{
208	y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;	209	y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
…		…
220	ch = *chr++;	221	ch = *chr++;
221		222
222	sprintf (buf, "%8x", ch);	223	sprintf (buf, "%8x", ch);
223	scr_overlay_set (0, y, buf);	224	scr_overlay_set (0, y, buf);
224	scr_overlay_set (9, y, '=');	225	scr_overlay_set (9, y, '=');
225	# if !UNICODE3	226	# if !UNICODE_3
226	if (ch >= 0x10000)	227	if (ch >= 0x10000)
227	ch = 0xfffd;	228	ch = 0xfffd;
228	# endif	229	# endif
229	scr_overlay_set (11, y, ch, r);	230	scr_overlay_set (11, y, ch, r);
230		231
…		…
278	}	279	}
279		280
280	iso14755buf = 0;	281	iso14755buf = 0;
281	}	282	}
282		283
283	int	284	static int
284	rxvt_term::hex_keyval (XKeyEvent &ev)	285	hex_keyval (XKeyEvent &ev)
285	{	286	{
286	// check wether this event corresponds to a hex digit	287	// check wether this event corresponds to a hex digit
287	// if the modifiers had not been pressed.	288	// if the modifiers had not been pressed.
288	for (int index = 0; index < 8; index++)	289	for (int index = 0; index < 8; index++)
289	{	290	{
…		…
297		298
298	return -1;	299	return -1;
299	}	300	}
300	#endif	301	#endif
301		302
		303	static inline KeySym
		304	translate_keypad (KeySym keysym, bool kp)
		305	{
		306	#ifdef XK_KP_Home
		307	static const KeySym keypadtrans[] = {
		308	XK_KP_7, // XK_KP_Home
		309	XK_KP_4, // XK_KP_Left
		310	XK_KP_8, // XK_KP_Up
		311	XK_KP_6, // XK_KP_Right
		312	XK_KP_2, // XK_KP_Down
		313	# ifndef UNSHIFTED_SCROLLKEYS
		314	XK_KP_9, // XK_KP_Prior
		315	XK_KP_3, // XK_KP_Next
		316	# else
		317	XK_Prior,
		318	XK_Next,
		319	# endif
		320	XK_KP_1, // XK_KP_End
		321	XK_KP_5, // XK_KP_Begin
		322	};
		323
		324	if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
		325	{
		326	unsigned int index = keysym - XK_KP_Home;
		327	keysym = kp ? keypadtrans[index] : XK_Home + index;
		328	}
		329	else if (keysym == XK_KP_Insert)
		330	keysym = kp ? XK_KP_0 : XK_Insert;
		331	# ifndef NO_DELETE_KEY
		332	else if (keysym == XK_KP_Delete)
		333	keysym = kp ? XK_KP_Decimal : XK_Delete;
		334	# endif
		335	#endif
		336	return keysym;
		337	}
		338
		339	static inline int
		340	map_function_key (KeySym keysym)
		341	{
		342	int param = 0;
		343
		344	if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
		345	{
		346	param = 11 + keysym - XK_F1;
		347	if (keysym >= XK_F17)
		348	param += 4;
		349	else if (keysym >= XK_F15)
		350	param += 3;
		351	else if (keysym >= XK_F11)
		352	param += 2;
		353	else if (keysym >= XK_F6)
		354	param += 1;
		355	}
		356	else
		357	switch (keysym)
		358	{
		359	case XK_Find:
		360	param = 1;
		361	break;
		362	case XK_Insert:
		363	param = 2;
		364	break;
		365	#ifdef DXK_Remove
		366	case DXK_Remove:
		367	#endif
		368	case XK_Execute:
		369	param = 3;
		370	break;
		371	case XK_Select:
		372	param = 4;
		373	break;
		374	#ifndef UNSHIFTED_SCROLLKEYS
		375	case XK_Prior:
		376	param = 5;
		377	break;
		378	case XK_Next:
		379	param = 6;
		380	break;
		381	#endif
		382	case XK_Help:
		383	param = 28;
		384	break;
		385	case XK_Menu:
		386	param = 29;
		387	break;
		388	}
		389	return param;
		390	}
		391
302	void	392	void
303	rxvt_term::key_press (XKeyEvent &ev)	393	rxvt_term::key_press (XKeyEvent &ev)
304	{	394	{
305	int ctrl, meta, shft, len;	395	int ctrl, meta, shft, len;
306	unsigned int newlen;
307	KeySym keysym;	396	KeySym keysym;
308	int valid_keysym;	397	int valid_keysym;
309	char kbuf[KBUFSZ];	398	char kbuf[KBUFSZ];
310		399
311	#if ISO_14755	400	#if ISO_14755
…		…
546	}	635	}
547	#endif	636	#endif
548		637
549	if (keysym >= 0xFF00 && keysym <= 0xFFFF)	638	if (keysym >= 0xFF00 && keysym <= 0xFFFF)
550	{	639	{
551	{
552	bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;	640	bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
553	newlen = 1;	641	unsigned int newlen = 1;
554	switch (keysym)	642
		643	switch (translate_keypad (keysym, kp))
555	{	644	{
556	#ifndef NO_BACKSPACE_KEY	645	#ifndef NO_BACKSPACE_KEY
557	case XK_BackSpace:	646	case XK_BackSpace:
558	if (priv_modes & PrivMode_HaveBackSpace)	647	if (priv_modes & PrivMode_HaveBackSpace)
559	{	648	{
…		…
564	else	653	else
565	strcpy (kbuf, rs[Rs_backspace_key]);	654	strcpy (kbuf, rs[Rs_backspace_key]);
566	break;	655	break;
567	#endif	656	#endif
568	#ifndef NO_DELETE_KEY	657	#ifndef NO_DELETE_KEY
569	# ifdef XK_KP_Delete
570	case XK_KP_Delete:
571	/* allow shift to override */
572	if (kp)
573	{
574	strcpy (kbuf, "\033On");
575	break;
576	}
577	/* FALLTHROUGH */
578	# endif
579	case XK_Delete:	658	case XK_Delete:
580	strcpy (kbuf, rs[Rs_delete_key]);	659	strcpy (kbuf, rs[Rs_delete_key]);
581	break;	660	break;
582	#endif	661	#endif
583	case XK_Tab:	662	case XK_Tab:
…		…
595	#endif	674	#endif
596	newlen = 0;	675	newlen = 0;
597	}	676	}
598	break;	677	break;
599		678
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 (kp)
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" */	679	case XK_Up: /* "\033[A" */
617	case XK_Down: /* "\033[B" */	680	case XK_Down: /* "\033[B" */
618	case XK_Right: /* "\033[C" */	681	case XK_Right: /* "\033[C" */
619	case XK_Left: /* "\033[D" */	682	case XK_Left: /* "\033[D" */
620	strcpy (kbuf, "\033[Z");	683	strcpy (kbuf, "\033[Z");
…		…
629	}	692	}
630	else if (priv_modes & PrivMode_aplCUR)	693	else if (priv_modes & PrivMode_aplCUR)
631	kbuf[1] = 'O';	694	kbuf[1] = 'O';
632	break;	695	break;
633		696
634	#ifndef UNSHIFTED_SCROLLKEYS
635	# ifdef XK_KP_Prior
636	case XK_KP_Prior:
637	/* allow shift to override */
638	if (kp)
639	{
640	strcpy (kbuf, "\033Oy");
641	break;
642	}
643	/* FALLTHROUGH */
644	# endif
645	case XK_Prior:
646	strcpy (kbuf, "\033[5~");
647	break;
648	# ifdef XK_KP_Next
649	case XK_KP_Next:
650	/* allow shift to override */
651	if (kp)
652	{
653	strcpy (kbuf, "\033Os");
654	break;
655	}
656	/* FALLTHROUGH */
657	# endif
658	case XK_Next:
659	strcpy (kbuf, "\033[6~");
660	break;
661	#endif
662	case XK_KP_Enter:	697	case XK_KP_Enter:
663	/* allow shift to override */	698	/* allow shift to override */
664	if (kp)	699	if (kp)
665	{	700	{
666	strcpy (kbuf, "\033OM");	701	strcpy (kbuf, "\033OM");
…		…
681	kbuf[0] = '\015';	716	kbuf[0] = '\015';
682	kbuf[1] = '\0';	717	kbuf[1] = '\0';
683	}	718	}
684	break;	719	break;
685		720
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" */	721	case XK_KP_F1: /* "\033OP" */
693	case XK_KP_F2: /* "\033OQ" */	722	case XK_KP_F2: /* "\033OQ" */
694	case XK_KP_F3: /* "\033OR" */	723	case XK_KP_F3: /* "\033OR" */
695	case XK_KP_F4: /* "\033OS" */	724	case XK_KP_F4: /* "\033OS" */
696	strcpy (kbuf, "\033OP");	725	strcpy (kbuf, "\033OP");
…		…
724	kbuf[0] = ('*' + (keysym - XK_KP_Multiply));	753	kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
725	kbuf[1] = '\0';	754	kbuf[1] = '\0';
726	}	755	}
727	break;	756	break;
728		757
729	case XK_Find:
730	strcpy (kbuf, "\033[1~");
731	break;
732
733	#ifdef XK_KP_Insert
734	case XK_KP_Insert:
735	/* allow shift to override */
736	if (kp)
737	{
738	strcpy (kbuf, "\033Op");
739	break;
740	}
741	/* FALLTHROUGH */
742	#endif
743	case XK_Insert:
744	strcpy (kbuf, "\033[2~");
745	break;
746	#ifdef DXK_Remove /* support for DEC remove like key */
747	case DXK_Remove:
748	/* FALLTHROUGH */
749	#endif
750	case XK_Execute:
751	strcpy (kbuf, "\033[3~");
752	break;
753	case XK_Select:
754	strcpy (kbuf, "\033[4~");
755	break;
756	#ifdef XK_KP_End
757	case XK_KP_End:
758	/* allow shift to override */
759	if (kp)
760	{
761	strcpy (kbuf, "\033Oq");
762	break;
763	}
764	/* FALLTHROUGH */
765	#endif
766	case XK_End:	758	case XK_End:
767	strcpy (kbuf, KS_END);	759	strcpy (kbuf, KS_END);
768	break;	760	break;
769	#ifdef XK_KP_Home
770	case XK_KP_Home:
771	/* allow shift to override */
772	if (kp)
773	{
774	strcpy (kbuf, "\033Ow");
775	break;
776	}
777	/* FALLTHROUGH */
778	#endif
779	case XK_Home:	761	case XK_Home:
780	strcpy (kbuf, KS_HOME);	762	strcpy (kbuf, KS_HOME);
781	break;	763	break;
782		764
783	#define FKEY(n, fkey) \
784	sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
785
786	case XK_F1: /* "\033[11~" */
787	case XK_F2: /* "\033[12~" */
788	case XK_F3: /* "\033[13~" */
789	case XK_F4: /* "\033[14~" */
790	case XK_F5: /* "\033[15~" */
791	FKEY (11, XK_F1);
792	break;
793	case XK_F6: /* "\033[17~" */
794	case XK_F7: /* "\033[18~" */
795	case XK_F8: /* "\033[19~" */
796	case XK_F9: /* "\033[20~" */
797	case XK_F10: /* "\033[21~" */
798	FKEY (17, XK_F6);
799	break;
800	case XK_F11: /* "\033[23~" */
801	case XK_F12: /* "\033[24~" */
802	case XK_F13: /* "\033[25~" */
803	case XK_F14: /* "\033[26~" */
804	FKEY (23, XK_F11);
805	break;
806	case XK_F15: /* "\033[28~" */
807	case XK_F16: /* "\033[29~" */
808	FKEY (28, XK_F15);
809	break;
810	case XK_Help: /* "\033[28~" */
811	FKEY (28, XK_Help);
812	break;
813	case XK_Menu: /* "\033[29~" */
814	FKEY (29, XK_Menu);
815	break;
816	case XK_F17: /* "\033[31~" */
817	case XK_F18: /* "\033[32~" */
818	case XK_F19: /* "\033[33~" */
819	case XK_F20: /* "\033[34~" */
820	case XK_F21: /* "\033[35~" */
821	case XK_F22: /* "\033[36~" */
822	case XK_F23: /* "\033[37~" */
823	case XK_F24: /* "\033[38~" */
824	case XK_F25: /* "\033[39~" */
825	case XK_F26: /* "\033[40~" */
826	case XK_F27: /* "\033[41~" */
827	case XK_F28: /* "\033[42~" */
828	case XK_F29: /* "\033[43~" */
829	case XK_F30: /* "\033[44~" */
830	case XK_F31: /* "\033[45~" */
831	case XK_F32: /* "\033[46~" */
832	case XK_F33: /* "\033[47~" */
833	case XK_F34: /* "\033[48~" */
834	case XK_F35: /* "\033[49~" */
835	FKEY (31, XK_F17);
836	break;
837	#undef FKEY
838	default:	765	default:
		766	{
		767	int param = map_function_key (keysym);
		768	if (param > 0)
		769	sprintf (kbuf,"\033[%d~", param);
		770	else
839	newlen = 0;	771	newlen = 0;
		772	}
840	break;	773	break;
841	}	774	}
842		775
843	if (newlen)	776	if (newlen)
844	len = strlen (kbuf);	777	len = strlen (kbuf);
845	}
846		778
847	/*	779	/*
848	* Pass meta for all function keys, if 'meta' option set	780	* Pass meta for all function keys, if 'meta' option set
849	*/	781	*/
850	#ifdef META8_OPTION	782	#ifdef META8_OPTION
…		…
1034		966
1035	void	967	void
1036	rxvt_term::flush ()	968	rxvt_term::flush ()
1037	{	969	{
1038	flush_ev.stop ();	970	flush_ev.stop ();
1039		971
1040	#ifdef HAVE_BG_PIXMAP	972	#ifdef HAVE_BG_PIXMAP
1041	if (bgPixmap.check_clearChanged ())	973	if (bgPixmap.check_clearChanged ())
1042	{	974	{
1043	// scr_clear (true); This needs to be researched further!	975	// scr_clear (true); This needs to be researched further!
1044	scr_touch (false);	976	scr_touch (false);
1045	}	977	}
…		…
1093	}	1025	}
1094		1026
1095	display->flush ();	1027	display->flush ();
1096	}	1028	}
1097		1029
		1030	/* checks wether a refresh is requested and starts the refresh timer */
1098	void	1031	void
1099	rxvt_term::check_cb (check_watcher &w)	1032	rxvt_term::refresh_check ()
1100	{	1033	{
1101	make_current ();	1034	if (want_refresh && !flush_ev.is_active ())
		1035	flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1102		1036
1103	display->flush ();	1037	display->flush ();
1104
1105	if (want_refresh && !flush_ev.active)
1106	flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1107	}	1038	}
1108		1039
1109	void	1040	void
1110	rxvt_term::flush_cb (time_watcher &w)	1041	rxvt_term::flush_cb (ev::timer &w, int revents)
1111	{	1042	{
1112	make_current ();	1043	make_current ();
1113		1044
1114	refresh_count = 0;	1045	refresh_count = 0;
1115	flush ();	1046	flush ();
1116	}	1047	}
1117		1048
1118	#ifdef CURSOR_BLINK	1049	#ifdef CURSOR_BLINK
1119	void	1050	void
1120	rxvt_term::cursor_blink_cb (time_watcher &w)	1051	rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1121	{	1052	{
1122	hidden_cursor = !hidden_cursor;	1053	hidden_cursor = !hidden_cursor;
1123	want_refresh = 1;	1054	want_refresh = 1;
1124		1055	refresh_check ();
1125	w.start (w.at + CURSOR_BLINK_INTERVAL);
1126	}	1056	}
1127	#endif	1057	#endif
1128		1058
1129	#ifdef TEXT_BLINK	1059	#ifdef TEXT_BLINK
1130	void	1060	void
1131	rxvt_term::text_blink_cb (time_watcher &w)	1061	rxvt_term::text_blink_cb (ev::timer &w, int revents)
1132	{	1062	{
1133	if (scr_refresh_rend (RS_Blink, RS_Blink))	1063	if (scr_refresh_rend (RS_Blink, RS_Blink))
1134	{	1064	{
1135	hidden_text = !hidden_text;	1065	hidden_text = !hidden_text;
1136	want_refresh = 1;	1066	want_refresh = 1;
1137	w.start (w.at + TEXT_BLINK_INTERVAL);	1067	refresh_check ();
1138	}	1068	}
		1069	else
		1070	w.stop ();
1139	}	1071	}
1140	#endif	1072	#endif
1141		1073
1142	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	1074	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1143	void	1075	void
1144	rxvt_term::cont_scroll_cb (time_watcher &w)	1076	rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1145	{	1077	{
1146	if ((scrollbar_isUp() \|\| scrollbar_isDn()) &&	1078	if ((scrollBar.state == STATE_UP \|\| scrollBar.state == STATE_DOWN)
1147	scr_page (scrollbar_isUp() ? UP : DN, 1))	1079	&& scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1148	{	1080	{
1149	want_refresh = 1;	1081	want_refresh = 1;
1150	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1082	refresh_check ();
1151	}	1083	}
		1084	else
		1085	w.stop ();
1152	}	1086	}
1153	#endif	1087	#endif
1154		1088
1155	#ifdef SELECTION_SCROLLING	1089	#ifdef SELECTION_SCROLLING
1156	void	1090	void
1157	rxvt_term::sel_scroll_cb (time_watcher &w)	1091	rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1158	{	1092	{
1159	if (scr_page (scroll_selection_dir, scroll_selection_lines))	1093	if (scr_page (scroll_selection_dir, scroll_selection_lines))
1160	{	1094	{
1161	selection_extend (selection_save_x, selection_save_y, selection_save_state);	1095	selection_extend (selection_save_x, selection_save_y, selection_save_state);
1162	want_refresh = 1;	1096	want_refresh = 1;
1163	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1097	refresh_check ();
1164	}	1098	}
		1099	else
		1100	w.stop ();
1165	}	1101	}
1166	#endif	1102	#endif
1167		1103
1168	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	1104	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1169	void	1105	void
1170	rxvt_term::slip_wheel_cb (time_watcher &w)	1106	rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1171	{	1107	{
1172	if (mouse_slip_wheel_speed == 0	1108	if (scr_changeview (view_start - mouse_slip_wheel_speed))
1173	\|\| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1174	: scr_page (UP, mouse_slip_wheel_speed))
1175	{	1109	{
1176	if (view_start == top_row \|\| view_start == 0)
1177	mouse_slip_wheel_speed = 0;
1178
1179	want_refresh = 1;	1110	want_refresh = 1;
1180	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1111	refresh_check ();
		1112	}
		1113
		1114	if (view_start == top_row \|\| view_start == 0 \|\| mouse_slip_wheel_speed == 0)
		1115	{
		1116	mouse_slip_wheel_speed = 0;
		1117	w.stop ();
1181	}	1118	}
1182	}	1119	}
1183	#endif	1120	#endif
1184		1121
1185	#if LINUX_YIELD_HACK	1122	#if LINUX_YIELD_HACK
1186	static struct event_handler	1123	static struct event_handler
1187	{	1124	{
1188	check_watcher yield_ev;	1125	ev::prepare yield_ev;
1189		1126
1190	void yield_cb (check_watcher &w)	1127	void yield_cb (ev::prepare &w, int revents)
1191	{	1128	{
1192	// this should really be sched_yield(), but the linux guys thought	1129	// this should really be sched_yield(), but the linux guys thought
1193	// that giving a process calling sched_yield () less cpu time than	1130	// that giving a process calling sched_yield () less cpu time than
1194	// ones with high nice levels is a useful thing to do. It surely is is	1131	// ones with high nice levels is a useful thing to do. It surely is is
1195	// allowed by the sus... as is returning ENOSYS.	1132	// allowed by the sus... as is returning ENOSYS.
…		…
1246		1183
1247	return false;	1184	return false;
1248	}	1185	}
1249		1186
1250	void	1187	void
1251	rxvt_term::pty_cb (io_watcher &w, short revents)	1188	rxvt_term::pty_cb (ev::io &w, int revents)
1252	{	1189	{
1253	make_current ();	1190	make_current ();
1254		1191
1255	if (revents & EVENT_READ)	1192	if (revents & ev::READ)
1256	// loop, but don't allow a single term to monopolize us	1193	// loop, but don't allow a single term to monopolize us
1257	while (pty_fill ())	1194	while (pty_fill ())
1258	if (cmd_parse ())	1195	if (cmd_parse ())
1259	break;	1196	break;
1260		1197
1261	if (revents & EVENT_WRITE)	1198	if (revents & ev::WRITE)
1262	pty_write ();	1199	pty_write ();
		1200
		1201	refresh_check ();
1263	}	1202	}
1264		1203
1265	void	1204	void
1266	rxvt_term::pointer_unblank ()	1205	rxvt_term::pointer_unblank ()
1267	{	1206	{
…		…
1270		1209
1271	#ifdef POINTER_BLANK	1210	#ifdef POINTER_BLANK
1272	hidden_pointer = 0;	1211	hidden_pointer = 0;
1273		1212
1274	if (option (Opt_pointerBlank))	1213	if (option (Opt_pointerBlank))
1275	pointer_ev.start (NOW + pointerBlankDelay);	1214	pointer_ev.start (pointerBlankDelay);
1276	#endif	1215	#endif
1277	}	1216	}
1278		1217
1279	#ifdef POINTER_BLANK	1218	#ifdef POINTER_BLANK
1280	void	1219	void
…		…
1288		1227
1289	hidden_pointer = 1;	1228	hidden_pointer = 1;
1290	}	1229	}
1291		1230
1292	void	1231	void
1293	rxvt_term::pointer_cb (time_watcher &w)	1232	rxvt_term::pointer_cb (ev::timer &w, int revents)
1294	{	1233	{
1295	make_current ();	1234	make_current ();
1296		1235
1297	pointer_blank ();	1236	pointer_blank ();
1298	}	1237	}
…		…
1301	void	1240	void
1302	rxvt_term::mouse_report (XButtonEvent &ev)	1241	rxvt_term::mouse_report (XButtonEvent &ev)
1303	{	1242	{
1304	int button_number, key_state = 0;	1243	int button_number, key_state = 0;
1305	int x, y;	1244	int x, y;
		1245	int code = 32;
1306		1246
1307	x = Pixel2Col (ev.x);	1247	x = Pixel2Col (ev.x);
1308	y = Pixel2Row (ev.y);	1248	y = Pixel2Row (ev.y);
		1249	if (ev.type == MotionNotify)
		1250	{
		1251	if (x == mouse_row && y == mouse_col)
		1252	return;
		1253	mouse_row = x;
		1254	mouse_col = y;
		1255	code += 32;
		1256	}
1309		1257
1310	if (MEvent.button == AnyButton)	1258	if (MEvent.button == AnyButton)
1311	button_number = 3;	1259	button_number = 3;
1312	else	1260	else
1313	{	1261	{
…		…
1359	x + 1,	1307	x + 1,
1360	y + 1);	1308	y + 1);
1361	#endif	1309	#endif
1362		1310
1363	tt_printf ("\033[M%c%c%c",	1311	tt_printf ("\033[M%c%c%c",
1364	(32 + button_number + key_state),	1312	(code + button_number + key_state),
1365	(32 + x + 1),	1313	(32 + x + 1),
1366	(32 + y + 1));	1314	(32 + y + 1));
1367	}	1315	}
1368		1316
1369	/{{{ process an X event /	1317	/{{{ process an X event /
…		…
1473	&& ev.xfocus.mode != NotifyGrab)	1421	&& ev.xfocus.mode != NotifyGrab)
1474	focus_out ();	1422	focus_out ();
1475	break;	1423	break;
1476		1424
1477	case ConfigureNotify:	1425	case ConfigureNotify:
1478	/* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",	1426	/*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1479	ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,	1427	ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1480	szHint.width, szHint.height); */	1428	szHint.width, szHint.height);*/
1481	if (ev.xconfigure.window == parent[0])	1429	if (ev.xconfigure.window == parent[0])
1482	{	1430	{
1483	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))	1431	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1484	;	1432	;
1485		1433
…		…
1490	}	1438	}
1491	else	1439	else
1492	{	1440	{
1493	#ifdef HAVE_BG_PIXMAP	1441	#ifdef HAVE_BG_PIXMAP
1494	if (bgPixmap.window_position_sensitive ())	1442	if (bgPixmap.window_position_sensitive ())
		1443	{
		1444	if (mapped)
1495	update_background ();	1445	update_background ();
		1446	else
		1447	bgPixmap.invalidate ();
		1448	}
1496	#endif	1449	#endif
1497	}	1450	}
		1451
1498	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));	1452	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1499	}	1453	}
1500	break;	1454	break;
1501		1455
1502	case PropertyNotify:	1456	case PropertyNotify:
…		…
1519	case SelectionRequest:	1473	case SelectionRequest:
1520	selection_send (ev.xselectionrequest);	1474	selection_send (ev.xselectionrequest);
1521	break;	1475	break;
1522		1476
1523	case MapNotify:	1477	case MapNotify:
		1478	#ifdef HAVE_BG_PIXMAP
		1479	/* This is needed spcifically to fix the case of no window manager or a
		1480	* non-reparenting window manager. In those cases we never get first
		1481	* ConfigureNotify. Also that speeds startup under normal WM, by taking
		1482	* care of multiplicity of ConfigureNotify events arriwing while WM does
		1483	* reparenting.
		1484	* We should not render background immidiately, as there could be several
		1485	* ConfigureNotify's to follow. Lets take care of all of them in one scoop
		1486	* by scheduling background redraw as soon as we can, but giving a short
		1487	* bit of time for ConfigureNotifies to arrive.
		1488	* We should render background PRIOR to drawing any text, but AFTER all
		1489	* of ConfigureNotifys for the best results.
		1490	*/
		1491	if (bgPixmap.flags & bgPixmap_t::isInvalid)
		1492	update_background_ev.start (0.025);
		1493	#endif
1524	mapped = 1;	1494	mapped = 1;
1525	#ifdef TEXT_BLINK	1495	#ifdef TEXT_BLINK
1526	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);	1496	text_blink_ev.start ();
1527	#endif	1497	#endif
1528	HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));	1498	HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1529	break;	1499	break;
1530		1500
1531	case UnmapNotify:	1501	case UnmapNotify:
…		…
1552	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))	1522	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1553	{	1523	{
1554	scr_expose (ev.xexpose.x, ev.xexpose.y,	1524	scr_expose (ev.xexpose.x, ev.xexpose.y,
1555	ev.xexpose.width, ev.xexpose.height, False);	1525	ev.xexpose.width, ev.xexpose.height, False);
1556	}	1526	}
		1527
1557	want_refresh = 1;	1528	want_refresh = 1;
1558	}	1529	}
1559	else	1530	else
1560	{	1531	{
1561	XEvent unused_event;	1532	XEvent unused_event;
…		…
1563	while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))	1534	while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1564	;	1535	;
1565	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))	1536	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1566	;	1537	;
1567		1538
1568	if (isScrollbarWindow (ev.xany.window))	1539	if (scrollBar.state && ev.xany.window == scrollBar.win)
1569	{	1540	{
1570	scrollBar.setIdle ();	1541	scrollBar.state = STATE_IDLE;
1571	scrollbar_show (0);	1542	scrollbar_show (0);
1572	}	1543	}
1573	}	1544	}
1574	break;	1545	break;
1575		1546
1576	case MotionNotify:	1547	case MotionNotify:
1577	#ifdef POINTER_BLANK	1548	#ifdef POINTER_BLANK
1578	if (hidden_pointer)	1549	if (hidden_pointer)
1579	pointer_unblank ();	1550	pointer_unblank ();
1580	#endif	1551	#endif
		1552	if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask\|Button2Mask\|Button3Mask))
		1553	\|\| priv_modes & PrivMode_MouseAnyEvent)
		1554	mouse_report (ev.xbutton);
1581	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)	1555	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1582	break;	1556	break;
1583		1557
1584	if (ev.xany.window == vt)	1558	if (ev.xany.window == vt)
1585	{	1559	{
…		…
1619	int dist;	1593	int dist;
1620		1594
1621	/* don't clobber the current delay if we are	1595	/* don't clobber the current delay if we are
1622	* already in the middle of scrolling.	1596	* already in the middle of scrolling.
1623	*/	1597	*/
1624	if (!sel_scroll_ev.active)	1598	if (!sel_scroll_ev.is_active ())
1625	sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);	1599	sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1626		1600
1627	/* save the event params so we can highlight	1601	/* save the event params so we can highlight
1628	* the selection in the pending-scroll loop	1602	* the selection in the pending-scroll loop
1629	*/	1603	*/
1630	selection_save_x = ev.xbutton.x;	1604	selection_save_x = ev.xbutton.x;
…		…
1652	else	1626	else
1653	{	1627	{
1654	/* we are within the text window, so we	1628	/* we are within the text window, so we
1655	* shouldn't be scrolling	1629	* shouldn't be scrolling
1656	*/	1630	*/
1657	if (sel_scroll_ev.active)
1658	sel_scroll_ev.stop();	1631	sel_scroll_ev.stop();
1659	}	1632	}
1660	#endif	1633	#endif
1661	#ifdef MOUSE_THRESHOLD	1634	#ifdef MOUSE_THRESHOLD
1662	}	1635	}
1663	#endif	1636	#endif
1664	}	1637	}
1665	}	1638	}
1666	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1639	else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1667	{	1640	{
1668	while (XCheckTypedWindowEvent (dpy, scrollBar.win,	1641	while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1669	MotionNotify, &ev))	1642	MotionNotify, &ev))
1670	;	1643	;
1671		1644
…		…
1689	{	1662	{
1690	hidden_cursor = 0;	1663	hidden_cursor = 0;
1691	want_refresh = 1;	1664	want_refresh = 1;
1692	}	1665	}
1693		1666
1694	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);	1667	cursor_blink_ev.again ();
1695	}	1668	}
1696	#endif	1669	#endif
1697		1670
1698	#if defined(POINTER_BLANK)	1671	#if defined(POINTER_BLANK)
1699	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)	1672	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
…		…
1706		1679
1707	if (ev.type == KeyPress && hidden_pointer == 0)	1680	if (ev.type == KeyPress && hidden_pointer == 0)
1708	pointer_blank ();	1681	pointer_blank ();
1709	}	1682	}
1710	#endif	1683	#endif
		1684
		1685	refresh_check ();
1711	}	1686	}
1712		1687
1713	void	1688	void
1714	rxvt_term::focus_in ()	1689	rxvt_term::focus_in ()
1715	{	1690	{
…		…
1727	XSetICFocus (Input_Context);	1702	XSetICFocus (Input_Context);
1728	}	1703	}
1729	#endif	1704	#endif
1730	#if CURSOR_BLINK	1705	#if CURSOR_BLINK
1731	if (option (Opt_cursorBlink))	1706	if (option (Opt_cursorBlink))
1732	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);	1707	cursor_blink_ev.again ();
1733	#endif	1708	#endif
1734	#if OFF_FOCUS_FADING	1709	#if OFF_FOCUS_FADING
1735	if (rs[Rs_fade])	1710	if (rs[Rs_fade])
1736	{	1711	{
1737	pix_colors = pix_colors_focused;	1712	pix_colors = pix_colors_focused;
…		…
1775	XUnsetICFocus (Input_Context);	1750	XUnsetICFocus (Input_Context);
1776	#endif	1751	#endif
1777	#if CURSOR_BLINK	1752	#if CURSOR_BLINK
1778	if (option (Opt_cursorBlink))	1753	if (option (Opt_cursorBlink))
1779	cursor_blink_ev.stop ();	1754	cursor_blink_ev.stop ();
		1755
1780	hidden_cursor = 0;	1756	hidden_cursor = 0;
1781	#endif	1757	#endif
1782	#if OFF_FOCUS_FADING	1758	#if OFF_FOCUS_FADING
1783	if (rs[Rs_fade])	1759	if (rs[Rs_fade])
1784	{	1760	{
…		…
1824	\|\| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])	1800	\|\| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1825	{	1801	{
1826	bgPixmap.set_root_pixmap ();	1802	bgPixmap.set_root_pixmap ();
1827	update_background ();	1803	update_background ();
1828	}	1804	}
		1805
1829	break;	1806	break;
1830	}	1807	}
1831	# endif	1808	# endif
		1809
		1810	refresh_check ();
1832	}	1811	}
1833	#endif	1812	#endif
1834		1813
1835	void	1814	void
1836	rxvt_term::button_press (XButtonEvent &ev)	1815	rxvt_term::button_press (XButtonEvent &ev)
…		…
1891	mouse_report (ev);	1870	mouse_report (ev);
1892	}	1871	}
1893	#else	1872	#else
1894	MEvent.button = ev.button;	1873	MEvent.button = ev.button;
1895	mouse_report (ev);	1874	mouse_report (ev);
1896	#endif /* MOUSE_REPORT_DOUBLECLICK */	1875	#endif /* MOUSE_REPORT_DOUBLECLICK */
1897		1876
1898	}	1877	}
1899	else	1878	else
1900	{	1879	{
1901	if (ev.button != MEvent.button)	1880	if (ev.button != MEvent.button)
…		…
1949	}	1928	}
1950		1929
1951	/*	1930	/*
1952	* Scrollbar window processing of button press	1931	* Scrollbar window processing of button press
1953	*/	1932	*/
1954	if (isScrollbarWindow (ev.window))	1933	if (scrollBar.state && ev.window == scrollBar.win)
1955	{	1934	{
1956	scrollBar.setIdle ();	1935	page_dirn direction = NO_DIR;
		1936
		1937	if (scrollBar.upButton (ev.y))
		1938	direction = UP; /* up */
		1939	else if (scrollBar.dnButton (ev.y))
		1940	direction = DN; /* down */
		1941
		1942	scrollBar.state = STATE_IDLE;
1957	/*	1943	/*
1958	* Rxvt-style scrollbar:	1944	* Rxvt-style scrollbar:
1959	* move up if mouse is above slider	1945	* move up if mouse is above slider
1960	* move dn if mouse is below slider	1946	* move dn if mouse is below slider
1961	*	1947	*
…		…
1970	/*	1956	/*
1971	* Mouse report disabled scrollbar:	1957	* Mouse report disabled scrollbar:
1972	* arrow buttons - send up/down	1958	* arrow buttons - send up/down
1973	* click on scrollbar - send pageup/down	1959	* click on scrollbar - send pageup/down
1974	*/	1960	*/
1975	if ((scrollBar.style == R_SB_NEXT	1961	if (direction == UP)
1976	&& scrollbarnext_upButton (ev.y))
1977	\|\| (scrollBar.style == R_SB_RXVT
1978	&& scrollbarrxvt_upButton (ev.y)))
1979	tt_printf ("\033[A");	1962	tt_printf ("\033[A");
1980	else if ((scrollBar.style == R_SB_NEXT	1963	else if (direction == DN)
1981	&& scrollbarnext_dnButton (ev.y))
1982	\|\| (scrollBar.style == R_SB_RXVT
1983	&& scrollbarrxvt_dnButton (ev.y)))
1984	tt_printf ("\033[B");	1964	tt_printf ("\033[B");
1985	else	1965	else
1986	switch (ev.button)	1966	switch (ev.button)
1987	{	1967	{
1988	case Button2:	1968	case Button2:
…		…
1995	tt_printf ("\033[5~");	1975	tt_printf ("\033[5~");
1996	break;	1976	break;
1997	}	1977	}
1998	}	1978	}
1999	else	1979	else
2000	#endif /* NO_SCROLLBAR_REPORT */	1980	#endif /* NO_SCROLLBAR_REPORT */
2001
2002	{
2003	char upordown = 0;
2004
2005	if (scrollBar.style == R_SB_NEXT)
2006	{	1981	{
2007	if (scrollbarnext_upButton (ev.y))	1982	if (direction != NO_DIR)
2008	upordown = -1; /* up */
2009	else if (scrollbarnext_dnButton (ev.y))
2010	upordown = 1; /* down */
2011	}
2012	else if (scrollBar.style == R_SB_RXVT)
2013	{
2014	if (scrollbarrxvt_upButton (ev.y))
2015	upordown = -1; /* up */
2016	else if (scrollbarrxvt_dnButton (ev.y))
2017	upordown = 1; /* down */
2018	}
2019	if (upordown)
2020	{	1983	{
2021	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	1984	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
		1985	if (!cont_scroll_ev.is_active ())
2022	cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);	1986	cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2023	#endif	1987	#endif
2024	if (scr_page (upordown < 0 ? UP : DN, 1))	1988	if (scr_page (direction, 1))
2025	{	1989	{
2026	if (upordown < 0)	1990	if (direction == UP)
2027	scrollBar.setUp ();	1991	scrollBar.state = STATE_UP;
2028	else	1992	else
2029	scrollBar.setDn ();	1993	scrollBar.state = STATE_DOWN;
2030	}	1994	}
2031	}	1995	}
2032	else	1996	else
2033	switch (ev.button)	1997	switch (ev.button)
2034	{	1998	{
2035	case Button2:	1999	case Button2:
2036	switch (scrollbar_align)	2000	switch (scrollBar.align)
2037	{	2001	{
2038	case R_SB_ALIGN_TOP:	2002	case R_SB_ALIGN_TOP:
2039	csrO = 0;	2003	csrO = 0;
2040	break;	2004	break;
2041	case R_SB_ALIGN_CENTRE:	2005	case R_SB_ALIGN_CENTRE:
…		…
2049	if (scrollBar.style == R_SB_XTERM	2013	if (scrollBar.style == R_SB_XTERM
2050	\|\| scrollbar_above_slider (ev.y)	2014	\|\| scrollbar_above_slider (ev.y)
2051	\|\| scrollbar_below_slider (ev.y))	2015	\|\| scrollbar_below_slider (ev.y))
2052	scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());	2016	scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
2053		2017
2054	scrollBar.setMotion ();	2018	scrollBar.state = STATE_MOTION;
2055	break;	2019	break;
2056		2020
2057	case Button1:	2021	case Button1:
2058	if (scrollbar_align == R_SB_ALIGN_CENTRE)	2022	if (scrollBar.align == R_SB_ALIGN_CENTRE)
2059	csrO = ev.y - scrollBar.top;	2023	csrO = ev.y - scrollBar.top;
2060	/* FALLTHROUGH */	2024	/* FALLTHROUGH */
2061		2025
2062	case Button3:	2026	case Button3:
2063	if (scrollBar.style != R_SB_XTERM)	2027	if (scrollBar.style != R_SB_XTERM)
…		…
2073	scr_page (DN, nrow - 1);	2037	scr_page (DN, nrow - 1);
2074	# else	2038	# else
2075	scr_page (DN, nrow / 4);	2039	scr_page (DN, nrow / 4);
2076	# endif	2040	# endif
2077	else	2041	else
2078	scrollBar.setMotion ();	2042	scrollBar.state = STATE_MOTION;
2079	}	2043	}
2080	else	2044	else
2081	{	2045	{
2082	scr_page ((ev.button == Button1 ? DN : UP),	2046	scr_page ((ev.button == Button1 ? DN : UP),
2083	(nrow	2047	(nrow
…		…
2100		2064
2101	csrO = 0; /* reset csr Offset */	2065	csrO = 0; /* reset csr Offset */
2102	if (!bypass_keystate)	2066	if (!bypass_keystate)
2103	reportmode = !! (priv_modes & PrivMode_mouse_report);	2067	reportmode = !! (priv_modes & PrivMode_mouse_report);
2104		2068
2105	if (scrollbar_isUpDn ())	2069	if (scrollBar.state == STATE_UP \|\| scrollBar.state == STATE_DOWN)
2106	{	2070	{
2107	scrollBar.setIdle ();	2071	scrollBar.state = STATE_IDLE;
2108	scrollbar_show (0);	2072	scrollbar_show (0);
2109	}	2073	}
2110		2074
2111	#ifdef SELECTION_SCROLLING	2075	#ifdef SELECTION_SCROLLING
2112	if (sel_scroll_ev.active)
2113	sel_scroll_ev.stop();	2076	sel_scroll_ev.stop();
2114	#endif	2077	#endif
2115		2078
2116	if (ev.window == vt)	2079	if (ev.window == vt)
2117	{	2080	{
2118	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))	2081	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
…		…
2142	mouse_report (ev);	2105	mouse_report (ev);
2143	}	2106	}
2144	#else /* MOUSE_REPORT_DOUBLECLICK */	2107	#else /* MOUSE_REPORT_DOUBLECLICK */
2145	MEvent.button = AnyButton;	2108	MEvent.button = AnyButton;
2146	mouse_report (ev);	2109	mouse_report (ev);
2147	#endif /* MOUSE_REPORT_DOUBLECLICK */	2110	#endif /* MOUSE_REPORT_DOUBLECLICK */
2148	return;	2111	return;
2149	}	2112	}
2150		2113
2151	/*	2114	/*
2152	* dumb hack to compensate for the failure of click-and-drag	2115	* dumb hack to compensate for the failure of click-and-drag
…		…
2190	{	2153	{
2191	mouse_slip_wheel_speed += v ? -1 : 1;	2154	mouse_slip_wheel_speed += v ? -1 : 1;
2192	if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;	2155	if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2193	if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;	2156	if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2194		2157
2195	if (slip_wheel_ev.at < NOW)	2158	if (!slip_wheel_ev.is_active ())
2196	slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;	2159	slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2197
2198	slip_wheel_ev.start ();
2199	}	2160	}
2200	else	2161	else
		2162	# endif
2201	{	2163	{
2202	# endif
2203	scr_page (v, i);	2164	scr_page (v, i);
2204	scrollbar_show (1);	2165	scrollbar_show (1);
2205	# ifdef MOUSE_SLIP_WHEELING
2206	}	2166	}
2207	# endif
2208	}	2167	}
2209	break;	2168	break;
2210	#endif	2169	#endif
2211	}	2170	}
2212	}	2171	}
…		…
2271		2230
2272	if (!option (Opt_jumpScroll) \|\| refresh_count >= nrow - 1)	2231	if (!option (Opt_jumpScroll) \|\| refresh_count >= nrow - 1)
2273	{	2232	{
2274	refresh_count = 0;	2233	refresh_count = 0;
2275		2234
2276	if (!option (Opt_skipScroll) \|\| io_manager::now () > NOW + 1. / 60.)	2235	if (!option (Opt_skipScroll) \|\| ev_time () > ev::now () + 1. / 60.)
2277	{	2236	{
2278	refreshnow = true;	2237	refreshnow = true;
2279	ch = NOCHAR;	2238	ch = NOCHAR;
2280	break;	2239	break;
2281	}	2240	}
…		…
2492	}	2451	}
2493	}	2452	}
2494		2453
2495	pclose_printer (fd);	2454	pclose_printer (fd);
2496	}	2455	}
2497	#endif /* PRINTPIPE */	2456	#endif /* PRINTPIPE */
2498	/}}} /	2457	/}}} /
2499		2458
2500	/* INDENT-OFF */	2459	/* INDENT-OFF */
2501	enum {	2460	enum {
2502	C1_40 = 0x40,	2461	C1_40 = 0x40,
…		…
2795	nargs = 0;	2754	nargs = 0;
2796		2755
2797	priv = 0;	2756	priv = 0;
2798	ch = cmd_getc ();	2757	ch = cmd_getc ();
2799	if (ch >= '<' && ch <= '?')	2758	if (ch >= '<' && ch <= '?')
		2759	{
2800	{ /* '<' '=' '>' '?' */	2760	/* '<' '=' '>' '?' */
2801	priv = ch;	2761	priv = ch;
2802	ch = cmd_getc ();	2762	ch = cmd_getc ();
2803	}	2763	}
2804		2764
2805	/* read any numerical arguments */	2765	/* read any numerical arguments */
…		…
2848	{	2808	{
2849	// first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,	2809	// first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2850	// 'U' for rxvt-unicode != 7.[34] (where it was broken).	2810	// 'U' for rxvt-unicode != 7.[34] (where it was broken).
2851	//	2811	//
2852	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt	2812	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2853	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify	2813	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2854	// that we do not support xterm mouse reporting (should be 95 when we do).	2814	// versions.
2855	//	2815	//
2856	tt_printf ("\033[>%d;94;0c", 'U');	2816	tt_printf ("\033[>%d;95;0c", 'U');
2857	}	2817	}
2858	break;	2818	break;
		2819
2859	case '?':	2820	case '?':
2860	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')	2821	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')
2861	process_terminal_mode (ch, priv, nargs, arg);	2822	process_terminal_mode (ch, priv, nargs, arg);
2862	break;	2823	break;
2863	}	2824	}
…		…
3379	*buf++ = '\0';	3340	*buf++ = '\0';
3380		3341
3381	process_color_seq (op, color, name, resp);	3342	process_color_seq (op, color, name, resp);
3382	}	3343	}
3383	break;	3344	break;
		3345	case Rxvt_restoreFG:
3384	case XTerm_Color00:	3346	case XTerm_Color00:
3385	process_color_seq (op, Color_fg, str, resp);	3347	process_color_seq (op, Color_fg, str, resp);
3386	break;	3348	break;
		3349	case Rxvt_restoreBG:
3387	case XTerm_Color01:	3350	case XTerm_Color01:
3388	process_color_seq (op, Color_bg, str, resp);	3351	process_color_seq (op, Color_bg, str, resp);
3389	break;	3352	break;
3390	#ifndef NO_CURSORCOLOR	3353	#ifndef NO_CURSORCOLOR
3391	case XTerm_Color_cursor:	3354	case XTerm_Color_cursor:
…		…
3417	#if ENABLE_TRANSPARENCY	3380	#if ENABLE_TRANSPARENCY
3418	case URxvt_Color_tint:	3381	case URxvt_Color_tint:
3419	process_color_seq (op, Color_tint, str, resp);	3382	process_color_seq (op, Color_tint, str, resp);
3420	{	3383	{
3421	bool changed = false;	3384	bool changed = false;
		3385
3422	if (ISSET_PIXCOLOR (Color_tint))	3386	if (ISSET_PIXCOLOR (Color_tint))
3423	changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);	3387	changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3424	else	3388	else
3425	changed = bgPixmap.unset_tint ();	3389	changed = bgPixmap.unset_tint ();
		3390
3426	if (changed)	3391	if (changed)
3427	update_background ();	3392	update_background ();
3428	}	3393	}
3429		3394
3430	break;	3395	break;
…		…
3453	changed++;	3418	changed++;
3454	str = strchr (str, ';');	3419	str = strchr (str, ';');
3455	if (str == NULL)	3420	if (str == NULL)
3456	bgPixmap.set_defaultGeometry ();	3421	bgPixmap.set_defaultGeometry ();
3457	}	3422	}
		3423
3458	while (str)	3424	while (str)
3459	{	3425	{
3460	str++;	3426	str++;
3461	if (bgPixmap.set_geometry (str))	3427	if (bgPixmap.set_geometry (str))
3462	changed++;	3428	changed++;
3463	str = strchr (str, ';');	3429	str = strchr (str, ';');
3464	}	3430	}
		3431
3465	if (changed)	3432	if (changed)
3466	update_background ();	3433	update_background ();
3467	}	3434	}
3468	break;	3435	break;
3469	#endif	3436	#endif
3470
3471	case Rxvt_restoreFG:
3472	set_window_color (Color_fg, str);
3473	break;
3474	case Rxvt_restoreBG:
3475	set_window_color (Color_bg, str);
3476	break;
3477		3437
3478	case XTerm_logfile:	3438	case XTerm_logfile:
3479	// TODO, when secure mode?	3439	// TODO, when secure mode?
3480	break;	3440	break;
3481		3441
…		…
3625	{ 66, PrivMode_aplKP },	3585	{ 66, PrivMode_aplKP },
3626	#ifndef NO_BACKSPACE_KEY	3586	#ifndef NO_BACKSPACE_KEY
3627	{ 67, PrivMode_BackSpace },	3587	{ 67, PrivMode_BackSpace },
3628	#endif	3588	#endif
3629	{ 1000, PrivMode_MouseX11 },	3589	{ 1000, PrivMode_MouseX11 },
3630	// 1001 Use Hilite Mouse Tracking. NYI, TODO	3590	{ 1002, PrivMode_MouseBtnEvent },
3631	// 1002 Use Cell Motion Mouse Tracking. NYI, TODO	3591	{ 1003, PrivMode_MouseAnyEvent },
3632	// 1003 Use All Motion Mouse Tracking. NYI, TODO
3633	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension	3592	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension
3634	{ 1011, PrivMode_Keypress }, // rxvt extension	3593	{ 1011, PrivMode_Keypress }, // rxvt extension
3635	// 1035 enable modifiers for alt, numlock NYI	3594	// 1035 enable modifiers for alt, numlock NYI
3636	// 1036 send ESC for meta keys NYI	3595	// 1036 send ESC for meta keys NYI
3637	// 1037 send DEL for keypad delete NYI	3596	// 1037 send DEL for keypad delete NYI
3638	{ 1047, PrivMode_Screen },	3597	{ 1047, PrivMode_Screen },
3639	// 1048 save and restore cursor	3598	// 1048 save and restore cursor
3640	{ 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */	3599	{ 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3641	// 1051, 1052, 1060, 1061 keyboard emulation NYI	3600	// 1051, 1052, 1060, 1061 keyboard emulation NYI
		3601	{ 2004, PrivMode_BracketPaste },
3642	};	3602	};
3643		3603
3644	if (nargs == 0)	3604	if (nargs == 0)
3645	return;	3605	return;
3646		3606
…		…
3694	*/	3654	*/
3695	PrivMode (1, PrivMode_vt52);	3655	PrivMode (1, PrivMode_vt52);
3696	break;	3656	break;
3697	case 3: /* 80/132 */	3657	case 3: /* 80/132 */
3698	if (priv_modes & PrivMode_132OK)	3658	if (priv_modes & PrivMode_132OK)
		3659	{
		3660	scr_poweron ();
3699	set_widthheight (((state ? 132 : 80) * fwidth), height);	3661	set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);
		3662	}
3700	break;	3663	break;
3701	case 4: /* smooth scrolling */	3664	case 4: /* smooth scrolling */
3702	set_option (Opt_jumpScroll, !state);	3665	set_option (Opt_jumpScroll, !state);
3703	break;	3666	break;
3704	case 5: /* reverse video */	3667	case 5: /* reverse video */
…		…
3711	scr_autowrap (state);	3674	scr_autowrap (state);
3712	break;	3675	break;
3713	/* case 8: - auto repeat, can't do on a per window basis */	3676	/* case 8: - auto repeat, can't do on a per window basis */
3714	case 9: /* X10 mouse reporting */	3677	case 9: /* X10 mouse reporting */
3715	if (state) /* orthogonal */	3678	if (state) /* orthogonal */
3716	priv_modes &= ~PrivMode_MouseX11;	3679	priv_modes &= ~(PrivMode_MouseX11\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);
3717	break;	3680	break;
3718	#ifdef scrollBar_esc	3681	#ifdef scrollBar_esc
3719	case scrollBar_esc:	3682	case scrollBar_esc:
3720	if (scrollbar_mapping (state))	3683	if (scrollbar_mapping (state))
3721	{	3684	{
…		…
3734	break;	3697	break;
3735	/* case 66: - application key pad */	3698	/* case 66: - application key pad */
3736	/* case 67: - backspace key */	3699	/* case 67: - backspace key */
3737	case 1000: /* X11 mouse reporting */	3700	case 1000: /* X11 mouse reporting */
3738	if (state) /* orthogonal */	3701	if (state) /* orthogonal */
3739	priv_modes &= ~PrivMode_MouseX10;	3702	priv_modes &= ~(PrivMode_MouseX10\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);
3740	break;	3703	break;
3741	#if 0
3742	case 1001:	3704	case 1002:
3743	break; /* X11 mouse highlighting */	3705	case 1003:
3744	#endif	3706	if (state)
		3707	{
		3708	priv_modes &= ~(PrivMode_MouseX10\|PrivMode_MouseX11);
		3709	priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
		3710	vt_emask_mouse = PointerMotionMask;
		3711	}
		3712	else
		3713	vt_emask_mouse = NoEventMask;
		3714	vt_select_input ();
		3715	break;
3745	case 1010: /* scroll to bottom on TTY output inhibit */	3716	case 1010: /* scroll to bottom on TTY output inhibit */
3746	set_option (Opt_scrollTtyOutput, !state);	3717	set_option (Opt_scrollTtyOutput, !state);
3747	break;	3718	break;
3748	case 1011: /* scroll to bottom on key press */	3719	case 1011: /* scroll to bottom on key press */
3749	set_option (Opt_scrollTtyKeypress, state);	3720	set_option (Opt_scrollTtyKeypress, state);
…		…
3926	rxvt_term::process_graphics ()	3897	rxvt_term::process_graphics ()
3927	{	3898	{
3928	unicode_t ch, cmd = cmd_getc ();	3899	unicode_t ch, cmd = cmd_getc ();
3929		3900
3930	if (cmd == 'Q')	3901	if (cmd == 'Q')
		3902	{
3931	{ /* query graphics */	3903	/* query graphics */
3932	tt_printf ("\033G0\012"); /* no graphics */	3904	tt_printf ("\033G0\012"); /* no graphics */
3933	return;	3905	return;
3934	}	3906	}
3935	/* swallow other graphics sequences until terminating ':' */	3907	/* swallow other graphics sequences until terminating ':' */
3936	do	3908	do
…		…
3986	v_buffer = (char *)realloc (v_buffer, v_buflen + len);	3958	v_buffer = (char *)realloc (v_buffer, v_buflen + len);
3987		3959
3988	memcpy (v_buffer + v_buflen, data, len);	3960	memcpy (v_buffer + v_buflen, data, len);
3989	v_buflen += len;	3961	v_buflen += len;
3990		3962
3991	pty_ev.set (EVENT_READ \| EVENT_WRITE);	3963	pty_ev.set (ev::READ \| ev::WRITE);
3992	}	3964	}
3993		3965
3994	void rxvt_term::pty_write ()	3966	void rxvt_term::pty_write ()
3995	{	3967	{
3996	int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));	3968	int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
…		…
4002	if (v_buflen == 0)	3974	if (v_buflen == 0)
4003	{	3975	{
4004	free (v_buffer);	3976	free (v_buffer);
4005	v_buffer = 0;	3977	v_buffer = 0;
4006		3978
4007	pty_ev.set (EVENT_READ);	3979	pty_ev.set (ev::READ);
4008	return;	3980	return;
4009	}	3981	}
4010		3982
4011	memmove (v_buffer, v_buffer + written, v_buflen);	3983	memmove (v_buffer, v_buffer + written, v_buflen);
4012	}	3984	}
4013	else if (written != -1 \|\| (errno != EAGAIN && errno != EINTR))	3985	else if (written != -1 \|\| (errno != EAGAIN && errno != EINTR))
4014	pty_ev.set (EVENT_READ);	3986	pty_ev.set (ev::READ);
4015	}	3987	}
4016		3988
4017	/----------------------- end-of-file (C source) -----------------------/	3989	/----------------------- end-of-file (C source) -----------------------/
4018		3990

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.359 by ayin, Mon Oct 15 14:56:06 2007 UTC vs. Revision 1.409 by ayin, Sat Feb 16 15:39:20 2008 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.359 by ayin, Mon Oct 15 14:56:06 2007 UTC vs.
Revision 1.409 by ayin, Sat Feb 16 15:39:20 2008 UTC