[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.381 by root, Fri Dec 14 05:25:23 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)
…		…
1093	}	1041	}
1094		1042
1095	display->flush ();	1043	display->flush ();
1096	}	1044	}
1097		1045
		1046	/* checks wether a refresh is requested and starts the refresh timer */
1098	void	1047	void
1099	rxvt_term::check_cb (check_watcher &w)	1048	rxvt_term::refresh_check ()
1100	{	1049	{
1101	make_current ();
1102
1103	display->flush ();
1104
1105	if (want_refresh && !flush_ev.active)	1050	if (want_refresh && !flush_ev.is_active ())
1106	flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally	1051	flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1107	}	1052	}
1108		1053
1109	void	1054	void
1110	rxvt_term::flush_cb (time_watcher &w)	1055	rxvt_term::flush_cb (ev::timer &w, int revents)
1111	{	1056	{
1112	make_current ();	1057	make_current ();
1113		1058
1114	refresh_count = 0;	1059	refresh_count = 0;
1115	flush ();	1060	flush ();
1116	}	1061	}
1117		1062
1118	#ifdef CURSOR_BLINK	1063	#ifdef CURSOR_BLINK
1119	void	1064	void
1120	rxvt_term::cursor_blink_cb (time_watcher &w)	1065	rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1121	{	1066	{
1122	hidden_cursor = !hidden_cursor;	1067	hidden_cursor = !hidden_cursor;
1123	want_refresh = 1;	1068	want_refresh = 1;
1124		1069	refresh_check ();
1125	w.start (w.at + CURSOR_BLINK_INTERVAL);
1126	}	1070	}
1127	#endif	1071	#endif
1128		1072
1129	#ifdef TEXT_BLINK	1073	#ifdef TEXT_BLINK
1130	void	1074	void
1131	rxvt_term::text_blink_cb (time_watcher &w)	1075	rxvt_term::text_blink_cb (ev::timer &w, int revents)
1132	{	1076	{
1133	if (scr_refresh_rend (RS_Blink, RS_Blink))	1077	if (scr_refresh_rend (RS_Blink, RS_Blink))
1134	{	1078	{
1135	hidden_text = !hidden_text;	1079	hidden_text = !hidden_text;
1136	want_refresh = 1;	1080	want_refresh = 1;
1137	w.start (w.at + TEXT_BLINK_INTERVAL);	1081	refresh_check ();
1138	}	1082	}
		1083	else
		1084	w.stop ();
1139	}	1085	}
1140	#endif	1086	#endif
1141		1087
1142	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	1088	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1143	void	1089	void
1144	rxvt_term::cont_scroll_cb (time_watcher &w)	1090	rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1145	{	1091	{
1146	if ((scrollbar_isUp() \|\| scrollbar_isDn()) &&	1092	if ((scrollbar_isUp () \|\| scrollbar_isDn ())
1147	scr_page (scrollbar_isUp() ? UP : DN, 1))	1093	&& scr_page (scrollbar_isUp () ? UP : DN, 1))
1148	{	1094	{
1149	want_refresh = 1;	1095	want_refresh = 1;
1150	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1096	refresh_check ();
1151	}	1097	}
		1098	else
		1099	w.stop ();
1152	}	1100	}
1153	#endif	1101	#endif
1154		1102
1155	#ifdef SELECTION_SCROLLING	1103	#ifdef SELECTION_SCROLLING
1156	void	1104	void
1157	rxvt_term::sel_scroll_cb (time_watcher &w)	1105	rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1158	{	1106	{
1159	if (scr_page (scroll_selection_dir, scroll_selection_lines))	1107	if (scr_page (scroll_selection_dir, scroll_selection_lines))
1160	{	1108	{
1161	selection_extend (selection_save_x, selection_save_y, selection_save_state);	1109	selection_extend (selection_save_x, selection_save_y, selection_save_state);
1162	want_refresh = 1;	1110	want_refresh = 1;
1163	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1111	refresh_check ();
1164	}	1112	}
		1113	else
		1114	w.stop ();
1165	}	1115	}
1166	#endif	1116	#endif
1167		1117
1168	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	1118	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1169	void	1119	void
1170	rxvt_term::slip_wheel_cb (time_watcher &w)	1120	rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1171	{	1121	{
1172	if (mouse_slip_wheel_speed == 0	1122	if (scr_changeview (view_start - mouse_slip_wheel_speed))
1173	\|\| mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1174	: scr_page (UP, mouse_slip_wheel_speed))
1175	{	1123	{
1176	if (view_start == top_row \|\| view_start == 0)
1177	mouse_slip_wheel_speed = 0;
1178
1179	want_refresh = 1;	1124	want_refresh = 1;
1180	w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);	1125	refresh_check ();
		1126	}
		1127
		1128	if (view_start == top_row \|\| view_start == 0 \|\| mouse_slip_wheel_speed == 0)
		1129	{
		1130	mouse_slip_wheel_speed = 0;
		1131	w.stop ();
1181	}	1132	}
1182	}	1133	}
1183	#endif	1134	#endif
1184		1135
1185	#if LINUX_YIELD_HACK	1136	#if LINUX_YIELD_HACK
1186	static struct event_handler	1137	static struct event_handler
1187	{	1138	{
1188	check_watcher yield_ev;	1139	ev::prepare yield_ev;
1189		1140
1190	void yield_cb (check_watcher &w)	1141	void yield_cb (ev::prepare &w, int revents)
1191	{	1142	{
1192	// this should really be sched_yield(), but the linux guys thought	1143	// this should really be sched_yield(), but the linux guys thought
1193	// that giving a process calling sched_yield () less cpu time than	1144	// that giving a process calling sched_yield () less cpu time than
1194	// ones with high nice levels is a useful thing to do. It surely is is	1145	// ones with high nice levels is a useful thing to do. It surely is is
1195	// allowed by the sus... as is returning ENOSYS.	1146	// allowed by the sus... as is returning ENOSYS.
…		…
1246		1197
1247	return false;	1198	return false;
1248	}	1199	}
1249		1200
1250	void	1201	void
1251	rxvt_term::pty_cb (io_watcher &w, short revents)	1202	rxvt_term::pty_cb (ev::io &w, int revents)
1252	{	1203	{
1253	make_current ();	1204	make_current ();
1254		1205
1255	if (revents & EVENT_READ)	1206	if (revents & ev::READ)
1256	// loop, but don't allow a single term to monopolize us	1207	// loop, but don't allow a single term to monopolize us
1257	while (pty_fill ())	1208	while (pty_fill ())
1258	if (cmd_parse ())	1209	if (cmd_parse ())
1259	break;	1210	break;
1260		1211
1261	if (revents & EVENT_WRITE)	1212	if (revents & ev::WRITE)
1262	pty_write ();	1213	pty_write ();
1263	}	1214	}
1264		1215
1265	void	1216	void
1266	rxvt_term::pointer_unblank ()	1217	rxvt_term::pointer_unblank ()
…		…
1270		1221
1271	#ifdef POINTER_BLANK	1222	#ifdef POINTER_BLANK
1272	hidden_pointer = 0;	1223	hidden_pointer = 0;
1273		1224
1274	if (option (Opt_pointerBlank))	1225	if (option (Opt_pointerBlank))
1275	pointer_ev.start (NOW + pointerBlankDelay);	1226	pointer_ev.start (pointerBlankDelay);
1276	#endif	1227	#endif
1277	}	1228	}
1278		1229
1279	#ifdef POINTER_BLANK	1230	#ifdef POINTER_BLANK
1280	void	1231	void
…		…
1288		1239
1289	hidden_pointer = 1;	1240	hidden_pointer = 1;
1290	}	1241	}
1291		1242
1292	void	1243	void
1293	rxvt_term::pointer_cb (time_watcher &w)	1244	rxvt_term::pointer_cb (ev::timer &w, int revents)
1294	{	1245	{
1295	make_current ();	1246	make_current ();
1296		1247
1297	pointer_blank ();	1248	pointer_blank ();
1298	}	1249	}
…		…
1301	void	1252	void
1302	rxvt_term::mouse_report (XButtonEvent &ev)	1253	rxvt_term::mouse_report (XButtonEvent &ev)
1303	{	1254	{
1304	int button_number, key_state = 0;	1255	int button_number, key_state = 0;
1305	int x, y;	1256	int x, y;
		1257	int code = 32;
1306		1258
1307	x = ev.x;	1259	x = Pixel2Col (ev.x);
1308	y = ev.y;	1260	y = Pixel2Row (ev.y);
1309	pixel_position (&x, &y);	1261	if (ev.type == MotionNotify)
		1262	{
		1263	if (x == mouse_row && y == mouse_col)
		1264	return;
		1265	mouse_row = x;
		1266	mouse_col = y;
		1267	code += 32;
		1268	}
1310		1269
1311	if (MEvent.button == AnyButton)	1270	if (MEvent.button == AnyButton)
1312	button_number = 3;	1271	button_number = 3;
1313	else	1272	else
1314	{	1273	{
…		…
1360	x + 1,	1319	x + 1,
1361	y + 1);	1320	y + 1);
1362	#endif	1321	#endif
1363		1322
1364	tt_printf ("\033[M%c%c%c",	1323	tt_printf ("\033[M%c%c%c",
1365	(32 + button_number + key_state),	1324	(code + button_number + key_state),
1366	(32 + x + 1),	1325	(32 + x + 1),
1367	(32 + y + 1));	1326	(32 + y + 1));
1368	}	1327	}
1369		1328
1370	/{{{ process an X event /	1329	/{{{ process an X event /
…		…
1474	&& ev.xfocus.mode != NotifyGrab)	1433	&& ev.xfocus.mode != NotifyGrab)
1475	focus_out ();	1434	focus_out ();
1476	break;	1435	break;
1477		1436
1478	case ConfigureNotify:	1437	case ConfigureNotify:
1479	/* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",	1438	/* 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,	1439	ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1481	szHint.width, szHint.height);*/	1440	szHint.width, szHint.height); */
1482	if (ev.xconfigure.window == parent[0])	1441	if (ev.xconfigure.window == parent[0])
1483	{	1442	{
1484	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))	1443	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1485	;	1444	;
1486		1445
…		…
1489	seen_resize = 1;	1448	seen_resize = 1;
1490	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1449	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1491	}	1450	}
1492	else	1451	else
1493	{	1452	{
1494	#ifdef ENABLE_TRANSPARENCY	1453	#ifdef HAVE_BG_PIXMAP
1495	if (option (Opt_transparent))	1454	if (bgPixmap.window_position_sensitive ())
1496	update_background ();	1455	update_background ();
1497	#endif	1456	#endif
1498	}	1457	}
1499	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));	1458	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1500	}	1459	}
…		…
1522	break;	1481	break;
1523		1482
1524	case MapNotify:	1483	case MapNotify:
1525	mapped = 1;	1484	mapped = 1;
1526	#ifdef TEXT_BLINK	1485	#ifdef TEXT_BLINK
1527	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);	1486	text_blink_ev.start ();
1528	#endif	1487	#endif
1529	HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));	1488	HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1530	break;	1489	break;
1531		1490
1532	case UnmapNotify:	1491	case UnmapNotify:
…		…
1534	#ifdef TEXT_BLINK	1493	#ifdef TEXT_BLINK
1535	text_blink_ev.stop ();	1494	text_blink_ev.stop ();
1536	#endif	1495	#endif
1537	HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));	1496	HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1538	break;	1497	break;
1539
1540	#ifdef ENABLE_TRANSPARENCY
1541	case ReparentNotify:
1542	rootwin_cb (ev);
1543	break;
1544	#endif /* ENABLE_TRANSPARENCY */
1545		1498
1546	case GraphicsExpose:	1499	case GraphicsExpose:
1547	case Expose:	1500	case Expose:
1548	if (ev.xany.window == vt)	1501	if (ev.xany.window == vt)
1549	{	1502	{
1550	do	1503	do
		1504	{
1551	scr_expose (ev.xexpose.x, ev.xexpose.y,	1505	scr_expose (ev.xexpose.x, ev.xexpose.y,
1552	ev.xexpose.width, ev.xexpose.height, False);	1506	ev.xexpose.width, ev.xexpose.height, False);
		1507	}
1553	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));	1508	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1554		1509
1555	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1510	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1556		1511
1557	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))	1512	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
		1513	{
1558	scr_expose (ev.xexpose.x, ev.xexpose.y,	1514	scr_expose (ev.xexpose.x, ev.xexpose.y,
1559	ev.xexpose.width, ev.xexpose.height, False);	1515	ev.xexpose.width, ev.xexpose.height, False);
		1516	}
1560		1517
1561	want_refresh = 1;	1518	want_refresh = 1;
1562	}	1519	}
1563	else	1520	else
1564	{	1521	{
…		…
1580	case MotionNotify:	1537	case MotionNotify:
1581	#ifdef POINTER_BLANK	1538	#ifdef POINTER_BLANK
1582	if (hidden_pointer)	1539	if (hidden_pointer)
1583	pointer_unblank ();	1540	pointer_unblank ();
1584	#endif	1541	#endif
		1542	if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask\|Button2Mask\|Button3Mask))
		1543	\|\| priv_modes & PrivMode_MouseAnyEvent)
		1544	mouse_report (ev.xbutton);
1585	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)	1545	if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1586	break;	1546	break;
1587		1547
1588	if (ev.xany.window == vt)	1548	if (ev.xany.window == vt)
1589	{	1549	{
…		…
1623	int dist;	1583	int dist;
1624		1584
1625	/* don't clobber the current delay if we are	1585	/* don't clobber the current delay if we are
1626	* already in the middle of scrolling.	1586	* already in the middle of scrolling.
1627	*/	1587	*/
1628	if (!sel_scroll_ev.active)	1588	if (!sel_scroll_ev.is_active ())
1629	sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);	1589	sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1630		1590
1631	/* save the event params so we can highlight	1591	/* save the event params so we can highlight
1632	* the selection in the pending-scroll loop	1592	* the selection in the pending-scroll loop
1633	*/	1593	*/
1634	selection_save_x = ev.xbutton.x;	1594	selection_save_x = ev.xbutton.x;
…		…
1656	else	1616	else
1657	{	1617	{
1658	/* we are within the text window, so we	1618	/* we are within the text window, so we
1659	* shouldn't be scrolling	1619	* shouldn't be scrolling
1660	*/	1620	*/
1661	if (sel_scroll_ev.active)
1662	sel_scroll_ev.stop();	1621	sel_scroll_ev.stop();
1663	}	1622	}
1664	#endif	1623	#endif
1665	#ifdef MOUSE_THRESHOLD	1624	#ifdef MOUSE_THRESHOLD
1666	}	1625	}
1667	#endif	1626	#endif
…		…
1693	{	1652	{
1694	hidden_cursor = 0;	1653	hidden_cursor = 0;
1695	want_refresh = 1;	1654	want_refresh = 1;
1696	}	1655	}
1697		1656
1698	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);	1657	cursor_blink_ev.again ();
1699	}	1658	}
1700	#endif	1659	#endif
1701		1660
1702	#if defined(POINTER_BLANK)	1661	#if defined(POINTER_BLANK)
1703	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)	1662	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
…		…
1710		1669
1711	if (ev.type == KeyPress && hidden_pointer == 0)	1670	if (ev.type == KeyPress && hidden_pointer == 0)
1712	pointer_blank ();	1671	pointer_blank ();
1713	}	1672	}
1714	#endif	1673	#endif
		1674
		1675	refresh_check ();
1715	}	1676	}
1716		1677
1717	void	1678	void
1718	rxvt_term::focus_in ()	1679	rxvt_term::focus_in ()
1719	{	1680	{
…		…
1731	XSetICFocus (Input_Context);	1692	XSetICFocus (Input_Context);
1732	}	1693	}
1733	#endif	1694	#endif
1734	#if CURSOR_BLINK	1695	#if CURSOR_BLINK
1735	if (option (Opt_cursorBlink))	1696	if (option (Opt_cursorBlink))
1736	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);	1697	cursor_blink_ev.again ();
1737	#endif	1698	#endif
1738	#if OFF_FOCUS_FADING	1699	#if OFF_FOCUS_FADING
1739	if (rs[Rs_fade])	1700	if (rs[Rs_fade])
1740	{	1701	{
1741	pix_colors = pix_colors_focused;	1702	pix_colors = pix_colors_focused;
…		…
1743	}	1704	}
1744	#endif	1705	#endif
1745	#if ENABLE_FRILLS	1706	#if ENABLE_FRILLS
1746	if (option (Opt_urgentOnBell))	1707	if (option (Opt_urgentOnBell))
1747	{	1708	{
1748	XWMHints *h;
1749
1750	h = XGetWMHints(dpy, parent[0]);	1709	if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1751	if (h != NULL)
1752	{	1710	{
1753	h->flags &= ~XUrgencyHint;	1711	h->flags &= ~XUrgencyHint;
1754	XSetWMHints(dpy, parent[0], h);	1712	XSetWMHints (dpy, parent[0], h);
1755	}	1713	}
1756	}	1714	}
1757	#endif	1715	#endif
1758	}	1716	}
1759	}	1717	}
…		…
1782	XUnsetICFocus (Input_Context);	1740	XUnsetICFocus (Input_Context);
1783	#endif	1741	#endif
1784	#if CURSOR_BLINK	1742	#if CURSOR_BLINK
1785	if (option (Opt_cursorBlink))	1743	if (option (Opt_cursorBlink))
1786	cursor_blink_ev.stop ();	1744	cursor_blink_ev.stop ();
		1745
1787	hidden_cursor = 0;	1746	hidden_cursor = 0;
1788	#endif	1747	#endif
1789	#if OFF_FOCUS_FADING	1748	#if OFF_FOCUS_FADING
1790	if (rs[Rs_fade])	1749	if (rs[Rs_fade])
1791	{	1750	{
…		…
1834	update_background ();	1793	update_background ();
1835	}	1794	}
1836	break;	1795	break;
1837	}	1796	}
1838	# endif	1797	# endif
		1798
		1799	refresh_check ();
1839	}	1800	}
1840	#endif	1801	#endif
1841		1802
1842	void	1803	void
1843	rxvt_term::button_press (XButtonEvent &ev)	1804	rxvt_term::button_press (XButtonEvent &ev)
…		…
1898	mouse_report (ev);	1859	mouse_report (ev);
1899	}	1860	}
1900	#else	1861	#else
1901	MEvent.button = ev.button;	1862	MEvent.button = ev.button;
1902	mouse_report (ev);	1863	mouse_report (ev);
1903	#endif /* MOUSE_REPORT_DOUBLECLICK */	1864	#endif /* MOUSE_REPORT_DOUBLECLICK */
1904		1865
1905	}	1866	}
1906	else	1867	else
1907	{	1868	{
1908	if (ev.button != MEvent.button)	1869	if (ev.button != MEvent.button)
…		…
2002	tt_printf ("\033[5~");	1963	tt_printf ("\033[5~");
2003	break;	1964	break;
2004	}	1965	}
2005	}	1966	}
2006	else	1967	else
2007	#endif /* NO_SCROLLBAR_REPORT */	1968	#endif /* NO_SCROLLBAR_REPORT */
2008		1969
2009	{	1970	{
2010	char upordown = 0;	1971	char upordown = 0;
2011		1972
2012	if (scrollBar.style == R_SB_NEXT)	1973	if (scrollBar.style == R_SB_NEXT)
2013	{	1974	{
2014	if (scrollbarnext_upButton (ev.y))	1975	if (scrollbarnext_upButton (ev.y))
2015	upordown = -1; /* up */	1976	upordown = -1; /* up */
…		…
2021	if (scrollbarrxvt_upButton (ev.y))	1982	if (scrollbarrxvt_upButton (ev.y))
2022	upordown = -1; /* up */	1983	upordown = -1; /* up */
2023	else if (scrollbarrxvt_dnButton (ev.y))	1984	else if (scrollbarrxvt_dnButton (ev.y))
2024	upordown = 1; /* down */	1985	upordown = 1; /* down */
2025	}	1986	}
		1987
2026	if (upordown)	1988	if (upordown)
2027	{	1989	{
2028	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	1990	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
		1991	if (!cont_scroll_ev.is_active ())
2029	cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);	1992	cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2030	#endif	1993	#endif
2031	if (scr_page (upordown < 0 ? UP : DN, 1))	1994	if (scr_page (upordown < 0 ? UP : DN, 1))
2032	{	1995	{
2033	if (upordown < 0)	1996	if (upordown < 0)
2034	scrollBar.setUp ();	1997	scrollBar.setUp ();
…		…
2114	scrollBar.setIdle ();	2077	scrollBar.setIdle ();
2115	scrollbar_show (0);	2078	scrollbar_show (0);
2116	}	2079	}
2117		2080
2118	#ifdef SELECTION_SCROLLING	2081	#ifdef SELECTION_SCROLLING
2119	if (sel_scroll_ev.active)
2120	sel_scroll_ev.stop();	2082	sel_scroll_ev.stop();
2121	#endif	2083	#endif
2122		2084
2123	if (ev.window == vt)	2085	if (ev.window == vt)
2124	{	2086	{
2125	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))	2087	if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
…		…
2149	mouse_report (ev);	2111	mouse_report (ev);
2150	}	2112	}
2151	#else /* MOUSE_REPORT_DOUBLECLICK */	2113	#else /* MOUSE_REPORT_DOUBLECLICK */
2152	MEvent.button = AnyButton;	2114	MEvent.button = AnyButton;
2153	mouse_report (ev);	2115	mouse_report (ev);
2154	#endif /* MOUSE_REPORT_DOUBLECLICK */	2116	#endif /* MOUSE_REPORT_DOUBLECLICK */
2155	return;	2117	return;
2156	}	2118	}
2157		2119
2158	/*	2120	/*
2159	* dumb hack to compensate for the failure of click-and-drag	2121	* dumb hack to compensate for the failure of click-and-drag
…		…
2197	{	2159	{
2198	mouse_slip_wheel_speed += v ? -1 : 1;	2160	mouse_slip_wheel_speed += v ? -1 : 1;
2199	if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;	2161	if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2200	if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;	2162	if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2201		2163
2202	if (slip_wheel_ev.at < NOW)	2164	if (!slip_wheel_ev.is_active ())
2203	slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;	2165	slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2204
2205	slip_wheel_ev.start ();
2206	}	2166	}
2207	else	2167	else
2208	{	2168	{
2209	# endif	2169	# endif
2210	scr_page (v, i);	2170	scr_page (v, i);
…		…
2278		2238
2279	if (!option (Opt_jumpScroll) \|\| refresh_count >= nrow - 1)	2239	if (!option (Opt_jumpScroll) \|\| refresh_count >= nrow - 1)
2280	{	2240	{
2281	refresh_count = 0;	2241	refresh_count = 0;
2282		2242
2283	if (!option (Opt_skipScroll) \|\| io_manager::now () > NOW + 1. / 60.)	2243	if (!option (Opt_skipScroll) \|\| ev_time () > ev::now () + 1. / 60.)
2284	{	2244	{
2285	refreshnow = true;	2245	refreshnow = true;
2286	ch = NOCHAR;	2246	ch = NOCHAR;
2287	break;	2247	break;
2288	}	2248	}
…		…
2348	}	2308	}
2349		2309
2350	ch = NOCHAR;	2310	ch = NOCHAR;
2351	}	2311	}
2352	}	2312	}
		2313
		2314	refresh_check ();
2353		2315
2354	return flag;	2316	return flag;
2355	}	2317	}
2356		2318
2357	// read the next character	2319	// read the next character
…		…
2499	}	2461	}
2500	}	2462	}
2501		2463
2502	pclose_printer (fd);	2464	pclose_printer (fd);
2503	}	2465	}
2504	#endif /* PRINTPIPE */	2466	#endif /* PRINTPIPE */
2505	/}}} /	2467	/}}} /
2506		2468
2507	/* INDENT-OFF */	2469	/* INDENT-OFF */
2508	enum {	2470	enum {
2509	C1_40 = 0x40,	2471	C1_40 = 0x40,
…		…
2802	nargs = 0;	2764	nargs = 0;
2803		2765
2804	priv = 0;	2766	priv = 0;
2805	ch = cmd_getc ();	2767	ch = cmd_getc ();
2806	if (ch >= '<' && ch <= '?')	2768	if (ch >= '<' && ch <= '?')
		2769	{
2807	{ /* '<' '=' '>' '?' */	2770	/* '<' '=' '>' '?' */
2808	priv = ch;	2771	priv = ch;
2809	ch = cmd_getc ();	2772	ch = cmd_getc ();
2810	}	2773	}
2811		2774
2812	/* read any numerical arguments */	2775	/* read any numerical arguments */
…		…
2855	{	2818	{
2856	// first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,	2819	// first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2857	// 'U' for rxvt-unicode != 7.[34] (where it was broken).	2820	// 'U' for rxvt-unicode != 7.[34] (where it was broken).
2858	//	2821	//
2859	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt	2822	// 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	2823	// 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).	2824	// versions.
2862	//	2825	//
2863	tt_printf ("\033[>%d;94;0c", 'U');	2826	tt_printf ("\033[>%d;95;0c", 'U');
2864	}	2827	}
2865	break;	2828	break;
2866	case '?':	2829	case '?':
2867	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')	2830	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')
2868	process_terminal_mode (ch, priv, nargs, arg);	2831	process_terminal_mode (ch, priv, nargs, arg);
…		…
3435	}	3398	}
3436		3399
3437	break;	3400	break;
3438	#endif	3401	#endif
3439		3402
3440	#if XPM_BACKGROUND	3403	#if BG_IMAGE_FROM_FILE
3441	case Rxvt_Pixmap:	3404	case Rxvt_Pixmap:
3442	if (!strcmp (str, "?"))	3405	if (!strcmp (str, "?"))
3443	{	3406	{
3444	char str[256];	3407	char str[256];
3445		3408
…		…
3632	{ 66, PrivMode_aplKP },	3595	{ 66, PrivMode_aplKP },
3633	#ifndef NO_BACKSPACE_KEY	3596	#ifndef NO_BACKSPACE_KEY
3634	{ 67, PrivMode_BackSpace },	3597	{ 67, PrivMode_BackSpace },
3635	#endif	3598	#endif
3636	{ 1000, PrivMode_MouseX11 },	3599	{ 1000, PrivMode_MouseX11 },
3637	// 1001 Use Hilite Mouse Tracking. NYI, TODO	3600	{ 1002, PrivMode_MouseBtnEvent },
3638	// 1002 Use Cell Motion Mouse Tracking. NYI, TODO	3601	{ 1003, PrivMode_MouseAnyEvent },
3639	// 1003 Use All Motion Mouse Tracking. NYI, TODO
3640	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension	3602	{ 1010, PrivMode_TtyOutputInh }, // rxvt extension
3641	{ 1011, PrivMode_Keypress }, // rxvt extension	3603	{ 1011, PrivMode_Keypress }, // rxvt extension
3642	// 1035 enable modifiers for alt, numlock NYI	3604	// 1035 enable modifiers for alt, numlock NYI
3643	// 1036 send ESC for meta keys NYI	3605	// 1036 send ESC for meta keys NYI
3644	// 1037 send DEL for keypad delete NYI	3606	// 1037 send DEL for keypad delete NYI
…		…
3718	scr_autowrap (state);	3680	scr_autowrap (state);
3719	break;	3681	break;
3720	/* case 8: - auto repeat, can't do on a per window basis */	3682	/* case 8: - auto repeat, can't do on a per window basis */
3721	case 9: /* X10 mouse reporting */	3683	case 9: /* X10 mouse reporting */
3722	if (state) /* orthogonal */	3684	if (state) /* orthogonal */
3723	priv_modes &= ~PrivMode_MouseX11;	3685	priv_modes &= ~(PrivMode_MouseX11\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);
3724	break;	3686	break;
3725	#ifdef scrollBar_esc	3687	#ifdef scrollBar_esc
3726	case scrollBar_esc:	3688	case scrollBar_esc:
3727	if (scrollbar_mapping (state))	3689	if (scrollbar_mapping (state))
3728	{	3690	{
…		…
3741	break;	3703	break;
3742	/* case 66: - application key pad */	3704	/* case 66: - application key pad */
3743	/* case 67: - backspace key */	3705	/* case 67: - backspace key */
3744	case 1000: /* X11 mouse reporting */	3706	case 1000: /* X11 mouse reporting */
3745	if (state) /* orthogonal */	3707	if (state) /* orthogonal */
3746	priv_modes &= ~PrivMode_MouseX10;	3708	priv_modes &= ~(PrivMode_MouseX10\|PrivMode_MouseBtnEvent\|PrivMode_MouseAnyEvent);
3747	break;	3709	break;
3748	#if 0
3749	case 1001:	3710	case 1002:
3750	break; /* X11 mouse highlighting */	3711	case 1003:
3751	#endif	3712	if (state)
		3713	{
		3714	priv_modes &= ~(PrivMode_MouseX10\|PrivMode_MouseX11);
		3715	priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
		3716	vt_emask_mouse = PointerMotionMask;
		3717	}
		3718	else
		3719	vt_emask_mouse = NoEventMask;
		3720	vt_select_input ();
		3721	break;
3752	case 1010: /* scroll to bottom on TTY output inhibit */	3722	case 1010: /* scroll to bottom on TTY output inhibit */
3753	set_option (Opt_scrollTtyOutput, !state);	3723	set_option (Opt_scrollTtyOutput, !state);
3754	break;	3724	break;
3755	case 1011: /* scroll to bottom on key press */	3725	case 1011: /* scroll to bottom on key press */
3756	set_option (Opt_scrollTtyKeypress, state);	3726	set_option (Opt_scrollTtyKeypress, state);
…		…
3933	rxvt_term::process_graphics ()	3903	rxvt_term::process_graphics ()
3934	{	3904	{
3935	unicode_t ch, cmd = cmd_getc ();	3905	unicode_t ch, cmd = cmd_getc ();
3936		3906
3937	if (cmd == 'Q')	3907	if (cmd == 'Q')
		3908	{
3938	{ /* query graphics */	3909	/* query graphics */
3939	tt_printf ("\033G0\012"); /* no graphics */	3910	tt_printf ("\033G0\012"); /* no graphics */
3940	return;	3911	return;
3941	}	3912	}
3942	/* swallow other graphics sequences until terminating ':' */	3913	/* swallow other graphics sequences until terminating ':' */
3943	do	3914	do
…		…
3993	v_buffer = (char *)realloc (v_buffer, v_buflen + len);	3964	v_buffer = (char *)realloc (v_buffer, v_buflen + len);
3994		3965
3995	memcpy (v_buffer + v_buflen, data, len);	3966	memcpy (v_buffer + v_buflen, data, len);
3996	v_buflen += len;	3967	v_buflen += len;
3997		3968
3998	pty_ev.set (EVENT_READ \| EVENT_WRITE);	3969	pty_ev.set (ev::READ \| ev::WRITE);
3999	}	3970	}
4000		3971
4001	void rxvt_term::pty_write ()	3972	void rxvt_term::pty_write ()
4002	{	3973	{
4003	int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));	3974	int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
…		…
4008		3979
4009	if (v_buflen == 0)	3980	if (v_buflen == 0)
4010	{	3981	{
4011	free (v_buffer);	3982	free (v_buffer);
4012	v_buffer = 0;	3983	v_buffer = 0;
4013	v_buflen = 0;
4014		3984
4015	pty_ev.set (EVENT_READ);	3985	pty_ev.set (ev::READ);
4016	return;	3986	return;
4017	}	3987	}
4018		3988
4019	memmove (v_buffer, v_buffer + written, v_buflen);	3989	memmove (v_buffer, v_buffer + written, v_buflen);
4020	}	3990	}
4021	else if (written != -1 \|\| (errno != EAGAIN && errno != EINTR))	3991	else if (written != -1 \|\| (errno != EAGAIN && errno != EINTR))
4022	pty_ev.set (EVENT_READ);	3992	pty_ev.set (ev::READ);
4023	}	3993	}
4024		3994
4025	/----------------------- end-of-file (C source) -----------------------/	3995	/----------------------- end-of-file (C source) -----------------------/
4026		3996

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.381 by root, Fri Dec 14 05:25:23 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.381 by root, Fri Dec 14 05:25:23 2007 UTC