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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.349 by ayin, Sun Aug 26 18:16:52 2007 UTC vs.
Revision 1.408 by ayin, Sat Feb 16 13:36:10 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
302	void	339	void
303	rxvt_term::key_press (XKeyEvent &ev)	340	rxvt_term::key_press (XKeyEvent &ev)
304	{	341	{
305	int ctrl, meta, shft, len;	342	int ctrl, meta, shft, len;
306	unsigned int newlen;
307	KeySym keysym;	343	KeySym keysym;
308	int valid_keysym;	344	int valid_keysym;
309	char kbuf[KBUFSZ];	345	char kbuf[KBUFSZ];
310		346
311	#if ISO_14755	347	#if ISO_14755
…		…
546	}	582	}
547	#endif	583	#endif
548		584
549	if (keysym >= 0xFF00 && keysym <= 0xFFFF)	585	if (keysym >= 0xFF00 && keysym <= 0xFFFF)
550	{	586	{
551	{	587	bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
552	newlen = 1;	588	unsigned int newlen = 1;
553	switch (keysym)	589
		590	switch (translate_keypad (keysym, kp))
554	{	591	{
555	#ifndef NO_BACKSPACE_KEY	592	#ifndef NO_BACKSPACE_KEY
556	case XK_BackSpace:	593	case XK_BackSpace:
557	if (priv_modes & PrivMode_HaveBackSpace)	594	if (priv_modes & PrivMode_HaveBackSpace)
558	{	595	{
559	kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)	596	kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
560	^ !!ctrl) ? '\b' : '\177';	597	^ !!ctrl) ? '\b' : '\177';
561	kbuf[1] = '\0';	598	kbuf[1] = '\0';
562	}	599	}
563	else	600	else
564	strcpy (kbuf, key_backspace);	601	strcpy (kbuf, rs[Rs_backspace_key]);
565	break;	602	break;
566	#endif	603	#endif
567	#ifndef NO_DELETE_KEY	604	#ifndef NO_DELETE_KEY
568	# ifdef XK_KP_Prior
569	case XK_KP_Delete:
570	/* allow shift to override */
571	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
572	{
573	strcpy (kbuf, "\033On");
574	break;
575	}
576	/* FALLTHROUGH */
577	# endif
578	case XK_Delete:	605	case XK_Delete:
579	strcpy (kbuf, key_delete);	606	strcpy (kbuf, rs[Rs_delete_key]);
580	break;	607	break;
581	#endif	608	#endif
582	case XK_Tab:	609	case XK_Tab:
583	if (shft)	610	if (shft)
584	strcpy (kbuf, "\033[Z");	611	strcpy (kbuf, "\033[Z");
…		…
594	#endif	621	#endif
595	newlen = 0;	622	newlen = 0;
596	}	623	}
597	break;	624	break;
598		625
599	#ifdef XK_KP_Left
600	case XK_KP_Up: /* \033Ox or standard */
601	case XK_KP_Down: /* \033Or or standard */
602	case XK_KP_Right: /* \033Ov or standard */
603	case XK_KP_Left: /* \033Ot or standard */
604	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
605	{
606	strcpy (kbuf, "\033OZ");
607	kbuf[2] = "txvr"[keysym - XK_KP_Left];
608	break;
609	}
610	else
611	/* translate to std. cursor key */
612	keysym = XK_Left + (keysym - XK_KP_Left);
613	/* FALLTHROUGH */
614	#endif
615	case XK_Up: /* "\033[A" */	626	case XK_Up: /* "\033[A" */
616	case XK_Down: /* "\033[B" */	627	case XK_Down: /* "\033[B" */
617	case XK_Right: /* "\033[C" */	628	case XK_Right: /* "\033[C" */
618	case XK_Left: /* "\033[D" */	629	case XK_Left: /* "\033[D" */
619	strcpy (kbuf, "\033[Z");	630	strcpy (kbuf, "\033[Z");
…		…
629	else if (priv_modes & PrivMode_aplCUR)	640	else if (priv_modes & PrivMode_aplCUR)
630	kbuf[1] = 'O';	641	kbuf[1] = 'O';
631	break;	642	break;
632		643
633	#ifndef UNSHIFTED_SCROLLKEYS	644	#ifndef UNSHIFTED_SCROLLKEYS
634	# ifdef XK_KP_Prior
635	case XK_KP_Prior:
636	/* allow shift to override */
637	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
638	{
639	strcpy (kbuf, "\033Oy");
640	break;
641	}
642	/* FALLTHROUGH */
643	# endif
644	case XK_Prior:	645	case XK_Prior:
645	strcpy (kbuf, "\033[5~");	646	strcpy (kbuf, "\033[5~");
646	break;	647	break;
647	# ifdef XK_KP_Next
648	case XK_KP_Next:
649	/* allow shift to override */
650	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
651	{
652	strcpy (kbuf, "\033Os");
653	break;
654	}
655	/* FALLTHROUGH */
656	# endif
657	case XK_Next:	648	case XK_Next:
658	strcpy (kbuf, "\033[6~");	649	strcpy (kbuf, "\033[6~");
659	break;	650	break;
660	#endif	651	#endif
661	case XK_KP_Enter:	652	case XK_KP_Enter:
662	/* allow shift to override */	653	/* allow shift to override */
663	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)	654	if (kp)
664	{	655	{
665	strcpy (kbuf, "\033OM");	656	strcpy (kbuf, "\033OM");
666	break;	657	break;
667	}	658	}
668		659
…		…
680	kbuf[0] = '\015';	671	kbuf[0] = '\015';
681	kbuf[1] = '\0';	672	kbuf[1] = '\0';
682	}	673	}
683	break;	674	break;
684		675
685	#ifdef XK_KP_Begin
686	case XK_KP_Begin:
687	strcpy (kbuf, "\033Ou");
688	break;
689
690	#endif
691	case XK_KP_F1: /* "\033OP" */	676	case XK_KP_F1: /* "\033OP" */
692	case XK_KP_F2: /* "\033OQ" */	677	case XK_KP_F2: /* "\033OQ" */
693	case XK_KP_F3: /* "\033OR" */	678	case XK_KP_F3: /* "\033OR" */
694	case XK_KP_F4: /* "\033OS" */	679	case XK_KP_F4: /* "\033OS" */
695	strcpy (kbuf, "\033OP");	680	strcpy (kbuf, "\033OP");
…		…
711	case XK_KP_6: /* "\033Ov" : "6" */	696	case XK_KP_6: /* "\033Ov" : "6" */
712	case XK_KP_7: /* "\033Ow" : "7" */	697	case XK_KP_7: /* "\033Ow" : "7" */
713	case XK_KP_8: /* "\033Ox" : "8" */	698	case XK_KP_8: /* "\033Ox" : "8" */
714	case XK_KP_9: /* "\033Oy" : "9" */	699	case XK_KP_9: /* "\033Oy" : "9" */
715	/* allow shift to override */	700	/* allow shift to override */
716	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)	701	if (kp)
717	{	702	{
718	strcpy (kbuf, "\033Oj");	703	strcpy (kbuf, "\033Oj");
719	kbuf[2] += (keysym - XK_KP_Multiply);	704	kbuf[2] += (keysym - XK_KP_Multiply);
720	}	705	}
721	else	706	else
…		…
727		712
728	case XK_Find:	713	case XK_Find:
729	strcpy (kbuf, "\033[1~");	714	strcpy (kbuf, "\033[1~");
730	break;	715	break;
731		716
732	#ifdef XK_KP_Insert
733	case XK_KP_Insert:
734	/* allow shift to override */
735	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
736	{
737	strcpy (kbuf, "\033Op");
738	break;
739	}
740	/* FALLTHROUGH */
741	#endif
742	case XK_Insert:	717	case XK_Insert:
743	strcpy (kbuf, "\033[2~");	718	strcpy (kbuf, "\033[2~");
744	break;	719	break;
745	#ifdef DXK_Remove /* support for DEC remove like key */	720	#ifdef DXK_Remove /* support for DEC remove like key */
746	case DXK_Remove:	721	case DXK_Remove:
…		…
750	strcpy (kbuf, "\033[3~");	725	strcpy (kbuf, "\033[3~");
751	break;	726	break;
752	case XK_Select:	727	case XK_Select:
753	strcpy (kbuf, "\033[4~");	728	strcpy (kbuf, "\033[4~");
754	break;	729	break;
755	#ifdef XK_KP_End
756	case XK_KP_End:
757	/* allow shift to override */
758	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
759	{
760	strcpy (kbuf, "\033Oq");
761	break;
762	}
763	/* FALLTHROUGH */
764	#endif
765	case XK_End:	730	case XK_End:
766	strcpy (kbuf, KS_END);	731	strcpy (kbuf, KS_END);
767	break;	732	break;
768	#ifdef XK_KP_Home
769	case XK_KP_Home:
770	/* allow shift to override */
771	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
772	{
773	strcpy (kbuf, "\033Ow");
774	break;
775	}
776	/* FALLTHROUGH */
777	#endif
778	case XK_Home:	733	case XK_Home:
779	strcpy (kbuf, KS_HOME);	734	strcpy (kbuf, KS_HOME);
780	break;	735	break;
781		736
782	#define FKEY(n, fkey) \	737	#define FKEY(n, fkey) \
…		…
839	break;	794	break;
840	}	795	}
841		796
842	if (newlen)	797	if (newlen)
843	len = strlen (kbuf);	798	len = strlen (kbuf);
844	}
845		799
846	/*	800	/*
847	* Pass meta for all function keys, if 'meta' option set	801	* Pass meta for all function keys, if 'meta' option set
848	*/	802	*/
849	#ifdef META8_OPTION	803	#ifdef META8_OPTION
…		…
1034	void	988	void
1035	rxvt_term::flush ()	989	rxvt_term::flush ()
1036	{	990	{
1037	flush_ev.stop ();	991	flush_ev.stop ();
1038		992
1039	#ifdef ENABLE_TRANSPARENCY	993	#ifdef HAVE_BG_PIXMAP
1040	if (want_full_refresh)	994	if (bgPixmap.check_clearChanged ())
1041	{	995	{
1042	want_full_refresh = 0;	996	// scr_clear (true); This needs to be researched further!
1043	scr_clear ();
1044	scr_touch (false);	997	scr_touch (false);
1045	}	998	}
1046	#endif	999	#endif
1047		1000
1048	if (want_refresh)	1001	if (want_refresh)
…		…
1093	}	1046	}
1094		1047
1095	display->flush ();	1048	display->flush ();
1096	}	1049	}
1097		1050
		1051	/* checks wether a refresh is requested and starts the refresh timer */
1098	void	1052	void
1099	rxvt_term::check_cb (check_watcher &w)	1053	rxvt_term::refresh_check ()
1100	{	1054	{
1101	make_current ();	1055	if (want_refresh && !flush_ev.is_active ())
		1056	flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1102		1057
1103	display->flush ();	1058	display->flush ();
1104
1105	if (want_refresh && !flush_ev.active)
1106	flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1107	}	1059	}
1108		1060
1109	void	1061	void
1110	rxvt_term::flush_cb (time_watcher &w)	1062	rxvt_term::flush_cb (ev::timer &w, int revents)
1111	{	1063	{
1112	make_current ();	1064	make_current ();
1113		1065
1114	refresh_count = 0;	1066	refresh_count = 0;
1115	flush ();	1067	flush ();
1116	}	1068	}
1117		1069
1118	#ifdef CURSOR_BLINK	1070	#ifdef CURSOR_BLINK
1119	void	1071	void
1120	rxvt_term::cursor_blink_cb (time_watcher &w)	1072	rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1121	{	1073	{
1122	hidden_cursor = !hidden_cursor;	1074	hidden_cursor = !hidden_cursor;
1123	want_refresh = 1;	1075	want_refresh = 1;
1124		1076	refresh_check ();
1125	w.start (w.at + CURSOR_BLINK_INTERVAL);
1126	}	1077	}
1127	#endif	1078	#endif
1128		1079
1129	#ifdef TEXT_BLINK	1080	#ifdef TEXT_BLINK
1130	void	1081	void
1131	rxvt_term::text_blink_cb (time_watcher &w)	1082	rxvt_term::text_blink_cb (ev::timer &w, int revents)
1132	{	1083	{
1133	if (scr_refresh_rend (RS_Blink, RS_Blink))	1084	if (scr_refresh_rend (RS_Blink, RS_Blink))
1134	{	1085	{
1135	hidden_text = !hidden_text;	1086	hidden_text = !hidden_text;
1136	want_refresh = 1;	1087	want_refresh = 1;
1137	w.start (w.at + TEXT_BLINK_INTERVAL);	1088	refresh_check ();
1138	}	1089	}
		1090	else
		1091	w.stop ();
1139	}	1092	}
1140	#endif	1093	#endif
1141		1094
1142	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	1095	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1143	void	1096	void
1144	rxvt_term::cont_scroll_cb (time_watcher &w)	1097	rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1145	{	1098	{
1146	if ((scrollbar_isUp() \|\| scrollbar_isDn()) &&	1099	if ((scrollBar.state == STATE_UP \|\| scrollBar.state == STATE_DOWN)
1147	scr_page (scrollbar_isUp() ? UP : DN, 1))	1100	&& scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1148	{	1101	{
1149	want_refresh = 1;	1102	want_refresh = 1;
1150	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1103	refresh_check ();
1151	}	1104	}
		1105	else
		1106	w.stop ();
1152	}	1107	}
1153	#endif	1108	#endif
1154		1109
1155	#ifdef SELECTION_SCROLLING	1110	#ifdef SELECTION_SCROLLING
1156	void	1111	void
1157	rxvt_term::sel_scroll_cb (time_watcher &w)	1112	rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1158	{	1113	{
1159	if (scr_page (scroll_selection_dir, scroll_selection_lines))	1114	if (scr_page (scroll_selection_dir, scroll_selection_lines))
1160	{	1115	{
1161	selection_extend (selection_save_x, selection_save_y, selection_save_state);	1116	selection_extend (selection_save_x, selection_save_y, selection_save_state);
1162	want_refresh = 1;	1117	want_refresh = 1;
1163	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1118	refresh_check ();
1164	}	1119	}
		1120	else
		1121	w.stop ();
1165	}	1122	}
1166	#endif	1123	#endif
1167		1124
1168	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	1125	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1169	void	1126	void
1170	rxvt_term::slip_wheel_cb (time_watcher &w)	1127	rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1171	{	1128	{
1172	if (mouse_slip_wheel_speed == 0	1129	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	{	1130	{
1176	if (view_start == top_row \|\| view_start == 0)
1177	mouse_slip_wheel_speed = 0;
1178
1179	want_refresh = 1;	1131	want_refresh = 1;
1180	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1132	refresh_check ();
		1133	}
		1134
		1135	if (view_start == top_row \|\| view_start == 0 \|\| mouse_slip_wheel_speed == 0)
		1136	{
		1137	mouse_slip_wheel_speed = 0;
		1138	w.stop ();
1181	}	1139	}
1182	}	1140	}
1183	#endif	1141	#endif
1184		1142
1185	#if LINUX_YIELD_HACK	1143	#if LINUX_YIELD_HACK
1186	static struct event_handler	1144	static struct event_handler
1187	{	1145	{
1188	check_watcher yield_ev;	1146	ev::prepare yield_ev;
1189		1147
1190	void yield_cb (check_watcher &w)	1148	void yield_cb (ev::prepare &w, int revents)
1191	{	1149	{
1192	// this should really be sched_yield(), but the linux guys thought	1150	// this should really be sched_yield(), but the linux guys thought
1193	// that giving a process calling sched_yield () less cpu time than	1151	// 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	1152	// ones with high nice levels is a useful thing to do. It surely is is
1195	// allowed by the sus... as is returning ENOSYS.	1153	// allowed by the sus... as is returning ENOSYS.
…		…
1246		1204
1247	return false;	1205	return false;
1248	}	1206	}
1249		1207
1250	void	1208	void
1251	rxvt_term::pty_cb (io_watcher &w, short revents)	1209	rxvt_term::pty_cb (ev::io &w, int revents)
1252	{	1210	{
1253	make_current ();	1211	make_current ();
1254		1212
1255	if (revents & EVENT_READ)	1213	if (revents & ev::READ)
1256	// loop, but don't allow a single term to monopolize us	1214	// loop, but don't allow a single term to monopolize us
1257	while (pty_fill ())	1215	while (pty_fill ())
1258	if (cmd_parse ())	1216	if (cmd_parse ())
1259	break;	1217	break;
1260		1218
1261	if (revents & EVENT_WRITE)	1219	if (revents & ev::WRITE)
1262	pty_write ();	1220	pty_write ();
		1221
		1222	refresh_check ();
1263	}	1223	}
1264		1224
1265	void	1225	void
1266	rxvt_term::pointer_unblank ()	1226	rxvt_term::pointer_unblank ()
1267	{	1227	{
…		…
1270		1230
1271	#ifdef POINTER_BLANK	1231	#ifdef POINTER_BLANK
1272	hidden_pointer = 0;	1232	hidden_pointer = 0;
1273		1233
1274	if (option (Opt_pointerBlank))	1234	if (option (Opt_pointerBlank))
1275	pointer_ev.start (NOW + pointerBlankDelay);	1235	pointer_ev.start (pointerBlankDelay);
1276	#endif	1236	#endif
1277	}	1237	}
1278		1238
1279	#ifdef POINTER_BLANK	1239	#ifdef POINTER_BLANK
1280	void	1240	void
…		…
1288		1248
1289	hidden_pointer = 1;	1249	hidden_pointer = 1;
1290	}	1250	}
1291		1251
1292	void	1252	void
1293	rxvt_term::pointer_cb (time_watcher &w)	1253	rxvt_term::pointer_cb (ev::timer &w, int revents)
1294	{	1254	{
1295	make_current ();	1255	make_current ();
1296		1256
1297	pointer_blank ();	1257	pointer_blank ();
1298	}	1258	}
…		…
1301	void	1261	void
1302	rxvt_term::mouse_report (XButtonEvent &ev)	1262	rxvt_term::mouse_report (XButtonEvent &ev)
1303	{	1263	{
1304	int button_number, key_state = 0;	1264	int button_number, key_state = 0;
1305	int x, y;	1265	int x, y;
		1266	int code = 32;
1306		1267
1307	x = ev.x;	1268	x = Pixel2Col (ev.x);
1308	y = ev.y;	1269	y = Pixel2Row (ev.y);
1309	pixel_position (&x, &y);	1270	if (ev.type == MotionNotify)
		1271	{
		1272	if (x == mouse_row && y == mouse_col)
		1273	return;
		1274	mouse_row = x;
		1275	mouse_col = y;
		1276	code += 32;
		1277	}
1310		1278
1311	if (MEvent.button == AnyButton)	1279	if (MEvent.button == AnyButton)
1312	button_number = 3;	1280	button_number = 3;
1313	else	1281	else
1314	{	1282	{
…		…
1360	x + 1,	1328	x + 1,
1361	y + 1);	1329	y + 1);
1362	#endif	1330	#endif
1363		1331
1364	tt_printf ("\033[M%c%c%c",	1332	tt_printf ("\033[M%c%c%c",
1365	(32 + button_number + key_state),	1333	(code + button_number + key_state),
1366	(32 + x + 1),	1334	(32 + x + 1),
1367	(32 + y + 1));	1335	(32 + y + 1));
1368	}	1336	}
1369		1337
1370	/{{{ process an X event /	1338	/{{{ process an X event /
…		…
1474	&& ev.xfocus.mode != NotifyGrab)	1442	&& ev.xfocus.mode != NotifyGrab)
1475	focus_out ();	1443	focus_out ();
1476	break;	1444	break;
1477		1445
1478	case ConfigureNotify:	1446	case ConfigureNotify:
1479	/* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",	1447	/*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1480	ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,	1448	ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1481	szHint.width, szHint.height);*/	1449	szHint.width, szHint.height);*/
1482	if (ev.xconfigure.window == parent[0])	1450	if (ev.xconfigure.window == parent[0])
1483	{	1451	{
1484	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))	1452	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
…		…
1489	seen_resize = 1;	1457	seen_resize = 1;
1490	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1458	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1491	}	1459	}
1492	else	1460	else
1493	{	1461	{
1494	#ifdef ENABLE_TRANSPARENCY	1462	#ifdef HAVE_BG_PIXMAP
1495	if (option (Opt_transparent))	1463	if (bgPixmap.window_position_sensitive ())
		1464	{
		1465	if (mapped)
1496	update_background ();	1466	update_background ();
		1467	else
		1468	bgPixmap.invalidate ();
		1469	}
1497	#endif	1470	#endif
1498	}	1471	}
		1472
1499	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));	1473	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1500	}	1474	}
1501	break;	1475	break;
1502		1476
1503	case PropertyNotify:	1477	case PropertyNotify:
…		…
1520	case SelectionRequest:	1494	case SelectionRequest:
1521	selection_send (ev.xselectionrequest);	1495	selection_send (ev.xselectionrequest);
1522	break;	1496	break;
1523		1497
1524	case MapNotify:	1498	case MapNotify:
		1499	#ifdef HAVE_BG_PIXMAP
		1500	/* This is needed spcifically to fix the case of no window manager or a
		1501	* non-reparenting window manager. In those cases we never get first
		1502	* ConfigureNotify. Also that speeds startup under normal WM, by taking
		1503	* care of multiplicity of ConfigureNotify events arriwing while WM does
		1504	* reparenting.
		1505	* We should not render background immidiately, as there could be several
		1506	* ConfigureNotify's to follow. Lets take care of all of them in one scoop
		1507	* by scheduling background redraw as soon as we can, but giving a short
		1508	* bit of time for ConfigureNotifies to arrive.
		1509	* We should render background PRIOR to drawing any text, but AFTER all
		1510	* of ConfigureNotifys for the best results.
		1511	*/
		1512	if (bgPixmap.flags & bgPixmap_t::isInvalid)
		1513	update_background_ev.start (0.025);
		1514	#endif
1525	mapped = 1;	1515	mapped = 1;
1526	#ifdef TEXT_BLINK	1516	#ifdef TEXT_BLINK
1527	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);	1517	text_blink_ev.start ();
1528	#endif	1518	#endif
1529	HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));	1519	HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1530	break;	1520	break;
1531		1521
1532	case UnmapNotify:	1522	case UnmapNotify:
…		…
1534	#ifdef TEXT_BLINK	1524	#ifdef TEXT_BLINK
1535	text_blink_ev.stop ();	1525	text_blink_ev.stop ();
1536	#endif	1526	#endif
1537	HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));	1527	HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1538	break;	1528	break;
1539
1540	#ifdef ENABLE_TRANSPARENCY
1541	case ReparentNotify:
1542	rootwin_cb (ev);
1543	break;
1544	#endif /* ENABLE_TRANSPARENCY */
1545		1529
1546	case GraphicsExpose:	1530	case GraphicsExpose:
1547	case Expose:	1531	case Expose:
1548	if (ev.xany.window == vt)	1532	if (ev.xany.window == vt)
1549	{	1533	{
1550	do	1534	do
		1535	{
1551	scr_expose (ev.xexpose.x, ev.xexpose.y,	1536	scr_expose (ev.xexpose.x, ev.xexpose.y,
1552	ev.xexpose.width, ev.xexpose.height, False);	1537	ev.xexpose.width, ev.xexpose.height, False);
		1538	}
1553	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));	1539	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1554		1540
1555	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1541	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1556		1542
1557	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))	1543	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
		1544	{
1558	scr_expose (ev.xexpose.x, ev.xexpose.y,	1545	scr_expose (ev.xexpose.x, ev.xexpose.y,
1559	ev.xexpose.width, ev.xexpose.height, False);	1546	ev.xexpose.width, ev.xexpose.height, False);
		1547	}
1560		1548
1561	want_refresh = 1;	1549	want_refresh = 1;
1562	}	1550	}
1563	else	1551	else
1564	{	1552	{
…		…
1567	while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))	1555	while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1568	;	1556	;
1569	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))	1557	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1570	;	1558	;
1571		1559
1572	if (isScrollbarWindow (ev.xany.window))	1560	if (scrollBar.state && ev.xany.window == scrollBar.win)
1573	{	1561	{
1574	scrollBar.setIdle ();	1562	scrollBar.state = STATE_IDLE;
1575	scrollbar_show (0);	1563	scrollbar_show (0);
1576	}	1564	}
1577	}	1565	}
1578	break;	1566	break;
1579		1567
1580	case MotionNotify:	1568	case MotionNotify:
1581	#ifdef POINTER_BLANK	1569	#ifdef POINTER_BLANK
1582	if (hidden_pointer)	1570	if (hidden_pointer)
1583	pointer_unblank ();	1571	pointer_unblank ();
1584	#endif	1572	#endif
		1573	if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask\|Button2Mask\|Button3Mask))
		1574	\|\| priv_modes & PrivMode_MouseAnyEvent)
		1575	mouse_report (ev.xbutton);
1585	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)	1576	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1586	break;	1577	break;
1587		1578
1588	if (ev.xany.window == vt)	1579	if (ev.xany.window == vt)
1589	{	1580	{
…		…
1623	int dist;	1614	int dist;
1624		1615
1625	/* don't clobber the current delay if we are	1616	/* don't clobber the current delay if we are
1626	* already in the middle of scrolling.	1617	* already in the middle of scrolling.
1627	*/	1618	*/
1628	if (!sel_scroll_ev.active)	1619	if (!sel_scroll_ev.is_active ())
1629	sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);	1620	sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1630		1621
1631	/* save the event params so we can highlight	1622	/* save the event params so we can highlight
1632	* the selection in the pending-scroll loop	1623	* the selection in the pending-scroll loop
1633	*/	1624	*/
1634	selection_save_x = ev.xbutton.x;	1625	selection_save_x = ev.xbutton.x;
…		…
1656	else	1647	else
1657	{	1648	{
1658	/* we are within the text window, so we	1649	/* we are within the text window, so we
1659	* shouldn't be scrolling	1650	* shouldn't be scrolling
1660	*/	1651	*/
1661	if (sel_scroll_ev.active)
1662	sel_scroll_ev.stop();	1652	sel_scroll_ev.stop();
1663	}	1653	}
1664	#endif	1654	#endif
1665	#ifdef MOUSE_THRESHOLD	1655	#ifdef MOUSE_THRESHOLD
1666	}	1656	}
1667	#endif	1657	#endif
1668	}	1658	}
1669	}	1659	}
1670	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1660	else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1671	{	1661	{
1672	while (XCheckTypedWindowEvent (dpy, scrollBar.win,	1662	while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1673	MotionNotify, &ev))	1663	MotionNotify, &ev))
1674	;	1664	;
1675		1665
…		…
1693	{	1683	{
1694	hidden_cursor = 0;	1684	hidden_cursor = 0;
1695	want_refresh = 1;	1685	want_refresh = 1;
1696	}	1686	}
1697		1687
1698	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);	1688	cursor_blink_ev.again ();
1699	}	1689	}
1700	#endif	1690	#endif
1701		1691
1702	#if defined(POINTER_BLANK)	1692	#if defined(POINTER_BLANK)
1703	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)	1693	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
…		…
1710		1700
1711	if (ev.type == KeyPress && hidden_pointer == 0)	1701	if (ev.type == KeyPress && hidden_pointer == 0)
1712	pointer_blank ();	1702	pointer_blank ();
1713	}	1703	}
1714	#endif	1704	#endif
		1705
		1706	refresh_check ();
1715	}	1707	}
1716		1708
1717	void	1709	void
1718	rxvt_term::focus_in ()	1710	rxvt_term::focus_in ()
1719	{	1711	{
…		…
1731	XSetICFocus (Input_Context);	1723	XSetICFocus (Input_Context);
1732	}	1724	}
1733	#endif	1725	#endif
1734	#if CURSOR_BLINK	1726	#if CURSOR_BLINK
1735	if (option (Opt_cursorBlink))	1727	if (option (Opt_cursorBlink))
1736	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);	1728	cursor_blink_ev.again ();
1737	#endif	1729	#endif
1738	#if OFF_FOCUS_FADING	1730	#if OFF_FOCUS_FADING
1739	if (rs[Rs_fade])	1731	if (rs[Rs_fade])
1740	{	1732	{
1741	pix_colors = pix_colors_focused;	1733	pix_colors = pix_colors_focused;
…		…
1743	}	1735	}
1744	#endif	1736	#endif
1745	#if ENABLE_FRILLS	1737	#if ENABLE_FRILLS
1746	if (option (Opt_urgentOnBell))	1738	if (option (Opt_urgentOnBell))
1747	{	1739	{
1748	XWMHints *h;
1749
1750	h = XGetWMHints(dpy, parent[0]);	1740	if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1751	if (h != NULL)
1752	{	1741	{
1753	h->flags &= ~XUrgencyHint;	1742	h->flags &= ~XUrgencyHint;
1754	XSetWMHints(dpy, parent[0], h);	1743	XSetWMHints (dpy, parent[0], h);
1755	}	1744	}
1756	}	1745	}
1757	#endif	1746	#endif
1758	}	1747	}
1759	}	1748	}
…		…
1782	XUnsetICFocus (Input_Context);	1771	XUnsetICFocus (Input_Context);
1783	#endif	1772	#endif
1784	#if CURSOR_BLINK	1773	#if CURSOR_BLINK
1785	if (option (Opt_cursorBlink))	1774	if (option (Opt_cursorBlink))
1786	cursor_blink_ev.stop ();	1775	cursor_blink_ev.stop ();
		1776
1787	hidden_cursor = 0;	1777	hidden_cursor = 0;
1788	#endif	1778	#endif
1789	#if OFF_FOCUS_FADING	1779	#if OFF_FOCUS_FADING
1790	if (rs[Rs_fade])	1780	if (rs[Rs_fade])
1791	{	1781	{
…		…
1831	\|\| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])	1821	\|\| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1832	{	1822	{
1833	bgPixmap.set_root_pixmap ();	1823	bgPixmap.set_root_pixmap ();
1834	update_background ();	1824	update_background ();
1835	}	1825	}
		1826
1836	break;	1827	break;
1837	}	1828	}
1838	# endif	1829	# endif
		1830
		1831	refresh_check ();
1839	}	1832	}
1840	#endif	1833	#endif
1841		1834
1842	void	1835	void
1843	rxvt_term::button_press (XButtonEvent &ev)	1836	rxvt_term::button_press (XButtonEvent &ev)
…		…
1898	mouse_report (ev);	1891	mouse_report (ev);
1899	}	1892	}
1900	#else	1893	#else
1901	MEvent.button = ev.button;	1894	MEvent.button = ev.button;
1902	mouse_report (ev);	1895	mouse_report (ev);
1903	#endif /* MOUSE_REPORT_DOUBLECLICK */	1896	#endif /* MOUSE_REPORT_DOUBLECLICK */
1904		1897
1905	}	1898	}
1906	else	1899	else
1907	{	1900	{
1908	if (ev.button != MEvent.button)	1901	if (ev.button != MEvent.button)
…		…
1956	}	1949	}
1957		1950
1958	/*	1951	/*
1959	* Scrollbar window processing of button press	1952	* Scrollbar window processing of button press
1960	*/	1953	*/
1961	if (isScrollbarWindow (ev.window))	1954	if (scrollBar.state && ev.window == scrollBar.win)
1962	{	1955	{
1963	scrollBar.setIdle ();	1956	page_dirn direction = NO_DIR;
		1957
		1958	if (scrollBar.upButton (ev.y))
		1959	direction = UP; /* up */
		1960	else if (scrollBar.dnButton (ev.y))
		1961	direction = DN; /* down */
		1962
		1963	scrollBar.state = STATE_IDLE;
1964	/*	1964	/*
1965	* Rxvt-style scrollbar:	1965	* Rxvt-style scrollbar:
1966	* move up if mouse is above slider	1966	* move up if mouse is above slider
1967	* move dn if mouse is below slider	1967	* move dn if mouse is below slider
1968	*	1968	*
…		…
1977	/*	1977	/*
1978	* Mouse report disabled scrollbar:	1978	* Mouse report disabled scrollbar:
1979	* arrow buttons - send up/down	1979	* arrow buttons - send up/down
1980	* click on scrollbar - send pageup/down	1980	* click on scrollbar - send pageup/down
1981	*/	1981	*/
1982	if ((scrollBar.style == R_SB_NEXT	1982	if (direction == UP)
1983	&& scrollbarnext_upButton (ev.y))
1984	\|\| (scrollBar.style == R_SB_RXVT
1985	&& scrollbarrxvt_upButton (ev.y)))
1986	tt_printf ("\033[A");	1983	tt_printf ("\033[A");
1987	else if ((scrollBar.style == R_SB_NEXT	1984	else if (direction == DN)
1988	&& scrollbarnext_dnButton (ev.y))
1989	\|\| (scrollBar.style == R_SB_RXVT
1990	&& scrollbarrxvt_dnButton (ev.y)))
1991	tt_printf ("\033[B");	1985	tt_printf ("\033[B");
1992	else	1986	else
1993	switch (ev.button)	1987	switch (ev.button)
1994	{	1988	{
1995	case Button2:	1989	case Button2:
…		…
2002	tt_printf ("\033[5~");	1996	tt_printf ("\033[5~");
2003	break;	1997	break;
2004	}	1998	}
2005	}	1999	}
2006	else	2000	else
2007	#endif /* NO_SCROLLBAR_REPORT */	2001	#endif /* NO_SCROLLBAR_REPORT */
2008
2009	{
2010	char upordown = 0;
2011
2012	if (scrollBar.style == R_SB_NEXT)
2013	{	2002	{
2014	if (scrollbarnext_upButton (ev.y))	2003	if (direction != NO_DIR)
2015	upordown = -1; /* up */
2016	else if (scrollbarnext_dnButton (ev.y))
2017	upordown = 1; /* down */
2018	}
2019	else if (scrollBar.style == R_SB_RXVT)
2020	{
2021	if (scrollbarrxvt_upButton (ev.y))
2022	upordown = -1; /* up */
2023	else if (scrollbarrxvt_dnButton (ev.y))
2024	upordown = 1; /* down */
2025	}
2026	if (upordown)
2027	{	2004	{
2028	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	2005	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
		2006	if (!cont_scroll_ev.is_active ())
2029	cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);	2007	cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2030	#endif	2008	#endif
2031	if (scr_page (upordown < 0 ? UP : DN, 1))	2009	if (scr_page (direction, 1))
2032	{	2010	{
2033	if (upordown < 0)	2011	if (direction == UP)
2034	scrollBar.setUp ();	2012	scrollBar.state = STATE_UP;
2035	else	2013	else
2036	scrollBar.setDn ();	2014	scrollBar.state = STATE_DOWN;
2037	}	2015	}
2038	}	2016	}
2039	else	2017	else
2040	switch (ev.button)	2018	switch (ev.button)
2041	{	2019	{
2042	case Button2:	2020	case Button2:
2043	switch (scrollbar_align)	2021	switch (scrollBar.align)
2044	{	2022	{
2045	case R_SB_ALIGN_TOP:	2023	case R_SB_ALIGN_TOP:
2046	csrO = 0;	2024	csrO = 0;
2047	break;	2025	break;
2048	case R_SB_ALIGN_CENTRE:	2026	case R_SB_ALIGN_CENTRE:
…		…
2056	if (scrollBar.style == R_SB_XTERM	2034	if (scrollBar.style == R_SB_XTERM
2057	\|\| scrollbar_above_slider (ev.y)	2035	\|\| scrollbar_above_slider (ev.y)
2058	\|\| scrollbar_below_slider (ev.y))	2036	\|\| scrollbar_below_slider (ev.y))
2059	scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());	2037	scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
2060		2038
2061	scrollBar.setMotion ();	2039	scrollBar.state = STATE_MOTION;
2062	break;	2040	break;
2063		2041
2064	case Button1:	2042	case Button1:
2065	if (scrollbar_align == R_SB_ALIGN_CENTRE)	2043	if (scrollBar.align == R_SB_ALIGN_CENTRE)
2066	csrO = ev.y - scrollBar.top;	2044	csrO = ev.y - scrollBar.top;
2067	/* FALLTHROUGH */	2045	/* FALLTHROUGH */
2068		2046
2069	case Button3:	2047	case Button3:
2070	if (scrollBar.style != R_SB_XTERM)	2048	if (scrollBar.style != R_SB_XTERM)
…		…
2080	scr_page (DN, nrow - 1);	2058	scr_page (DN, nrow - 1);
2081	# else	2059	# else
2082	scr_page (DN, nrow / 4);	2060	scr_page (DN, nrow / 4);
2083	# endif	2061	# endif
2084	else	2062	else
2085	scrollBar.setMotion ();	2063	scrollBar.state = STATE_MOTION;
2086	}	2064	}
2087	else	2065	else
2088	{	2066	{
2089	scr_page ((ev.button == Button1 ? DN : UP),	2067	scr_page ((ev.button == Button1 ? DN : UP),
2090	(nrow	2068	(nrow
…		…
2107		2085
2108	csrO = 0; /* reset csr Offset */	2086	csrO = 0; /* reset csr Offset */
2109	if (!bypass_keystate)	2087	if (!bypass_keystate)
2110	reportmode = !! (priv_modes & PrivMode_mouse_report);	2088	reportmode = !! (priv_modes & PrivMode_mouse_report);
2111		2089
2112	if (scrollbar_isUpDn ())	2090	if (scrollBar.state == STATE_UP \|\| scrollBar.state == STATE_DOWN)
2113	{	2091	{
2114	scrollBar.setIdle ();	2092	scrollBar.state = STATE_IDLE;
2115	scrollbar_show (0);	2093	scrollbar_show (0);
2116	}	2094	}
2117		2095
2118	#ifdef SELECTION_SCROLLING	2096	#ifdef SELECTION_SCROLLING
2119	if (sel_scroll_ev.active)
2120	sel_scroll_ev.stop();	2097	sel_scroll_ev.stop();
2121	#endif	2098	#endif
2122		2099
2123	if (ev.window == vt)	2100	if (ev.window == vt)
2124	{	2101	{
2125	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))	2102	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
…		…
2149	mouse_report (ev);	2126	mouse_report (ev);
2150	}	2127	}
2151	#else /* MOUSE_REPORT_DOUBLECLICK */	2128	#else /* MOUSE_REPORT_DOUBLECLICK */
2152	MEvent.button = AnyButton;	2129	MEvent.button = AnyButton;
2153	mouse_report (ev);	2130	mouse_report (ev);
2154	#endif /* MOUSE_REPORT_DOUBLECLICK */	2131	#endif /* MOUSE_REPORT_DOUBLECLICK */
2155	return;	2132	return;
2156	}	2133	}
2157		2134
2158	/*	2135	/*
2159	* dumb hack to compensate for the failure of click-and-drag	2136	* dumb hack to compensate for the failure of click-and-drag
…		…
2197	{	2174	{
2198	mouse_slip_wheel_speed += v ? -1 : 1;	2175	mouse_slip_wheel_speed += v ? -1 : 1;
2199	if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;	2176	if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2200	if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;	2177	if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2201		2178
2202	if (slip_wheel_ev.at < NOW)	2179	if (!slip_wheel_ev.is_active ())
2203	slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;	2180	slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2204
2205	slip_wheel_ev.start ();
2206	}	2181	}
2207	else	2182	else
		2183	# endif
2208	{	2184	{
2209	# endif
2210	scr_page (v, i);	2185	scr_page (v, i);
2211	scrollbar_show (1);	2186	scrollbar_show (1);
2212	# ifdef MOUSE_SLIP_WHEELING
2213	}	2187	}
2214	# endif
2215	}	2188	}
2216	break;	2189	break;
2217	#endif	2190	#endif
2218	}	2191	}
2219	}	2192	}
…		…
2278		2251
2279	if (!option (Opt_jumpScroll) \|\| refresh_count >= nrow - 1)	2252	if (!option (Opt_jumpScroll) \|\| refresh_count >= nrow - 1)
2280	{	2253	{
2281	refresh_count = 0;	2254	refresh_count = 0;
2282		2255
2283	if (!option (Opt_skipScroll) \|\| io_manager::now () > NOW + 1. / 60.)	2256	if (!option (Opt_skipScroll) \|\| ev_time () > ev::now () + 1. / 60.)
2284	{	2257	{
2285	refreshnow = true;	2258	refreshnow = true;
2286	ch = NOCHAR;	2259	ch = NOCHAR;
2287	break;	2260	break;
2288	}	2261	}
…		…
2499	}	2472	}
2500	}	2473	}
2501		2474
2502	pclose_printer (fd);	2475	pclose_printer (fd);
2503	}	2476	}
2504	#endif /* PRINTPIPE */	2477	#endif /* PRINTPIPE */
2505	/}}} /	2478	/}}} /
2506		2479
2507	/* INDENT-OFF */	2480	/* INDENT-OFF */
2508	enum {	2481	enum {
2509	C1_40 = 0x40,	2482	C1_40 = 0x40,
…		…
2802	nargs = 0;	2775	nargs = 0;
2803		2776
2804	priv = 0;	2777	priv = 0;
2805	ch = cmd_getc ();	2778	ch = cmd_getc ();
2806	if (ch >= '<' && ch <= '?')	2779	if (ch >= '<' && ch <= '?')
		2780	{
2807	{ /* '<' '=' '>' '?' */	2781	/* '<' '=' '>' '?' */
2808	priv = ch;	2782	priv = ch;
2809	ch = cmd_getc ();	2783	ch = cmd_getc ();
2810	}	2784	}
2811		2785
2812	/* read any numerical arguments */	2786	/* read any numerical arguments */
…		…
2855	{	2829	{
2856	// first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,	2830	// first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2857	// 'U' for rxvt-unicode != 7.[34] (where it was broken).	2831	// 'U' for rxvt-unicode != 7.[34] (where it was broken).
2858	//	2832	//
2859	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt	2833	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2860	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify	2834	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2861	// that we do not support xterm mouse reporting (should be 95 when we do).	2835	// versions.
2862	//	2836	//
2863	tt_printf ("\033[>%d;94;0c", 'U');	2837	tt_printf ("\033[>%d;95;0c", 'U');
2864	}	2838	}
2865	break;	2839	break;
		2840
2866	case '?':	2841	case '?':
2867	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')	2842	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')
2868	process_terminal_mode (ch, priv, nargs, arg);	2843	process_terminal_mode (ch, priv, nargs, arg);
2869	break;	2844	break;
2870	}	2845	}
…		…
3386	*buf++ = '\0';	3361	*buf++ = '\0';
3387		3362
3388	process_color_seq (op, color, name, resp);	3363	process_color_seq (op, color, name, resp);
3389	}	3364	}
3390	break;	3365	break;
		3366	case Rxvt_restoreFG:
3391	case XTerm_Color00:	3367	case XTerm_Color00:
3392	process_color_seq (op, Color_fg, str, resp);	3368	process_color_seq (op, Color_fg, str, resp);
3393	break;	3369	break;
		3370	case Rxvt_restoreBG:
3394	case XTerm_Color01:	3371	case XTerm_Color01:
3395	process_color_seq (op, Color_bg, str, resp);	3372	process_color_seq (op, Color_bg, str, resp);
3396	break;	3373	break;
3397	#ifndef NO_CURSORCOLOR	3374	#ifndef NO_CURSORCOLOR
3398	case XTerm_Color_cursor:	3375	case XTerm_Color_cursor:
…		…
3424	#if ENABLE_TRANSPARENCY	3401	#if ENABLE_TRANSPARENCY
3425	case URxvt_Color_tint:	3402	case URxvt_Color_tint:
3426	process_color_seq (op, Color_tint, str, resp);	3403	process_color_seq (op, Color_tint, str, resp);
3427	{	3404	{
3428	bool changed = false;	3405	bool changed = false;
		3406
3429	if (ISSET_PIXCOLOR (Color_tint))	3407	if (ISSET_PIXCOLOR (Color_tint))
3430	changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);	3408	changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3431	else	3409	else
3432	changed = bgPixmap.unset_tint ();	3410	changed = bgPixmap.unset_tint ();
		3411
3433	if (changed)	3412	if (changed)
3434	update_background ();	3413	update_background ();
3435	}	3414	}
3436		3415
3437	break;	3416	break;
3438	#endif	3417	#endif
3439		3418
3440	#if XPM_BACKGROUND	3419	#if BG_IMAGE_FROM_FILE
3441	case Rxvt_Pixmap:	3420	case Rxvt_Pixmap:
3442	if (!strcmp (str, "?"))	3421	if (!strcmp (str, "?"))
3443	{	3422	{
3444	char str[256];	3423	char str[256];
3445		3424
…		…
3460	changed++;	3439	changed++;
3461	str = strchr (str, ';');	3440	str = strchr (str, ';');
3462	if (str == NULL)	3441	if (str == NULL)
3463	bgPixmap.set_defaultGeometry ();	3442	bgPixmap.set_defaultGeometry ();
3464	}	3443	}
		3444
3465	while (str)	3445	while (str)
3466	{	3446	{
3467	str++;	3447	str++;
3468	if (bgPixmap.set_geometry (str))	3448	if (bgPixmap.set_geometry (str))
3469	changed++;	3449	changed++;
3470	str = strchr (str, ';');	3450	str = strchr (str, ';');
3471	}	3451	}
		3452
3472	if (changed)	3453	if (changed)
3473	update_background ();	3454	update_background ();
3474	}	3455	}
3475	break;	3456	break;
3476	#endif	3457	#endif
3477
3478	case Rxvt_restoreFG:
3479	set_window_color (Color_fg, str);
3480	break;
3481	case Rxvt_restoreBG:
3482	set_window_color (Color_bg, str);
3483	break;
3484		3458
3485	case XTerm_logfile:	3459	case XTerm_logfile:
3486	// TODO, when secure mode?	3460	// TODO, when secure mode?
3487	break;	3461	break;
3488		3462
…		…
3632	{ 66, PrivMode_aplKP },	3606	{ 66, PrivMode_aplKP },
3633	#ifndef NO_BACKSPACE_KEY	3607	#ifndef NO_BACKSPACE_KEY
3634	{ 67, PrivMode_BackSpace },	3608	{ 67, PrivMode_BackSpace },
3635	#endif	3609	#endif
3636	{ 1000, PrivMode_MouseX11 },	3610	{ 1000, PrivMode_MouseX11 },
3637	// 1001 Use Hilite Mouse Tracking. NYI, TODO	3611	{ 1002, PrivMode_MouseBtnEvent },
3638	// 1002 Use Cell Motion Mouse Tracking. NYI, TODO	3612	{ 1003, PrivMode_MouseAnyEvent },
3639	// 1003 Use All Motion Mouse Tracking. NYI, TODO
3640	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension	3613	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension
3641	{ 1011, PrivMode_Keypress }, // rxvt extension	3614	{ 1011, PrivMode_Keypress }, // rxvt extension
3642	// 1035 enable modifiers for alt, numlock NYI	3615	// 1035 enable modifiers for alt, numlock NYI
3643	// 1036 send ESC for meta keys NYI	3616	// 1036 send ESC for meta keys NYI
3644	// 1037 send DEL for keypad delete NYI	3617	// 1037 send DEL for keypad delete NYI
3645	{ 1047, PrivMode_Screen },	3618	{ 1047, PrivMode_Screen },
3646	// 1048 save and restore cursor	3619	// 1048 save and restore cursor
3647	{ 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */	3620	{ 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3648	// 1051, 1052, 1060, 1061 keyboard emulation NYI	3621	// 1051, 1052, 1060, 1061 keyboard emulation NYI
		3622	{ 2004, PrivMode_BracketPaste },
3649	};	3623	};
3650		3624
3651	if (nargs == 0)	3625	if (nargs == 0)
3652	return;	3626	return;
3653		3627
…		…
3701	*/	3675	*/
3702	PrivMode (1, PrivMode_vt52);	3676	PrivMode (1, PrivMode_vt52);
3703	break;	3677	break;
3704	case 3: /* 80/132 */	3678	case 3: /* 80/132 */
3705	if (priv_modes & PrivMode_132OK)	3679	if (priv_modes & PrivMode_132OK)
		3680	{
		3681	scr_poweron ();
3706	set_widthheight (((state ? 132 : 80) * fwidth), height);	3682	set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);
		3683	}
3707	break;	3684	break;
3708	case 4: /* smooth scrolling */	3685	case 4: /* smooth scrolling */
3709	set_option (Opt_jumpScroll, !state);	3686	set_option (Opt_jumpScroll, !state);
3710	break;	3687	break;
3711	case 5: /* reverse video */	3688	case 5: /* reverse video */
…		…
3718	scr_autowrap (state);	3695	scr_autowrap (state);
3719	break;	3696	break;
3720	/* case 8: - auto repeat, can't do on a per window basis */	3697	/* case 8: - auto repeat, can't do on a per window basis */
3721	case 9: /* X10 mouse reporting */	3698	case 9: /* X10 mouse reporting */
3722	if (state) /* orthogonal */	3699	if (state) /* orthogonal */
3723	priv_modes &= ~PrivMode_MouseX11;	3700	priv_modes &= ~(PrivMode_MouseX11\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);
3724	break;	3701	break;
3725	#ifdef scrollBar_esc	3702	#ifdef scrollBar_esc
3726	case scrollBar_esc:	3703	case scrollBar_esc:
3727	if (scrollbar_mapping (state))	3704	if (scrollbar_mapping (state))
3728	{	3705	{
…		…
3741	break;	3718	break;
3742	/* case 66: - application key pad */	3719	/* case 66: - application key pad */
3743	/* case 67: - backspace key */	3720	/* case 67: - backspace key */
3744	case 1000: /* X11 mouse reporting */	3721	case 1000: /* X11 mouse reporting */
3745	if (state) /* orthogonal */	3722	if (state) /* orthogonal */
3746	priv_modes &= ~PrivMode_MouseX10;	3723	priv_modes &= ~(PrivMode_MouseX10\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);
3747	break;	3724	break;
3748	#if 0
3749	case 1001:	3725	case 1002:
3750	break; /* X11 mouse highlighting */	3726	case 1003:
3751	#endif	3727	if (state)
		3728	{
		3729	priv_modes &= ~(PrivMode_MouseX10\|PrivMode_MouseX11);
		3730	priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
		3731	vt_emask_mouse = PointerMotionMask;
		3732	}
		3733	else
		3734	vt_emask_mouse = NoEventMask;
		3735	vt_select_input ();
		3736	break;
3752	case 1010: /* scroll to bottom on TTY output inhibit */	3737	case 1010: /* scroll to bottom on TTY output inhibit */
3753	set_option (Opt_scrollTtyOutput, !state);	3738	set_option (Opt_scrollTtyOutput, !state);
3754	break;	3739	break;
3755	case 1011: /* scroll to bottom on key press */	3740	case 1011: /* scroll to bottom on key press */
3756	set_option (Opt_scrollTtyKeypress, state);	3741	set_option (Opt_scrollTtyKeypress, state);
…		…
3933	rxvt_term::process_graphics ()	3918	rxvt_term::process_graphics ()
3934	{	3919	{
3935	unicode_t ch, cmd = cmd_getc ();	3920	unicode_t ch, cmd = cmd_getc ();
3936		3921
3937	if (cmd == 'Q')	3922	if (cmd == 'Q')
		3923	{
3938	{ /* query graphics */	3924	/* query graphics */
3939	tt_printf ("\033G0\012"); /* no graphics */	3925	tt_printf ("\033G0\012"); /* no graphics */
3940	return;	3926	return;
3941	}	3927	}
3942	/* swallow other graphics sequences until terminating ':' */	3928	/* swallow other graphics sequences until terminating ':' */
3943	do	3929	do
…		…
3993	v_buffer = (char *)realloc (v_buffer, v_buflen + len);	3979	v_buffer = (char *)realloc (v_buffer, v_buflen + len);
3994		3980
3995	memcpy (v_buffer + v_buflen, data, len);	3981	memcpy (v_buffer + v_buflen, data, len);
3996	v_buflen += len;	3982	v_buflen += len;
3997		3983
3998	pty_ev.set (EVENT_READ \| EVENT_WRITE);	3984	pty_ev.set (ev::READ \| ev::WRITE);
3999	}	3985	}
4000		3986
4001	void rxvt_term::pty_write ()	3987	void rxvt_term::pty_write ()
4002	{	3988	{
4003	int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));	3989	int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
…		…
4008		3994
4009	if (v_buflen == 0)	3995	if (v_buflen == 0)
4010	{	3996	{
4011	free (v_buffer);	3997	free (v_buffer);
4012	v_buffer = 0;	3998	v_buffer = 0;
4013	v_buflen = 0;
4014		3999
4015	pty_ev.set (EVENT_READ);	4000	pty_ev.set (ev::READ);
4016	return;	4001	return;
4017	}	4002	}
4018		4003
4019	memmove (v_buffer, v_buffer + written, v_buflen);	4004	memmove (v_buffer, v_buffer + written, v_buflen);
4020	}	4005	}
4021	else if (written != -1 \|\| (errno != EAGAIN && errno != EINTR))	4006	else if (written != -1 \|\| (errno != EAGAIN && errno != EINTR))
4022	pty_ev.set (EVENT_READ);	4007	pty_ev.set (ev::READ);
4023	}	4008	}
4024		4009
4025	/----------------------- end-of-file (C source) -----------------------/	4010	/----------------------- end-of-file (C source) -----------------------/
4026		4011

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.349 by ayin, Sun Aug 26 18:16:52 2007 UTC vs. Revision 1.408 by ayin, Sat Feb 16 13:36:10 2008 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.349 by ayin, Sun Aug 26 18:16:52 2007 UTC vs.
Revision 1.408 by ayin, Sat Feb 16 13:36:10 2008 UTC