ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/rxvt-unicode/src/command.C

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.5 by pcg, Tue Nov 25 15:44:38 2003 UTC vs.
Revision 1.19 by pcg, Thu Dec 18 05:45:11 2003 UTC

1	/*--------------------------------*-C-*---------------------------------*	1	/*--------------------------------*-C-*---------------------------------*
2	* File: command.c	2	* File: command.c
3	*----------------------------------------------------------------------*	3	*----------------------------------------------------------------------*
4	* $Id: command.C,v 1.5 2003/11/25 15:44:38 pcg Exp $	4	* $Id: command.C,v 1.19 2003/12/18 05:45:11 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>
…		…
61	unsigned int newlen;	61	unsigned int newlen;
62	KeySym keysym;	62	KeySym keysym;
63	#ifdef DEBUG_CMD	63	#ifdef DEBUG_CMD
64	static int debug_key = 1; /* accessible by a debugger only */	64	static int debug_key = 1; /* accessible by a debugger only */
65	#endif	65	#endif
66	#ifdef USE_XIM
67	int valid_keysym;	66	int valid_keysym;
68	#endif
69	unsigned char *kbuf = R->kbuf;	67	unsigned char *kbuf = R->kbuf;
70		68
71	/*	69	/*
72	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an	70	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
73	* escape sequence to toggle the Keypad.	71	* escape sequence to toggle the Keypad.
…		…
75	* Always permit `shift' to override the current setting	73	* Always permit `shift' to override the current setting
76	*/	74	*/
77	shft = (ev->state & ShiftMask);	75	shft = (ev->state & ShiftMask);
78	ctrl = (ev->state & ControlMask);	76	ctrl = (ev->state & ControlMask);
79	meta = (ev->state & R->ModMetaMask);	77	meta = (ev->state & R->ModMetaMask);
		78
80	if (R->numlock_state || (ev->state & R->ModNumLockMask)) {	79	if (R->numlock_state || (ev->state & R->ModNumLockMask))
		80	{
81	R->numlock_state = (ev->state & R->ModNumLockMask);	81	R->numlock_state = (ev->state & R->ModNumLockMask);
82	PrivMode((!R->numlock_state), PrivMode_aplKP);	82	PrivMode((!R->numlock_state), PrivMode_aplKP);
83	}	83	}
		84
		85	kbuf[0] = 0;
		86
84	#ifdef USE_XIM	87	#ifdef USE_XIM
85	if (R->Input_Context != NULL) {	88	if (R->Input_Context)
		89	{
86	Status status_return;	90	Status status_return;
87		91
88	kbuf[0] = '\0';
89	#ifdef X_HAVE_UTF8_STRING	92	#ifdef X_HAVE_UTF8_STRING
90	len = Xutf8LookupString(R->Input_Context, ev, (char *)kbuf,	93	len = Xutf8LookupString (R->Input_Context, ev, (char *)kbuf,
91	KBUFSZ, &keysym, &status_return);	94	KBUFSZ, &keysym, &status_return);
92	#else	95	#else
		96	wchar_t wkbuf[KBUFSZ + 1];
		97
		98	// assume wchar_t == unicode or better
93	len = XmbLookupString(R->Input_Context, ev, (char *)kbuf,	99	len = XwcLookupString (R->Input_Context, ev, wkbuf,
94	KBUFSZ, &keysym, &status_return);	100	KBUFSZ, &keysym, &status_return);
		101
		102	if (status_return == XLookupChars
		103	|| status_return == XLookupBoth)
		104	{
		105	wkbuf[len] = 0;
		106	len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ);
		107	}
		108	else
		109	len = 0;
95	#endif	110	#endif
96	valid_keysym = ((status_return == XLookupKeySym)	111	valid_keysym = status_return == XLookupKeySym
97	|| (status_return == XLookupBoth));	112	|| status_return == XLookupBoth;
		113	}
98	} else {	114	else
		115	#endif
		116	{
99	len = XLookupString(ev, (char *)kbuf, KBUFSZ, &keysym,	117	len = XLookupString (ev, (char *)kbuf, KBUFSZ, &keysym, &R->compose);
100	&R->compose);
101	valid_keysym = 1;	118	valid_keysym = !len;
102	}	119	}
103	#else /* USE_XIM */
104	len = XLookupString(ev, (char *)kbuf, KBUFSZ, &keysym,
105	&R->compose);
106	/*
107	* map unmapped Latin[2-4]/Katakana/Arabic/Cyrillic/Greek entries -> Latin1
108	* good for installations with correct fonts, but without XLOCALE
109	*/
110	if (!len) {
111	if ((keysym >= 0x0100) && (keysym < 0x0800)) {
112	kbuf[0] = (keysym & 0xFF);
113	kbuf[1] = '\0';
114	len = 1;
115	} else
116	kbuf[0] = '\0';
117	}
118	#endif /* USE_XIM */
119		120
120	#ifdef USE_XIM
121	if (valid_keysym)	121	if (valid_keysym)
122	#endif
123	{	122	{
124	/* for some backwards compatibility */	123	/* for some backwards compatibility */
125	#if defined(HOTKEY_CTRL) || defined(HOTKEY_META)	124	#if defined(HOTKEY_CTRL) || defined(HOTKEY_META)
126	# ifdef HOTKEY_CTRL	125	# ifdef HOTKEY_CTRL
127	if (ctrl) {	126	if (ctrl)
128	# else	127	# else
129	if (meta) {	128	if (meta)
130	# endif	129	# endif
		130	{
131	if (keysym == R->ks_bigfont) {	131	if (keysym == R->ks_bigfont)
		132	{
132	rxvt_change_font(aR_ 0, FONT_UP);	133	rxvt_change_font(aR_ 0, FONT_UP);
133	return;	134	return;
		135	}
134	} else if (keysym == R->ks_smallfont) {	136	else if (keysym == R->ks_smallfont)
		137	{
135	rxvt_change_font(aR_ 0, FONT_DN);	138	rxvt_change_font(aR_ 0, FONT_DN);
136	return;	139	return;
137	}	140	}
138	}	141	}
139	#endif	142	#endif
140		143
141	if (R->TermWin.saveLines) {	144	if (R->TermWin.saveLines) {
142	#ifdef UNSHIFTED_SCROLLKEYS	145	#ifdef UNSHIFTED_SCROLLKEYS
143	if (!ctrl && !meta) {	146	if (!ctrl && !meta) {
…		…
237	/* escape prefix */	240	/* escape prefix */
238	if (meta)	241	if (meta)
239	# ifdef META8_OPTION	242	# ifdef META8_OPTION
240	if (R->meta_char == C0_ESC)	243	if (R->meta_char == C0_ESC)
241	# endif	244	# endif
242	rxvt_tt_write(aR_ &ch, 1);	245	R->tt_write (&ch, 1);
243	rxvt_tt_write(aR_ kbuf0, l);	246	R->tt_write (kbuf0, l);
244	return;	247	return;
245	} else	248	} else
246	#endif	249	#endif
247	{	250	{
248	newlen = 1;	251	newlen = 1;
…		…
572	if (R->greek_mode)	575	if (R->greek_mode)
573	len = greek_xlat(kbuf, len);	576	len = greek_xlat(kbuf, len);
574	#endif	577	#endif
575	/* nil */ ;	578	/* nil */ ;
576	}	579	}
577	}	580	}
578		581
579	if (len <= 0)	582	if (len <= 0)
580	return; /* not mapped */	583	return; /* not mapped */
581		584
582	if (R->Options & Opt_scrollTtyKeypress)	585	if (R->Options & Opt_scrollTtyKeypress)
…		…
605	&& (R->meta_char == C0_ESC)	608	&& (R->meta_char == C0_ESC)
606	#endif	609	#endif
607	) {	610	) {
608	const unsigned char ch = C0_ESC;	611	const unsigned char ch = C0_ESC;
609		612
610	rxvt_tt_write(aR_ &ch, 1);	613	R->tt_write(&ch, 1);
611	}	614	}
612	#ifdef DEBUG_CMD	615	#ifdef DEBUG_CMD
613	if (debug_key) { /* Display keyboard buffer contents */	616	if (debug_key) { /* Display keyboard buffer contents */
614	char *p;	617	char *p;
615	int i;	618	int i;
…		…
618	for (i = 0, p = kbuf; i < len; i++, p++)	621	for (i = 0, p = kbuf; i < len; i++, p++)
619	fprintf(stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);	622	fprintf(stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
620	fprintf(stderr, "'\n");	623	fprintf(stderr, "'\n");
621	}	624	}
622	#endif /* DEBUG_CMD */	625	#endif /* DEBUG_CMD */
623	rxvt_tt_write(aR_ kbuf, (unsigned int)len);	626	R->tt_write(kbuf, (unsigned int)len);
624	}	627	}
625	/*}}} */	628	/*}}} */
626		629
627	#if (MENUBAR_MAX)	630	#if (MENUBAR_MAX)
628	/*{{{ rxvt_cmd_write(), rxvt_cmd_getc() */	631	/*{{{ rxvt_cmd_write(), rxvt_cmd_getc() */
…		…
656	return 0;	659	return 0;
657	}	660	}
658	#endif /* MENUBAR_MAX */	661	#endif /* MENUBAR_MAX */
659		662
660	void	663	void
		664	rxvt_term::flush ()
		665	{
		666	#ifdef TRANSPARENT
		667	if (want_full_refresh)
		668	{
		669	want_full_refresh = 0;
		670	rxvt_scr_clear (this);
		671	rxvt_scr_touch (this, False);
		672	want_refresh = 1;
		673	}
		674	#endif
		675
		676	if (want_refresh)
		677	{
		678	rxvt_scr_refresh (this, refresh_type);
		679	rxvt_scrollbar_show (this, 1);
		680	#ifdef USE_XIM
		681	rxvt_IMSendSpot (this);
		682	#endif
		683	}
		684
		685	XFlush (Xdisplay);
		686	#if 0
		687	if (XPending (Xdisplay)) process_x_events ();
		688	if (XPending (Xdisplay)) process_x_events ();
		689	#endif
		690	}
		691
		692	void
		693	rxvt_term::check_cb (check_watcher &w)
		694	{
		695	SET_R (this);
		696	SET_LOCALE (locale);
		697
		698	flush ();
		699	}
		700
		701	void
661	rxvt_term::process_x_events ()	702	rxvt_term::process_x_events ()
662	{	703	{
663	do	704	do
664	{	705	{
665	XEvent xev;	706	XEvent xev;
666		707
667	XNextEvent (Xdisplay, &xev);	708	XNextEvent (Xdisplay, &xev);
668		709
669	#if defined(CURSOR_BLINK)	710	#if defined(CURSOR_BLINK)
670	if ((Options & Opt_cursorBlink)	711	if ((Options & Opt_cursorBlink)
671	&& xev.type == KeyPress) {	712	&& xev.type == KeyPress)
		713	{
672	if (hidden_cursor) {	714	if (hidden_cursor)
		715	{
673	hidden_cursor = 0;	716	hidden_cursor = 0;
674	want_refresh = 1;	717	want_refresh = 1;
675	}	718	}
		719
676	blink_ev.start (NOW + BLINK_INTERVAL);	720	blink_ev.start (NOW + BLINK_INTERVAL);
677	}	721	}
678	#endif	722	#endif
679		723
680	#if defined(POINTER_BLANK)	724	#if defined(POINTER_BLANK)
681	if ((Options & Opt_pointerBlank)	725	if ((Options & Opt_pointerBlank)
682	&& (pointerBlankDelay > 0)) {	726	&& (pointerBlankDelay > 0))
		727	{
683	if (xev.type == MotionNotify	728	if (xev.type == MotionNotify
684	|| xev.type == ButtonPress	729	|| xev.type == ButtonPress
685	|| xev.type == ButtonRelease) {	730	|| xev.type == ButtonRelease)
686	if (hidden_pointer)	731	if (hidden_pointer)
687	rxvt_pointer_unblank(aR);	732	pointer_unblank ();
688	want_motion_time = 1;	733
689	}
690	if (xev.type == KeyPress && hidden_pointer == 0)	734	if (xev.type == KeyPress && hidden_pointer == 0)
691	rxvt_pointer_blank (this);	735	pointer_blank ();
692	}	736	}
693	#endif	737	#endif
694		738
695	#ifdef USE_XIM	739	#ifdef USE_XIM
696	if (!XFilterEvent (&xev, xev.xany.window))	740	if (!XFilterEvent (&xev, xev.xany.window))
697	#endif	741	#endif
…		…
704	rxvt_term::blink_cb (time_watcher &w)	748	rxvt_term::blink_cb (time_watcher &w)
705	{	749	{
706	w.at += BLINK_INTERVAL;	750	w.at += BLINK_INTERVAL;
707	hidden_cursor = !hidden_cursor;	751	hidden_cursor = !hidden_cursor;
708	want_refresh = 1;	752	want_refresh = 1;
709	flush();
710	}	753	}
711		754
712	void	755	void
713	rxvt_term::x_cb (io_watcher &w, short revents)	756	rxvt_term::x_cb (io_watcher &w, short revents)
714	{	757	{
		758	SET_R (this);
		759	SET_LOCALE (locale);
		760
715	process_x_events ();	761	process_x_events ();
		762	}
716		763
717	flush ();	764	bool
		765	rxvt_term::pty_fill ()
		766	{
		767	ssize_t n = cmdbuf_endp - cmdbuf_ptr;
		768
		769	memmove (cmdbuf_base, cmdbuf_ptr, n);
		770	cmdbuf_ptr = cmdbuf_base;
		771	cmdbuf_endp = cmdbuf_ptr + n;
		772
		773	n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n);
		774
		775	if (n > 0)
		776	{
		777	cmdbuf_endp += n;
		778	return true;
		779	}
		780	else if (n < 0 && errno != EAGAIN)
		781	destroy ();
		782
		783	return false;
		784	}
		785
		786	void
		787	rxvt_term::pty_cb (io_watcher &w, short revents)
		788	{
		789	SET_R (this);
		790	SET_LOCALE (locale);
		791
		792	if (revents & EVENT_WRITE)
		793	tt_write (0, 0);
		794	else if (revents & EVENT_READ)
		795	{
		796	bool flag = true;
		797
		798	// loop, but don't allow a single term to monopolize us
		799	// the number of loops is fully arbitrary, and thus wrong
		800	while (flag && pty_fill ())
		801	{
		802	if (!seen_input)
		803	{
		804	seen_input = 1;
		805	/* once we know the shell is running, send the screen size. Again! */
		806	tt_winch ();
		807	}
		808
		809	uint32_t ch = NOCHAR;
		810
		811	for (;;)
		812	{
		813	if (ch == NOCHAR)
		814	ch = next_char ();
		815
		816	if (ch == NOCHAR) // TODO: improve
		817	break;
		818
		819	if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
		820	{
		821	/* Read a text string from the input buffer */
		822	uint32_t buf[BUFSIZ];
		823	bool refreshnow = false;
		824	int nlines = 0;
		825	uint32_t *str = buf;
		826
		827	*str++ = ch;
		828
		829	for (;;)
		830	{
		831	ch = next_char ();
		832
		833	if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
		834	break;
		835	else
		836	{
		837	*str++ = ch;
		838
		839	if (ch == '\n')
		840	{
		841	nlines++;
		842	refresh_count++;
		843
		844	if (!(Options & Opt_jumpScroll)
		845	|| (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
		846	{
		847	refreshnow = true;
		848	flag = false;
		849	ch = NOCHAR;
		850	break;
		851	}
		852	}
		853
		854	if (str >= buf + BUFSIZ)
		855	{
		856	ch = NOCHAR;
		857	break;
		858	}
		859	}
		860	}
		861
		862	rxvt_scr_add_lines (this, buf, nlines, str - buf);
		863
		864	/*
		865	* If there have been a lot of new lines, then update the screen
		866	* What the heck I'll cheat and only refresh less than every page-full.
		867	* the number of pages between refreshes is refresh_limit, which
		868	* is incremented here because we must be doing flat-out scrolling.
		869	*
		870	* refreshing should be correct for small scrolls, because of the
		871	* time-out
		872	*/
		873	if (refreshnow)
		874	{
		875	if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
		876	refresh_limit++;
		877
		878	rxvt_scr_refresh (this, refresh_type);
		879	}
		880
		881	}
		882	else
		883	{
		884	switch (ch)
		885	{
		886	default:
		887	rxvt_process_nonprinting (this, ch);
		888	break;
		889	case C0_ESC: /* escape char */
		890	rxvt_process_escape_seq (this);
		891	break;
		892	/*case 0x9b: */ /* CSI */
		893	/* rxvt_process_csi_seq (this); */
		894	}
		895
		896	ch = NOCHAR;
		897	}
		898	}
		899	}
		900	}
718	}	901	}
719		902
720	// read the next character, currently handles UTF-8	903	// read the next character, currently handles UTF-8
721	// will probably handle all sorts of other stuff in the future	904	// will probably handle all sorts of other stuff in the future
722	uint32_t	905	uint32_t
…		…
770	}	953	}
771		954
772	return NOCHAR;	955	return NOCHAR;
773	}	956	}
774		957
775	bool
776	rxvt_term::pty_fill (size_t count)
777	{
778	ssize_t n = cmdbuf_endp - cmdbuf_ptr;
779
780	memmove (cmdbuf_base, cmdbuf_ptr, n);
781	cmdbuf_ptr = cmdbuf_base;
782	cmdbuf_endp = cmdbuf_ptr + n;
783
784	n = read (cmd_fd, cmdbuf_endp, count);
785
786	if (n > 0)
787	{
788	cmdbuf_endp += n;
789	return true;
790	}
791	else if (n < 0 && errno == EAGAIN)
792	return false;
793
794	rxvt_clean_exit();
795	exit(EXIT_FAILURE); /* bad order of events? */
796	}
797
798	void
799	rxvt_term::pty_cb (io_watcher &w, short revents)
800	{
801	while (pty_fill (BUFSIZ - (cmdbuf_endp - cmdbuf_ptr)))
802	{
803	/* once we know the shell is running, send the screen size. Again! */
804	//ch = rxvt_cmd_getc(aR); /* wait for something */
805	//rxvt_tt_winsize(cmd_fd, TermWin.ncol, TermWin.nrow, cmd_pid);
806
807	uint32_t ch = NOCHAR;
808
809	for (;;)
810	{
811	if (ch == NOCHAR)
812	ch = next_char ();
813
814	if (ch == NOCHAR) // TODO: improve
815	break;
816
817	if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
818	{
819	/* Read a text string from the input buffer */
820	uint32_t buf[BUFSIZ];
821	bool refreshnow = false;
822	int nlines = 0;
823	uint32_t *str = buf;
824
825	*str++ = ch;
826
827	for (;;)
828	{
829	ch = next_char ();
830
831	if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
832	break;
833	else
834	{
835	*str++ = ch;
836
837	if (ch == '\n')
838	{
839	nlines++;
840	refresh_count++;
841
842	if (!(Options & Opt_jumpScroll)
843	|| (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
844	{
845	refreshnow = true;
846	ch = NOCHAR;
847	break;
848	}
849	}
850
851	if (str >= buf + BUFSIZ)
852	{
853	ch = NOCHAR;
854	break;
855	}
856	}
857	}
858
859	rxvt_scr_add_lines (this, buf, nlines, str - buf);
860
861	/*
862	* If there have been a lot of new lines, then update the screen
863	* What the heck I'll cheat and only refresh less than every page-full.
864	* the number of pages between refreshes is refresh_limit, which
865	* is incremented here because we must be doing flat-out scrolling.
866	*
867	* refreshing should be correct for small scrolls, because of the
868	* time-out
869	*/
870	if (refreshnow)
871	{
872	if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
873	refresh_limit++;
874
875	rxvt_scr_refresh (this, refresh_type);
876	}
877
878	}
879	else
880	{
881	switch (ch)
882	{
883	default:
884	rxvt_process_nonprinting (this, ch);
885	break;
886	case C0_ESC: /* escape char */
887	rxvt_process_escape_seq (this);
888	break;
889	/*case 0x9b: */ /* CSI */
890	/* rxvt_process_csi_seq (this); */
891	}
892
893	ch = NOCHAR;
894	}
895	}
896	}
897
898	flush ();
899	}
900
901	void
902	rxvt_term::flush ()
903	{
904	#ifdef TRANSPARENT
905	if (want_full_refresh)
906	{
907	want_full_refresh = 0;
908	rxvt_scr_clear (this);
909	rxvt_scr_touch (this, False);
910	want_refresh = 1;
911	}
912	#endif
913
914	if (want_refresh)
915	{
916	rxvt_scr_refresh (this, refresh_type);
917	rxvt_scrollbar_show (this, 1);
918	#ifdef USE_XIM
919	rxvt_IMSendSpot (this);
920	#endif
921	}
922
923	XFlush (Xdisplay);
924	}
925
926	/* rxvt_cmd_getc() - Return next input character */	958	/* rxvt_cmd_getc() - Return next input character */
927	/*	959	/*
928	* Return the next input character after first passing any keyboard input	960	* Return the next input character after first passing any keyboard input
929	* to the command.	961	* to the command.
930	*/	962	*/
…		…
939	return c;	971	return c;
940		972
941	// incomplete sequences should occur rarely, still, a better solution	973	// incomplete sequences should occur rarely, still, a better solution
942	// would be preferred. either setjmp/longjmp or better design.	974	// would be preferred. either setjmp/longjmp or better design.
943	fcntl (R->cmd_fd, F_SETFL, 0);	975	fcntl (R->cmd_fd, F_SETFL, 0);
944	R->pty_fill (1);	976	R->pty_fill ();
945	fcntl (R->cmd_fd, F_SETFL, O_NONBLOCK);	977	fcntl (R->cmd_fd, F_SETFL, O_NONBLOCK);
946	}	978	}
947		979
		980	#if 0
948	#define TIMEOUT_USEC 5000	981	#define TIMEOUT_USEC 5000
949	fd_set readfds;	982	fd_set readfds;
950	int quick_timeout, select_res;	983	int quick_timeout, select_res;
951	int want_motion_time, want_keypress_time;	984	int want_motion_time, want_keypress_time;
952	struct timeval value;	985	struct timeval value;
…		…
956		989
957	for (;;) {	990	for (;;) {
958	/* loop until we can return something */	991	/* loop until we can return something */
959		992
960	if (R->v_bufstr < R->v_bufptr) /* output any pending chars */	993	if (R->v_bufstr < R->v_bufptr) /* output any pending chars */
961	rxvt_tt_write(aR_ NULL, 0);	994	R->tt_write(NULL, 0);
962
963	#if defined(POINTER_BLANK) || defined(CURSOR_BLINK)
964	tp.tv_sec = 0; /* presume == 0 implies time not yet retrieved */
965	#endif
966	#if defined(CURSOR_BLINK)
967	want_keypress_time = 0;
968	#endif
969	#if defined(POINTER_BLANK)
970	want_motion_time = 0;
971	#endif
972
973	if (XPending (R->Xdisplay))
974	{
975	R->process_x_events ();
976
977	/* in case button actions pushed chars to cmdbuf */
978	if (R->cmdbuf_ptr < R->cmdbuf_endp)
979	return *R->cmdbuf_ptr++;
980	}
981
982	#if defined(CURSOR_BLINK)
983	if (want_keypress_time) {
984	(void)gettimeofday(&tp, NULL);
985	R->lastcursorchange.tv_sec = tp.tv_sec;
986	R->lastcursorchange.tv_usec = tp.tv_usec;
987	}
988	#endif
989	#if defined(POINTER_BLANK)
990	if (want_motion_time) {
991	if (!tp.tv_sec)
992	(void)gettimeofday(&tp, NULL);
993	R->lastmotion.tv_sec = tp.tv_sec;
994	R->lastmotion.tv_usec = tp.tv_usec;
995	}
996	#endif
997
998	/*
999	* the command input buffer is empty and we have no pending X events
1000	*/
1001	quick_timeout = 0;
1002		995
1003	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	996	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1004	if (R->mouse_slip_wheel_speed) {	997	if (R->mouse_slip_wheel_speed) {
1005	quick_timeout = 1;	998	quick_timeout = 1;
1006	if (!R->mouse_slip_wheel_delay--	999	if (!R->mouse_slip_wheel_delay--
…		…
1036	R->want_refresh = 1;	1029	R->want_refresh = 1;
1037	}	1030	}
1038	}	1031	}
1039	#endif /* NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING */	1032	#endif /* NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING */
1040		1033
1041	FD_ZERO(&readfds);
1042	FD_SET(R->cmd_fd, &readfds);
1043	FD_SET(R->Xfd, &readfds);
1044	value.tv_usec = TIMEOUT_USEC;
1045	value.tv_sec = 0;
1046
1047	if (!R->TermWin.mapped)
1048	quick_timeout = 0;
1049	else {
1050	quick_timeout |= R->want_refresh;
1051	#ifdef TRANSPARENT	1034	#ifdef TRANSPARENT
1052	quick_timeout |= R->want_full_refresh;	1035	quick_timeout |= R->want_full_refresh;
1053	#endif	1036	#endif
1054	}
1055
1056	#if defined(POINTER_BLANK) || defined(CURSOR_BLINK)
1057	{
1058	int set_quick_timeout = 0;
1059	long csdiff, psdiff;
1060
1061	#define BLINK_TIME 500000L
1062	csdiff = psdiff = 60000000L; /* or, say, LONG_MAX */
1063	# if defined(CURSOR_BLINK)
1064	if (R->Options & Opt_cursorBlink) {
1065	if (!tp.tv_sec) /* didn't get it before so get it now */
1066	(void)gettimeofday(&tp, NULL);
1067
1068	csdiff = (tp.tv_sec - R->lastcursorchange.tv_sec) * 1000000L
1069	+ tp.tv_usec - R->lastcursorchange.tv_usec;
1070	if (csdiff > BLINK_TIME) { /* XXX: settable blink times */
1071	R->lastcursorchange.tv_sec = tp.tv_sec;
1072	R->lastcursorchange.tv_usec = tp.tv_usec;
1073	R->hidden_cursor = !R->hidden_cursor;
1074	csdiff = 0;
1075	} else
1076	csdiff = BLINK_TIME - csdiff;
1077	set_quick_timeout = 1;
1078	}
1079	# endif	1037	#endif
1080	# if defined(POINTER_BLANK)
1081	/*
1082	* If we haven't moved the pointer for a while
1083	*/
1084	if ((R->Options & Opt_pointerBlank)
1085	&& (R->pointerBlankDelay > 0)
1086	&& (R->hidden_pointer == 0)) {
1087	long pdelay;
1088
1089	if (!tp.tv_sec) /* didn't get it before so get it now */
1090	(void)gettimeofday(&tp, NULL);
1091	psdiff = (tp.tv_sec - R->lastmotion.tv_sec) * 1000000L
1092	+ tp.tv_usec - R->lastmotion.tv_usec;
1093	pdelay = R->pointerBlankDelay * 1000000L;
1094	if (psdiff >= pdelay)
1095	rxvt_pointer_blank(aR);
1096	else {
1097	set_quick_timeout = 1;
1098	psdiff = pdelay - psdiff;
1099	}
1100	}
1101	# endif
1102	if (!quick_timeout && set_quick_timeout) {
1103	MIN_IT(csdiff, psdiff);
1104	value.tv_sec = csdiff / 1000000L;
1105	value.tv_usec = csdiff % 1000000L;
1106	quick_timeout = 1;
1107	}
1108	}
1109	#endif
1110
1111	if ((select_res = select(R->num_fds, &readfds, NULL, NULL,
1112	(quick_timeout ? &value : NULL))) == 0) {
1113	/* select statement timed out - we're not hard and fast scrolling */
1114	R->refresh_limit = 1;
1115	}
1116	#if defined(CURSOR_BLINK)
1117	if (R->Options & Opt_cursorBlink)
1118	R->want_refresh = 1;
1119	#endif
1120	}
1121	}	1038	}
1122		1039
1123	/* EXTPROTO */
1124	void	1040	void
1125	rxvt_pointer_unblank(pR)	1041	rxvt_term::pointer_unblank ()
1126	{	1042	{
1127	XDefineCursor(R->Xdisplay, R->TermWin.vt, R->TermWin_cursor);	1043	XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor);
1128	rxvt_recolour_cursor(aR);	1044	recolour_cursor ();
		1045
1129	#ifdef POINTER_BLANK	1046	#ifdef POINTER_BLANK
1130	R->hidden_pointer = 0;	1047	hidden_pointer = 0;
1131	if (R->pointerBlankDelay > 0) {
1132	struct timeval tp;
1133		1048
1134	(void)gettimeofday(&tp, NULL);	1049	if (Options & Opt_pointerBlank)
1135	R->lastmotion.tv_sec = tp.tv_sec;	1050	pointer_ev.start (NOW + pointerBlankDelay);
1136	R->lastmotion.tv_usec = tp.tv_usec;
1137	}
1138	#endif	1051	#endif
1139	}	1052	}
1140		1053
1141	#ifdef POINTER_BLANK	1054	#ifdef POINTER_BLANK
1142	/* INTPROTO */
1143	void	1055	void
1144	rxvt_pointer_blank(pR)	1056	rxvt_term::pointer_blank ()
1145	{	1057	{
		1058	pointer_ev.stop ();
		1059
		1060	if (!(Options & Opt_pointerBlank))
		1061	return;
		1062
1146	XDefineCursor(R->Xdisplay, R->TermWin.vt, R->pointer_blank);	1063	XDefineCursor (Xdisplay, TermWin.vt, blank_cursor);
1147	XFlush(R->Xdisplay);	1064	XFlush (Xdisplay);
		1065
1148	R->hidden_pointer = 1;	1066	hidden_pointer = 1;
		1067	}
		1068
		1069	void
		1070	rxvt_term::pointer_cb (time_watcher &w)
		1071	{
		1072	SET_R (this);
		1073	SET_LOCALE (locale);
		1074
		1075	pointer_blank ();
1149	}	1076	}
1150	#endif	1077	#endif
1151		1078
1152	/* INTPROTO */	1079	/* INTPROTO */
1153	void	1080	void
…		…
1206	fprintf(stderr, "]: <%d>, %d/%d\n",	1133	fprintf(stderr, "]: <%d>, %d/%d\n",
1207	button_number,	1134	button_number,
1208	x + 1,	1135	x + 1,
1209	y + 1);	1136	y + 1);
1210	#else	1137	#else
1211	rxvt_tt_printf(aR_ "\033[M%c%c%c",	1138	R->tt_printf("\033[M%c%c%c",
1212	(32 + button_number + key_state),	1139	(32 + button_number + key_state),
1213	(32 + x + 1),	1140	(32 + x + 1),
1214	(32 + y + 1));	1141	(32 + y + 1));
1215	#endif	1142	#endif
1216	}	1143	}
…		…
1233	{	1160	{
1234	int i, want_timeout;	1161	int i, want_timeout;
1235	Window unused_root, unused_child;	1162	Window unused_root, unused_child;
1236	int unused_root_x, unused_root_y;	1163	int unused_root_x, unused_root_y;
1237	unsigned int unused_mask;	1164	unsigned int unused_mask;
1238	struct timeval tp;
1239		1165
1240	#ifdef DEBUG_X	1166	#ifdef DEBUG_X
1241	const char *const eventnames[] =	1167	const char *const eventnames[] =
1242	{ /* mason - this matches my system */	1168	{ /* mason - this matches my system */
1243	"",	1169	"",
…		…
1274	"SelectionNotify",	1200	"SelectionNotify",
1275	"ColormapNotify",	1201	"ColormapNotify",
1276	"ClientMessage",	1202	"ClientMessage",
1277	"MappingNotify"	1203	"MappingNotify"
1278	};	1204	};
		1205	#endif
		1206
		1207	#ifdef DEBUG_X
		1208	struct timeval tp;
1279	struct tm *ltt;	1209	struct tm *ltt;
1280	#endif
1281
1282	/*
1283	* check if we need to get the time for any timeouts
1284	*/
1285
1286	for (i = NUM_TIMEOUTS; i--; )
1287	if (R->timeout[i].tv_sec) {
1288	want_timeout = 1;
1289	break;
1290	}
1291
1292	#ifndef DEBUG_X
1293	if (want_timeout)
1294	#endif
1295	(void)gettimeofday(&tp, NULL);	1210	(void)gettimeofday(&tp, NULL);
1296
1297	#ifdef DEBUG_X
1298	ltt = localtime(&(tp.tv_sec));	1211	ltt = localtime(&(tp.tv_sec));
1299	D_X((stderr, "Event: %-16s %-7s %08lx (%4d-%02d-%02d %02d:%02d:%02d.%.6ld) %s %lu", eventnames[ev->type], (ev->xany.window == R->TermWin.parent[0] ? "parent" : (ev->xany.window == R->TermWin.vt ? "vt" : (ev->xany.window == R->scrollBar.win ? "scroll" : (ev->xany.window == R->menuBar.win ? "menubar" : "UNKNOWN")))), (ev->xany.window == R->TermWin.parent[0] ? R->TermWin.parent[0] : (ev->xany.window == R->TermWin.vt ? R->TermWin.vt : (ev->xany.window == R->scrollBar.win ? R->scrollBar.win : (ev->xany.window == R->menuBar.win ? R->menuBar.win : 0)))), ltt->tm_year + 1900, ltt->tm_mon + 1, ltt->tm_mday, ltt->tm_hour, ltt->tm_min, ltt->tm_sec, tp.tv_usec, ev->xany.send_event ? "S" : " ", ev->xany.serial));	1212	D_X((stderr, "Event: %-16s %-7s %08lx (%4d-%02d-%02d %02d:%02d:%02d.%.6ld) %s %lu", eventnames[ev->type], (ev->xany.window == R->TermWin.parent[0] ? "parent" : (ev->xany.window == R->TermWin.vt ? "vt" : (ev->xany.window == R->scrollBar.win ? "scroll" : (ev->xany.window == R->menuBar.win ? "menubar" : "UNKNOWN")))), (ev->xany.window == R->TermWin.parent[0] ? R->TermWin.parent[0] : (ev->xany.window == R->TermWin.vt ? R->TermWin.vt : (ev->xany.window == R->scrollBar.win ? R->scrollBar.win : (ev->xany.window == R->menuBar.win ? R->menuBar.win : 0)))), ltt->tm_year + 1900, ltt->tm_mon + 1, ltt->tm_mday, ltt->tm_hour, ltt->tm_min, ltt->tm_sec, tp.tv_usec, ev->xany.send_event ? "S" : " ", ev->xany.serial));
1300	#endif	1213	#endif
1301
1302	/* X event timeouts */
1303	if (want_timeout)
1304	for (i = NUM_TIMEOUTS; i--; ) {
1305	if (R->timeout[i].tv_sec == 0)
1306	continue;
1307	if ((tp.tv_sec < R->timeout[i].tv_sec)
1308	|| (tp.tv_sec == R->timeout[i].tv_sec
1309	&& tp.tv_usec < R->timeout[i].tv_usec))
1310	continue;
1311	R->timeout[i].tv_sec = 0;
1312	switch(i) {
1313	case TIMEOUT_INCR:
1314	rxvt_print_error("data loss: timeout on INCR selection paste");
1315	R->selection_wait = Sel_none;
1316	break;
1317	default:
1318	break;
1319	}
1320	}
1321		1214
1322	switch (ev->type) {	1215	switch (ev->type) {
1323	case KeyPress:	1216	case KeyPress:
1324	rxvt_lookup_key(aR_ (XKeyEvent *)ev);	1217	rxvt_lookup_key(aR_ (XKeyEvent *)ev);
1325	break;	1218	break;
…		…
1349	break;	1242	break;
1350		1243
1351	case ClientMessage:	1244	case ClientMessage:
1352	if (ev->xclient.format == 32	1245	if (ev->xclient.format == 32
1353	&& (Atom)ev->xclient.data.l[0] == R->xa[XA_WMDELETEWINDOW])	1246	&& (Atom)ev->xclient.data.l[0] == R->xa[XA_WMDELETEWINDOW])
1354	exit(EXIT_SUCCESS);	1247	R->destroy ();
1355	#ifdef OFFIX_DND	1248	#ifdef OFFIX_DND
1356	/* OffiX Dnd (drag 'n' drop) protocol */	1249	/* OffiX Dnd (drag 'n' drop) protocol */
1357	if (ev->xclient.message_type == R->xa[XA_DNDPROTOCOL]	1250	else if (ev->xclient.message_type == R->xa[XA_DNDPROTOCOL]
1358	&& (ev->xclient.data.l[0] == DndFile	1251	&& (ev->xclient.data.l[0] == DndFile
1359	|| ev->xclient.data.l[0] == DndDir	1252	|| ev->xclient.data.l[0] == DndDir
1360	|| ev->xclient.data.l[0] == DndLink)) {	1253	|| ev->xclient.data.l[0] == DndLink)) {
1361	/* Get Dnd data */	1254	/* Get Dnd data */
1362	Atom ActualType;	1255	Atom ActualType;
…		…
1394	* in the GraphicsExpose parts, which means that after each refresh,	1287	* in the GraphicsExpose parts, which means that after each refresh,
1395	* we need to wait for the graphics expose or Noexpose events,	1288	* we need to wait for the graphics expose or Noexpose events,
1396	* which ought to make things real slow!	1289	* which ought to make things real slow!
1397	*/	1290	*/
1398	case VisibilityNotify:	1291	case VisibilityNotify:
1399	switch (ev->xvisibility.state) {	1292	switch (ev->xvisibility.state)
		1293	{
1400	case VisibilityUnobscured:	1294	case VisibilityUnobscured:
1401	R->refresh_type = FAST_REFRESH;	1295	R->refresh_type = FAST_REFRESH;
1402	break;	1296	break;
1403	case VisibilityPartiallyObscured:	1297	case VisibilityPartiallyObscured:
1404	R->refresh_type = SLOW_REFRESH;	1298	R->refresh_type = SLOW_REFRESH;
1405	break;	1299	break;
1406	default:	1300	default:
1407	R->refresh_type = NO_REFRESH;	1301	R->refresh_type = NO_REFRESH;
1408	break;	1302	break;
1409	}	1303	}
1410	break;	1304	break;
1411		1305
1412	case FocusIn:	1306	case FocusIn:
1413	if (!R->TermWin.focus) {	1307	if (!R->TermWin.focus) {
1414	R->TermWin.focus = 1;	1308	R->TermWin.focus = 1;
…		…
1540	&unused_xevent)) ;	1434	&unused_xevent)) ;
1541	while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window,	1435	while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window,
1542	GraphicsExpose,	1436	GraphicsExpose,
1543	&unused_xevent)) ;	1437	&unused_xevent)) ;
1544	if (isScrollbarWindow(ev->xany.window)) {	1438	if (isScrollbarWindow(ev->xany.window)) {
1545	scrollbar_setIdle();	1439	R->scrollBar.setIdle();
1546	rxvt_scrollbar_show(aR_ 0);	1440	rxvt_scrollbar_show(aR_ 0);
1547	}	1441	}
1548	#ifdef MENUBAR	1442	#ifdef MENUBAR
1549	if (menubar_visible(aR) && isMenuBarWindow(ev->xany.window))	1443	if (menubar_visible(aR) && isMenuBarWindow(ev->xany.window))
1550	rxvt_menubar_expose(aR);	1444	rxvt_menubar_expose(aR);
…		…
1556	break;	1450	break;
1557		1451
1558	case MotionNotify:	1452	case MotionNotify:
1559	#ifdef POINTER_BLANK	1453	#ifdef POINTER_BLANK
1560	if (R->hidden_pointer)	1454	if (R->hidden_pointer)
1561	rxvt_pointer_unblank(aR);	1455	R->pointer_unblank ();
1562	#endif	1456	#endif
1563	#if MENUBAR	1457	#if MENUBAR
1564	if (isMenuBarWindow(ev->xany.window)) {	1458	if (isMenuBarWindow(ev->xany.window)) {
1565	rxvt_menubar_control(aR_ &(ev->xbutton));	1459	rxvt_menubar_control(aR_ &(ev->xbutton));
1566	break;	1460	break;
…		…
1663	*/	1557	*/
1664	if (ev->window == R->TermWin.vt)	1558	if (ev->window == R->TermWin.vt)
1665	{	1559	{
1666	#if RXVT_GRAPHICS	1560	#if RXVT_GRAPHICS
1667	if (ev->subwindow != None)	1561	if (ev->subwindow != None)
1668	rxvt_Gr_ButtonPress(ev->x, ev->y);	1562	rxvt_Gr_ButtonPress (ev->x, ev->y);
1669	else	1563	else
1670	#endif	1564	#endif
1671	{	1565	{
1672	clickintime = ev->time - R->MEvent.time < MULTICLICK_TIME;	1566	clickintime = ev->time - R->MEvent.time < MULTICLICK_TIME;
1673	if (reportmode)	1567	if (reportmode)
…		…
1735	/*	1629	/*
1736	* Scrollbar window processing of button press	1630	* Scrollbar window processing of button press
1737	*/	1631	*/
1738	if (isScrollbarWindow(ev->window))	1632	if (isScrollbarWindow(ev->window))
1739	{	1633	{
1740	scrollbar_setIdle();	1634	R->scrollBar.setIdle ();
1741	/*	1635	/*
1742	* Rxvt-style scrollbar:	1636	* Rxvt-style scrollbar:
1743	* move up if mouse is above slider	1637	* move up if mouse is above slider
1744	* move dn if mouse is below slider	1638	* move dn if mouse is below slider
1745	*	1639	*
…		…
1757	*/	1651	*/
1758	if ((R->scrollBar.style == R_SB_NEXT	1652	if ((R->scrollBar.style == R_SB_NEXT
1759	&& scrollbarnext_upButton(ev->y))	1653	&& scrollbarnext_upButton(ev->y))
1760	|| (R->scrollBar.style == R_SB_RXVT	1654	|| (R->scrollBar.style == R_SB_RXVT
1761	&& scrollbarrxvt_upButton(ev->y)))	1655	&& scrollbarrxvt_upButton(ev->y)))
1762	rxvt_tt_printf(aR_ "\033[A");	1656	R->tt_printf("\033[A");
1763	else if ((R->scrollBar.style == R_SB_NEXT	1657	else if ((R->scrollBar.style == R_SB_NEXT
1764	&& scrollbarnext_dnButton(ev->y))	1658	&& scrollbarnext_dnButton(ev->y))
1765	|| (R->scrollBar.style == R_SB_RXVT	1659	|| (R->scrollBar.style == R_SB_RXVT
1766	&& scrollbarrxvt_dnButton(ev->y)))	1660	&& scrollbarrxvt_dnButton(ev->y)))
1767	rxvt_tt_printf(aR_ "\033[B");	1661	R->tt_printf("\033[B");
1768	else	1662	else
1769	switch (ev->button) {	1663	switch (ev->button) {
1770	case Button2:	1664	case Button2:
1771	rxvt_tt_printf(aR_ "\014");	1665	R->tt_printf("\014");
1772	break;	1666	break;
1773	case Button1:	1667	case Button1:
1774	rxvt_tt_printf(aR_ "\033[6~");	1668	R->tt_printf("\033[6~");
1775	break;	1669	break;
1776	case Button3:	1670	case Button3:
1777	rxvt_tt_printf(aR_ "\033[5~");	1671	R->tt_printf("\033[5~");
1778	break;	1672	break;
1779	}	1673	}
1780	}	1674	}
1781	else	1675	else
1782	#endif /* NO_SCROLLBAR_REPORT */	1676	#endif /* NO_SCROLLBAR_REPORT */
…		…
1798	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	1692	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1799	R->scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY;	1693	R->scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY;
1800	#endif	1694	#endif
1801	if (rxvt_scr_page(aR_ upordown < 0 ? UP : DN, 1)) {	1695	if (rxvt_scr_page(aR_ upordown < 0 ? UP : DN, 1)) {
1802	if (upordown < 0)	1696	if (upordown < 0)
1803	scrollbar_setUp();	1697	R->scrollBar.setUp ();
1804	else	1698	else
1805	scrollbar_setDn();	1699	R->scrollBar.setDn ();
1806	}	1700	}
1807	} else	1701	} else
1808	switch (ev->button) {	1702	switch (ev->button) {
1809	case Button2:	1703	case Button2:
1810	switch (R->scrollbar_align) {	1704	switch (R->scrollbar_align) {
…		…
1822	|| scrollbar_above_slider(ev->y)	1716	|| scrollbar_above_slider(ev->y)
1823	|| scrollbar_below_slider(ev->y))	1717	|| scrollbar_below_slider(ev->y))
1824	rxvt_scr_move_to(aR_	1718	rxvt_scr_move_to(aR_
1825	scrollbar_position(ev->y) - R->csrO,	1719	scrollbar_position(ev->y) - R->csrO,
1826	scrollbar_size());	1720	scrollbar_size());
1827	scrollbar_setMotion();	1721	R->scrollBar.setMotion ();
1828	break;	1722	break;
1829		1723
1830	case Button1:	1724	case Button1:
1831	if (R->scrollbar_align == R_SB_ALIGN_CENTRE)	1725	if (R->scrollbar_align == R_SB_ALIGN_CENTRE)
1832	R->csrO = ev->y - R->scrollBar.top;	1726	R->csrO = ev->y - R->scrollBar.top;
…		…
1845	rxvt_scr_page(aR_ DN, R->TermWin.nrow - 1);	1739	rxvt_scr_page(aR_ DN, R->TermWin.nrow - 1);
1846	# else	1740	# else
1847	rxvt_scr_page(aR_ DN, R->TermWin.nrow / 4);	1741	rxvt_scr_page(aR_ DN, R->TermWin.nrow / 4);
1848	# endif	1742	# endif
1849	else	1743	else
1850	scrollbar_setMotion();	1744	R->scrollBar.setMotion ();
1851	} else {	1745	} else {
1852	rxvt_scr_page(aR_ (ev->button == Button1 ? DN : UP),	1746	rxvt_scr_page(aR_ (ev->button == Button1 ? DN : UP),
1853	(R->TermWin.nrow	1747	(R->TermWin.nrow
1854	* scrollbar_position(ev->y)	1748	* scrollbar_position(ev->y)
1855	/ scrollbar_size()));	1749	/ scrollbar_size()));
…		…
1877	R->csrO = 0; /* reset csr Offset */	1771	R->csrO = 0; /* reset csr Offset */
1878	if (!R->bypass_keystate)	1772	if (!R->bypass_keystate)
1879	reportmode = !!(R->PrivateModes & PrivMode_mouse_report);	1773	reportmode = !!(R->PrivateModes & PrivMode_mouse_report);
1880		1774
1881	if (scrollbar_isUpDn()) {	1775	if (scrollbar_isUpDn()) {
1882	scrollbar_setIdle();	1776	R->scrollBar.setIdle ();
1883	rxvt_scrollbar_show(aR_ 0);	1777	rxvt_scrollbar_show(aR_ 0);
1884	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	1778	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1885	R->refresh_type &= ~SMOOTH_REFRESH;	1779	R->refresh_type &= ~SMOOTH_REFRESH;
1886	#endif	1780	#endif
1887	}	1781	}
…		…
1938	break;	1832	break;
1939	#ifdef MOUSE_WHEEL	1833	#ifdef MOUSE_WHEEL
1940	case Button4:	1834	case Button4:
1941	case Button5:	1835	case Button5:
1942	{	1836	{
1943	int i, v;	1837	int i;
		1838	page_dirn v;
1944		1839
1945	v = (ev->button == Button4) ? UP : DN;	1840	v = (ev->button == Button4) ? UP : DN;
1946	if (ev->state & ShiftMask)	1841	if (ev->state & ShiftMask)
1947	i = 1;	1842	i = 1;
1948	else if ((R->Options & Opt_mouseWheelScrollPage))	1843	else if ((R->Options & Opt_mouseWheelScrollPage))
…		…
2123	n = 0;	2018	n = 0;
2124	if (pchanged) {	2019	if (pchanged) {
2125	for (; n < (unsigned int)i; n++) {	2020	for (; n < (unsigned int)i; n++) {
2126	XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[n], &wattr);	2021	XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[n], &wattr);
2127	D_X((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));	2022	D_X((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2128	if (wattr.depth != rootdepth || wattr.class == InputOnly) {	2023	if (wattr.depth != rootdepth || wattr.c_class == InputOnly) {
2129	n = (int)(sizeof(R->TermWin.parent) / sizeof(Window)) + 1;	2024	n = (int)(sizeof(R->TermWin.parent) / sizeof(Window)) + 1;
2130	break;	2025	break;
2131	}	2026	}
2132	}	2027	}
2133	}	2028	}
…		…
2183	return stream;	2078	return stream;
2184	}	2079	}
2185		2080
2186	/* EXTPROTO */	2081	/* EXTPROTO */
2187	int	2082	int
2188	rxvt_pclose_printer(FILE *stream)	2083	rxvt_pclose_printer (FILE *stream)
2189	{	2084	{
2190	fflush(stream);	2085	fflush (stream);
2191	/* pclose() reported not to work on SunOS 4.1.3 */	2086	/* pclose() reported not to work on SunOS 4.1.3 */
2192	# if defined (__sun__) /* TODO: RESOLVE THIS */	2087	# if defined (__sun__) /* TODO: RESOLVE THIS */
2193	/* pclose works provided SIGCHLD handler uses waitpid */	2088	/* pclose works provided SIGCHLD handler uses waitpid */
2194	return pclose(stream); /* return fclose (stream); */	2089	return pclose (stream); /* return fclose (stream); */
2195	# else	2090	# else
2196	return pclose(stream);	2091	return pclose (stream);
2197	# endif	2092	# endif
2198	}	2093	}
2199		2094
2200	/*	2095	/*
2201	* simulate attached vt100 printer	2096	* simulate attached vt100 printer
…		…
2264	rxvt_process_nonprinting(pR_ unsigned char ch)	2159	rxvt_process_nonprinting(pR_ unsigned char ch)
2265	{	2160	{
2266	switch (ch) {	2161	switch (ch) {
2267	case C0_ENQ: /* terminal Status */	2162	case C0_ENQ: /* terminal Status */
2268	if (R->rs[Rs_answerbackstring])	2163	if (R->rs[Rs_answerbackstring])
2269	rxvt_tt_write(aR_	2164	R->tt_write(
2270	(const unsigned char *)R->rs[Rs_answerbackstring],	2165	(const unsigned char *)R->rs[Rs_answerbackstring],
2271	(unsigned int)STRLEN(R->rs[Rs_answerbackstring]));	2166	(unsigned int)STRLEN(R->rs[Rs_answerbackstring]));
2272	else	2167	else
2273	rxvt_tt_write(aR_ (unsigned char *)VT100_ANS,	2168	R->tt_write((unsigned char *)VT100_ANS,
2274	(unsigned int)STRLEN(VT100_ANS));	2169	(unsigned int)STRLEN(VT100_ANS));
2275	break;	2170	break;
2276	case C0_BEL: /* bell */	2171	case C0_BEL: /* bell */
2277	rxvt_scr_bell(aR);	2172	rxvt_scr_bell(aR);
2278	break;	2173	break;
…		…
2341	row = rxvt_cmd_getc(aR) - ' ';	2236	row = rxvt_cmd_getc(aR) - ' ';
2342	col = rxvt_cmd_getc(aR) - ' ';	2237	col = rxvt_cmd_getc(aR) - ' ';
2343	rxvt_scr_gotorc(aR_ row, col, 0);	2238	rxvt_scr_gotorc(aR_ row, col, 0);
2344	break;	2239	break;
2345	case 'Z': /* identify the terminal type */	2240	case 'Z': /* identify the terminal type */
2346	rxvt_tt_printf(aR_ "\033/Z"); /* I am a VT100 emulating a VT52 */	2241	R->tt_printf("\033/Z"); /* I am a VT100 emulating a VT52 */
2347	break;	2242	break;
2348	case '<': /* turn off VT52 mode */	2243	case '<': /* turn off VT52 mode */
2349	PrivMode(0, PrivMode_vt52);	2244	PrivMode(0, PrivMode_vt52);
2350	break;	2245	break;
2351	case 'F': /* use special graphics character set */	2246	case 'F': /* use special graphics character set */
…		…
2458	rxvt_process_dcs_seq(aR);	2353	rxvt_process_dcs_seq(aR);
2459	break;	2354	break;
2460		2355
2461	/* 8.3.110: SINGLE CHARACTER INTRODUCER */	2356	/* 8.3.110: SINGLE CHARACTER INTRODUCER */
2462	case C1_SCI: /* ESC Z */	2357	case C1_SCI: /* ESC Z */
2463	rxvt_tt_write(aR_ (const unsigned char *)ESCZ_ANSWER,	2358	R->tt_write((const unsigned char *)ESCZ_ANSWER,
2464	(unsigned int)(sizeof(ESCZ_ANSWER) - 1));	2359	(unsigned int)(sizeof(ESCZ_ANSWER) - 1));
2465	break; /* steal obsolete ESC [ c */	2360	break; /* steal obsolete ESC [ c */
2466		2361
2467	/* 8.3.16: CONTROL SEQUENCE INTRODUCER */	2362	/* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2468	case C1_CSI: /* ESC [ */	2363	case C1_CSI: /* ESC [ */
…		…
2589	*/	2484	*/
2590	if (priv) {	2485	if (priv) {
2591	switch (priv) {	2486	switch (priv) {
2592	case '>':	2487	case '>':
2593	if (ch == CSI_DA) /* secondary device attributes */	2488	if (ch == CSI_DA) /* secondary device attributes */
2594	rxvt_tt_printf(aR_ "\033[>%d;%-.8s;0c", 'R', VSTRING);	2489	R->tt_printf("\033[>%d;%-.8s;0c", 'R', VSTRING);
2595	break;	2490	break;
2596	case '?':	2491	case '?':
2597	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')	2492	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2598	rxvt_process_terminal_mode(aR_ ch, priv, nargs, arg);	2493	rxvt_process_terminal_mode(aR_ ch, priv, nargs, arg);
2599	break;	2494	break;
…		…
2702		2597
2703	case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */	2598	case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2704	arg[0] = -arg[0];	2599	arg[0] = -arg[0];
2705	/* FALLTHROUGH */	2600	/* FALLTHROUGH */
2706	case CSI_SU: /* 8.3.148: (1) SCROLL UP */	2601	case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2707	rxvt_scroll_text(aR_ R->screen.tscroll, R->screen.bscroll, arg[0], 0);	2602	R->scr_scroll_text (R->screen.tscroll, R->screen.bscroll, arg[0], 0);
2708	break;	2603	break;
2709		2604
2710	case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */	2605	case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2711	rxvt_tt_write(aR_ (const unsigned char *)VT100_ANS,	2606	R->tt_write((const unsigned char *)VT100_ANS,
2712	(unsigned int)(sizeof(VT100_ANS) - 1));	2607	(unsigned int)(sizeof(VT100_ANS) - 1));
2713	break;	2608	break;
2714		2609
2715	case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */	2610	case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2716	rxvt_process_sgr_mode(aR_ nargs, arg);	2611	rxvt_process_sgr_mode(aR_ nargs, arg);
2717	break;	2612	break;
2718		2613
2719	case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */	2614	case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */
2720	switch (arg[0]) {	2615	switch (arg[0]) {
2721	case 5: /* DSR requested */	2616	case 5: /* DSR requested */
2722	rxvt_tt_printf(aR_ "\033[0n");	2617	R->tt_printf("\033[0n");
2723	break;	2618	break;
2724	case 6: /* CPR requested */	2619	case 6: /* CPR requested */
2725	rxvt_scr_report_position(aR);	2620	rxvt_scr_report_position(aR);
2726	break;	2621	break;
2727	#if defined (ENABLE_DISPLAY_ANSWER)	2622	#if defined (ENABLE_DISPLAY_ANSWER)
2728	case 7: /* unofficial extension */	2623	case 7: /* unofficial extension */
2729	rxvt_tt_printf(aR_ "%-.250s\n", R->rs[Rs_display_name]);	2624	R->tt_printf("%-.250s\n", R->rs[Rs_display_name]);
2730	break;	2625	break;
2731	#endif	2626	#endif
2732	case 8: /* unofficial extension */	2627	case 8: /* unofficial extension */
2733	rxvt_xterm_seq(aR_ XTerm_title, APL_NAME "-" VERSION, CHAR_ST);	2628	rxvt_xterm_seq(aR_ XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
2734	break;	2629	break;
…		…
2803	break;	2698	break;
2804	#endif	2699	#endif
2805		2700
2806	case CSI_78: /* DECREQTPARM */	2701	case CSI_78: /* DECREQTPARM */
2807	if (arg[0] == 0 || arg[0] == 1)	2702	if (arg[0] == 0 || arg[0] == 1)
2808	rxvt_tt_printf(aR_ "\033[%d;1;1;112;112;1;0x", arg[0] + 2);	2703	R->tt_printf("\033[%d;1;1;112;112;1;0x", arg[0] + 2);
2809	/* FALLTHROUGH */	2704	/* FALLTHROUGH */
2810		2705
2811	default:	2706	default:
2812	break;	2707	break;
2813	}	2708	}
…		…
2867	/*	2762	/*
2868	* reports - some output format copied from XTerm	2763	* reports - some output format copied from XTerm
2869	*/	2764	*/
2870	case 11: /* report window state */	2765	case 11: /* report window state */
2871	XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);	2766	XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);
2872	rxvt_tt_printf(aR_ "\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	2767	R->tt_printf("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2873	break;	2768	break;
2874	case 13: /* report window position */	2769	case 13: /* report window position */
2875	XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);	2770	XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);
2876	XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], wattr.root,	2771	XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], wattr.root,
2877	-wattr.border_width, -wattr.border_width,	2772	-wattr.border_width, -wattr.border_width,
2878	&x, &y, &wdummy);	2773	&x, &y, &wdummy);
2879	rxvt_tt_printf(aR_ "\033[3;%d;%dt", x, y);	2774	R->tt_printf("\033[3;%d;%dt", x, y);
2880	break;	2775	break;
2881	case 14: /* report window size (pixels) */	2776	case 14: /* report window size (pixels) */
2882	XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);	2777	XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);
2883	rxvt_tt_printf(aR_ "\033[4;%d;%dt", wattr.height, wattr.width);	2778	R->tt_printf("\033[4;%d;%dt", wattr.height, wattr.width);
2884	break;	2779	break;
2885	case 18: /* report window size (chars) */	2780	case 18: /* report window size (chars) */
2886	rxvt_tt_printf(aR_ "\033[8;%d;%dt", R->TermWin.nrow, R->TermWin.ncol);	2781	R->tt_printf("\033[8;%d;%dt", R->TermWin.nrow, R->TermWin.ncol);
2887	break;	2782	break;
2888	#if 0 /* XXX: currently disabled due to security concerns */	2783	#if 0 /* XXX: currently disabled due to security concerns */
2889	case 20: /* report icon label */	2784	case 20: /* report icon label */
2890	XGetIconName(R->Xdisplay, R->TermWin.parent[0], &s);	2785	XGetIconName(R->Xdisplay, R->TermWin.parent[0], &s);
2891	rxvt_tt_printf(aR_ "\033]L%-.200s\234", s ? s : ""); /* 8bit ST */	2786	R->tt_printf("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */
2892	break;	2787	break;
2893	case 21: /* report window title */	2788	case 21: /* report window title */
2894	XFetchName(R->Xdisplay, R->TermWin.parent[0], &s);	2789	XFetchName(R->Xdisplay, R->TermWin.parent[0], &s);
2895	rxvt_tt_printf(aR_ "\033]l%-.200s\234", s ? s : ""); /* 8bit ST */	2790	R->tt_printf("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */
2896	break;	2791	break;
2897	#endif	2792	#endif
2898	}	2793	}
2899	}	2794	}
2900	#endif	2795	#endif
…		…
3443	{	3338	{
3444	unsigned char ch, cmd = rxvt_cmd_getc(aR);	3339	unsigned char ch, cmd = rxvt_cmd_getc(aR);
3445		3340
3446	#ifndef RXVT_GRAPHICS	3341	#ifndef RXVT_GRAPHICS
3447	if (cmd == 'Q') { /* query graphics */	3342	if (cmd == 'Q') { /* query graphics */
3448	rxvt_tt_printf(aR_ "\033G0\n"); /* no graphics */	3343	R->tt_printf("\033G0\n"); /* no graphics */
3449	return;	3344	return;
3450	}	3345	}
3451	/* swallow other graphics sequences until terminating ':' */	3346	/* swallow other graphics sequences until terminating ':' */
3452	do	3347	do
3453	ch = rxvt_cmd_getc(aR);	3348	ch = rxvt_cmd_getc(aR);
…		…
3456	unsigned int nargs;	3351	unsigned int nargs;
3457	int args[NGRX_PTS];	3352	int args[NGRX_PTS];
3458	unsigned char *text = NULL;	3353	unsigned char *text = NULL;
3459		3354
3460	if (cmd == 'Q') { /* query graphics */	3355	if (cmd == 'Q') { /* query graphics */
3461	rxvt_tt_printf(aR_ "\033G1\n"); /* yes, graphics (color) */	3356	R->tt_printf("\033G1\n"); /* yes, graphics (color) */
3462	return;	3357	return;
3463	}	3358	}
3464	for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;) {	3359	for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;) {
3465	int neg;	3360	int neg;
3466		3361
…		…
3481	}	3376	}
3482		3377
3483	if ((cmd == 'T') && (nargs >= 5)) {	3378	if ((cmd == 'T') && (nargs >= 5)) {
3484	int i, len = args[4];	3379	int i, len = args[4];
3485		3380
3486	text = rxvt_malloc((len + 1) * sizeof(char));	3381	text = (unsigned char *)rxvt_malloc((len + 1) * sizeof(char));
3487		3382
3488	if (text != NULL) {	3383	if (text != NULL) {
3489	for (i = 0; i < len; i++)	3384	for (i = 0; i < len; i++)
3490	text[i] = rxvt_cmd_getc(aR);	3385	text[i] = rxvt_cmd_getc(aR);
3491	text[len] = '\0';	3386	text[len] = '\0';
…		…
3500		3395
3501	/*	3396	/*
3502	* Send printf() formatted output to the command.	3397	* Send printf() formatted output to the command.
3503	* Only use for small amounts of data.	3398	* Only use for small amounts of data.
3504	*/	3399	*/
3505	/* EXTPROTO */
3506	void	3400	void
3507	rxvt_tt_printf(pR_ const char *fmt,...)	3401	rxvt_term::tt_printf (const char *fmt,...)
3508	{	3402	{
3509	va_list arg_ptr;	3403	va_list arg_ptr;
3510	unsigned char buf[256];	3404	unsigned char buf[256];
3511		3405
3512	va_start(arg_ptr, fmt);	3406	va_start (arg_ptr, fmt);
3513	vsprintf((char *)buf, fmt, arg_ptr);	3407	vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3514	va_end(arg_ptr);	3408	va_end (arg_ptr);
3515	rxvt_tt_write(aR_ buf, (unsigned int)STRLEN(buf));	3409	tt_write (buf, STRLEN (buf));
3516	}	3410	}
3517		3411
3518	/* ---------------------------------------------------------------------- */	3412	/* ---------------------------------------------------------------------- */
3519	/* Addresses pasting large amounts of data and rxvt hang
3520	* code pinched from xterm (v_write()) and applied originally to
3521	* rxvt-2.18 - Hops
3522	* Write data to the pty as typed by the user, pasted with the mouse,	3413	/* Write data to the pty as typed by the user, pasted with the mouse,
3523	* or generated by us in response to a query ESC sequence.	3414	* or generated by us in response to a query ESC sequence.
3524	*/	3415	*/
3525	/* EXTPROTO */
3526	void	3416	void
3527	rxvt_tt_write(pR_ const unsigned char *d, unsigned int len)	3417	rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3528	{	3418	{
3529	#define MAX_PTY_WRITE 256 /* POSIX minimum MAX_INPUT */	3419	enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT
3530	int riten;
3531	unsigned int p;
3532	unsigned char *v_buffer, /* start of physical buffer */
3533	*v_bufstr, /* start of current buffer pending */
3534	*v_bufptr, /* end of current buffer pending */
3535	*v_bufend; /* end of physical buffer */
3536		3420
3537	if (R->v_bufstr == NULL && len > 0) {	3421	if (len)
3538	p = (len / MAX_PTY_WRITE + 1) * MAX_PTY_WRITE;
3539	v_buffer = v_bufstr = v_bufptr = (unsigned char *)rxvt_malloc(p);
3540	v_bufend = v_buffer + p;
3541	} else {
3542	v_buffer = R->v_buffer;
3543	v_bufstr = R->v_bufstr;
3544	v_bufptr = R->v_bufptr;
3545	v_bufend = R->v_bufend;
3546	}	3422	{
		3423	if (v_buflen == 0)
		3424	{
		3425	int written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
		3426	if (written == len)
		3427	return;
3547		3428
3548	/*	3429	data += written;
3549	* Append to the block we already have. Always doing this simplifies the	3430	len -= written;
3550	* code, and isn't too bad, either. If this is a short block, it isn't	3431	}
3551	* too expensive, and if this is a long block, we won't be able to write	3432
3552	* it all anyway.	3433
3553	*/	3434	v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3554	if (len > 0) {	3435
3555	if (v_bufend < v_bufptr + len) { /* run out of room */	3436	memcpy (v_buffer + v_buflen, data, len);
3556	if (v_bufstr != v_buffer) {	3437	v_buflen += len;
3557	/* there is unused space, move everything down */
3558	MEMMOVE(v_buffer, v_bufstr,
3559	(unsigned int)(v_bufptr - v_bufstr));
3560	v_bufptr -= v_bufstr - v_buffer;
3561	v_bufstr = v_buffer;
3562	}	3438	}
3563	if (v_bufend < v_bufptr + len) {
3564	/* still won't fit: get more space */
3565	/* use most basic realloc because an error is not fatal. */
3566	unsigned int size = v_bufptr - v_buffer;
3567	unsigned int reallocto;
3568		3439
3569	reallocto = ((size + len) / MAX_PTY_WRITE + 1) * MAX_PTY_WRITE;	3440	for (;;)
3570	v_buffer = (unsigned char *)realloc(v_buffer, reallocto);	3441	{
3571	/* save across realloc */	3442	int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3572	if (v_buffer) {	3443
3573	v_bufstr = v_buffer;	3444	if (written > 0)
3574	v_bufptr = v_buffer + size;	3445	{
3575	v_bufend = v_buffer + reallocto;	3446	v_buflen -= written;
3576	} else { /* no memory: ignore entire write request */	3447
3577	rxvt_print_error("data loss: cannot allocate buffer space");	3448	if (v_buflen == 0)
3578	v_buffer = v_bufstr; /* restore clobbered pointer */	3449	{
3579	}	3450	free (v_buffer);
		3451	v_buffer = 0;
		3452	v_buflen = 0;
		3453
		3454	pty_ev.set (EVENT_READ);
		3455	return;
		3456	}
		3457
		3458	memmove (v_buffer, v_buffer + written, v_buflen);
		3459	}
		3460	else if (written != -1 || (errno != EAGAIN && errno != EINTR))
		3461	// original code just ignores this...
		3462	destroy ();
		3463	else
		3464	{
		3465	pty_ev.set (EVENT_READ | EVENT_WRITE);
		3466	return;
		3467	}
3580	}	3468	}
3581	}
3582	if (v_bufend >= v_bufptr + len) { /* new stuff will fit */
3583	MEMCPY(v_bufptr, d, len);
3584	v_bufptr += len;
3585	}
3586	}
3587
3588	/*
3589	* Write out as much of the buffer as we can.
3590	* Be careful not to overflow the pty's input silo.
3591	* We are conservative here and only write a small amount at a time.
3592	*
3593	* If we can't push all the data into the pty yet, we expect write
3594	* to return a non-negative number less than the length requested
3595	* (if some data written) or -1 and set errno to EAGAIN,
3596	* EWOULDBLOCK, or EINTR (if no data written).
3597	*
3598	* (Not all systems do this, sigh, so the code is actually
3599	* a little more forgiving.)
3600	*/
3601	if ((p = v_bufptr - v_bufstr) > 0) {
3602	riten = write(R->cmd_fd, v_bufstr, min(p, MAX_PTY_WRITE));
3603	if (riten < 0)
3604	riten = 0;
3605	v_bufstr += riten;
3606	if (v_bufstr >= v_bufptr) /* we wrote it all */
3607	v_bufstr = v_bufptr = v_buffer;
3608	}
3609	/*
3610	* If we have lots of unused memory allocated, return it
3611	*/
3612	if (v_bufend - v_bufptr > MAX_PTY_WRITE * 8) { /* arbitrary hysteresis */
3613	/* save pointers across realloc */
3614	unsigned int start = v_bufstr - v_buffer;
3615	unsigned int size = v_bufptr - v_buffer;
3616	unsigned int reallocto;
3617
3618	reallocto = (size / MAX_PTY_WRITE + 1) * MAX_PTY_WRITE;
3619	v_buffer = (unsigned char *)realloc(v_buffer, reallocto);
3620	if (v_buffer) {
3621	v_bufstr = v_buffer + start;
3622	v_bufptr = v_buffer + size;
3623	v_bufend = v_buffer + reallocto;
3624	} else {
3625	/* should we print a warning if couldn't return memory? */
3626	v_buffer = v_bufstr - start; /* restore clobbered pointer */
3627	}
3628	}
3629	R->v_buffer = v_buffer;
3630	R->v_bufstr = v_bufstr;
3631	R->v_bufptr = v_bufptr;
3632	R->v_bufend = v_bufend;
3633	}	3469	}
		3470
3634	/*----------------------- end-of-file (C source) -----------------------*/	3471	/*----------------------- end-of-file (C source) -----------------------*/
3635		3472

Diff Legend

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