[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.377 by root, Fri Dec 14 02:22:24 2007 UTC

…		…
25	* - extensive modifications	25	* - extensive modifications
26	* Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>	26	* Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27	* Copyright (c) 2001 Marius Gedminas	27	* Copyright (c) 2001 Marius Gedminas
28	* - Ctrl/Mod4+Tab works like Meta+Tab (options)	28	* - Ctrl/Mod4+Tab works like Meta+Tab (options)
29	* Copyright (c) 2003 Rob McMullen <robm@flipturn.org>	29	* Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30	* Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>	30	* Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
31	*	31	*
32	* This program is free software; you can redistribute it and/or modify	32	* This program is free software; you can redistribute it and/or modify
33	* it under the terms of the GNU General Public License as published by	33	* it under the terms of the GNU General Public License as published by
34	* the Free Software Foundation; either version 2 of the License, or	34	* the Free Software Foundation; either version 2 of the License, or
35	* (at your option) any later version.	35	* (at your option) any later version.
…		…
547	#endif	547	#endif
548		548
549	if (keysym >= 0xFF00 && keysym <= 0xFFFF)	549	if (keysym >= 0xFF00 && keysym <= 0xFFFF)
550	{	550	{
551	{	551	{
		552	bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
552	newlen = 1;	553	newlen = 1;
		554	#ifdef XK_KP_Home
		555	static const KeySym keypadtrans[] = {
		556	XK_KP_7, // XK_KP_Home
		557	XK_KP_4, // XK_KP_Left
		558	XK_KP_8, // XK_KP_Up
		559	XK_KP_6, // XK_KP_Right
		560	XK_KP_2, // XK_KP_Down
		561	#ifndef UNSHIFTED_SCROLLKEYS
		562	XK_KP_9, // XK_KP_Prior
		563	XK_KP_3, // XK_KP_Next
		564	#else
		565	XK_Prior,
		566	XK_Next,
		567	#endif
		568	XK_KP_1, // XK_KP_End
		569	XK_KP_5, // XK_KP_Begin
		570	};
		571
		572	if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
		573	{
		574	unsigned int index = keysym - XK_KP_Home;
		575	keysym = kp ? keypadtrans[index] : XK_Home + index;
		576	}
		577	else if (keysym == XK_KP_Insert)
		578	keysym = kp ? XK_KP_0 : XK_Insert;
		579	#ifndef NO_DELETE_KEY
		580	else if (keysym == XK_KP_Delete)
		581	keysym = kp ? XK_KP_Decimal : XK_Delete;
		582	#endif
		583	#endif
553	switch (keysym)	584	switch (keysym)
554	{	585	{
555	#ifndef NO_BACKSPACE_KEY	586	#ifndef NO_BACKSPACE_KEY
556	case XK_BackSpace:	587	case XK_BackSpace:
557	if (priv_modes & PrivMode_HaveBackSpace)	588	if (priv_modes & PrivMode_HaveBackSpace)
…		…
559	kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)	590	kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
560	^ !!ctrl) ? '\b' : '\177';	591	^ !!ctrl) ? '\b' : '\177';
561	kbuf[1] = '\0';	592	kbuf[1] = '\0';
562	}	593	}
563	else	594	else
564	strcpy (kbuf, key_backspace);	595	strcpy (kbuf, rs[Rs_backspace_key]);
565	break;	596	break;
566	#endif	597	#endif
567	#ifndef NO_DELETE_KEY	598	#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:	599	case XK_Delete:
579	strcpy (kbuf, key_delete);	600	strcpy (kbuf, rs[Rs_delete_key]);
580	break;	601	break;
581	#endif	602	#endif
582	case XK_Tab:	603	case XK_Tab:
583	if (shft)	604	if (shft)
584	strcpy (kbuf, "\033[Z");	605	strcpy (kbuf, "\033[Z");
…		…
594	#endif	615	#endif
595	newlen = 0;	616	newlen = 0;
596	}	617	}
597	break;	618	break;
598		619
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" */	620	case XK_Up: /* "\033[A" */
616	case XK_Down: /* "\033[B" */	621	case XK_Down: /* "\033[B" */
617	case XK_Right: /* "\033[C" */	622	case XK_Right: /* "\033[C" */
618	case XK_Left: /* "\033[D" */	623	case XK_Left: /* "\033[D" */
619	strcpy (kbuf, "\033[Z");	624	strcpy (kbuf, "\033[Z");
…		…
629	else if (priv_modes & PrivMode_aplCUR)	634	else if (priv_modes & PrivMode_aplCUR)
630	kbuf[1] = 'O';	635	kbuf[1] = 'O';
631	break;	636	break;
632		637
633	#ifndef UNSHIFTED_SCROLLKEYS	638	#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:	639	case XK_Prior:
645	strcpy (kbuf, "\033[5~");	640	strcpy (kbuf, "\033[5~");
646	break;	641	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:	642	case XK_Next:
658	strcpy (kbuf, "\033[6~");	643	strcpy (kbuf, "\033[6~");
659	break;	644	break;
660	#endif	645	#endif
661	case XK_KP_Enter:	646	case XK_KP_Enter:
662	/* allow shift to override */	647	/* allow shift to override */
663	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)	648	if (kp)
664	{	649	{
665	strcpy (kbuf, "\033OM");	650	strcpy (kbuf, "\033OM");
666	break;	651	break;
667	}	652	}
668		653
…		…
680	kbuf[0] = '\015';	665	kbuf[0] = '\015';
681	kbuf[1] = '\0';	666	kbuf[1] = '\0';
682	}	667	}
683	break;	668	break;
684		669
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" */	670	case XK_KP_F1: /* "\033OP" */
692	case XK_KP_F2: /* "\033OQ" */	671	case XK_KP_F2: /* "\033OQ" */
693	case XK_KP_F3: /* "\033OR" */	672	case XK_KP_F3: /* "\033OR" */
694	case XK_KP_F4: /* "\033OS" */	673	case XK_KP_F4: /* "\033OS" */
695	strcpy (kbuf, "\033OP");	674	strcpy (kbuf, "\033OP");
…		…
711	case XK_KP_6: /* "\033Ov" : "6" */	690	case XK_KP_6: /* "\033Ov" : "6" */
712	case XK_KP_7: /* "\033Ow" : "7" */	691	case XK_KP_7: /* "\033Ow" : "7" */
713	case XK_KP_8: /* "\033Ox" : "8" */	692	case XK_KP_8: /* "\033Ox" : "8" */
714	case XK_KP_9: /* "\033Oy" : "9" */	693	case XK_KP_9: /* "\033Oy" : "9" */
715	/* allow shift to override */	694	/* allow shift to override */
716	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)	695	if (kp)
717	{	696	{
718	strcpy (kbuf, "\033Oj");	697	strcpy (kbuf, "\033Oj");
719	kbuf[2] += (keysym - XK_KP_Multiply);	698	kbuf[2] += (keysym - XK_KP_Multiply);
720	}	699	}
721	else	700	else
…		…
727		706
728	case XK_Find:	707	case XK_Find:
729	strcpy (kbuf, "\033[1~");	708	strcpy (kbuf, "\033[1~");
730	break;	709	break;
731		710
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:	711	case XK_Insert:
743	strcpy (kbuf, "\033[2~");	712	strcpy (kbuf, "\033[2~");
744	break;	713	break;
745	#ifdef DXK_Remove /* support for DEC remove like key */	714	#ifdef DXK_Remove /* support for DEC remove like key */
746	case DXK_Remove:	715	case DXK_Remove:
…		…
750	strcpy (kbuf, "\033[3~");	719	strcpy (kbuf, "\033[3~");
751	break;	720	break;
752	case XK_Select:	721	case XK_Select:
753	strcpy (kbuf, "\033[4~");	722	strcpy (kbuf, "\033[4~");
754	break;	723	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:	724	case XK_End:
766	strcpy (kbuf, KS_END);	725	strcpy (kbuf, KS_END);
767	break;	726	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:	727	case XK_Home:
779	strcpy (kbuf, KS_HOME);	728	strcpy (kbuf, KS_HOME);
780	break;	729	break;
781		730
782	#define FKEY(n, fkey) \	731	#define FKEY(n, fkey) \
…		…
1034	void	983	void
1035	rxvt_term::flush ()	984	rxvt_term::flush ()
1036	{	985	{
1037	flush_ev.stop ();	986	flush_ev.stop ();
1038		987
1039	#ifdef ENABLE_TRANSPARENCY	988	#ifdef HAVE_BG_PIXMAP
1040	if (want_full_refresh)	989	if (bgPixmap.check_clearChanged ())
1041	{	990	{
1042	want_full_refresh = 0;	991	// scr_clear (true); This needs to be researched further!
1043	scr_clear ();
1044	scr_touch (false);	992	scr_touch (false);
1045	}	993	}
1046	#endif	994	#endif
1047		995
1048	if (want_refresh)	996	if (want_refresh)
…		…
1094		1042
1095	display->flush ();	1043	display->flush ();
1096	}	1044	}
1097		1045
1098	void	1046	void
1099	rxvt_term::check_cb (check_watcher &w)	1047	rxvt_term::prepare_cb (ev::prepare &w, int revents)
1100	{	1048	{
1101	make_current ();	1049	make_current ();
1102		1050
1103	display->flush ();	1051	display->flush ();
1104		1052
1105	if (want_refresh && !flush_ev.active)	1053	if (want_refresh && !flush_ev.is_active ())
1106	flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally	1054	flush_ev.start (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
1125	w.start (w.at + CURSOR_BLINK_INTERVAL);
1126	}	1072	}
1127	#endif	1073	#endif
1128		1074
1129	#ifdef TEXT_BLINK	1075	#ifdef TEXT_BLINK
1130	void	1076	void
1131	rxvt_term::text_blink_cb (time_watcher &w)	1077	rxvt_term::text_blink_cb (ev::timer &w, int revents)
1132	{	1078	{
1133	if (scr_refresh_rend (RS_Blink, RS_Blink))	1079	if (scr_refresh_rend (RS_Blink, RS_Blink))
1134	{	1080	{
1135	hidden_text = !hidden_text;	1081	hidden_text = !hidden_text;
1136	want_refresh = 1;	1082	want_refresh = 1;
1137	w.start (w.at + TEXT_BLINK_INTERVAL);
1138	}	1083	}
		1084	else
		1085	w.stop ();
1139	}	1086	}
1140	#endif	1087	#endif
1141		1088
1142	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	1089	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1143	void	1090	void
1144	rxvt_term::cont_scroll_cb (time_watcher &w)	1091	rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1145	{	1092	{
1146	if ((scrollbar_isUp() \|\| scrollbar_isDn()) &&	1093	if ((scrollbar_isUp() \|\| scrollbar_isDn()) &&
1147	scr_page (scrollbar_isUp() ? UP : DN, 1))	1094	scr_page (scrollbar_isUp() ? UP : DN, 1))
1148	{
1149	want_refresh = 1;	1095	want_refresh = 1;
1150	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1096	else
1151	}	1097	w.stop ();
1152	}	1098	}
1153	#endif	1099	#endif
1154		1100
1155	#ifdef SELECTION_SCROLLING	1101	#ifdef SELECTION_SCROLLING
1156	void	1102	void
1157	rxvt_term::sel_scroll_cb (time_watcher &w)	1103	rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1158	{	1104	{
1159	if (scr_page (scroll_selection_dir, scroll_selection_lines))	1105	if (scr_page (scroll_selection_dir, scroll_selection_lines))
1160	{	1106	{
1161	selection_extend (selection_save_x, selection_save_y, selection_save_state);	1107	selection_extend (selection_save_x, selection_save_y, selection_save_state);
1162	want_refresh = 1;	1108	want_refresh = 1;
1163	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1164	}	1109	}
		1110	else
		1111	w.stop ();
1165	}	1112	}
1166	#endif	1113	#endif
1167		1114
1168	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	1115	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1169	void	1116	void
1170	rxvt_term::slip_wheel_cb (time_watcher &w)	1117	rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1171	{	1118	{
1172	if (mouse_slip_wheel_speed == 0	1119	if (mouse_slip_wheel_speed == 0
1173	\|\| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)	1120	\|\| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1174	: scr_page (UP, mouse_slip_wheel_speed))	1121	: scr_page (UP, mouse_slip_wheel_speed))
1175	{	1122	{
1176	if (view_start == top_row \|\| view_start == 0)	1123	if (view_start == top_row \|\| view_start == 0)
1177	mouse_slip_wheel_speed = 0;	1124	mouse_slip_wheel_speed = 0;
1178		1125
1179	want_refresh = 1;	1126	want_refresh = 1;
1180	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1181	}	1127	}
		1128	else
		1129	w.stop ();
1182	}	1130	}
1183	#endif	1131	#endif
1184		1132
1185	#if LINUX_YIELD_HACK	1133	#if LINUX_YIELD_HACK
1186	static struct event_handler	1134	static struct event_handler
1187	{	1135	{
1188	check_watcher yield_ev;	1136	ev::prepare yield_ev;
1189		1137
1190	void yield_cb (check_watcher &w)	1138	void yield_cb (ev::prepare &w, int revents)
1191	{	1139	{
1192	// this should really be sched_yield(), but the linux guys thought	1140	// this should really be sched_yield(), but the linux guys thought
1193	// that giving a process calling sched_yield () less cpu time than	1141	// 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	1142	// ones with high nice levels is a useful thing to do. It surely is is
1195	// allowed by the sus... as is returning ENOSYS.	1143	// allowed by the sus... as is returning ENOSYS.
…		…
1246		1194
1247	return false;	1195	return false;
1248	}	1196	}
1249		1197
1250	void	1198	void
1251	rxvt_term::pty_cb (io_watcher &w, short revents)	1199	rxvt_term::pty_cb (ev::io &w, int revents)
1252	{	1200	{
1253	make_current ();	1201	make_current ();
1254		1202
1255	if (revents & EVENT_READ)	1203	if (revents & ev::READ)
1256	// loop, but don't allow a single term to monopolize us	1204	// loop, but don't allow a single term to monopolize us
1257	while (pty_fill ())	1205	while (pty_fill ())
1258	if (cmd_parse ())	1206	if (cmd_parse ())
1259	break;	1207	break;
1260		1208
1261	if (revents & EVENT_WRITE)	1209	if (revents & ev::WRITE)
1262	pty_write ();	1210	pty_write ();
1263	}	1211	}
1264		1212
1265	void	1213	void
1266	rxvt_term::pointer_unblank ()	1214	rxvt_term::pointer_unblank ()
…		…
1270		1218
1271	#ifdef POINTER_BLANK	1219	#ifdef POINTER_BLANK
1272	hidden_pointer = 0;	1220	hidden_pointer = 0;
1273		1221
1274	if (option (Opt_pointerBlank))	1222	if (option (Opt_pointerBlank))
1275	pointer_ev.start (NOW + pointerBlankDelay);	1223	pointer_ev.start (pointerBlankDelay);
1276	#endif	1224	#endif
1277	}	1225	}
1278		1226
1279	#ifdef POINTER_BLANK	1227	#ifdef POINTER_BLANK
1280	void	1228	void
…		…
1288		1236
1289	hidden_pointer = 1;	1237	hidden_pointer = 1;
1290	}	1238	}
1291		1239
1292	void	1240	void
1293	rxvt_term::pointer_cb (time_watcher &w)	1241	rxvt_term::pointer_cb (ev::timer &w, int revents)
1294	{	1242	{
1295	make_current ();	1243	make_current ();
1296		1244
1297	pointer_blank ();	1245	pointer_blank ();
1298	}	1246	}
…		…
1301	void	1249	void
1302	rxvt_term::mouse_report (XButtonEvent &ev)	1250	rxvt_term::mouse_report (XButtonEvent &ev)
1303	{	1251	{
1304	int button_number, key_state = 0;	1252	int button_number, key_state = 0;
1305	int x, y;	1253	int x, y;
		1254	int code = 32;
1306		1255
1307	x = ev.x;	1256	x = Pixel2Col (ev.x);
1308	y = ev.y;	1257	y = Pixel2Row (ev.y);
1309	pixel_position (&x, &y);	1258	if (ev.type == MotionNotify)
		1259	{
		1260	if (x == mouse_row && y == mouse_col)
		1261	return;
		1262	mouse_row = x;
		1263	mouse_col = y;
		1264	code += 32;
		1265	}
1310		1266
1311	if (MEvent.button == AnyButton)	1267	if (MEvent.button == AnyButton)
1312	button_number = 3;	1268	button_number = 3;
1313	else	1269	else
1314	{	1270	{
…		…
1360	x + 1,	1316	x + 1,
1361	y + 1);	1317	y + 1);
1362	#endif	1318	#endif
1363		1319
1364	tt_printf ("\033[M%c%c%c",	1320	tt_printf ("\033[M%c%c%c",
1365	(32 + button_number + key_state),	1321	(code + button_number + key_state),
1366	(32 + x + 1),	1322	(32 + x + 1),
1367	(32 + y + 1));	1323	(32 + y + 1));
1368	}	1324	}
1369		1325
1370	/{{{ process an X event /	1326	/{{{ process an X event /
…		…
1474	&& ev.xfocus.mode != NotifyGrab)	1430	&& ev.xfocus.mode != NotifyGrab)
1475	focus_out ();	1431	focus_out ();
1476	break;	1432	break;
1477		1433
1478	case ConfigureNotify:	1434	case ConfigureNotify:
		1435	/* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
		1436	ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
		1437	szHint.width, szHint.height); */
1479	if (ev.xconfigure.window == parent[0])	1438	if (ev.xconfigure.window == parent[0])
1480	{	1439	{
1481	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))	1440	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1482	;	1441	;
1483		1442
…		…
1486	seen_resize = 1;	1445	seen_resize = 1;
1487	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1446	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1488	}	1447	}
1489	else	1448	else
1490	{	1449	{
1491	#ifdef ENABLE_TRANSPARENCY	1450	#ifdef HAVE_BG_PIXMAP
1492	if (option (Opt_transparent))	1451	if (bgPixmap.window_position_sensitive ())
1493	if (bgPixmap.render ())	1452	update_background ();
1494	scr_touch (false);
1495	#endif	1453	#endif
1496	}	1454	}
1497	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));	1455	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1498	}	1456	}
1499	break;	1457	break;
…		…
1520	break;	1478	break;
1521		1479
1522	case MapNotify:	1480	case MapNotify:
1523	mapped = 1;	1481	mapped = 1;
1524	#ifdef TEXT_BLINK	1482	#ifdef TEXT_BLINK
1525	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);	1483	text_blink_ev.start ();
1526	#endif	1484	#endif
1527	HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));	1485	HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1528	break;	1486	break;
1529		1487
1530	case UnmapNotify:	1488	case UnmapNotify:
…		…
1532	#ifdef TEXT_BLINK	1490	#ifdef TEXT_BLINK
1533	text_blink_ev.stop ();	1491	text_blink_ev.stop ();
1534	#endif	1492	#endif
1535	HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));	1493	HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1536	break;	1494	break;
1537
1538	#ifdef ENABLE_TRANSPARENCY
1539	case ReparentNotify:
1540	rootwin_cb (ev);
1541	break;
1542	#endif /* ENABLE_TRANSPARENCY */
1543		1495
1544	case GraphicsExpose:	1496	case GraphicsExpose:
1545	case Expose:	1497	case Expose:
1546	if (ev.xany.window == vt)	1498	if (ev.xany.window == vt)
1547	{	1499	{
1548	do	1500	do
		1501	{
1549	scr_expose (ev.xexpose.x, ev.xexpose.y,	1502	scr_expose (ev.xexpose.x, ev.xexpose.y,
1550	ev.xexpose.width, ev.xexpose.height, False);	1503	ev.xexpose.width, ev.xexpose.height, False);
		1504	}
1551	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));	1505	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1552		1506
1553	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1507	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1554		1508
1555	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))	1509	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
		1510	{
1556	scr_expose (ev.xexpose.x, ev.xexpose.y,	1511	scr_expose (ev.xexpose.x, ev.xexpose.y,
1557	ev.xexpose.width, ev.xexpose.height, False);	1512	ev.xexpose.width, ev.xexpose.height, False);
1558		1513	}
1559	want_refresh = 1;	1514	want_refresh = 1;
1560	}	1515	}
1561	else	1516	else
1562	{	1517	{
1563	XEvent unused_event;	1518	XEvent unused_event;
…		…
1578	case MotionNotify:	1533	case MotionNotify:
1579	#ifdef POINTER_BLANK	1534	#ifdef POINTER_BLANK
1580	if (hidden_pointer)	1535	if (hidden_pointer)
1581	pointer_unblank ();	1536	pointer_unblank ();
1582	#endif	1537	#endif
		1538	if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask\|Button2Mask\|Button3Mask))
		1539	\|\| priv_modes & PrivMode_MouseAnyEvent)
		1540	mouse_report (ev.xbutton);
1583	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)	1541	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1584	break;	1542	break;
1585		1543
1586	if (ev.xany.window == vt)	1544	if (ev.xany.window == vt)
1587	{	1545	{
…		…
1621	int dist;	1579	int dist;
1622		1580
1623	/* don't clobber the current delay if we are	1581	/* don't clobber the current delay if we are
1624	* already in the middle of scrolling.	1582	* already in the middle of scrolling.
1625	*/	1583	*/
1626	if (!sel_scroll_ev.active)	1584	if (!sel_scroll_ev.is_active ())
1627	sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);	1585	sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1628		1586
1629	/* save the event params so we can highlight	1587	/* save the event params so we can highlight
1630	* the selection in the pending-scroll loop	1588	* the selection in the pending-scroll loop
1631	*/	1589	*/
1632	selection_save_x = ev.xbutton.x;	1590	selection_save_x = ev.xbutton.x;
…		…
1654	else	1612	else
1655	{	1613	{
1656	/* we are within the text window, so we	1614	/* we are within the text window, so we
1657	* shouldn't be scrolling	1615	* shouldn't be scrolling
1658	*/	1616	*/
1659	if (sel_scroll_ev.active)
1660	sel_scroll_ev.stop();	1617	sel_scroll_ev.stop();
1661	}	1618	}
1662	#endif	1619	#endif
1663	#ifdef MOUSE_THRESHOLD	1620	#ifdef MOUSE_THRESHOLD
1664	}	1621	}
1665	#endif	1622	#endif
…		…
1691	{	1648	{
1692	hidden_cursor = 0;	1649	hidden_cursor = 0;
1693	want_refresh = 1;	1650	want_refresh = 1;
1694	}	1651	}
1695		1652
1696	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);	1653	cursor_blink_ev.again ();
1697	}	1654	}
1698	#endif	1655	#endif
1699		1656
1700	#if defined(POINTER_BLANK)	1657	#if defined(POINTER_BLANK)
1701	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)	1658	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
…		…
1729	XSetICFocus (Input_Context);	1686	XSetICFocus (Input_Context);
1730	}	1687	}
1731	#endif	1688	#endif
1732	#if CURSOR_BLINK	1689	#if CURSOR_BLINK
1733	if (option (Opt_cursorBlink))	1690	if (option (Opt_cursorBlink))
1734	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);	1691	cursor_blink_ev.again ();
1735	#endif	1692	#endif
1736	#if OFF_FOCUS_FADING	1693	#if OFF_FOCUS_FADING
1737	if (rs[Rs_fade])	1694	if (rs[Rs_fade])
1738	{	1695	{
1739	pix_colors = pix_colors_focused;	1696	pix_colors = pix_colors_focused;
…		…
1741	}	1698	}
1742	#endif	1699	#endif
1743	#if ENABLE_FRILLS	1700	#if ENABLE_FRILLS
1744	if (option (Opt_urgentOnBell))	1701	if (option (Opt_urgentOnBell))
1745	{	1702	{
1746	XWMHints *h;
1747
1748	h = XGetWMHints(dpy, parent[0]);	1703	if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1749	if (h != NULL)
1750	{	1704	{
1751	h->flags &= ~XUrgencyHint;	1705	h->flags &= ~XUrgencyHint;
1752	XSetWMHints(dpy, parent[0], h);	1706	XSetWMHints (dpy, parent[0], h);
1753	}	1707	}
1754	}	1708	}
1755	#endif	1709	#endif
1756	}	1710	}
1757	}	1711	}
…		…
1780	XUnsetICFocus (Input_Context);	1734	XUnsetICFocus (Input_Context);
1781	#endif	1735	#endif
1782	#if CURSOR_BLINK	1736	#if CURSOR_BLINK
1783	if (option (Opt_cursorBlink))	1737	if (option (Opt_cursorBlink))
1784	cursor_blink_ev.stop ();	1738	cursor_blink_ev.stop ();
		1739
1785	hidden_cursor = 0;	1740	hidden_cursor = 0;
1786	#endif	1741	#endif
1787	#if OFF_FOCUS_FADING	1742	#if OFF_FOCUS_FADING
1788	if (rs[Rs_fade])	1743	if (rs[Rs_fade])
1789	{	1744	{
…		…
1827	*/	1782	*/
1828	if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]	1783	if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1829	\|\| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])	1784	\|\| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1830	{	1785	{
1831	bgPixmap.set_root_pixmap ();	1786	bgPixmap.set_root_pixmap ();
1832	bgPixmap.render ();	1787	update_background ();
1833	}	1788	}
1834	break;	1789	break;
1835	}	1790	}
1836	# endif	1791	# endif
1837	}	1792	}
…		…
1896	mouse_report (ev);	1851	mouse_report (ev);
1897	}	1852	}
1898	#else	1853	#else
1899	MEvent.button = ev.button;	1854	MEvent.button = ev.button;
1900	mouse_report (ev);	1855	mouse_report (ev);
1901	#endif /* MOUSE_REPORT_DOUBLECLICK */	1856	#endif /* MOUSE_REPORT_DOUBLECLICK */
1902		1857
1903	}	1858	}
1904	else	1859	else
1905	{	1860	{
1906	if (ev.button != MEvent.button)	1861	if (ev.button != MEvent.button)
…		…
2000	tt_printf ("\033[5~");	1955	tt_printf ("\033[5~");
2001	break;	1956	break;
2002	}	1957	}
2003	}	1958	}
2004	else	1959	else
2005	#endif /* NO_SCROLLBAR_REPORT */	1960	#endif /* NO_SCROLLBAR_REPORT */
2006		1961
2007	{	1962	{
2008	char upordown = 0;	1963	char upordown = 0;
2009		1964
2010	if (scrollBar.style == R_SB_NEXT)	1965	if (scrollBar.style == R_SB_NEXT)
2011	{	1966	{
2012	if (scrollbarnext_upButton (ev.y))	1967	if (scrollbarnext_upButton (ev.y))
2013	upordown = -1; /* up */	1968	upordown = -1; /* up */
…		…
2019	if (scrollbarrxvt_upButton (ev.y))	1974	if (scrollbarrxvt_upButton (ev.y))
2020	upordown = -1; /* up */	1975	upordown = -1; /* up */
2021	else if (scrollbarrxvt_dnButton (ev.y))	1976	else if (scrollbarrxvt_dnButton (ev.y))
2022	upordown = 1; /* down */	1977	upordown = 1; /* down */
2023	}	1978	}
		1979
2024	if (upordown)	1980	if (upordown)
2025	{	1981	{
2026	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	1982	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
		1983	if (!cont_scroll_ev.is_active ())
2027	cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);	1984	cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2028	#endif	1985	#endif
2029	if (scr_page (upordown < 0 ? UP : DN, 1))	1986	if (scr_page (upordown < 0 ? UP : DN, 1))
2030	{	1987	{
2031	if (upordown < 0)	1988	if (upordown < 0)
2032	scrollBar.setUp ();	1989	scrollBar.setUp ();
…		…
2112	scrollBar.setIdle ();	2069	scrollBar.setIdle ();
2113	scrollbar_show (0);	2070	scrollbar_show (0);
2114	}	2071	}
2115		2072
2116	#ifdef SELECTION_SCROLLING	2073	#ifdef SELECTION_SCROLLING
2117	if (sel_scroll_ev.active)
2118	sel_scroll_ev.stop();	2074	sel_scroll_ev.stop();
2119	#endif	2075	#endif
2120		2076
2121	if (ev.window == vt)	2077	if (ev.window == vt)
2122	{	2078	{
2123	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))	2079	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
…		…
2147	mouse_report (ev);	2103	mouse_report (ev);
2148	}	2104	}
2149	#else /* MOUSE_REPORT_DOUBLECLICK */	2105	#else /* MOUSE_REPORT_DOUBLECLICK */
2150	MEvent.button = AnyButton;	2106	MEvent.button = AnyButton;
2151	mouse_report (ev);	2107	mouse_report (ev);
2152	#endif /* MOUSE_REPORT_DOUBLECLICK */	2108	#endif /* MOUSE_REPORT_DOUBLECLICK */
2153	return;	2109	return;
2154	}	2110	}
2155		2111
2156	/*	2112	/*
2157	* dumb hack to compensate for the failure of click-and-drag	2113	* dumb hack to compensate for the failure of click-and-drag
…		…
2195	{	2151	{
2196	mouse_slip_wheel_speed += v ? -1 : 1;	2152	mouse_slip_wheel_speed += v ? -1 : 1;
2197	if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;	2153	if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2198	if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;	2154	if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2199		2155
2200	if (slip_wheel_ev.at < NOW)	2156	if (!slip_wheel_ev.is_active ())
2201	slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;	2157	slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2202
2203	slip_wheel_ev.start ();
2204	}	2158	}
2205	else	2159	else
2206	{	2160	{
2207	# endif	2161	# endif
2208	scr_page (v, i);	2162	scr_page (v, i);
…		…
2276		2230
2277	if (!option (Opt_jumpScroll) \|\| refresh_count >= nrow - 1)	2231	if (!option (Opt_jumpScroll) \|\| refresh_count >= nrow - 1)
2278	{	2232	{
2279	refresh_count = 0;	2233	refresh_count = 0;
2280		2234
2281	if (!option (Opt_skipScroll) \|\| io_manager::now () > NOW + 1. / 60.)	2235	if (!option (Opt_skipScroll) \|\| ev_time () > ev::now () + 1. / 60.)
2282	{	2236	{
2283	refreshnow = true;	2237	refreshnow = true;
2284	ch = NOCHAR;	2238	ch = NOCHAR;
2285	break;	2239	break;
2286	}	2240	}
…		…
2497	}	2451	}
2498	}	2452	}
2499		2453
2500	pclose_printer (fd);	2454	pclose_printer (fd);
2501	}	2455	}
2502	#endif /* PRINTPIPE */	2456	#endif /* PRINTPIPE */
2503	/}}} /	2457	/}}} /
2504		2458
2505	/* INDENT-OFF */	2459	/* INDENT-OFF */
2506	enum {	2460	enum {
2507	C1_40 = 0x40,	2461	C1_40 = 0x40,
…		…
2793	rxvt_term::process_csi_seq ()	2747	rxvt_term::process_csi_seq ()
2794	{	2748	{
2795	unicode_t ch, priv, i;	2749	unicode_t ch, priv, i;
2796	unsigned int nargs, p;	2750	unsigned int nargs, p;
2797	int n, ndef;	2751	int n, ndef;
2798	int arg[ESC_ARGS];	2752	int arg[ESC_ARGS] = { };
2799		2753
2800	memset (arg, 0, sizeof (arg));
2801	nargs = 0;	2754	nargs = 0;
2802		2755
2803	priv = 0;	2756	priv = 0;
2804	ch = cmd_getc ();	2757	ch = cmd_getc ();
2805	if (ch >= '<' && ch <= '?')	2758	if (ch >= '<' && ch <= '?')
		2759	{
2806	{ /* '<' '=' '>' '?' */	2760	/* '<' '=' '>' '?' */
2807	priv = ch;	2761	priv = ch;
2808	ch = cmd_getc ();	2762	ch = cmd_getc ();
2809	}	2763	}
2810		2764
2811	/* read any numerical arguments */	2765	/* read any numerical arguments */
…		…
2854	{	2808	{
2855	// first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,	2809	// first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2856	// 'U' for rxvt-unicode != 7.[34] (where it was broken).	2810	// 'U' for rxvt-unicode != 7.[34] (where it was broken).
2857	//	2811	//
2858	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt	2812	// 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	2813	// 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).	2814	// versions.
2861	//	2815	//
2862	tt_printf ("\033[>%d;94;0c", 'U');	2816	tt_printf ("\033[>%d;95;0c", 'U');
2863	}	2817	}
2864	break;	2818	break;
2865	case '?':	2819	case '?':
2866	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')	2820	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')
2867	process_terminal_mode (ch, priv, nargs, arg);	2821	process_terminal_mode (ch, priv, nargs, arg);
…		…
3428	if (ISSET_PIXCOLOR (Color_tint))	3382	if (ISSET_PIXCOLOR (Color_tint))
3429	changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);	3383	changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3430	else	3384	else
3431	changed = bgPixmap.unset_tint ();	3385	changed = bgPixmap.unset_tint ();
3432	if (changed)	3386	if (changed)
3433	bgPixmap.render ();	3387	update_background ();
3434	}	3388	}
3435		3389
3436	break;	3390	break;
3437	#endif	3391	#endif
3438		3392
3439	#if XPM_BACKGROUND	3393	#if BG_IMAGE_FROM_FILE
3440	case Rxvt_Pixmap:	3394	case Rxvt_Pixmap:
3441	if (!strcmp (str, "?"))	3395	if (!strcmp (str, "?"))
3442	{	3396	{
3443	char str[256];	3397	char str[256];
3444		3398
…		…
3467	if (bgPixmap.set_geometry (str))	3421	if (bgPixmap.set_geometry (str))
3468	changed++;	3422	changed++;
3469	str = strchr (str, ';');	3423	str = strchr (str, ';');
3470	}	3424	}
3471	if (changed)	3425	if (changed)
3472	{	3426	update_background ();
3473	bgPixmap.render ();
3474	scr_touch (true);
3475	}
3476	}	3427	}
3477	break;	3428	break;
3478	#endif	3429	#endif
3479		3430
3480	case Rxvt_restoreFG:	3431	case Rxvt_restoreFG:
…		…
3634	{ 66, PrivMode_aplKP },	3585	{ 66, PrivMode_aplKP },
3635	#ifndef NO_BACKSPACE_KEY	3586	#ifndef NO_BACKSPACE_KEY
3636	{ 67, PrivMode_BackSpace },	3587	{ 67, PrivMode_BackSpace },
3637	#endif	3588	#endif
3638	{ 1000, PrivMode_MouseX11 },	3589	{ 1000, PrivMode_MouseX11 },
3639	// 1001 Use Hilite Mouse Tracking. NYI, TODO	3590	{ 1002, PrivMode_MouseBtnEvent },
3640	// 1002 Use Cell Motion Mouse Tracking. NYI, TODO	3591	{ 1003, PrivMode_MouseAnyEvent },
3641	// 1003 Use All Motion Mouse Tracking. NYI, TODO
3642	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension	3592	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension
3643	{ 1011, PrivMode_Keypress }, // rxvt extension	3593	{ 1011, PrivMode_Keypress }, // rxvt extension
3644	// 1035 enable modifiers for alt, numlock NYI	3594	// 1035 enable modifiers for alt, numlock NYI
3645	// 1036 send ESC for meta keys NYI	3595	// 1036 send ESC for meta keys NYI
3646	// 1037 send DEL for keypad delete NYI	3596	// 1037 send DEL for keypad delete NYI
…		…
3720	scr_autowrap (state);	3670	scr_autowrap (state);
3721	break;	3671	break;
3722	/* case 8: - auto repeat, can't do on a per window basis */	3672	/* case 8: - auto repeat, can't do on a per window basis */
3723	case 9: /* X10 mouse reporting */	3673	case 9: /* X10 mouse reporting */
3724	if (state) /* orthogonal */	3674	if (state) /* orthogonal */
3725	priv_modes &= ~PrivMode_MouseX11;	3675	priv_modes &= ~(PrivMode_MouseX11\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);
3726	break;	3676	break;
3727	#ifdef scrollBar_esc	3677	#ifdef scrollBar_esc
3728	case scrollBar_esc:	3678	case scrollBar_esc:
3729	if (scrollbar_mapping (state))	3679	if (scrollbar_mapping (state))
3730	{	3680	{
…		…
3743	break;	3693	break;
3744	/* case 66: - application key pad */	3694	/* case 66: - application key pad */
3745	/* case 67: - backspace key */	3695	/* case 67: - backspace key */
3746	case 1000: /* X11 mouse reporting */	3696	case 1000: /* X11 mouse reporting */
3747	if (state) /* orthogonal */	3697	if (state) /* orthogonal */
3748	priv_modes &= ~PrivMode_MouseX10;	3698	priv_modes &= ~(PrivMode_MouseX10\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);
3749	break;	3699	break;
3750	#if 0
3751	case 1001:	3700	case 1002:
3752	break; /* X11 mouse highlighting */	3701	case 1003:
3753	#endif	3702	if (state)
		3703	{
		3704	priv_modes &= ~(PrivMode_MouseX10\|PrivMode_MouseX11);
		3705	priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
		3706	vt_emask_mouse = PointerMotionMask;
		3707	}
		3708	else
		3709	vt_emask_mouse = NoEventMask;
		3710	vt_select_input ();
		3711	break;
3754	case 1010: /* scroll to bottom on TTY output inhibit */	3712	case 1010: /* scroll to bottom on TTY output inhibit */
3755	set_option (Opt_scrollTtyOutput, !state);	3713	set_option (Opt_scrollTtyOutput, !state);
3756	break;	3714	break;
3757	case 1011: /* scroll to bottom on key press */	3715	case 1011: /* scroll to bottom on key press */
3758	set_option (Opt_scrollTtyKeypress, state);	3716	set_option (Opt_scrollTtyKeypress, state);
…		…
3935	rxvt_term::process_graphics ()	3893	rxvt_term::process_graphics ()
3936	{	3894	{
3937	unicode_t ch, cmd = cmd_getc ();	3895	unicode_t ch, cmd = cmd_getc ();
3938		3896
3939	if (cmd == 'Q')	3897	if (cmd == 'Q')
		3898	{
3940	{ /* query graphics */	3899	/* query graphics */
3941	tt_printf ("\033G0\012"); /* no graphics */	3900	tt_printf ("\033G0\012"); /* no graphics */
3942	return;	3901	return;
3943	}	3902	}
3944	/* swallow other graphics sequences until terminating ':' */	3903	/* swallow other graphics sequences until terminating ':' */
3945	do	3904	do
…		…
3995	v_buffer = (char *)realloc (v_buffer, v_buflen + len);	3954	v_buffer = (char *)realloc (v_buffer, v_buflen + len);
3996		3955
3997	memcpy (v_buffer + v_buflen, data, len);	3956	memcpy (v_buffer + v_buflen, data, len);
3998	v_buflen += len;	3957	v_buflen += len;
3999		3958
4000	pty_ev.set (EVENT_READ \| EVENT_WRITE);	3959	pty_ev.set (ev::READ \| ev::WRITE);
4001	}	3960	}
4002		3961
4003	void rxvt_term::pty_write ()	3962	void rxvt_term::pty_write ()
4004	{	3963	{
4005	int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));	3964	int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
…		…
4010		3969
4011	if (v_buflen == 0)	3970	if (v_buflen == 0)
4012	{	3971	{
4013	free (v_buffer);	3972	free (v_buffer);
4014	v_buffer = 0;	3973	v_buffer = 0;
4015	v_buflen = 0;
4016		3974
4017	pty_ev.set (EVENT_READ);	3975	pty_ev.set (ev::READ);
4018	return;	3976	return;
4019	}	3977	}
4020		3978
4021	memmove (v_buffer, v_buffer + written, v_buflen);	3979	memmove (v_buffer, v_buffer + written, v_buflen);
4022	}	3980	}
4023	else if (written != -1 \|\| (errno != EAGAIN && errno != EINTR))	3981	else if (written != -1 \|\| (errno != EAGAIN && errno != EINTR))
4024	pty_ev.set (EVENT_READ);	3982	pty_ev.set (ev::READ);
4025	}	3983	}
4026		3984
4027	/----------------------- end-of-file (C source) -----------------------/	3985	/----------------------- end-of-file (C source) -----------------------/
4028		3986

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.377 by root, Fri Dec 14 02:22:24 2007 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.377 by root, Fri Dec 14 02:22:24 2007 UTC