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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.347 by sasha, Wed Aug 15 22:41:52 2007 UTC vs.
Revision 1.394 by ayin, Sat Jan 19 15:00:49 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
…		…
547	#endif	548	#endif
548		549
549	if (keysym >= 0xFF00 && keysym <= 0xFFFF)	550	if (keysym >= 0xFF00 && keysym <= 0xFFFF)
550	{	551	{
551	{	552	{
		553	bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
552	newlen = 1;	554	newlen = 1;
		555	#ifdef XK_KP_Home
		556	static const KeySym keypadtrans[] = {
		557	XK_KP_7, // XK_KP_Home
		558	XK_KP_4, // XK_KP_Left
		559	XK_KP_8, // XK_KP_Up
		560	XK_KP_6, // XK_KP_Right
		561	XK_KP_2, // XK_KP_Down
		562	#ifndef UNSHIFTED_SCROLLKEYS
		563	XK_KP_9, // XK_KP_Prior
		564	XK_KP_3, // XK_KP_Next
		565	#else
		566	XK_Prior,
		567	XK_Next,
		568	#endif
		569	XK_KP_1, // XK_KP_End
		570	XK_KP_5, // XK_KP_Begin
		571	};
		572
		573	if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
		574	{
		575	unsigned int index = keysym - XK_KP_Home;
		576	keysym = kp ? keypadtrans[index] : XK_Home + index;
		577	}
		578	else if (keysym == XK_KP_Insert)
		579	keysym = kp ? XK_KP_0 : XK_Insert;
		580	#ifndef NO_DELETE_KEY
		581	else if (keysym == XK_KP_Delete)
		582	keysym = kp ? XK_KP_Decimal : XK_Delete;
		583	#endif
		584	#endif
553	switch (keysym)	585	switch (keysym)
554	{	586	{
555	#ifndef NO_BACKSPACE_KEY	587	#ifndef NO_BACKSPACE_KEY
556	case XK_BackSpace:	588	case XK_BackSpace:
557	if (priv_modes & PrivMode_HaveBackSpace)	589	if (priv_modes & PrivMode_HaveBackSpace)
…		…
559	kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)	591	kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
560	^ !!ctrl) ? '\b' : '\177';	592	^ !!ctrl) ? '\b' : '\177';
561	kbuf[1] = '\0';	593	kbuf[1] = '\0';
562	}	594	}
563	else	595	else
564	strcpy (kbuf, key_backspace);	596	strcpy (kbuf, rs[Rs_backspace_key]);
565	break;	597	break;
566	#endif	598	#endif
567	#ifndef NO_DELETE_KEY	599	#ifndef NO_DELETE_KEY
568	# ifdef XK_KP_Prior
569	case XK_KP_Delete:
570	/* allow shift to override */
571	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
572	{
573	strcpy (kbuf, "\033On");
574	break;
575	}
576	/* FALLTHROUGH */
577	# endif
578	case XK_Delete:	600	case XK_Delete:
579	strcpy (kbuf, key_delete);	601	strcpy (kbuf, rs[Rs_delete_key]);
580	break;	602	break;
581	#endif	603	#endif
582	case XK_Tab:	604	case XK_Tab:
583	if (shft)	605	if (shft)
584	strcpy (kbuf, "\033[Z");	606	strcpy (kbuf, "\033[Z");
…		…
594	#endif	616	#endif
595	newlen = 0;	617	newlen = 0;
596	}	618	}
597	break;	619	break;
598		620
599	#ifdef XK_KP_Left
600	case XK_KP_Up: /* \033Ox or standard */
601	case XK_KP_Down: /* \033Or or standard */
602	case XK_KP_Right: /* \033Ov or standard */
603	case XK_KP_Left: /* \033Ot or standard */
604	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
605	{
606	strcpy (kbuf, "\033OZ");
607	kbuf[2] = "txvr"[keysym - XK_KP_Left];
608	break;
609	}
610	else
611	/* translate to std. cursor key */
612	keysym = XK_Left + (keysym - XK_KP_Left);
613	/* FALLTHROUGH */
614	#endif
615	case XK_Up: /* "\033[A" */	621	case XK_Up: /* "\033[A" */
616	case XK_Down: /* "\033[B" */	622	case XK_Down: /* "\033[B" */
617	case XK_Right: /* "\033[C" */	623	case XK_Right: /* "\033[C" */
618	case XK_Left: /* "\033[D" */	624	case XK_Left: /* "\033[D" */
619	strcpy (kbuf, "\033[Z");	625	strcpy (kbuf, "\033[Z");
…		…
629	else if (priv_modes & PrivMode_aplCUR)	635	else if (priv_modes & PrivMode_aplCUR)
630	kbuf[1] = 'O';	636	kbuf[1] = 'O';
631	break;	637	break;
632		638
633	#ifndef UNSHIFTED_SCROLLKEYS	639	#ifndef UNSHIFTED_SCROLLKEYS
634	# ifdef XK_KP_Prior
635	case XK_KP_Prior:
636	/* allow shift to override */
637	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
638	{
639	strcpy (kbuf, "\033Oy");
640	break;
641	}
642	/* FALLTHROUGH */
643	# endif
644	case XK_Prior:	640	case XK_Prior:
645	strcpy (kbuf, "\033[5~");	641	strcpy (kbuf, "\033[5~");
646	break;	642	break;
647	# ifdef XK_KP_Next
648	case XK_KP_Next:
649	/* allow shift to override */
650	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
651	{
652	strcpy (kbuf, "\033Os");
653	break;
654	}
655	/* FALLTHROUGH */
656	# endif
657	case XK_Next:	643	case XK_Next:
658	strcpy (kbuf, "\033[6~");	644	strcpy (kbuf, "\033[6~");
659	break;	645	break;
660	#endif	646	#endif
661	case XK_KP_Enter:	647	case XK_KP_Enter:
662	/* allow shift to override */	648	/* allow shift to override */
663	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)	649	if (kp)
664	{	650	{
665	strcpy (kbuf, "\033OM");	651	strcpy (kbuf, "\033OM");
666	break;	652	break;
667	}	653	}
668		654
…		…
680	kbuf[0] = '\015';	666	kbuf[0] = '\015';
681	kbuf[1] = '\0';	667	kbuf[1] = '\0';
682	}	668	}
683	break;	669	break;
684		670
685	#ifdef XK_KP_Begin
686	case XK_KP_Begin:
687	strcpy (kbuf, "\033Ou");
688	break;
689
690	#endif
691	case XK_KP_F1: /* "\033OP" */	671	case XK_KP_F1: /* "\033OP" */
692	case XK_KP_F2: /* "\033OQ" */	672	case XK_KP_F2: /* "\033OQ" */
693	case XK_KP_F3: /* "\033OR" */	673	case XK_KP_F3: /* "\033OR" */
694	case XK_KP_F4: /* "\033OS" */	674	case XK_KP_F4: /* "\033OS" */
695	strcpy (kbuf, "\033OP");	675	strcpy (kbuf, "\033OP");
…		…
711	case XK_KP_6: /* "\033Ov" : "6" */	691	case XK_KP_6: /* "\033Ov" : "6" */
712	case XK_KP_7: /* "\033Ow" : "7" */	692	case XK_KP_7: /* "\033Ow" : "7" */
713	case XK_KP_8: /* "\033Ox" : "8" */	693	case XK_KP_8: /* "\033Ox" : "8" */
714	case XK_KP_9: /* "\033Oy" : "9" */	694	case XK_KP_9: /* "\033Oy" : "9" */
715	/* allow shift to override */	695	/* allow shift to override */
716	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)	696	if (kp)
717	{	697	{
718	strcpy (kbuf, "\033Oj");	698	strcpy (kbuf, "\033Oj");
719	kbuf[2] += (keysym - XK_KP_Multiply);	699	kbuf[2] += (keysym - XK_KP_Multiply);
720	}	700	}
721	else	701	else
…		…
727		707
728	case XK_Find:	708	case XK_Find:
729	strcpy (kbuf, "\033[1~");	709	strcpy (kbuf, "\033[1~");
730	break;	710	break;
731		711
732	#ifdef XK_KP_Insert
733	case XK_KP_Insert:
734	/* allow shift to override */
735	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
736	{
737	strcpy (kbuf, "\033Op");
738	break;
739	}
740	/* FALLTHROUGH */
741	#endif
742	case XK_Insert:	712	case XK_Insert:
743	strcpy (kbuf, "\033[2~");	713	strcpy (kbuf, "\033[2~");
744	break;	714	break;
745	#ifdef DXK_Remove /* support for DEC remove like key */	715	#ifdef DXK_Remove /* support for DEC remove like key */
746	case DXK_Remove:	716	case DXK_Remove:
…		…
750	strcpy (kbuf, "\033[3~");	720	strcpy (kbuf, "\033[3~");
751	break;	721	break;
752	case XK_Select:	722	case XK_Select:
753	strcpy (kbuf, "\033[4~");	723	strcpy (kbuf, "\033[4~");
754	break;	724	break;
755	#ifdef XK_KP_End
756	case XK_KP_End:
757	/* allow shift to override */
758	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
759	{
760	strcpy (kbuf, "\033Oq");
761	break;
762	}
763	/* FALLTHROUGH */
764	#endif
765	case XK_End:	725	case XK_End:
766	strcpy (kbuf, KS_END);	726	strcpy (kbuf, KS_END);
767	break;	727	break;
768	#ifdef XK_KP_Home
769	case XK_KP_Home:
770	/* allow shift to override */
771	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
772	{
773	strcpy (kbuf, "\033Ow");
774	break;
775	}
776	/* FALLTHROUGH */
777	#endif
778	case XK_Home:	728	case XK_Home:
779	strcpy (kbuf, KS_HOME);	729	strcpy (kbuf, KS_HOME);
780	break;	730	break;
781		731
782	#define FKEY(n, fkey) \	732	#define FKEY(n, fkey) \
…		…
1034	void	984	void
1035	rxvt_term::flush ()	985	rxvt_term::flush ()
1036	{	986	{
1037	flush_ev.stop ();	987	flush_ev.stop ();
1038		988
1039	#ifdef ENABLE_TRANSPARENCY	989	#ifdef HAVE_BG_PIXMAP
1040	if (want_full_refresh)	990	if (bgPixmap.check_clearChanged ())
1041	{	991	{
1042	want_full_refresh = 0;	992	// scr_clear (true); This needs to be researched further!
1043	scr_clear ();
1044	scr_touch (false);	993	scr_touch (false);
1045	}	994	}
1046	#endif	995	#endif
1047		996
1048	if (want_refresh)	997	if (want_refresh)
…		…
1093	}	1042	}
1094		1043
1095	display->flush ();	1044	display->flush ();
1096	}	1045	}
1097		1046
		1047	/* checks wether a refresh is requested and starts the refresh timer */
1098	void	1048	void
1099	rxvt_term::check_cb (check_watcher &w)	1049	rxvt_term::refresh_check ()
1100	{	1050	{
1101	make_current ();	1051	if (want_refresh && !flush_ev.is_active ())
		1052	flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1102		1053
1103	display->flush ();	1054	display->flush ();
1104
1105	if (want_refresh && !flush_ev.active)
1106	flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1107	}	1055	}
1108		1056
1109	void	1057	void
1110	rxvt_term::flush_cb (time_watcher &w)	1058	rxvt_term::flush_cb (ev::timer &w, int revents)
1111	{	1059	{
1112	make_current ();	1060	make_current ();
1113		1061
1114	refresh_count = 0;	1062	refresh_count = 0;
1115	flush ();	1063	flush ();
1116	}	1064	}
1117		1065
1118	#ifdef CURSOR_BLINK	1066	#ifdef CURSOR_BLINK
1119	void	1067	void
1120	rxvt_term::cursor_blink_cb (time_watcher &w)	1068	rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1121	{	1069	{
1122	hidden_cursor = !hidden_cursor;	1070	hidden_cursor = !hidden_cursor;
1123	want_refresh = 1;	1071	want_refresh = 1;
1124		1072	refresh_check ();
1125	w.start (w.at + CURSOR_BLINK_INTERVAL);
1126	}	1073	}
1127	#endif	1074	#endif
1128		1075
1129	#ifdef TEXT_BLINK	1076	#ifdef TEXT_BLINK
1130	void	1077	void
1131	rxvt_term::text_blink_cb (time_watcher &w)	1078	rxvt_term::text_blink_cb (ev::timer &w, int revents)
1132	{	1079	{
1133	if (scr_refresh_rend (RS_Blink, RS_Blink))	1080	if (scr_refresh_rend (RS_Blink, RS_Blink))
1134	{	1081	{
1135	hidden_text = !hidden_text;	1082	hidden_text = !hidden_text;
1136	want_refresh = 1;	1083	want_refresh = 1;
1137	w.start (w.at + TEXT_BLINK_INTERVAL);	1084	refresh_check ();
1138	}	1085	}
		1086	else
		1087	w.stop ();
1139	}	1088	}
1140	#endif	1089	#endif
1141		1090
1142	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	1091	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1143	void	1092	void
1144	rxvt_term::cont_scroll_cb (time_watcher &w)	1093	rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1145	{	1094	{
1146	if ((scrollbar_isUp() \|\| scrollbar_isDn()) &&	1095	if ((scrollbar_isUp () \|\| scrollbar_isDn ())
1147	scr_page (scrollbar_isUp() ? UP : DN, 1))	1096	&& scr_page (scrollbar_isUp () ? UP : DN, 1))
1148	{	1097	{
1149	want_refresh = 1;	1098	want_refresh = 1;
1150	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1099	refresh_check ();
1151	}	1100	}
		1101	else
		1102	w.stop ();
1152	}	1103	}
1153	#endif	1104	#endif
1154		1105
1155	#ifdef SELECTION_SCROLLING	1106	#ifdef SELECTION_SCROLLING
1156	void	1107	void
1157	rxvt_term::sel_scroll_cb (time_watcher &w)	1108	rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1158	{	1109	{
1159	if (scr_page (scroll_selection_dir, scroll_selection_lines))	1110	if (scr_page (scroll_selection_dir, scroll_selection_lines))
1160	{	1111	{
1161	selection_extend (selection_save_x, selection_save_y, selection_save_state);	1112	selection_extend (selection_save_x, selection_save_y, selection_save_state);
1162	want_refresh = 1;	1113	want_refresh = 1;
1163	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1114	refresh_check ();
1164	}	1115	}
		1116	else
		1117	w.stop ();
1165	}	1118	}
1166	#endif	1119	#endif
1167		1120
1168	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	1121	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1169	void	1122	void
1170	rxvt_term::slip_wheel_cb (time_watcher &w)	1123	rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1171	{	1124	{
1172	if (mouse_slip_wheel_speed == 0	1125	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	{	1126	{
1176	if (view_start == top_row \|\| view_start == 0)
1177	mouse_slip_wheel_speed = 0;
1178
1179	want_refresh = 1;	1127	want_refresh = 1;
1180	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1128	refresh_check ();
		1129	}
		1130
		1131	if (view_start == top_row \|\| view_start == 0 \|\| mouse_slip_wheel_speed == 0)
		1132	{
		1133	mouse_slip_wheel_speed = 0;
		1134	w.stop ();
1181	}	1135	}
1182	}	1136	}
1183	#endif	1137	#endif
1184		1138
1185	#if LINUX_YIELD_HACK	1139	#if LINUX_YIELD_HACK
1186	static struct event_handler	1140	static struct event_handler
1187	{	1141	{
1188	check_watcher yield_ev;	1142	ev::prepare yield_ev;
1189		1143
1190	void yield_cb (check_watcher &w)	1144	void yield_cb (ev::prepare &w, int revents)
1191	{	1145	{
1192	// this should really be sched_yield(), but the linux guys thought	1146	// this should really be sched_yield(), but the linux guys thought
1193	// that giving a process calling sched_yield () less cpu time than	1147	// 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	1148	// ones with high nice levels is a useful thing to do. It surely is is
1195	// allowed by the sus... as is returning ENOSYS.	1149	// allowed by the sus... as is returning ENOSYS.
…		…
1246		1200
1247	return false;	1201	return false;
1248	}	1202	}
1249		1203
1250	void	1204	void
1251	rxvt_term::pty_cb (io_watcher &w, short revents)	1205	rxvt_term::pty_cb (ev::io &w, int revents)
1252	{	1206	{
1253	make_current ();	1207	make_current ();
1254		1208
1255	if (revents & EVENT_READ)	1209	if (revents & ev::READ)
1256	// loop, but don't allow a single term to monopolize us	1210	// loop, but don't allow a single term to monopolize us
1257	while (pty_fill ())	1211	while (pty_fill ())
1258	if (cmd_parse ())	1212	if (cmd_parse ())
1259	break;	1213	break;
1260		1214
1261	if (revents & EVENT_WRITE)	1215	if (revents & ev::WRITE)
1262	pty_write ();	1216	pty_write ();
		1217
		1218	refresh_check ();
1263	}	1219	}
1264		1220
1265	void	1221	void
1266	rxvt_term::pointer_unblank ()	1222	rxvt_term::pointer_unblank ()
1267	{	1223	{
…		…
1270		1226
1271	#ifdef POINTER_BLANK	1227	#ifdef POINTER_BLANK
1272	hidden_pointer = 0;	1228	hidden_pointer = 0;
1273		1229
1274	if (option (Opt_pointerBlank))	1230	if (option (Opt_pointerBlank))
1275	pointer_ev.start (NOW + pointerBlankDelay);	1231	pointer_ev.start (pointerBlankDelay);
1276	#endif	1232	#endif
1277	}	1233	}
1278		1234
1279	#ifdef POINTER_BLANK	1235	#ifdef POINTER_BLANK
1280	void	1236	void
…		…
1288		1244
1289	hidden_pointer = 1;	1245	hidden_pointer = 1;
1290	}	1246	}
1291		1247
1292	void	1248	void
1293	rxvt_term::pointer_cb (time_watcher &w)	1249	rxvt_term::pointer_cb (ev::timer &w, int revents)
1294	{	1250	{
1295	make_current ();	1251	make_current ();
1296		1252
1297	pointer_blank ();	1253	pointer_blank ();
1298	}	1254	}
…		…
1301	void	1257	void
1302	rxvt_term::mouse_report (XButtonEvent &ev)	1258	rxvt_term::mouse_report (XButtonEvent &ev)
1303	{	1259	{
1304	int button_number, key_state = 0;	1260	int button_number, key_state = 0;
1305	int x, y;	1261	int x, y;
		1262	int code = 32;
1306		1263
1307	x = ev.x;	1264	x = Pixel2Col (ev.x);
1308	y = ev.y;	1265	y = Pixel2Row (ev.y);
1309	pixel_position (&x, &y);	1266	if (ev.type == MotionNotify)
		1267	{
		1268	if (x == mouse_row && y == mouse_col)
		1269	return;
		1270	mouse_row = x;
		1271	mouse_col = y;
		1272	code += 32;
		1273	}
1310		1274
1311	if (MEvent.button == AnyButton)	1275	if (MEvent.button == AnyButton)
1312	button_number = 3;	1276	button_number = 3;
1313	else	1277	else
1314	{	1278	{
…		…
1360	x + 1,	1324	x + 1,
1361	y + 1);	1325	y + 1);
1362	#endif	1326	#endif
1363		1327
1364	tt_printf ("\033[M%c%c%c",	1328	tt_printf ("\033[M%c%c%c",
1365	(32 + button_number + key_state),	1329	(code + button_number + key_state),
1366	(32 + x + 1),	1330	(32 + x + 1),
1367	(32 + y + 1));	1331	(32 + y + 1));
1368	}	1332	}
1369		1333
1370	/{{{ process an X event /	1334	/{{{ process an X event /
…		…
1474	&& ev.xfocus.mode != NotifyGrab)	1438	&& ev.xfocus.mode != NotifyGrab)
1475	focus_out ();	1439	focus_out ();
1476	break;	1440	break;
1477		1441
1478	case ConfigureNotify:	1442	case ConfigureNotify:
		1443	/*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
		1444	ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
		1445	szHint.width, szHint.height); */
1479	if (ev.xconfigure.window == parent[0])	1446	if (ev.xconfigure.window == parent[0])
1480	{	1447	{
1481	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))	1448	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1482	;	1449	;
1483		1450
…		…
1486	seen_resize = 1;	1453	seen_resize = 1;
1487	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1454	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1488	}	1455	}
1489	else	1456	else
1490	{	1457	{
1491	#ifdef ENABLE_TRANSPARENCY	1458	#ifdef HAVE_BG_PIXMAP
1492	if (option (Opt_transparent))	1459	if (bgPixmap.window_position_sensitive ())
		1460	{
1493	if (bgPixmap.render ())	1461	if (mapped)
1494	scr_touch (false);	1462	update_background ();
		1463	else
		1464	bgPixmap.invalidate ();
		1465	}
1495	#endif	1466	#endif
1496	}	1467	}
		1468
1497	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));	1469	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1498	}	1470	}
1499	break;	1471	break;
1500		1472
1501	case PropertyNotify:	1473	case PropertyNotify:
…		…
1518	case SelectionRequest:	1490	case SelectionRequest:
1519	selection_send (ev.xselectionrequest);	1491	selection_send (ev.xselectionrequest);
1520	break;	1492	break;
1521		1493
1522	case MapNotify:	1494	case MapNotify:
		1495	#ifdef HAVE_BG_PIXMAP
		1496	/* This is needed spcifically to fix the case of no window manager or a
		1497	* non-reparenting window manager. In those cases we never get first
		1498	* ConfigureNotify. Also that speeds startup under normal WM, by taking
		1499	* care of multiplicity of ConfigureNotify events arriwing while WM does
		1500	* reparenting.
		1501	* We should not render background immidiately, as there could be several
		1502	* ConfigureNotify's to follow. Lets take care of all of them in one scoop
		1503	* by scheduling background redraw as soon as we can, but giving a short
		1504	* bit of time for ConfigureNotifies to arrive.
		1505	* We should render background PRIOR to drawing any text, but AFTER all
		1506	* of ConfigureNotifys for the best results.
		1507	*/
		1508	if (bgPixmap.flags & bgPixmap_t::isInvalid)
		1509	update_background_ev.start (0.025);
		1510	#endif
1523	mapped = 1;	1511	mapped = 1;
1524	#ifdef TEXT_BLINK	1512	#ifdef TEXT_BLINK
1525	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);	1513	text_blink_ev.start ();
1526	#endif	1514	#endif
1527	HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));	1515	HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1528	break;	1516	break;
1529		1517
1530	case UnmapNotify:	1518	case UnmapNotify:
…		…
1532	#ifdef TEXT_BLINK	1520	#ifdef TEXT_BLINK
1533	text_blink_ev.stop ();	1521	text_blink_ev.stop ();
1534	#endif	1522	#endif
1535	HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));	1523	HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1536	break;	1524	break;
1537
1538	#ifdef ENABLE_TRANSPARENCY
1539	case ReparentNotify:
1540	rootwin_cb (ev);
1541	break;
1542	#endif /* ENABLE_TRANSPARENCY */
1543		1525
1544	case GraphicsExpose:	1526	case GraphicsExpose:
1545	case Expose:	1527	case Expose:
1546	if (ev.xany.window == vt)	1528	if (ev.xany.window == vt)
1547	{	1529	{
1548	do	1530	do
		1531	{
1549	scr_expose (ev.xexpose.x, ev.xexpose.y,	1532	scr_expose (ev.xexpose.x, ev.xexpose.y,
1550	ev.xexpose.width, ev.xexpose.height, False);	1533	ev.xexpose.width, ev.xexpose.height, False);
		1534	}
1551	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));	1535	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1552		1536
1553	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1537	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1554		1538
1555	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))	1539	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
		1540	{
1556	scr_expose (ev.xexpose.x, ev.xexpose.y,	1541	scr_expose (ev.xexpose.x, ev.xexpose.y,
1557	ev.xexpose.width, ev.xexpose.height, False);	1542	ev.xexpose.width, ev.xexpose.height, False);
		1543	}
1558		1544
1559	want_refresh = 1;	1545	want_refresh = 1;
1560	}	1546	}
1561	else	1547	else
1562	{	1548	{
…		…
1565	while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))	1551	while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1566	;	1552	;
1567	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))	1553	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1568	;	1554	;
1569		1555
1570	if (isScrollbarWindow (ev.xany.window))	1556	if (scrollBar.state && ev.xany.window == scrollBar.win)
1571	{	1557	{
1572	scrollBar.setIdle ();	1558	scrollBar.setIdle ();
1573	scrollbar_show (0);	1559	scrollbar_show (0);
1574	}	1560	}
1575	}	1561	}
…		…
1578	case MotionNotify:	1564	case MotionNotify:
1579	#ifdef POINTER_BLANK	1565	#ifdef POINTER_BLANK
1580	if (hidden_pointer)	1566	if (hidden_pointer)
1581	pointer_unblank ();	1567	pointer_unblank ();
1582	#endif	1568	#endif
		1569	if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask\|Button2Mask\|Button3Mask))
		1570	\|\| priv_modes & PrivMode_MouseAnyEvent)
		1571	mouse_report (ev.xbutton);
1583	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)	1572	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1584	break;	1573	break;
1585		1574
1586	if (ev.xany.window == vt)	1575	if (ev.xany.window == vt)
1587	{	1576	{
…		…
1621	int dist;	1610	int dist;
1622		1611
1623	/* don't clobber the current delay if we are	1612	/* don't clobber the current delay if we are
1624	* already in the middle of scrolling.	1613	* already in the middle of scrolling.
1625	*/	1614	*/
1626	if (!sel_scroll_ev.active)	1615	if (!sel_scroll_ev.is_active ())
1627	sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);	1616	sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1628		1617
1629	/* save the event params so we can highlight	1618	/* save the event params so we can highlight
1630	* the selection in the pending-scroll loop	1619	* the selection in the pending-scroll loop
1631	*/	1620	*/
1632	selection_save_x = ev.xbutton.x;	1621	selection_save_x = ev.xbutton.x;
…		…
1654	else	1643	else
1655	{	1644	{
1656	/* we are within the text window, so we	1645	/* we are within the text window, so we
1657	* shouldn't be scrolling	1646	* shouldn't be scrolling
1658	*/	1647	*/
1659	if (sel_scroll_ev.active)
1660	sel_scroll_ev.stop();	1648	sel_scroll_ev.stop();
1661	}	1649	}
1662	#endif	1650	#endif
1663	#ifdef MOUSE_THRESHOLD	1651	#ifdef MOUSE_THRESHOLD
1664	}	1652	}
1665	#endif	1653	#endif
1666	}	1654	}
1667	}	1655	}
1668	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1656	else if (scrollbar_isMotion () && ev.xany.window == scrollBar.win)
1669	{	1657	{
1670	while (XCheckTypedWindowEvent (dpy, scrollBar.win,	1658	while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1671	MotionNotify, &ev))	1659	MotionNotify, &ev))
1672	;	1660	;
1673		1661
…		…
1691	{	1679	{
1692	hidden_cursor = 0;	1680	hidden_cursor = 0;
1693	want_refresh = 1;	1681	want_refresh = 1;
1694	}	1682	}
1695		1683
1696	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);	1684	cursor_blink_ev.again ();
1697	}	1685	}
1698	#endif	1686	#endif
1699		1687
1700	#if defined(POINTER_BLANK)	1688	#if defined(POINTER_BLANK)
1701	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)	1689	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
…		…
1708		1696
1709	if (ev.type == KeyPress && hidden_pointer == 0)	1697	if (ev.type == KeyPress && hidden_pointer == 0)
1710	pointer_blank ();	1698	pointer_blank ();
1711	}	1699	}
1712	#endif	1700	#endif
		1701
		1702	refresh_check ();
1713	}	1703	}
1714		1704
1715	void	1705	void
1716	rxvt_term::focus_in ()	1706	rxvt_term::focus_in ()
1717	{	1707	{
…		…
1729	XSetICFocus (Input_Context);	1719	XSetICFocus (Input_Context);
1730	}	1720	}
1731	#endif	1721	#endif
1732	#if CURSOR_BLINK	1722	#if CURSOR_BLINK
1733	if (option (Opt_cursorBlink))	1723	if (option (Opt_cursorBlink))
1734	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);	1724	cursor_blink_ev.again ();
1735	#endif	1725	#endif
1736	#if OFF_FOCUS_FADING	1726	#if OFF_FOCUS_FADING
1737	if (rs[Rs_fade])	1727	if (rs[Rs_fade])
1738	{	1728	{
1739	pix_colors = pix_colors_focused;	1729	pix_colors = pix_colors_focused;
…		…
1741	}	1731	}
1742	#endif	1732	#endif
1743	#if ENABLE_FRILLS	1733	#if ENABLE_FRILLS
1744	if (option (Opt_urgentOnBell))	1734	if (option (Opt_urgentOnBell))
1745	{	1735	{
1746	XWMHints *h;
1747
1748	h = XGetWMHints(dpy, parent[0]);	1736	if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1749	if (h != NULL)
1750	{	1737	{
1751	h->flags &= ~XUrgencyHint;	1738	h->flags &= ~XUrgencyHint;
1752	XSetWMHints(dpy, parent[0], h);	1739	XSetWMHints (dpy, parent[0], h);
1753	}	1740	}
1754	}	1741	}
1755	#endif	1742	#endif
1756	}	1743	}
1757	}	1744	}
…		…
1780	XUnsetICFocus (Input_Context);	1767	XUnsetICFocus (Input_Context);
1781	#endif	1768	#endif
1782	#if CURSOR_BLINK	1769	#if CURSOR_BLINK
1783	if (option (Opt_cursorBlink))	1770	if (option (Opt_cursorBlink))
1784	cursor_blink_ev.stop ();	1771	cursor_blink_ev.stop ();
		1772
1785	hidden_cursor = 0;	1773	hidden_cursor = 0;
1786	#endif	1774	#endif
1787	#if OFF_FOCUS_FADING	1775	#if OFF_FOCUS_FADING
1788	if (rs[Rs_fade])	1776	if (rs[Rs_fade])
1789	{	1777	{
…		…
1827	*/	1815	*/
1828	if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]	1816	if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1829	\|\| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])	1817	\|\| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1830	{	1818	{
1831	bgPixmap.set_root_pixmap ();	1819	bgPixmap.set_root_pixmap ();
1832	bgPixmap.render ();	1820	update_background ();
1833	}	1821	}
		1822
1834	break;	1823	break;
1835	}	1824	}
1836	# endif	1825	# endif
		1826
		1827	refresh_check ();
1837	}	1828	}
1838	#endif	1829	#endif
1839		1830
1840	void	1831	void
1841	rxvt_term::button_press (XButtonEvent &ev)	1832	rxvt_term::button_press (XButtonEvent &ev)
…		…
1896	mouse_report (ev);	1887	mouse_report (ev);
1897	}	1888	}
1898	#else	1889	#else
1899	MEvent.button = ev.button;	1890	MEvent.button = ev.button;
1900	mouse_report (ev);	1891	mouse_report (ev);
1901	#endif /* MOUSE_REPORT_DOUBLECLICK */	1892	#endif /* MOUSE_REPORT_DOUBLECLICK */
1902		1893
1903	}	1894	}
1904	else	1895	else
1905	{	1896	{
1906	if (ev.button != MEvent.button)	1897	if (ev.button != MEvent.button)
…		…
1954	}	1945	}
1955		1946
1956	/*	1947	/*
1957	* Scrollbar window processing of button press	1948	* Scrollbar window processing of button press
1958	*/	1949	*/
1959	if (isScrollbarWindow (ev.window))	1950	if (scrollBar.state && ev.window == scrollBar.win)
1960	{	1951	{
1961	scrollBar.setIdle ();	1952	scrollBar.setIdle ();
1962	/*	1953	/*
1963	* Rxvt-style scrollbar:	1954	* Rxvt-style scrollbar:
1964	* move up if mouse is above slider	1955	* move up if mouse is above slider
…		…
2000	tt_printf ("\033[5~");	1991	tt_printf ("\033[5~");
2001	break;	1992	break;
2002	}	1993	}
2003	}	1994	}
2004	else	1995	else
2005	#endif /* NO_SCROLLBAR_REPORT */	1996	#endif /* NO_SCROLLBAR_REPORT */
2006		1997
2007	{	1998	{
2008	char upordown = 0;	1999	char upordown = 0;
2009		2000
2010	if (scrollBar.style == R_SB_NEXT)	2001	if (scrollBar.style == R_SB_NEXT)
2011	{	2002	{
2012	if (scrollbarnext_upButton (ev.y))	2003	if (scrollbarnext_upButton (ev.y))
2013	upordown = -1; /* up */	2004	upordown = -1; /* up */
…		…
2019	if (scrollbarrxvt_upButton (ev.y))	2010	if (scrollbarrxvt_upButton (ev.y))
2020	upordown = -1; /* up */	2011	upordown = -1; /* up */
2021	else if (scrollbarrxvt_dnButton (ev.y))	2012	else if (scrollbarrxvt_dnButton (ev.y))
2022	upordown = 1; /* down */	2013	upordown = 1; /* down */
2023	}	2014	}
		2015
2024	if (upordown)	2016	if (upordown)
2025	{	2017	{
2026	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	2018	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
		2019	if (!cont_scroll_ev.is_active ())
2027	cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);	2020	cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2028	#endif	2021	#endif
2029	if (scr_page (upordown < 0 ? UP : DN, 1))	2022	if (scr_page (upordown < 0 ? UP : DN, 1))
2030	{	2023	{
2031	if (upordown < 0)	2024	if (upordown < 0)
2032	scrollBar.setUp ();	2025	scrollBar.setUp ();
…		…
2036	}	2029	}
2037	else	2030	else
2038	switch (ev.button)	2031	switch (ev.button)
2039	{	2032	{
2040	case Button2:	2033	case Button2:
2041	switch (scrollbar_align)	2034	switch (scrollBar.align)
2042	{	2035	{
2043	case R_SB_ALIGN_TOP:	2036	case R_SB_ALIGN_TOP:
2044	csrO = 0;	2037	csrO = 0;
2045	break;	2038	break;
2046	case R_SB_ALIGN_CENTRE:	2039	case R_SB_ALIGN_CENTRE:
…		…
2058		2051
2059	scrollBar.setMotion ();	2052	scrollBar.setMotion ();
2060	break;	2053	break;
2061		2054
2062	case Button1:	2055	case Button1:
2063	if (scrollbar_align == R_SB_ALIGN_CENTRE)	2056	if (scrollBar.align == R_SB_ALIGN_CENTRE)
2064	csrO = ev.y - scrollBar.top;	2057	csrO = ev.y - scrollBar.top;
2065	/* FALLTHROUGH */	2058	/* FALLTHROUGH */
2066		2059
2067	case Button3:	2060	case Button3:
2068	if (scrollBar.style != R_SB_XTERM)	2061	if (scrollBar.style != R_SB_XTERM)
…		…
2112	scrollBar.setIdle ();	2105	scrollBar.setIdle ();
2113	scrollbar_show (0);	2106	scrollbar_show (0);
2114	}	2107	}
2115		2108
2116	#ifdef SELECTION_SCROLLING	2109	#ifdef SELECTION_SCROLLING
2117	if (sel_scroll_ev.active)
2118	sel_scroll_ev.stop();	2110	sel_scroll_ev.stop();
2119	#endif	2111	#endif
2120		2112
2121	if (ev.window == vt)	2113	if (ev.window == vt)
2122	{	2114	{
2123	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))	2115	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
…		…
2147	mouse_report (ev);	2139	mouse_report (ev);
2148	}	2140	}
2149	#else /* MOUSE_REPORT_DOUBLECLICK */	2141	#else /* MOUSE_REPORT_DOUBLECLICK */
2150	MEvent.button = AnyButton;	2142	MEvent.button = AnyButton;
2151	mouse_report (ev);	2143	mouse_report (ev);
2152	#endif /* MOUSE_REPORT_DOUBLECLICK */	2144	#endif /* MOUSE_REPORT_DOUBLECLICK */
2153	return;	2145	return;
2154	}	2146	}
2155		2147
2156	/*	2148	/*
2157	* dumb hack to compensate for the failure of click-and-drag	2149	* dumb hack to compensate for the failure of click-and-drag
…		…
2195	{	2187	{
2196	mouse_slip_wheel_speed += v ? -1 : 1;	2188	mouse_slip_wheel_speed += v ? -1 : 1;
2197	if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;	2189	if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2198	if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;	2190	if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2199		2191
2200	if (slip_wheel_ev.at < NOW)	2192	if (!slip_wheel_ev.is_active ())
2201	slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;	2193	slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2202
2203	slip_wheel_ev.start ();
2204	}	2194	}
2205	else	2195	else
		2196	# endif
2206	{	2197	{
2207	# endif
2208	scr_page (v, i);	2198	scr_page (v, i);
2209	scrollbar_show (1);	2199	scrollbar_show (1);
2210	# ifdef MOUSE_SLIP_WHEELING
2211	}	2200	}
2212	# endif
2213	}	2201	}
2214	break;	2202	break;
2215	#endif	2203	#endif
2216	}	2204	}
2217	}	2205	}
…		…
2276		2264
2277	if (!option (Opt_jumpScroll) \|\| refresh_count >= nrow - 1)	2265	if (!option (Opt_jumpScroll) \|\| refresh_count >= nrow - 1)
2278	{	2266	{
2279	refresh_count = 0;	2267	refresh_count = 0;
2280		2268
2281	if (!option (Opt_skipScroll) \|\| io_manager::now () > NOW + 1. / 60.)	2269	if (!option (Opt_skipScroll) \|\| ev_time () > ev::now () + 1. / 60.)
2282	{	2270	{
2283	refreshnow = true;	2271	refreshnow = true;
2284	ch = NOCHAR;	2272	ch = NOCHAR;
2285	break;	2273	break;
2286	}	2274	}
…		…
2497	}	2485	}
2498	}	2486	}
2499		2487
2500	pclose_printer (fd);	2488	pclose_printer (fd);
2501	}	2489	}
2502	#endif /* PRINTPIPE */	2490	#endif /* PRINTPIPE */
2503	/}}} /	2491	/}}} /
2504		2492
2505	/* INDENT-OFF */	2493	/* INDENT-OFF */
2506	enum {	2494	enum {
2507	C1_40 = 0x40,	2495	C1_40 = 0x40,
…		…
2793	rxvt_term::process_csi_seq ()	2781	rxvt_term::process_csi_seq ()
2794	{	2782	{
2795	unicode_t ch, priv, i;	2783	unicode_t ch, priv, i;
2796	unsigned int nargs, p;	2784	unsigned int nargs, p;
2797	int n, ndef;	2785	int n, ndef;
2798	int arg[ESC_ARGS];	2786	int arg[ESC_ARGS] = { };
2799		2787
2800	memset (arg, 0, sizeof (arg));
2801	nargs = 0;	2788	nargs = 0;
2802		2789
2803	priv = 0;	2790	priv = 0;
2804	ch = cmd_getc ();	2791	ch = cmd_getc ();
2805	if (ch >= '<' && ch <= '?')	2792	if (ch >= '<' && ch <= '?')
		2793	{
2806	{ /* '<' '=' '>' '?' */	2794	/* '<' '=' '>' '?' */
2807	priv = ch;	2795	priv = ch;
2808	ch = cmd_getc ();	2796	ch = cmd_getc ();
2809	}	2797	}
2810		2798
2811	/* read any numerical arguments */	2799	/* read any numerical arguments */
…		…
2854	{	2842	{
2855	// first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,	2843	// first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2856	// 'U' for rxvt-unicode != 7.[34] (where it was broken).	2844	// 'U' for rxvt-unicode != 7.[34] (where it was broken).
2857	//	2845	//
2858	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt	2846	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2859	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify	2847	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2860	// that we do not support xterm mouse reporting (should be 95 when we do).	2848	// versions.
2861	//	2849	//
2862	tt_printf ("\033[>%d;94;0c", 'U');	2850	tt_printf ("\033[>%d;95;0c", 'U');
2863	}	2851	}
2864	break;	2852	break;
2865	case '?':	2853	case '?':
2866	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')	2854	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')
2867	process_terminal_mode (ch, priv, nargs, arg);	2855	process_terminal_mode (ch, priv, nargs, arg);
…		…
3385	*buf++ = '\0';	3373	*buf++ = '\0';
3386		3374
3387	process_color_seq (op, color, name, resp);	3375	process_color_seq (op, color, name, resp);
3388	}	3376	}
3389	break;	3377	break;
		3378	case Rxvt_restoreFG:
3390	case XTerm_Color00:	3379	case XTerm_Color00:
3391	process_color_seq (op, Color_fg, str, resp);	3380	process_color_seq (op, Color_fg, str, resp);
3392	break;	3381	break;
		3382	case Rxvt_restoreBG:
3393	case XTerm_Color01:	3383	case XTerm_Color01:
3394	process_color_seq (op, Color_bg, str, resp);	3384	process_color_seq (op, Color_bg, str, resp);
3395	break;	3385	break;
3396	#ifndef NO_CURSORCOLOR	3386	#ifndef NO_CURSORCOLOR
3397	case XTerm_Color_cursor:	3387	case XTerm_Color_cursor:
…		…
3423	#if ENABLE_TRANSPARENCY	3413	#if ENABLE_TRANSPARENCY
3424	case URxvt_Color_tint:	3414	case URxvt_Color_tint:
3425	process_color_seq (op, Color_tint, str, resp);	3415	process_color_seq (op, Color_tint, str, resp);
3426	{	3416	{
3427	bool changed = false;	3417	bool changed = false;
		3418
3428	if (ISSET_PIXCOLOR (Color_tint))	3419	if (ISSET_PIXCOLOR (Color_tint))
3429	changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);	3420	changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3430	else	3421	else
3431	changed = bgPixmap.unset_tint ();	3422	changed = bgPixmap.unset_tint ();
		3423
3432	if (changed)	3424	if (changed)
3433	bgPixmap.render ();	3425	update_background ();
3434	}	3426	}
3435		3427
3436	break;	3428	break;
3437	#endif	3429	#endif
3438		3430
3439	#if XPM_BACKGROUND	3431	#if BG_IMAGE_FROM_FILE
3440	case Rxvt_Pixmap:	3432	case Rxvt_Pixmap:
3441	if (!strcmp (str, "?"))	3433	if (!strcmp (str, "?"))
3442	{	3434	{
3443	char str[256];	3435	char str[256];
3444		3436
…		…
3459	changed++;	3451	changed++;
3460	str = strchr (str, ';');	3452	str = strchr (str, ';');
3461	if (str == NULL)	3453	if (str == NULL)
3462	bgPixmap.set_defaultGeometry ();	3454	bgPixmap.set_defaultGeometry ();
3463	}	3455	}
		3456
3464	while (str)	3457	while (str)
3465	{	3458	{
3466	str++;	3459	str++;
3467	if (bgPixmap.set_geometry (str))	3460	if (bgPixmap.set_geometry (str))
3468	changed++;	3461	changed++;
3469	str = strchr (str, ';');	3462	str = strchr (str, ';');
3470	}	3463	}
		3464
3471	if (changed)	3465	if (changed)
3472	{	3466	update_background ();
3473	bgPixmap.render ();
3474	scr_touch (true);
3475	}
3476	}	3467	}
3477	break;	3468	break;
3478	#endif	3469	#endif
3479
3480	case Rxvt_restoreFG:
3481	set_window_color (Color_fg, str);
3482	break;
3483	case Rxvt_restoreBG:
3484	set_window_color (Color_bg, str);
3485	break;
3486		3470
3487	case XTerm_logfile:	3471	case XTerm_logfile:
3488	// TODO, when secure mode?	3472	// TODO, when secure mode?
3489	break;	3473	break;
3490		3474
…		…
3634	{ 66, PrivMode_aplKP },	3618	{ 66, PrivMode_aplKP },
3635	#ifndef NO_BACKSPACE_KEY	3619	#ifndef NO_BACKSPACE_KEY
3636	{ 67, PrivMode_BackSpace },	3620	{ 67, PrivMode_BackSpace },
3637	#endif	3621	#endif
3638	{ 1000, PrivMode_MouseX11 },	3622	{ 1000, PrivMode_MouseX11 },
3639	// 1001 Use Hilite Mouse Tracking. NYI, TODO	3623	{ 1002, PrivMode_MouseBtnEvent },
3640	// 1002 Use Cell Motion Mouse Tracking. NYI, TODO	3624	{ 1003, PrivMode_MouseAnyEvent },
3641	// 1003 Use All Motion Mouse Tracking. NYI, TODO
3642	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension	3625	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension
3643	{ 1011, PrivMode_Keypress }, // rxvt extension	3626	{ 1011, PrivMode_Keypress }, // rxvt extension
3644	// 1035 enable modifiers for alt, numlock NYI	3627	// 1035 enable modifiers for alt, numlock NYI
3645	// 1036 send ESC for meta keys NYI	3628	// 1036 send ESC for meta keys NYI
3646	// 1037 send DEL for keypad delete NYI	3629	// 1037 send DEL for keypad delete NYI
…		…
3703	*/	3686	*/
3704	PrivMode (1, PrivMode_vt52);	3687	PrivMode (1, PrivMode_vt52);
3705	break;	3688	break;
3706	case 3: /* 80/132 */	3689	case 3: /* 80/132 */
3707	if (priv_modes & PrivMode_132OK)	3690	if (priv_modes & PrivMode_132OK)
		3691	{
		3692	scr_poweron ();
3708	set_widthheight (((state ? 132 : 80) * fwidth), height);	3693	set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);
		3694	}
3709	break;	3695	break;
3710	case 4: /* smooth scrolling */	3696	case 4: /* smooth scrolling */
3711	set_option (Opt_jumpScroll, !state);	3697	set_option (Opt_jumpScroll, !state);
3712	break;	3698	break;
3713	case 5: /* reverse video */	3699	case 5: /* reverse video */
…		…
3720	scr_autowrap (state);	3706	scr_autowrap (state);
3721	break;	3707	break;
3722	/* case 8: - auto repeat, can't do on a per window basis */	3708	/* case 8: - auto repeat, can't do on a per window basis */
3723	case 9: /* X10 mouse reporting */	3709	case 9: /* X10 mouse reporting */
3724	if (state) /* orthogonal */	3710	if (state) /* orthogonal */
3725	priv_modes &= ~PrivMode_MouseX11;	3711	priv_modes &= ~(PrivMode_MouseX11\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);
3726	break;	3712	break;
3727	#ifdef scrollBar_esc	3713	#ifdef scrollBar_esc
3728	case scrollBar_esc:	3714	case scrollBar_esc:
3729	if (scrollbar_mapping (state))	3715	if (scrollbar_mapping (state))
3730	{	3716	{
…		…
3743	break;	3729	break;
3744	/* case 66: - application key pad */	3730	/* case 66: - application key pad */
3745	/* case 67: - backspace key */	3731	/* case 67: - backspace key */
3746	case 1000: /* X11 mouse reporting */	3732	case 1000: /* X11 mouse reporting */
3747	if (state) /* orthogonal */	3733	if (state) /* orthogonal */
3748	priv_modes &= ~PrivMode_MouseX10;	3734	priv_modes &= ~(PrivMode_MouseX10\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);
3749	break;	3735	break;
3750	#if 0
3751	case 1001:	3736	case 1002:
3752	break; /* X11 mouse highlighting */	3737	case 1003:
3753	#endif	3738	if (state)
		3739	{
		3740	priv_modes &= ~(PrivMode_MouseX10\|PrivMode_MouseX11);
		3741	priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
		3742	vt_emask_mouse = PointerMotionMask;
		3743	}
		3744	else
		3745	vt_emask_mouse = NoEventMask;
		3746	vt_select_input ();
		3747	break;
3754	case 1010: /* scroll to bottom on TTY output inhibit */	3748	case 1010: /* scroll to bottom on TTY output inhibit */
3755	set_option (Opt_scrollTtyOutput, !state);	3749	set_option (Opt_scrollTtyOutput, !state);
3756	break;	3750	break;
3757	case 1011: /* scroll to bottom on key press */	3751	case 1011: /* scroll to bottom on key press */
3758	set_option (Opt_scrollTtyKeypress, state);	3752	set_option (Opt_scrollTtyKeypress, state);
…		…
3935	rxvt_term::process_graphics ()	3929	rxvt_term::process_graphics ()
3936	{	3930	{
3937	unicode_t ch, cmd = cmd_getc ();	3931	unicode_t ch, cmd = cmd_getc ();
3938		3932
3939	if (cmd == 'Q')	3933	if (cmd == 'Q')
		3934	{
3940	{ /* query graphics */	3935	/* query graphics */
3941	tt_printf ("\033G0\012"); /* no graphics */	3936	tt_printf ("\033G0\012"); /* no graphics */
3942	return;	3937	return;
3943	}	3938	}
3944	/* swallow other graphics sequences until terminating ':' */	3939	/* swallow other graphics sequences until terminating ':' */
3945	do	3940	do
…		…
3995	v_buffer = (char *)realloc (v_buffer, v_buflen + len);	3990	v_buffer = (char *)realloc (v_buffer, v_buflen + len);
3996		3991
3997	memcpy (v_buffer + v_buflen, data, len);	3992	memcpy (v_buffer + v_buflen, data, len);
3998	v_buflen += len;	3993	v_buflen += len;
3999		3994
4000	pty_ev.set (EVENT_READ \| EVENT_WRITE);	3995	pty_ev.set (ev::READ \| ev::WRITE);
4001	}	3996	}
4002		3997
4003	void rxvt_term::pty_write ()	3998	void rxvt_term::pty_write ()
4004	{	3999	{
4005	int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));	4000	int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
…		…
4010		4005
4011	if (v_buflen == 0)	4006	if (v_buflen == 0)
4012	{	4007	{
4013	free (v_buffer);	4008	free (v_buffer);
4014	v_buffer = 0;	4009	v_buffer = 0;
4015	v_buflen = 0;
4016		4010
4017	pty_ev.set (EVENT_READ);	4011	pty_ev.set (ev::READ);
4018	return;	4012	return;
4019	}	4013	}
4020		4014
4021	memmove (v_buffer, v_buffer + written, v_buflen);	4015	memmove (v_buffer, v_buffer + written, v_buflen);
4022	}	4016	}
4023	else if (written != -1 \|\| (errno != EAGAIN && errno != EINTR))	4017	else if (written != -1 \|\| (errno != EAGAIN && errno != EINTR))
4024	pty_ev.set (EVENT_READ);	4018	pty_ev.set (ev::READ);
4025	}	4019	}
4026		4020
4027	/----------------------- end-of-file (C source) -----------------------/	4021	/----------------------- end-of-file (C source) -----------------------/
4028		4022

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.347 by sasha, Wed Aug 15 22:41:52 2007 UTC vs. Revision 1.394 by ayin, Sat Jan 19 15:00:49 2008 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.347 by sasha, Wed Aug 15 22:41:52 2007 UTC vs.
Revision 1.394 by ayin, Sat Jan 19 15:00:49 2008 UTC