[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.12 by pcg, Fri Dec 5 04:05:13 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.12 2003/12/05 04:05:13 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,
…		…
656	return 0;	656	return 0;
657	}	657	}
658	#endif /* MENUBAR_MAX */	658	#endif /* MENUBAR_MAX */
659		659
660	void	660	void
		661	rxvt_term::flush ()
		662	{
		663	#ifdef TRANSPARENT
		664	if (want_full_refresh)
		665	{
		666	want_full_refresh = 0;
		667	rxvt_scr_clear (this);
		668	rxvt_scr_touch (this, False);
		669	want_refresh = 1;
		670	}
		671	#endif
		672
		673	if (want_refresh)
		674	{
		675	rxvt_scr_refresh (this, refresh_type);
		676	rxvt_scrollbar_show (this, 1);
		677	#ifdef USE_XIM
		678	rxvt_IMSendSpot (this);
		679	#endif
		680	}
		681
		682	XFlush (Xdisplay);
		683	#if 0
		684	if (XPending (Xdisplay)) process_x_events ();
		685	if (XPending (Xdisplay)) process_x_events ();
		686	#endif
		687	}
		688
		689	void
		690	rxvt_term::check_cb (check_watcher &w)
		691	{
		692	SET_R (this);
		693
		694	flush ();
		695	}
		696
		697	void
661	rxvt_term::process_x_events ()	698	rxvt_term::process_x_events ()
662	{	699	{
663	do	700	do
664	{	701	{
665	XEvent xev;	702	XEvent xev;
666		703
667	XNextEvent (Xdisplay, &xev);	704	XNextEvent (Xdisplay, &xev);
		705
668	#if defined(CURSOR_BLINK)	706	#if defined(CURSOR_BLINK)
669	if ((Options & Opt_cursorBlink)	707	if ((Options & Opt_cursorBlink)
670	&& xev.type == KeyPress) {	708	&& xev.type == KeyPress)
		709	{
671	if (hidden_cursor) {	710	if (hidden_cursor)
		711	{
672	hidden_cursor = 0;	712	hidden_cursor = 0;
673	want_refresh = 1;	713	want_refresh = 1;
674	}	714	}
675	want_keypress_time = 1;	715
		716	blink_ev.start (NOW + BLINK_INTERVAL);
676	}	717	}
677	#endif	718	#endif
678		719
679	#if defined(POINTER_BLANK)	720	#if defined(POINTER_BLANK)
680	if ((Options & Opt_pointerBlank)	721	if ((Options & Opt_pointerBlank)
681	&& (pointerBlankDelay > 0)) {	722	&& (pointerBlankDelay > 0))
		723	{
682	if (xev.type == MotionNotify	724	if (xev.type == MotionNotify
683	\|\| xev.type == ButtonPress	725	\|\| xev.type == ButtonPress
684	\|\| xev.type == ButtonRelease) {	726	\|\| xev.type == ButtonRelease)
685	if (hidden_pointer)	727	if (hidden_pointer)
686	rxvt_pointer_unblank(aR);	728	pointer_unblank ();
687	want_motion_time = 1;	729
688	}
689	if (xev.type == KeyPress && hidden_pointer == 0)	730	if (xev.type == KeyPress && hidden_pointer == 0)
690	rxvt_pointer_blank (this);	731	pointer_blank ();
691	}	732	}
692	#endif	733	#endif
693		734
694	#ifdef USE_XIM	735	#ifdef USE_XIM
695	if (!XFilterEvent (&xev, xev.xany.window))	736	if (!XFilterEvent (&xev, xev.xany.window))
696	#endif	737	#endif
…		…
698	}	739	}
699	while (XPending (Xdisplay));	740	while (XPending (Xdisplay));
700	}	741	}
701		742
702	void	743	void
		744	rxvt_term::blink_cb (time_watcher &w)
		745	{
		746	SET_R (this);
		747
		748	w.at += BLINK_INTERVAL;
		749	hidden_cursor = !hidden_cursor;
		750	want_refresh = 1;
		751	}
		752
		753	void
703	rxvt_term::x_cb (io_watcher &w, short revents)	754	rxvt_term::x_cb (io_watcher &w, short revents)
704	{	755	{
		756	SET_R (this);
		757
705	process_x_events ();	758	process_x_events ();
		759	}
		760
		761	bool
		762	rxvt_term::pty_fill ()
		763	{
		764	ssize_t n = cmdbuf_endp - cmdbuf_ptr;
		765
		766	memmove (cmdbuf_base, cmdbuf_ptr, n);
		767	cmdbuf_ptr = cmdbuf_base;
		768	cmdbuf_endp = cmdbuf_ptr + n;
		769
		770	n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n);
		771
		772	if (n > 0)
		773	{
		774	cmdbuf_endp += n;
		775	return true;
		776	}
		777	else if (n < 0 && errno == EAGAIN)
		778	return false;
		779
		780	destroy ();
		781	}
		782
		783	void
		784	rxvt_term::pty_cb (io_watcher &w, short revents)
		785	{
		786	SET_R (this);
		787
		788	if (revents & EVENT_WRITE)
		789	tt_write (0, 0);
		790	else if (revents & EVENT_READ)
		791	{
		792	bool flag = true;
		793
		794	// loop, but don't allow a single term to monopolize us
		795	// the number of loops is fully arbitrary, and thus wrong
		796	while (flag && pty_fill ())
		797	{
		798	if (!seen_input)
		799	{
		800	seen_input = 1;
		801	/* once we know the shell is running, send the screen size. Again! */
		802	tt_winch ();
		803	}
		804
		805	uint32_t ch = NOCHAR;
		806
		807	for (;;)
		808	{
		809	if (ch == NOCHAR)
		810	ch = next_char ();
		811
		812	if (ch == NOCHAR) // TODO: improve
		813	break;
		814
		815	if (ch >= ' ' \|\| ch == '\t' \|\| ch == '\n' \|\| ch == '\r')
		816	{
		817	/* Read a text string from the input buffer */
		818	uint32_t buf[BUFSIZ];
		819	bool refreshnow = false;
		820	int nlines = 0;
		821	uint32_t *str = buf;
		822
		823	*str++ = ch;
		824
		825	for (;;)
		826	{
		827	ch = next_char ();
		828
		829	if (ch == NOCHAR \|\| (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
		830	break;
		831	else
		832	{
		833	*str++ = ch;
		834
		835	if (ch == '\n')
		836	{
		837	nlines++;
		838	refresh_count++;
		839
		840	if (!(Options & Opt_jumpScroll)
		841	\|\| (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
		842	{
		843	refreshnow = true;
		844	flag = false;
		845	ch = NOCHAR;
		846	break;
		847	}
		848	}
		849
		850	if (str >= buf + BUFSIZ)
		851	{
		852	ch = NOCHAR;
		853	break;
		854	}
		855	}
		856	}
		857
		858	rxvt_scr_add_lines (this, buf, nlines, str - buf);
		859
		860	/*
		861	* If there have been a lot of new lines, then update the screen
		862	* What the heck I'll cheat and only refresh less than every page-full.
		863	* the number of pages between refreshes is refresh_limit, which
		864	* is incremented here because we must be doing flat-out scrolling.
		865	*
		866	* refreshing should be correct for small scrolls, because of the
		867	* time-out
		868	*/
		869	if (refreshnow)
		870	{
		871	if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
		872	refresh_limit++;
		873
		874	rxvt_scr_refresh (this, refresh_type);
		875	}
		876
		877	}
		878	else
		879	{
		880	switch (ch)
		881	{
		882	default:
		883	rxvt_process_nonprinting (this, ch);
		884	break;
		885	case C0_ESC: /* escape char */
		886	rxvt_process_escape_seq (this);
		887	break;
		888	/case 0x9b: / /* CSI */
		889	/* rxvt_process_csi_seq (this); */
		890	}
		891
		892	ch = NOCHAR;
		893	}
		894	}
		895	}
		896	}
706	}	897	}
707		898
708	// read the next character, currently handles UTF-8	899	// read the next character, currently handles UTF-8
709	// will probably handle all sorts of other stuff in the future	900	// will probably handle all sorts of other stuff in the future
710	static uint32_t	901	uint32_t
711	next_char (pR)	902	rxvt_term::next_char ()
712	{	903	{
713	mbstate &s = R->mbstate;	904	struct mbstate &s = mbstate;
714		905
715	while (R->cmdbuf_ptr < R->cmdbuf_endp)	906	while (cmdbuf_ptr < cmdbuf_endp)
716	{	907	{
717	uint8_t ch = *R->cmdbuf_ptr;	908	uint8_t ch = *cmdbuf_ptr;
718		909
719	if (s.cnt)	910	if (s.cnt)
720	{	911	{
721	if ((ch & 0xc0) == 0x80)	912	if ((ch & 0xc0) == 0x80)
722	{	913	{
723	R->cmdbuf_ptr++;	914	cmdbuf_ptr++;
724		915
725	/* continuation */	916	/* continuation */
726	s.reg = (s.reg << 6) \| (ch & 0x7f);	917	s.reg = (s.reg << 6) \| (ch & 0x7f);
727		918
728	if (--s.cnt == 0 && s.reg >= 128) /* if !inrange then corruption or Racking */	919	if (--s.cnt == 0 && s.reg >= 128) /* if !inrange then corruption or Racking */
…		…
737	}	928	}
738	}	929	}
739		930
740	if ((ch & 0xc0) == 0xc0)	931	if ((ch & 0xc0) == 0xc0)
741	{	932	{
742	R->cmdbuf_ptr++;	933	cmdbuf_ptr++;
743		934
744	/* first byte */	935	/* first byte */
745	s.orig = ch; /* for broken encodings */	936	s.orig = ch; /* for broken encodings */
746	s.reg = ch;	937	s.reg = ch;
747	if ((ch & 0xe0) == 0xc0) { s.reg &= 0x1f; s.cnt = 1; }	938	if ((ch & 0xe0) == 0xc0) { s.reg &= 0x1f; s.cnt = 1; }
…		…
750	if ((ch & 0xfc) == 0xf8) { s.reg &= 0x03; s.cnt = 4; }	941	if ((ch & 0xfc) == 0xf8) { s.reg &= 0x03; s.cnt = 4; }
751	if ((ch & 0xfe) == 0xfc) { s.reg &= 0x01; s.cnt = 5; }	942	if ((ch & 0xfe) == 0xfc) { s.reg &= 0x01; s.cnt = 5; }
752	}	943	}
753	else	944	else
754	{	945	{
755	R->cmdbuf_ptr++; /* _occasional_ non-utf8 may slip through... */	946	cmdbuf_ptr++; /* _occasional_ non-utf8 may slip through... */
756	return ch;	947	return ch;
757	}	948	}
758	}	949	}
759		950
760	return NOCHAR;	951	return NOCHAR;
761	}
762
763	void
764	rxvt_term::pty_cb (io_watcher &w, short revents)
765	{
766	int n;
767	unsigned int count;
768
769	if (count = (cmdbuf_endp - cmdbuf_ptr))
770	{
771	memmove (cmdbuf_base, cmdbuf_ptr, count);
772	cmdbuf_ptr = cmdbuf_base;
773	cmdbuf_endp = cmdbuf_ptr + count;
774	}
775
776
777	for (count = BUFSIZ - count; count; count -= n, cmdbuf_endp += n)
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	{
790	uint32_t c = next_char (this);
791
792	#if 0
793	if (c != NOCHAR)
794	return c;
795	#endif
796	}
797	}	952	}
798		953
799	/* rxvt_cmd_getc() - Return next input character */	954	/* rxvt_cmd_getc() - Return next input character */
800	/*	955	/*
801	* Return the next input character after first passing any keyboard input	956	* Return the next input character after first passing any keyboard input
…		…
803	*/	958	*/
804	/* INTPROTO */	959	/* INTPROTO */
805	uint32_t	960	uint32_t
806	rxvt_cmd_getc(pR)	961	rxvt_cmd_getc(pR)
807	{	962	{
		963	for (;;)
		964	{
		965	uint32_t c = R->next_char ();
		966	if (c != NOCHAR)
		967	return c;
		968
		969	// incomplete sequences should occur rarely, still, a better solution
		970	// would be preferred. either setjmp/longjmp or better design.
		971	fcntl (R->cmd_fd, F_SETFL, 0);
		972	R->pty_fill ();
		973	fcntl (R->cmd_fd, F_SETFL, O_NONBLOCK);
		974	}
		975
		976	#if 0
808	#define TIMEOUT_USEC 5000	977	#define TIMEOUT_USEC 5000
809	fd_set readfds;	978	fd_set readfds;
810	int quick_timeout, select_res;	979	int quick_timeout, select_res;
811	int want_motion_time, want_keypress_time;	980	int want_motion_time, want_keypress_time;
812	struct timeval value;	981	struct timeval value;
813	#if defined(POINTER_BLANK) \|\| defined(CURSOR_BLINK)	982	#if defined(POINTER_BLANK) \|\| defined(CURSOR_BLINK)
814	struct timeval tp;	983	struct timeval tp;
815	#endif	984	#endif
816		985
817	uint32_t c = next_char (aR);
818	if (c != NOCHAR)
819	return c;
820
821	for (;;) {	986	for (;;) {
822	/* loop until we can return something */	987	/* loop until we can return something */
823		988
824	if (R->v_bufstr < R->v_bufptr) /* output any pending chars */	989	if (R->v_bufstr < R->v_bufptr) /* output any pending chars */
825	rxvt_tt_write(aR_ NULL, 0);	990	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		991
867	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	992	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
868	if (R->mouse_slip_wheel_speed) {	993	if (R->mouse_slip_wheel_speed) {
869	quick_timeout = 1;	994	quick_timeout = 1;
870	if (!R->mouse_slip_wheel_delay--	995	if (!R->mouse_slip_wheel_delay--
…		…
900	R->want_refresh = 1;	1025	R->want_refresh = 1;
901	}	1026	}
902	}	1027	}
903	#endif /* NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING */	1028	#endif /* NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING */
904		1029
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	1030	#ifdef TRANSPARENT
916	quick_timeout \|= R->want_full_refresh;	1031	quick_timeout \|= R->want_full_refresh;
917	#endif	1032	#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	1033	#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	}	1034	}
1026	/}}} /
1027		1035
1028	/* EXTPROTO */
1029	void	1036	void
1030	rxvt_pointer_unblank(pR)	1037	rxvt_term::pointer_unblank ()
1031	{	1038	{
1032	XDefineCursor(R->Xdisplay, R->TermWin.vt, R->TermWin_cursor);	1039	XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor);
1033	rxvt_recolour_cursor(aR);	1040	rxvt_recolour_cursor (this);
		1041
1034	#ifdef POINTER_BLANK	1042	#ifdef POINTER_BLANK
1035	R->hidden_pointer = 0;	1043	hidden_pointer = 0;
1036	if (R->pointerBlankDelay > 0) {
1037	struct timeval tp;
1038		1044
1039	(void)gettimeofday(&tp, NULL);	1045	if (Options & Opt_pointerBlank)
1040	R->lastmotion.tv_sec = tp.tv_sec;	1046	pointer_ev.start (NOW + pointerBlankDelay);
1041	R->lastmotion.tv_usec = tp.tv_usec;
1042	}
1043	#endif	1047	#endif
1044	}	1048	}
1045		1049
1046	#ifdef POINTER_BLANK	1050	#ifdef POINTER_BLANK
1047	/* INTPROTO */
1048	void	1051	void
1049	rxvt_pointer_blank(pR)	1052	rxvt_term::pointer_blank ()
1050	{	1053	{
		1054	pointer_ev.stop ();
		1055
		1056	if (!(Options & Opt_pointerBlank))
		1057	return;
		1058
1051	XDefineCursor(R->Xdisplay, R->TermWin.vt, R->pointer_blank);	1059	XDefineCursor (Xdisplay, TermWin.vt, blank_cursor);
1052	XFlush(R->Xdisplay);	1060	XFlush (Xdisplay);
		1061
1053	R->hidden_pointer = 1;	1062	hidden_pointer = 1;
		1063	}
		1064
		1065	void
		1066	rxvt_term::pointer_cb (time_watcher &w)
		1067	{
		1068	SET_R (this);
		1069
		1070	pointer_blank ();
1054	}	1071	}
1055	#endif	1072	#endif
1056		1073
1057	/* INTPROTO */	1074	/* INTPROTO */
1058	void	1075	void
…		…
1111	fprintf(stderr, "]: <%d>, %d/%d\n",	1128	fprintf(stderr, "]: <%d>, %d/%d\n",
1112	button_number,	1129	button_number,
1113	x + 1,	1130	x + 1,
1114	y + 1);	1131	y + 1);
1115	#else	1132	#else
1116	rxvt_tt_printf(aR_ "\033[M%c%c%c",	1133	R->tt_printf("\033[M%c%c%c",
1117	(32 + button_number + key_state),	1134	(32 + button_number + key_state),
1118	(32 + x + 1),	1135	(32 + x + 1),
1119	(32 + y + 1));	1136	(32 + y + 1));
1120	#endif	1137	#endif
1121	}	1138	}
…		…
1254	break;	1271	break;
1255		1272
1256	case ClientMessage:	1273	case ClientMessage:
1257	if (ev->xclient.format == 32	1274	if (ev->xclient.format == 32
1258	&& (Atom)ev->xclient.data.l[0] == R->xa[XA_WMDELETEWINDOW])	1275	&& (Atom)ev->xclient.data.l[0] == R->xa[XA_WMDELETEWINDOW])
1259	exit(EXIT_SUCCESS);	1276	R->destroy ();
1260	#ifdef OFFIX_DND	1277	#ifdef OFFIX_DND
1261	/* OffiX Dnd (drag 'n' drop) protocol */	1278	/* OffiX Dnd (drag 'n' drop) protocol */
1262	if (ev->xclient.message_type == R->xa[XA_DNDPROTOCOL]	1279	else if (ev->xclient.message_type == R->xa[XA_DNDPROTOCOL]
1263	&& (ev->xclient.data.l[0] == DndFile	1280	&& (ev->xclient.data.l[0] == DndFile
1264	\|\| ev->xclient.data.l[0] == DndDir	1281	\|\| ev->xclient.data.l[0] == DndDir
1265	\|\| ev->xclient.data.l[0] == DndLink)) {	1282	\|\| ev->xclient.data.l[0] == DndLink)) {
1266	/* Get Dnd data */	1283	/* Get Dnd data */
1267	Atom ActualType;	1284	Atom ActualType;
…		…
1299	* in the GraphicsExpose parts, which means that after each refresh,	1316	* in the GraphicsExpose parts, which means that after each refresh,
1300	* we need to wait for the graphics expose or Noexpose events,	1317	* we need to wait for the graphics expose or Noexpose events,
1301	* which ought to make things real slow!	1318	* which ought to make things real slow!
1302	*/	1319	*/
1303	case VisibilityNotify:	1320	case VisibilityNotify:
1304	switch (ev->xvisibility.state) {	1321	switch (ev->xvisibility.state)
		1322	{
1305	case VisibilityUnobscured:	1323	case VisibilityUnobscured:
1306	R->refresh_type = FAST_REFRESH;	1324	R->refresh_type = FAST_REFRESH;
1307	break;	1325	break;
1308	case VisibilityPartiallyObscured:	1326	case VisibilityPartiallyObscured:
1309	R->refresh_type = SLOW_REFRESH;	1327	R->refresh_type = SLOW_REFRESH;
1310	break;	1328	break;
1311	default:	1329	default:
1312	R->refresh_type = NO_REFRESH;	1330	R->refresh_type = NO_REFRESH;
1313	break;	1331	break;
1314	}	1332	}
1315	break;	1333	break;
1316		1334
1317	case FocusIn:	1335	case FocusIn:
1318	if (!R->TermWin.focus) {	1336	if (!R->TermWin.focus) {
1319	R->TermWin.focus = 1;	1337	R->TermWin.focus = 1;
1320	R->want_refresh = 1;	1338	R->want_refresh = 1;
1321	#ifdef USE_XIM	1339	#ifdef USE_XIM
1322	if (R->Input_Context != NULL)	1340	if (R->Input_Context != NULL)
1323	XSetICFocus(R->Input_Context);	1341	XSetICFocus(R->Input_Context);
1324	#endif	1342	#endif
		1343	#ifdef CURSOR_BLINK
		1344	if (R->Options & Opt_cursorBlink)
		1345	R->blink_ev.start (NOW + BLINK_INTERVAL);
		1346	#endif
1325	}	1347	}
1326	break;	1348	break;
1327		1349
1328	case FocusOut:	1350	case FocusOut:
1329	if (R->TermWin.focus) {	1351	if (R->TermWin.focus) {
1330	R->TermWin.focus = 0;	1352	R->TermWin.focus = 0;
1331	R->want_refresh = 1;	1353	R->want_refresh = 1;
1332	#ifdef USE_XIM	1354	#ifdef USE_XIM
1333	if (R->Input_Context != NULL)	1355	if (R->Input_Context != NULL)
1334	XUnsetICFocus(R->Input_Context);	1356	XUnsetICFocus(R->Input_Context);
		1357	#endif
		1358	#ifdef CURSOR_BLINK
		1359	if (R->Options & Opt_cursorBlink)
		1360	R->blink_ev.stop ();
		1361	R->hidden_cursor = 0;
1335	#endif	1362	#endif
1336	}	1363	}
1337	break;	1364	break;
1338		1365
1339	case ConfigureNotify:	1366	case ConfigureNotify:
…		…
1452	break;	1479	break;
1453		1480
1454	case MotionNotify:	1481	case MotionNotify:
1455	#ifdef POINTER_BLANK	1482	#ifdef POINTER_BLANK
1456	if (R->hidden_pointer)	1483	if (R->hidden_pointer)
1457	rxvt_pointer_unblank(aR);	1484	R->pointer_unblank ();
1458	#endif	1485	#endif
1459	#if MENUBAR	1486	#if MENUBAR
1460	if (isMenuBarWindow(ev->xany.window)) {	1487	if (isMenuBarWindow(ev->xany.window)) {
1461	rxvt_menubar_control(aR_ &(ev->xbutton));	1488	rxvt_menubar_control(aR_ &(ev->xbutton));
1462	break;	1489	break;
…		…
1653	*/	1680	*/
1654	if ((R->scrollBar.style == R_SB_NEXT	1681	if ((R->scrollBar.style == R_SB_NEXT
1655	&& scrollbarnext_upButton(ev->y))	1682	&& scrollbarnext_upButton(ev->y))
1656	\|\| (R->scrollBar.style == R_SB_RXVT	1683	\|\| (R->scrollBar.style == R_SB_RXVT
1657	&& scrollbarrxvt_upButton(ev->y)))	1684	&& scrollbarrxvt_upButton(ev->y)))
1658	rxvt_tt_printf(aR_ "\033[A");	1685	R->tt_printf("\033[A");
1659	else if ((R->scrollBar.style == R_SB_NEXT	1686	else if ((R->scrollBar.style == R_SB_NEXT
1660	&& scrollbarnext_dnButton(ev->y))	1687	&& scrollbarnext_dnButton(ev->y))
1661	\|\| (R->scrollBar.style == R_SB_RXVT	1688	\|\| (R->scrollBar.style == R_SB_RXVT
1662	&& scrollbarrxvt_dnButton(ev->y)))	1689	&& scrollbarrxvt_dnButton(ev->y)))
1663	rxvt_tt_printf(aR_ "\033[B");	1690	R->tt_printf("\033[B");
1664	else	1691	else
1665	switch (ev->button) {	1692	switch (ev->button) {
1666	case Button2:	1693	case Button2:
1667	rxvt_tt_printf(aR_ "\014");	1694	R->tt_printf("\014");
1668	break;	1695	break;
1669	case Button1:	1696	case Button1:
1670	rxvt_tt_printf(aR_ "\033[6~");	1697	R->tt_printf("\033[6~");
1671	break;	1698	break;
1672	case Button3:	1699	case Button3:
1673	rxvt_tt_printf(aR_ "\033[5~");	1700	R->tt_printf("\033[5~");
1674	break;	1701	break;
1675	}	1702	}
1676	}	1703	}
1677	else	1704	else
1678	#endif /* NO_SCROLLBAR_REPORT */	1705	#endif /* NO_SCROLLBAR_REPORT */
…		…
2079	return stream;	2106	return stream;
2080	}	2107	}
2081		2108
2082	/* EXTPROTO */	2109	/* EXTPROTO */
2083	int	2110	int
2084	rxvt_pclose_printer(FILE *stream)	2111	rxvt_pclose_printer (FILE *stream)
2085	{	2112	{
2086	fflush(stream);	2113	fflush (stream);
2087	/* pclose() reported not to work on SunOS 4.1.3 */	2114	/* pclose() reported not to work on SunOS 4.1.3 */
2088	# if defined (__sun__) /* TODO: RESOLVE THIS */	2115	# if defined (__sun__) /* TODO: RESOLVE THIS */
2089	/* pclose works provided SIGCHLD handler uses waitpid */	2116	/* pclose works provided SIGCHLD handler uses waitpid */
2090	return pclose(stream); /* return fclose (stream); */	2117	return pclose (stream); /* return fclose (stream); */
2091	# else	2118	# else
2092	return pclose(stream);	2119	return pclose (stream);
2093	# endif	2120	# endif
2094	}	2121	}
2095		2122
2096	/*	2123	/*
2097	* simulate attached vt100 printer	2124	* simulate attached vt100 printer
…		…
2160	rxvt_process_nonprinting(pR_ unsigned char ch)	2187	rxvt_process_nonprinting(pR_ unsigned char ch)
2161	{	2188	{
2162	switch (ch) {	2189	switch (ch) {
2163	case C0_ENQ: /* terminal Status */	2190	case C0_ENQ: /* terminal Status */
2164	if (R->rs[Rs_answerbackstring])	2191	if (R->rs[Rs_answerbackstring])
2165	rxvt_tt_write(aR_	2192	R->tt_write(
2166	(const unsigned char *)R->rs[Rs_answerbackstring],	2193	(const unsigned char *)R->rs[Rs_answerbackstring],
2167	(unsigned int)STRLEN(R->rs[Rs_answerbackstring]));	2194	(unsigned int)STRLEN(R->rs[Rs_answerbackstring]));
2168	else	2195	else
2169	rxvt_tt_write(aR_ (unsigned char *)VT100_ANS,	2196	R->tt_write((unsigned char *)VT100_ANS,
2170	(unsigned int)STRLEN(VT100_ANS));	2197	(unsigned int)STRLEN(VT100_ANS));
2171	break;	2198	break;
2172	case C0_BEL: /* bell */	2199	case C0_BEL: /* bell */
2173	rxvt_scr_bell(aR);	2200	rxvt_scr_bell(aR);
2174	break;	2201	break;
…		…
2237	row = rxvt_cmd_getc(aR) - ' ';	2264	row = rxvt_cmd_getc(aR) - ' ';
2238	col = rxvt_cmd_getc(aR) - ' ';	2265	col = rxvt_cmd_getc(aR) - ' ';
2239	rxvt_scr_gotorc(aR_ row, col, 0);	2266	rxvt_scr_gotorc(aR_ row, col, 0);
2240	break;	2267	break;
2241	case 'Z': /* identify the terminal type */	2268	case 'Z': /* identify the terminal type */
2242	rxvt_tt_printf(aR_ "\033/Z"); /* I am a VT100 emulating a VT52 */	2269	R->tt_printf("\033/Z"); /* I am a VT100 emulating a VT52 */
2243	break;	2270	break;
2244	case '<': /* turn off VT52 mode */	2271	case '<': /* turn off VT52 mode */
2245	PrivMode(0, PrivMode_vt52);	2272	PrivMode(0, PrivMode_vt52);
2246	break;	2273	break;
2247	case 'F': /* use special graphics character set */	2274	case 'F': /* use special graphics character set */
…		…
2354	rxvt_process_dcs_seq(aR);	2381	rxvt_process_dcs_seq(aR);
2355	break;	2382	break;
2356		2383
2357	/* 8.3.110: SINGLE CHARACTER INTRODUCER */	2384	/* 8.3.110: SINGLE CHARACTER INTRODUCER */
2358	case C1_SCI: /* ESC Z */	2385	case C1_SCI: /* ESC Z */
2359	rxvt_tt_write(aR_ (const unsigned char *)ESCZ_ANSWER,	2386	R->tt_write((const unsigned char *)ESCZ_ANSWER,
2360	(unsigned int)(sizeof(ESCZ_ANSWER) - 1));	2387	(unsigned int)(sizeof(ESCZ_ANSWER) - 1));
2361	break; /* steal obsolete ESC [ c */	2388	break; /* steal obsolete ESC [ c */
2362		2389
2363	/* 8.3.16: CONTROL SEQUENCE INTRODUCER */	2390	/* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2364	case C1_CSI: /* ESC [ */	2391	case C1_CSI: /* ESC [ */
…		…
2485	*/	2512	*/
2486	if (priv) {	2513	if (priv) {
2487	switch (priv) {	2514	switch (priv) {
2488	case '>':	2515	case '>':
2489	if (ch == CSI_DA) /* secondary device attributes */	2516	if (ch == CSI_DA) /* secondary device attributes */
2490	rxvt_tt_printf(aR_ "\033[>%d;%-.8s;0c", 'R', VSTRING);	2517	R->tt_printf("\033[>%d;%-.8s;0c", 'R', VSTRING);
2491	break;	2518	break;
2492	case '?':	2519	case '?':
2493	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')	2520	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')
2494	rxvt_process_terminal_mode(aR_ ch, priv, nargs, arg);	2521	rxvt_process_terminal_mode(aR_ ch, priv, nargs, arg);
2495	break;	2522	break;
…		…
2602	case CSI_SU: /* 8.3.148: (1) SCROLL UP */	2629	case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2603	rxvt_scroll_text(aR_ R->screen.tscroll, R->screen.bscroll, arg[0], 0);	2630	rxvt_scroll_text(aR_ R->screen.tscroll, R->screen.bscroll, arg[0], 0);
2604	break;	2631	break;
2605		2632
2606	case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */	2633	case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2607	rxvt_tt_write(aR_ (const unsigned char *)VT100_ANS,	2634	R->tt_write((const unsigned char *)VT100_ANS,
2608	(unsigned int)(sizeof(VT100_ANS) - 1));	2635	(unsigned int)(sizeof(VT100_ANS) - 1));
2609	break;	2636	break;
2610		2637
2611	case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */	2638	case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2612	rxvt_process_sgr_mode(aR_ nargs, arg);	2639	rxvt_process_sgr_mode(aR_ nargs, arg);
2613	break;	2640	break;
2614		2641
2615	case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */	2642	case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */
2616	switch (arg[0]) {	2643	switch (arg[0]) {
2617	case 5: /* DSR requested */	2644	case 5: /* DSR requested */
2618	rxvt_tt_printf(aR_ "\033[0n");	2645	R->tt_printf("\033[0n");
2619	break;	2646	break;
2620	case 6: /* CPR requested */	2647	case 6: /* CPR requested */
2621	rxvt_scr_report_position(aR);	2648	rxvt_scr_report_position(aR);
2622	break;	2649	break;
2623	#if defined (ENABLE_DISPLAY_ANSWER)	2650	#if defined (ENABLE_DISPLAY_ANSWER)
2624	case 7: /* unofficial extension */	2651	case 7: /* unofficial extension */
2625	rxvt_tt_printf(aR_ "%-.250s\n", R->rs[Rs_display_name]);	2652	R->tt_printf("%-.250s\n", R->rs[Rs_display_name]);
2626	break;	2653	break;
2627	#endif	2654	#endif
2628	case 8: /* unofficial extension */	2655	case 8: /* unofficial extension */
2629	rxvt_xterm_seq(aR_ XTerm_title, APL_NAME "-" VERSION, CHAR_ST);	2656	rxvt_xterm_seq(aR_ XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
2630	break;	2657	break;
…		…
2699	break;	2726	break;
2700	#endif	2727	#endif
2701		2728
2702	case CSI_78: /* DECREQTPARM */	2729	case CSI_78: /* DECREQTPARM */
2703	if (arg[0] == 0 \|\| arg[0] == 1)	2730	if (arg[0] == 0 \|\| arg[0] == 1)
2704	rxvt_tt_printf(aR_ "\033[%d;1;1;112;112;1;0x", arg[0] + 2);	2731	R->tt_printf("\033[%d;1;1;112;112;1;0x", arg[0] + 2);
2705	/* FALLTHROUGH */	2732	/* FALLTHROUGH */
2706		2733
2707	default:	2734	default:
2708	break;	2735	break;
2709	}	2736	}
…		…
2763	/*	2790	/*
2764	* reports - some output format copied from XTerm	2791	* reports - some output format copied from XTerm
2765	*/	2792	*/
2766	case 11: /* report window state */	2793	case 11: /* report window state */
2767	XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);	2794	XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);
2768	rxvt_tt_printf(aR_ "\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	2795	R->tt_printf("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2769	break;	2796	break;
2770	case 13: /* report window position */	2797	case 13: /* report window position */
2771	XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);	2798	XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);
2772	XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], wattr.root,	2799	XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], wattr.root,
2773	-wattr.border_width, -wattr.border_width,	2800	-wattr.border_width, -wattr.border_width,
2774	&x, &y, &wdummy);	2801	&x, &y, &wdummy);
2775	rxvt_tt_printf(aR_ "\033[3;%d;%dt", x, y);	2802	R->tt_printf("\033[3;%d;%dt", x, y);
2776	break;	2803	break;
2777	case 14: /* report window size (pixels) */	2804	case 14: /* report window size (pixels) */
2778	XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);	2805	XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);
2779	rxvt_tt_printf(aR_ "\033[4;%d;%dt", wattr.height, wattr.width);	2806	R->tt_printf("\033[4;%d;%dt", wattr.height, wattr.width);
2780	break;	2807	break;
2781	case 18: /* report window size (chars) */	2808	case 18: /* report window size (chars) */
2782	rxvt_tt_printf(aR_ "\033[8;%d;%dt", R->TermWin.nrow, R->TermWin.ncol);	2809	R->tt_printf("\033[8;%d;%dt", R->TermWin.nrow, R->TermWin.ncol);
2783	break;	2810	break;
2784	#if 0 /* XXX: currently disabled due to security concerns */	2811	#if 0 /* XXX: currently disabled due to security concerns */
2785	case 20: /* report icon label */	2812	case 20: /* report icon label */
2786	XGetIconName(R->Xdisplay, R->TermWin.parent[0], &s);	2813	XGetIconName(R->Xdisplay, R->TermWin.parent[0], &s);
2787	rxvt_tt_printf(aR_ "\033]L%-.200s\234", s ? s : ""); /* 8bit ST */	2814	R->tt_printf("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */
2788	break;	2815	break;
2789	case 21: /* report window title */	2816	case 21: /* report window title */
2790	XFetchName(R->Xdisplay, R->TermWin.parent[0], &s);	2817	XFetchName(R->Xdisplay, R->TermWin.parent[0], &s);
2791	rxvt_tt_printf(aR_ "\033]l%-.200s\234", s ? s : ""); /* 8bit ST */	2818	R->tt_printf("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */
2792	break;	2819	break;
2793	#endif	2820	#endif
2794	}	2821	}
2795	}	2822	}
2796	#endif	2823	#endif
…		…
3339	{	3366	{
3340	unsigned char ch, cmd = rxvt_cmd_getc(aR);	3367	unsigned char ch, cmd = rxvt_cmd_getc(aR);
3341		3368
3342	#ifndef RXVT_GRAPHICS	3369	#ifndef RXVT_GRAPHICS
3343	if (cmd == 'Q') { /* query graphics */	3370	if (cmd == 'Q') { /* query graphics */
3344	rxvt_tt_printf(aR_ "\033G0\n"); /* no graphics */	3371	R->tt_printf("\033G0\n"); /* no graphics */
3345	return;	3372	return;
3346	}	3373	}
3347	/* swallow other graphics sequences until terminating ':' */	3374	/* swallow other graphics sequences until terminating ':' */
3348	do	3375	do
3349	ch = rxvt_cmd_getc(aR);	3376	ch = rxvt_cmd_getc(aR);
…		…
3352	unsigned int nargs;	3379	unsigned int nargs;
3353	int args[NGRX_PTS];	3380	int args[NGRX_PTS];
3354	unsigned char *text = NULL;	3381	unsigned char *text = NULL;
3355		3382
3356	if (cmd == 'Q') { /* query graphics */	3383	if (cmd == 'Q') { /* query graphics */
3357	rxvt_tt_printf(aR_ "\033G1\n"); /* yes, graphics (color) */	3384	R->tt_printf("\033G1\n"); /* yes, graphics (color) */
3358	return;	3385	return;
3359	}	3386	}
3360	for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;) {	3387	for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;) {
3361	int neg;	3388	int neg;
3362		3389
…		…
3392	}	3419	}
3393	/}}} /	3420	/}}} /
3394		3421
3395	/* ------------------------------------------------------------------------- */	3422	/* ------------------------------------------------------------------------- */
3396		3423
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	/*	3424	/*
3499	* Send printf() formatted output to the command.	3425	* Send printf() formatted output to the command.
3500	* Only use for small amounts of data.	3426	* Only use for small amounts of data.
3501	*/	3427	*/
3502	/* EXTPROTO */
3503	void	3428	void
3504	rxvt_tt_printf(pR_ const char *fmt,...)	3429	rxvt_term::tt_printf (const char *fmt,...)
3505	{	3430	{
3506	va_list arg_ptr;	3431	va_list arg_ptr;
3507	unsigned char buf[256];	3432	unsigned char buf[256];
3508		3433
3509	va_start(arg_ptr, fmt);	3434	va_start (arg_ptr, fmt);
3510	vsprintf((char *)buf, fmt, arg_ptr);	3435	vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3511	va_end(arg_ptr);	3436	va_end (arg_ptr);
3512	rxvt_tt_write(aR_ buf, (unsigned int)STRLEN(buf));	3437	tt_write (buf, STRLEN (buf));
3513	}	3438	}
3514		3439
3515	/* ---------------------------------------------------------------------- */	3440	/* ---------------------------------------------------------------------- */
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,	3441	/* 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.	3442	* or generated by us in response to a query ESC sequence.
3521	*/	3443	*/
3522	/* EXTPROTO */
3523	void	3444	void
3524	rxvt_tt_write(pR_ const unsigned char *d, unsigned int len)	3445	rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3525	{	3446	{
3526	#define MAX_PTY_WRITE 256 /* POSIX minimum MAX_INPUT */	3447	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		3448
3534	if (R->v_bufstr == NULL && len > 0) {	3449	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	}	3450	{
		3451	if (v_buflen == 0)
		3452	{
		3453	int written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
		3454	if (written == len)
		3455	return;
3544		3456
3545	/*	3457	data += written;
3546	* Append to the block we already have. Always doing this simplifies the	3458	len -= written;
3547	* code, and isn't too bad, either. If this is a short block, it isn't	3459	}
3548	* too expensive, and if this is a long block, we won't be able to write	3460
3549	* it all anyway.	3461
3550	*/	3462	v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3551	if (len > 0) {	3463
3552	if (v_bufend < v_bufptr + len) { /* run out of room */	3464	memcpy (v_buffer + v_buflen, data, len);
3553	if (v_bufstr != v_buffer) {	3465	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	}	3466	}
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		3467
3566	reallocto = ((size + len) / MAX_PTY_WRITE + 1) * MAX_PTY_WRITE;	3468	for (;;)
3567	v_buffer = (unsigned char *)realloc(v_buffer, reallocto);	3469	{
3568	/* save across realloc */	3470	int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3569	if (v_buffer) {	3471
3570	v_bufstr = v_buffer;	3472	if (written > 0)
3571	v_bufptr = v_buffer + size;	3473	{
3572	v_bufend = v_buffer + reallocto;	3474	v_buflen -= written;
3573	} else { /* no memory: ignore entire write request */	3475
3574	rxvt_print_error("data loss: cannot allocate buffer space");	3476	if (v_buflen == 0)
3575	v_buffer = v_bufstr; /* restore clobbered pointer */	3477	{
3576	}	3478	free (v_buffer);
		3479	v_buffer = 0;
		3480	v_buflen = 0;
		3481
		3482	pty_ev.set (EVENT_READ);
		3483	return;
		3484	}
		3485
		3486	memmove (v_buffer, v_buffer + written, v_buflen);
		3487	}
		3488	else if (written != -1 \|\| (errno != EAGAIN && errno != EINTR))
		3489	// original code just ignores this...
		3490	destroy ();
		3491	else
		3492	{
		3493	pty_ev.set (EVENT_READ \| EVENT_WRITE);
		3494	return;
		3495	}
3577	}	3496	}
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	}	3497	}
		3498
3631	/----------------------- end-of-file (C source) -----------------------/	3499	/----------------------- end-of-file (C source) -----------------------/
3632		3500

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.12 by pcg, Fri Dec 5 04:05:13 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.12 by pcg, Fri Dec 5 04:05:13 2003 UTC