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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.329 by ayin, Mon Jun 11 19:57:28 2007 UTC vs.
Revision 1.382 by root, Fri Dec 14 06:04:56 2007 UTC

…		…
25	* - extensive modifications	25	* - extensive modifications
26	* Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>	26	* Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27	* Copyright (c) 2001 Marius Gedminas	27	* Copyright (c) 2001 Marius Gedminas
28	* - Ctrl/Mod4+Tab works like Meta+Tab (options)	28	* - Ctrl/Mod4+Tab works like Meta+Tab (options)
29	* Copyright (c) 2003 Rob McMullen <robm@flipturn.org>	29	* Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30	* Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>	30	* Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
31	*	31	*
32	* This program is free software; you can redistribute it and/or modify	32	* This program is free software; you can redistribute it and/or modify
33	* it under the terms of the GNU General Public License as published by	33	* it under the terms of the GNU General Public License as published by
34	* the Free Software Foundation; either version 2 of the License, or	34	* the Free Software Foundation; either version 2 of the License, or
35	* (at your option) any later version.	35	* (at your option) any later version.
…		…
94	XK_ISO_Left_Tab, 0x21e6,	94	XK_ISO_Left_Tab, 0x21e6,
95	XK_Shift_L, 0x21e7,	95	XK_Shift_L, 0x21e7,
96	XK_Shift_R, 0x21e7,	96	XK_Shift_R, 0x21e7,
97		97
98	XK_Shift_Lock, 0x21eb,	98	XK_Shift_Lock, 0x21eb,
99	XK_ISO_Lock, 0x21eb,
100	XK_ISO_Lock, 0x21eb,	99	XK_ISO_Lock, 0x21eb,
101	XK_Caps_Lock, 0x21ec,	100	XK_Caps_Lock, 0x21ec,
102	XK_Num_Lock, 0x21ed,	101	XK_Num_Lock, 0x21ed,
103	XK_ISO_Level3_Shift, 0x21ee,	102	XK_ISO_Level3_Shift, 0x21ee,
104	XK_ISO_Level3_Lock, 0x21ef,	103	XK_ISO_Level3_Lock, 0x21ef,
…		…
519	# endif	518	# endif
520	return;	519	return;
521	}	520	}
522	else	521	else
523	{	522	{
524	# if ENABLE_OVERLAY	523	# if ISO_14755
525	scr_overlay_off ();	524	scr_overlay_off ();
526	# endif	525	# endif
527	iso14755buf = 0;	526	iso14755buf = 0;
528	}	527	}
529	}	528	}
530	else if ((ctrl && (keysym == XK_Shift_L \|\| keysym == XK_Shift_R))	529	else if ((ctrl && (keysym == XK_Shift_L \|\| keysym == XK_Shift_R))
531	\|\| (shft && (keysym == XK_Control_L \|\| keysym == XK_Control_R)))	530	\|\| (shft && (keysym == XK_Control_L \|\| keysym == XK_Control_R)))
532	if (!(iso14755buf & ISO_14755_STARTED))	531	if (!(iso14755buf & ISO_14755_STARTED))
533	{	532	{
534	iso14755buf \|= ISO_14755_STARTED;	533	iso14755buf \|= ISO_14755_STARTED;
535	# if ENABLE_OVERLAY	534	# if ISO_14755
536	scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);	535	scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
537	scr_overlay_set (0, 0, "ISO 14755 mode");	536	scr_overlay_set (0, 0, "ISO 14755 mode");
538	# endif	537	# endif
539	}	538	}
540	#endif	539	#endif
…		…
548	#endif	547	#endif
549		548
550	if (keysym >= 0xFF00 && keysym <= 0xFFFF)	549	if (keysym >= 0xFF00 && keysym <= 0xFFFF)
551	{	550	{
552	{	551	{
		552	bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
553	newlen = 1;	553	newlen = 1;
		554	#ifdef XK_KP_Home
		555	static const KeySym keypadtrans[] = {
		556	XK_KP_7, // XK_KP_Home
		557	XK_KP_4, // XK_KP_Left
		558	XK_KP_8, // XK_KP_Up
		559	XK_KP_6, // XK_KP_Right
		560	XK_KP_2, // XK_KP_Down
		561	#ifndef UNSHIFTED_SCROLLKEYS
		562	XK_KP_9, // XK_KP_Prior
		563	XK_KP_3, // XK_KP_Next
		564	#else
		565	XK_Prior,
		566	XK_Next,
		567	#endif
		568	XK_KP_1, // XK_KP_End
		569	XK_KP_5, // XK_KP_Begin
		570	};
		571
		572	if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
		573	{
		574	unsigned int index = keysym - XK_KP_Home;
		575	keysym = kp ? keypadtrans[index] : XK_Home + index;
		576	}
		577	else if (keysym == XK_KP_Insert)
		578	keysym = kp ? XK_KP_0 : XK_Insert;
		579	#ifndef NO_DELETE_KEY
		580	else if (keysym == XK_KP_Delete)
		581	keysym = kp ? XK_KP_Decimal : XK_Delete;
		582	#endif
		583	#endif
554	switch (keysym)	584	switch (keysym)
555	{	585	{
556	#ifndef NO_BACKSPACE_KEY	586	#ifndef NO_BACKSPACE_KEY
557	case XK_BackSpace:	587	case XK_BackSpace:
558	if (priv_modes & PrivMode_HaveBackSpace)	588	if (priv_modes & PrivMode_HaveBackSpace)
…		…
560	kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)	590	kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
561	^ !!ctrl) ? '\b' : '\177';	591	^ !!ctrl) ? '\b' : '\177';
562	kbuf[1] = '\0';	592	kbuf[1] = '\0';
563	}	593	}
564	else	594	else
565	strcpy (kbuf, key_backspace);	595	strcpy (kbuf, rs[Rs_backspace_key]);
566	break;	596	break;
567	#endif	597	#endif
568	#ifndef NO_DELETE_KEY	598	#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:	599	case XK_Delete:
580	strcpy (kbuf, key_delete);	600	strcpy (kbuf, rs[Rs_delete_key]);
581	break;	601	break;
582	#endif	602	#endif
583	case XK_Tab:	603	case XK_Tab:
584	if (shft)	604	if (shft)
585	strcpy (kbuf, "\033[Z");	605	strcpy (kbuf, "\033[Z");
…		…
595	#endif	615	#endif
596	newlen = 0;	616	newlen = 0;
597	}	617	}
598	break;	618	break;
599		619
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" */	620	case XK_Up: /* "\033[A" */
617	case XK_Down: /* "\033[B" */	621	case XK_Down: /* "\033[B" */
618	case XK_Right: /* "\033[C" */	622	case XK_Right: /* "\033[C" */
619	case XK_Left: /* "\033[D" */	623	case XK_Left: /* "\033[D" */
620	strcpy (kbuf, "\033[Z");	624	strcpy (kbuf, "\033[Z");
…		…
630	else if (priv_modes & PrivMode_aplCUR)	634	else if (priv_modes & PrivMode_aplCUR)
631	kbuf[1] = 'O';	635	kbuf[1] = 'O';
632	break;	636	break;
633		637
634	#ifndef UNSHIFTED_SCROLLKEYS	638	#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:	639	case XK_Prior:
646	strcpy (kbuf, "\033[5~");	640	strcpy (kbuf, "\033[5~");
647	break;	641	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:	642	case XK_Next:
659	strcpy (kbuf, "\033[6~");	643	strcpy (kbuf, "\033[6~");
660	break;	644	break;
661	#endif	645	#endif
662	case XK_KP_Enter:	646	case XK_KP_Enter:
663	/* allow shift to override */	647	/* allow shift to override */
664	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)	648	if (kp)
665	{	649	{
666	strcpy (kbuf, "\033OM");	650	strcpy (kbuf, "\033OM");
667	break;	651	break;
668	}	652	}
669		653
…		…
681	kbuf[0] = '\015';	665	kbuf[0] = '\015';
682	kbuf[1] = '\0';	666	kbuf[1] = '\0';
683	}	667	}
684	break;	668	break;
685		669
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" */	670	case XK_KP_F1: /* "\033OP" */
693	case XK_KP_F2: /* "\033OQ" */	671	case XK_KP_F2: /* "\033OQ" */
694	case XK_KP_F3: /* "\033OR" */	672	case XK_KP_F3: /* "\033OR" */
695	case XK_KP_F4: /* "\033OS" */	673	case XK_KP_F4: /* "\033OS" */
696	strcpy (kbuf, "\033OP");	674	strcpy (kbuf, "\033OP");
…		…
712	case XK_KP_6: /* "\033Ov" : "6" */	690	case XK_KP_6: /* "\033Ov" : "6" */
713	case XK_KP_7: /* "\033Ow" : "7" */	691	case XK_KP_7: /* "\033Ow" : "7" */
714	case XK_KP_8: /* "\033Ox" : "8" */	692	case XK_KP_8: /* "\033Ox" : "8" */
715	case XK_KP_9: /* "\033Oy" : "9" */	693	case XK_KP_9: /* "\033Oy" : "9" */
716	/* allow shift to override */	694	/* allow shift to override */
717	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)	695	if (kp)
718	{	696	{
719	strcpy (kbuf, "\033Oj");	697	strcpy (kbuf, "\033Oj");
720	kbuf[2] += (keysym - XK_KP_Multiply);	698	kbuf[2] += (keysym - XK_KP_Multiply);
721	}	699	}
722	else	700	else
…		…
728		706
729	case XK_Find:	707	case XK_Find:
730	strcpy (kbuf, "\033[1~");	708	strcpy (kbuf, "\033[1~");
731	break;	709	break;
732		710
733	#ifdef XK_KP_End
734	case XK_KP_Insert:
735	/* allow shift to override */
736	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
737	{
738	strcpy (kbuf, "\033Op");
739	break;
740	}
741	/* FALLTHROUGH */
742	#endif
743	case XK_Insert:	711	case XK_Insert:
744	strcpy (kbuf, "\033[2~");	712	strcpy (kbuf, "\033[2~");
745	break;	713	break;
746	#ifdef DXK_Remove /* support for DEC remove like key */	714	#ifdef DXK_Remove /* support for DEC remove like key */
747	case DXK_Remove:	715	case DXK_Remove:
…		…
751	strcpy (kbuf, "\033[3~");	719	strcpy (kbuf, "\033[3~");
752	break;	720	break;
753	case XK_Select:	721	case XK_Select:
754	strcpy (kbuf, "\033[4~");	722	strcpy (kbuf, "\033[4~");
755	break;	723	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:	724	case XK_End:
767	strcpy (kbuf, KS_END);	725	strcpy (kbuf, KS_END);
768	break;	726	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:	727	case XK_Home:
780	strcpy (kbuf, KS_HOME);	728	strcpy (kbuf, KS_HOME);
781	break;	729	break;
782		730
783	#define FKEY(n, fkey) \	731	#define FKEY(n, fkey) \
…		…
934	#if ENABLE_FRILLS \|\| ISO_14755	882	#if ENABLE_FRILLS \|\| ISO_14755
935	// ISO 14755 support	883	// ISO 14755 support
936	if (iso14755buf)	884	if (iso14755buf)
937	if (iso14755buf & ISO_14755_52)	885	if (iso14755buf & ISO_14755_52)
938	{	886	{
939	# if ENABLE_OVERLAY	887	# if ISO_14755
940	scr_overlay_off ();	888	scr_overlay_off ();
941	# endif	889	# endif
942	# if ISO_14755	890	# if ISO_14755
943	// iso14755 part 5.2 handling: release time	891	// iso14755 part 5.2 handling: release time
944	// first: controls	892	// first: controls
…		…
967		915
968	return;	916	return;
969	}	917	}
970	else if ((ev.state & (ShiftMask \| ControlMask)) != (ShiftMask \| ControlMask))	918	else if ((ev.state & (ShiftMask \| ControlMask)) != (ShiftMask \| ControlMask))
971	{	919	{
972	# if ENABLE_OVERLAY	920	# if ISO_14755
973	scr_overlay_off ();	921	scr_overlay_off ();
974	# endif	922	# endif
975	if (iso14755buf & ISO_14755_51)	923	if (iso14755buf & ISO_14755_51)
976	commit_iso14755 ();	924	commit_iso14755 ();
977	#if ISO_14755	925	#if ISO_14755
…		…
1035	void	983	void
1036	rxvt_term::flush ()	984	rxvt_term::flush ()
1037	{	985	{
1038	flush_ev.stop ();	986	flush_ev.stop ();
1039		987
1040	#ifdef TRANSPARENT	988	#ifdef HAVE_BG_PIXMAP
1041	if (want_full_refresh)	989	if (bgPixmap.check_clearChanged ())
1042	{	990	{
1043	want_full_refresh = 0;	991	// scr_clear (true); This needs to be researched further!
1044	scr_clear ();
1045	scr_touch (false);	992	scr_touch (false);
1046	}	993	}
1047	#endif	994	#endif
1048		995
1049	if (want_refresh)	996	if (want_refresh)
…		…
1094	}	1041	}
1095		1042
1096	display->flush ();	1043	display->flush ();
1097	}	1044	}
1098		1045
		1046	/* checks wether a refresh is requested and starts the refresh timer */
1099	void	1047	void
1100	rxvt_term::check_cb (check_watcher &w)	1048	rxvt_term::refresh_check ()
		1049	{
		1050	if (want_refresh && !flush_ev.is_active ())
		1051	flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
		1052
		1053	display->flush ();
		1054	}
		1055
		1056	void
		1057	rxvt_term::flush_cb (ev::timer &w, int revents)
1101	{	1058	{
1102	make_current ();	1059	make_current ();
1103		1060
1104	display->flush ();
1105
1106	if (want_refresh && !flush_ev.active)
1107	flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1108	}
1109
1110	void
1111	rxvt_term::flush_cb (time_watcher &w)
1112	{
1113	make_current ();
1114
1115	refresh_limit = 1;
1116	refresh_count = 0;	1061	refresh_count = 0;
1117	flush ();	1062	flush ();
1118	}	1063	}
1119		1064
1120	#ifdef CURSOR_BLINK	1065	#ifdef CURSOR_BLINK
1121	void	1066	void
1122	rxvt_term::cursor_blink_cb (time_watcher &w)	1067	rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1123	{	1068	{
1124	hidden_cursor = !hidden_cursor;	1069	hidden_cursor = !hidden_cursor;
1125	want_refresh = 1;	1070	want_refresh = 1;
1126		1071	refresh_check ();
1127	w.start (w.at + CURSOR_BLINK_INTERVAL);
1128	}	1072	}
1129	#endif	1073	#endif
1130		1074
1131	#ifdef TEXT_BLINK	1075	#ifdef TEXT_BLINK
1132	void	1076	void
1133	rxvt_term::text_blink_cb (time_watcher &w)	1077	rxvt_term::text_blink_cb (ev::timer &w, int revents)
1134	{	1078	{
1135	if (scr_refresh_rend (RS_Blink, RS_Blink))	1079	if (scr_refresh_rend (RS_Blink, RS_Blink))
1136	{	1080	{
1137	hidden_text = !hidden_text;	1081	hidden_text = !hidden_text;
1138	want_refresh = 1;	1082	want_refresh = 1;
1139	w.start (w.at + TEXT_BLINK_INTERVAL);	1083	refresh_check ();
1140	}	1084	}
		1085	else
		1086	w.stop ();
1141	}	1087	}
1142	#endif	1088	#endif
1143		1089
1144	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	1090	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1145	void	1091	void
1146	rxvt_term::cont_scroll_cb (time_watcher &w)	1092	rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1147	{	1093	{
1148	if ((scrollbar_isUp() \|\| scrollbar_isDn()) &&	1094	if ((scrollbar_isUp () \|\| scrollbar_isDn ())
1149	scr_page (scrollbar_isUp() ? UP : DN, 1))	1095	&& scr_page (scrollbar_isUp () ? UP : DN, 1))
1150	{	1096	{
1151	want_refresh = 1;	1097	want_refresh = 1;
1152	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1098	refresh_check ();
1153	}	1099	}
		1100	else
		1101	w.stop ();
1154	}	1102	}
1155	#endif	1103	#endif
1156		1104
1157	#ifdef SELECTION_SCROLLING	1105	#ifdef SELECTION_SCROLLING
1158	void	1106	void
1159	rxvt_term::sel_scroll_cb (time_watcher &w)	1107	rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1160	{	1108	{
1161	if (scr_page (scroll_selection_dir, scroll_selection_lines))	1109	if (scr_page (scroll_selection_dir, scroll_selection_lines))
1162	{	1110	{
1163	selection_extend (selection_save_x, selection_save_y, selection_save_state);	1111	selection_extend (selection_save_x, selection_save_y, selection_save_state);
1164	want_refresh = 1;	1112	want_refresh = 1;
1165	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1113	refresh_check ();
1166	}	1114	}
		1115	else
		1116	w.stop ();
1167	}	1117	}
1168	#endif	1118	#endif
1169		1119
1170	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	1120	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1171	void	1121	void
1172	rxvt_term::slip_wheel_cb (time_watcher &w)	1122	rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1173	{	1123	{
1174	if (mouse_slip_wheel_speed == 0	1124	if (scr_changeview (view_start - mouse_slip_wheel_speed))
1175	\|\| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1176	: scr_page (UP, mouse_slip_wheel_speed))
1177	{	1125	{
1178	if (view_start == top_row \|\| view_start == 0)
1179	mouse_slip_wheel_speed = 0;
1180
1181	want_refresh = 1;	1126	want_refresh = 1;
1182	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1127	refresh_check ();
		1128	}
		1129
		1130	if (view_start == top_row \|\| view_start == 0 \|\| mouse_slip_wheel_speed == 0)
		1131	{
		1132	mouse_slip_wheel_speed = 0;
		1133	w.stop ();
1183	}	1134	}
1184	}	1135	}
1185	#endif	1136	#endif
1186		1137
1187	#if LINUX_YIELD_HACK	1138	#if LINUX_YIELD_HACK
1188	static struct event_handler	1139	static struct event_handler
1189	{	1140	{
1190	check_watcher yield_ev;	1141	ev::prepare yield_ev;
1191		1142
1192	void yield_cb (check_watcher &w)	1143	void yield_cb (ev::prepare &w, int revents)
1193	{	1144	{
1194	// this should really be sched_yield(), but the linux guys thought	1145	// this should really be sched_yield(), but the linux guys thought
1195	// that giving a process calling sched_yield () less cpu time than	1146	// that giving a process calling sched_yield () less cpu time than
1196	// ones with high nice levels is a useful thing to do. It surely is is	1147	// ones with high nice levels is a useful thing to do. It surely is is
1197	// allowed by the sus... as is returning ENOSYS.	1148	// allowed by the sus... as is returning ENOSYS.
…		…
1248		1199
1249	return false;	1200	return false;
1250	}	1201	}
1251		1202
1252	void	1203	void
1253	rxvt_term::pty_cb (io_watcher &w, short revents)	1204	rxvt_term::pty_cb (ev::io &w, int revents)
1254	{	1205	{
1255	make_current ();	1206	make_current ();
1256		1207
1257	if (revents & EVENT_READ)	1208	if (revents & ev::READ)
1258	// loop, but don't allow a single term to monopolize us	1209	// loop, but don't allow a single term to monopolize us
1259	while (pty_fill ())	1210	while (pty_fill ())
1260	if (cmd_parse ())	1211	if (cmd_parse ())
1261	break;	1212	break;
1262		1213
1263	if (revents & EVENT_WRITE)	1214	if (revents & ev::WRITE)
1264	pty_write ();	1215	pty_write ();
1265	}	1216	}
1266		1217
1267	void	1218	void
1268	rxvt_term::pointer_unblank ()	1219	rxvt_term::pointer_unblank ()
…		…
1272		1223
1273	#ifdef POINTER_BLANK	1224	#ifdef POINTER_BLANK
1274	hidden_pointer = 0;	1225	hidden_pointer = 0;
1275		1226
1276	if (option (Opt_pointerBlank))	1227	if (option (Opt_pointerBlank))
1277	pointer_ev.start (NOW + pointerBlankDelay);	1228	pointer_ev.start (pointerBlankDelay);
1278	#endif	1229	#endif
1279	}	1230	}
1280		1231
1281	#ifdef POINTER_BLANK	1232	#ifdef POINTER_BLANK
1282	void	1233	void
…		…
1290		1241
1291	hidden_pointer = 1;	1242	hidden_pointer = 1;
1292	}	1243	}
1293		1244
1294	void	1245	void
1295	rxvt_term::pointer_cb (time_watcher &w)	1246	rxvt_term::pointer_cb (ev::timer &w, int revents)
1296	{	1247	{
1297	make_current ();	1248	make_current ();
1298		1249
1299	pointer_blank ();	1250	pointer_blank ();
1300	}	1251	}
…		…
1303	void	1254	void
1304	rxvt_term::mouse_report (XButtonEvent &ev)	1255	rxvt_term::mouse_report (XButtonEvent &ev)
1305	{	1256	{
1306	int button_number, key_state = 0;	1257	int button_number, key_state = 0;
1307	int x, y;	1258	int x, y;
		1259	int code = 32;
1308		1260
1309	x = ev.x;	1261	x = Pixel2Col (ev.x);
1310	y = ev.y;	1262	y = Pixel2Row (ev.y);
1311	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	}
1312		1271
1313	if (MEvent.button == AnyButton)	1272	if (MEvent.button == AnyButton)
1314	button_number = 3;	1273	button_number = 3;
1315	else	1274	else
1316	{	1275	{
…		…
1362	x + 1,	1321	x + 1,
1363	y + 1);	1322	y + 1);
1364	#endif	1323	#endif
1365		1324
1366	tt_printf ("\033[M%c%c%c",	1325	tt_printf ("\033[M%c%c%c",
1367	(32 + button_number + key_state),	1326	(code + button_number + key_state),
1368	(32 + x + 1),	1327	(32 + x + 1),
1369	(32 + y + 1));	1328	(32 + y + 1));
1370	}	1329	}
1371		1330
1372	/{{{ process an X event /	1331	/{{{ process an X event /
…		…
1434	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)	1393	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1435	focus_out ();	1394	focus_out ();
1436	}	1395	}
1437	#endif	1396	#endif
1438	}	1397	}
1439	break;
1440
1441	case MappingNotify:
1442	XRefreshKeyboardMapping (&ev.xmapping);
1443	break;	1398	break;
1444		1399
1445	/*	1400	/*
1446	* XXX: this is not the _current_ arrangement	1401	* XXX: this is not the _current_ arrangement
1447	* Here's my conclusion:	1402	* Here's my conclusion:
…		…
1480	&& ev.xfocus.mode != NotifyGrab)	1435	&& ev.xfocus.mode != NotifyGrab)
1481	focus_out ();	1436	focus_out ();
1482	break;	1437	break;
1483		1438
1484	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); */
1485	if (ev.xconfigure.window == parent[0])	1443	if (ev.xconfigure.window == parent[0])
1486	{	1444	{
1487	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))	1445	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1488	;	1446	;
1489		1447
1490	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)	1448	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)
1491	{	1449	{
1492	seen_resize = 1;	1450	seen_resize = 1;
1493	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1451	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1494	#ifdef XPM_BACKGROUND
1495	if (!option (Opt_transparent) && bgPixmap.auto_resize)
1496	{
1497	resize_pixmap ();
1498	scr_touch (true);
1499	}
1500	#endif
1501	}	1452	}
1502		1453	else
		1454	{
		1455	#ifdef HAVE_BG_PIXMAP
		1456	if (bgPixmap.window_position_sensitive ())
		1457	update_background ();
		1458	#endif
		1459	}
1503	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));	1460	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1504
1505	#ifdef TRANSPARENT
1506	if (option (Opt_transparent))
1507	check_our_parents ();
1508	#endif
1509	}	1461	}
1510	break;	1462	break;
1511		1463
1512	case PropertyNotify:	1464	case PropertyNotify:
1513	if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))	1465	if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
…		…
1531	break;	1483	break;
1532		1484
1533	case MapNotify:	1485	case MapNotify:
1534	mapped = 1;	1486	mapped = 1;
1535	#ifdef TEXT_BLINK	1487	#ifdef TEXT_BLINK
1536	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);	1488	text_blink_ev.start ();
1537	#endif	1489	#endif
1538	HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));	1490	HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1539	break;	1491	break;
1540		1492
1541	case UnmapNotify:	1493	case UnmapNotify:
…		…
1543	#ifdef TEXT_BLINK	1495	#ifdef TEXT_BLINK
1544	text_blink_ev.stop ();	1496	text_blink_ev.stop ();
1545	#endif	1497	#endif
1546	HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));	1498	HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1547	break;	1499	break;
1548
1549	#ifdef TRANSPARENT
1550	case ReparentNotify:
1551	rootwin_cb (ev);
1552	break;
1553	#endif /* TRANSPARENT */
1554		1500
1555	case GraphicsExpose:	1501	case GraphicsExpose:
1556	case Expose:	1502	case Expose:
1557	if (ev.xany.window == vt)	1503	if (ev.xany.window == vt)
1558	{	1504	{
1559	do	1505	do
		1506	{
1560	scr_expose (ev.xexpose.x, ev.xexpose.y,	1507	scr_expose (ev.xexpose.x, ev.xexpose.y,
1561	ev.xexpose.width, ev.xexpose.height, False);	1508	ev.xexpose.width, ev.xexpose.height, False);
		1509	}
1562	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));	1510	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1563		1511
1564	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1512	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1565		1513
1566	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))	1514	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
		1515	{
1567	scr_expose (ev.xexpose.x, ev.xexpose.y,	1516	scr_expose (ev.xexpose.x, ev.xexpose.y,
1568	ev.xexpose.width, ev.xexpose.height, False);	1517	ev.xexpose.width, ev.xexpose.height, False);
		1518	}
1569		1519
1570	want_refresh = 1;	1520	want_refresh = 1;
1571	}	1521	}
1572	else	1522	else
1573	{	1523	{
…		…
1581	if (isScrollbarWindow (ev.xany.window))	1531	if (isScrollbarWindow (ev.xany.window))
1582	{	1532	{
1583	scrollBar.setIdle ();	1533	scrollBar.setIdle ();
1584	scrollbar_show (0);	1534	scrollbar_show (0);
1585	}	1535	}
1586
1587	#ifdef TRANSPARENT
1588	if (am_transparent && ev.xany.window == parent[0])
1589	XClearWindow (dpy, ev.xany.window);
1590	#endif
1591	}	1536	}
1592	break;	1537	break;
1593		1538
1594	case MotionNotify:	1539	case MotionNotify:
1595	#ifdef POINTER_BLANK	1540	#ifdef POINTER_BLANK
1596	if (hidden_pointer)	1541	if (hidden_pointer)
1597	pointer_unblank ();	1542	pointer_unblank ();
1598	#endif	1543	#endif
		1544	if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask\|Button2Mask\|Button3Mask))
		1545	\|\| priv_modes & PrivMode_MouseAnyEvent)
		1546	mouse_report (ev.xbutton);
1599	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)	1547	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1600	break;	1548	break;
1601		1549
1602	if (ev.xany.window == vt)	1550	if (ev.xany.window == vt)
1603	{	1551	{
…		…
1637	int dist;	1585	int dist;
1638		1586
1639	/* don't clobber the current delay if we are	1587	/* don't clobber the current delay if we are
1640	* already in the middle of scrolling.	1588	* already in the middle of scrolling.
1641	*/	1589	*/
1642	if (!sel_scroll_ev.active)	1590	if (!sel_scroll_ev.is_active ())
1643	sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);	1591	sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1644		1592
1645	/* save the event params so we can highlight	1593	/* save the event params so we can highlight
1646	* the selection in the pending-scroll loop	1594	* the selection in the pending-scroll loop
1647	*/	1595	*/
1648	selection_save_x = ev.xbutton.x;	1596	selection_save_x = ev.xbutton.x;
…		…
1670	else	1618	else
1671	{	1619	{
1672	/* we are within the text window, so we	1620	/* we are within the text window, so we
1673	* shouldn't be scrolling	1621	* shouldn't be scrolling
1674	*/	1622	*/
1675	if (sel_scroll_ev.active)
1676	sel_scroll_ev.stop();	1623	sel_scroll_ev.stop();
1677	}	1624	}
1678	#endif	1625	#endif
1679	#ifdef MOUSE_THRESHOLD	1626	#ifdef MOUSE_THRESHOLD
1680	}	1627	}
1681	#endif	1628	#endif
…		…
1693	&ev.xbutton.x, &ev.xbutton.y,	1640	&ev.xbutton.x, &ev.xbutton.y,
1694	&unused_mask);	1641	&unused_mask);
1695	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1642	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1696	scrollbar_size ());	1643	scrollbar_size ());
1697	want_refresh = 1;	1644	want_refresh = 1;
1698	refresh_limit = 0;
1699	scrollbar_show (1);	1645	scrollbar_show (1);
1700	}	1646	}
1701	break;	1647	break;
1702	}	1648	}
1703		1649
…		…
1708	{	1654	{
1709	hidden_cursor = 0;	1655	hidden_cursor = 0;
1710	want_refresh = 1;	1656	want_refresh = 1;
1711	}	1657	}
1712		1658
1713	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);	1659	cursor_blink_ev.again ();
1714	}	1660	}
1715	#endif	1661	#endif
1716		1662
1717	#if defined(POINTER_BLANK)	1663	#if defined(POINTER_BLANK)
1718	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)	1664	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
…		…
1725		1671
1726	if (ev.type == KeyPress && hidden_pointer == 0)	1672	if (ev.type == KeyPress && hidden_pointer == 0)
1727	pointer_blank ();	1673	pointer_blank ();
1728	}	1674	}
1729	#endif	1675	#endif
		1676
		1677	refresh_check ();
1730	}	1678	}
1731		1679
1732	void	1680	void
1733	rxvt_term::focus_in ()	1681	rxvt_term::focus_in ()
1734	{	1682	{
…		…
1746	XSetICFocus (Input_Context);	1694	XSetICFocus (Input_Context);
1747	}	1695	}
1748	#endif	1696	#endif
1749	#if CURSOR_BLINK	1697	#if CURSOR_BLINK
1750	if (option (Opt_cursorBlink))	1698	if (option (Opt_cursorBlink))
1751	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);	1699	cursor_blink_ev.again ();
1752	#endif	1700	#endif
1753	#if OFF_FOCUS_FADING	1701	#if OFF_FOCUS_FADING
1754	if (rs[Rs_fade])	1702	if (rs[Rs_fade])
1755	{	1703	{
1756	pix_colors = pix_colors_focused;	1704	pix_colors = pix_colors_focused;
…		…
1758	}	1706	}
1759	#endif	1707	#endif
1760	#if ENABLE_FRILLS	1708	#if ENABLE_FRILLS
1761	if (option (Opt_urgentOnBell))	1709	if (option (Opt_urgentOnBell))
1762	{	1710	{
1763	XWMHints *h;
1764
1765	h = XGetWMHints(dpy, parent[0]);	1711	if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1766	if (h != NULL)
1767	{	1712	{
1768	h->flags &= ~XUrgencyHint;	1713	h->flags &= ~XUrgencyHint;
1769	XSetWMHints(dpy, parent[0], h);	1714	XSetWMHints (dpy, parent[0], h);
1770	}	1715	}
1771	}	1716	}
1772	#endif	1717	#endif
1773	}	1718	}
1774	}	1719	}
…		…
1785		1730
1786	#if ENABLE_FRILLS \|\| ISO_14755	1731	#if ENABLE_FRILLS \|\| ISO_14755
1787	if (iso14755buf)	1732	if (iso14755buf)
1788	{	1733	{
1789	iso14755buf = 0;	1734	iso14755buf = 0;
1790	# if ENABLE_OVERLAY	1735	# if ISO_14755
1791	scr_overlay_off ();	1736	scr_overlay_off ();
1792	# endif	1737	# endif
1793	}	1738	}
1794	#endif	1739	#endif
1795	#if USE_XIM	1740	#if USE_XIM
…		…
1797	XUnsetICFocus (Input_Context);	1742	XUnsetICFocus (Input_Context);
1798	#endif	1743	#endif
1799	#if CURSOR_BLINK	1744	#if CURSOR_BLINK
1800	if (option (Opt_cursorBlink))	1745	if (option (Opt_cursorBlink))
1801	cursor_blink_ev.stop ();	1746	cursor_blink_ev.stop ();
		1747
1802	hidden_cursor = 0;	1748	hidden_cursor = 0;
1803	#endif	1749	#endif
1804	#if OFF_FOCUS_FADING	1750	#if OFF_FOCUS_FADING
1805	if (rs[Rs_fade])	1751	if (rs[Rs_fade])
1806	{	1752	{
…		…
1822	pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);	1768	pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1823	}	1769	}
1824	#endif	1770	#endif
1825	}	1771	}
1826		1772
1827	#if TRANSPARENT \|\| ENABLE_PERL	1773	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
1828	void	1774	void
1829	rxvt_term::rootwin_cb (XEvent &ev)	1775	rxvt_term::rootwin_cb (XEvent &ev)
1830	{	1776	{
1831	make_current ();	1777	make_current ();
1832		1778
1833	if (SHOULD_INVOKE (HOOK_ROOT_EVENT)	1779	if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1834	&& HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))	1780	&& HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1835	return;	1781	return;
1836		1782
1837	# if TRANSPARENT	1783	# if ENABLE_TRANSPARENCY
1838	switch (ev.type)	1784	switch (ev.type)
1839	{	1785	{
1840	case PropertyNotify:	1786	case PropertyNotify:
1841	/*	1787	/*
1842	* if user used some Esetroot compatible prog to set the root bg,	1788	* if user used some Esetroot compatible prog to set the root bg,
1843	* use the property to determine the pixmap. We use it later on.	1789	* use the property to determine the pixmap. We use it later on.
1844	*/	1790	*/
1845	if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]	1791	if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1846	&& ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])	1792	\|\| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1847	return;	1793	{
1848		1794	bgPixmap.set_root_pixmap ();
1849	/* FALLTHROUGH */	1795	update_background ();
1850	case ReparentNotify:	1796	}
1851	if (option (Opt_transparent))
1852	check_our_parents ();
1853	break;	1797	break;
1854	}	1798	}
1855	# endif	1799	# endif
		1800
		1801	refresh_check ();
1856	}	1802	}
1857	#endif	1803	#endif
1858		1804
1859	void	1805	void
1860	rxvt_term::button_press (XButtonEvent &ev)	1806	rxvt_term::button_press (XButtonEvent &ev)
…		…
1915	mouse_report (ev);	1861	mouse_report (ev);
1916	}	1862	}
1917	#else	1863	#else
1918	MEvent.button = ev.button;	1864	MEvent.button = ev.button;
1919	mouse_report (ev);	1865	mouse_report (ev);
1920	#endif /* MOUSE_REPORT_DOUBLECLICK */	1866	#endif /* MOUSE_REPORT_DOUBLECLICK */
1921		1867
1922	}	1868	}
1923	else	1869	else
1924	{	1870	{
1925	if (ev.button != MEvent.button)	1871	if (ev.button != MEvent.button)
…		…
2019	tt_printf ("\033[5~");	1965	tt_printf ("\033[5~");
2020	break;	1966	break;
2021	}	1967	}
2022	}	1968	}
2023	else	1969	else
2024	#endif /* NO_SCROLLBAR_REPORT */	1970	#endif /* NO_SCROLLBAR_REPORT */
2025		1971
2026	{	1972	{
2027	char upordown = 0;	1973	char upordown = 0;
2028		1974
2029	if (scrollBar.style == R_SB_NEXT)	1975	if (scrollBar.style == R_SB_NEXT)
2030	{	1976	{
2031	if (scrollbarnext_upButton (ev.y))	1977	if (scrollbarnext_upButton (ev.y))
2032	upordown = -1; /* up */	1978	upordown = -1; /* up */
…		…
2038	if (scrollbarrxvt_upButton (ev.y))	1984	if (scrollbarrxvt_upButton (ev.y))
2039	upordown = -1; /* up */	1985	upordown = -1; /* up */
2040	else if (scrollbarrxvt_dnButton (ev.y))	1986	else if (scrollbarrxvt_dnButton (ev.y))
2041	upordown = 1; /* down */	1987	upordown = 1; /* down */
2042	}	1988	}
		1989
2043	if (upordown)	1990	if (upordown)
2044	{	1991	{
2045	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	1992	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
		1993	if (!cont_scroll_ev.is_active ())
2046	cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);	1994	cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2047	#endif	1995	#endif
2048	if (scr_page (upordown < 0 ? UP : DN, 1))	1996	if (scr_page (upordown < 0 ? UP : DN, 1))
2049	{	1997	{
2050	if (upordown < 0)	1998	if (upordown < 0)
2051	scrollBar.setUp ();	1999	scrollBar.setUp ();
…		…
2131	scrollBar.setIdle ();	2079	scrollBar.setIdle ();
2132	scrollbar_show (0);	2080	scrollbar_show (0);
2133	}	2081	}
2134		2082
2135	#ifdef SELECTION_SCROLLING	2083	#ifdef SELECTION_SCROLLING
2136	if (sel_scroll_ev.active)
2137	sel_scroll_ev.stop();	2084	sel_scroll_ev.stop();
2138	#endif	2085	#endif
2139		2086
2140	if (ev.window == vt)	2087	if (ev.window == vt)
2141	{	2088	{
2142	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))	2089	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
…		…
2166	mouse_report (ev);	2113	mouse_report (ev);
2167	}	2114	}
2168	#else /* MOUSE_REPORT_DOUBLECLICK */	2115	#else /* MOUSE_REPORT_DOUBLECLICK */
2169	MEvent.button = AnyButton;	2116	MEvent.button = AnyButton;
2170	mouse_report (ev);	2117	mouse_report (ev);
2171	#endif /* MOUSE_REPORT_DOUBLECLICK */	2118	#endif /* MOUSE_REPORT_DOUBLECLICK */
2172	return;	2119	return;
2173	}	2120	}
2174		2121
2175	/*	2122	/*
2176	* dumb hack to compensate for the failure of click-and-drag	2123	* dumb hack to compensate for the failure of click-and-drag
…		…
2214	{	2161	{
2215	mouse_slip_wheel_speed += v ? -1 : 1;	2162	mouse_slip_wheel_speed += v ? -1 : 1;
2216	if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;	2163	if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2217	if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;	2164	if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2218		2165
2219	if (slip_wheel_ev.at < NOW)	2166	if (!slip_wheel_ev.is_active ())
2220	slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;	2167	slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2221
2222	slip_wheel_ev.start ();
2223	}	2168	}
2224	else	2169	else
2225	{	2170	{
2226	# endif	2171	# endif
2227	scr_page (v, i);	2172	scr_page (v, i);
…		…
2291	if (ch == C0_LF)	2236	if (ch == C0_LF)
2292	nlines++;	2237	nlines++;
2293		2238
2294	refresh_count++;	2239	refresh_count++;
2295		2240
2296	if (!option (Opt_jumpScroll)	2241	if (!option (Opt_jumpScroll) \|\| refresh_count >= nrow - 1)
2297	\|\| (refresh_count >= refresh_limit * (nrow - 1)))
2298	{	2242	{
2299	refreshnow = true;
2300	refresh_count = 0;	2243	refresh_count = 0;
		2244
		2245	if (!option (Opt_skipScroll) \|\| ev_time () > ev::now () + 1. / 60.)
		2246	{
		2247	refreshnow = true;
2301	ch = NOCHAR;	2248	ch = NOCHAR;
2302	break;	2249	break;
		2250	}
2303	}	2251	}
2304		2252
2305	// scr_add_lines only works for nlines <= nrow - 1.	2253	// scr_add_lines only works for nlines <= nrow - 1.
2306	if (nlines >= nrow - 1)	2254	if (nlines >= nrow - 1)
2307	{	2255	{
…		…
2335	&& HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))	2283	&& HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2336	scr_add_lines (buf, str - buf, nlines);	2284	scr_add_lines (buf, str - buf, nlines);
2337		2285
2338	/*	2286	/*
2339	* If there have been a lot of new lines, then update the screen	2287	* If there have been a lot of new lines, then update the screen
2340	* What the heck I'll cheat and only refresh less than every page-full.	2288	* What the heck we'll cheat and only refresh less than every page-full.
2341	* the number of pages between refreshes is refresh_limit, which	2289	* if skipScroll is enabled.
2342	* is incremented here because we must be doing flat-out scrolling.
2343	*/	2290	*/
2344	if (refreshnow)	2291	if (refreshnow)
2345	{	2292	{
2346	if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2347	refresh_limit++;
2348	else
2349	{
2350	flag = true;	2293	flag = true;
2351	//TODO: due to popular request, implement "skipscroll" option here
2352	scr_refresh ();	2294	scr_refresh ();
2353	want_refresh = 1;	2295	want_refresh = 1;
2354	}
2355	}	2296	}
2356		2297
2357	}	2298	}
2358	else	2299	else
2359	{	2300	{
…		…
2369	}	2310	}
2370		2311
2371	ch = NOCHAR;	2312	ch = NOCHAR;
2372	}	2313	}
2373	}	2314	}
		2315
		2316	refresh_check ();
2374		2317
2375	return flag;	2318	return flag;
2376	}	2319	}
2377		2320
2378	// read the next character	2321	// read the next character
…		…
2520	}	2463	}
2521	}	2464	}
2522		2465
2523	pclose_printer (fd);	2466	pclose_printer (fd);
2524	}	2467	}
2525	#endif /* PRINTPIPE */	2468	#endif /* PRINTPIPE */
2526	/}}} /	2469	/}}} /
2527		2470
2528	/* INDENT-OFF */	2471	/* INDENT-OFF */
2529	enum {	2472	enum {
2530	C1_40 = 0x40,	2473	C1_40 = 0x40,
…		…
2580	process_dcs_seq ();	2523	process_dcs_seq ();
2581	break;	2524	break;
2582	case 0x9b: /* CSI */	2525	case 0x9b: /* CSI */
2583	process_csi_seq ();	2526	process_csi_seq ();
2584	break;	2527	break;
2585	case 0x9d: /* CSI */	2528	case 0x9d: /* OSC */
2586	process_osc_seq ();	2529	process_osc_seq ();
2587	break;	2530	break;
2588	#endif	2531	#endif
2589	}	2532	}
2590	}	2533	}
…		…
2816	rxvt_term::process_csi_seq ()	2759	rxvt_term::process_csi_seq ()
2817	{	2760	{
2818	unicode_t ch, priv, i;	2761	unicode_t ch, priv, i;
2819	unsigned int nargs, p;	2762	unsigned int nargs, p;
2820	int n, ndef;	2763	int n, ndef;
2821	int arg[ESC_ARGS];	2764	int arg[ESC_ARGS] = { };
2822		2765
2823	for (nargs = ESC_ARGS; nargs > 0;)	2766	nargs = 0;
2824	arg[--nargs] = 0;
2825		2767
2826	priv = 0;	2768	priv = 0;
2827	ch = cmd_getc ();	2769	ch = cmd_getc ();
2828	if (ch >= '<' && ch <= '?')	2770	if (ch >= '<' && ch <= '?')
		2771	{
2829	{ /* '<' '=' '>' '?' */	2772	/* '<' '=' '>' '?' */
2830	priv = ch;	2773	priv = ch;
2831	ch = cmd_getc ();	2774	ch = cmd_getc ();
2832	}	2775	}
2833		2776
2834	/* read any numerical arguments */	2777	/* read any numerical arguments */
…		…
2873	switch (priv)	2816	switch (priv)
2874	{	2817	{
2875	case '>':	2818	case '>':
2876	if (ch == CSI_DA) /* secondary device attributes */	2819	if (ch == CSI_DA) /* secondary device attributes */
2877	{	2820	{
2878	// first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,	2821	// first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2879	// 'U' for rxvt-unicode != 7.[34] (where it was broken).	2822	// 'U' for rxvt-unicode != 7.[34] (where it was broken).
2880	//	2823	//
2881	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt	2824	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2882	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify	2825	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2883	// that we do not support xterm mouse reporting (should be 95 when we do).	2826	// versions.
2884	//	2827	//
2885	tt_printf ("\033[>%d;94;0c", 'U');	2828	tt_printf ("\033[>%d;95;0c", 'U');
2886	}	2829	}
2887	break;	2830	break;
2888	case '?':	2831	case '?':
2889	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')	2832	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')
2890	process_terminal_mode (ch, priv, nargs, arg);	2833	process_terminal_mode (ch, priv, nargs, arg);
…		…
3441	break;	3384	break;
3442	case URxvt_Color_IT:	3385	case URxvt_Color_IT:
3443	process_color_seq (op, Color_IT, str, resp);	3386	process_color_seq (op, Color_IT, str, resp);
3444	break;	3387	break;
3445	#endif	3388	#endif
3446	#if TRANSPARENT && TINTING	3389	#if ENABLE_TRANSPARENCY
3447	case URxvt_Color_tint:	3390	case URxvt_Color_tint:
3448	process_color_seq (op, Color_tint, str, resp);	3391	process_color_seq (op, Color_tint, str, resp);
		3392	{
		3393	bool changed = false;
		3394	if (ISSET_PIXCOLOR (Color_tint))
		3395	changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
		3396	else
		3397	changed = bgPixmap.unset_tint ();
		3398	if (changed)
		3399	update_background ();
		3400	}
3449		3401
3450	check_our_parents ();
3451
3452	if (am_transparent)
3453	want_full_refresh = want_refresh = 1;
3454
3455	break;	3402	break;
3456	#endif	3403	#endif
3457		3404
		3405	#if BG_IMAGE_FROM_FILE
3458	case Rxvt_Pixmap:	3406	case Rxvt_Pixmap:
3459	{	3407	if (!strcmp (str, "?"))
3460	if (*str != ';')
3461	{	3408	{
3462	#if XPM_BACKGROUND	3409	char str[256];
3463	scale_pixmap (""); /* reset to default scaling */	3410
3464	set_bgPixmap (str); /* change pixmap */	3411	sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3465	scr_touch (true);	3412	min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3466	#endif	3413	min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
		3414	process_xterm_seq (XTerm_title, str, CHAR_ST);
3467	}	3415	}
3468		3416	else
		3417	{
3469	int changed = 0;	3418	int changed = 0;
3470		3419
3471	while ((str = strchr (str, ';')) != NULL)	3420	if (*str != ';')
3472	{	3421	{
		3422	/* reset to default scaling :*/
		3423	bgPixmap.unset_geometry ();
		3424	if (bgPixmap.set_file (str)) /* change pixmap */
		3425	changed++;
		3426	str = strchr (str, ';');
		3427	if (str == NULL)
		3428	bgPixmap.set_defaultGeometry ();
		3429	}
		3430	while (str)
		3431	{
3473	str++;	3432	str++;
3474	#if XPM_BACKGROUND	3433	if (bgPixmap.set_geometry (str))
3475	changed += scale_pixmap (str);	3434	changed++;
3476	#endif	3435	str = strchr (str, ';');
3477	}	3436	}
3478
3479	if (changed)	3437	if (changed)
3480	{	3438	update_background ();
3481	#ifdef XPM_BACKGROUND
3482	resize_pixmap ();
3483	scr_touch (true);
3484	#endif
3485	}	3439	}
3486	#if TRANSPARENT && defined(HAVE_AFTERIMAGE)
3487	if (option (Opt_transparent))
3488	check_our_parents ();
3489	#endif
3490	}
3491	break;	3440	break;
		3441	#endif
3492		3442
3493	case Rxvt_restoreFG:	3443	case Rxvt_restoreFG:
3494	set_window_color (Color_fg, str);	3444	set_window_color (Color_fg, str);
3495	break;	3445	break;
3496	case Rxvt_restoreBG:	3446	case Rxvt_restoreBG:
…		…
3618	{	3568	{
3619	unsigned int i, j;	3569	unsigned int i, j;
3620	int state;	3570	int state;
3621		3571
3622	static const struct	3572	static const struct
3623	{	3573	{
3624	const int argval;	3574	const int argval;
3625	const unsigned long bit;	3575	const unsigned long bit;
3626	}
3627
3628	argtopriv[] = {	3576	} argtopriv[] = {
3629	{ 1, PrivMode_aplCUR },	3577	{ 1, PrivMode_aplCUR },
3630	{ 2, PrivMode_vt52 },	3578	{ 2, PrivMode_vt52 },
3631	{ 3, PrivMode_132 },	3579	{ 3, PrivMode_132 },
3632	{ 4, PrivMode_smoothScroll },	3580	{ 4, PrivMode_smoothScroll },
3633	{ 5, PrivMode_rVideo },	3581	{ 5, PrivMode_rVideo },
…		…
3649	{ 66, PrivMode_aplKP },	3597	{ 66, PrivMode_aplKP },
3650	#ifndef NO_BACKSPACE_KEY	3598	#ifndef NO_BACKSPACE_KEY
3651	{ 67, PrivMode_BackSpace },	3599	{ 67, PrivMode_BackSpace },
3652	#endif	3600	#endif
3653	{ 1000, PrivMode_MouseX11 },	3601	{ 1000, PrivMode_MouseX11 },
3654	// 1001 Use Hilite Mouse Tracking. NYI, TODO	3602	{ 1002, PrivMode_MouseBtnEvent },
3655	// 1002 Use Cell Motion Mouse Tracking. NYI, TODO	3603	{ 1003, PrivMode_MouseAnyEvent },
3656	// 1003 Use All Motion Mouse Tracking. NYI, TODO
3657	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension	3604	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension
3658	{ 1011, PrivMode_Keypress }, // rxvt extension	3605	{ 1011, PrivMode_Keypress }, // rxvt extension
3659	// 1035 enable modifiers for alt, numlock NYI	3606	// 1035 enable modifiers for alt, numlock NYI
3660	// 1036 send ESC for meta keys NYI	3607	// 1036 send ESC for meta keys NYI
3661	// 1037 send DEL for keypad delete NYI	3608	// 1037 send DEL for keypad delete NYI
…		…
3735	scr_autowrap (state);	3682	scr_autowrap (state);
3736	break;	3683	break;
3737	/* case 8: - auto repeat, can't do on a per window basis */	3684	/* case 8: - auto repeat, can't do on a per window basis */
3738	case 9: /* X10 mouse reporting */	3685	case 9: /* X10 mouse reporting */
3739	if (state) /* orthogonal */	3686	if (state) /* orthogonal */
3740	priv_modes &= ~PrivMode_MouseX11;	3687	priv_modes &= ~(PrivMode_MouseX11\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);
3741	break;	3688	break;
3742	#ifdef scrollBar_esc	3689	#ifdef scrollBar_esc
3743	case scrollBar_esc:	3690	case scrollBar_esc:
3744	if (scrollbar_mapping (state))	3691	if (scrollbar_mapping (state))
3745	{	3692	{
…		…
3758	break;	3705	break;
3759	/* case 66: - application key pad */	3706	/* case 66: - application key pad */
3760	/* case 67: - backspace key */	3707	/* case 67: - backspace key */
3761	case 1000: /* X11 mouse reporting */	3708	case 1000: /* X11 mouse reporting */
3762	if (state) /* orthogonal */	3709	if (state) /* orthogonal */
3763	priv_modes &= ~PrivMode_MouseX10;	3710	priv_modes &= ~(PrivMode_MouseX10\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);
3764	break;	3711	break;
3765	#if 0
3766	case 1001:	3712	case 1002:
3767	break; /* X11 mouse highlighting */	3713	case 1003:
3768	#endif	3714	if (state)
		3715	{
		3716	priv_modes &= ~(PrivMode_MouseX10\|PrivMode_MouseX11);
		3717	priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
		3718	vt_emask_mouse = PointerMotionMask;
		3719	}
		3720	else
		3721	vt_emask_mouse = NoEventMask;
		3722	vt_select_input ();
		3723	break;
3769	case 1010: /* scroll to bottom on TTY output inhibit */	3724	case 1010: /* scroll to bottom on TTY output inhibit */
3770	set_option (Opt_scrollTtyOutput, !state);	3725	set_option (Opt_scrollTtyOutput, !state);
3771	break;	3726	break;
3772	case 1011: /* scroll to bottom on key press */	3727	case 1011: /* scroll to bottom on key press */
3773	set_option (Opt_scrollTtyKeypress, state);	3728	set_option (Opt_scrollTtyKeypress, state);
…		…
3950	rxvt_term::process_graphics ()	3905	rxvt_term::process_graphics ()
3951	{	3906	{
3952	unicode_t ch, cmd = cmd_getc ();	3907	unicode_t ch, cmd = cmd_getc ();
3953		3908
3954	if (cmd == 'Q')	3909	if (cmd == 'Q')
		3910	{
3955	{ /* query graphics */	3911	/* query graphics */
3956	tt_printf ("\033G0\012"); /* no graphics */	3912	tt_printf ("\033G0\012"); /* no graphics */
3957	return;	3913	return;
3958	}	3914	}
3959	/* swallow other graphics sequences until terminating ':' */	3915	/* swallow other graphics sequences until terminating ':' */
3960	do	3916	do
…		…
4010	v_buffer = (char *)realloc (v_buffer, v_buflen + len);	3966	v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4011		3967
4012	memcpy (v_buffer + v_buflen, data, len);	3968	memcpy (v_buffer + v_buflen, data, len);
4013	v_buflen += len;	3969	v_buflen += len;
4014		3970
4015	pty_ev.set (EVENT_READ \| EVENT_WRITE);	3971	pty_ev.set (ev::READ \| ev::WRITE);
4016	}	3972	}
4017		3973
4018	void rxvt_term::pty_write ()	3974	void rxvt_term::pty_write ()
4019	{	3975	{
4020	int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));	3976	int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
…		…
4025		3981
4026	if (v_buflen == 0)	3982	if (v_buflen == 0)
4027	{	3983	{
4028	free (v_buffer);	3984	free (v_buffer);
4029	v_buffer = 0;	3985	v_buffer = 0;
4030	v_buflen = 0;
4031		3986
4032	pty_ev.set (EVENT_READ);	3987	pty_ev.set (ev::READ);
4033	return;	3988	return;
4034	}	3989	}
4035		3990
4036	memmove (v_buffer, v_buffer + written, v_buflen);	3991	memmove (v_buffer, v_buffer + written, v_buflen);
4037	}	3992	}
4038	else if (written != -1 \|\| (errno != EAGAIN && errno != EINTR))	3993	else if (written != -1 \|\| (errno != EAGAIN && errno != EINTR))
4039	pty_ev.set (EVENT_READ);	3994	pty_ev.set (ev::READ);
4040	}	3995	}
4041		3996
4042	/----------------------- end-of-file (C source) -----------------------/	3997	/----------------------- end-of-file (C source) -----------------------/
4043		3998

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.329 by ayin, Mon Jun 11 19:57:28 2007 UTC vs. Revision 1.382 by root, Fri Dec 14 06:04:56 2007 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.329 by ayin, Mon Jun 11 19:57:28 2007 UTC vs.
Revision 1.382 by root, Fri Dec 14 06:04:56 2007 UTC