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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.349 by ayin, Sun Aug 26 18:16:52 2007 UTC vs.
Revision 1.389 by ayin, Mon Dec 31 13:50:56 2007 UTC

…		…
25	* - extensive modifications	25	* - extensive modifications
26	* Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>	26	* Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27	* Copyright (c) 2001 Marius Gedminas	27	* Copyright (c) 2001 Marius Gedminas
28	* - Ctrl/Mod4+Tab works like Meta+Tab (options)	28	* - Ctrl/Mod4+Tab works like Meta+Tab (options)
29	* Copyright (c) 2003 Rob McMullen <robm@flipturn.org>	29	* Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30	* Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>	30	* Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
		31	* 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:
1479	/* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",	1443	/* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1480	ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,	1444	ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1481	szHint.width, szHint.height);*/	1445	szHint.width, szHint.height); */
1482	if (ev.xconfigure.window == parent[0])	1446	if (ev.xconfigure.window == parent[0])
1483	{	1447	{
1484	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))	1448	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1485	;	1449	;
1486		1450
…		…
1489	seen_resize = 1;	1453	seen_resize = 1;
1490	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1454	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1491	}	1455	}
1492	else	1456	else
1493	{	1457	{
1494	#ifdef ENABLE_TRANSPARENCY	1458	#ifdef HAVE_BG_PIXMAP
1495	if (option (Opt_transparent))	1459	if (bgPixmap.window_position_sensitive ())
1496	update_background ();	1460	update_background ();
1497	#endif	1461	#endif
1498	}	1462	}
		1463
1499	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));	1464	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1500	}	1465	}
1501	break;	1466	break;
1502		1467
1503	case PropertyNotify:	1468	case PropertyNotify:
…		…
1522	break;	1487	break;
1523		1488
1524	case MapNotify:	1489	case MapNotify:
1525	mapped = 1;	1490	mapped = 1;
1526	#ifdef TEXT_BLINK	1491	#ifdef TEXT_BLINK
1527	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);	1492	text_blink_ev.start ();
1528	#endif	1493	#endif
1529	HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));	1494	HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1530	break;	1495	break;
1531		1496
1532	case UnmapNotify:	1497	case UnmapNotify:
…		…
1534	#ifdef TEXT_BLINK	1499	#ifdef TEXT_BLINK
1535	text_blink_ev.stop ();	1500	text_blink_ev.stop ();
1536	#endif	1501	#endif
1537	HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));	1502	HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1538	break;	1503	break;
1539
1540	#ifdef ENABLE_TRANSPARENCY
1541	case ReparentNotify:
1542	rootwin_cb (ev);
1543	break;
1544	#endif /* ENABLE_TRANSPARENCY */
1545		1504
1546	case GraphicsExpose:	1505	case GraphicsExpose:
1547	case Expose:	1506	case Expose:
1548	if (ev.xany.window == vt)	1507	if (ev.xany.window == vt)
1549	{	1508	{
1550	do	1509	do
		1510	{
1551	scr_expose (ev.xexpose.x, ev.xexpose.y,	1511	scr_expose (ev.xexpose.x, ev.xexpose.y,
1552	ev.xexpose.width, ev.xexpose.height, False);	1512	ev.xexpose.width, ev.xexpose.height, False);
		1513	}
1553	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));	1514	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1554		1515
1555	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1516	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1556		1517
1557	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))	1518	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
		1519	{
1558	scr_expose (ev.xexpose.x, ev.xexpose.y,	1520	scr_expose (ev.xexpose.x, ev.xexpose.y,
1559	ev.xexpose.width, ev.xexpose.height, False);	1521	ev.xexpose.width, ev.xexpose.height, False);
		1522	}
1560		1523
1561	want_refresh = 1;	1524	want_refresh = 1;
1562	}	1525	}
1563	else	1526	else
1564	{	1527	{
…		…
1567	while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))	1530	while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1568	;	1531	;
1569	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))	1532	while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1570	;	1533	;
1571		1534
1572	if (isScrollbarWindow (ev.xany.window))	1535	if (scrollBar.state && ev.xany.window == scrollBar.win)
1573	{	1536	{
1574	scrollBar.setIdle ();	1537	scrollBar.setIdle ();
1575	scrollbar_show (0);	1538	scrollbar_show (0);
1576	}	1539	}
1577	}	1540	}
…		…
1580	case MotionNotify:	1543	case MotionNotify:
1581	#ifdef POINTER_BLANK	1544	#ifdef POINTER_BLANK
1582	if (hidden_pointer)	1545	if (hidden_pointer)
1583	pointer_unblank ();	1546	pointer_unblank ();
1584	#endif	1547	#endif
		1548	if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask\|Button2Mask\|Button3Mask))
		1549	\|\| priv_modes & PrivMode_MouseAnyEvent)
		1550	mouse_report (ev.xbutton);
1585	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)	1551	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1586	break;	1552	break;
1587		1553
1588	if (ev.xany.window == vt)	1554	if (ev.xany.window == vt)
1589	{	1555	{
…		…
1623	int dist;	1589	int dist;
1624		1590
1625	/* don't clobber the current delay if we are	1591	/* don't clobber the current delay if we are
1626	* already in the middle of scrolling.	1592	* already in the middle of scrolling.
1627	*/	1593	*/
1628	if (!sel_scroll_ev.active)	1594	if (!sel_scroll_ev.is_active ())
1629	sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);	1595	sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1630		1596
1631	/* save the event params so we can highlight	1597	/* save the event params so we can highlight
1632	* the selection in the pending-scroll loop	1598	* the selection in the pending-scroll loop
1633	*/	1599	*/
1634	selection_save_x = ev.xbutton.x;	1600	selection_save_x = ev.xbutton.x;
…		…
1656	else	1622	else
1657	{	1623	{
1658	/* we are within the text window, so we	1624	/* we are within the text window, so we
1659	* shouldn't be scrolling	1625	* shouldn't be scrolling
1660	*/	1626	*/
1661	if (sel_scroll_ev.active)
1662	sel_scroll_ev.stop();	1627	sel_scroll_ev.stop();
1663	}	1628	}
1664	#endif	1629	#endif
1665	#ifdef MOUSE_THRESHOLD	1630	#ifdef MOUSE_THRESHOLD
1666	}	1631	}
1667	#endif	1632	#endif
1668	}	1633	}
1669	}	1634	}
1670	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1635	else if (scrollbar_isMotion () && ev.xany.window == scrollBar.win)
1671	{	1636	{
1672	while (XCheckTypedWindowEvent (dpy, scrollBar.win,	1637	while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1673	MotionNotify, &ev))	1638	MotionNotify, &ev))
1674	;	1639	;
1675		1640
…		…
1693	{	1658	{
1694	hidden_cursor = 0;	1659	hidden_cursor = 0;
1695	want_refresh = 1;	1660	want_refresh = 1;
1696	}	1661	}
1697		1662
1698	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);	1663	cursor_blink_ev.again ();
1699	}	1664	}
1700	#endif	1665	#endif
1701		1666
1702	#if defined(POINTER_BLANK)	1667	#if defined(POINTER_BLANK)
1703	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)	1668	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
…		…
1710		1675
1711	if (ev.type == KeyPress && hidden_pointer == 0)	1676	if (ev.type == KeyPress && hidden_pointer == 0)
1712	pointer_blank ();	1677	pointer_blank ();
1713	}	1678	}
1714	#endif	1679	#endif
		1680
		1681	refresh_check ();
1715	}	1682	}
1716		1683
1717	void	1684	void
1718	rxvt_term::focus_in ()	1685	rxvt_term::focus_in ()
1719	{	1686	{
…		…
1731	XSetICFocus (Input_Context);	1698	XSetICFocus (Input_Context);
1732	}	1699	}
1733	#endif	1700	#endif
1734	#if CURSOR_BLINK	1701	#if CURSOR_BLINK
1735	if (option (Opt_cursorBlink))	1702	if (option (Opt_cursorBlink))
1736	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);	1703	cursor_blink_ev.again ();
1737	#endif	1704	#endif
1738	#if OFF_FOCUS_FADING	1705	#if OFF_FOCUS_FADING
1739	if (rs[Rs_fade])	1706	if (rs[Rs_fade])
1740	{	1707	{
1741	pix_colors = pix_colors_focused;	1708	pix_colors = pix_colors_focused;
…		…
1743	}	1710	}
1744	#endif	1711	#endif
1745	#if ENABLE_FRILLS	1712	#if ENABLE_FRILLS
1746	if (option (Opt_urgentOnBell))	1713	if (option (Opt_urgentOnBell))
1747	{	1714	{
1748	XWMHints *h;
1749
1750	h = XGetWMHints(dpy, parent[0]);	1715	if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1751	if (h != NULL)
1752	{	1716	{
1753	h->flags &= ~XUrgencyHint;	1717	h->flags &= ~XUrgencyHint;
1754	XSetWMHints(dpy, parent[0], h);	1718	XSetWMHints (dpy, parent[0], h);
1755	}	1719	}
1756	}	1720	}
1757	#endif	1721	#endif
1758	}	1722	}
1759	}	1723	}
…		…
1782	XUnsetICFocus (Input_Context);	1746	XUnsetICFocus (Input_Context);
1783	#endif	1747	#endif
1784	#if CURSOR_BLINK	1748	#if CURSOR_BLINK
1785	if (option (Opt_cursorBlink))	1749	if (option (Opt_cursorBlink))
1786	cursor_blink_ev.stop ();	1750	cursor_blink_ev.stop ();
		1751
1787	hidden_cursor = 0;	1752	hidden_cursor = 0;
1788	#endif	1753	#endif
1789	#if OFF_FOCUS_FADING	1754	#if OFF_FOCUS_FADING
1790	if (rs[Rs_fade])	1755	if (rs[Rs_fade])
1791	{	1756	{
…		…
1831	\|\| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])	1796	\|\| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1832	{	1797	{
1833	bgPixmap.set_root_pixmap ();	1798	bgPixmap.set_root_pixmap ();
1834	update_background ();	1799	update_background ();
1835	}	1800	}
		1801
1836	break;	1802	break;
1837	}	1803	}
1838	# endif	1804	# endif
		1805
		1806	refresh_check ();
1839	}	1807	}
1840	#endif	1808	#endif
1841		1809
1842	void	1810	void
1843	rxvt_term::button_press (XButtonEvent &ev)	1811	rxvt_term::button_press (XButtonEvent &ev)
…		…
1898	mouse_report (ev);	1866	mouse_report (ev);
1899	}	1867	}
1900	#else	1868	#else
1901	MEvent.button = ev.button;	1869	MEvent.button = ev.button;
1902	mouse_report (ev);	1870	mouse_report (ev);
1903	#endif /* MOUSE_REPORT_DOUBLECLICK */	1871	#endif /* MOUSE_REPORT_DOUBLECLICK */
1904		1872
1905	}	1873	}
1906	else	1874	else
1907	{	1875	{
1908	if (ev.button != MEvent.button)	1876	if (ev.button != MEvent.button)
…		…
1956	}	1924	}
1957		1925
1958	/*	1926	/*
1959	* Scrollbar window processing of button press	1927	* Scrollbar window processing of button press
1960	*/	1928	*/
1961	if (isScrollbarWindow (ev.window))	1929	if (scrollBar.state && ev.window == scrollBar.win)
1962	{	1930	{
1963	scrollBar.setIdle ();	1931	scrollBar.setIdle ();
1964	/*	1932	/*
1965	* Rxvt-style scrollbar:	1933	* Rxvt-style scrollbar:
1966	* move up if mouse is above slider	1934	* move up if mouse is above slider
…		…
2002	tt_printf ("\033[5~");	1970	tt_printf ("\033[5~");
2003	break;	1971	break;
2004	}	1972	}
2005	}	1973	}
2006	else	1974	else
2007	#endif /* NO_SCROLLBAR_REPORT */	1975	#endif /* NO_SCROLLBAR_REPORT */
2008		1976
2009	{	1977	{
2010	char upordown = 0;	1978	char upordown = 0;
2011		1979
2012	if (scrollBar.style == R_SB_NEXT)	1980	if (scrollBar.style == R_SB_NEXT)
2013	{	1981	{
2014	if (scrollbarnext_upButton (ev.y))	1982	if (scrollbarnext_upButton (ev.y))
2015	upordown = -1; /* up */	1983	upordown = -1; /* up */
…		…
2021	if (scrollbarrxvt_upButton (ev.y))	1989	if (scrollbarrxvt_upButton (ev.y))
2022	upordown = -1; /* up */	1990	upordown = -1; /* up */
2023	else if (scrollbarrxvt_dnButton (ev.y))	1991	else if (scrollbarrxvt_dnButton (ev.y))
2024	upordown = 1; /* down */	1992	upordown = 1; /* down */
2025	}	1993	}
		1994
2026	if (upordown)	1995	if (upordown)
2027	{	1996	{
2028	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	1997	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
		1998	if (!cont_scroll_ev.is_active ())
2029	cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);	1999	cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2030	#endif	2000	#endif
2031	if (scr_page (upordown < 0 ? UP : DN, 1))	2001	if (scr_page (upordown < 0 ? UP : DN, 1))
2032	{	2002	{
2033	if (upordown < 0)	2003	if (upordown < 0)
2034	scrollBar.setUp ();	2004	scrollBar.setUp ();
…		…
2038	}	2008	}
2039	else	2009	else
2040	switch (ev.button)	2010	switch (ev.button)
2041	{	2011	{
2042	case Button2:	2012	case Button2:
2043	switch (scrollbar_align)	2013	switch (scrollBar.align)
2044	{	2014	{
2045	case R_SB_ALIGN_TOP:	2015	case R_SB_ALIGN_TOP:
2046	csrO = 0;	2016	csrO = 0;
2047	break;	2017	break;
2048	case R_SB_ALIGN_CENTRE:	2018	case R_SB_ALIGN_CENTRE:
…		…
2060		2030
2061	scrollBar.setMotion ();	2031	scrollBar.setMotion ();
2062	break;	2032	break;
2063		2033
2064	case Button1:	2034	case Button1:
2065	if (scrollbar_align == R_SB_ALIGN_CENTRE)	2035	if (scrollBar.align == R_SB_ALIGN_CENTRE)
2066	csrO = ev.y - scrollBar.top;	2036	csrO = ev.y - scrollBar.top;
2067	/* FALLTHROUGH */	2037	/* FALLTHROUGH */
2068		2038
2069	case Button3:	2039	case Button3:
2070	if (scrollBar.style != R_SB_XTERM)	2040	if (scrollBar.style != R_SB_XTERM)
…		…
2114	scrollBar.setIdle ();	2084	scrollBar.setIdle ();
2115	scrollbar_show (0);	2085	scrollbar_show (0);
2116	}	2086	}
2117		2087
2118	#ifdef SELECTION_SCROLLING	2088	#ifdef SELECTION_SCROLLING
2119	if (sel_scroll_ev.active)
2120	sel_scroll_ev.stop();	2089	sel_scroll_ev.stop();
2121	#endif	2090	#endif
2122		2091
2123	if (ev.window == vt)	2092	if (ev.window == vt)
2124	{	2093	{
2125	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))	2094	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
…		…
2149	mouse_report (ev);	2118	mouse_report (ev);
2150	}	2119	}
2151	#else /* MOUSE_REPORT_DOUBLECLICK */	2120	#else /* MOUSE_REPORT_DOUBLECLICK */
2152	MEvent.button = AnyButton;	2121	MEvent.button = AnyButton;
2153	mouse_report (ev);	2122	mouse_report (ev);
2154	#endif /* MOUSE_REPORT_DOUBLECLICK */	2123	#endif /* MOUSE_REPORT_DOUBLECLICK */
2155	return;	2124	return;
2156	}	2125	}
2157		2126
2158	/*	2127	/*
2159	* dumb hack to compensate for the failure of click-and-drag	2128	* dumb hack to compensate for the failure of click-and-drag
…		…
2197	{	2166	{
2198	mouse_slip_wheel_speed += v ? -1 : 1;	2167	mouse_slip_wheel_speed += v ? -1 : 1;
2199	if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;	2168	if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2200	if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;	2169	if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2201		2170
2202	if (slip_wheel_ev.at < NOW)	2171	if (!slip_wheel_ev.is_active ())
2203	slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;	2172	slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2204
2205	slip_wheel_ev.start ();
2206	}	2173	}
2207	else	2174	else
2208	{	2175	{
2209	# endif	2176	# endif
2210	scr_page (v, i);	2177	scr_page (v, i);
…		…
2278		2245
2279	if (!option (Opt_jumpScroll) \|\| refresh_count >= nrow - 1)	2246	if (!option (Opt_jumpScroll) \|\| refresh_count >= nrow - 1)
2280	{	2247	{
2281	refresh_count = 0;	2248	refresh_count = 0;
2282		2249
2283	if (!option (Opt_skipScroll) \|\| io_manager::now () > NOW + 1. / 60.)	2250	if (!option (Opt_skipScroll) \|\| ev_time () > ev::now () + 1. / 60.)
2284	{	2251	{
2285	refreshnow = true;	2252	refreshnow = true;
2286	ch = NOCHAR;	2253	ch = NOCHAR;
2287	break;	2254	break;
2288	}	2255	}
…		…
2499	}	2466	}
2500	}	2467	}
2501		2468
2502	pclose_printer (fd);	2469	pclose_printer (fd);
2503	}	2470	}
2504	#endif /* PRINTPIPE */	2471	#endif /* PRINTPIPE */
2505	/}}} /	2472	/}}} /
2506		2473
2507	/* INDENT-OFF */	2474	/* INDENT-OFF */
2508	enum {	2475	enum {
2509	C1_40 = 0x40,	2476	C1_40 = 0x40,
…		…
2802	nargs = 0;	2769	nargs = 0;
2803		2770
2804	priv = 0;	2771	priv = 0;
2805	ch = cmd_getc ();	2772	ch = cmd_getc ();
2806	if (ch >= '<' && ch <= '?')	2773	if (ch >= '<' && ch <= '?')
		2774	{
2807	{ /* '<' '=' '>' '?' */	2775	/* '<' '=' '>' '?' */
2808	priv = ch;	2776	priv = ch;
2809	ch = cmd_getc ();	2777	ch = cmd_getc ();
2810	}	2778	}
2811		2779
2812	/* read any numerical arguments */	2780	/* read any numerical arguments */
…		…
2855	{	2823	{
2856	// first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,	2824	// first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2857	// 'U' for rxvt-unicode != 7.[34] (where it was broken).	2825	// 'U' for rxvt-unicode != 7.[34] (where it was broken).
2858	//	2826	//
2859	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt	2827	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2860	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify	2828	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2861	// that we do not support xterm mouse reporting (should be 95 when we do).	2829	// versions.
2862	//	2830	//
2863	tt_printf ("\033[>%d;94;0c", 'U');	2831	tt_printf ("\033[>%d;95;0c", 'U');
2864	}	2832	}
2865	break;	2833	break;
2866	case '?':	2834	case '?':
2867	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')	2835	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')
2868	process_terminal_mode (ch, priv, nargs, arg);	2836	process_terminal_mode (ch, priv, nargs, arg);
…		…
3424	#if ENABLE_TRANSPARENCY	3392	#if ENABLE_TRANSPARENCY
3425	case URxvt_Color_tint:	3393	case URxvt_Color_tint:
3426	process_color_seq (op, Color_tint, str, resp);	3394	process_color_seq (op, Color_tint, str, resp);
3427	{	3395	{
3428	bool changed = false;	3396	bool changed = false;
		3397
3429	if (ISSET_PIXCOLOR (Color_tint))	3398	if (ISSET_PIXCOLOR (Color_tint))
3430	changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);	3399	changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3431	else	3400	else
3432	changed = bgPixmap.unset_tint ();	3401	changed = bgPixmap.unset_tint ();
		3402
3433	if (changed)	3403	if (changed)
3434	update_background ();	3404	update_background ();
3435	}	3405	}
3436		3406
3437	break;	3407	break;
3438	#endif	3408	#endif
3439		3409
3440	#if XPM_BACKGROUND	3410	#if BG_IMAGE_FROM_FILE
3441	case Rxvt_Pixmap:	3411	case Rxvt_Pixmap:
3442	if (!strcmp (str, "?"))	3412	if (!strcmp (str, "?"))
3443	{	3413	{
3444	char str[256];	3414	char str[256];
3445		3415
…		…
3460	changed++;	3430	changed++;
3461	str = strchr (str, ';');	3431	str = strchr (str, ';');
3462	if (str == NULL)	3432	if (str == NULL)
3463	bgPixmap.set_defaultGeometry ();	3433	bgPixmap.set_defaultGeometry ();
3464	}	3434	}
		3435
3465	while (str)	3436	while (str)
3466	{	3437	{
3467	str++;	3438	str++;
3468	if (bgPixmap.set_geometry (str))	3439	if (bgPixmap.set_geometry (str))
3469	changed++;	3440	changed++;
3470	str = strchr (str, ';');	3441	str = strchr (str, ';');
3471	}	3442	}
		3443
3472	if (changed)	3444	if (changed)
3473	update_background ();	3445	update_background ();
3474	}	3446	}
3475	break;	3447	break;
3476	#endif	3448	#endif
3477		3449
3478	case Rxvt_restoreFG:	3450	case Rxvt_restoreFG:
…		…
3632	{ 66, PrivMode_aplKP },	3604	{ 66, PrivMode_aplKP },
3633	#ifndef NO_BACKSPACE_KEY	3605	#ifndef NO_BACKSPACE_KEY
3634	{ 67, PrivMode_BackSpace },	3606	{ 67, PrivMode_BackSpace },
3635	#endif	3607	#endif
3636	{ 1000, PrivMode_MouseX11 },	3608	{ 1000, PrivMode_MouseX11 },
3637	// 1001 Use Hilite Mouse Tracking. NYI, TODO	3609	{ 1002, PrivMode_MouseBtnEvent },
3638	// 1002 Use Cell Motion Mouse Tracking. NYI, TODO	3610	{ 1003, PrivMode_MouseAnyEvent },
3639	// 1003 Use All Motion Mouse Tracking. NYI, TODO
3640	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension	3611	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension
3641	{ 1011, PrivMode_Keypress }, // rxvt extension	3612	{ 1011, PrivMode_Keypress }, // rxvt extension
3642	// 1035 enable modifiers for alt, numlock NYI	3613	// 1035 enable modifiers for alt, numlock NYI
3643	// 1036 send ESC for meta keys NYI	3614	// 1036 send ESC for meta keys NYI
3644	// 1037 send DEL for keypad delete NYI	3615	// 1037 send DEL for keypad delete NYI
…		…
3718	scr_autowrap (state);	3689	scr_autowrap (state);
3719	break;	3690	break;
3720	/* case 8: - auto repeat, can't do on a per window basis */	3691	/* case 8: - auto repeat, can't do on a per window basis */
3721	case 9: /* X10 mouse reporting */	3692	case 9: /* X10 mouse reporting */
3722	if (state) /* orthogonal */	3693	if (state) /* orthogonal */
3723	priv_modes &= ~PrivMode_MouseX11;	3694	priv_modes &= ~(PrivMode_MouseX11\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);
3724	break;	3695	break;
3725	#ifdef scrollBar_esc	3696	#ifdef scrollBar_esc
3726	case scrollBar_esc:	3697	case scrollBar_esc:
3727	if (scrollbar_mapping (state))	3698	if (scrollbar_mapping (state))
3728	{	3699	{
…		…
3741	break;	3712	break;
3742	/* case 66: - application key pad */	3713	/* case 66: - application key pad */
3743	/* case 67: - backspace key */	3714	/* case 67: - backspace key */
3744	case 1000: /* X11 mouse reporting */	3715	case 1000: /* X11 mouse reporting */
3745	if (state) /* orthogonal */	3716	if (state) /* orthogonal */
3746	priv_modes &= ~PrivMode_MouseX10;	3717	priv_modes &= ~(PrivMode_MouseX10\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);
3747	break;	3718	break;
3748	#if 0
3749	case 1001:	3719	case 1002:
3750	break; /* X11 mouse highlighting */	3720	case 1003:
3751	#endif	3721	if (state)
		3722	{
		3723	priv_modes &= ~(PrivMode_MouseX10\|PrivMode_MouseX11);
		3724	priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
		3725	vt_emask_mouse = PointerMotionMask;
		3726	}
		3727	else
		3728	vt_emask_mouse = NoEventMask;
		3729	vt_select_input ();
		3730	break;
3752	case 1010: /* scroll to bottom on TTY output inhibit */	3731	case 1010: /* scroll to bottom on TTY output inhibit */
3753	set_option (Opt_scrollTtyOutput, !state);	3732	set_option (Opt_scrollTtyOutput, !state);
3754	break;	3733	break;
3755	case 1011: /* scroll to bottom on key press */	3734	case 1011: /* scroll to bottom on key press */
3756	set_option (Opt_scrollTtyKeypress, state);	3735	set_option (Opt_scrollTtyKeypress, state);
…		…
3933	rxvt_term::process_graphics ()	3912	rxvt_term::process_graphics ()
3934	{	3913	{
3935	unicode_t ch, cmd = cmd_getc ();	3914	unicode_t ch, cmd = cmd_getc ();
3936		3915
3937	if (cmd == 'Q')	3916	if (cmd == 'Q')
		3917	{
3938	{ /* query graphics */	3918	/* query graphics */
3939	tt_printf ("\033G0\012"); /* no graphics */	3919	tt_printf ("\033G0\012"); /* no graphics */
3940	return;	3920	return;
3941	}	3921	}
3942	/* swallow other graphics sequences until terminating ':' */	3922	/* swallow other graphics sequences until terminating ':' */
3943	do	3923	do
…		…
3993	v_buffer = (char *)realloc (v_buffer, v_buflen + len);	3973	v_buffer = (char *)realloc (v_buffer, v_buflen + len);
3994		3974
3995	memcpy (v_buffer + v_buflen, data, len);	3975	memcpy (v_buffer + v_buflen, data, len);
3996	v_buflen += len;	3976	v_buflen += len;
3997		3977
3998	pty_ev.set (EVENT_READ \| EVENT_WRITE);	3978	pty_ev.set (ev::READ \| ev::WRITE);
3999	}	3979	}
4000		3980
4001	void rxvt_term::pty_write ()	3981	void rxvt_term::pty_write ()
4002	{	3982	{
4003	int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));	3983	int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
…		…
4008		3988
4009	if (v_buflen == 0)	3989	if (v_buflen == 0)
4010	{	3990	{
4011	free (v_buffer);	3991	free (v_buffer);
4012	v_buffer = 0;	3992	v_buffer = 0;
4013	v_buflen = 0;
4014		3993
4015	pty_ev.set (EVENT_READ);	3994	pty_ev.set (ev::READ);
4016	return;	3995	return;
4017	}	3996	}
4018		3997
4019	memmove (v_buffer, v_buffer + written, v_buflen);	3998	memmove (v_buffer, v_buffer + written, v_buflen);
4020	}	3999	}
4021	else if (written != -1 \|\| (errno != EAGAIN && errno != EINTR))	4000	else if (written != -1 \|\| (errno != EAGAIN && errno != EINTR))
4022	pty_ev.set (EVENT_READ);	4001	pty_ev.set (ev::READ);
4023	}	4002	}
4024		4003
4025	/----------------------- end-of-file (C source) -----------------------/	4004	/----------------------- end-of-file (C source) -----------------------/
4026		4005

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.349 by ayin, Sun Aug 26 18:16:52 2007 UTC vs. Revision 1.389 by ayin, Mon Dec 31 13:50:56 2007 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.349 by ayin, Sun Aug 26 18:16:52 2007 UTC vs.
Revision 1.389 by ayin, Mon Dec 31 13:50:56 2007 UTC