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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.353 by sasha, Wed Sep 12 19:51:41 2007 UTC vs.
Revision 1.408 by ayin, Sat Feb 16 13:36:10 2008 UTC

…		…
25	* - extensive modifications	25	* - extensive modifications
26	* Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>	26	* Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27	* Copyright (c) 2001 Marius Gedminas	27	* Copyright (c) 2001 Marius Gedminas
28	* - Ctrl/Mod4+Tab works like Meta+Tab (options)	28	* - Ctrl/Mod4+Tab works like Meta+Tab (options)
29	* Copyright (c) 2003 Rob McMullen <robm@flipturn.org>	29	* Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30	* Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>	30	* Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
		31	* Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
31	*	32	*
32	* This program is free software; you can redistribute it and/or modify	33	* This program is free software; you can redistribute it and/or modify
33	* it under the terms of the GNU General Public License as published by	34	* it under the terms of the GNU General Public License as published by
34	* the Free Software Foundation; either version 2 of the License, or	35	* the Free Software Foundation; either version 2 of the License, or
35	* (at your option) any later version.	36	* (at your option) any later version.
…		…
198	r & RS_Uline ? " uline" : "",	199	r & RS_Uline ? " uline" : "",
199	r & RS_Careful ? " careful" : "");	200	r & RS_Careful ? " careful" : "");
200		201
201	int width = wcswidth (fname, wcslen (fname));	202	int width = wcswidth (fname, wcslen (fname));
202		203
203	max_it (width, 8+5); // for char + hey	204	max_it (width, 8+5); // for char + hex
204	max_it (width, strlen (attr));	205	max_it (width, strlen (attr));
205		206
206	if (y >= 0)	207	if (y >= 0)
207	{	208	{
208	y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;	209	y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
…		…
220	ch = *chr++;	221	ch = *chr++;
221		222
222	sprintf (buf, "%8x", ch);	223	sprintf (buf, "%8x", ch);
223	scr_overlay_set (0, y, buf);	224	scr_overlay_set (0, y, buf);
224	scr_overlay_set (9, y, '=');	225	scr_overlay_set (9, y, '=');
225	# if !UNICODE3	226	# if !UNICODE_3
226	if (ch >= 0x10000)	227	if (ch >= 0x10000)
227	ch = 0xfffd;	228	ch = 0xfffd;
228	# endif	229	# endif
229	scr_overlay_set (11, y, ch, r);	230	scr_overlay_set (11, y, ch, r);
230		231
…		…
278	}	279	}
279		280
280	iso14755buf = 0;	281	iso14755buf = 0;
281	}	282	}
282		283
283	int	284	static int
284	rxvt_term::hex_keyval (XKeyEvent &ev)	285	hex_keyval (XKeyEvent &ev)
285	{	286	{
286	// check wether this event corresponds to a hex digit	287	// check wether this event corresponds to a hex digit
287	// if the modifiers had not been pressed.	288	// if the modifiers had not been pressed.
288	for (int index = 0; index < 8; index++)	289	for (int index = 0; index < 8; index++)
289	{	290	{
…		…
297		298
298	return -1;	299	return -1;
299	}	300	}
300	#endif	301	#endif
301		302
		303	static inline KeySym
		304	translate_keypad (KeySym keysym, bool kp)
		305	{
		306	#ifdef XK_KP_Home
		307	static const KeySym keypadtrans[] = {
		308	XK_KP_7, // XK_KP_Home
		309	XK_KP_4, // XK_KP_Left
		310	XK_KP_8, // XK_KP_Up
		311	XK_KP_6, // XK_KP_Right
		312	XK_KP_2, // XK_KP_Down
		313	# ifndef UNSHIFTED_SCROLLKEYS
		314	XK_KP_9, // XK_KP_Prior
		315	XK_KP_3, // XK_KP_Next
		316	# else
		317	XK_Prior,
		318	XK_Next,
		319	# endif
		320	XK_KP_1, // XK_KP_End
		321	XK_KP_5, // XK_KP_Begin
		322	};
		323
		324	if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
		325	{
		326	unsigned int index = keysym - XK_KP_Home;
		327	keysym = kp ? keypadtrans[index] : XK_Home + index;
		328	}
		329	else if (keysym == XK_KP_Insert)
		330	keysym = kp ? XK_KP_0 : XK_Insert;
		331	# ifndef NO_DELETE_KEY
		332	else if (keysym == XK_KP_Delete)
		333	keysym = kp ? XK_KP_Decimal : XK_Delete;
		334	# endif
		335	#endif
		336	return keysym;
		337	}
		338
302	void	339	void
303	rxvt_term::key_press (XKeyEvent &ev)	340	rxvt_term::key_press (XKeyEvent &ev)
304	{	341	{
305	int ctrl, meta, shft, len;	342	int ctrl, meta, shft, len;
306	unsigned int newlen;
307	KeySym keysym;	343	KeySym keysym;
308	int valid_keysym;	344	int valid_keysym;
309	char kbuf[KBUFSZ];	345	char kbuf[KBUFSZ];
310		346
311	#if ISO_14755	347	#if ISO_14755
…		…
546	}	582	}
547	#endif	583	#endif
548		584
549	if (keysym >= 0xFF00 && keysym <= 0xFFFF)	585	if (keysym >= 0xFF00 && keysym <= 0xFFFF)
550	{	586	{
551	{
552	bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;	587	bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
553	newlen = 1;	588	unsigned int newlen = 1;
554	switch (keysym)	589
		590	switch (translate_keypad (keysym, kp))
555	{	591	{
556	#ifndef NO_BACKSPACE_KEY	592	#ifndef NO_BACKSPACE_KEY
557	case XK_BackSpace:	593	case XK_BackSpace:
558	if (priv_modes & PrivMode_HaveBackSpace)	594	if (priv_modes & PrivMode_HaveBackSpace)
559	{	595	{
…		…
564	else	600	else
565	strcpy (kbuf, rs[Rs_backspace_key]);	601	strcpy (kbuf, rs[Rs_backspace_key]);
566	break;	602	break;
567	#endif	603	#endif
568	#ifndef NO_DELETE_KEY	604	#ifndef NO_DELETE_KEY
569	# ifdef XK_KP_Delete
570	case XK_KP_Delete:
571	/* allow shift to override */
572	if (kp)
573	{
574	strcpy (kbuf, "\033On");
575	break;
576	}
577	/* FALLTHROUGH */
578	# endif
579	case XK_Delete:	605	case XK_Delete:
580	strcpy (kbuf, rs[Rs_delete_key]);	606	strcpy (kbuf, rs[Rs_delete_key]);
581	break;	607	break;
582	#endif	608	#endif
583	case XK_Tab:	609	case XK_Tab:
…		…
595	#endif	621	#endif
596	newlen = 0;	622	newlen = 0;
597	}	623	}
598	break;	624	break;
599		625
600	#ifdef XK_KP_Left
601	case XK_KP_Up: /* \033Ox or standard */
602	case XK_KP_Down: /* \033Or or standard */
603	case XK_KP_Right: /* \033Ov or standard */
604	case XK_KP_Left: /* \033Ot or standard */
605	if (kp)
606	{
607	strcpy (kbuf, "\033OZ");
608	kbuf[2] = "txvr"[keysym - XK_KP_Left];
609	break;
610	}
611	else
612	/* translate to std. cursor key */
613	keysym = XK_Left + (keysym - XK_KP_Left);
614	/* FALLTHROUGH */
615	#endif
616	case XK_Up: /* "\033[A" */	626	case XK_Up: /* "\033[A" */
617	case XK_Down: /* "\033[B" */	627	case XK_Down: /* "\033[B" */
618	case XK_Right: /* "\033[C" */	628	case XK_Right: /* "\033[C" */
619	case XK_Left: /* "\033[D" */	629	case XK_Left: /* "\033[D" */
620	strcpy (kbuf, "\033[Z");	630	strcpy (kbuf, "\033[Z");
…		…
630	else if (priv_modes & PrivMode_aplCUR)	640	else if (priv_modes & PrivMode_aplCUR)
631	kbuf[1] = 'O';	641	kbuf[1] = 'O';
632	break;	642	break;
633		643
634	#ifndef UNSHIFTED_SCROLLKEYS	644	#ifndef UNSHIFTED_SCROLLKEYS
635	# ifdef XK_KP_Prior
636	case XK_KP_Prior:
637	/* allow shift to override */
638	if (kp)
639	{
640	strcpy (kbuf, "\033Oy");
641	break;
642	}
643	/* FALLTHROUGH */
644	# endif
645	case XK_Prior:	645	case XK_Prior:
646	strcpy (kbuf, "\033[5~");	646	strcpy (kbuf, "\033[5~");
647	break;	647	break;
648	# ifdef XK_KP_Next
649	case XK_KP_Next:
650	/* allow shift to override */
651	if (kp)
652	{
653	strcpy (kbuf, "\033Os");
654	break;
655	}
656	/* FALLTHROUGH */
657	# endif
658	case XK_Next:	648	case XK_Next:
659	strcpy (kbuf, "\033[6~");	649	strcpy (kbuf, "\033[6~");
660	break;	650	break;
661	#endif	651	#endif
662	case XK_KP_Enter:	652	case XK_KP_Enter:
…		…
681	kbuf[0] = '\015';	671	kbuf[0] = '\015';
682	kbuf[1] = '\0';	672	kbuf[1] = '\0';
683	}	673	}
684	break;	674	break;
685		675
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" */	676	case XK_KP_F1: /* "\033OP" */
693	case XK_KP_F2: /* "\033OQ" */	677	case XK_KP_F2: /* "\033OQ" */
694	case XK_KP_F3: /* "\033OR" */	678	case XK_KP_F3: /* "\033OR" */
695	case XK_KP_F4: /* "\033OS" */	679	case XK_KP_F4: /* "\033OS" */
696	strcpy (kbuf, "\033OP");	680	strcpy (kbuf, "\033OP");
…		…
728		712
729	case XK_Find:	713	case XK_Find:
730	strcpy (kbuf, "\033[1~");	714	strcpy (kbuf, "\033[1~");
731	break;	715	break;
732		716
733	#ifdef XK_KP_Insert
734	case XK_KP_Insert:
735	/* allow shift to override */
736	if (kp)
737	{
738	strcpy (kbuf, "\033Op");
739	break;
740	}
741	/* FALLTHROUGH */
742	#endif
743	case XK_Insert:	717	case XK_Insert:
744	strcpy (kbuf, "\033[2~");	718	strcpy (kbuf, "\033[2~");
745	break;	719	break;
746	#ifdef DXK_Remove /* support for DEC remove like key */	720	#ifdef DXK_Remove /* support for DEC remove like key */
747	case DXK_Remove:	721	case DXK_Remove:
…		…
751	strcpy (kbuf, "\033[3~");	725	strcpy (kbuf, "\033[3~");
752	break;	726	break;
753	case XK_Select:	727	case XK_Select:
754	strcpy (kbuf, "\033[4~");	728	strcpy (kbuf, "\033[4~");
755	break;	729	break;
756	#ifdef XK_KP_End
757	case XK_KP_End:
758	/* allow shift to override */
759	if (kp)
760	{
761	strcpy (kbuf, "\033Oq");
762	break;
763	}
764	/* FALLTHROUGH */
765	#endif
766	case XK_End:	730	case XK_End:
767	strcpy (kbuf, KS_END);	731	strcpy (kbuf, KS_END);
768	break;	732	break;
769	#ifdef XK_KP_Home
770	case XK_KP_Home:
771	/* allow shift to override */
772	if (kp)
773	{
774	strcpy (kbuf, "\033Ow");
775	break;
776	}
777	/* FALLTHROUGH */
778	#endif
779	case XK_Home:	733	case XK_Home:
780	strcpy (kbuf, KS_HOME);	734	strcpy (kbuf, KS_HOME);
781	break;	735	break;
782		736
783	#define FKEY(n, fkey) \	737	#define FKEY(n, fkey) \
…		…
840	break;	794	break;
841	}	795	}
842		796
843	if (newlen)	797	if (newlen)
844	len = strlen (kbuf);	798	len = strlen (kbuf);
845	}
846		799
847	/*	800	/*
848	* Pass meta for all function keys, if 'meta' option set	801	* Pass meta for all function keys, if 'meta' option set
849	*/	802	*/
850	#ifdef META8_OPTION	803	#ifdef META8_OPTION
…		…
1035	void	988	void
1036	rxvt_term::flush ()	989	rxvt_term::flush ()
1037	{	990	{
1038	flush_ev.stop ();	991	flush_ev.stop ();
1039		992
		993	#ifdef HAVE_BG_PIXMAP
		994	if (bgPixmap.check_clearChanged ())
		995	{
		996	// scr_clear (true); This needs to be researched further!
		997	scr_touch (false);
		998	}
		999	#endif
		1000
1040	if (want_refresh)	1001	if (want_refresh)
1041	{	1002	{
1042	if (SHOULD_INVOKE (HOOK_LINE_UPDATE))	1003	if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
1043	{	1004	{
1044	int row = view_start;	1005	int row = view_start;
…		…
1085	}	1046	}
1086		1047
1087	display->flush ();	1048	display->flush ();
1088	}	1049	}
1089		1050
		1051	/* checks wether a refresh is requested and starts the refresh timer */
1090	void	1052	void
1091	rxvt_term::check_cb (check_watcher &w)	1053	rxvt_term::refresh_check ()
1092	{	1054	{
1093	make_current ();	1055	if (want_refresh && !flush_ev.is_active ())
		1056	flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1094		1057
1095	display->flush ();	1058	display->flush ();
1096
1097	if (want_refresh && !flush_ev.active)
1098	flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1099	}	1059	}
1100		1060
1101	void	1061	void
1102	rxvt_term::flush_cb (time_watcher &w)	1062	rxvt_term::flush_cb (ev::timer &w, int revents)
1103	{	1063	{
1104	make_current ();	1064	make_current ();
1105		1065
1106	refresh_count = 0;	1066	refresh_count = 0;
1107	flush ();	1067	flush ();
1108	}	1068	}
1109		1069
1110	#ifdef CURSOR_BLINK	1070	#ifdef CURSOR_BLINK
1111	void	1071	void
1112	rxvt_term::cursor_blink_cb (time_watcher &w)	1072	rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1113	{	1073	{
1114	hidden_cursor = !hidden_cursor;	1074	hidden_cursor = !hidden_cursor;
1115	want_refresh = 1;	1075	want_refresh = 1;
1116		1076	refresh_check ();
1117	w.start (w.at + CURSOR_BLINK_INTERVAL);
1118	}	1077	}
1119	#endif	1078	#endif
1120		1079
1121	#ifdef TEXT_BLINK	1080	#ifdef TEXT_BLINK
1122	void	1081	void
1123	rxvt_term::text_blink_cb (time_watcher &w)	1082	rxvt_term::text_blink_cb (ev::timer &w, int revents)
1124	{	1083	{
1125	if (scr_refresh_rend (RS_Blink, RS_Blink))	1084	if (scr_refresh_rend (RS_Blink, RS_Blink))
1126	{	1085	{
1127	hidden_text = !hidden_text;	1086	hidden_text = !hidden_text;
1128	want_refresh = 1;	1087	want_refresh = 1;
1129	w.start (w.at + TEXT_BLINK_INTERVAL);	1088	refresh_check ();
1130	}	1089	}
		1090	else
		1091	w.stop ();
1131	}	1092	}
1132	#endif	1093	#endif
1133		1094
1134	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	1095	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1135	void	1096	void
1136	rxvt_term::cont_scroll_cb (time_watcher &w)	1097	rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1137	{	1098	{
1138	if ((scrollbar_isUp() \|\| scrollbar_isDn()) &&	1099	if ((scrollBar.state == STATE_UP \|\| scrollBar.state == STATE_DOWN)
1139	scr_page (scrollbar_isUp() ? UP : DN, 1))	1100	&& scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1140	{	1101	{
1141	want_refresh = 1;	1102	want_refresh = 1;
1142	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1103	refresh_check ();
1143	}	1104	}
		1105	else
		1106	w.stop ();
1144	}	1107	}
1145	#endif	1108	#endif
1146		1109
1147	#ifdef SELECTION_SCROLLING	1110	#ifdef SELECTION_SCROLLING
1148	void	1111	void
1149	rxvt_term::sel_scroll_cb (time_watcher &w)	1112	rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1150	{	1113	{
1151	if (scr_page (scroll_selection_dir, scroll_selection_lines))	1114	if (scr_page (scroll_selection_dir, scroll_selection_lines))
1152	{	1115	{
1153	selection_extend (selection_save_x, selection_save_y, selection_save_state);	1116	selection_extend (selection_save_x, selection_save_y, selection_save_state);
1154	want_refresh = 1;	1117	want_refresh = 1;
1155	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1118	refresh_check ();
1156	}	1119	}
		1120	else
		1121	w.stop ();
1157	}	1122	}
1158	#endif	1123	#endif
1159		1124
1160	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	1125	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1161	void	1126	void
1162	rxvt_term::slip_wheel_cb (time_watcher &w)	1127	rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1163	{	1128	{
1164	if (mouse_slip_wheel_speed == 0	1129	if (scr_changeview (view_start - mouse_slip_wheel_speed))
1165	\|\| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1166	: scr_page (UP, mouse_slip_wheel_speed))
1167	{	1130	{
1168	if (view_start == top_row \|\| view_start == 0)
1169	mouse_slip_wheel_speed = 0;
1170
1171	want_refresh = 1;	1131	want_refresh = 1;
1172	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1132	refresh_check ();
		1133	}
		1134
		1135	if (view_start == top_row \|\| view_start == 0 \|\| mouse_slip_wheel_speed == 0)
		1136	{
		1137	mouse_slip_wheel_speed = 0;
		1138	w.stop ();
1173	}	1139	}
1174	}	1140	}
1175	#endif	1141	#endif
1176		1142
1177	#if LINUX_YIELD_HACK	1143	#if LINUX_YIELD_HACK
1178	static struct event_handler	1144	static struct event_handler
1179	{	1145	{
1180	check_watcher yield_ev;	1146	ev::prepare yield_ev;
1181		1147
1182	void yield_cb (check_watcher &w)	1148	void yield_cb (ev::prepare &w, int revents)
1183	{	1149	{
1184	// this should really be sched_yield(), but the linux guys thought	1150	// this should really be sched_yield(), but the linux guys thought
1185	// that giving a process calling sched_yield () less cpu time than	1151	// that giving a process calling sched_yield () less cpu time than
1186	// ones with high nice levels is a useful thing to do. It surely is is	1152	// ones with high nice levels is a useful thing to do. It surely is is
1187	// allowed by the sus... as is returning ENOSYS.	1153	// allowed by the sus... as is returning ENOSYS.
…		…
1238		1204
1239	return false;	1205	return false;
1240	}	1206	}
1241		1207
1242	void	1208	void
1243	rxvt_term::pty_cb (io_watcher &w, short revents)	1209	rxvt_term::pty_cb (ev::io &w, int revents)
1244	{	1210	{
1245	make_current ();	1211	make_current ();
1246		1212
1247	if (revents & EVENT_READ)	1213	if (revents & ev::READ)
1248	// loop, but don't allow a single term to monopolize us	1214	// loop, but don't allow a single term to monopolize us
1249	while (pty_fill ())	1215	while (pty_fill ())
1250	if (cmd_parse ())	1216	if (cmd_parse ())
1251	break;	1217	break;
1252		1218
1253	if (revents & EVENT_WRITE)	1219	if (revents & ev::WRITE)
1254	pty_write ();	1220	pty_write ();
		1221
		1222	refresh_check ();
1255	}	1223	}
1256		1224
1257	void	1225	void
1258	rxvt_term::pointer_unblank ()	1226	rxvt_term::pointer_unblank ()
1259	{	1227	{
…		…
1262		1230
1263	#ifdef POINTER_BLANK	1231	#ifdef POINTER_BLANK
1264	hidden_pointer = 0;	1232	hidden_pointer = 0;
1265		1233
1266	if (option (Opt_pointerBlank))	1234	if (option (Opt_pointerBlank))
1267	pointer_ev.start (NOW + pointerBlankDelay);	1235	pointer_ev.start (pointerBlankDelay);
1268	#endif	1236	#endif
1269	}	1237	}
1270		1238
1271	#ifdef POINTER_BLANK	1239	#ifdef POINTER_BLANK
1272	void	1240	void
…		…
1280		1248
1281	hidden_pointer = 1;	1249	hidden_pointer = 1;
1282	}	1250	}
1283		1251
1284	void	1252	void
1285	rxvt_term::pointer_cb (time_watcher &w)	1253	rxvt_term::pointer_cb (ev::timer &w, int revents)
1286	{	1254	{
1287	make_current ();	1255	make_current ();
1288		1256
1289	pointer_blank ();	1257	pointer_blank ();
1290	}	1258	}
…		…
1293	void	1261	void
1294	rxvt_term::mouse_report (XButtonEvent &ev)	1262	rxvt_term::mouse_report (XButtonEvent &ev)
1295	{	1263	{
1296	int button_number, key_state = 0;	1264	int button_number, key_state = 0;
1297	int x, y;	1265	int x, y;
		1266	int code = 32;
1298		1267
1299	x = ev.x;	1268	x = Pixel2Col (ev.x);
1300	y = ev.y;	1269	y = Pixel2Row (ev.y);
1301	pixel_position (&x, &y);	1270	if (ev.type == MotionNotify)
		1271	{
		1272	if (x == mouse_row && y == mouse_col)
		1273	return;
		1274	mouse_row = x;
		1275	mouse_col = y;
		1276	code += 32;
		1277	}
1302		1278
1303	if (MEvent.button == AnyButton)	1279	if (MEvent.button == AnyButton)
1304	button_number = 3;	1280	button_number = 3;
1305	else	1281	else
1306	{	1282	{
…		…
1352	x + 1,	1328	x + 1,
1353	y + 1);	1329	y + 1);
1354	#endif	1330	#endif
1355		1331
1356	tt_printf ("\033[M%c%c%c",	1332	tt_printf ("\033[M%c%c%c",
1357	(32 + button_number + key_state),	1333	(code + button_number + key_state),
1358	(32 + x + 1),	1334	(32 + x + 1),
1359	(32 + y + 1));	1335	(32 + y + 1));
1360	}	1336	}
1361		1337
1362	/{{{ process an X event /	1338	/{{{ process an X event /
…		…
1466	&& ev.xfocus.mode != NotifyGrab)	1442	&& ev.xfocus.mode != NotifyGrab)
1467	focus_out ();	1443	focus_out ();
1468	break;	1444	break;
1469		1445
1470	case ConfigureNotify:	1446	case ConfigureNotify:
1471	/* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",	1447	/*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1472	ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,	1448	ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1473	szHint.width, szHint.height);*/	1449	szHint.width, szHint.height);*/
1474	if (ev.xconfigure.window == parent[0])	1450	if (ev.xconfigure.window == parent[0])
1475	{	1451	{
1476	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))	1452	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
…		…
1483	}	1459	}
1484	else	1460	else
1485	{	1461	{
1486	#ifdef HAVE_BG_PIXMAP	1462	#ifdef HAVE_BG_PIXMAP
1487	if (bgPixmap.window_position_sensitive ())	1463	if (bgPixmap.window_position_sensitive ())
		1464	{
		1465	if (mapped)
1488	update_background ();	1466	update_background ();
		1467	else
		1468	bgPixmap.invalidate ();
		1469	}
1489	#endif	1470	#endif
1490	}	1471	}
		1472
1491	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));	1473	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1492	}	1474	}
1493	break;	1475	break;
1494		1476
1495	case PropertyNotify:	1477	case PropertyNotify:
…		…
1512	case SelectionRequest:	1494	case SelectionRequest:
1513	selection_send (ev.xselectionrequest);	1495	selection_send (ev.xselectionrequest);
1514	break;	1496	break;
1515		1497
1516	case MapNotify:	1498	case MapNotify:
		1499	#ifdef HAVE_BG_PIXMAP
		1500	/* This is needed spcifically to fix the case of no window manager or a
		1501	* non-reparenting window manager. In those cases we never get first
		1502	* ConfigureNotify. Also that speeds startup under normal WM, by taking
		1503	* care of multiplicity of ConfigureNotify events arriwing while WM does
		1504	* reparenting.
		1505	* We should not render background immidiately, as there could be several
		1506	* ConfigureNotify's to follow. Lets take care of all of them in one scoop
		1507	* by scheduling background redraw as soon as we can, but giving a short
		1508	* bit of time for ConfigureNotifies to arrive.
		1509	* We should render background PRIOR to drawing any text, but AFTER all
		1510	* of ConfigureNotifys for the best results.
		1511	*/
		1512	if (bgPixmap.flags & bgPixmap_t::isInvalid)
		1513	update_background_ev.start (0.025);
		1514	#endif
1517	mapped = 1;	1515	mapped = 1;
1518	#ifdef TEXT_BLINK	1516	#ifdef TEXT_BLINK
1519	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);	1517	text_blink_ev.start ();
1520	#endif	1518	#endif
1521	HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));	1519	HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1522	break;	1520	break;
1523		1521
1524	case UnmapNotify:	1522	case UnmapNotify:
…		…
1532	case GraphicsExpose:	1530	case GraphicsExpose:
1533	case Expose:	1531	case Expose:
1534	if (ev.xany.window == vt)	1532	if (ev.xany.window == vt)
1535	{	1533	{
1536	do	1534	do
		1535	{
1537	scr_expose (ev.xexpose.x, ev.xexpose.y,	1536	scr_expose (ev.xexpose.x, ev.xexpose.y,
1538	ev.xexpose.width, ev.xexpose.height, False);	1537	ev.xexpose.width, ev.xexpose.height, False);
		1538	}
1539	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));	1539	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1540		1540
1541	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1541	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1542		1542
1543	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))	1543	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
		1544	{
1544	scr_expose (ev.xexpose.x, ev.xexpose.y,	1545	scr_expose (ev.xexpose.x, ev.xexpose.y,
1545	ev.xexpose.width, ev.xexpose.height, False);	1546	ev.xexpose.width, ev.xexpose.height, False);
		1547	}
1546		1548
1547	want_refresh = 1;	1549	want_refresh = 1;
1548	}	1550	}
1549	else	1551	else
1550	{	1552	{
…		…
1553	while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))	1555	while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1554	;	1556	;
1555	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))	1557	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1556	;	1558	;
1557		1559
1558	if (isScrollbarWindow (ev.xany.window))	1560	if (scrollBar.state && ev.xany.window == scrollBar.win)
1559	{	1561	{
1560	scrollBar.setIdle ();	1562	scrollBar.state = STATE_IDLE;
1561	scrollbar_show (0);	1563	scrollbar_show (0);
1562	}	1564	}
1563	}	1565	}
1564	break;	1566	break;
1565		1567
1566	case MotionNotify:	1568	case MotionNotify:
1567	#ifdef POINTER_BLANK	1569	#ifdef POINTER_BLANK
1568	if (hidden_pointer)	1570	if (hidden_pointer)
1569	pointer_unblank ();	1571	pointer_unblank ();
1570	#endif	1572	#endif
		1573	if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask\|Button2Mask\|Button3Mask))
		1574	\|\| priv_modes & PrivMode_MouseAnyEvent)
		1575	mouse_report (ev.xbutton);
1571	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)	1576	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1572	break;	1577	break;
1573		1578
1574	if (ev.xany.window == vt)	1579	if (ev.xany.window == vt)
1575	{	1580	{
…		…
1609	int dist;	1614	int dist;
1610		1615
1611	/* don't clobber the current delay if we are	1616	/* don't clobber the current delay if we are
1612	* already in the middle of scrolling.	1617	* already in the middle of scrolling.
1613	*/	1618	*/
1614	if (!sel_scroll_ev.active)	1619	if (!sel_scroll_ev.is_active ())
1615	sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);	1620	sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1616		1621
1617	/* save the event params so we can highlight	1622	/* save the event params so we can highlight
1618	* the selection in the pending-scroll loop	1623	* the selection in the pending-scroll loop
1619	*/	1624	*/
1620	selection_save_x = ev.xbutton.x;	1625	selection_save_x = ev.xbutton.x;
…		…
1642	else	1647	else
1643	{	1648	{
1644	/* we are within the text window, so we	1649	/* we are within the text window, so we
1645	* shouldn't be scrolling	1650	* shouldn't be scrolling
1646	*/	1651	*/
1647	if (sel_scroll_ev.active)
1648	sel_scroll_ev.stop();	1652	sel_scroll_ev.stop();
1649	}	1653	}
1650	#endif	1654	#endif
1651	#ifdef MOUSE_THRESHOLD	1655	#ifdef MOUSE_THRESHOLD
1652	}	1656	}
1653	#endif	1657	#endif
1654	}	1658	}
1655	}	1659	}
1656	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1660	else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1657	{	1661	{
1658	while (XCheckTypedWindowEvent (dpy, scrollBar.win,	1662	while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1659	MotionNotify, &ev))	1663	MotionNotify, &ev))
1660	;	1664	;
1661		1665
…		…
1679	{	1683	{
1680	hidden_cursor = 0;	1684	hidden_cursor = 0;
1681	want_refresh = 1;	1685	want_refresh = 1;
1682	}	1686	}
1683		1687
1684	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);	1688	cursor_blink_ev.again ();
1685	}	1689	}
1686	#endif	1690	#endif
1687		1691
1688	#if defined(POINTER_BLANK)	1692	#if defined(POINTER_BLANK)
1689	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)	1693	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
…		…
1696		1700
1697	if (ev.type == KeyPress && hidden_pointer == 0)	1701	if (ev.type == KeyPress && hidden_pointer == 0)
1698	pointer_blank ();	1702	pointer_blank ();
1699	}	1703	}
1700	#endif	1704	#endif
		1705
		1706	refresh_check ();
1701	}	1707	}
1702		1708
1703	void	1709	void
1704	rxvt_term::focus_in ()	1710	rxvt_term::focus_in ()
1705	{	1711	{
…		…
1717	XSetICFocus (Input_Context);	1723	XSetICFocus (Input_Context);
1718	}	1724	}
1719	#endif	1725	#endif
1720	#if CURSOR_BLINK	1726	#if CURSOR_BLINK
1721	if (option (Opt_cursorBlink))	1727	if (option (Opt_cursorBlink))
1722	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);	1728	cursor_blink_ev.again ();
1723	#endif	1729	#endif
1724	#if OFF_FOCUS_FADING	1730	#if OFF_FOCUS_FADING
1725	if (rs[Rs_fade])	1731	if (rs[Rs_fade])
1726	{	1732	{
1727	pix_colors = pix_colors_focused;	1733	pix_colors = pix_colors_focused;
…		…
1729	}	1735	}
1730	#endif	1736	#endif
1731	#if ENABLE_FRILLS	1737	#if ENABLE_FRILLS
1732	if (option (Opt_urgentOnBell))	1738	if (option (Opt_urgentOnBell))
1733	{	1739	{
1734	XWMHints *h;
1735
1736	h = XGetWMHints(dpy, parent[0]);	1740	if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1737	if (h != NULL)
1738	{	1741	{
1739	h->flags &= ~XUrgencyHint;	1742	h->flags &= ~XUrgencyHint;
1740	XSetWMHints(dpy, parent[0], h);	1743	XSetWMHints (dpy, parent[0], h);
1741	}	1744	}
1742	}	1745	}
1743	#endif	1746	#endif
1744	}	1747	}
1745	}	1748	}
…		…
1768	XUnsetICFocus (Input_Context);	1771	XUnsetICFocus (Input_Context);
1769	#endif	1772	#endif
1770	#if CURSOR_BLINK	1773	#if CURSOR_BLINK
1771	if (option (Opt_cursorBlink))	1774	if (option (Opt_cursorBlink))
1772	cursor_blink_ev.stop ();	1775	cursor_blink_ev.stop ();
		1776
1773	hidden_cursor = 0;	1777	hidden_cursor = 0;
1774	#endif	1778	#endif
1775	#if OFF_FOCUS_FADING	1779	#if OFF_FOCUS_FADING
1776	if (rs[Rs_fade])	1780	if (rs[Rs_fade])
1777	{	1781	{
…		…
1817	\|\| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])	1821	\|\| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1818	{	1822	{
1819	bgPixmap.set_root_pixmap ();	1823	bgPixmap.set_root_pixmap ();
1820	update_background ();	1824	update_background ();
1821	}	1825	}
		1826
1822	break;	1827	break;
1823	}	1828	}
1824	# endif	1829	# endif
		1830
		1831	refresh_check ();
1825	}	1832	}
1826	#endif	1833	#endif
1827		1834
1828	void	1835	void
1829	rxvt_term::button_press (XButtonEvent &ev)	1836	rxvt_term::button_press (XButtonEvent &ev)
…		…
1884	mouse_report (ev);	1891	mouse_report (ev);
1885	}	1892	}
1886	#else	1893	#else
1887	MEvent.button = ev.button;	1894	MEvent.button = ev.button;
1888	mouse_report (ev);	1895	mouse_report (ev);
1889	#endif /* MOUSE_REPORT_DOUBLECLICK */	1896	#endif /* MOUSE_REPORT_DOUBLECLICK */
1890		1897
1891	}	1898	}
1892	else	1899	else
1893	{	1900	{
1894	if (ev.button != MEvent.button)	1901	if (ev.button != MEvent.button)
…		…
1942	}	1949	}
1943		1950
1944	/*	1951	/*
1945	* Scrollbar window processing of button press	1952	* Scrollbar window processing of button press
1946	*/	1953	*/
1947	if (isScrollbarWindow (ev.window))	1954	if (scrollBar.state && ev.window == scrollBar.win)
1948	{	1955	{
1949	scrollBar.setIdle ();	1956	page_dirn direction = NO_DIR;
		1957
		1958	if (scrollBar.upButton (ev.y))
		1959	direction = UP; /* up */
		1960	else if (scrollBar.dnButton (ev.y))
		1961	direction = DN; /* down */
		1962
		1963	scrollBar.state = STATE_IDLE;
1950	/*	1964	/*
1951	* Rxvt-style scrollbar:	1965	* Rxvt-style scrollbar:
1952	* move up if mouse is above slider	1966	* move up if mouse is above slider
1953	* move dn if mouse is below slider	1967	* move dn if mouse is below slider
1954	*	1968	*
…		…
1963	/*	1977	/*
1964	* Mouse report disabled scrollbar:	1978	* Mouse report disabled scrollbar:
1965	* arrow buttons - send up/down	1979	* arrow buttons - send up/down
1966	* click on scrollbar - send pageup/down	1980	* click on scrollbar - send pageup/down
1967	*/	1981	*/
1968	if ((scrollBar.style == R_SB_NEXT	1982	if (direction == UP)
1969	&& scrollbarnext_upButton (ev.y))
1970	\|\| (scrollBar.style == R_SB_RXVT
1971	&& scrollbarrxvt_upButton (ev.y)))
1972	tt_printf ("\033[A");	1983	tt_printf ("\033[A");
1973	else if ((scrollBar.style == R_SB_NEXT	1984	else if (direction == DN)
1974	&& scrollbarnext_dnButton (ev.y))
1975	\|\| (scrollBar.style == R_SB_RXVT
1976	&& scrollbarrxvt_dnButton (ev.y)))
1977	tt_printf ("\033[B");	1985	tt_printf ("\033[B");
1978	else	1986	else
1979	switch (ev.button)	1987	switch (ev.button)
1980	{	1988	{
1981	case Button2:	1989	case Button2:
…		…
1988	tt_printf ("\033[5~");	1996	tt_printf ("\033[5~");
1989	break;	1997	break;
1990	}	1998	}
1991	}	1999	}
1992	else	2000	else
1993	#endif /* NO_SCROLLBAR_REPORT */	2001	#endif /* NO_SCROLLBAR_REPORT */
1994
1995	{
1996	char upordown = 0;
1997
1998	if (scrollBar.style == R_SB_NEXT)
1999	{	2002	{
2000	if (scrollbarnext_upButton (ev.y))	2003	if (direction != NO_DIR)
2001	upordown = -1; /* up */
2002	else if (scrollbarnext_dnButton (ev.y))
2003	upordown = 1; /* down */
2004	}
2005	else if (scrollBar.style == R_SB_RXVT)
2006	{
2007	if (scrollbarrxvt_upButton (ev.y))
2008	upordown = -1; /* up */
2009	else if (scrollbarrxvt_dnButton (ev.y))
2010	upordown = 1; /* down */
2011	}
2012	if (upordown)
2013	{	2004	{
2014	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	2005	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
		2006	if (!cont_scroll_ev.is_active ())
2015	cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);	2007	cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2016	#endif	2008	#endif
2017	if (scr_page (upordown < 0 ? UP : DN, 1))	2009	if (scr_page (direction, 1))
2018	{	2010	{
2019	if (upordown < 0)	2011	if (direction == UP)
2020	scrollBar.setUp ();	2012	scrollBar.state = STATE_UP;
2021	else	2013	else
2022	scrollBar.setDn ();	2014	scrollBar.state = STATE_DOWN;
2023	}	2015	}
2024	}	2016	}
2025	else	2017	else
2026	switch (ev.button)	2018	switch (ev.button)
2027	{	2019	{
2028	case Button2:	2020	case Button2:
2029	switch (scrollbar_align)	2021	switch (scrollBar.align)
2030	{	2022	{
2031	case R_SB_ALIGN_TOP:	2023	case R_SB_ALIGN_TOP:
2032	csrO = 0;	2024	csrO = 0;
2033	break;	2025	break;
2034	case R_SB_ALIGN_CENTRE:	2026	case R_SB_ALIGN_CENTRE:
…		…
2042	if (scrollBar.style == R_SB_XTERM	2034	if (scrollBar.style == R_SB_XTERM
2043	\|\| scrollbar_above_slider (ev.y)	2035	\|\| scrollbar_above_slider (ev.y)
2044	\|\| scrollbar_below_slider (ev.y))	2036	\|\| scrollbar_below_slider (ev.y))
2045	scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());	2037	scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
2046		2038
2047	scrollBar.setMotion ();	2039	scrollBar.state = STATE_MOTION;
2048	break;	2040	break;
2049		2041
2050	case Button1:	2042	case Button1:
2051	if (scrollbar_align == R_SB_ALIGN_CENTRE)	2043	if (scrollBar.align == R_SB_ALIGN_CENTRE)
2052	csrO = ev.y - scrollBar.top;	2044	csrO = ev.y - scrollBar.top;
2053	/* FALLTHROUGH */	2045	/* FALLTHROUGH */
2054		2046
2055	case Button3:	2047	case Button3:
2056	if (scrollBar.style != R_SB_XTERM)	2048	if (scrollBar.style != R_SB_XTERM)
…		…
2066	scr_page (DN, nrow - 1);	2058	scr_page (DN, nrow - 1);
2067	# else	2059	# else
2068	scr_page (DN, nrow / 4);	2060	scr_page (DN, nrow / 4);
2069	# endif	2061	# endif
2070	else	2062	else
2071	scrollBar.setMotion ();	2063	scrollBar.state = STATE_MOTION;
2072	}	2064	}
2073	else	2065	else
2074	{	2066	{
2075	scr_page ((ev.button == Button1 ? DN : UP),	2067	scr_page ((ev.button == Button1 ? DN : UP),
2076	(nrow	2068	(nrow
…		…
2093		2085
2094	csrO = 0; /* reset csr Offset */	2086	csrO = 0; /* reset csr Offset */
2095	if (!bypass_keystate)	2087	if (!bypass_keystate)
2096	reportmode = !! (priv_modes & PrivMode_mouse_report);	2088	reportmode = !! (priv_modes & PrivMode_mouse_report);
2097		2089
2098	if (scrollbar_isUpDn ())	2090	if (scrollBar.state == STATE_UP \|\| scrollBar.state == STATE_DOWN)
2099	{	2091	{
2100	scrollBar.setIdle ();	2092	scrollBar.state = STATE_IDLE;
2101	scrollbar_show (0);	2093	scrollbar_show (0);
2102	}	2094	}
2103		2095
2104	#ifdef SELECTION_SCROLLING	2096	#ifdef SELECTION_SCROLLING
2105	if (sel_scroll_ev.active)
2106	sel_scroll_ev.stop();	2097	sel_scroll_ev.stop();
2107	#endif	2098	#endif
2108		2099
2109	if (ev.window == vt)	2100	if (ev.window == vt)
2110	{	2101	{
2111	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))	2102	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
…		…
2135	mouse_report (ev);	2126	mouse_report (ev);
2136	}	2127	}
2137	#else /* MOUSE_REPORT_DOUBLECLICK */	2128	#else /* MOUSE_REPORT_DOUBLECLICK */
2138	MEvent.button = AnyButton;	2129	MEvent.button = AnyButton;
2139	mouse_report (ev);	2130	mouse_report (ev);
2140	#endif /* MOUSE_REPORT_DOUBLECLICK */	2131	#endif /* MOUSE_REPORT_DOUBLECLICK */
2141	return;	2132	return;
2142	}	2133	}
2143		2134
2144	/*	2135	/*
2145	* dumb hack to compensate for the failure of click-and-drag	2136	* dumb hack to compensate for the failure of click-and-drag
…		…
2183	{	2174	{
2184	mouse_slip_wheel_speed += v ? -1 : 1;	2175	mouse_slip_wheel_speed += v ? -1 : 1;
2185	if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;	2176	if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2186	if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;	2177	if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2187		2178
2188	if (slip_wheel_ev.at < NOW)	2179	if (!slip_wheel_ev.is_active ())
2189	slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;	2180	slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2190
2191	slip_wheel_ev.start ();
2192	}	2181	}
2193	else	2182	else
		2183	# endif
2194	{	2184	{
2195	# endif
2196	scr_page (v, i);	2185	scr_page (v, i);
2197	scrollbar_show (1);	2186	scrollbar_show (1);
2198	# ifdef MOUSE_SLIP_WHEELING
2199	}	2187	}
2200	# endif
2201	}	2188	}
2202	break;	2189	break;
2203	#endif	2190	#endif
2204	}	2191	}
2205	}	2192	}
…		…
2264		2251
2265	if (!option (Opt_jumpScroll) \|\| refresh_count >= nrow - 1)	2252	if (!option (Opt_jumpScroll) \|\| refresh_count >= nrow - 1)
2266	{	2253	{
2267	refresh_count = 0;	2254	refresh_count = 0;
2268		2255
2269	if (!option (Opt_skipScroll) \|\| io_manager::now () > NOW + 1. / 60.)	2256	if (!option (Opt_skipScroll) \|\| ev_time () > ev::now () + 1. / 60.)
2270	{	2257	{
2271	refreshnow = true;	2258	refreshnow = true;
2272	ch = NOCHAR;	2259	ch = NOCHAR;
2273	break;	2260	break;
2274	}	2261	}
…		…
2485	}	2472	}
2486	}	2473	}
2487		2474
2488	pclose_printer (fd);	2475	pclose_printer (fd);
2489	}	2476	}
2490	#endif /* PRINTPIPE */	2477	#endif /* PRINTPIPE */
2491	/}}} /	2478	/}}} /
2492		2479
2493	/* INDENT-OFF */	2480	/* INDENT-OFF */
2494	enum {	2481	enum {
2495	C1_40 = 0x40,	2482	C1_40 = 0x40,
…		…
2788	nargs = 0;	2775	nargs = 0;
2789		2776
2790	priv = 0;	2777	priv = 0;
2791	ch = cmd_getc ();	2778	ch = cmd_getc ();
2792	if (ch >= '<' && ch <= '?')	2779	if (ch >= '<' && ch <= '?')
		2780	{
2793	{ /* '<' '=' '>' '?' */	2781	/* '<' '=' '>' '?' */
2794	priv = ch;	2782	priv = ch;
2795	ch = cmd_getc ();	2783	ch = cmd_getc ();
2796	}	2784	}
2797		2785
2798	/* read any numerical arguments */	2786	/* read any numerical arguments */
…		…
2841	{	2829	{
2842	// first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,	2830	// first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2843	// 'U' for rxvt-unicode != 7.[34] (where it was broken).	2831	// 'U' for rxvt-unicode != 7.[34] (where it was broken).
2844	//	2832	//
2845	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt	2833	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2846	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify	2834	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2847	// that we do not support xterm mouse reporting (should be 95 when we do).	2835	// versions.
2848	//	2836	//
2849	tt_printf ("\033[>%d;94;0c", 'U');	2837	tt_printf ("\033[>%d;95;0c", 'U');
2850	}	2838	}
2851	break;	2839	break;
		2840
2852	case '?':	2841	case '?':
2853	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')	2842	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')
2854	process_terminal_mode (ch, priv, nargs, arg);	2843	process_terminal_mode (ch, priv, nargs, arg);
2855	break;	2844	break;
2856	}	2845	}
…		…
3372	*buf++ = '\0';	3361	*buf++ = '\0';
3373		3362
3374	process_color_seq (op, color, name, resp);	3363	process_color_seq (op, color, name, resp);
3375	}	3364	}
3376	break;	3365	break;
		3366	case Rxvt_restoreFG:
3377	case XTerm_Color00:	3367	case XTerm_Color00:
3378	process_color_seq (op, Color_fg, str, resp);	3368	process_color_seq (op, Color_fg, str, resp);
3379	break;	3369	break;
		3370	case Rxvt_restoreBG:
3380	case XTerm_Color01:	3371	case XTerm_Color01:
3381	process_color_seq (op, Color_bg, str, resp);	3372	process_color_seq (op, Color_bg, str, resp);
3382	break;	3373	break;
3383	#ifndef NO_CURSORCOLOR	3374	#ifndef NO_CURSORCOLOR
3384	case XTerm_Color_cursor:	3375	case XTerm_Color_cursor:
…		…
3410	#if ENABLE_TRANSPARENCY	3401	#if ENABLE_TRANSPARENCY
3411	case URxvt_Color_tint:	3402	case URxvt_Color_tint:
3412	process_color_seq (op, Color_tint, str, resp);	3403	process_color_seq (op, Color_tint, str, resp);
3413	{	3404	{
3414	bool changed = false;	3405	bool changed = false;
		3406
3415	if (ISSET_PIXCOLOR (Color_tint))	3407	if (ISSET_PIXCOLOR (Color_tint))
3416	changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);	3408	changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3417	else	3409	else
3418	changed = bgPixmap.unset_tint ();	3410	changed = bgPixmap.unset_tint ();
		3411
3419	if (changed)	3412	if (changed)
3420	update_background ();	3413	update_background ();
3421	}	3414	}
3422		3415
3423	break;	3416	break;
3424	#endif	3417	#endif
3425		3418
3426	#if XPM_BACKGROUND	3419	#if BG_IMAGE_FROM_FILE
3427	case Rxvt_Pixmap:	3420	case Rxvt_Pixmap:
3428	if (!strcmp (str, "?"))	3421	if (!strcmp (str, "?"))
3429	{	3422	{
3430	char str[256];	3423	char str[256];
3431		3424
…		…
3446	changed++;	3439	changed++;
3447	str = strchr (str, ';');	3440	str = strchr (str, ';');
3448	if (str == NULL)	3441	if (str == NULL)
3449	bgPixmap.set_defaultGeometry ();	3442	bgPixmap.set_defaultGeometry ();
3450	}	3443	}
		3444
3451	while (str)	3445	while (str)
3452	{	3446	{
3453	str++;	3447	str++;
3454	if (bgPixmap.set_geometry (str))	3448	if (bgPixmap.set_geometry (str))
3455	changed++;	3449	changed++;
3456	str = strchr (str, ';');	3450	str = strchr (str, ';');
3457	}	3451	}
		3452
3458	if (changed)	3453	if (changed)
3459	update_background ();	3454	update_background ();
3460	}	3455	}
3461	break;	3456	break;
3462	#endif	3457	#endif
3463
3464	case Rxvt_restoreFG:
3465	set_window_color (Color_fg, str);
3466	break;
3467	case Rxvt_restoreBG:
3468	set_window_color (Color_bg, str);
3469	break;
3470		3458
3471	case XTerm_logfile:	3459	case XTerm_logfile:
3472	// TODO, when secure mode?	3460	// TODO, when secure mode?
3473	break;	3461	break;
3474		3462
…		…
3618	{ 66, PrivMode_aplKP },	3606	{ 66, PrivMode_aplKP },
3619	#ifndef NO_BACKSPACE_KEY	3607	#ifndef NO_BACKSPACE_KEY
3620	{ 67, PrivMode_BackSpace },	3608	{ 67, PrivMode_BackSpace },
3621	#endif	3609	#endif
3622	{ 1000, PrivMode_MouseX11 },	3610	{ 1000, PrivMode_MouseX11 },
3623	// 1001 Use Hilite Mouse Tracking. NYI, TODO	3611	{ 1002, PrivMode_MouseBtnEvent },
3624	// 1002 Use Cell Motion Mouse Tracking. NYI, TODO	3612	{ 1003, PrivMode_MouseAnyEvent },
3625	// 1003 Use All Motion Mouse Tracking. NYI, TODO
3626	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension	3613	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension
3627	{ 1011, PrivMode_Keypress }, // rxvt extension	3614	{ 1011, PrivMode_Keypress }, // rxvt extension
3628	// 1035 enable modifiers for alt, numlock NYI	3615	// 1035 enable modifiers for alt, numlock NYI
3629	// 1036 send ESC for meta keys NYI	3616	// 1036 send ESC for meta keys NYI
3630	// 1037 send DEL for keypad delete NYI	3617	// 1037 send DEL for keypad delete NYI
3631	{ 1047, PrivMode_Screen },	3618	{ 1047, PrivMode_Screen },
3632	// 1048 save and restore cursor	3619	// 1048 save and restore cursor
3633	{ 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */	3620	{ 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3634	// 1051, 1052, 1060, 1061 keyboard emulation NYI	3621	// 1051, 1052, 1060, 1061 keyboard emulation NYI
		3622	{ 2004, PrivMode_BracketPaste },
3635	};	3623	};
3636		3624
3637	if (nargs == 0)	3625	if (nargs == 0)
3638	return;	3626	return;
3639		3627
…		…
3687	*/	3675	*/
3688	PrivMode (1, PrivMode_vt52);	3676	PrivMode (1, PrivMode_vt52);
3689	break;	3677	break;
3690	case 3: /* 80/132 */	3678	case 3: /* 80/132 */
3691	if (priv_modes & PrivMode_132OK)	3679	if (priv_modes & PrivMode_132OK)
		3680	{
		3681	scr_poweron ();
3692	set_widthheight (((state ? 132 : 80) * fwidth), height);	3682	set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);
		3683	}
3693	break;	3684	break;
3694	case 4: /* smooth scrolling */	3685	case 4: /* smooth scrolling */
3695	set_option (Opt_jumpScroll, !state);	3686	set_option (Opt_jumpScroll, !state);
3696	break;	3687	break;
3697	case 5: /* reverse video */	3688	case 5: /* reverse video */
…		…
3704	scr_autowrap (state);	3695	scr_autowrap (state);
3705	break;	3696	break;
3706	/* case 8: - auto repeat, can't do on a per window basis */	3697	/* case 8: - auto repeat, can't do on a per window basis */
3707	case 9: /* X10 mouse reporting */	3698	case 9: /* X10 mouse reporting */
3708	if (state) /* orthogonal */	3699	if (state) /* orthogonal */
3709	priv_modes &= ~PrivMode_MouseX11;	3700	priv_modes &= ~(PrivMode_MouseX11\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);
3710	break;	3701	break;
3711	#ifdef scrollBar_esc	3702	#ifdef scrollBar_esc
3712	case scrollBar_esc:	3703	case scrollBar_esc:
3713	if (scrollbar_mapping (state))	3704	if (scrollbar_mapping (state))
3714	{	3705	{
…		…
3727	break;	3718	break;
3728	/* case 66: - application key pad */	3719	/* case 66: - application key pad */
3729	/* case 67: - backspace key */	3720	/* case 67: - backspace key */
3730	case 1000: /* X11 mouse reporting */	3721	case 1000: /* X11 mouse reporting */
3731	if (state) /* orthogonal */	3722	if (state) /* orthogonal */
3732	priv_modes &= ~PrivMode_MouseX10;	3723	priv_modes &= ~(PrivMode_MouseX10\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);
3733	break;	3724	break;
3734	#if 0
3735	case 1001:	3725	case 1002:
3736	break; /* X11 mouse highlighting */	3726	case 1003:
3737	#endif	3727	if (state)
		3728	{
		3729	priv_modes &= ~(PrivMode_MouseX10\|PrivMode_MouseX11);
		3730	priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
		3731	vt_emask_mouse = PointerMotionMask;
		3732	}
		3733	else
		3734	vt_emask_mouse = NoEventMask;
		3735	vt_select_input ();
		3736	break;
3738	case 1010: /* scroll to bottom on TTY output inhibit */	3737	case 1010: /* scroll to bottom on TTY output inhibit */
3739	set_option (Opt_scrollTtyOutput, !state);	3738	set_option (Opt_scrollTtyOutput, !state);
3740	break;	3739	break;
3741	case 1011: /* scroll to bottom on key press */	3740	case 1011: /* scroll to bottom on key press */
3742	set_option (Opt_scrollTtyKeypress, state);	3741	set_option (Opt_scrollTtyKeypress, state);
…		…
3919	rxvt_term::process_graphics ()	3918	rxvt_term::process_graphics ()
3920	{	3919	{
3921	unicode_t ch, cmd = cmd_getc ();	3920	unicode_t ch, cmd = cmd_getc ();
3922		3921
3923	if (cmd == 'Q')	3922	if (cmd == 'Q')
		3923	{
3924	{ /* query graphics */	3924	/* query graphics */
3925	tt_printf ("\033G0\012"); /* no graphics */	3925	tt_printf ("\033G0\012"); /* no graphics */
3926	return;	3926	return;
3927	}	3927	}
3928	/* swallow other graphics sequences until terminating ':' */	3928	/* swallow other graphics sequences until terminating ':' */
3929	do	3929	do
…		…
3979	v_buffer = (char *)realloc (v_buffer, v_buflen + len);	3979	v_buffer = (char *)realloc (v_buffer, v_buflen + len);
3980		3980
3981	memcpy (v_buffer + v_buflen, data, len);	3981	memcpy (v_buffer + v_buflen, data, len);
3982	v_buflen += len;	3982	v_buflen += len;
3983		3983
3984	pty_ev.set (EVENT_READ \| EVENT_WRITE);	3984	pty_ev.set (ev::READ \| ev::WRITE);
3985	}	3985	}
3986		3986
3987	void rxvt_term::pty_write ()	3987	void rxvt_term::pty_write ()
3988	{	3988	{
3989	int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));	3989	int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
…		…
3994		3994
3995	if (v_buflen == 0)	3995	if (v_buflen == 0)
3996	{	3996	{
3997	free (v_buffer);	3997	free (v_buffer);
3998	v_buffer = 0;	3998	v_buffer = 0;
3999	v_buflen = 0;
4000		3999
4001	pty_ev.set (EVENT_READ);	4000	pty_ev.set (ev::READ);
4002	return;	4001	return;
4003	}	4002	}
4004		4003
4005	memmove (v_buffer, v_buffer + written, v_buflen);	4004	memmove (v_buffer, v_buffer + written, v_buflen);
4006	}	4005	}
4007	else if (written != -1 \|\| (errno != EAGAIN && errno != EINTR))	4006	else if (written != -1 \|\| (errno != EAGAIN && errno != EINTR))
4008	pty_ev.set (EVENT_READ);	4007	pty_ev.set (ev::READ);
4009	}	4008	}
4010		4009
4011	/----------------------- end-of-file (C source) -----------------------/	4010	/----------------------- end-of-file (C source) -----------------------/
4012		4011

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.353 by sasha, Wed Sep 12 19:51:41 2007 UTC vs. Revision 1.408 by ayin, Sat Feb 16 13:36:10 2008 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.353 by sasha, Wed Sep 12 19:51:41 2007 UTC vs.
Revision 1.408 by ayin, Sat Feb 16 13:36:10 2008 UTC