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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.3 by pcg, Tue Nov 25 11:52:42 2003 UTC vs.
Revision 1.10 by pcg, Thu Nov 27 16:49:45 2003 UTC

…		…
1	/---------------------------------C----------------------------------	1	/---------------------------------C----------------------------------
2	* File: command.c	2	* File: command.c
3	----------------------------------------------------------------------	3	----------------------------------------------------------------------
4	* $Id: command.C,v 1.3 2003/11/25 11:52:42 pcg Exp $	4	* $Id: command.C,v 1.10 2003/11/27 16:49:45 pcg Exp $
5	*	5	*
6	* All portions of code are copyright by their respective author/s.	6	* All portions of code are copyright by their respective author/s.
7	* Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>	7	* Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
8	* - original version	8	* - original version
9	* Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>	9	* Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
237	/* escape prefix */	237	/* escape prefix */
238	if (meta)	238	if (meta)
239	# ifdef META8_OPTION	239	# ifdef META8_OPTION
240	if (R->meta_char == C0_ESC)	240	if (R->meta_char == C0_ESC)
241	# endif	241	# endif
242	rxvt_tt_write(aR_ &ch, 1);	242	R->tt_write(&ch, 1);
243	rxvt_tt_write(aR_ kbuf0, l);	243	R->tt_write(kbuf0, l);
244	return;	244	return;
245	} else	245	} else
246	#endif	246	#endif
247	{	247	{
248	newlen = 1;	248	newlen = 1;
…		…
605	&& (R->meta_char == C0_ESC)	605	&& (R->meta_char == C0_ESC)
606	#endif	606	#endif
607	) {	607	) {
608	const unsigned char ch = C0_ESC;	608	const unsigned char ch = C0_ESC;
609		609
610	rxvt_tt_write(aR_ &ch, 1);	610	R->tt_write(&ch, 1);
611	}	611	}
612	#ifdef DEBUG_CMD	612	#ifdef DEBUG_CMD
613	if (debug_key) { /* Display keyboard buffer contents */	613	if (debug_key) { /* Display keyboard buffer contents */
614	char *p;	614	char *p;
615	int i;	615	int i;
…		…
618	for (i = 0, p = kbuf; i < len; i++, p++)	618	for (i = 0, p = kbuf; i < len; i++, p++)
619	fprintf(stderr, (p >= ' ' && p < '\177' ? "%c" : "\\%03o"), *p);	619	fprintf(stderr, (p >= ' ' && p < '\177' ? "%c" : "\\%03o"), *p);
620	fprintf(stderr, "'\n");	620	fprintf(stderr, "'\n");
621	}	621	}
622	#endif /* DEBUG_CMD */	622	#endif /* DEBUG_CMD */
623	rxvt_tt_write(aR_ kbuf, (unsigned int)len);	623	R->tt_write(kbuf, (unsigned int)len);
624	}	624	}
625	/}}} /	625	/}}} /
626		626
627	#if (MENUBAR_MAX)	627	#if (MENUBAR_MAX)
628	/{{{ rxvt_cmd_write(), rxvt_cmd_getc() /	628	/{{{ rxvt_cmd_write(), rxvt_cmd_getc() /
…		…
632	rxvt_cmd_write(pR_ const unsigned char *str, unsigned int count)	632	rxvt_cmd_write(pR_ const unsigned char *str, unsigned int count)
633	{	633	{
634	unsigned int n, s;	634	unsigned int n, s;
635	unsigned char *cmdbuf_base = R->cmdbuf_base,	635	unsigned char *cmdbuf_base = R->cmdbuf_base,
636	*cmdbuf_endp = R->cmdbuf_endp,	636	*cmdbuf_endp = R->cmdbuf_endp,
637	*cmdbuf_ptr = R->cmdbuf_ptr;	637	*cmdbuf_ptr = R->cmdbuf_ptr;
638		638
639	n = cmdbuf_ptr - cmdbuf_base;	639	n = cmdbuf_ptr - cmdbuf_base;
640	s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp;	640	s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp;
641	if (n > 0 && s < count) {	641	if (n > 0 && s < count) {
642	MEMMOVE(cmdbuf_base, cmdbuf_ptr,	642	MEMMOVE(cmdbuf_base, cmdbuf_ptr,
…		…
663	do	663	do
664	{	664	{
665	XEvent xev;	665	XEvent xev;
666		666
667	XNextEvent (Xdisplay, &xev);	667	XNextEvent (Xdisplay, &xev);
		668
668	#if defined(CURSOR_BLINK)	669	#if defined(CURSOR_BLINK)
669	if ((Options & Opt_cursorBlink)	670	if ((Options & Opt_cursorBlink)
670	&& xev.type == KeyPress) {	671	&& xev.type == KeyPress)
		672	{
671	if (hidden_cursor) {	673	if (hidden_cursor)
		674	{
672	hidden_cursor = 0;	675	hidden_cursor = 0;
673	want_refresh = 1;	676	want_refresh = 1;
674	}	677	}
675	want_keypress_time = 1;	678
		679	blink_ev.start (NOW + BLINK_INTERVAL);
676	}	680	}
677	#endif	681	#endif
678		682
679	#if defined(POINTER_BLANK)	683	#if defined(POINTER_BLANK)
680	if ((Options & Opt_pointerBlank)	684	if ((Options & Opt_pointerBlank)
681	&& (pointerBlankDelay > 0)) {	685	&& (pointerBlankDelay > 0))
		686	{
682	if (xev.type == MotionNotify	687	if (xev.type == MotionNotify
683	\|\| xev.type == ButtonPress	688	\|\| xev.type == ButtonPress
684	\|\| xev.type == ButtonRelease) {	689	\|\| xev.type == ButtonRelease)
685	if (hidden_pointer)	690	if (hidden_pointer)
686	rxvt_pointer_unblank(aR);	691	pointer_unblank ();
687	want_motion_time = 1;	692
688	}
689	if (xev.type == KeyPress && hidden_pointer == 0)	693	if (xev.type == KeyPress && hidden_pointer == 0)
690	rxvt_pointer_blank (this);	694	pointer_blank ();
691	}	695	}
692	#endif	696	#endif
693		697
694	#ifdef USE_XIM	698	#ifdef USE_XIM
695	if (!XFilterEvent (&xev, xev.xany.window))	699	if (!XFilterEvent (&xev, xev.xany.window))
696	#endif	700	#endif
…		…
698	}	702	}
699	while (XPending (Xdisplay));	703	while (XPending (Xdisplay));
700	}	704	}
701		705
702	void	706	void
		707	rxvt_term::blink_cb (time_watcher &w)
		708	{
		709	SET_R (this);
		710
		711	w.at += BLINK_INTERVAL;
		712	hidden_cursor = !hidden_cursor;
		713	want_refresh = 1;
		714	flush ();
		715	}
		716
		717	void
703	rxvt_term::x_cb (io_watcher &w, short revents)	718	rxvt_term::x_cb (io_watcher &w, short revents)
704	{	719	{
		720	SET_R (this);
		721
705	process_x_events ();	722	process_x_events ();
		723
		724	flush ();
706	}	725	}
707		726
708	// read the next character, currently handles UTF-8	727	// read the next character, currently handles UTF-8
709	// will probably handle all sorts of other stuff in the future	728	// will probably handle all sorts of other stuff in the future
710	static uint32_t	729	uint32_t
711	next_char (pR)	730	rxvt_term::next_char ()
712	{	731	{
713	mbstate &s = R->mbstate;	732	struct mbstate &s = mbstate;
714		733
715	while (R->cmdbuf_ptr < R->cmdbuf_endp)	734	while (cmdbuf_ptr < cmdbuf_endp)
716	{	735	{
717	uint8_t ch = *R->cmdbuf_ptr;	736	uint8_t ch = *cmdbuf_ptr;
718		737
719	if (s.cnt)	738	if (s.cnt)
720	{	739	{
721	if ((ch & 0xc0) == 0x80)	740	if ((ch & 0xc0) == 0x80)
722	{	741	{
723	R->cmdbuf_ptr++;	742	cmdbuf_ptr++;
724		743
725	/* continuation */	744	/* continuation */
726	s.reg = (s.reg << 6) \| (ch & 0x7f);	745	s.reg = (s.reg << 6) \| (ch & 0x7f);
727		746
728	if (--s.cnt == 0 && s.reg >= 128) /* if !inrange then corruption or Racking */	747	if (--s.cnt == 0 && s.reg >= 128) /* if !inrange then corruption or Racking */
…		…
737	}	756	}
738	}	757	}
739		758
740	if ((ch & 0xc0) == 0xc0)	759	if ((ch & 0xc0) == 0xc0)
741	{	760	{
742	R->cmdbuf_ptr++;	761	cmdbuf_ptr++;
743		762
744	/* first byte */	763	/* first byte */
745	s.orig = ch; /* for broken encodings */	764	s.orig = ch; /* for broken encodings */
746	s.reg = ch;	765	s.reg = ch;
747	if ((ch & 0xe0) == 0xc0) { s.reg &= 0x1f; s.cnt = 1; }	766	if ((ch & 0xe0) == 0xc0) { s.reg &= 0x1f; s.cnt = 1; }
…		…
750	if ((ch & 0xfc) == 0xf8) { s.reg &= 0x03; s.cnt = 4; }	769	if ((ch & 0xfc) == 0xf8) { s.reg &= 0x03; s.cnt = 4; }
751	if ((ch & 0xfe) == 0xfc) { s.reg &= 0x01; s.cnt = 5; }	770	if ((ch & 0xfe) == 0xfc) { s.reg &= 0x01; s.cnt = 5; }
752	}	771	}
753	else	772	else
754	{	773	{
755	R->cmdbuf_ptr++; /* _occasional_ non-utf8 may slip through... */	774	cmdbuf_ptr++; /* _occasional_ non-utf8 may slip through... */
756	return ch;	775	return ch;
757	}	776	}
758	}	777	}
759		778
760	return NOCHAR;	779	return NOCHAR;
761	}	780	}
762		781
		782	bool
		783	rxvt_term::pty_fill ()
		784	{
		785	ssize_t n = cmdbuf_endp - cmdbuf_ptr;
		786
		787	memmove (cmdbuf_base, cmdbuf_ptr, n);
		788	cmdbuf_ptr = cmdbuf_base;
		789	cmdbuf_endp = cmdbuf_ptr + n;
		790
		791	n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n);
		792
		793	if (n > 0)
		794	{
		795	cmdbuf_endp += n;
		796	return true;
		797	}
		798	else if (n < 0 && errno == EAGAIN)
		799	return false;
		800
		801	destroy ();
		802	}
		803
763	void	804	void
764	rxvt_term::pty_cb (io_watcher &w, short revents)	805	rxvt_term::pty_cb (io_watcher &w, short revents)
765	{	806	{
766	int n;	807	SET_R (this);
767	unsigned int count;
768		808
769	if (count = (cmdbuf_endp - cmdbuf_ptr))	809	if (revents & EVENT_WRITE)
		810	tt_write (0, 0);
		811	else if (revents & EVENT_READ)
		812	// loop, but don't allow a single term to monopolize us
		813	// the number of loops is fully arbitrary, and thus wrong
		814	for (int i = 7; i-- && pty_fill (); )
		815	{
		816	//TODO:
		817	/* once we know the shell is running, send the screen size. Again! */
		818	//ch = rxvt_cmd_getc(aR); /* wait for something */
		819	//rxvt_tt_winsize(cmd_fd, TermWin.ncol, TermWin.nrow, cmd_pid);
		820
		821	uint32_t ch = NOCHAR;
		822
		823	for (;;)
		824	{
		825	if (ch == NOCHAR)
		826	ch = next_char ();
		827
		828	if (ch == NOCHAR) // TODO: improve
		829	break;
		830
		831	if (ch >= ' ' \|\| ch == '\t' \|\| ch == '\n' \|\| ch == '\r')
		832	{
		833	/* Read a text string from the input buffer */
		834	uint32_t buf[BUFSIZ];
		835	bool refreshnow = false;
		836	int nlines = 0;
		837	uint32_t *str = buf;
		838
		839	*str++ = ch;
		840
		841	for (;;)
		842	{
		843	ch = next_char ();
		844
		845	if (ch == NOCHAR \|\| (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
		846	break;
		847	else
		848	{
		849	*str++ = ch;
		850
		851	if (ch == '\n')
		852	{
		853	nlines++;
		854	refresh_count++;
		855
		856	if (!(Options & Opt_jumpScroll)
		857	\|\| (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
		858	{
		859	refreshnow = true;
		860	ch = NOCHAR;
		861	break;
		862	}
		863	}
		864
		865	if (str >= buf + BUFSIZ)
		866	{
		867	ch = NOCHAR;
		868	break;
		869	}
		870	}
		871	}
		872
		873	rxvt_scr_add_lines (this, buf, nlines, str - buf);
		874
		875	/*
		876	* If there have been a lot of new lines, then update the screen
		877	* What the heck I'll cheat and only refresh less than every page-full.
		878	* the number of pages between refreshes is refresh_limit, which
		879	* is incremented here because we must be doing flat-out scrolling.
		880	*
		881	* refreshing should be correct for small scrolls, because of the
		882	* time-out
		883	*/
		884	if (refreshnow)
		885	{
		886	if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
		887	refresh_limit++;
		888
		889	rxvt_scr_refresh (this, refresh_type);
		890	}
		891
		892	}
		893	else
		894	{
		895	switch (ch)
		896	{
		897	default:
		898	rxvt_process_nonprinting (this, ch);
		899	break;
		900	case C0_ESC: /* escape char */
		901	rxvt_process_escape_seq (this);
		902	break;
		903	/case 0x9b: / /* CSI */
		904	/* rxvt_process_csi_seq (this); */
		905	}
		906
		907	ch = NOCHAR;
		908	}
		909	}
		910	}
		911
		912	flush ();
		913	}
		914
		915	void
		916	rxvt_term::flush ()
		917	{
		918	#ifdef TRANSPARENT
		919	if (want_full_refresh)
770	{	920	{
771	memmove (cmdbuf_base, cmdbuf_ptr, count);	921	want_full_refresh = 0;
772	cmdbuf_ptr = cmdbuf_base;	922	rxvt_scr_clear (this);
773	cmdbuf_endp = cmdbuf_ptr + count;	923	rxvt_scr_touch (this, False);
		924	want_refresh = 1;
774	}	925	}
775		926	#endif
776		927
777	for (count = BUFSIZ - count; count; count -= n, cmdbuf_endp += n)	928	if (want_refresh)
778	if ((n = read(cmd_fd, cmdbuf_endp, count)) > 0)
779	continue;
780	else if (n == 0 \|\| (n < 0 && errno == EAGAIN))
781	break;
782	else
783	{
784	rxvt_clean_exit();
785	exit(EXIT_FAILURE); /* bad order of events? */
786	}
787
788	if (count != BUFSIZ) /* some characters read in */
789	{	929	{
790	uint32_t c = next_char (this);	930	rxvt_scr_refresh (this, refresh_type);
791		931	rxvt_scrollbar_show (this, 1);
792	#if 0	932	#ifdef USE_XIM
793	if (c != NOCHAR)	933	rxvt_IMSendSpot (this);
794	return c;
795	#endif	934	#endif
796	}	935	}
		936
		937	if (XPending (Xdisplay)) process_x_events ();
		938	XFlush (Xdisplay);
		939	if (XPending (Xdisplay)) process_x_events ();
797	}	940	}
798		941
799	/* rxvt_cmd_getc() - Return next input character */	942	/* rxvt_cmd_getc() - Return next input character */
800	/*	943	/*
801	* Return the next input character after first passing any keyboard input	944	* Return the next input character after first passing any keyboard input
…		…
803	*/	946	*/
804	/* INTPROTO */	947	/* INTPROTO */
805	uint32_t	948	uint32_t
806	rxvt_cmd_getc(pR)	949	rxvt_cmd_getc(pR)
807	{	950	{
		951	for (;;)
		952	{
		953	uint32_t c = R->next_char ();
		954	if (c != NOCHAR)
		955	return c;
		956
		957	// incomplete sequences should occur rarely, still, a better solution
		958	// would be preferred. either setjmp/longjmp or better design.
		959	fcntl (R->cmd_fd, F_SETFL, 0);
		960	R->pty_fill ();
		961	fcntl (R->cmd_fd, F_SETFL, O_NONBLOCK);
		962	}
		963
		964	#if 0
808	#define TIMEOUT_USEC 5000	965	#define TIMEOUT_USEC 5000
809	fd_set readfds;	966	fd_set readfds;
810	int quick_timeout, select_res;	967	int quick_timeout, select_res;
811	int want_motion_time, want_keypress_time;	968	int want_motion_time, want_keypress_time;
812	struct timeval value;	969	struct timeval value;
813	#if defined(POINTER_BLANK) \|\| defined(CURSOR_BLINK)	970	#if defined(POINTER_BLANK) \|\| defined(CURSOR_BLINK)
814	struct timeval tp;	971	struct timeval tp;
815	#endif	972	#endif
816		973
817	uint32_t c = next_char (aR);
818	if (c != NOCHAR)
819	return c;
820
821	for (;;) {	974	for (;;) {
822	/* loop until we can return something */	975	/* loop until we can return something */
823		976
824	if (R->v_bufstr < R->v_bufptr) /* output any pending chars */	977	if (R->v_bufstr < R->v_bufptr) /* output any pending chars */
825	rxvt_tt_write(aR_ NULL, 0);	978	R->tt_write(NULL, 0);
826
827	#if defined(POINTER_BLANK) \|\| defined(CURSOR_BLINK)
828	tp.tv_sec = 0; /* presume == 0 implies time not yet retrieved */
829	#endif
830	#if defined(CURSOR_BLINK)
831	want_keypress_time = 0;
832	#endif
833	#if defined(POINTER_BLANK)
834	want_motion_time = 0;
835	#endif
836
837	if (XPending (R->Xdisplay))
838	{
839	R->process_x_events ();
840
841	/* in case button actions pushed chars to cmdbuf */
842	if (R->cmdbuf_ptr < R->cmdbuf_endp)
843	return *R->cmdbuf_ptr++;
844	}
845
846	#if defined(CURSOR_BLINK)
847	if (want_keypress_time) {
848	(void)gettimeofday(&tp, NULL);
849	R->lastcursorchange.tv_sec = tp.tv_sec;
850	R->lastcursorchange.tv_usec = tp.tv_usec;
851	}
852	#endif
853	#if defined(POINTER_BLANK)
854	if (want_motion_time) {
855	if (!tp.tv_sec)
856	(void)gettimeofday(&tp, NULL);
857	R->lastmotion.tv_sec = tp.tv_sec;
858	R->lastmotion.tv_usec = tp.tv_usec;
859	}
860	#endif
861
862	/*
863	* the command input buffer is empty and we have no pending X events
864	*/
865	quick_timeout = 0;
866		979
867	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	980	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
868	if (R->mouse_slip_wheel_speed) {	981	if (R->mouse_slip_wheel_speed) {
869	quick_timeout = 1;	982	quick_timeout = 1;
870	if (!R->mouse_slip_wheel_delay--	983	if (!R->mouse_slip_wheel_delay--
…		…
900	R->want_refresh = 1;	1013	R->want_refresh = 1;
901	}	1014	}
902	}	1015	}
903	#endif /* NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING */	1016	#endif /* NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING */
904		1017
905	FD_ZERO(&readfds);
906	FD_SET(R->cmd_fd, &readfds);
907	FD_SET(R->Xfd, &readfds);
908	value.tv_usec = TIMEOUT_USEC;
909	value.tv_sec = 0;
910
911	if (!R->TermWin.mapped)
912	quick_timeout = 0;
913	else {
914	quick_timeout \|= R->want_refresh;
915	#ifdef TRANSPARENT	1018	#ifdef TRANSPARENT
916	quick_timeout \|= R->want_full_refresh;	1019	quick_timeout \|= R->want_full_refresh;
917	#endif	1020	#endif
918	}
919
920	#if defined(POINTER_BLANK) \|\| defined(CURSOR_BLINK)
921	{
922	int set_quick_timeout = 0;
923	long csdiff, psdiff;
924
925	#define BLINK_TIME 500000L
926	csdiff = psdiff = 60000000L; /* or, say, LONG_MAX */
927	# if defined(CURSOR_BLINK)
928	if (R->Options & Opt_cursorBlink) {
929	if (!tp.tv_sec) /* didn't get it before so get it now */
930	(void)gettimeofday(&tp, NULL);
931
932	csdiff = (tp.tv_sec - R->lastcursorchange.tv_sec) * 1000000L
933	+ tp.tv_usec - R->lastcursorchange.tv_usec;
934	if (csdiff > BLINK_TIME) { /* XXX: settable blink times */
935	R->lastcursorchange.tv_sec = tp.tv_sec;
936	R->lastcursorchange.tv_usec = tp.tv_usec;
937	R->hidden_cursor = !R->hidden_cursor;
938	csdiff = 0;
939	} else
940	csdiff = BLINK_TIME - csdiff;
941	set_quick_timeout = 1;
942	}
943	# endif	1021	#endif
944	# if defined(POINTER_BLANK)
945	/*
946	* If we haven't moved the pointer for a while
947	*/
948	if ((R->Options & Opt_pointerBlank)
949	&& (R->pointerBlankDelay > 0)
950	&& (R->hidden_pointer == 0)) {
951	long pdelay;
952
953	if (!tp.tv_sec) /* didn't get it before so get it now */
954	(void)gettimeofday(&tp, NULL);
955	psdiff = (tp.tv_sec - R->lastmotion.tv_sec) * 1000000L
956	+ tp.tv_usec - R->lastmotion.tv_usec;
957	pdelay = R->pointerBlankDelay * 1000000L;
958	if (psdiff >= pdelay)
959	rxvt_pointer_blank(aR);
960	else {
961	set_quick_timeout = 1;
962	psdiff = pdelay - psdiff;
963	}
964	}
965	# endif
966	if (!quick_timeout && set_quick_timeout) {
967	MIN_IT(csdiff, psdiff);
968	value.tv_sec = csdiff / 1000000L;
969	value.tv_usec = csdiff % 1000000L;
970	quick_timeout = 1;
971	}
972	}
973	#endif
974
975	if ((select_res = select(R->num_fds, &readfds, NULL, NULL,
976	(quick_timeout ? &value : NULL))) == 0) {
977	/* select statement timed out - we're not hard and fast scrolling */
978	R->refresh_limit = 1;
979	}
980	#if defined(CURSOR_BLINK)
981	if (R->Options & Opt_cursorBlink)
982	R->want_refresh = 1;
983	#endif
984
985	/* See if we can read new data from the application */
986	if (select_res > 0 && FD_ISSET(R->cmd_fd, &readfds)) {
987	int n;
988	unsigned int count;
989
990	R->cmdbuf_ptr = R->cmdbuf_endp = R->cmdbuf_base;
991	for (count = BUFSIZ; count; count -= n, R->cmdbuf_endp += n)
992	if ((n = read(R->cmd_fd, R->cmdbuf_endp, count)) > 0)
993	continue;
994	else if (n == 0 \|\| (n < 0 && errno == EAGAIN))
995	break;
996	else {
997	rxvt_clean_exit();
998	exit(EXIT_FAILURE); /* bad order of events? */
999	}
1000
1001	if (count != BUFSIZ) /* some characters read in */
1002	{
1003	uint32_t c = next_char (aR);
1004	if (c != NOCHAR)
1005	return c;
1006	}
1007	}
1008	#ifdef TRANSPARENT
1009	if (R->want_full_refresh) {
1010	R->want_full_refresh = 0;
1011	rxvt_scr_clear(aR);
1012	rxvt_scr_touch(aR_ False);
1013	R->want_refresh = 1;
1014	}
1015	#endif
1016	if (R->want_refresh) {
1017	rxvt_scr_refresh(aR_ R->refresh_type);
1018	rxvt_scrollbar_show(aR_ 1);
1019	#ifdef USE_XIM
1020	rxvt_IMSendSpot(aR);
1021	#endif
1022	}
1023	}
1024	/* NOTREACHED */
1025	}	1022	}
1026	/}}} /
1027		1023
1028	/* EXTPROTO */
1029	void	1024	void
1030	rxvt_pointer_unblank(pR)	1025	rxvt_term::pointer_unblank ()
1031	{	1026	{
1032	XDefineCursor(R->Xdisplay, R->TermWin.vt, R->TermWin_cursor);	1027	XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor);
1033	rxvt_recolour_cursor(aR);	1028	rxvt_recolour_cursor (this);
		1029
1034	#ifdef POINTER_BLANK	1030	#ifdef POINTER_BLANK
1035	R->hidden_pointer = 0;	1031	hidden_pointer = 0;
1036	if (R->pointerBlankDelay > 0) {
1037	struct timeval tp;
1038		1032
1039	(void)gettimeofday(&tp, NULL);	1033	if (Options & Opt_pointerBlank)
1040	R->lastmotion.tv_sec = tp.tv_sec;	1034	pointer_ev.start (NOW + pointerBlankDelay);
1041	R->lastmotion.tv_usec = tp.tv_usec;
1042	}
1043	#endif	1035	#endif
1044	}	1036	}
1045		1037
1046	#ifdef POINTER_BLANK	1038	#ifdef POINTER_BLANK
1047	/* INTPROTO */
1048	void	1039	void
1049	rxvt_pointer_blank(pR)	1040	rxvt_term::pointer_blank ()
1050	{	1041	{
		1042	pointer_ev.stop ();
		1043
		1044	if (!(Options & Opt_pointerBlank))
		1045	return;
		1046
1051	XDefineCursor(R->Xdisplay, R->TermWin.vt, R->pointer_blank);	1047	XDefineCursor (Xdisplay, TermWin.vt, blank_cursor);
1052	XFlush(R->Xdisplay);	1048	XFlush (Xdisplay);
		1049
1053	R->hidden_pointer = 1;	1050	hidden_pointer = 1;
		1051	}
		1052
		1053	void
		1054	rxvt_term::pointer_cb (time_watcher &w)
		1055	{
		1056	SET_R (this);
		1057
		1058	pointer_blank ();
1054	}	1059	}
1055	#endif	1060	#endif
1056		1061
1057	/* INTPROTO */	1062	/* INTPROTO */
1058	void	1063	void
…		…
1111	fprintf(stderr, "]: <%d>, %d/%d\n",	1116	fprintf(stderr, "]: <%d>, %d/%d\n",
1112	button_number,	1117	button_number,
1113	x + 1,	1118	x + 1,
1114	y + 1);	1119	y + 1);
1115	#else	1120	#else
1116	rxvt_tt_printf(aR_ "\033[M%c%c%c",	1121	R->tt_printf("\033[M%c%c%c",
1117	(32 + button_number + key_state),	1122	(32 + button_number + key_state),
1118	(32 + x + 1),	1123	(32 + x + 1),
1119	(32 + y + 1));	1124	(32 + y + 1));
1120	#endif	1125	#endif
1121	}	1126	}
…		…
1254	break;	1259	break;
1255		1260
1256	case ClientMessage:	1261	case ClientMessage:
1257	if (ev->xclient.format == 32	1262	if (ev->xclient.format == 32
1258	&& (Atom)ev->xclient.data.l[0] == R->xa[XA_WMDELETEWINDOW])	1263	&& (Atom)ev->xclient.data.l[0] == R->xa[XA_WMDELETEWINDOW])
1259	exit(EXIT_SUCCESS);	1264	R->destroy ();
1260	#ifdef OFFIX_DND	1265	#ifdef OFFIX_DND
1261	/* OffiX Dnd (drag 'n' drop) protocol */	1266	/* OffiX Dnd (drag 'n' drop) protocol */
1262	if (ev->xclient.message_type == R->xa[XA_DNDPROTOCOL]	1267	else if (ev->xclient.message_type == R->xa[XA_DNDPROTOCOL]
1263	&& (ev->xclient.data.l[0] == DndFile	1268	&& (ev->xclient.data.l[0] == DndFile
1264	\|\| ev->xclient.data.l[0] == DndDir	1269	\|\| ev->xclient.data.l[0] == DndDir
1265	\|\| ev->xclient.data.l[0] == DndLink)) {	1270	\|\| ev->xclient.data.l[0] == DndLink)) {
1266	/* Get Dnd data */	1271	/* Get Dnd data */
1267	Atom ActualType;	1272	Atom ActualType;
…		…
1299	* in the GraphicsExpose parts, which means that after each refresh,	1304	* in the GraphicsExpose parts, which means that after each refresh,
1300	* we need to wait for the graphics expose or Noexpose events,	1305	* we need to wait for the graphics expose or Noexpose events,
1301	* which ought to make things real slow!	1306	* which ought to make things real slow!
1302	*/	1307	*/
1303	case VisibilityNotify:	1308	case VisibilityNotify:
1304	switch (ev->xvisibility.state) {	1309	switch (ev->xvisibility.state)
		1310	{
1305	case VisibilityUnobscured:	1311	case VisibilityUnobscured:
1306	R->refresh_type = FAST_REFRESH;	1312	R->refresh_type = FAST_REFRESH;
1307	break;	1313	break;
1308	case VisibilityPartiallyObscured:	1314	case VisibilityPartiallyObscured:
1309	R->refresh_type = SLOW_REFRESH;	1315	R->refresh_type = SLOW_REFRESH;
1310	break;	1316	break;
1311	default:	1317	default:
1312	R->refresh_type = NO_REFRESH;	1318	R->refresh_type = NO_REFRESH;
1313	break;	1319	break;
1314	}	1320	}
1315	break;	1321	break;
1316		1322
1317	case FocusIn:	1323	case FocusIn:
1318	if (!R->TermWin.focus) {	1324	if (!R->TermWin.focus) {
1319	R->TermWin.focus = 1;	1325	R->TermWin.focus = 1;
1320	R->want_refresh = 1;	1326	R->want_refresh = 1;
1321	#ifdef USE_XIM	1327	#ifdef USE_XIM
1322	if (R->Input_Context != NULL)	1328	if (R->Input_Context != NULL)
1323	XSetICFocus(R->Input_Context);	1329	XSetICFocus(R->Input_Context);
1324	#endif	1330	#endif
		1331	#ifdef CURSOR_BLINK
		1332	if (R->Options & Opt_cursorBlink)
		1333	R->blink_ev.start (NOW + BLINK_INTERVAL);
		1334	#endif
1325	}	1335	}
1326	break;	1336	break;
1327		1337
1328	case FocusOut:	1338	case FocusOut:
1329	if (R->TermWin.focus) {	1339	if (R->TermWin.focus) {
1330	R->TermWin.focus = 0;	1340	R->TermWin.focus = 0;
1331	R->want_refresh = 1;	1341	R->want_refresh = 1;
1332	#ifdef USE_XIM	1342	#ifdef USE_XIM
1333	if (R->Input_Context != NULL)	1343	if (R->Input_Context != NULL)
1334	XUnsetICFocus(R->Input_Context);	1344	XUnsetICFocus(R->Input_Context);
		1345	#endif
		1346	#ifdef CURSOR_BLINK
		1347	if (R->Options & Opt_cursorBlink)
		1348	R->blink_ev.stop ();
		1349	R->hidden_cursor = 0;
1335	#endif	1350	#endif
1336	}	1351	}
1337	break;	1352	break;
1338		1353
1339	case ConfigureNotify:	1354	case ConfigureNotify:
…		…
1452	break;	1467	break;
1453		1468
1454	case MotionNotify:	1469	case MotionNotify:
1455	#ifdef POINTER_BLANK	1470	#ifdef POINTER_BLANK
1456	if (R->hidden_pointer)	1471	if (R->hidden_pointer)
1457	rxvt_pointer_unblank(aR);	1472	R->pointer_unblank ();
1458	#endif	1473	#endif
1459	#if MENUBAR	1474	#if MENUBAR
1460	if (isMenuBarWindow(ev->xany.window)) {	1475	if (isMenuBarWindow(ev->xany.window)) {
1461	rxvt_menubar_control(aR_ &(ev->xbutton));	1476	rxvt_menubar_control(aR_ &(ev->xbutton));
1462	break;	1477	break;
…		…
1653	*/	1668	*/
1654	if ((R->scrollBar.style == R_SB_NEXT	1669	if ((R->scrollBar.style == R_SB_NEXT
1655	&& scrollbarnext_upButton(ev->y))	1670	&& scrollbarnext_upButton(ev->y))
1656	\|\| (R->scrollBar.style == R_SB_RXVT	1671	\|\| (R->scrollBar.style == R_SB_RXVT
1657	&& scrollbarrxvt_upButton(ev->y)))	1672	&& scrollbarrxvt_upButton(ev->y)))
1658	rxvt_tt_printf(aR_ "\033[A");	1673	R->tt_printf("\033[A");
1659	else if ((R->scrollBar.style == R_SB_NEXT	1674	else if ((R->scrollBar.style == R_SB_NEXT
1660	&& scrollbarnext_dnButton(ev->y))	1675	&& scrollbarnext_dnButton(ev->y))
1661	\|\| (R->scrollBar.style == R_SB_RXVT	1676	\|\| (R->scrollBar.style == R_SB_RXVT
1662	&& scrollbarrxvt_dnButton(ev->y)))	1677	&& scrollbarrxvt_dnButton(ev->y)))
1663	rxvt_tt_printf(aR_ "\033[B");	1678	R->tt_printf("\033[B");
1664	else	1679	else
1665	switch (ev->button) {	1680	switch (ev->button) {
1666	case Button2:	1681	case Button2:
1667	rxvt_tt_printf(aR_ "\014");	1682	R->tt_printf("\014");
1668	break;	1683	break;
1669	case Button1:	1684	case Button1:
1670	rxvt_tt_printf(aR_ "\033[6~");	1685	R->tt_printf("\033[6~");
1671	break;	1686	break;
1672	case Button3:	1687	case Button3:
1673	rxvt_tt_printf(aR_ "\033[5~");	1688	R->tt_printf("\033[5~");
1674	break;	1689	break;
1675	}	1690	}
1676	}	1691	}
1677	else	1692	else
1678	#endif /* NO_SCROLLBAR_REPORT */	1693	#endif /* NO_SCROLLBAR_REPORT */
…		…
2160	rxvt_process_nonprinting(pR_ unsigned char ch)	2175	rxvt_process_nonprinting(pR_ unsigned char ch)
2161	{	2176	{
2162	switch (ch) {	2177	switch (ch) {
2163	case C0_ENQ: /* terminal Status */	2178	case C0_ENQ: /* terminal Status */
2164	if (R->rs[Rs_answerbackstring])	2179	if (R->rs[Rs_answerbackstring])
2165	rxvt_tt_write(aR_	2180	R->tt_write(
2166	(const unsigned char *)R->rs[Rs_answerbackstring],	2181	(const unsigned char *)R->rs[Rs_answerbackstring],
2167	(unsigned int)STRLEN(R->rs[Rs_answerbackstring]));	2182	(unsigned int)STRLEN(R->rs[Rs_answerbackstring]));
2168	else	2183	else
2169	rxvt_tt_write(aR_ (unsigned char *)VT100_ANS,	2184	R->tt_write((unsigned char *)VT100_ANS,
2170	(unsigned int)STRLEN(VT100_ANS));	2185	(unsigned int)STRLEN(VT100_ANS));
2171	break;	2186	break;
2172	case C0_BEL: /* bell */	2187	case C0_BEL: /* bell */
2173	rxvt_scr_bell(aR);	2188	rxvt_scr_bell(aR);
2174	break;	2189	break;
…		…
2237	row = rxvt_cmd_getc(aR) - ' ';	2252	row = rxvt_cmd_getc(aR) - ' ';
2238	col = rxvt_cmd_getc(aR) - ' ';	2253	col = rxvt_cmd_getc(aR) - ' ';
2239	rxvt_scr_gotorc(aR_ row, col, 0);	2254	rxvt_scr_gotorc(aR_ row, col, 0);
2240	break;	2255	break;
2241	case 'Z': /* identify the terminal type */	2256	case 'Z': /* identify the terminal type */
2242	rxvt_tt_printf(aR_ "\033/Z"); /* I am a VT100 emulating a VT52 */	2257	R->tt_printf("\033/Z"); /* I am a VT100 emulating a VT52 */
2243	break;	2258	break;
2244	case '<': /* turn off VT52 mode */	2259	case '<': /* turn off VT52 mode */
2245	PrivMode(0, PrivMode_vt52);	2260	PrivMode(0, PrivMode_vt52);
2246	break;	2261	break;
2247	case 'F': /* use special graphics character set */	2262	case 'F': /* use special graphics character set */
…		…
2354	rxvt_process_dcs_seq(aR);	2369	rxvt_process_dcs_seq(aR);
2355	break;	2370	break;
2356		2371
2357	/* 8.3.110: SINGLE CHARACTER INTRODUCER */	2372	/* 8.3.110: SINGLE CHARACTER INTRODUCER */
2358	case C1_SCI: /* ESC Z */	2373	case C1_SCI: /* ESC Z */
2359	rxvt_tt_write(aR_ (const unsigned char *)ESCZ_ANSWER,	2374	R->tt_write((const unsigned char *)ESCZ_ANSWER,
2360	(unsigned int)(sizeof(ESCZ_ANSWER) - 1));	2375	(unsigned int)(sizeof(ESCZ_ANSWER) - 1));
2361	break; /* steal obsolete ESC [ c */	2376	break; /* steal obsolete ESC [ c */
2362		2377
2363	/* 8.3.16: CONTROL SEQUENCE INTRODUCER */	2378	/* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2364	case C1_CSI: /* ESC [ */	2379	case C1_CSI: /* ESC [ */
…		…
2485	*/	2500	*/
2486	if (priv) {	2501	if (priv) {
2487	switch (priv) {	2502	switch (priv) {
2488	case '>':	2503	case '>':
2489	if (ch == CSI_DA) /* secondary device attributes */	2504	if (ch == CSI_DA) /* secondary device attributes */
2490	rxvt_tt_printf(aR_ "\033[>%d;%-.8s;0c", 'R', VSTRING);	2505	R->tt_printf("\033[>%d;%-.8s;0c", 'R', VSTRING);
2491	break;	2506	break;
2492	case '?':	2507	case '?':
2493	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')	2508	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')
2494	rxvt_process_terminal_mode(aR_ ch, priv, nargs, arg);	2509	rxvt_process_terminal_mode(aR_ ch, priv, nargs, arg);
2495	break;	2510	break;
…		…
2602	case CSI_SU: /* 8.3.148: (1) SCROLL UP */	2617	case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2603	rxvt_scroll_text(aR_ R->screen.tscroll, R->screen.bscroll, arg[0], 0);	2618	rxvt_scroll_text(aR_ R->screen.tscroll, R->screen.bscroll, arg[0], 0);
2604	break;	2619	break;
2605		2620
2606	case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */	2621	case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2607	rxvt_tt_write(aR_ (const unsigned char *)VT100_ANS,	2622	R->tt_write((const unsigned char *)VT100_ANS,
2608	(unsigned int)(sizeof(VT100_ANS) - 1));	2623	(unsigned int)(sizeof(VT100_ANS) - 1));
2609	break;	2624	break;
2610		2625
2611	case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */	2626	case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2612	rxvt_process_sgr_mode(aR_ nargs, arg);	2627	rxvt_process_sgr_mode(aR_ nargs, arg);
2613	break;	2628	break;
2614		2629
2615	case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */	2630	case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */
2616	switch (arg[0]) {	2631	switch (arg[0]) {
2617	case 5: /* DSR requested */	2632	case 5: /* DSR requested */
2618	rxvt_tt_printf(aR_ "\033[0n");	2633	R->tt_printf("\033[0n");
2619	break;	2634	break;
2620	case 6: /* CPR requested */	2635	case 6: /* CPR requested */
2621	rxvt_scr_report_position(aR);	2636	rxvt_scr_report_position(aR);
2622	break;	2637	break;
2623	#if defined (ENABLE_DISPLAY_ANSWER)	2638	#if defined (ENABLE_DISPLAY_ANSWER)
2624	case 7: /* unofficial extension */	2639	case 7: /* unofficial extension */
2625	rxvt_tt_printf(aR_ "%-.250s\n", R->rs[Rs_display_name]);	2640	R->tt_printf("%-.250s\n", R->rs[Rs_display_name]);
2626	break;	2641	break;
2627	#endif	2642	#endif
2628	case 8: /* unofficial extension */	2643	case 8: /* unofficial extension */
2629	rxvt_xterm_seq(aR_ XTerm_title, APL_NAME "-" VERSION, CHAR_ST);	2644	rxvt_xterm_seq(aR_ XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
2630	break;	2645	break;
…		…
2699	break;	2714	break;
2700	#endif	2715	#endif
2701		2716
2702	case CSI_78: /* DECREQTPARM */	2717	case CSI_78: /* DECREQTPARM */
2703	if (arg[0] == 0 \|\| arg[0] == 1)	2718	if (arg[0] == 0 \|\| arg[0] == 1)
2704	rxvt_tt_printf(aR_ "\033[%d;1;1;112;112;1;0x", arg[0] + 2);	2719	R->tt_printf("\033[%d;1;1;112;112;1;0x", arg[0] + 2);
2705	/* FALLTHROUGH */	2720	/* FALLTHROUGH */
2706		2721
2707	default:	2722	default:
2708	break;	2723	break;
2709	}	2724	}
…		…
2763	/*	2778	/*
2764	* reports - some output format copied from XTerm	2779	* reports - some output format copied from XTerm
2765	*/	2780	*/
2766	case 11: /* report window state */	2781	case 11: /* report window state */
2767	XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);	2782	XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);
2768	rxvt_tt_printf(aR_ "\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	2783	R->tt_printf("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2769	break;	2784	break;
2770	case 13: /* report window position */	2785	case 13: /* report window position */
2771	XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);	2786	XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);
2772	XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], wattr.root,	2787	XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], wattr.root,
2773	-wattr.border_width, -wattr.border_width,	2788	-wattr.border_width, -wattr.border_width,
2774	&x, &y, &wdummy);	2789	&x, &y, &wdummy);
2775	rxvt_tt_printf(aR_ "\033[3;%d;%dt", x, y);	2790	R->tt_printf("\033[3;%d;%dt", x, y);
2776	break;	2791	break;
2777	case 14: /* report window size (pixels) */	2792	case 14: /* report window size (pixels) */
2778	XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);	2793	XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);
2779	rxvt_tt_printf(aR_ "\033[4;%d;%dt", wattr.height, wattr.width);	2794	R->tt_printf("\033[4;%d;%dt", wattr.height, wattr.width);
2780	break;	2795	break;
2781	case 18: /* report window size (chars) */	2796	case 18: /* report window size (chars) */
2782	rxvt_tt_printf(aR_ "\033[8;%d;%dt", R->TermWin.nrow, R->TermWin.ncol);	2797	R->tt_printf("\033[8;%d;%dt", R->TermWin.nrow, R->TermWin.ncol);
2783	break;	2798	break;
2784	#if 0 /* XXX: currently disabled due to security concerns */	2799	#if 0 /* XXX: currently disabled due to security concerns */
2785	case 20: /* report icon label */	2800	case 20: /* report icon label */
2786	XGetIconName(R->Xdisplay, R->TermWin.parent[0], &s);	2801	XGetIconName(R->Xdisplay, R->TermWin.parent[0], &s);
2787	rxvt_tt_printf(aR_ "\033]L%-.200s\234", s ? s : ""); /* 8bit ST */	2802	R->tt_printf("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */
2788	break;	2803	break;
2789	case 21: /* report window title */	2804	case 21: /* report window title */
2790	XFetchName(R->Xdisplay, R->TermWin.parent[0], &s);	2805	XFetchName(R->Xdisplay, R->TermWin.parent[0], &s);
2791	rxvt_tt_printf(aR_ "\033]l%-.200s\234", s ? s : ""); /* 8bit ST */	2806	R->tt_printf("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */
2792	break;	2807	break;
2793	#endif	2808	#endif
2794	}	2809	}
2795	}	2810	}
2796	#endif	2811	#endif
…		…
3339	{	3354	{
3340	unsigned char ch, cmd = rxvt_cmd_getc(aR);	3355	unsigned char ch, cmd = rxvt_cmd_getc(aR);
3341		3356
3342	#ifndef RXVT_GRAPHICS	3357	#ifndef RXVT_GRAPHICS
3343	if (cmd == 'Q') { /* query graphics */	3358	if (cmd == 'Q') { /* query graphics */
3344	rxvt_tt_printf(aR_ "\033G0\n"); /* no graphics */	3359	R->tt_printf("\033G0\n"); /* no graphics */
3345	return;	3360	return;
3346	}	3361	}
3347	/* swallow other graphics sequences until terminating ':' */	3362	/* swallow other graphics sequences until terminating ':' */
3348	do	3363	do
3349	ch = rxvt_cmd_getc(aR);	3364	ch = rxvt_cmd_getc(aR);
…		…
3352	unsigned int nargs;	3367	unsigned int nargs;
3353	int args[NGRX_PTS];	3368	int args[NGRX_PTS];
3354	unsigned char *text = NULL;	3369	unsigned char *text = NULL;
3355		3370
3356	if (cmd == 'Q') { /* query graphics */	3371	if (cmd == 'Q') { /* query graphics */
3357	rxvt_tt_printf(aR_ "\033G1\n"); /* yes, graphics (color) */	3372	R->tt_printf("\033G1\n"); /* yes, graphics (color) */
3358	return;	3373	return;
3359	}	3374	}
3360	for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;) {	3375	for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;) {
3361	int neg;	3376	int neg;
3362		3377
…		…
3392	}	3407	}
3393	/}}} /	3408	/}}} /
3394		3409
3395	/* ------------------------------------------------------------------------- */	3410	/* ------------------------------------------------------------------------- */
3396		3411
3397	/{{{ Read and process output from the application /
3398	/* LIBPROTO */
3399	void
3400	rxvt_main_loop(pR)
3401	{
3402	uint32_t ch, *str, buf[BUFSIZ];
3403	int nlines, refreshnow;
3404
3405	R->cmdbuf_ptr = R->cmdbuf_endp = R->cmdbuf_base;
3406
3407	/* once we know the shell is running, send the screen size. Again! */
3408	ch = rxvt_cmd_getc(aR); /* wait for something */
3409	rxvt_tt_winsize(R->cmd_fd, R->TermWin.ncol, R->TermWin.nrow, R->cmd_pid);
3410
3411	refreshnow = 0;
3412	for (;;) {
3413	if (ch == NOCHAR)
3414	ch = rxvt_cmd_getc(aR);
3415
3416	if (ch >= ' ' \|\| ch == '\t' \|\| ch == '\n' \|\| ch == '\r')
3417	{
3418	/* Read a text string from the input buffer */
3419	nlines = 0;
3420	str = buf;
3421	*str++ = ch;
3422	for (;;)
3423	{
3424	ch = next_char (aR);
3425
3426	if (ch == NOCHAR \|\| (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
3427	break;
3428	else
3429	{
3430	*str++ = ch;
3431
3432	if (ch == '\n')
3433	{
3434	nlines++;
3435	R->refresh_count++;
3436	if (!(R->Options & Opt_jumpScroll)
3437	\|\| (R->refresh_count >= (R->refresh_limit
3438	* (R->TermWin.nrow - 1))))
3439	{
3440	refreshnow = 1;
3441	ch = NOCHAR;
3442	break;
3443	}
3444	}
3445
3446	if (str >= buf + BUFSIZ)
3447	{
3448	ch = NOCHAR;
3449	break;
3450	}
3451	}
3452	}
3453
3454	rxvt_scr_add_lines(aR_ buf, nlines, str - buf);
3455
3456	/*
3457	* If there have been a lot of new lines, then update the screen
3458	* What the heck I'll cheat and only refresh less than every page-full.
3459	* the number of pages between refreshes is R->refresh_limit, which
3460	* is incremented here because we must be doing flat-out scrolling.
3461	*
3462	* refreshing should be correct for small scrolls, because of the
3463	* time-out
3464	*/
3465
3466	//TODO: REFRESH_PERIOD is one, fix it
3467	if (refreshnow)
3468	{
3469	refreshnow = 0;
3470
3471	if ((R->Options & Opt_jumpScroll) && R->refresh_limit < REFRESH_PERIOD)
3472	R->refresh_limit++;
3473
3474	rxvt_scr_refresh(aR_ R->refresh_type);
3475	}
3476
3477	}
3478	else
3479	{
3480	switch (ch)
3481	{
3482	default:
3483	rxvt_process_nonprinting(aR_ ch);
3484	break;
3485	case C0_ESC: /* escape char */
3486	rxvt_process_escape_seq(aR);
3487	break;
3488	/* case 0x9b: / / CSI */
3489	/* rxvt_process_csi_seq(aR); */
3490	}
3491
3492	ch = NOCHAR;
3493	}
3494	}
3495	/* NOTREACHED */
3496	}
3497
3498	/*	3412	/*
3499	* Send printf() formatted output to the command.	3413	* Send printf() formatted output to the command.
3500	* Only use for small amounts of data.	3414	* Only use for small amounts of data.
3501	*/	3415	*/
3502	/* EXTPROTO */
3503	void	3416	void
3504	rxvt_tt_printf(pR_ const char *fmt,...)	3417	rxvt_term::tt_printf (const char *fmt,...)
3505	{	3418	{
3506	va_list arg_ptr;	3419	va_list arg_ptr;
3507	unsigned char buf[256];	3420	unsigned char buf[256];
3508		3421
3509	va_start(arg_ptr, fmt);	3422	va_start (arg_ptr, fmt);
3510	vsprintf((char *)buf, fmt, arg_ptr);	3423	vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3511	va_end(arg_ptr);	3424	va_end (arg_ptr);
3512	rxvt_tt_write(aR_ buf, (unsigned int)STRLEN(buf));	3425	tt_write (buf, STRLEN (buf));
3513	}	3426	}
3514		3427
3515	/* ---------------------------------------------------------------------- */	3428	/* ---------------------------------------------------------------------- */
3516	/* Addresses pasting large amounts of data and rxvt hang
3517	* code pinched from xterm (v_write()) and applied originally to
3518	* rxvt-2.18 - Hops
3519	* Write data to the pty as typed by the user, pasted with the mouse,	3429	/* Write data to the pty as typed by the user, pasted with the mouse,
3520	* or generated by us in response to a query ESC sequence.	3430	* or generated by us in response to a query ESC sequence.
3521	*/	3431	*/
3522	/* EXTPROTO */
3523	void	3432	void
3524	rxvt_tt_write(pR_ const unsigned char *d, unsigned int len)	3433	rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3525	{	3434	{
3526	#define MAX_PTY_WRITE 256 /* POSIX minimum MAX_INPUT */	3435	enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT
3527	int riten;
3528	unsigned int p;
3529	unsigned char v_buffer, / start of physical buffer */
3530	v_bufstr, / start of current buffer pending */
3531	v_bufptr, / end of current buffer pending */
3532	v_bufend; / end of physical buffer */
3533		3436
3534	if (R->v_bufstr == NULL && len > 0) {	3437	if (len)
3535	p = (len / MAX_PTY_WRITE + 1) * MAX_PTY_WRITE;
3536	v_buffer = v_bufstr = v_bufptr = (unsigned char *)rxvt_malloc(p);
3537	v_bufend = v_buffer + p;
3538	} else {
3539	v_buffer = R->v_buffer;
3540	v_bufstr = R->v_bufstr;
3541	v_bufptr = R->v_bufptr;
3542	v_bufend = R->v_bufend;
3543	}	3438	{
		3439	if (v_buflen == 0)
		3440	{
		3441	int written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
		3442	if (written == len)
		3443	return;
3544		3444
3545	/*	3445	data += written;
3546	* Append to the block we already have. Always doing this simplifies the	3446	len -= written;
3547	* code, and isn't too bad, either. If this is a short block, it isn't	3447	}
3548	* too expensive, and if this is a long block, we won't be able to write	3448
3549	* it all anyway.	3449
3550	*/	3450	v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3551	if (len > 0) {	3451
3552	if (v_bufend < v_bufptr + len) { /* run out of room */	3452	memcpy (v_buffer + v_buflen, data, len);
3553	if (v_bufstr != v_buffer) {	3453	v_buflen += len;
3554	/* there is unused space, move everything down */
3555	MEMMOVE(v_buffer, v_bufstr,
3556	(unsigned int)(v_bufptr - v_bufstr));
3557	v_bufptr -= v_bufstr - v_buffer;
3558	v_bufstr = v_buffer;
3559	}	3454	}
3560	if (v_bufend < v_bufptr + len) {
3561	/* still won't fit: get more space */
3562	/* use most basic realloc because an error is not fatal. */
3563	unsigned int size = v_bufptr - v_buffer;
3564	unsigned int reallocto;
3565		3455
3566	reallocto = ((size + len) / MAX_PTY_WRITE + 1) * MAX_PTY_WRITE;	3456	for (;;)
3567	v_buffer = (unsigned char *)realloc(v_buffer, reallocto);	3457	{
3568	/* save across realloc */	3458	int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3569	if (v_buffer) {	3459
3570	v_bufstr = v_buffer;	3460	if (written > 0)
3571	v_bufptr = v_buffer + size;	3461	{
3572	v_bufend = v_buffer + reallocto;	3462	v_buflen -= written;
3573	} else { /* no memory: ignore entire write request */	3463
3574	rxvt_print_error("data loss: cannot allocate buffer space");	3464	if (v_buflen == 0)
3575	v_buffer = v_bufstr; /* restore clobbered pointer */	3465	{
3576	}	3466	free (v_buffer);
		3467	v_buffer = 0;
		3468	v_buflen = 0;
		3469
		3470	pty_ev.set (EVENT_READ);
		3471	return;
		3472	}
		3473
		3474	memmove (v_buffer, v_buffer + written, v_buflen);
		3475	}
		3476	else if (written != -1 \|\| (errno != EAGAIN && errno != EINTR))
		3477	// original code just ignores this...
		3478	destroy ();
		3479	else
		3480	{
		3481	pty_ev.set (EVENT_READ \| EVENT_WRITE);
		3482	return;
		3483	}
3577	}	3484	}
3578	}
3579	if (v_bufend >= v_bufptr + len) { /* new stuff will fit */
3580	MEMCPY(v_bufptr, d, len);
3581	v_bufptr += len;
3582	}
3583	}
3584
3585	/*
3586	* Write out as much of the buffer as we can.
3587	* Be careful not to overflow the pty's input silo.
3588	* We are conservative here and only write a small amount at a time.
3589	*
3590	* If we can't push all the data into the pty yet, we expect write
3591	* to return a non-negative number less than the length requested
3592	* (if some data written) or -1 and set errno to EAGAIN,
3593	* EWOULDBLOCK, or EINTR (if no data written).
3594	*
3595	* (Not all systems do this, sigh, so the code is actually
3596	* a little more forgiving.)
3597	*/
3598	if ((p = v_bufptr - v_bufstr) > 0) {
3599	riten = write(R->cmd_fd, v_bufstr, min(p, MAX_PTY_WRITE));
3600	if (riten < 0)
3601	riten = 0;
3602	v_bufstr += riten;
3603	if (v_bufstr >= v_bufptr) /* we wrote it all */
3604	v_bufstr = v_bufptr = v_buffer;
3605	}
3606	/*
3607	* If we have lots of unused memory allocated, return it
3608	*/
3609	if (v_bufend - v_bufptr > MAX_PTY_WRITE * 8) { /* arbitrary hysteresis */
3610	/* save pointers across realloc */
3611	unsigned int start = v_bufstr - v_buffer;
3612	unsigned int size = v_bufptr - v_buffer;
3613	unsigned int reallocto;
3614
3615	reallocto = (size / MAX_PTY_WRITE + 1) * MAX_PTY_WRITE;
3616	v_buffer = (unsigned char *)realloc(v_buffer, reallocto);
3617	if (v_buffer) {
3618	v_bufstr = v_buffer + start;
3619	v_bufptr = v_buffer + size;
3620	v_bufend = v_buffer + reallocto;
3621	} else {
3622	/* should we print a warning if couldn't return memory? */
3623	v_buffer = v_bufstr - start; /* restore clobbered pointer */
3624	}
3625	}
3626	R->v_buffer = v_buffer;
3627	R->v_bufstr = v_bufstr;
3628	R->v_bufptr = v_bufptr;
3629	R->v_bufend = v_bufend;
3630	}	3485	}
		3486
3631	/----------------------- end-of-file (C source) -----------------------/	3487	/----------------------- end-of-file (C source) -----------------------/
3632		3488

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.3 by pcg, Tue Nov 25 11:52:42 2003 UTC vs. Revision 1.10 by pcg, Thu Nov 27 16:49:45 2003 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.3 by pcg, Tue Nov 25 11:52:42 2003 UTC vs.
Revision 1.10 by pcg, Thu Nov 27 16:49:45 2003 UTC