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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.340 by sasha, Fri Aug 3 22:40:10 2007 UTC vs.
Revision 1.406 by ayin, Thu Feb 14 23:53:05 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.
…		…
95	XK_Shift_L, 0x21e7,	96	XK_Shift_L, 0x21e7,
96	XK_Shift_R, 0x21e7,	97	XK_Shift_R, 0x21e7,
97		98
98	XK_Shift_Lock, 0x21eb,	99	XK_Shift_Lock, 0x21eb,
99	XK_ISO_Lock, 0x21eb,	100	XK_ISO_Lock, 0x21eb,
100	XK_ISO_Lock, 0x21eb,
101	XK_Caps_Lock, 0x21ec,	101	XK_Caps_Lock, 0x21ec,
102	XK_Num_Lock, 0x21ed,	102	XK_Num_Lock, 0x21ed,
103	XK_ISO_Level3_Shift, 0x21ee,	103	XK_ISO_Level3_Shift, 0x21ee,
104	XK_ISO_Level3_Lock, 0x21ef,	104	XK_ISO_Level3_Lock, 0x21ef,
105	XK_ISO_Group_Lock, 0x21f0,	105	XK_ISO_Group_Lock, 0x21f0,
…		…
199	r & RS_Uline ? " uline" : "",	199	r & RS_Uline ? " uline" : "",
200	r & RS_Careful ? " careful" : "");	200	r & RS_Careful ? " careful" : "");
201		201
202	int width = wcswidth (fname, wcslen (fname));	202	int width = wcswidth (fname, wcslen (fname));
203		203
204	max_it (width, 8+5); // for char + hey	204	max_it (width, 8+5); // for char + hex
205	max_it (width, strlen (attr));	205	max_it (width, strlen (attr));
206		206
207	if (y >= 0)	207	if (y >= 0)
208	{	208	{
209	y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;	209	y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
…		…
221	ch = *chr++;	221	ch = *chr++;
222		222
223	sprintf (buf, "%8x", ch);	223	sprintf (buf, "%8x", ch);
224	scr_overlay_set (0, y, buf);	224	scr_overlay_set (0, y, buf);
225	scr_overlay_set (9, y, '=');	225	scr_overlay_set (9, y, '=');
226	# if !UNICODE3	226	# if !UNICODE_3
227	if (ch >= 0x10000)	227	if (ch >= 0x10000)
228	ch = 0xfffd;	228	ch = 0xfffd;
229	# endif	229	# endif
230	scr_overlay_set (11, y, ch, r);	230	scr_overlay_set (11, y, ch, r);
231		231
…		…
302		302
303	void	303	void
304	rxvt_term::key_press (XKeyEvent &ev)	304	rxvt_term::key_press (XKeyEvent &ev)
305	{	305	{
306	int ctrl, meta, shft, len;	306	int ctrl, meta, shft, len;
307	unsigned int newlen;
308	KeySym keysym;	307	KeySym keysym;
309	int valid_keysym;	308	int valid_keysym;
310	char kbuf[KBUFSZ];	309	char kbuf[KBUFSZ];
311		310
312	#if ISO_14755	311	#if ISO_14755
…		…
547	}	546	}
548	#endif	547	#endif
549		548
550	if (keysym >= 0xFF00 && keysym <= 0xFFFF)	549	if (keysym >= 0xFF00 && keysym <= 0xFFFF)
551	{	550	{
		551	bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
		552	unsigned int newlen = 1;
		553	#ifdef XK_KP_Home
		554	static const KeySym keypadtrans[] = {
		555	XK_KP_7, // XK_KP_Home
		556	XK_KP_4, // XK_KP_Left
		557	XK_KP_8, // XK_KP_Up
		558	XK_KP_6, // XK_KP_Right
		559	XK_KP_2, // XK_KP_Down
		560	#ifndef UNSHIFTED_SCROLLKEYS
		561	XK_KP_9, // XK_KP_Prior
		562	XK_KP_3, // XK_KP_Next
		563	#else
		564	XK_Prior,
		565	XK_Next,
		566	#endif
		567	XK_KP_1, // XK_KP_End
		568	XK_KP_5, // XK_KP_Begin
		569	};
		570
		571	if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
552	{	572	{
553	newlen = 1;	573	unsigned int index = keysym - XK_KP_Home;
		574	keysym = kp ? keypadtrans[index] : XK_Home + index;
		575	}
		576	else if (keysym == XK_KP_Insert)
		577	keysym = kp ? XK_KP_0 : XK_Insert;
		578	#ifndef NO_DELETE_KEY
		579	else if (keysym == XK_KP_Delete)
		580	keysym = kp ? XK_KP_Decimal : XK_Delete;
		581	#endif
		582	#endif
554	switch (keysym)	583	switch (keysym)
555	{	584	{
556	#ifndef NO_BACKSPACE_KEY	585	#ifndef NO_BACKSPACE_KEY
557	case XK_BackSpace:	586	case XK_BackSpace:
558	if (priv_modes & PrivMode_HaveBackSpace)	587	if (priv_modes & PrivMode_HaveBackSpace)
…		…
560	kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)	589	kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
561	^ !!ctrl) ? '\b' : '\177';	590	^ !!ctrl) ? '\b' : '\177';
562	kbuf[1] = '\0';	591	kbuf[1] = '\0';
563	}	592	}
564	else	593	else
565	strcpy (kbuf, key_backspace);	594	strcpy (kbuf, rs[Rs_backspace_key]);
566	break;	595	break;
567	#endif	596	#endif
568	#ifndef NO_DELETE_KEY	597	#ifndef NO_DELETE_KEY
569	# ifdef XK_KP_Prior
570	case XK_KP_Delete:
571	/* allow shift to override */
572	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
573	{
574	strcpy (kbuf, "\033On");
575	break;
576	}
577	/* FALLTHROUGH */
578	# endif
579	case XK_Delete:	598	case XK_Delete:
580	strcpy (kbuf, key_delete);	599	strcpy (kbuf, rs[Rs_delete_key]);
581	break;	600	break;
582	#endif	601	#endif
583	case XK_Tab:	602	case XK_Tab:
584	if (shft)	603	if (shft)
585	strcpy (kbuf, "\033[Z");	604	strcpy (kbuf, "\033[Z");
…		…
595	#endif	614	#endif
596	newlen = 0;	615	newlen = 0;
597	}	616	}
598	break;	617	break;
599		618
600	#ifdef XK_KP_Left
601	case XK_KP_Up: /* \033Ox or standard */
602	case XK_KP_Down: /* \033Or or standard */
603	case XK_KP_Right: /* \033Ov or standard */
604	case XK_KP_Left: /* \033Ot or standard */
605	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
606	{
607	strcpy (kbuf, "\033OZ");
608	kbuf[2] = "txvr"[keysym - XK_KP_Left];
609	break;
610	}
611	else
612	/* translate to std. cursor key */
613	keysym = XK_Left + (keysym - XK_KP_Left);
614	/* FALLTHROUGH */
615	#endif
616	case XK_Up: /* "\033[A" */	619	case XK_Up: /* "\033[A" */
617	case XK_Down: /* "\033[B" */	620	case XK_Down: /* "\033[B" */
618	case XK_Right: /* "\033[C" */	621	case XK_Right: /* "\033[C" */
619	case XK_Left: /* "\033[D" */	622	case XK_Left: /* "\033[D" */
620	strcpy (kbuf, "\033[Z");	623	strcpy (kbuf, "\033[Z");
…		…
630	else if (priv_modes & PrivMode_aplCUR)	633	else if (priv_modes & PrivMode_aplCUR)
631	kbuf[1] = 'O';	634	kbuf[1] = 'O';
632	break;	635	break;
633		636
634	#ifndef UNSHIFTED_SCROLLKEYS	637	#ifndef UNSHIFTED_SCROLLKEYS
635	# ifdef XK_KP_Prior
636	case XK_KP_Prior:
637	/* allow shift to override */
638	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
639	{
640	strcpy (kbuf, "\033Oy");
641	break;
642	}
643	/* FALLTHROUGH */
644	# endif
645	case XK_Prior:	638	case XK_Prior:
646	strcpy (kbuf, "\033[5~");	639	strcpy (kbuf, "\033[5~");
647	break;	640	break;
648	# ifdef XK_KP_Next
649	case XK_KP_Next:
650	/* allow shift to override */
651	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
652	{
653	strcpy (kbuf, "\033Os");
654	break;
655	}
656	/* FALLTHROUGH */
657	# endif
658	case XK_Next:	641	case XK_Next:
659	strcpy (kbuf, "\033[6~");	642	strcpy (kbuf, "\033[6~");
660	break;	643	break;
661	#endif	644	#endif
662	case XK_KP_Enter:	645	case XK_KP_Enter:
663	/* allow shift to override */	646	/* allow shift to override */
664	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)	647	if (kp)
665	{	648	{
666	strcpy (kbuf, "\033OM");	649	strcpy (kbuf, "\033OM");
667	break;	650	break;
668	}	651	}
669		652
…		…
681	kbuf[0] = '\015';	664	kbuf[0] = '\015';
682	kbuf[1] = '\0';	665	kbuf[1] = '\0';
683	}	666	}
684	break;	667	break;
685		668
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" */	669	case XK_KP_F1: /* "\033OP" */
693	case XK_KP_F2: /* "\033OQ" */	670	case XK_KP_F2: /* "\033OQ" */
694	case XK_KP_F3: /* "\033OR" */	671	case XK_KP_F3: /* "\033OR" */
695	case XK_KP_F4: /* "\033OS" */	672	case XK_KP_F4: /* "\033OS" */
696	strcpy (kbuf, "\033OP");	673	strcpy (kbuf, "\033OP");
…		…
712	case XK_KP_6: /* "\033Ov" : "6" */	689	case XK_KP_6: /* "\033Ov" : "6" */
713	case XK_KP_7: /* "\033Ow" : "7" */	690	case XK_KP_7: /* "\033Ow" : "7" */
714	case XK_KP_8: /* "\033Ox" : "8" */	691	case XK_KP_8: /* "\033Ox" : "8" */
715	case XK_KP_9: /* "\033Oy" : "9" */	692	case XK_KP_9: /* "\033Oy" : "9" */
716	/* allow shift to override */	693	/* allow shift to override */
717	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)	694	if (kp)
718	{	695	{
719	strcpy (kbuf, "\033Oj");	696	strcpy (kbuf, "\033Oj");
720	kbuf[2] += (keysym - XK_KP_Multiply);	697	kbuf[2] += (keysym - XK_KP_Multiply);
721	}	698	}
722	else	699	else
…		…
728		705
729	case XK_Find:	706	case XK_Find:
730	strcpy (kbuf, "\033[1~");	707	strcpy (kbuf, "\033[1~");
731	break;	708	break;
732		709
733	#ifdef XK_KP_Insert
734	case XK_KP_Insert:
735	/* allow shift to override */
736	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
737	{
738	strcpy (kbuf, "\033Op");
739	break;
740	}
741	/* FALLTHROUGH */
742	#endif
743	case XK_Insert:	710	case XK_Insert:
744	strcpy (kbuf, "\033[2~");	711	strcpy (kbuf, "\033[2~");
745	break;	712	break;
746	#ifdef DXK_Remove /* support for DEC remove like key */	713	#ifdef DXK_Remove /* support for DEC remove like key */
747	case DXK_Remove:	714	case DXK_Remove:
…		…
751	strcpy (kbuf, "\033[3~");	718	strcpy (kbuf, "\033[3~");
752	break;	719	break;
753	case XK_Select:	720	case XK_Select:
754	strcpy (kbuf, "\033[4~");	721	strcpy (kbuf, "\033[4~");
755	break;	722	break;
756	#ifdef XK_KP_End
757	case XK_KP_End:
758	/* allow shift to override */
759	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
760	{
761	strcpy (kbuf, "\033Oq");
762	break;
763	}
764	/* FALLTHROUGH */
765	#endif
766	case XK_End:	723	case XK_End:
767	strcpy (kbuf, KS_END);	724	strcpy (kbuf, KS_END);
768	break;	725	break;
769	#ifdef XK_KP_Home
770	case XK_KP_Home:
771	/* allow shift to override */
772	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
773	{
774	strcpy (kbuf, "\033Ow");
775	break;
776	}
777	/* FALLTHROUGH */
778	#endif
779	case XK_Home:	726	case XK_Home:
780	strcpy (kbuf, KS_HOME);	727	strcpy (kbuf, KS_HOME);
781	break;	728	break;
782		729
783	#define FKEY(n, fkey) \	730	#define FKEY(n, fkey) \
…		…
840	break;	787	break;
841	}	788	}
842		789
843	if (newlen)	790	if (newlen)
844	len = strlen (kbuf);	791	len = strlen (kbuf);
845	}
846		792
847	/*	793	/*
848	* Pass meta for all function keys, if 'meta' option set	794	* Pass meta for all function keys, if 'meta' option set
849	*/	795	*/
850	#ifdef META8_OPTION	796	#ifdef META8_OPTION
…		…
1035	void	981	void
1036	rxvt_term::flush ()	982	rxvt_term::flush ()
1037	{	983	{
1038	flush_ev.stop ();	984	flush_ev.stop ();
1039		985
1040	#ifdef ENABLE_TRANSPARENCY	986	#ifdef HAVE_BG_PIXMAP
1041	if (want_full_refresh)	987	if (bgPixmap.check_clearChanged ())
1042	{	988	{
1043	want_full_refresh = 0;	989	// scr_clear (true); This needs to be researched further!
1044	scr_clear ();
1045	scr_touch (false);	990	scr_touch (false);
1046	}	991	}
1047	#endif	992	#endif
1048		993
1049	if (want_refresh)	994	if (want_refresh)
…		…
1094	}	1039	}
1095		1040
1096	display->flush ();	1041	display->flush ();
1097	}	1042	}
1098		1043
		1044	/* checks wether a refresh is requested and starts the refresh timer */
1099	void	1045	void
1100	rxvt_term::check_cb (check_watcher &w)	1046	rxvt_term::refresh_check ()
1101	{	1047	{
1102	make_current ();	1048	if (want_refresh && !flush_ev.is_active ())
		1049	flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1103		1050
1104	display->flush ();	1051	display->flush ();
1105
1106	if (want_refresh && !flush_ev.active)
1107	flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1108	}	1052	}
1109		1053
1110	void	1054	void
1111	rxvt_term::flush_cb (time_watcher &w)	1055	rxvt_term::flush_cb (ev::timer &w, int revents)
1112	{	1056	{
1113	make_current ();	1057	make_current ();
1114		1058
1115	refresh_count = 0;	1059	refresh_count = 0;
1116	flush ();	1060	flush ();
1117	}	1061	}
1118		1062
1119	#ifdef CURSOR_BLINK	1063	#ifdef CURSOR_BLINK
1120	void	1064	void
1121	rxvt_term::cursor_blink_cb (time_watcher &w)	1065	rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1122	{	1066	{
1123	hidden_cursor = !hidden_cursor;	1067	hidden_cursor = !hidden_cursor;
1124	want_refresh = 1;	1068	want_refresh = 1;
1125		1069	refresh_check ();
1126	w.start (w.at + CURSOR_BLINK_INTERVAL);
1127	}	1070	}
1128	#endif	1071	#endif
1129		1072
1130	#ifdef TEXT_BLINK	1073	#ifdef TEXT_BLINK
1131	void	1074	void
1132	rxvt_term::text_blink_cb (time_watcher &w)	1075	rxvt_term::text_blink_cb (ev::timer &w, int revents)
1133	{	1076	{
1134	if (scr_refresh_rend (RS_Blink, RS_Blink))	1077	if (scr_refresh_rend (RS_Blink, RS_Blink))
1135	{	1078	{
1136	hidden_text = !hidden_text;	1079	hidden_text = !hidden_text;
1137	want_refresh = 1;	1080	want_refresh = 1;
1138	w.start (w.at + TEXT_BLINK_INTERVAL);	1081	refresh_check ();
1139	}	1082	}
		1083	else
		1084	w.stop ();
1140	}	1085	}
1141	#endif	1086	#endif
1142		1087
1143	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	1088	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1144	void	1089	void
1145	rxvt_term::cont_scroll_cb (time_watcher &w)	1090	rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1146	{	1091	{
1147	if ((scrollbar_isUp() \|\| scrollbar_isDn()) &&	1092	if ((scrollBar.state == STATE_UP \|\| scrollBar.state == STATE_DOWN)
1148	scr_page (scrollbar_isUp() ? UP : DN, 1))	1093	&& scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1149	{	1094	{
1150	want_refresh = 1;	1095	want_refresh = 1;
1151	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1096	refresh_check ();
1152	}	1097	}
		1098	else
		1099	w.stop ();
1153	}	1100	}
1154	#endif	1101	#endif
1155		1102
1156	#ifdef SELECTION_SCROLLING	1103	#ifdef SELECTION_SCROLLING
1157	void	1104	void
1158	rxvt_term::sel_scroll_cb (time_watcher &w)	1105	rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1159	{	1106	{
1160	if (scr_page (scroll_selection_dir, scroll_selection_lines))	1107	if (scr_page (scroll_selection_dir, scroll_selection_lines))
1161	{	1108	{
1162	selection_extend (selection_save_x, selection_save_y, selection_save_state);	1109	selection_extend (selection_save_x, selection_save_y, selection_save_state);
1163	want_refresh = 1;	1110	want_refresh = 1;
1164	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1111	refresh_check ();
1165	}	1112	}
		1113	else
		1114	w.stop ();
1166	}	1115	}
1167	#endif	1116	#endif
1168		1117
1169	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	1118	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1170	void	1119	void
1171	rxvt_term::slip_wheel_cb (time_watcher &w)	1120	rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1172	{	1121	{
1173	if (mouse_slip_wheel_speed == 0	1122	if (scr_changeview (view_start - mouse_slip_wheel_speed))
1174	\|\| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1175	: scr_page (UP, mouse_slip_wheel_speed))
1176	{	1123	{
1177	if (view_start == top_row \|\| view_start == 0)
1178	mouse_slip_wheel_speed = 0;
1179
1180	want_refresh = 1;	1124	want_refresh = 1;
1181	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1125	refresh_check ();
		1126	}
		1127
		1128	if (view_start == top_row \|\| view_start == 0 \|\| mouse_slip_wheel_speed == 0)
		1129	{
		1130	mouse_slip_wheel_speed = 0;
		1131	w.stop ();
1182	}	1132	}
1183	}	1133	}
1184	#endif	1134	#endif
1185		1135
1186	#if LINUX_YIELD_HACK	1136	#if LINUX_YIELD_HACK
1187	static struct event_handler	1137	static struct event_handler
1188	{	1138	{
1189	check_watcher yield_ev;	1139	ev::prepare yield_ev;
1190		1140
1191	void yield_cb (check_watcher &w)	1141	void yield_cb (ev::prepare &w, int revents)
1192	{	1142	{
1193	// this should really be sched_yield(), but the linux guys thought	1143	// this should really be sched_yield(), but the linux guys thought
1194	// that giving a process calling sched_yield () less cpu time than	1144	// that giving a process calling sched_yield () less cpu time than
1195	// ones with high nice levels is a useful thing to do. It surely is is	1145	// ones with high nice levels is a useful thing to do. It surely is is
1196	// allowed by the sus... as is returning ENOSYS.	1146	// allowed by the sus... as is returning ENOSYS.
…		…
1247		1197
1248	return false;	1198	return false;
1249	}	1199	}
1250		1200
1251	void	1201	void
1252	rxvt_term::pty_cb (io_watcher &w, short revents)	1202	rxvt_term::pty_cb (ev::io &w, int revents)
1253	{	1203	{
1254	make_current ();	1204	make_current ();
1255		1205
1256	if (revents & EVENT_READ)	1206	if (revents & ev::READ)
1257	// loop, but don't allow a single term to monopolize us	1207	// loop, but don't allow a single term to monopolize us
1258	while (pty_fill ())	1208	while (pty_fill ())
1259	if (cmd_parse ())	1209	if (cmd_parse ())
1260	break;	1210	break;
1261		1211
1262	if (revents & EVENT_WRITE)	1212	if (revents & ev::WRITE)
1263	pty_write ();	1213	pty_write ();
		1214
		1215	refresh_check ();
1264	}	1216	}
1265		1217
1266	void	1218	void
1267	rxvt_term::pointer_unblank ()	1219	rxvt_term::pointer_unblank ()
1268	{	1220	{
…		…
1271		1223
1272	#ifdef POINTER_BLANK	1224	#ifdef POINTER_BLANK
1273	hidden_pointer = 0;	1225	hidden_pointer = 0;
1274		1226
1275	if (option (Opt_pointerBlank))	1227	if (option (Opt_pointerBlank))
1276	pointer_ev.start (NOW + pointerBlankDelay);	1228	pointer_ev.start (pointerBlankDelay);
1277	#endif	1229	#endif
1278	}	1230	}
1279		1231
1280	#ifdef POINTER_BLANK	1232	#ifdef POINTER_BLANK
1281	void	1233	void
…		…
1289		1241
1290	hidden_pointer = 1;	1242	hidden_pointer = 1;
1291	}	1243	}
1292		1244
1293	void	1245	void
1294	rxvt_term::pointer_cb (time_watcher &w)	1246	rxvt_term::pointer_cb (ev::timer &w, int revents)
1295	{	1247	{
1296	make_current ();	1248	make_current ();
1297		1249
1298	pointer_blank ();	1250	pointer_blank ();
1299	}	1251	}
…		…
1302	void	1254	void
1303	rxvt_term::mouse_report (XButtonEvent &ev)	1255	rxvt_term::mouse_report (XButtonEvent &ev)
1304	{	1256	{
1305	int button_number, key_state = 0;	1257	int button_number, key_state = 0;
1306	int x, y;	1258	int x, y;
		1259	int code = 32;
1307		1260
1308	x = ev.x;	1261	x = Pixel2Col (ev.x);
1309	y = ev.y;	1262	y = Pixel2Row (ev.y);
1310	pixel_position (&x, &y);	1263	if (ev.type == MotionNotify)
		1264	{
		1265	if (x == mouse_row && y == mouse_col)
		1266	return;
		1267	mouse_row = x;
		1268	mouse_col = y;
		1269	code += 32;
		1270	}
1311		1271
1312	if (MEvent.button == AnyButton)	1272	if (MEvent.button == AnyButton)
1313	button_number = 3;	1273	button_number = 3;
1314	else	1274	else
1315	{	1275	{
…		…
1361	x + 1,	1321	x + 1,
1362	y + 1);	1322	y + 1);
1363	#endif	1323	#endif
1364		1324
1365	tt_printf ("\033[M%c%c%c",	1325	tt_printf ("\033[M%c%c%c",
1366	(32 + button_number + key_state),	1326	(code + button_number + key_state),
1367	(32 + x + 1),	1327	(32 + x + 1),
1368	(32 + y + 1));	1328	(32 + y + 1));
1369	}	1329	}
1370		1330
1371	/{{{ process an X event /	1331	/{{{ process an X event /
…		…
1475	&& ev.xfocus.mode != NotifyGrab)	1435	&& ev.xfocus.mode != NotifyGrab)
1476	focus_out ();	1436	focus_out ();
1477	break;	1437	break;
1478		1438
1479	case ConfigureNotify:	1439	case ConfigureNotify:
		1440	/*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
		1441	ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
		1442	szHint.width, szHint.height);*/
1480	if (ev.xconfigure.window == parent[0])	1443	if (ev.xconfigure.window == parent[0])
1481	{	1444	{
1482	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))	1445	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1483	;	1446	;
1484		1447
1485	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)	1448	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)
1486	{	1449	{
1487	seen_resize = 1;	1450	seen_resize = 1;
1488	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1451	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
		1452	}
		1453	else
		1454	{
1489	#ifdef HAVE_BG_PIXMAP	1455	#ifdef HAVE_BG_PIXMAP
1490	/* TODO: replace with update_pixmap() that should unify transparency and bg image handling ! */	1456	if (bgPixmap.window_position_sensitive ())
1491	if (!option (Opt_transparent) && bgPixmap.window_size_sensitive ())
1492	{	1457	{
		1458	if (mapped)
		1459	update_background ();
1493	resize_pixmap ();	1460	else
1494	scr_touch (true);	1461	bgPixmap.invalidate ();
1495	}	1462	}
1496	#endif	1463	#endif
1497	}	1464	}
1498		1465
1499	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));	1466	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1500
1501	#ifdef ENABLE_TRANSPARENCY
1502	if (option (Opt_transparent))
1503	check_our_parents ();
1504	#endif
1505	}	1467	}
1506	break;	1468	break;
1507		1469
1508	case PropertyNotify:	1470	case PropertyNotify:
1509	if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))	1471	if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
…		…
1525	case SelectionRequest:	1487	case SelectionRequest:
1526	selection_send (ev.xselectionrequest);	1488	selection_send (ev.xselectionrequest);
1527	break;	1489	break;
1528		1490
1529	case MapNotify:	1491	case MapNotify:
		1492	#ifdef HAVE_BG_PIXMAP
		1493	/* This is needed spcifically to fix the case of no window manager or a
		1494	* non-reparenting window manager. In those cases we never get first
		1495	* ConfigureNotify. Also that speeds startup under normal WM, by taking
		1496	* care of multiplicity of ConfigureNotify events arriwing while WM does
		1497	* reparenting.
		1498	* We should not render background immidiately, as there could be several
		1499	* ConfigureNotify's to follow. Lets take care of all of them in one scoop
		1500	* by scheduling background redraw as soon as we can, but giving a short
		1501	* bit of time for ConfigureNotifies to arrive.
		1502	* We should render background PRIOR to drawing any text, but AFTER all
		1503	* of ConfigureNotifys for the best results.
		1504	*/
		1505	if (bgPixmap.flags & bgPixmap_t::isInvalid)
		1506	update_background_ev.start (0.025);
		1507	#endif
1530	mapped = 1;	1508	mapped = 1;
1531	#ifdef TEXT_BLINK	1509	#ifdef TEXT_BLINK
1532	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);	1510	text_blink_ev.start ();
1533	#endif	1511	#endif
1534	HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));	1512	HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1535	break;	1513	break;
1536		1514
1537	case UnmapNotify:	1515	case UnmapNotify:
…		…
1539	#ifdef TEXT_BLINK	1517	#ifdef TEXT_BLINK
1540	text_blink_ev.stop ();	1518	text_blink_ev.stop ();
1541	#endif	1519	#endif
1542	HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));	1520	HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1543	break;	1521	break;
1544
1545	#ifdef ENABLE_TRANSPARENCY
1546	case ReparentNotify:
1547	rootwin_cb (ev);
1548	break;
1549	#endif /* ENABLE_TRANSPARENCY */
1550		1522
1551	case GraphicsExpose:	1523	case GraphicsExpose:
1552	case Expose:	1524	case Expose:
1553	if (ev.xany.window == vt)	1525	if (ev.xany.window == vt)
1554	{	1526	{
1555	do	1527	do
		1528	{
1556	scr_expose (ev.xexpose.x, ev.xexpose.y,	1529	scr_expose (ev.xexpose.x, ev.xexpose.y,
1557	ev.xexpose.width, ev.xexpose.height, False);	1530	ev.xexpose.width, ev.xexpose.height, False);
		1531	}
1558	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));	1532	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1559		1533
1560	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1534	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1561		1535
1562	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))	1536	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
		1537	{
1563	scr_expose (ev.xexpose.x, ev.xexpose.y,	1538	scr_expose (ev.xexpose.x, ev.xexpose.y,
1564	ev.xexpose.width, ev.xexpose.height, False);	1539	ev.xexpose.width, ev.xexpose.height, False);
		1540	}
1565		1541
1566	want_refresh = 1;	1542	want_refresh = 1;
1567	}	1543	}
1568	else	1544	else
1569	{	1545	{
…		…
1572	while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))	1548	while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1573	;	1549	;
1574	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))	1550	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1575	;	1551	;
1576		1552
1577	if (isScrollbarWindow (ev.xany.window))	1553	if (scrollBar.state && ev.xany.window == scrollBar.win)
1578	{	1554	{
1579	scrollBar.setIdle ();	1555	scrollBar.state = STATE_IDLE;
1580	scrollbar_show (0);	1556	scrollbar_show (0);
1581	}	1557	}
1582
1583	#ifdef ENABLE_TRANSPARENCY
1584	if (am_transparent && ev.xany.window == parent[0])
1585	XClearWindow (dpy, ev.xany.window);
1586	#endif
1587	}	1558	}
1588	break;	1559	break;
1589		1560
1590	case MotionNotify:	1561	case MotionNotify:
1591	#ifdef POINTER_BLANK	1562	#ifdef POINTER_BLANK
1592	if (hidden_pointer)	1563	if (hidden_pointer)
1593	pointer_unblank ();	1564	pointer_unblank ();
1594	#endif	1565	#endif
		1566	if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask\|Button2Mask\|Button3Mask))
		1567	\|\| priv_modes & PrivMode_MouseAnyEvent)
		1568	mouse_report (ev.xbutton);
1595	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)	1569	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1596	break;	1570	break;
1597		1571
1598	if (ev.xany.window == vt)	1572	if (ev.xany.window == vt)
1599	{	1573	{
…		…
1633	int dist;	1607	int dist;
1634		1608
1635	/* don't clobber the current delay if we are	1609	/* don't clobber the current delay if we are
1636	* already in the middle of scrolling.	1610	* already in the middle of scrolling.
1637	*/	1611	*/
1638	if (!sel_scroll_ev.active)	1612	if (!sel_scroll_ev.is_active ())
1639	sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);	1613	sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1640		1614
1641	/* save the event params so we can highlight	1615	/* save the event params so we can highlight
1642	* the selection in the pending-scroll loop	1616	* the selection in the pending-scroll loop
1643	*/	1617	*/
1644	selection_save_x = ev.xbutton.x;	1618	selection_save_x = ev.xbutton.x;
…		…
1666	else	1640	else
1667	{	1641	{
1668	/* we are within the text window, so we	1642	/* we are within the text window, so we
1669	* shouldn't be scrolling	1643	* shouldn't be scrolling
1670	*/	1644	*/
1671	if (sel_scroll_ev.active)
1672	sel_scroll_ev.stop();	1645	sel_scroll_ev.stop();
1673	}	1646	}
1674	#endif	1647	#endif
1675	#ifdef MOUSE_THRESHOLD	1648	#ifdef MOUSE_THRESHOLD
1676	}	1649	}
1677	#endif	1650	#endif
1678	}	1651	}
1679	}	1652	}
1680	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1653	else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1681	{	1654	{
1682	while (XCheckTypedWindowEvent (dpy, scrollBar.win,	1655	while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1683	MotionNotify, &ev))	1656	MotionNotify, &ev))
1684	;	1657	;
1685		1658
…		…
1703	{	1676	{
1704	hidden_cursor = 0;	1677	hidden_cursor = 0;
1705	want_refresh = 1;	1678	want_refresh = 1;
1706	}	1679	}
1707		1680
1708	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);	1681	cursor_blink_ev.again ();
1709	}	1682	}
1710	#endif	1683	#endif
1711		1684
1712	#if defined(POINTER_BLANK)	1685	#if defined(POINTER_BLANK)
1713	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)	1686	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
…		…
1720		1693
1721	if (ev.type == KeyPress && hidden_pointer == 0)	1694	if (ev.type == KeyPress && hidden_pointer == 0)
1722	pointer_blank ();	1695	pointer_blank ();
1723	}	1696	}
1724	#endif	1697	#endif
		1698
		1699	refresh_check ();
1725	}	1700	}
1726		1701
1727	void	1702	void
1728	rxvt_term::focus_in ()	1703	rxvt_term::focus_in ()
1729	{	1704	{
…		…
1741	XSetICFocus (Input_Context);	1716	XSetICFocus (Input_Context);
1742	}	1717	}
1743	#endif	1718	#endif
1744	#if CURSOR_BLINK	1719	#if CURSOR_BLINK
1745	if (option (Opt_cursorBlink))	1720	if (option (Opt_cursorBlink))
1746	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);	1721	cursor_blink_ev.again ();
1747	#endif	1722	#endif
1748	#if OFF_FOCUS_FADING	1723	#if OFF_FOCUS_FADING
1749	if (rs[Rs_fade])	1724	if (rs[Rs_fade])
1750	{	1725	{
1751	pix_colors = pix_colors_focused;	1726	pix_colors = pix_colors_focused;
…		…
1753	}	1728	}
1754	#endif	1729	#endif
1755	#if ENABLE_FRILLS	1730	#if ENABLE_FRILLS
1756	if (option (Opt_urgentOnBell))	1731	if (option (Opt_urgentOnBell))
1757	{	1732	{
1758	XWMHints *h;
1759
1760	h = XGetWMHints(dpy, parent[0]);	1733	if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1761	if (h != NULL)
1762	{	1734	{
1763	h->flags &= ~XUrgencyHint;	1735	h->flags &= ~XUrgencyHint;
1764	XSetWMHints(dpy, parent[0], h);	1736	XSetWMHints (dpy, parent[0], h);
1765	}	1737	}
1766	}	1738	}
1767	#endif	1739	#endif
1768	}	1740	}
1769	}	1741	}
…		…
1792	XUnsetICFocus (Input_Context);	1764	XUnsetICFocus (Input_Context);
1793	#endif	1765	#endif
1794	#if CURSOR_BLINK	1766	#if CURSOR_BLINK
1795	if (option (Opt_cursorBlink))	1767	if (option (Opt_cursorBlink))
1796	cursor_blink_ev.stop ();	1768	cursor_blink_ev.stop ();
		1769
1797	hidden_cursor = 0;	1770	hidden_cursor = 0;
1798	#endif	1771	#endif
1799	#if OFF_FOCUS_FADING	1772	#if OFF_FOCUS_FADING
1800	if (rs[Rs_fade])	1773	if (rs[Rs_fade])
1801	{	1774	{
…		…
1835	case PropertyNotify:	1808	case PropertyNotify:
1836	/*	1809	/*
1837	* if user used some Esetroot compatible prog to set the root bg,	1810	* if user used some Esetroot compatible prog to set the root bg,
1838	* use the property to determine the pixmap. We use it later on.	1811	* use the property to determine the pixmap. We use it later on.
1839	*/	1812	*/
1840	if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]	1813	if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1841	&& ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])	1814	\|\| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1842	return;	1815	{
		1816	bgPixmap.set_root_pixmap ();
		1817	update_background ();
		1818	}
1843		1819
1844	/* FALLTHROUGH */
1845	case ReparentNotify:
1846	if (option (Opt_transparent))
1847	check_our_parents ();
1848	break;	1820	break;
1849	}	1821	}
1850	# endif	1822	# endif
		1823
		1824	refresh_check ();
1851	}	1825	}
1852	#endif	1826	#endif
1853		1827
1854	void	1828	void
1855	rxvt_term::button_press (XButtonEvent &ev)	1829	rxvt_term::button_press (XButtonEvent &ev)
…		…
1910	mouse_report (ev);	1884	mouse_report (ev);
1911	}	1885	}
1912	#else	1886	#else
1913	MEvent.button = ev.button;	1887	MEvent.button = ev.button;
1914	mouse_report (ev);	1888	mouse_report (ev);
1915	#endif /* MOUSE_REPORT_DOUBLECLICK */	1889	#endif /* MOUSE_REPORT_DOUBLECLICK */
1916		1890
1917	}	1891	}
1918	else	1892	else
1919	{	1893	{
1920	if (ev.button != MEvent.button)	1894	if (ev.button != MEvent.button)
…		…
1968	}	1942	}
1969		1943
1970	/*	1944	/*
1971	* Scrollbar window processing of button press	1945	* Scrollbar window processing of button press
1972	*/	1946	*/
1973	if (isScrollbarWindow (ev.window))	1947	if (scrollBar.state && ev.window == scrollBar.win)
1974	{	1948	{
1975	scrollBar.setIdle ();	1949	page_dirn direction = NO_DIR;
		1950
		1951	if (scrollBar.upButton (ev.y))
		1952	direction = UP; /* up */
		1953	else if (scrollBar.dnButton (ev.y))
		1954	direction = DN; /* down */
		1955
		1956	scrollBar.state = STATE_IDLE;
1976	/*	1957	/*
1977	* Rxvt-style scrollbar:	1958	* Rxvt-style scrollbar:
1978	* move up if mouse is above slider	1959	* move up if mouse is above slider
1979	* move dn if mouse is below slider	1960	* move dn if mouse is below slider
1980	*	1961	*
…		…
1989	/*	1970	/*
1990	* Mouse report disabled scrollbar:	1971	* Mouse report disabled scrollbar:
1991	* arrow buttons - send up/down	1972	* arrow buttons - send up/down
1992	* click on scrollbar - send pageup/down	1973	* click on scrollbar - send pageup/down
1993	*/	1974	*/
1994	if ((scrollBar.style == R_SB_NEXT	1975	if (direction == UP)
1995	&& scrollbarnext_upButton (ev.y))
1996	\|\| (scrollBar.style == R_SB_RXVT
1997	&& scrollbarrxvt_upButton (ev.y)))
1998	tt_printf ("\033[A");	1976	tt_printf ("\033[A");
1999	else if ((scrollBar.style == R_SB_NEXT	1977	else if (direction == DN)
2000	&& scrollbarnext_dnButton (ev.y))
2001	\|\| (scrollBar.style == R_SB_RXVT
2002	&& scrollbarrxvt_dnButton (ev.y)))
2003	tt_printf ("\033[B");	1978	tt_printf ("\033[B");
2004	else	1979	else
2005	switch (ev.button)	1980	switch (ev.button)
2006	{	1981	{
2007	case Button2:	1982	case Button2:
…		…
2014	tt_printf ("\033[5~");	1989	tt_printf ("\033[5~");
2015	break;	1990	break;
2016	}	1991	}
2017	}	1992	}
2018	else	1993	else
2019	#endif /* NO_SCROLLBAR_REPORT */	1994	#endif /* NO_SCROLLBAR_REPORT */
2020
2021	{
2022	char upordown = 0;
2023
2024	if (scrollBar.style == R_SB_NEXT)
2025	{	1995	{
2026	if (scrollbarnext_upButton (ev.y))	1996	if (direction != NO_DIR)
2027	upordown = -1; /* up */
2028	else if (scrollbarnext_dnButton (ev.y))
2029	upordown = 1; /* down */
2030	}
2031	else if (scrollBar.style == R_SB_RXVT)
2032	{
2033	if (scrollbarrxvt_upButton (ev.y))
2034	upordown = -1; /* up */
2035	else if (scrollbarrxvt_dnButton (ev.y))
2036	upordown = 1; /* down */
2037	}
2038	if (upordown)
2039	{	1997	{
2040	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	1998	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
		1999	if (!cont_scroll_ev.is_active ())
2041	cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);	2000	cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2042	#endif	2001	#endif
2043	if (scr_page (upordown < 0 ? UP : DN, 1))	2002	if (scr_page (direction, 1))
2044	{	2003	{
2045	if (upordown < 0)	2004	if (direction == UP)
2046	scrollBar.setUp ();	2005	scrollBar.state = STATE_UP;
2047	else	2006	else
2048	scrollBar.setDn ();	2007	scrollBar.state = STATE_DOWN;
2049	}	2008	}
2050	}	2009	}
2051	else	2010	else
2052	switch (ev.button)	2011	switch (ev.button)
2053	{	2012	{
2054	case Button2:	2013	case Button2:
2055	switch (scrollbar_align)	2014	switch (scrollBar.align)
2056	{	2015	{
2057	case R_SB_ALIGN_TOP:	2016	case R_SB_ALIGN_TOP:
2058	csrO = 0;	2017	csrO = 0;
2059	break;	2018	break;
2060	case R_SB_ALIGN_CENTRE:	2019	case R_SB_ALIGN_CENTRE:
…		…
2068	if (scrollBar.style == R_SB_XTERM	2027	if (scrollBar.style == R_SB_XTERM
2069	\|\| scrollbar_above_slider (ev.y)	2028	\|\| scrollbar_above_slider (ev.y)
2070	\|\| scrollbar_below_slider (ev.y))	2029	\|\| scrollbar_below_slider (ev.y))
2071	scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());	2030	scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
2072		2031
2073	scrollBar.setMotion ();	2032	scrollBar.state = STATE_MOTION;
2074	break;	2033	break;
2075		2034
2076	case Button1:	2035	case Button1:
2077	if (scrollbar_align == R_SB_ALIGN_CENTRE)	2036	if (scrollBar.align == R_SB_ALIGN_CENTRE)
2078	csrO = ev.y - scrollBar.top;	2037	csrO = ev.y - scrollBar.top;
2079	/* FALLTHROUGH */	2038	/* FALLTHROUGH */
2080		2039
2081	case Button3:	2040	case Button3:
2082	if (scrollBar.style != R_SB_XTERM)	2041	if (scrollBar.style != R_SB_XTERM)
…		…
2092	scr_page (DN, nrow - 1);	2051	scr_page (DN, nrow - 1);
2093	# else	2052	# else
2094	scr_page (DN, nrow / 4);	2053	scr_page (DN, nrow / 4);
2095	# endif	2054	# endif
2096	else	2055	else
2097	scrollBar.setMotion ();	2056	scrollBar.state = STATE_MOTION;
2098	}	2057	}
2099	else	2058	else
2100	{	2059	{
2101	scr_page ((ev.button == Button1 ? DN : UP),	2060	scr_page ((ev.button == Button1 ? DN : UP),
2102	(nrow	2061	(nrow
…		…
2119		2078
2120	csrO = 0; /* reset csr Offset */	2079	csrO = 0; /* reset csr Offset */
2121	if (!bypass_keystate)	2080	if (!bypass_keystate)
2122	reportmode = !! (priv_modes & PrivMode_mouse_report);	2081	reportmode = !! (priv_modes & PrivMode_mouse_report);
2123		2082
2124	if (scrollbar_isUpDn ())	2083	if (scrollBar.state == STATE_UP \|\| scrollBar.state == STATE_DOWN)
2125	{	2084	{
2126	scrollBar.setIdle ();	2085	scrollBar.state = STATE_IDLE;
2127	scrollbar_show (0);	2086	scrollbar_show (0);
2128	}	2087	}
2129		2088
2130	#ifdef SELECTION_SCROLLING	2089	#ifdef SELECTION_SCROLLING
2131	if (sel_scroll_ev.active)
2132	sel_scroll_ev.stop();	2090	sel_scroll_ev.stop();
2133	#endif	2091	#endif
2134		2092
2135	if (ev.window == vt)	2093	if (ev.window == vt)
2136	{	2094	{
2137	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))	2095	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
…		…
2161	mouse_report (ev);	2119	mouse_report (ev);
2162	}	2120	}
2163	#else /* MOUSE_REPORT_DOUBLECLICK */	2121	#else /* MOUSE_REPORT_DOUBLECLICK */
2164	MEvent.button = AnyButton;	2122	MEvent.button = AnyButton;
2165	mouse_report (ev);	2123	mouse_report (ev);
2166	#endif /* MOUSE_REPORT_DOUBLECLICK */	2124	#endif /* MOUSE_REPORT_DOUBLECLICK */
2167	return;	2125	return;
2168	}	2126	}
2169		2127
2170	/*	2128	/*
2171	* dumb hack to compensate for the failure of click-and-drag	2129	* dumb hack to compensate for the failure of click-and-drag
…		…
2209	{	2167	{
2210	mouse_slip_wheel_speed += v ? -1 : 1;	2168	mouse_slip_wheel_speed += v ? -1 : 1;
2211	if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;	2169	if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2212	if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;	2170	if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2213		2171
2214	if (slip_wheel_ev.at < NOW)	2172	if (!slip_wheel_ev.is_active ())
2215	slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;	2173	slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2216
2217	slip_wheel_ev.start ();
2218	}	2174	}
2219	else	2175	else
		2176	# endif
2220	{	2177	{
2221	# endif
2222	scr_page (v, i);	2178	scr_page (v, i);
2223	scrollbar_show (1);	2179	scrollbar_show (1);
2224	# ifdef MOUSE_SLIP_WHEELING
2225	}	2180	}
2226	# endif
2227	}	2181	}
2228	break;	2182	break;
2229	#endif	2183	#endif
2230	}	2184	}
2231	}	2185	}
…		…
2290		2244
2291	if (!option (Opt_jumpScroll) \|\| refresh_count >= nrow - 1)	2245	if (!option (Opt_jumpScroll) \|\| refresh_count >= nrow - 1)
2292	{	2246	{
2293	refresh_count = 0;	2247	refresh_count = 0;
2294		2248
2295	if (!option (Opt_skipScroll) \|\| io_manager::now () > NOW + 1. / 60.)	2249	if (!option (Opt_skipScroll) \|\| ev_time () > ev::now () + 1. / 60.)
2296	{	2250	{
2297	refreshnow = true;	2251	refreshnow = true;
2298	ch = NOCHAR;	2252	ch = NOCHAR;
2299	break;	2253	break;
2300	}	2254	}
…		…
2511	}	2465	}
2512	}	2466	}
2513		2467
2514	pclose_printer (fd);	2468	pclose_printer (fd);
2515	}	2469	}
2516	#endif /* PRINTPIPE */	2470	#endif /* PRINTPIPE */
2517	/}}} /	2471	/}}} /
2518		2472
2519	/* INDENT-OFF */	2473	/* INDENT-OFF */
2520	enum {	2474	enum {
2521	C1_40 = 0x40,	2475	C1_40 = 0x40,
…		…
2807	rxvt_term::process_csi_seq ()	2761	rxvt_term::process_csi_seq ()
2808	{	2762	{
2809	unicode_t ch, priv, i;	2763	unicode_t ch, priv, i;
2810	unsigned int nargs, p;	2764	unsigned int nargs, p;
2811	int n, ndef;	2765	int n, ndef;
2812	int arg[ESC_ARGS];	2766	int arg[ESC_ARGS] = { };
2813		2767
2814	memset (arg, 0, sizeof (arg));
2815	nargs = 0;	2768	nargs = 0;
2816		2769
2817	priv = 0;	2770	priv = 0;
2818	ch = cmd_getc ();	2771	ch = cmd_getc ();
2819	if (ch >= '<' && ch <= '?')	2772	if (ch >= '<' && ch <= '?')
		2773	{
2820	{ /* '<' '=' '>' '?' */	2774	/* '<' '=' '>' '?' */
2821	priv = ch;	2775	priv = ch;
2822	ch = cmd_getc ();	2776	ch = cmd_getc ();
2823	}	2777	}
2824		2778
2825	/* read any numerical arguments */	2779	/* read any numerical arguments */
…		…
2868	{	2822	{
2869	// first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,	2823	// first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2870	// 'U' for rxvt-unicode != 7.[34] (where it was broken).	2824	// 'U' for rxvt-unicode != 7.[34] (where it was broken).
2871	//	2825	//
2872	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt	2826	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2873	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify	2827	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2874	// that we do not support xterm mouse reporting (should be 95 when we do).	2828	// versions.
2875	//	2829	//
2876	tt_printf ("\033[>%d;94;0c", 'U');	2830	tt_printf ("\033[>%d;95;0c", 'U');
2877	}	2831	}
2878	break;	2832	break;
		2833
2879	case '?':	2834	case '?':
2880	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')	2835	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')
2881	process_terminal_mode (ch, priv, nargs, arg);	2836	process_terminal_mode (ch, priv, nargs, arg);
2882	break;	2837	break;
2883	}	2838	}
…		…
3399	*buf++ = '\0';	3354	*buf++ = '\0';
3400		3355
3401	process_color_seq (op, color, name, resp);	3356	process_color_seq (op, color, name, resp);
3402	}	3357	}
3403	break;	3358	break;
		3359	case Rxvt_restoreFG:
3404	case XTerm_Color00:	3360	case XTerm_Color00:
3405	process_color_seq (op, Color_fg, str, resp);	3361	process_color_seq (op, Color_fg, str, resp);
3406	break;	3362	break;
		3363	case Rxvt_restoreBG:
3407	case XTerm_Color01:	3364	case XTerm_Color01:
3408	process_color_seq (op, Color_bg, str, resp);	3365	process_color_seq (op, Color_bg, str, resp);
3409	break;	3366	break;
3410	#ifndef NO_CURSORCOLOR	3367	#ifndef NO_CURSORCOLOR
3411	case XTerm_Color_cursor:	3368	case XTerm_Color_cursor:
…		…
3432	break;	3389	break;
3433	case URxvt_Color_IT:	3390	case URxvt_Color_IT:
3434	process_color_seq (op, Color_IT, str, resp);	3391	process_color_seq (op, Color_IT, str, resp);
3435	break;	3392	break;
3436	#endif	3393	#endif
3437	#if ENABLE_TRANSPARENCY && TINTING	3394	#if ENABLE_TRANSPARENCY
3438	case URxvt_Color_tint:	3395	case URxvt_Color_tint:
3439	process_color_seq (op, Color_tint, str, resp);	3396	process_color_seq (op, Color_tint, str, resp);
		3397	{
		3398	bool changed = false;
3440		3399
3441	check_our_parents ();	3400	if (ISSET_PIXCOLOR (Color_tint))
		3401	changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
		3402	else
		3403	changed = bgPixmap.unset_tint ();
3442		3404
3443	if (am_transparent)	3405	if (changed)
3444	want_full_refresh = want_refresh = 1;	3406	update_background ();
		3407	}
3445		3408
3446	break;	3409	break;
3447	#endif	3410	#endif
3448		3411
3449	#if XPM_BACKGROUND	3412	#if BG_IMAGE_FROM_FILE
3450	case Rxvt_Pixmap:	3413	case Rxvt_Pixmap:
3451	{	3414	if (!strcmp (str, "?"))
3452	if (*str != ';')
3453	{	3415	{
3454	bgPixmap.handle_geometry (""); /* reset to default scaling */	3416	char str[256];
3455	set_bgPixmap (str); /* change pixmap */	3417
3456	scr_touch (true);	3418	sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
		3419	min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
		3420	min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
		3421	process_xterm_seq (XTerm_title, str, CHAR_ST);
3457	}	3422	}
3458		3423	else
		3424	{
3459	int changed = 0;	3425	int changed = 0;
3460		3426
3461	while ((str = strchr (str, ';')) != NULL)	3427	if (*str != ';')
3462	{	3428	{
		3429	/* reset to default scaling :*/
		3430	bgPixmap.unset_geometry ();
		3431	if (bgPixmap.set_file (str)) /* change pixmap */
		3432	changed++;
		3433	str = strchr (str, ';');
		3434	if (str == NULL)
		3435	bgPixmap.set_defaultGeometry ();
		3436	}
		3437
		3438	while (str)
		3439	{
3463	str++;	3440	str++;
3464	changed += bgPixmap.handle_geometry (str);	3441	if (bgPixmap.set_geometry (str))
		3442	changed++;
		3443	str = strchr (str, ';');
3465	}	3444	}
3466		3445
3467	if (changed)	3446	if (changed)
3468	{	3447	update_background ();
3469	resize_pixmap ();
3470	scr_touch (true);
3471	}	3448	}
3472	#if ENABLE_TRANSPARENCY && defined(HAVE_AFTERIMAGE)
3473	if (option (Opt_transparent))
3474	check_our_parents ();
3475	#endif
3476	}
3477	break;	3449	break;
3478	#endif	3450	#endif
3479
3480	case Rxvt_restoreFG:
3481	set_window_color (Color_fg, str);
3482	break;
3483	case Rxvt_restoreBG:
3484	set_window_color (Color_bg, str);
3485	break;
3486		3451
3487	case XTerm_logfile:	3452	case XTerm_logfile:
3488	// TODO, when secure mode?	3453	// TODO, when secure mode?
3489	break;	3454	break;
3490		3455
…		…
3605	{	3570	{
3606	unsigned int i, j;	3571	unsigned int i, j;
3607	int state;	3572	int state;
3608		3573
3609	static const struct	3574	static const struct
3610	{	3575	{
3611	const int argval;	3576	const int argval;
3612	const unsigned long bit;	3577	const unsigned long bit;
3613	}
3614
3615	argtopriv[] = {	3578	} argtopriv[] = {
3616	{ 1, PrivMode_aplCUR },	3579	{ 1, PrivMode_aplCUR },
3617	{ 2, PrivMode_vt52 },	3580	{ 2, PrivMode_vt52 },
3618	{ 3, PrivMode_132 },	3581	{ 3, PrivMode_132 },
3619	{ 4, PrivMode_smoothScroll },	3582	{ 4, PrivMode_smoothScroll },
3620	{ 5, PrivMode_rVideo },	3583	{ 5, PrivMode_rVideo },
…		…
3636	{ 66, PrivMode_aplKP },	3599	{ 66, PrivMode_aplKP },
3637	#ifndef NO_BACKSPACE_KEY	3600	#ifndef NO_BACKSPACE_KEY
3638	{ 67, PrivMode_BackSpace },	3601	{ 67, PrivMode_BackSpace },
3639	#endif	3602	#endif
3640	{ 1000, PrivMode_MouseX11 },	3603	{ 1000, PrivMode_MouseX11 },
3641	// 1001 Use Hilite Mouse Tracking. NYI, TODO	3604	{ 1002, PrivMode_MouseBtnEvent },
3642	// 1002 Use Cell Motion Mouse Tracking. NYI, TODO	3605	{ 1003, PrivMode_MouseAnyEvent },
3643	// 1003 Use All Motion Mouse Tracking. NYI, TODO
3644	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension	3606	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension
3645	{ 1011, PrivMode_Keypress }, // rxvt extension	3607	{ 1011, PrivMode_Keypress }, // rxvt extension
3646	// 1035 enable modifiers for alt, numlock NYI	3608	// 1035 enable modifiers for alt, numlock NYI
3647	// 1036 send ESC for meta keys NYI	3609	// 1036 send ESC for meta keys NYI
3648	// 1037 send DEL for keypad delete NYI	3610	// 1037 send DEL for keypad delete NYI
3649	{ 1047, PrivMode_Screen },	3611	{ 1047, PrivMode_Screen },
3650	// 1048 save and restore cursor	3612	// 1048 save and restore cursor
3651	{ 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */	3613	{ 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3652	// 1051, 1052, 1060, 1061 keyboard emulation NYI	3614	// 1051, 1052, 1060, 1061 keyboard emulation NYI
		3615	{ 2004, PrivMode_BracketPaste },
3653	};	3616	};
3654		3617
3655	if (nargs == 0)	3618	if (nargs == 0)
3656	return;	3619	return;
3657		3620
…		…
3705	*/	3668	*/
3706	PrivMode (1, PrivMode_vt52);	3669	PrivMode (1, PrivMode_vt52);
3707	break;	3670	break;
3708	case 3: /* 80/132 */	3671	case 3: /* 80/132 */
3709	if (priv_modes & PrivMode_132OK)	3672	if (priv_modes & PrivMode_132OK)
		3673	{
		3674	scr_poweron ();
3710	set_widthheight (((state ? 132 : 80) * fwidth), height);	3675	set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);
		3676	}
3711	break;	3677	break;
3712	case 4: /* smooth scrolling */	3678	case 4: /* smooth scrolling */
3713	set_option (Opt_jumpScroll, !state);	3679	set_option (Opt_jumpScroll, !state);
3714	break;	3680	break;
3715	case 5: /* reverse video */	3681	case 5: /* reverse video */
…		…
3722	scr_autowrap (state);	3688	scr_autowrap (state);
3723	break;	3689	break;
3724	/* case 8: - auto repeat, can't do on a per window basis */	3690	/* case 8: - auto repeat, can't do on a per window basis */
3725	case 9: /* X10 mouse reporting */	3691	case 9: /* X10 mouse reporting */
3726	if (state) /* orthogonal */	3692	if (state) /* orthogonal */
3727	priv_modes &= ~PrivMode_MouseX11;	3693	priv_modes &= ~(PrivMode_MouseX11\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);
3728	break;	3694	break;
3729	#ifdef scrollBar_esc	3695	#ifdef scrollBar_esc
3730	case scrollBar_esc:	3696	case scrollBar_esc:
3731	if (scrollbar_mapping (state))	3697	if (scrollbar_mapping (state))
3732	{	3698	{
…		…
3745	break;	3711	break;
3746	/* case 66: - application key pad */	3712	/* case 66: - application key pad */
3747	/* case 67: - backspace key */	3713	/* case 67: - backspace key */
3748	case 1000: /* X11 mouse reporting */	3714	case 1000: /* X11 mouse reporting */
3749	if (state) /* orthogonal */	3715	if (state) /* orthogonal */
3750	priv_modes &= ~PrivMode_MouseX10;	3716	priv_modes &= ~(PrivMode_MouseX10\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);
3751	break;	3717	break;
3752	#if 0
3753	case 1001:	3718	case 1002:
3754	break; /* X11 mouse highlighting */	3719	case 1003:
3755	#endif	3720	if (state)
		3721	{
		3722	priv_modes &= ~(PrivMode_MouseX10\|PrivMode_MouseX11);
		3723	priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
		3724	vt_emask_mouse = PointerMotionMask;
		3725	}
		3726	else
		3727	vt_emask_mouse = NoEventMask;
		3728	vt_select_input ();
		3729	break;
3756	case 1010: /* scroll to bottom on TTY output inhibit */	3730	case 1010: /* scroll to bottom on TTY output inhibit */
3757	set_option (Opt_scrollTtyOutput, !state);	3731	set_option (Opt_scrollTtyOutput, !state);
3758	break;	3732	break;
3759	case 1011: /* scroll to bottom on key press */	3733	case 1011: /* scroll to bottom on key press */
3760	set_option (Opt_scrollTtyKeypress, state);	3734	set_option (Opt_scrollTtyKeypress, state);
…		…
3937	rxvt_term::process_graphics ()	3911	rxvt_term::process_graphics ()
3938	{	3912	{
3939	unicode_t ch, cmd = cmd_getc ();	3913	unicode_t ch, cmd = cmd_getc ();
3940		3914
3941	if (cmd == 'Q')	3915	if (cmd == 'Q')
		3916	{
3942	{ /* query graphics */	3917	/* query graphics */
3943	tt_printf ("\033G0\012"); /* no graphics */	3918	tt_printf ("\033G0\012"); /* no graphics */
3944	return;	3919	return;
3945	}	3920	}
3946	/* swallow other graphics sequences until terminating ':' */	3921	/* swallow other graphics sequences until terminating ':' */
3947	do	3922	do
…		…
3997	v_buffer = (char *)realloc (v_buffer, v_buflen + len);	3972	v_buffer = (char *)realloc (v_buffer, v_buflen + len);
3998		3973
3999	memcpy (v_buffer + v_buflen, data, len);	3974	memcpy (v_buffer + v_buflen, data, len);
4000	v_buflen += len;	3975	v_buflen += len;
4001		3976
4002	pty_ev.set (EVENT_READ \| EVENT_WRITE);	3977	pty_ev.set (ev::READ \| ev::WRITE);
4003	}	3978	}
4004		3979
4005	void rxvt_term::pty_write ()	3980	void rxvt_term::pty_write ()
4006	{	3981	{
4007	int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));	3982	int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
…		…
4012		3987
4013	if (v_buflen == 0)	3988	if (v_buflen == 0)
4014	{	3989	{
4015	free (v_buffer);	3990	free (v_buffer);
4016	v_buffer = 0;	3991	v_buffer = 0;
4017	v_buflen = 0;
4018		3992
4019	pty_ev.set (EVENT_READ);	3993	pty_ev.set (ev::READ);
4020	return;	3994	return;
4021	}	3995	}
4022		3996
4023	memmove (v_buffer, v_buffer + written, v_buflen);	3997	memmove (v_buffer, v_buffer + written, v_buflen);
4024	}	3998	}
4025	else if (written != -1 \|\| (errno != EAGAIN && errno != EINTR))	3999	else if (written != -1 \|\| (errno != EAGAIN && errno != EINTR))
4026	pty_ev.set (EVENT_READ);	4000	pty_ev.set (ev::READ);
4027	}	4001	}
4028		4002
4029	/----------------------- end-of-file (C source) -----------------------/	4003	/----------------------- end-of-file (C source) -----------------------/
4030		4004

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.340 by sasha, Fri Aug 3 22:40:10 2007 UTC vs. Revision 1.406 by ayin, Thu Feb 14 23:53:05 2008 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.340 by sasha, Fri Aug 3 22:40:10 2007 UTC vs.
Revision 1.406 by ayin, Thu Feb 14 23:53:05 2008 UTC