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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.359 by ayin, Mon Oct 15 14:56:06 2007 UTC vs.
Revision 1.406 by ayin, Thu Feb 14 23:53:05 2008 UTC

…		…
25	* - extensive modifications	25	* - extensive modifications
26	* Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>	26	* Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27	* Copyright (c) 2001 Marius Gedminas	27	* Copyright (c) 2001 Marius Gedminas
28	* - Ctrl/Mod4+Tab works like Meta+Tab (options)	28	* - Ctrl/Mod4+Tab works like Meta+Tab (options)
29	* Copyright (c) 2003 Rob McMullen <robm@flipturn.org>	29	* Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30	* Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>	30	* Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
		31	* Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
31	*	32	*
32	* This program is free software; you can redistribute it and/or modify	33	* This program is free software; you can redistribute it and/or modify
33	* it under the terms of the GNU General Public License as published by	34	* it under the terms of the GNU General Public License as published by
34	* the Free Software Foundation; either version 2 of the License, or	35	* the Free Software Foundation; either version 2 of the License, or
35	* (at your option) any later version.	36	* (at your option) any later version.
…		…
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
…		…
301		302
302	void	303	void
303	rxvt_term::key_press (XKeyEvent &ev)	304	rxvt_term::key_press (XKeyEvent &ev)
304	{	305	{
305	int ctrl, meta, shft, len;	306	int ctrl, meta, shft, len;
306	unsigned int newlen;
307	KeySym keysym;	307	KeySym keysym;
308	int valid_keysym;	308	int valid_keysym;
309	char kbuf[KBUFSZ];	309	char kbuf[KBUFSZ];
310		310
311	#if ISO_14755	311	#if ISO_14755
…		…
546	}	546	}
547	#endif	547	#endif
548		548
549	if (keysym >= 0xFF00 && keysym <= 0xFFFF)	549	if (keysym >= 0xFF00 && keysym <= 0xFFFF)
550	{	550	{
551	{
552	bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;	551	bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
553	newlen = 1;	552	unsigned int newlen = 1;
		553	#ifdef XK_KP_Home
		554	static const KeySym keypadtrans[] = {
		555	XK_KP_7, // XK_KP_Home
		556	XK_KP_4, // XK_KP_Left
		557	XK_KP_8, // XK_KP_Up
		558	XK_KP_6, // XK_KP_Right
		559	XK_KP_2, // XK_KP_Down
		560	#ifndef UNSHIFTED_SCROLLKEYS
		561	XK_KP_9, // XK_KP_Prior
		562	XK_KP_3, // XK_KP_Next
		563	#else
		564	XK_Prior,
		565	XK_Next,
		566	#endif
		567	XK_KP_1, // XK_KP_End
		568	XK_KP_5, // XK_KP_Begin
		569	};
		570
		571	if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
		572	{
		573	unsigned int index = keysym - XK_KP_Home;
		574	keysym = kp ? keypadtrans[index] : XK_Home + index;
		575	}
		576	else if (keysym == XK_KP_Insert)
		577	keysym = kp ? XK_KP_0 : XK_Insert;
		578	#ifndef NO_DELETE_KEY
		579	else if (keysym == XK_KP_Delete)
		580	keysym = kp ? XK_KP_Decimal : XK_Delete;
		581	#endif
		582	#endif
554	switch (keysym)	583	switch (keysym)
555	{	584	{
556	#ifndef NO_BACKSPACE_KEY	585	#ifndef NO_BACKSPACE_KEY
557	case XK_BackSpace:	586	case XK_BackSpace:
558	if (priv_modes & PrivMode_HaveBackSpace)	587	if (priv_modes & PrivMode_HaveBackSpace)
…		…
564	else	593	else
565	strcpy (kbuf, rs[Rs_backspace_key]);	594	strcpy (kbuf, rs[Rs_backspace_key]);
566	break;	595	break;
567	#endif	596	#endif
568	#ifndef NO_DELETE_KEY	597	#ifndef NO_DELETE_KEY
569	# ifdef XK_KP_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:	598	case XK_Delete:
580	strcpy (kbuf, rs[Rs_delete_key]);	599	strcpy (kbuf, rs[Rs_delete_key]);
581	break;	600	break;
582	#endif	601	#endif
583	case XK_Tab:	602	case XK_Tab:
…		…
595	#endif	614	#endif
596	newlen = 0;	615	newlen = 0;
597	}	616	}
598	break;	617	break;
599		618
600	#ifdef XK_KP_Left
601	case XK_KP_Up: /* \033Ox or standard */
602	case XK_KP_Down: /* \033Or or standard */
603	case XK_KP_Right: /* \033Ov or standard */
604	case XK_KP_Left: /* \033Ot or standard */
605	if (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" */	619	case XK_Up: /* "\033[A" */
617	case XK_Down: /* "\033[B" */	620	case XK_Down: /* "\033[B" */
618	case XK_Right: /* "\033[C" */	621	case XK_Right: /* "\033[C" */
619	case XK_Left: /* "\033[D" */	622	case XK_Left: /* "\033[D" */
620	strcpy (kbuf, "\033[Z");	623	strcpy (kbuf, "\033[Z");
…		…
630	else if (priv_modes & PrivMode_aplCUR)	633	else if (priv_modes & PrivMode_aplCUR)
631	kbuf[1] = 'O';	634	kbuf[1] = 'O';
632	break;	635	break;
633		636
634	#ifndef UNSHIFTED_SCROLLKEYS	637	#ifndef UNSHIFTED_SCROLLKEYS
635	# ifdef XK_KP_Prior
636	case XK_KP_Prior:
637	/* allow shift to override */
638	if (kp)
639	{
640	strcpy (kbuf, "\033Oy");
641	break;
642	}
643	/* FALLTHROUGH */
644	# endif
645	case XK_Prior:	638	case XK_Prior:
646	strcpy (kbuf, "\033[5~");	639	strcpy (kbuf, "\033[5~");
647	break;	640	break;
648	# ifdef XK_KP_Next
649	case XK_KP_Next:
650	/* allow shift to override */
651	if (kp)
652	{
653	strcpy (kbuf, "\033Os");
654	break;
655	}
656	/* FALLTHROUGH */
657	# endif
658	case XK_Next:	641	case XK_Next:
659	strcpy (kbuf, "\033[6~");	642	strcpy (kbuf, "\033[6~");
660	break;	643	break;
661	#endif	644	#endif
662	case XK_KP_Enter:	645	case XK_KP_Enter:
…		…
681	kbuf[0] = '\015';	664	kbuf[0] = '\015';
682	kbuf[1] = '\0';	665	kbuf[1] = '\0';
683	}	666	}
684	break;	667	break;
685		668
686	#ifdef XK_KP_Begin
687	case XK_KP_Begin:
688	strcpy (kbuf, "\033Ou");
689	break;
690
691	#endif
692	case XK_KP_F1: /* "\033OP" */	669	case XK_KP_F1: /* "\033OP" */
693	case XK_KP_F2: /* "\033OQ" */	670	case XK_KP_F2: /* "\033OQ" */
694	case XK_KP_F3: /* "\033OR" */	671	case XK_KP_F3: /* "\033OR" */
695	case XK_KP_F4: /* "\033OS" */	672	case XK_KP_F4: /* "\033OS" */
696	strcpy (kbuf, "\033OP");	673	strcpy (kbuf, "\033OP");
…		…
728		705
729	case XK_Find:	706	case XK_Find:
730	strcpy (kbuf, "\033[1~");	707	strcpy (kbuf, "\033[1~");
731	break;	708	break;
732		709
733	#ifdef XK_KP_Insert
734	case XK_KP_Insert:
735	/* allow shift to override */
736	if (kp)
737	{
738	strcpy (kbuf, "\033Op");
739	break;
740	}
741	/* FALLTHROUGH */
742	#endif
743	case XK_Insert:	710	case XK_Insert:
744	strcpy (kbuf, "\033[2~");	711	strcpy (kbuf, "\033[2~");
745	break;	712	break;
746	#ifdef DXK_Remove /* support for DEC remove like key */	713	#ifdef DXK_Remove /* support for DEC remove like key */
747	case DXK_Remove:	714	case DXK_Remove:
…		…
751	strcpy (kbuf, "\033[3~");	718	strcpy (kbuf, "\033[3~");
752	break;	719	break;
753	case XK_Select:	720	case XK_Select:
754	strcpy (kbuf, "\033[4~");	721	strcpy (kbuf, "\033[4~");
755	break;	722	break;
756	#ifdef XK_KP_End
757	case XK_KP_End:
758	/* allow shift to override */
759	if (kp)
760	{
761	strcpy (kbuf, "\033Oq");
762	break;
763	}
764	/* FALLTHROUGH */
765	#endif
766	case XK_End:	723	case XK_End:
767	strcpy (kbuf, KS_END);	724	strcpy (kbuf, KS_END);
768	break;	725	break;
769	#ifdef XK_KP_Home
770	case XK_KP_Home:
771	/* allow shift to override */
772	if (kp)
773	{
774	strcpy (kbuf, "\033Ow");
775	break;
776	}
777	/* FALLTHROUGH */
778	#endif
779	case XK_Home:	726	case XK_Home:
780	strcpy (kbuf, KS_HOME);	727	strcpy (kbuf, KS_HOME);
781	break;	728	break;
782		729
783	#define FKEY(n, fkey) \	730	#define FKEY(n, fkey) \
…		…
840	break;	787	break;
841	}	788	}
842		789
843	if (newlen)	790	if (newlen)
844	len = strlen (kbuf);	791	len = strlen (kbuf);
845	}
846		792
847	/*	793	/*
848	* Pass meta for all function keys, if 'meta' option set	794	* Pass meta for all function keys, if 'meta' option set
849	*/	795	*/
850	#ifdef META8_OPTION	796	#ifdef META8_OPTION
…		…
1034		980
1035	void	981	void
1036	rxvt_term::flush ()	982	rxvt_term::flush ()
1037	{	983	{
1038	flush_ev.stop ();	984	flush_ev.stop ();
1039		985
1040	#ifdef HAVE_BG_PIXMAP	986	#ifdef HAVE_BG_PIXMAP
1041	if (bgPixmap.check_clearChanged ())	987	if (bgPixmap.check_clearChanged ())
1042	{	988	{
1043	// scr_clear (true); This needs to be researched further!	989	// scr_clear (true); This needs to be researched further!
1044	scr_touch (false);	990	scr_touch (false);
1045	}	991	}
…		…
1093	}	1039	}
1094		1040
1095	display->flush ();	1041	display->flush ();
1096	}	1042	}
1097		1043
		1044	/* checks wether a refresh is requested and starts the refresh timer */
1098	void	1045	void
1099	rxvt_term::check_cb (check_watcher &w)	1046	rxvt_term::refresh_check ()
1100	{	1047	{
1101	make_current ();	1048	if (want_refresh && !flush_ev.is_active ())
		1049	flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1102		1050
1103	display->flush ();	1051	display->flush ();
1104
1105	if (want_refresh && !flush_ev.active)
1106	flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1107	}	1052	}
1108		1053
1109	void	1054	void
1110	rxvt_term::flush_cb (time_watcher &w)	1055	rxvt_term::flush_cb (ev::timer &w, int revents)
1111	{	1056	{
1112	make_current ();	1057	make_current ();
1113		1058
1114	refresh_count = 0;	1059	refresh_count = 0;
1115	flush ();	1060	flush ();
1116	}	1061	}
1117		1062
1118	#ifdef CURSOR_BLINK	1063	#ifdef CURSOR_BLINK
1119	void	1064	void
1120	rxvt_term::cursor_blink_cb (time_watcher &w)	1065	rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1121	{	1066	{
1122	hidden_cursor = !hidden_cursor;	1067	hidden_cursor = !hidden_cursor;
1123	want_refresh = 1;	1068	want_refresh = 1;
1124		1069	refresh_check ();
1125	w.start (w.at + CURSOR_BLINK_INTERVAL);
1126	}	1070	}
1127	#endif	1071	#endif
1128		1072
1129	#ifdef TEXT_BLINK	1073	#ifdef TEXT_BLINK
1130	void	1074	void
1131	rxvt_term::text_blink_cb (time_watcher &w)	1075	rxvt_term::text_blink_cb (ev::timer &w, int revents)
1132	{	1076	{
1133	if (scr_refresh_rend (RS_Blink, RS_Blink))	1077	if (scr_refresh_rend (RS_Blink, RS_Blink))
1134	{	1078	{
1135	hidden_text = !hidden_text;	1079	hidden_text = !hidden_text;
1136	want_refresh = 1;	1080	want_refresh = 1;
1137	w.start (w.at + TEXT_BLINK_INTERVAL);	1081	refresh_check ();
1138	}	1082	}
		1083	else
		1084	w.stop ();
1139	}	1085	}
1140	#endif	1086	#endif
1141		1087
1142	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	1088	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1143	void	1089	void
1144	rxvt_term::cont_scroll_cb (time_watcher &w)	1090	rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1145	{	1091	{
1146	if ((scrollbar_isUp() \|\| scrollbar_isDn()) &&	1092	if ((scrollBar.state == STATE_UP \|\| scrollBar.state == STATE_DOWN)
1147	scr_page (scrollbar_isUp() ? UP : DN, 1))	1093	&& scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1148	{	1094	{
1149	want_refresh = 1;	1095	want_refresh = 1;
1150	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1096	refresh_check ();
1151	}	1097	}
		1098	else
		1099	w.stop ();
1152	}	1100	}
1153	#endif	1101	#endif
1154		1102
1155	#ifdef SELECTION_SCROLLING	1103	#ifdef SELECTION_SCROLLING
1156	void	1104	void
1157	rxvt_term::sel_scroll_cb (time_watcher &w)	1105	rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1158	{	1106	{
1159	if (scr_page (scroll_selection_dir, scroll_selection_lines))	1107	if (scr_page (scroll_selection_dir, scroll_selection_lines))
1160	{	1108	{
1161	selection_extend (selection_save_x, selection_save_y, selection_save_state);	1109	selection_extend (selection_save_x, selection_save_y, selection_save_state);
1162	want_refresh = 1;	1110	want_refresh = 1;
1163	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1111	refresh_check ();
1164	}	1112	}
		1113	else
		1114	w.stop ();
1165	}	1115	}
1166	#endif	1116	#endif
1167		1117
1168	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	1118	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1169	void	1119	void
1170	rxvt_term::slip_wheel_cb (time_watcher &w)	1120	rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1171	{	1121	{
1172	if (mouse_slip_wheel_speed == 0	1122	if (scr_changeview (view_start - mouse_slip_wheel_speed))
1173	\|\| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1174	: scr_page (UP, mouse_slip_wheel_speed))
1175	{	1123	{
1176	if (view_start == top_row \|\| view_start == 0)
1177	mouse_slip_wheel_speed = 0;
1178
1179	want_refresh = 1;	1124	want_refresh = 1;
1180	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1125	refresh_check ();
		1126	}
		1127
		1128	if (view_start == top_row \|\| view_start == 0 \|\| mouse_slip_wheel_speed == 0)
		1129	{
		1130	mouse_slip_wheel_speed = 0;
		1131	w.stop ();
1181	}	1132	}
1182	}	1133	}
1183	#endif	1134	#endif
1184		1135
1185	#if LINUX_YIELD_HACK	1136	#if LINUX_YIELD_HACK
1186	static struct event_handler	1137	static struct event_handler
1187	{	1138	{
1188	check_watcher yield_ev;	1139	ev::prepare yield_ev;
1189		1140
1190	void yield_cb (check_watcher &w)	1141	void yield_cb (ev::prepare &w, int revents)
1191	{	1142	{
1192	// this should really be sched_yield(), but the linux guys thought	1143	// this should really be sched_yield(), but the linux guys thought
1193	// that giving a process calling sched_yield () less cpu time than	1144	// that giving a process calling sched_yield () less cpu time than
1194	// ones with high nice levels is a useful thing to do. It surely is is	1145	// ones with high nice levels is a useful thing to do. It surely is is
1195	// allowed by the sus... as is returning ENOSYS.	1146	// allowed by the sus... as is returning ENOSYS.
…		…
1246		1197
1247	return false;	1198	return false;
1248	}	1199	}
1249		1200
1250	void	1201	void
1251	rxvt_term::pty_cb (io_watcher &w, short revents)	1202	rxvt_term::pty_cb (ev::io &w, int revents)
1252	{	1203	{
1253	make_current ();	1204	make_current ();
1254		1205
1255	if (revents & EVENT_READ)	1206	if (revents & ev::READ)
1256	// loop, but don't allow a single term to monopolize us	1207	// loop, but don't allow a single term to monopolize us
1257	while (pty_fill ())	1208	while (pty_fill ())
1258	if (cmd_parse ())	1209	if (cmd_parse ())
1259	break;	1210	break;
1260		1211
1261	if (revents & EVENT_WRITE)	1212	if (revents & ev::WRITE)
1262	pty_write ();	1213	pty_write ();
		1214
		1215	refresh_check ();
1263	}	1216	}
1264		1217
1265	void	1218	void
1266	rxvt_term::pointer_unblank ()	1219	rxvt_term::pointer_unblank ()
1267	{	1220	{
…		…
1270		1223
1271	#ifdef POINTER_BLANK	1224	#ifdef POINTER_BLANK
1272	hidden_pointer = 0;	1225	hidden_pointer = 0;
1273		1226
1274	if (option (Opt_pointerBlank))	1227	if (option (Opt_pointerBlank))
1275	pointer_ev.start (NOW + pointerBlankDelay);	1228	pointer_ev.start (pointerBlankDelay);
1276	#endif	1229	#endif
1277	}	1230	}
1278		1231
1279	#ifdef POINTER_BLANK	1232	#ifdef POINTER_BLANK
1280	void	1233	void
…		…
1288		1241
1289	hidden_pointer = 1;	1242	hidden_pointer = 1;
1290	}	1243	}
1291		1244
1292	void	1245	void
1293	rxvt_term::pointer_cb (time_watcher &w)	1246	rxvt_term::pointer_cb (ev::timer &w, int revents)
1294	{	1247	{
1295	make_current ();	1248	make_current ();
1296		1249
1297	pointer_blank ();	1250	pointer_blank ();
1298	}	1251	}
…		…
1301	void	1254	void
1302	rxvt_term::mouse_report (XButtonEvent &ev)	1255	rxvt_term::mouse_report (XButtonEvent &ev)
1303	{	1256	{
1304	int button_number, key_state = 0;	1257	int button_number, key_state = 0;
1305	int x, y;	1258	int x, y;
		1259	int code = 32;
1306		1260
1307	x = Pixel2Col (ev.x);	1261	x = Pixel2Col (ev.x);
1308	y = Pixel2Row (ev.y);	1262	y = Pixel2Row (ev.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	}
1309		1271
1310	if (MEvent.button == AnyButton)	1272	if (MEvent.button == AnyButton)
1311	button_number = 3;	1273	button_number = 3;
1312	else	1274	else
1313	{	1275	{
…		…
1359	x + 1,	1321	x + 1,
1360	y + 1);	1322	y + 1);
1361	#endif	1323	#endif
1362		1324
1363	tt_printf ("\033[M%c%c%c",	1325	tt_printf ("\033[M%c%c%c",
1364	(32 + button_number + key_state),	1326	(code + button_number + key_state),
1365	(32 + x + 1),	1327	(32 + x + 1),
1366	(32 + y + 1));	1328	(32 + y + 1));
1367	}	1329	}
1368		1330
1369	/{{{ process an X event /	1331	/{{{ process an X event /
…		…
1473	&& ev.xfocus.mode != NotifyGrab)	1435	&& ev.xfocus.mode != NotifyGrab)
1474	focus_out ();	1436	focus_out ();
1475	break;	1437	break;
1476		1438
1477	case ConfigureNotify:	1439	case ConfigureNotify:
1478	/* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",	1440	/*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1479	ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,	1441	ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1480	szHint.width, szHint.height); */	1442	szHint.width, szHint.height);*/
1481	if (ev.xconfigure.window == parent[0])	1443	if (ev.xconfigure.window == parent[0])
1482	{	1444	{
1483	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))	1445	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1484	;	1446	;
1485		1447
…		…
1490	}	1452	}
1491	else	1453	else
1492	{	1454	{
1493	#ifdef HAVE_BG_PIXMAP	1455	#ifdef HAVE_BG_PIXMAP
1494	if (bgPixmap.window_position_sensitive ())	1456	if (bgPixmap.window_position_sensitive ())
		1457	{
		1458	if (mapped)
1495	update_background ();	1459	update_background ();
		1460	else
		1461	bgPixmap.invalidate ();
		1462	}
1496	#endif	1463	#endif
1497	}	1464	}
		1465
1498	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));	1466	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1499	}	1467	}
1500	break;	1468	break;
1501		1469
1502	case PropertyNotify:	1470	case PropertyNotify:
…		…
1519	case SelectionRequest:	1487	case SelectionRequest:
1520	selection_send (ev.xselectionrequest);	1488	selection_send (ev.xselectionrequest);
1521	break;	1489	break;
1522		1490
1523	case MapNotify:	1491	case MapNotify:
		1492	#ifdef HAVE_BG_PIXMAP
		1493	/* This is needed spcifically to fix the case of no window manager or a
		1494	* non-reparenting window manager. In those cases we never get first
		1495	* ConfigureNotify. Also that speeds startup under normal WM, by taking
		1496	* care of multiplicity of ConfigureNotify events arriwing while WM does
		1497	* reparenting.
		1498	* We should not render background immidiately, as there could be several
		1499	* ConfigureNotify's to follow. Lets take care of all of them in one scoop
		1500	* by scheduling background redraw as soon as we can, but giving a short
		1501	* bit of time for ConfigureNotifies to arrive.
		1502	* We should render background PRIOR to drawing any text, but AFTER all
		1503	* of ConfigureNotifys for the best results.
		1504	*/
		1505	if (bgPixmap.flags & bgPixmap_t::isInvalid)
		1506	update_background_ev.start (0.025);
		1507	#endif
1524	mapped = 1;	1508	mapped = 1;
1525	#ifdef TEXT_BLINK	1509	#ifdef TEXT_BLINK
1526	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);	1510	text_blink_ev.start ();
1527	#endif	1511	#endif
1528	HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));	1512	HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1529	break;	1513	break;
1530		1514
1531	case UnmapNotify:	1515	case UnmapNotify:
…		…
1552	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))	1536	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1553	{	1537	{
1554	scr_expose (ev.xexpose.x, ev.xexpose.y,	1538	scr_expose (ev.xexpose.x, ev.xexpose.y,
1555	ev.xexpose.width, ev.xexpose.height, False);	1539	ev.xexpose.width, ev.xexpose.height, False);
1556	}	1540	}
		1541
1557	want_refresh = 1;	1542	want_refresh = 1;
1558	}	1543	}
1559	else	1544	else
1560	{	1545	{
1561	XEvent unused_event;	1546	XEvent unused_event;
…		…
1563	while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))	1548	while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1564	;	1549	;
1565	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))	1550	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1566	;	1551	;
1567		1552
1568	if (isScrollbarWindow (ev.xany.window))	1553	if (scrollBar.state && ev.xany.window == scrollBar.win)
1569	{	1554	{
1570	scrollBar.setIdle ();	1555	scrollBar.state = STATE_IDLE;
1571	scrollbar_show (0);	1556	scrollbar_show (0);
1572	}	1557	}
1573	}	1558	}
1574	break;	1559	break;
1575		1560
1576	case MotionNotify:	1561	case MotionNotify:
1577	#ifdef POINTER_BLANK	1562	#ifdef POINTER_BLANK
1578	if (hidden_pointer)	1563	if (hidden_pointer)
1579	pointer_unblank ();	1564	pointer_unblank ();
1580	#endif	1565	#endif
		1566	if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask\|Button2Mask\|Button3Mask))
		1567	\|\| priv_modes & PrivMode_MouseAnyEvent)
		1568	mouse_report (ev.xbutton);
1581	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)	1569	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1582	break;	1570	break;
1583		1571
1584	if (ev.xany.window == vt)	1572	if (ev.xany.window == vt)
1585	{	1573	{
…		…
1619	int dist;	1607	int dist;
1620		1608
1621	/* don't clobber the current delay if we are	1609	/* don't clobber the current delay if we are
1622	* already in the middle of scrolling.	1610	* already in the middle of scrolling.
1623	*/	1611	*/
1624	if (!sel_scroll_ev.active)	1612	if (!sel_scroll_ev.is_active ())
1625	sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);	1613	sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1626		1614
1627	/* save the event params so we can highlight	1615	/* save the event params so we can highlight
1628	* the selection in the pending-scroll loop	1616	* the selection in the pending-scroll loop
1629	*/	1617	*/
1630	selection_save_x = ev.xbutton.x;	1618	selection_save_x = ev.xbutton.x;
…		…
1652	else	1640	else
1653	{	1641	{
1654	/* we are within the text window, so we	1642	/* we are within the text window, so we
1655	* shouldn't be scrolling	1643	* shouldn't be scrolling
1656	*/	1644	*/
1657	if (sel_scroll_ev.active)
1658	sel_scroll_ev.stop();	1645	sel_scroll_ev.stop();
1659	}	1646	}
1660	#endif	1647	#endif
1661	#ifdef MOUSE_THRESHOLD	1648	#ifdef MOUSE_THRESHOLD
1662	}	1649	}
1663	#endif	1650	#endif
1664	}	1651	}
1665	}	1652	}
1666	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1653	else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1667	{	1654	{
1668	while (XCheckTypedWindowEvent (dpy, scrollBar.win,	1655	while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1669	MotionNotify, &ev))	1656	MotionNotify, &ev))
1670	;	1657	;
1671		1658
…		…
1689	{	1676	{
1690	hidden_cursor = 0;	1677	hidden_cursor = 0;
1691	want_refresh = 1;	1678	want_refresh = 1;
1692	}	1679	}
1693		1680
1694	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);	1681	cursor_blink_ev.again ();
1695	}	1682	}
1696	#endif	1683	#endif
1697		1684
1698	#if defined(POINTER_BLANK)	1685	#if defined(POINTER_BLANK)
1699	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)	1686	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
…		…
1706		1693
1707	if (ev.type == KeyPress && hidden_pointer == 0)	1694	if (ev.type == KeyPress && hidden_pointer == 0)
1708	pointer_blank ();	1695	pointer_blank ();
1709	}	1696	}
1710	#endif	1697	#endif
		1698
		1699	refresh_check ();
1711	}	1700	}
1712		1701
1713	void	1702	void
1714	rxvt_term::focus_in ()	1703	rxvt_term::focus_in ()
1715	{	1704	{
…		…
1727	XSetICFocus (Input_Context);	1716	XSetICFocus (Input_Context);
1728	}	1717	}
1729	#endif	1718	#endif
1730	#if CURSOR_BLINK	1719	#if CURSOR_BLINK
1731	if (option (Opt_cursorBlink))	1720	if (option (Opt_cursorBlink))
1732	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);	1721	cursor_blink_ev.again ();
1733	#endif	1722	#endif
1734	#if OFF_FOCUS_FADING	1723	#if OFF_FOCUS_FADING
1735	if (rs[Rs_fade])	1724	if (rs[Rs_fade])
1736	{	1725	{
1737	pix_colors = pix_colors_focused;	1726	pix_colors = pix_colors_focused;
…		…
1775	XUnsetICFocus (Input_Context);	1764	XUnsetICFocus (Input_Context);
1776	#endif	1765	#endif
1777	#if CURSOR_BLINK	1766	#if CURSOR_BLINK
1778	if (option (Opt_cursorBlink))	1767	if (option (Opt_cursorBlink))
1779	cursor_blink_ev.stop ();	1768	cursor_blink_ev.stop ();
		1769
1780	hidden_cursor = 0;	1770	hidden_cursor = 0;
1781	#endif	1771	#endif
1782	#if OFF_FOCUS_FADING	1772	#if OFF_FOCUS_FADING
1783	if (rs[Rs_fade])	1773	if (rs[Rs_fade])
1784	{	1774	{
…		…
1824	\|\| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])	1814	\|\| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1825	{	1815	{
1826	bgPixmap.set_root_pixmap ();	1816	bgPixmap.set_root_pixmap ();
1827	update_background ();	1817	update_background ();
1828	}	1818	}
		1819
1829	break;	1820	break;
1830	}	1821	}
1831	# endif	1822	# endif
		1823
		1824	refresh_check ();
1832	}	1825	}
1833	#endif	1826	#endif
1834		1827
1835	void	1828	void
1836	rxvt_term::button_press (XButtonEvent &ev)	1829	rxvt_term::button_press (XButtonEvent &ev)
…		…
1891	mouse_report (ev);	1884	mouse_report (ev);
1892	}	1885	}
1893	#else	1886	#else
1894	MEvent.button = ev.button;	1887	MEvent.button = ev.button;
1895	mouse_report (ev);	1888	mouse_report (ev);
1896	#endif /* MOUSE_REPORT_DOUBLECLICK */	1889	#endif /* MOUSE_REPORT_DOUBLECLICK */
1897		1890
1898	}	1891	}
1899	else	1892	else
1900	{	1893	{
1901	if (ev.button != MEvent.button)	1894	if (ev.button != MEvent.button)
…		…
1949	}	1942	}
1950		1943
1951	/*	1944	/*
1952	* Scrollbar window processing of button press	1945	* Scrollbar window processing of button press
1953	*/	1946	*/
1954	if (isScrollbarWindow (ev.window))	1947	if (scrollBar.state && ev.window == scrollBar.win)
1955	{	1948	{
1956	scrollBar.setIdle ();	1949	page_dirn direction = NO_DIR;
		1950
		1951	if (scrollBar.upButton (ev.y))
		1952	direction = UP; /* up */
		1953	else if (scrollBar.dnButton (ev.y))
		1954	direction = DN; /* down */
		1955
		1956	scrollBar.state = STATE_IDLE;
1957	/*	1957	/*
1958	* Rxvt-style scrollbar:	1958	* Rxvt-style scrollbar:
1959	* move up if mouse is above slider	1959	* move up if mouse is above slider
1960	* move dn if mouse is below slider	1960	* move dn if mouse is below slider
1961	*	1961	*
…		…
1970	/*	1970	/*
1971	* Mouse report disabled scrollbar:	1971	* Mouse report disabled scrollbar:
1972	* arrow buttons - send up/down	1972	* arrow buttons - send up/down
1973	* click on scrollbar - send pageup/down	1973	* click on scrollbar - send pageup/down
1974	*/	1974	*/
1975	if ((scrollBar.style == R_SB_NEXT	1975	if (direction == UP)
1976	&& scrollbarnext_upButton (ev.y))
1977	\|\| (scrollBar.style == R_SB_RXVT
1978	&& scrollbarrxvt_upButton (ev.y)))
1979	tt_printf ("\033[A");	1976	tt_printf ("\033[A");
1980	else if ((scrollBar.style == R_SB_NEXT	1977	else if (direction == DN)
1981	&& scrollbarnext_dnButton (ev.y))
1982	\|\| (scrollBar.style == R_SB_RXVT
1983	&& scrollbarrxvt_dnButton (ev.y)))
1984	tt_printf ("\033[B");	1978	tt_printf ("\033[B");
1985	else	1979	else
1986	switch (ev.button)	1980	switch (ev.button)
1987	{	1981	{
1988	case Button2:	1982	case Button2:
…		…
1995	tt_printf ("\033[5~");	1989	tt_printf ("\033[5~");
1996	break;	1990	break;
1997	}	1991	}
1998	}	1992	}
1999	else	1993	else
2000	#endif /* NO_SCROLLBAR_REPORT */	1994	#endif /* NO_SCROLLBAR_REPORT */
2001
2002	{
2003	char upordown = 0;
2004
2005	if (scrollBar.style == R_SB_NEXT)
2006	{	1995	{
2007	if (scrollbarnext_upButton (ev.y))	1996	if (direction != NO_DIR)
2008	upordown = -1; /* up */
2009	else if (scrollbarnext_dnButton (ev.y))
2010	upordown = 1; /* down */
2011	}
2012	else if (scrollBar.style == R_SB_RXVT)
2013	{
2014	if (scrollbarrxvt_upButton (ev.y))
2015	upordown = -1; /* up */
2016	else if (scrollbarrxvt_dnButton (ev.y))
2017	upordown = 1; /* down */
2018	}
2019	if (upordown)
2020	{	1997	{
2021	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	1998	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
		1999	if (!cont_scroll_ev.is_active ())
2022	cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);	2000	cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2023	#endif	2001	#endif
2024	if (scr_page (upordown < 0 ? UP : DN, 1))	2002	if (scr_page (direction, 1))
2025	{	2003	{
2026	if (upordown < 0)	2004	if (direction == UP)
2027	scrollBar.setUp ();	2005	scrollBar.state = STATE_UP;
2028	else	2006	else
2029	scrollBar.setDn ();	2007	scrollBar.state = STATE_DOWN;
2030	}	2008	}
2031	}	2009	}
2032	else	2010	else
2033	switch (ev.button)	2011	switch (ev.button)
2034	{	2012	{
2035	case Button2:	2013	case Button2:
2036	switch (scrollbar_align)	2014	switch (scrollBar.align)
2037	{	2015	{
2038	case R_SB_ALIGN_TOP:	2016	case R_SB_ALIGN_TOP:
2039	csrO = 0;	2017	csrO = 0;
2040	break;	2018	break;
2041	case R_SB_ALIGN_CENTRE:	2019	case R_SB_ALIGN_CENTRE:
…		…
2049	if (scrollBar.style == R_SB_XTERM	2027	if (scrollBar.style == R_SB_XTERM
2050	\|\| scrollbar_above_slider (ev.y)	2028	\|\| scrollbar_above_slider (ev.y)
2051	\|\| scrollbar_below_slider (ev.y))	2029	\|\| scrollbar_below_slider (ev.y))
2052	scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());	2030	scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
2053		2031
2054	scrollBar.setMotion ();	2032	scrollBar.state = STATE_MOTION;
2055	break;	2033	break;
2056		2034
2057	case Button1:	2035	case Button1:
2058	if (scrollbar_align == R_SB_ALIGN_CENTRE)	2036	if (scrollBar.align == R_SB_ALIGN_CENTRE)
2059	csrO = ev.y - scrollBar.top;	2037	csrO = ev.y - scrollBar.top;
2060	/* FALLTHROUGH */	2038	/* FALLTHROUGH */
2061		2039
2062	case Button3:	2040	case Button3:
2063	if (scrollBar.style != R_SB_XTERM)	2041	if (scrollBar.style != R_SB_XTERM)
…		…
2073	scr_page (DN, nrow - 1);	2051	scr_page (DN, nrow - 1);
2074	# else	2052	# else
2075	scr_page (DN, nrow / 4);	2053	scr_page (DN, nrow / 4);
2076	# endif	2054	# endif
2077	else	2055	else
2078	scrollBar.setMotion ();	2056	scrollBar.state = STATE_MOTION;
2079	}	2057	}
2080	else	2058	else
2081	{	2059	{
2082	scr_page ((ev.button == Button1 ? DN : UP),	2060	scr_page ((ev.button == Button1 ? DN : UP),
2083	(nrow	2061	(nrow
…		…
2100		2078
2101	csrO = 0; /* reset csr Offset */	2079	csrO = 0; /* reset csr Offset */
2102	if (!bypass_keystate)	2080	if (!bypass_keystate)
2103	reportmode = !! (priv_modes & PrivMode_mouse_report);	2081	reportmode = !! (priv_modes & PrivMode_mouse_report);
2104		2082
2105	if (scrollbar_isUpDn ())	2083	if (scrollBar.state == STATE_UP \|\| scrollBar.state == STATE_DOWN)
2106	{	2084	{
2107	scrollBar.setIdle ();	2085	scrollBar.state = STATE_IDLE;
2108	scrollbar_show (0);	2086	scrollbar_show (0);
2109	}	2087	}
2110		2088
2111	#ifdef SELECTION_SCROLLING	2089	#ifdef SELECTION_SCROLLING
2112	if (sel_scroll_ev.active)
2113	sel_scroll_ev.stop();	2090	sel_scroll_ev.stop();
2114	#endif	2091	#endif
2115		2092
2116	if (ev.window == vt)	2093	if (ev.window == vt)
2117	{	2094	{
2118	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))	2095	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
…		…
2142	mouse_report (ev);	2119	mouse_report (ev);
2143	}	2120	}
2144	#else /* MOUSE_REPORT_DOUBLECLICK */	2121	#else /* MOUSE_REPORT_DOUBLECLICK */
2145	MEvent.button = AnyButton;	2122	MEvent.button = AnyButton;
2146	mouse_report (ev);	2123	mouse_report (ev);
2147	#endif /* MOUSE_REPORT_DOUBLECLICK */	2124	#endif /* MOUSE_REPORT_DOUBLECLICK */
2148	return;	2125	return;
2149	}	2126	}
2150		2127
2151	/*	2128	/*
2152	* dumb hack to compensate for the failure of click-and-drag	2129	* dumb hack to compensate for the failure of click-and-drag
…		…
2190	{	2167	{
2191	mouse_slip_wheel_speed += v ? -1 : 1;	2168	mouse_slip_wheel_speed += v ? -1 : 1;
2192	if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;	2169	if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2193	if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;	2170	if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2194		2171
2195	if (slip_wheel_ev.at < NOW)	2172	if (!slip_wheel_ev.is_active ())
2196	slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;	2173	slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2197
2198	slip_wheel_ev.start ();
2199	}	2174	}
2200	else	2175	else
		2176	# endif
2201	{	2177	{
2202	# endif
2203	scr_page (v, i);	2178	scr_page (v, i);
2204	scrollbar_show (1);	2179	scrollbar_show (1);
2205	# ifdef MOUSE_SLIP_WHEELING
2206	}	2180	}
2207	# endif
2208	}	2181	}
2209	break;	2182	break;
2210	#endif	2183	#endif
2211	}	2184	}
2212	}	2185	}
…		…
2271		2244
2272	if (!option (Opt_jumpScroll) \|\| refresh_count >= nrow - 1)	2245	if (!option (Opt_jumpScroll) \|\| refresh_count >= nrow - 1)
2273	{	2246	{
2274	refresh_count = 0;	2247	refresh_count = 0;
2275		2248
2276	if (!option (Opt_skipScroll) \|\| io_manager::now () > NOW + 1. / 60.)	2249	if (!option (Opt_skipScroll) \|\| ev_time () > ev::now () + 1. / 60.)
2277	{	2250	{
2278	refreshnow = true;	2251	refreshnow = true;
2279	ch = NOCHAR;	2252	ch = NOCHAR;
2280	break;	2253	break;
2281	}	2254	}
…		…
2492	}	2465	}
2493	}	2466	}
2494		2467
2495	pclose_printer (fd);	2468	pclose_printer (fd);
2496	}	2469	}
2497	#endif /* PRINTPIPE */	2470	#endif /* PRINTPIPE */
2498	/}}} /	2471	/}}} /
2499		2472
2500	/* INDENT-OFF */	2473	/* INDENT-OFF */
2501	enum {	2474	enum {
2502	C1_40 = 0x40,	2475	C1_40 = 0x40,
…		…
2795	nargs = 0;	2768	nargs = 0;
2796		2769
2797	priv = 0;	2770	priv = 0;
2798	ch = cmd_getc ();	2771	ch = cmd_getc ();
2799	if (ch >= '<' && ch <= '?')	2772	if (ch >= '<' && ch <= '?')
		2773	{
2800	{ /* '<' '=' '>' '?' */	2774	/* '<' '=' '>' '?' */
2801	priv = ch;	2775	priv = ch;
2802	ch = cmd_getc ();	2776	ch = cmd_getc ();
2803	}	2777	}
2804		2778
2805	/* read any numerical arguments */	2779	/* read any numerical arguments */
…		…
2848	{	2822	{
2849	// first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,	2823	// first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2850	// 'U' for rxvt-unicode != 7.[34] (where it was broken).	2824	// 'U' for rxvt-unicode != 7.[34] (where it was broken).
2851	//	2825	//
2852	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt	2826	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2853	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify	2827	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2854	// that we do not support xterm mouse reporting (should be 95 when we do).	2828	// versions.
2855	//	2829	//
2856	tt_printf ("\033[>%d;94;0c", 'U');	2830	tt_printf ("\033[>%d;95;0c", 'U');
2857	}	2831	}
2858	break;	2832	break;
		2833
2859	case '?':	2834	case '?':
2860	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')	2835	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')
2861	process_terminal_mode (ch, priv, nargs, arg);	2836	process_terminal_mode (ch, priv, nargs, arg);
2862	break;	2837	break;
2863	}	2838	}
…		…
3379	*buf++ = '\0';	3354	*buf++ = '\0';
3380		3355
3381	process_color_seq (op, color, name, resp);	3356	process_color_seq (op, color, name, resp);
3382	}	3357	}
3383	break;	3358	break;
		3359	case Rxvt_restoreFG:
3384	case XTerm_Color00:	3360	case XTerm_Color00:
3385	process_color_seq (op, Color_fg, str, resp);	3361	process_color_seq (op, Color_fg, str, resp);
3386	break;	3362	break;
		3363	case Rxvt_restoreBG:
3387	case XTerm_Color01:	3364	case XTerm_Color01:
3388	process_color_seq (op, Color_bg, str, resp);	3365	process_color_seq (op, Color_bg, str, resp);
3389	break;	3366	break;
3390	#ifndef NO_CURSORCOLOR	3367	#ifndef NO_CURSORCOLOR
3391	case XTerm_Color_cursor:	3368	case XTerm_Color_cursor:
…		…
3417	#if ENABLE_TRANSPARENCY	3394	#if ENABLE_TRANSPARENCY
3418	case URxvt_Color_tint:	3395	case URxvt_Color_tint:
3419	process_color_seq (op, Color_tint, str, resp);	3396	process_color_seq (op, Color_tint, str, resp);
3420	{	3397	{
3421	bool changed = false;	3398	bool changed = false;
		3399
3422	if (ISSET_PIXCOLOR (Color_tint))	3400	if (ISSET_PIXCOLOR (Color_tint))
3423	changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);	3401	changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3424	else	3402	else
3425	changed = bgPixmap.unset_tint ();	3403	changed = bgPixmap.unset_tint ();
		3404
3426	if (changed)	3405	if (changed)
3427	update_background ();	3406	update_background ();
3428	}	3407	}
3429		3408
3430	break;	3409	break;
…		…
3453	changed++;	3432	changed++;
3454	str = strchr (str, ';');	3433	str = strchr (str, ';');
3455	if (str == NULL)	3434	if (str == NULL)
3456	bgPixmap.set_defaultGeometry ();	3435	bgPixmap.set_defaultGeometry ();
3457	}	3436	}
		3437
3458	while (str)	3438	while (str)
3459	{	3439	{
3460	str++;	3440	str++;
3461	if (bgPixmap.set_geometry (str))	3441	if (bgPixmap.set_geometry (str))
3462	changed++;	3442	changed++;
3463	str = strchr (str, ';');	3443	str = strchr (str, ';');
3464	}	3444	}
		3445
3465	if (changed)	3446	if (changed)
3466	update_background ();	3447	update_background ();
3467	}	3448	}
3468	break;	3449	break;
3469	#endif	3450	#endif
3470
3471	case Rxvt_restoreFG:
3472	set_window_color (Color_fg, str);
3473	break;
3474	case Rxvt_restoreBG:
3475	set_window_color (Color_bg, str);
3476	break;
3477		3451
3478	case XTerm_logfile:	3452	case XTerm_logfile:
3479	// TODO, when secure mode?	3453	// TODO, when secure mode?
3480	break;	3454	break;
3481		3455
…		…
3625	{ 66, PrivMode_aplKP },	3599	{ 66, PrivMode_aplKP },
3626	#ifndef NO_BACKSPACE_KEY	3600	#ifndef NO_BACKSPACE_KEY
3627	{ 67, PrivMode_BackSpace },	3601	{ 67, PrivMode_BackSpace },
3628	#endif	3602	#endif
3629	{ 1000, PrivMode_MouseX11 },	3603	{ 1000, PrivMode_MouseX11 },
3630	// 1001 Use Hilite Mouse Tracking. NYI, TODO	3604	{ 1002, PrivMode_MouseBtnEvent },
3631	// 1002 Use Cell Motion Mouse Tracking. NYI, TODO	3605	{ 1003, PrivMode_MouseAnyEvent },
3632	// 1003 Use All Motion Mouse Tracking. NYI, TODO
3633	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension	3606	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension
3634	{ 1011, PrivMode_Keypress }, // rxvt extension	3607	{ 1011, PrivMode_Keypress }, // rxvt extension
3635	// 1035 enable modifiers for alt, numlock NYI	3608	// 1035 enable modifiers for alt, numlock NYI
3636	// 1036 send ESC for meta keys NYI	3609	// 1036 send ESC for meta keys NYI
3637	// 1037 send DEL for keypad delete NYI	3610	// 1037 send DEL for keypad delete NYI
3638	{ 1047, PrivMode_Screen },	3611	{ 1047, PrivMode_Screen },
3639	// 1048 save and restore cursor	3612	// 1048 save and restore cursor
3640	{ 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */	3613	{ 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3641	// 1051, 1052, 1060, 1061 keyboard emulation NYI	3614	// 1051, 1052, 1060, 1061 keyboard emulation NYI
		3615	{ 2004, PrivMode_BracketPaste },
3642	};	3616	};
3643		3617
3644	if (nargs == 0)	3618	if (nargs == 0)
3645	return;	3619	return;
3646		3620
…		…
3694	*/	3668	*/
3695	PrivMode (1, PrivMode_vt52);	3669	PrivMode (1, PrivMode_vt52);
3696	break;	3670	break;
3697	case 3: /* 80/132 */	3671	case 3: /* 80/132 */
3698	if (priv_modes & PrivMode_132OK)	3672	if (priv_modes & PrivMode_132OK)
		3673	{
		3674	scr_poweron ();
3699	set_widthheight (((state ? 132 : 80) * fwidth), height);	3675	set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);
		3676	}
3700	break;	3677	break;
3701	case 4: /* smooth scrolling */	3678	case 4: /* smooth scrolling */
3702	set_option (Opt_jumpScroll, !state);	3679	set_option (Opt_jumpScroll, !state);
3703	break;	3680	break;
3704	case 5: /* reverse video */	3681	case 5: /* reverse video */
…		…
3711	scr_autowrap (state);	3688	scr_autowrap (state);
3712	break;	3689	break;
3713	/* case 8: - auto repeat, can't do on a per window basis */	3690	/* case 8: - auto repeat, can't do on a per window basis */
3714	case 9: /* X10 mouse reporting */	3691	case 9: /* X10 mouse reporting */
3715	if (state) /* orthogonal */	3692	if (state) /* orthogonal */
3716	priv_modes &= ~PrivMode_MouseX11;	3693	priv_modes &= ~(PrivMode_MouseX11\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);
3717	break;	3694	break;
3718	#ifdef scrollBar_esc	3695	#ifdef scrollBar_esc
3719	case scrollBar_esc:	3696	case scrollBar_esc:
3720	if (scrollbar_mapping (state))	3697	if (scrollbar_mapping (state))
3721	{	3698	{
…		…
3734	break;	3711	break;
3735	/* case 66: - application key pad */	3712	/* case 66: - application key pad */
3736	/* case 67: - backspace key */	3713	/* case 67: - backspace key */
3737	case 1000: /* X11 mouse reporting */	3714	case 1000: /* X11 mouse reporting */
3738	if (state) /* orthogonal */	3715	if (state) /* orthogonal */
3739	priv_modes &= ~PrivMode_MouseX10;	3716	priv_modes &= ~(PrivMode_MouseX10\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);
3740	break;	3717	break;
3741	#if 0
3742	case 1001:	3718	case 1002:
3743	break; /* X11 mouse highlighting */	3719	case 1003:
3744	#endif	3720	if (state)
		3721	{
		3722	priv_modes &= ~(PrivMode_MouseX10\|PrivMode_MouseX11);
		3723	priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
		3724	vt_emask_mouse = PointerMotionMask;
		3725	}
		3726	else
		3727	vt_emask_mouse = NoEventMask;
		3728	vt_select_input ();
		3729	break;
3745	case 1010: /* scroll to bottom on TTY output inhibit */	3730	case 1010: /* scroll to bottom on TTY output inhibit */
3746	set_option (Opt_scrollTtyOutput, !state);	3731	set_option (Opt_scrollTtyOutput, !state);
3747	break;	3732	break;
3748	case 1011: /* scroll to bottom on key press */	3733	case 1011: /* scroll to bottom on key press */
3749	set_option (Opt_scrollTtyKeypress, state);	3734	set_option (Opt_scrollTtyKeypress, state);
…		…
3926	rxvt_term::process_graphics ()	3911	rxvt_term::process_graphics ()
3927	{	3912	{
3928	unicode_t ch, cmd = cmd_getc ();	3913	unicode_t ch, cmd = cmd_getc ();
3929		3914
3930	if (cmd == 'Q')	3915	if (cmd == 'Q')
		3916	{
3931	{ /* query graphics */	3917	/* query graphics */
3932	tt_printf ("\033G0\012"); /* no graphics */	3918	tt_printf ("\033G0\012"); /* no graphics */
3933	return;	3919	return;
3934	}	3920	}
3935	/* swallow other graphics sequences until terminating ':' */	3921	/* swallow other graphics sequences until terminating ':' */
3936	do	3922	do
…		…
3986	v_buffer = (char *)realloc (v_buffer, v_buflen + len);	3972	v_buffer = (char *)realloc (v_buffer, v_buflen + len);
3987		3973
3988	memcpy (v_buffer + v_buflen, data, len);	3974	memcpy (v_buffer + v_buflen, data, len);
3989	v_buflen += len;	3975	v_buflen += len;
3990		3976
3991	pty_ev.set (EVENT_READ \| EVENT_WRITE);	3977	pty_ev.set (ev::READ \| ev::WRITE);
3992	}	3978	}
3993		3979
3994	void rxvt_term::pty_write ()	3980	void rxvt_term::pty_write ()
3995	{	3981	{
3996	int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));	3982	int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
…		…
4002	if (v_buflen == 0)	3988	if (v_buflen == 0)
4003	{	3989	{
4004	free (v_buffer);	3990	free (v_buffer);
4005	v_buffer = 0;	3991	v_buffer = 0;
4006		3992
4007	pty_ev.set (EVENT_READ);	3993	pty_ev.set (ev::READ);
4008	return;	3994	return;
4009	}	3995	}
4010		3996
4011	memmove (v_buffer, v_buffer + written, v_buflen);	3997	memmove (v_buffer, v_buffer + written, v_buflen);
4012	}	3998	}
4013	else if (written != -1 \|\| (errno != EAGAIN && errno != EINTR))	3999	else if (written != -1 \|\| (errno != EAGAIN && errno != EINTR))
4014	pty_ev.set (EVENT_READ);	4000	pty_ev.set (ev::READ);
4015	}	4001	}
4016		4002
4017	/----------------------- end-of-file (C source) -----------------------/	4003	/----------------------- end-of-file (C source) -----------------------/
4018		4004

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.359 by ayin, Mon Oct 15 14:56:06 2007 UTC vs. Revision 1.406 by ayin, Thu Feb 14 23:53:05 2008 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.359 by ayin, Mon Oct 15 14:56:06 2007 UTC vs.
Revision 1.406 by ayin, Thu Feb 14 23:53:05 2008 UTC