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.4 by pcg, Tue Nov 25 15:25:16 2003 UTC vs.
Revision 1.23 by pcg, Thu Dec 18 14:11:47 2003 UTC

1	/*--------------------------------*-C-*---------------------------------*	1	/*--------------------------------*-C-*---------------------------------*
2	* File: command.c	2	* File: command.c
3	*----------------------------------------------------------------------*	3	*----------------------------------------------------------------------*
4	* $Id: command.C,v 1.4 2003/11/25 15:25:16 pcg Exp $	4	* $Id: command.C,v 1.23 2003/12/18 14:11:47 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>
…		…
48	#include "../config.h" /* NECESSARY */	48	#include "../config.h" /* NECESSARY */
49	#include "rxvt.h" /* NECESSARY */	49	#include "rxvt.h" /* NECESSARY */
50	#include "version.h"	50	#include "version.h"
51	#include "command.h"	51	#include "command.h"
52		52
		53	#include <wchar.h>
		54
53	/*----------------------------------------------------------------------*/	55	/*----------------------------------------------------------------------*/
54		56
55	/*{{{ Convert the keypress event into a string */	57	/*{{{ Convert the keypress event into a string */
56	/* INTPROTO */	58	/* INTPROTO */
57	void	59	void
…		…
61	unsigned int newlen;	63	unsigned int newlen;
62	KeySym keysym;	64	KeySym keysym;
63	#ifdef DEBUG_CMD	65	#ifdef DEBUG_CMD
64	static int debug_key = 1; /* accessible by a debugger only */	66	static int debug_key = 1; /* accessible by a debugger only */
65	#endif	67	#endif
66	#ifdef USE_XIM
67	int valid_keysym;	68	int valid_keysym;
68	#endif
69	unsigned char *kbuf = R->kbuf;	69	unsigned char *kbuf = R->kbuf;
70		70
71	/*	71	/*
72	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an	72	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
73	* escape sequence to toggle the Keypad.	73	* escape sequence to toggle the Keypad.
…		…
75	* Always permit `shift' to override the current setting	75	* Always permit `shift' to override the current setting
76	*/	76	*/
77	shft = (ev->state & ShiftMask);	77	shft = (ev->state & ShiftMask);
78	ctrl = (ev->state & ControlMask);	78	ctrl = (ev->state & ControlMask);
79	meta = (ev->state & R->ModMetaMask);	79	meta = (ev->state & R->ModMetaMask);
		80
80	if (R->numlock_state || (ev->state & R->ModNumLockMask)) {	81	if (R->numlock_state || (ev->state & R->ModNumLockMask))
		82	{
81	R->numlock_state = (ev->state & R->ModNumLockMask);	83	R->numlock_state = (ev->state & R->ModNumLockMask);
82	PrivMode((!R->numlock_state), PrivMode_aplKP);	84	PrivMode((!R->numlock_state), PrivMode_aplKP);
83	}	85	}
		86
		87	kbuf[0] = 0;
		88
84	#ifdef USE_XIM	89	#ifdef USE_XIM
85	if (R->Input_Context != NULL) {	90	if (R->Input_Context)
		91	{
86	Status status_return;	92	Status status_return;
87		93
88	kbuf[0] = '\0';
89	#ifdef X_HAVE_UTF8_STRING	94	#ifdef X_HAVE_UTF8_STRING
		95	if (R->enc_utf8 && 0)
90	len = Xutf8LookupString(R->Input_Context, ev, (char *)kbuf,	96	len = Xutf8LookupString (R->Input_Context, ev, (char *)kbuf,
91	KBUFSZ, &keysym, &status_return);	97	KBUFSZ, &keysym, &status_return);
92	#else	98	else
		99	#endif
		100	{
		101	wchar_t wkbuf[KBUFSZ + 1];
		102
		103	// the XOpenIM manpage lies about hardcoding the locale
		104	// at the point of XOpenIM, so temporarily switch locales
		105	if (R->rs[Rs_imLocale])
		106	SET_LOCALE (R->rs[Rs_imLocale]);
		107	// assume wchar_t == unicode or better
93	len = XmbLookupString(R->Input_Context, ev, (char *)kbuf,	108	len = XwcLookupString (R->Input_Context, ev, wkbuf,
94	KBUFSZ, &keysym, &status_return);	109	KBUFSZ, &keysym, &status_return);
95	#endif	110	if (R->rs[Rs_imLocale])
		111	SET_LOCALE (R->locale);
		112
		113	if (status_return == XLookupChars
		114	|| status_return == XLookupBoth)
		115	{
		116	wkbuf[len] = 0;
		117	len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ);
		118	if (len < 0)
		119	len = 0;
		120	}
		121	else
		122	len = 0;
		123	}
		124
96	valid_keysym = ((status_return == XLookupKeySym)	125	valid_keysym = status_return == XLookupKeySym
97	|| (status_return == XLookupBoth));	126	|| status_return == XLookupBoth;
		127	}
98	} else {	128	else
		129	#endif
		130	{
99	len = XLookupString(ev, (char *)kbuf, KBUFSZ, &keysym,	131	len = XLookupString (ev, (char *)kbuf, KBUFSZ, &keysym, &R->compose);
100	&R->compose);
101	valid_keysym = 1;	132	valid_keysym = !len;
102	}	133	}
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		134
120	#ifdef USE_XIM
121	if (valid_keysym)	135	if (valid_keysym)
122	#endif
123	{	136	{
124	/* for some backwards compatibility */	137	/* for some backwards compatibility */
125	#if defined(HOTKEY_CTRL) || defined(HOTKEY_META)	138	#if defined(HOTKEY_CTRL) || defined(HOTKEY_META)
126	# ifdef HOTKEY_CTRL	139	# ifdef HOTKEY_CTRL
127	if (ctrl) {	140	if (ctrl)
128	# else	141	# else
129	if (meta) {	142	if (meta)
130	# endif	143	# endif
		144	{
131	if (keysym == R->ks_bigfont) {	145	if (keysym == R->ks_bigfont)
		146	{
132	rxvt_change_font(aR_ 0, FONT_UP);	147	rxvt_change_font(aR_ 0, FONT_UP);
133	return;	148	return;
		149	}
134	} else if (keysym == R->ks_smallfont) {	150	else if (keysym == R->ks_smallfont)
		151	{
135	rxvt_change_font(aR_ 0, FONT_DN);	152	rxvt_change_font(aR_ 0, FONT_DN);
136	return;	153	return;
137	}	154	}
138	}	155	}
139	#endif	156	#endif
140		157
141	if (R->TermWin.saveLines) {	158	if (R->TermWin.saveLines) {
142	#ifdef UNSHIFTED_SCROLLKEYS	159	#ifdef UNSHIFTED_SCROLLKEYS
143	if (!ctrl && !meta) {	160	if (!ctrl && !meta) {
…		…
237	/* escape prefix */	254	/* escape prefix */
238	if (meta)	255	if (meta)
239	# ifdef META8_OPTION	256	# ifdef META8_OPTION
240	if (R->meta_char == C0_ESC)	257	if (R->meta_char == C0_ESC)
241	# endif	258	# endif
242	rxvt_tt_write(aR_ &ch, 1);	259	R->tt_write (&ch, 1);
243	rxvt_tt_write(aR_ kbuf0, l);	260	R->tt_write (kbuf0, l);
244	return;	261	return;
245	} else	262	} else
246	#endif	263	#endif
247	{	264	{
248	newlen = 1;	265	newlen = 1;
…		…
572	if (R->greek_mode)	589	if (R->greek_mode)
573	len = greek_xlat(kbuf, len);	590	len = greek_xlat(kbuf, len);
574	#endif	591	#endif
575	/* nil */ ;	592	/* nil */ ;
576	}	593	}
577	}	594	}
578		595
579	if (len <= 0)	596	if (len <= 0)
580	return; /* not mapped */	597	return; /* not mapped */
581		598
582	if (R->Options & Opt_scrollTtyKeypress)	599	if (R->Options & Opt_scrollTtyKeypress)
…		…
605	&& (R->meta_char == C0_ESC)	622	&& (R->meta_char == C0_ESC)
606	#endif	623	#endif
607	) {	624	) {
608	const unsigned char ch = C0_ESC;	625	const unsigned char ch = C0_ESC;
609		626
610	rxvt_tt_write(aR_ &ch, 1);	627	R->tt_write(&ch, 1);
611	}	628	}
612	#ifdef DEBUG_CMD	629	#ifdef DEBUG_CMD
613	if (debug_key) { /* Display keyboard buffer contents */	630	if (debug_key) { /* Display keyboard buffer contents */
614	char *p;	631	char *p;
615	int i;	632	int i;
…		…
618	for (i = 0, p = kbuf; i < len; i++, p++)	635	for (i = 0, p = kbuf; i < len; i++, p++)
619	fprintf(stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);	636	fprintf(stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
620	fprintf(stderr, "'\n");	637	fprintf(stderr, "'\n");
621	}	638	}
622	#endif /* DEBUG_CMD */	639	#endif /* DEBUG_CMD */
623	rxvt_tt_write(aR_ kbuf, (unsigned int)len);	640	R->tt_write (kbuf, (unsigned int)len);
624	}	641	}
625	/*}}} */	642	/*}}} */
626		643
627	#if (MENUBAR_MAX)	644	#if (MENUBAR_MAX)
628	/*{{{ rxvt_cmd_write(), rxvt_cmd_getc() */	645	/*{{{ rxvt_cmd_write(), rxvt_cmd_getc() */
…		…
656	return 0;	673	return 0;
657	}	674	}
658	#endif /* MENUBAR_MAX */	675	#endif /* MENUBAR_MAX */
659		676
660	void	677	void
		678	rxvt_term::flush ()
		679	{
		680	#ifdef TRANSPARENT
		681	if (want_full_refresh)
		682	{
		683	want_full_refresh = 0;
		684	scr_clear ();
		685	scr_touch (false);
		686	want_refresh = 1;
		687	}
		688	#endif
		689
		690	if (want_refresh)
		691	{
		692	scr_refresh (refresh_type);
		693	rxvt_scrollbar_show (this, 1);
		694	#ifdef USE_XIM
		695	rxvt_IMSendSpot (this);
		696	#endif
		697	}
		698
		699	XFlush (Xdisplay);
		700	#if 0
		701	if (XPending (Xdisplay)) process_x_events ();
		702	if (XPending (Xdisplay)) process_x_events ();
		703	#endif
		704	}
		705
		706	void
		707	rxvt_term::check_cb (check_watcher &w)
		708	{
		709	SET_R (this);
		710	SET_LOCALE (locale);
		711
		712	flush ();
		713	}
		714
		715	void
661	rxvt_term::process_x_events ()	716	rxvt_term::process_x_events ()
662	{	717	{
663	do	718	do
664	{	719	{
665	XEvent xev;	720	XEvent xev;
666		721
667	XNextEvent (Xdisplay, &xev);	722	XNextEvent (Xdisplay, &xev);
		723
668	#if defined(CURSOR_BLINK)	724	#if defined(CURSOR_BLINK)
669	if ((Options & Opt_cursorBlink)	725	if ((Options & Opt_cursorBlink)
670	&& xev.type == KeyPress) {	726	&& xev.type == KeyPress)
		727	{
671	if (hidden_cursor) {	728	if (hidden_cursor)
		729	{
672	hidden_cursor = 0;	730	hidden_cursor = 0;
673	want_refresh = 1;	731	want_refresh = 1;
674	}	732	}
675	want_keypress_time = 1;	733
		734	blink_ev.start (NOW + BLINK_INTERVAL);
676	}	735	}
677	#endif	736	#endif
678		737
679	#if defined(POINTER_BLANK)	738	#if defined(POINTER_BLANK)
680	if ((Options & Opt_pointerBlank)	739	if ((Options & Opt_pointerBlank)
681	&& (pointerBlankDelay > 0)) {	740	&& (pointerBlankDelay > 0))
		741	{
682	if (xev.type == MotionNotify	742	if (xev.type == MotionNotify
683	|| xev.type == ButtonPress	743	|| xev.type == ButtonPress
684	|| xev.type == ButtonRelease) {	744	|| xev.type == ButtonRelease)
685	if (hidden_pointer)	745	if (hidden_pointer)
686	rxvt_pointer_unblank(aR);	746	pointer_unblank ();
687	want_motion_time = 1;	747
688	}
689	if (xev.type == KeyPress && hidden_pointer == 0)	748	if (xev.type == KeyPress && hidden_pointer == 0)
690	rxvt_pointer_blank (this);	749	pointer_blank ();
691	}	750	}
692	#endif	751	#endif
693		752
694	#ifdef USE_XIM	753	#ifdef USE_XIM
695	if (!XFilterEvent (&xev, xev.xany.window))	754	if (!XFilterEvent (&xev, xev.xany.window))
696	#endif	755	#endif
…		…
698	}	757	}
699	while (XPending (Xdisplay));	758	while (XPending (Xdisplay));
700	}	759	}
701		760
702	void	761	void
		762	rxvt_term::blink_cb (time_watcher &w)
		763	{
		764	w.at += BLINK_INTERVAL;
		765	hidden_cursor = !hidden_cursor;
		766	want_refresh = 1;
		767	}
		768
		769	void
703	rxvt_term::x_cb (io_watcher &w, short revents)	770	rxvt_term::x_cb (io_watcher &w, short revents)
704	{	771	{
		772	SET_R (this);
		773	SET_LOCALE (locale);
		774
705	process_x_events ();	775	process_x_events ();
		776	}
706		777
707	flush ();	778	bool
		779	rxvt_term::pty_fill ()
		780	{
		781	ssize_t n = cmdbuf_endp - cmdbuf_ptr;
		782
		783	memmove (cmdbuf_base, cmdbuf_ptr, n);
		784	cmdbuf_ptr = cmdbuf_base;
		785	cmdbuf_endp = cmdbuf_ptr + n;
		786
		787	n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n);
		788
		789	if (n > 0)
		790	{
		791	cmdbuf_endp += n;
		792	return true;
		793	}
		794	else if (n < 0 && errno != EAGAIN)
		795	destroy ();
		796
		797	return false;
		798	}
		799
		800	void
		801	rxvt_term::pty_cb (io_watcher &w, short revents)
		802	{
		803	SET_R (this);
		804	SET_LOCALE (locale);
		805
		806	if (revents & EVENT_WRITE)
		807	tt_write (0, 0);
		808	else if (revents & EVENT_READ)
		809	{
		810	bool flag = true;
		811
		812	// loop, but don't allow a single term to monopolize us
		813	// the number of loops is fully arbitrary, and thus wrong
		814	while (flag && pty_fill ())
		815	{
		816	if (!seen_input)
		817	{
		818	seen_input = 1;
		819	/* once we know the shell is running, send the screen size. Again! */
		820	tt_winch ();
		821	}
		822
		823	uint32_t ch = NOCHAR;
		824
		825	for (;;)
		826	{
		827	if (ch == NOCHAR)
		828	ch = next_char ();
		829
		830	if (ch == NOCHAR) // TODO: improve
		831	break;
		832
		833	if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
		834	{
		835	/* Read a text string from the input buffer */
		836	uint32_t buf[BUFSIZ];
		837	bool refreshnow = false;
		838	int nlines = 0;
		839	uint32_t *str = buf;
		840
		841	*str++ = ch;
		842
		843	for (;;)
		844	{
		845	ch = next_char ();
		846
		847	if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
		848	break;
		849	else
		850	{
		851	*str++ = ch;
		852
		853	if (ch == '\n')
		854	{
		855	nlines++;
		856	refresh_count++;
		857
		858	if (!(Options & Opt_jumpScroll)
		859	|| (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
		860	{
		861	refreshnow = true;
		862	flag = false;
		863	ch = NOCHAR;
		864	break;
		865	}
		866	}
		867
		868	if (str >= buf + BUFSIZ)
		869	{
		870	ch = NOCHAR;
		871	break;
		872	}
		873	}
		874	}
		875
		876	rxvt_scr_add_lines (this, buf, nlines, str - buf);
		877
		878	/*
		879	* If there have been a lot of new lines, then update the screen
		880	* What the heck I'll cheat and only refresh less than every page-full.
		881	* the number of pages between refreshes is refresh_limit, which
		882	* is incremented here because we must be doing flat-out scrolling.
		883	*
		884	* refreshing should be correct for small scrolls, because of the
		885	* time-out
		886	*/
		887	if (refreshnow)
		888	{
		889	if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
		890	refresh_limit++;
		891
		892	scr_refresh (refresh_type);
		893	}
		894
		895	}
		896	else
		897	{
		898	switch (ch)
		899	{
		900	default:
		901	rxvt_process_nonprinting (this, ch);
		902	break;
		903	case C0_ESC: /* escape char */
		904	rxvt_process_escape_seq (this);
		905	break;
		906	/*case 0x9b: */ /* CSI */
		907	/* rxvt_process_csi_seq (this); */
		908	}
		909
		910	ch = NOCHAR;
		911	}
		912	}
		913	}
		914	}
708	}	915	}
709		916
710	// read the next character, currently handles UTF-8	917	// read the next character, currently handles UTF-8
711	// will probably handle all sorts of other stuff in the future	918	// will probably handle all sorts of other stuff in the future
712	uint32_t	919	uint32_t
713	rxvt_term::next_char ()	920	rxvt_term::next_char ()
714	{	921	{
715	struct mbstate &s = mbstate;
716
717	while (cmdbuf_ptr < cmdbuf_endp)	922	while (cmdbuf_ptr < cmdbuf_endp)
718	{	923	{
719	uint8_t ch = *cmdbuf_ptr;	924	if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh
720
721	if (s.cnt)
722	{
723	if ((ch & 0xc0) == 0x80)
724	{
725	cmdbuf_ptr++;
726
727	/* continuation */
728	s.reg = (s.reg << 6) | (ch & 0x7f);
729
730	if (--s.cnt == 0 && s.reg >= 128) /* if !inrange then corruption or Racking */
731	return s.reg;
732
733	continue;
734	}
735	else
736	{
737	s.cnt = 0;
738	return s.orig; /* the _occasional_ non-utf-8 character may slip through... */
739	}
740	}
741
742	if ((ch & 0xc0) == 0xc0)
743	{
744	cmdbuf_ptr++;	925	return *cmdbuf_ptr++;
745		926
746	/* first byte */	927	wchar_t wc;
747	s.orig = ch; /* for broken encodings */	928	int len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, &mbstate.mbs);
748	s.reg = ch;	929
749	if ((ch & 0xe0) == 0xc0) { s.reg &= 0x1f; s.cnt = 1; }	930	if (len == (size_t)-2)
750	if ((ch & 0xf0) == 0xe0) { s.reg &= 0x0f; s.cnt = 2; }	931	return NOCHAR;
751	if ((ch & 0xf8) == 0xf0) { s.reg &= 0x07; s.cnt = 3; }	932
752	if ((ch & 0xfc) == 0xf8) { s.reg &= 0x03; s.cnt = 4; }	933	if (len == (size_t)-1)
753	if ((ch & 0xfe) == 0xfc) { s.reg &= 0x01; s.cnt = 5; }	934	return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
754	}	935
755	else	936	// assume wchar == unicode
756	{	937	cmdbuf_ptr += len;
757	cmdbuf_ptr++; /* _occasional_ non-utf8 may slip through... */
758	return ch;	938	return wc;
759	}
760	}	939	}
761		940
762	return NOCHAR;	941	return NOCHAR;
763	}
764
765	bool
766	rxvt_term::pty_fill (size_t count)
767	{
768	ssize_t n = cmdbuf_endp - cmdbuf_ptr;
769
770	memmove (cmdbuf_base, cmdbuf_ptr, n);
771	cmdbuf_ptr = cmdbuf_base;
772	cmdbuf_endp = cmdbuf_ptr + n;
773
774	n = read (cmd_fd, cmdbuf_endp, count);
775
776	if (n > 0)
777	{
778	cmdbuf_endp += n;
779	return true;
780	}
781	else if (n < 0 && errno == EAGAIN)
782	return false;
783
784	rxvt_clean_exit();
785	exit(EXIT_FAILURE); /* bad order of events? */
786	}
787
788	void
789	rxvt_term::pty_cb (io_watcher &w, short revents)
790	{
791	while (pty_fill (BUFSIZ - (cmdbuf_endp - cmdbuf_ptr)))
792	{
793	/* once we know the shell is running, send the screen size. Again! */
794	//ch = rxvt_cmd_getc(aR); /* wait for something */
795	//rxvt_tt_winsize(cmd_fd, TermWin.ncol, TermWin.nrow, cmd_pid);
796
797	uint32_t ch = NOCHAR;
798
799	for (;;)
800	{
801	if (ch == NOCHAR)
802	ch = next_char ();
803
804	if (ch == NOCHAR) // TODO: improve
805	break;
806
807	if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
808	{
809	/* Read a text string from the input buffer */
810	uint32_t buf[BUFSIZ];
811	bool refreshnow = false;
812	int nlines = 0;
813	uint32_t *str = buf;
814
815	*str++ = ch;
816
817	for (;;)
818	{
819	ch = next_char ();
820
821	if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
822	break;
823	else
824	{
825	*str++ = ch;
826
827	if (ch == '\n')
828	{
829	nlines++;
830	refresh_count++;
831
832	if (!(Options & Opt_jumpScroll)
833	|| (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
834	{
835	refreshnow = true;
836	ch = NOCHAR;
837	break;
838	}
839	}
840
841	if (str >= buf + BUFSIZ)
842	{
843	ch = NOCHAR;
844	break;
845	}
846	}
847	}
848
849	rxvt_scr_add_lines (this, buf, nlines, str - buf);
850
851	/*
852	* If there have been a lot of new lines, then update the screen
853	* What the heck I'll cheat and only refresh less than every page-full.
854	* the number of pages between refreshes is refresh_limit, which
855	* is incremented here because we must be doing flat-out scrolling.
856	*
857	* refreshing should be correct for small scrolls, because of the
858	* time-out
859	*/
860	if (refreshnow)
861	{
862	if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
863	refresh_limit++;
864
865	rxvt_scr_refresh (this, refresh_type);
866	}
867
868	}
869	else
870	{
871	switch (ch)
872	{
873	default:
874	rxvt_process_nonprinting (this, ch);
875	break;
876	case C0_ESC: /* escape char */
877	rxvt_process_escape_seq (this);
878	break;
879	/*case 0x9b: */ /* CSI */
880	/* rxvt_process_csi_seq (this); */
881	}
882
883	ch = NOCHAR;
884	}
885	}
886	}
887
888	flush ();
889	}
890
891	void
892	rxvt_term::flush ()
893	{
894	#ifdef TRANSPARENT
895	if (want_full_refresh)
896	{
897	want_full_refresh = 0;
898	rxvt_scr_clear (this);
899	rxvt_scr_touch (this, False);
900	want_refresh = 1;
901	}
902	#endif
903
904	if (want_refresh)
905	{
906	rxvt_scr_refresh (this, refresh_type);
907	rxvt_scrollbar_show (this, 1);
908	#ifdef USE_XIM
909	rxvt_IMSendSpot (this);
910	#endif
911	}
912
913	XFlush (Xdisplay);
914	}	942	}
915		943
916	/* rxvt_cmd_getc() - Return next input character */	944	/* rxvt_cmd_getc() - Return next input character */
917	/*	945	/*
918	* Return the next input character after first passing any keyboard input	946	* Return the next input character after first passing any keyboard input
…		…
929	return c;	957	return c;
930		958
931	// incomplete sequences should occur rarely, still, a better solution	959	// incomplete sequences should occur rarely, still, a better solution
932	// would be preferred. either setjmp/longjmp or better design.	960	// would be preferred. either setjmp/longjmp or better design.
933	fcntl (R->cmd_fd, F_SETFL, 0);	961	fcntl (R->cmd_fd, F_SETFL, 0);
934	R->pty_fill (1);	962	R->pty_fill ();
935	fcntl (R->cmd_fd, F_SETFL, O_NONBLOCK);	963	fcntl (R->cmd_fd, F_SETFL, O_NONBLOCK);
936	}	964	}
937		965
		966	#if 0
938	#define TIMEOUT_USEC 5000	967	#define TIMEOUT_USEC 5000
939	fd_set readfds;	968	fd_set readfds;
940	int quick_timeout, select_res;	969	int quick_timeout, select_res;
941	int want_motion_time, want_keypress_time;	970	int want_motion_time, want_keypress_time;
942	struct timeval value;	971	struct timeval value;
…		…
946		975
947	for (;;) {	976	for (;;) {
948	/* loop until we can return something */	977	/* loop until we can return something */
949		978
950	if (R->v_bufstr < R->v_bufptr) /* output any pending chars */	979	if (R->v_bufstr < R->v_bufptr) /* output any pending chars */
951	rxvt_tt_write(aR_ NULL, 0);	980	R->tt_write(NULL, 0);
952
953	#if defined(POINTER_BLANK) || defined(CURSOR_BLINK)
954	tp.tv_sec = 0; /* presume == 0 implies time not yet retrieved */
955	#endif
956	#if defined(CURSOR_BLINK)
957	want_keypress_time = 0;
958	#endif
959	#if defined(POINTER_BLANK)
960	want_motion_time = 0;
961	#endif
962
963	if (XPending (R->Xdisplay))
964	{
965	R->process_x_events ();
966
967	/* in case button actions pushed chars to cmdbuf */
968	if (R->cmdbuf_ptr < R->cmdbuf_endp)
969	return *R->cmdbuf_ptr++;
970	}
971
972	#if defined(CURSOR_BLINK)
973	if (want_keypress_time) {
974	(void)gettimeofday(&tp, NULL);
975	R->lastcursorchange.tv_sec = tp.tv_sec;
976	R->lastcursorchange.tv_usec = tp.tv_usec;
977	}
978	#endif
979	#if defined(POINTER_BLANK)
980	if (want_motion_time) {
981	if (!tp.tv_sec)
982	(void)gettimeofday(&tp, NULL);
983	R->lastmotion.tv_sec = tp.tv_sec;
984	R->lastmotion.tv_usec = tp.tv_usec;
985	}
986	#endif
987
988	/*
989	* the command input buffer is empty and we have no pending X events
990	*/
991	quick_timeout = 0;
992		981
993	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	982	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
994	if (R->mouse_slip_wheel_speed) {	983	if (R->mouse_slip_wheel_speed) {
995	quick_timeout = 1;	984	quick_timeout = 1;
996	if (!R->mouse_slip_wheel_delay--	985	if (!R->mouse_slip_wheel_delay--
…		…
1006	if (R->pending_scroll_selection) {	995	if (R->pending_scroll_selection) {
1007	quick_timeout = 1;	996	quick_timeout = 1;
1008	if (!R->scroll_selection_delay--	997	if (!R->scroll_selection_delay--
1009	&& rxvt_scr_page(aR_ R->scroll_selection_dir,	998	&& rxvt_scr_page(aR_ R->scroll_selection_dir,
1010	R->scroll_selection_lines)) {	999	R->scroll_selection_lines)) {
1011	rxvt_selection_extend(aR_ R->selection_save_x,	1000	R->selection_extend (R->selection_save_x,
1012	R->selection_save_y, R->selection_save_state);	1001	R->selection_save_y, R->selection_save_state);
1013	R->scroll_selection_delay = SCROLLBAR_CONTINUOUS_DELAY;	1002	R->scroll_selection_delay = SCROLLBAR_CONTINUOUS_DELAY;
1014	R->refresh_type |= SMOOTH_REFRESH;	1003	R->refresh_type |= SMOOTH_REFRESH;
1015	R->want_refresh = 1;	1004	R->want_refresh = 1;
1016	}	1005	}
…		…
1026	R->want_refresh = 1;	1015	R->want_refresh = 1;
1027	}	1016	}
1028	}	1017	}
1029	#endif /* NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING */	1018	#endif /* NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING */
1030		1019
1031	FD_ZERO(&readfds);
1032	FD_SET(R->cmd_fd, &readfds);
1033	FD_SET(R->Xfd, &readfds);
1034	value.tv_usec = TIMEOUT_USEC;
1035	value.tv_sec = 0;
1036
1037	if (!R->TermWin.mapped)
1038	quick_timeout = 0;
1039	else {
1040	quick_timeout |= R->want_refresh;
1041	#ifdef TRANSPARENT	1020	#ifdef TRANSPARENT
1042	quick_timeout |= R->want_full_refresh;	1021	quick_timeout |= R->want_full_refresh;
1043	#endif	1022	#endif
1044	}
1045
1046	#if defined(POINTER_BLANK) || defined(CURSOR_BLINK)
1047	{
1048	int set_quick_timeout = 0;
1049	long csdiff, psdiff;
1050
1051	#define BLINK_TIME 500000L
1052	csdiff = psdiff = 60000000L; /* or, say, LONG_MAX */
1053	# if defined(CURSOR_BLINK)
1054	if (R->Options & Opt_cursorBlink) {
1055	if (!tp.tv_sec) /* didn't get it before so get it now */
1056	(void)gettimeofday(&tp, NULL);
1057
1058	csdiff = (tp.tv_sec - R->lastcursorchange.tv_sec) * 1000000L
1059	+ tp.tv_usec - R->lastcursorchange.tv_usec;
1060	if (csdiff > BLINK_TIME) { /* XXX: settable blink times */
1061	R->lastcursorchange.tv_sec = tp.tv_sec;
1062	R->lastcursorchange.tv_usec = tp.tv_usec;
1063	R->hidden_cursor = !R->hidden_cursor;
1064	csdiff = 0;
1065	} else
1066	csdiff = BLINK_TIME - csdiff;
1067	set_quick_timeout = 1;
1068	}
1069	# endif	1023	#endif
1070	# if defined(POINTER_BLANK)
1071	/*
1072	* If we haven't moved the pointer for a while
1073	*/
1074	if ((R->Options & Opt_pointerBlank)
1075	&& (R->pointerBlankDelay > 0)
1076	&& (R->hidden_pointer == 0)) {
1077	long pdelay;
1078
1079	if (!tp.tv_sec) /* didn't get it before so get it now */
1080	(void)gettimeofday(&tp, NULL);
1081	psdiff = (tp.tv_sec - R->lastmotion.tv_sec) * 1000000L
1082	+ tp.tv_usec - R->lastmotion.tv_usec;
1083	pdelay = R->pointerBlankDelay * 1000000L;
1084	if (psdiff >= pdelay)
1085	rxvt_pointer_blank(aR);
1086	else {
1087	set_quick_timeout = 1;
1088	psdiff = pdelay - psdiff;
1089	}
1090	}
1091	# endif
1092	if (!quick_timeout && set_quick_timeout) {
1093	MIN_IT(csdiff, psdiff);
1094	value.tv_sec = csdiff / 1000000L;
1095	value.tv_usec = csdiff % 1000000L;
1096	quick_timeout = 1;
1097	}
1098	}
1099	#endif
1100
1101	if ((select_res = select(R->num_fds, &readfds, NULL, NULL,
1102	(quick_timeout ? &value : NULL))) == 0) {
1103	/* select statement timed out - we're not hard and fast scrolling */
1104	R->refresh_limit = 1;
1105	}
1106	#if defined(CURSOR_BLINK)
1107	if (R->Options & Opt_cursorBlink)
1108	R->want_refresh = 1;
1109	#endif
1110	}
1111	}	1024	}
1112		1025
1113	/* EXTPROTO */
1114	void	1026	void
1115	rxvt_pointer_unblank(pR)	1027	rxvt_term::pointer_unblank ()
1116	{	1028	{
1117	XDefineCursor(R->Xdisplay, R->TermWin.vt, R->TermWin_cursor);	1029	XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor);
1118	rxvt_recolour_cursor(aR);	1030	recolour_cursor ();
		1031
1119	#ifdef POINTER_BLANK	1032	#ifdef POINTER_BLANK
1120	R->hidden_pointer = 0;	1033	hidden_pointer = 0;
1121	if (R->pointerBlankDelay > 0) {
1122	struct timeval tp;
1123		1034
1124	(void)gettimeofday(&tp, NULL);	1035	if (Options & Opt_pointerBlank)
1125	R->lastmotion.tv_sec = tp.tv_sec;	1036	pointer_ev.start (NOW + pointerBlankDelay);
1126	R->lastmotion.tv_usec = tp.tv_usec;
1127	}
1128	#endif	1037	#endif
1129	}	1038	}
1130		1039
1131	#ifdef POINTER_BLANK	1040	#ifdef POINTER_BLANK
1132	/* INTPROTO */
1133	void	1041	void
1134	rxvt_pointer_blank(pR)	1042	rxvt_term::pointer_blank ()
1135	{	1043	{
		1044	pointer_ev.stop ();
		1045
		1046	if (!(Options & Opt_pointerBlank))
		1047	return;
		1048
1136	XDefineCursor(R->Xdisplay, R->TermWin.vt, R->pointer_blank);	1049	XDefineCursor (Xdisplay, TermWin.vt, blank_cursor);
1137	XFlush(R->Xdisplay);	1050	XFlush (Xdisplay);
		1051
1138	R->hidden_pointer = 1;	1052	hidden_pointer = 1;
		1053	}
		1054
		1055	void
		1056	rxvt_term::pointer_cb (time_watcher &w)
		1057	{
		1058	SET_R (this);
		1059	SET_LOCALE (locale);
		1060
		1061	pointer_blank ();
1139	}	1062	}
1140	#endif	1063	#endif
1141		1064
1142	/* INTPROTO */	1065	/* INTPROTO */
1143	void	1066	void
…		…
1146	int button_number, key_state = 0;	1069	int button_number, key_state = 0;
1147	int x, y;	1070	int x, y;
1148		1071
1149	x = ev->x;	1072	x = ev->x;
1150	y = ev->y;	1073	y = ev->y;
1151	rxvt_pixel_position(aR_ &x, &y);	1074	R->pixel_position (&x, &y);
1152		1075
1153	if (R->MEvent.button == AnyButton) {	1076	if (R->MEvent.button == AnyButton) {
1154	button_number = 3;	1077	button_number = 3;
1155	} else {	1078	} else {
1156	button_number = R->MEvent.button - Button1;	1079	button_number = R->MEvent.button - Button1;
…		…
1196	fprintf(stderr, "]: <%d>, %d/%d\n",	1119	fprintf(stderr, "]: <%d>, %d/%d\n",
1197	button_number,	1120	button_number,
1198	x + 1,	1121	x + 1,
1199	y + 1);	1122	y + 1);
1200	#else	1123	#else
1201	rxvt_tt_printf(aR_ "\033[M%c%c%c",	1124	R->tt_printf("\033[M%c%c%c",
1202	(32 + button_number + key_state),	1125	(32 + button_number + key_state),
1203	(32 + x + 1),	1126	(32 + x + 1),
1204	(32 + y + 1));	1127	(32 + y + 1));
1205	#endif	1128	#endif
1206	}	1129	}
…		…
1223	{	1146	{
1224	int i, want_timeout;	1147	int i, want_timeout;
1225	Window unused_root, unused_child;	1148	Window unused_root, unused_child;
1226	int unused_root_x, unused_root_y;	1149	int unused_root_x, unused_root_y;
1227	unsigned int unused_mask;	1150	unsigned int unused_mask;
1228	struct timeval tp;
1229		1151
1230	#ifdef DEBUG_X	1152	#ifdef DEBUG_X
1231	const char *const eventnames[] =	1153	const char *const eventnames[] =
1232	{ /* mason - this matches my system */	1154	{ /* mason - this matches my system */
1233	"",	1155	"",
…		…
1264	"SelectionNotify",	1186	"SelectionNotify",
1265	"ColormapNotify",	1187	"ColormapNotify",
1266	"ClientMessage",	1188	"ClientMessage",
1267	"MappingNotify"	1189	"MappingNotify"
1268	};	1190	};
		1191	#endif
		1192
		1193	#ifdef DEBUG_X
		1194	struct timeval tp;
1269	struct tm *ltt;	1195	struct tm *ltt;
1270	#endif
1271
1272	/*
1273	* check if we need to get the time for any timeouts
1274	*/
1275
1276	for (i = NUM_TIMEOUTS; i--; )
1277	if (R->timeout[i].tv_sec) {
1278	want_timeout = 1;
1279	break;
1280	}
1281
1282	#ifndef DEBUG_X
1283	if (want_timeout)
1284	#endif
1285	(void)gettimeofday(&tp, NULL);	1196	(void)gettimeofday(&tp, NULL);
1286
1287	#ifdef DEBUG_X
1288	ltt = localtime(&(tp.tv_sec));	1197	ltt = localtime(&(tp.tv_sec));
1289	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));	1198	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));
1290	#endif	1199	#endif
1291
1292	/* X event timeouts */
1293	if (want_timeout)
1294	for (i = NUM_TIMEOUTS; i--; ) {
1295	if (R->timeout[i].tv_sec == 0)
1296	continue;
1297	if ((tp.tv_sec < R->timeout[i].tv_sec)
1298	|| (tp.tv_sec == R->timeout[i].tv_sec
1299	&& tp.tv_usec < R->timeout[i].tv_usec))
1300	continue;
1301	R->timeout[i].tv_sec = 0;
1302	switch(i) {
1303	case TIMEOUT_INCR:
1304	rxvt_print_error("data loss: timeout on INCR selection paste");
1305	R->selection_wait = Sel_none;
1306	break;
1307	default:
1308	break;
1309	}
1310	}
1311		1200
1312	switch (ev->type) {	1201	switch (ev->type) {
1313	case KeyPress:	1202	case KeyPress:
1314	rxvt_lookup_key(aR_ (XKeyEvent *)ev);	1203	rxvt_lookup_key(aR_ (XKeyEvent *)ev);
1315	break;	1204	break;
…		…
1339	break;	1228	break;
1340		1229
1341	case ClientMessage:	1230	case ClientMessage:
1342	if (ev->xclient.format == 32	1231	if (ev->xclient.format == 32
1343	&& (Atom)ev->xclient.data.l[0] == R->xa[XA_WMDELETEWINDOW])	1232	&& (Atom)ev->xclient.data.l[0] == R->xa[XA_WMDELETEWINDOW])
1344	exit(EXIT_SUCCESS);	1233	R->destroy ();
1345	#ifdef OFFIX_DND	1234	#ifdef OFFIX_DND
1346	/* OffiX Dnd (drag 'n' drop) protocol */	1235	/* OffiX Dnd (drag 'n' drop) protocol */
1347	if (ev->xclient.message_type == R->xa[XA_DNDPROTOCOL]	1236	else if (ev->xclient.message_type == R->xa[XA_DNDPROTOCOL]
1348	&& (ev->xclient.data.l[0] == DndFile	1237	&& (ev->xclient.data.l[0] == DndFile
1349	|| ev->xclient.data.l[0] == DndDir	1238	|| ev->xclient.data.l[0] == DndDir
1350	|| ev->xclient.data.l[0] == DndLink)) {	1239	|| ev->xclient.data.l[0] == DndLink)) {
1351	/* Get Dnd data */	1240	/* Get Dnd data */
1352	Atom ActualType;	1241	Atom ActualType;
…		…
1384	* in the GraphicsExpose parts, which means that after each refresh,	1273	* in the GraphicsExpose parts, which means that after each refresh,
1385	* we need to wait for the graphics expose or Noexpose events,	1274	* we need to wait for the graphics expose or Noexpose events,
1386	* which ought to make things real slow!	1275	* which ought to make things real slow!
1387	*/	1276	*/
1388	case VisibilityNotify:	1277	case VisibilityNotify:
1389	switch (ev->xvisibility.state) {	1278	switch (ev->xvisibility.state)
		1279	{
1390	case VisibilityUnobscured:	1280	case VisibilityUnobscured:
1391	R->refresh_type = FAST_REFRESH;	1281	R->refresh_type = FAST_REFRESH;
1392	break;	1282	break;
1393	case VisibilityPartiallyObscured:	1283	case VisibilityPartiallyObscured:
1394	R->refresh_type = SLOW_REFRESH;	1284	R->refresh_type = SLOW_REFRESH;
1395	break;	1285	break;
1396	default:	1286	default:
1397	R->refresh_type = NO_REFRESH;	1287	R->refresh_type = NO_REFRESH;
1398	break;	1288	break;
1399	}	1289	}
1400	break;	1290	break;
1401		1291
1402	case FocusIn:	1292	case FocusIn:
1403	if (!R->TermWin.focus) {	1293	if (!R->TermWin.focus) {
1404	R->TermWin.focus = 1;	1294	R->TermWin.focus = 1;
1405	R->want_refresh = 1;	1295	R->want_refresh = 1;
1406	#ifdef USE_XIM	1296	#ifdef USE_XIM
1407	if (R->Input_Context != NULL)	1297	if (R->Input_Context != NULL)
1408	XSetICFocus(R->Input_Context);	1298	XSetICFocus(R->Input_Context);
1409	#endif	1299	#endif
		1300	#ifdef CURSOR_BLINK
		1301	if (R->Options & Opt_cursorBlink)
		1302	R->blink_ev.start (NOW + BLINK_INTERVAL);
		1303	#endif
1410	}	1304	}
1411	break;	1305	break;
1412		1306
1413	case FocusOut:	1307	case FocusOut:
1414	if (R->TermWin.focus) {	1308	if (R->TermWin.focus) {
1415	R->TermWin.focus = 0;	1309	R->TermWin.focus = 0;
1416	R->want_refresh = 1;	1310	R->want_refresh = 1;
1417	#ifdef USE_XIM	1311	#ifdef USE_XIM
1418	if (R->Input_Context != NULL)	1312	if (R->Input_Context != NULL)
1419	XUnsetICFocus(R->Input_Context);	1313	XUnsetICFocus(R->Input_Context);
		1314	#endif
		1315	#ifdef CURSOR_BLINK
		1316	if (R->Options & Opt_cursorBlink)
		1317	R->blink_ev.stop ();
		1318	R->hidden_cursor = 0;
1420	#endif	1319	#endif
1421	}	1320	}
1422	break;	1321	break;
1423		1322
1424	case ConfigureNotify:	1323	case ConfigureNotify:
…		…
1431	D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));	1330	D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1432	} while (XCheckTypedWindowEvent(R->Xdisplay, ev->xconfigure.window,	1331	} while (XCheckTypedWindowEvent(R->Xdisplay, ev->xconfigure.window,
1433	ConfigureNotify, ev));	1332	ConfigureNotify, ev));
1434	if (R->szHint.width != width || R->szHint.height != height) {	1333	if (R->szHint.width != width || R->szHint.height != height) {
1435	D_SIZE((stderr, "Size: Resizing from: %4d x %4d", R->szHint.width, R->szHint.height));	1334	D_SIZE((stderr, "Size: Resizing from: %4d x %4d", R->szHint.width, R->szHint.height));
1436	rxvt_resize_all_windows(aR_ (unsigned int)width,	1335	R->resize_all_windows (width, height, 1);
1437	(unsigned int)height, 1);
1438	}	1336	}
1439	#ifdef DEBUG_SIZE	1337	#ifdef DEBUG_SIZE
1440	else {	1338	else {
1441	D_SIZE((stderr, "Size: Not resizing"));	1339	D_SIZE((stderr, "Size: Not resizing"));
1442	}	1340	}
…		…
1501		1399
1502	case GraphicsExpose:	1400	case GraphicsExpose:
1503	case Expose:	1401	case Expose:
1504	if (ev->xany.window == R->TermWin.vt) {	1402	if (ev->xany.window == R->TermWin.vt) {
1505	#ifdef NO_SLOW_LINK_SUPPORT	1403	#ifdef NO_SLOW_LINK_SUPPORT
1506	rxvt_scr_expose(aR_ ev->xexpose.x, ev->xexpose.y,	1404	R->scr_expose (ev->xexpose.x, ev->xexpose.y,
1507	ev->xexpose.width, ev->xexpose.height, False);	1405	ev->xexpose.width, ev->xexpose.height, False);
1508	#else	1406	#else
1509	// don't understand this, so commented it out	1407	// don't understand this, so commented it out
1510	rxvt_scr_expose(aR_ ev->xexpose.x, ev->xexpose.y,	1408	R->scr_expose (ev->xexpose.x, ev->xexpose.y,
1511	ev->xexpose.width, ev->xexpose.height, False);	1409	ev->xexpose.width, ev->xexpose.height, False);
1512	//rxvt_scr_expose(aR_ ev->xexpose.x, 0,	1410	//rxvt_scr_expose(aR_ ev->xexpose.x, 0,
1513	// ev->xexpose.width, R->TermWin.height, False);	1411	// ev->xexpose.width, R->TermWin.height, False);
1514	#endif	1412	#endif
1515	R->want_refresh = 1;	1413	R->want_refresh = 1;
1516	} else {	1414	} else {
…		…
1521	&unused_xevent)) ;	1419	&unused_xevent)) ;
1522	while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window,	1420	while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window,
1523	GraphicsExpose,	1421	GraphicsExpose,
1524	&unused_xevent)) ;	1422	&unused_xevent)) ;
1525	if (isScrollbarWindow(ev->xany.window)) {	1423	if (isScrollbarWindow(ev->xany.window)) {
1526	scrollbar_setIdle();	1424	R->scrollBar.setIdle();
1527	rxvt_scrollbar_show(aR_ 0);	1425	rxvt_scrollbar_show(aR_ 0);
1528	}	1426	}
1529	#ifdef MENUBAR	1427	#ifdef MENUBAR
1530	if (menubar_visible(aR) && isMenuBarWindow(ev->xany.window))	1428	if (menubar_visible(aR) && isMenuBarWindow(ev->xany.window))
1531	rxvt_menubar_expose(aR);	1429	rxvt_menubar_expose(aR);
…		…
1537	break;	1435	break;
1538		1436
1539	case MotionNotify:	1437	case MotionNotify:
1540	#ifdef POINTER_BLANK	1438	#ifdef POINTER_BLANK
1541	if (R->hidden_pointer)	1439	if (R->hidden_pointer)
1542	rxvt_pointer_unblank(aR);	1440	R->pointer_unblank ();
1543	#endif	1441	#endif
1544	#if MENUBAR	1442	#if MENUBAR
1545	if (isMenuBarWindow(ev->xany.window)) {	1443	if (isMenuBarWindow(ev->xany.window)) {
1546	rxvt_menubar_control(aR_ &(ev->xbutton));	1444	rxvt_menubar_control(aR_ &(ev->xbutton));
1547	break;	1445	break;
…		…
1561	&unused_mask);	1459	&unused_mask);
1562	#ifdef MOUSE_THRESHOLD	1460	#ifdef MOUSE_THRESHOLD
1563	/* deal with a `jumpy' mouse */	1461	/* deal with a `jumpy' mouse */
1564	if ((ev->xmotion.time - R->MEvent.time) > MOUSE_THRESHOLD) {	1462	if ((ev->xmotion.time - R->MEvent.time) > MOUSE_THRESHOLD) {
1565	#endif	1463	#endif
1566	rxvt_selection_extend(aR_ (ev->xbutton.x), (ev->xbutton.y),	1464	R->selection_extend ((ev->xbutton.x), (ev->xbutton.y),
1567	(ev->xbutton.state & Button3Mask) ? 2 : 0);	1465	(ev->xbutton.state & Button3Mask) ? 2 : 0);
1568	#ifdef SELECTION_SCROLLING	1466	#ifdef SELECTION_SCROLLING
1569	if (ev->xbutton.y<R->TermWin.int_bwidth ||	1467	if (ev->xbutton.y<R->TermWin.int_bwidth ||
1570	Pixel2Row(ev->xbutton.y)>(R->TermWin.nrow-1)) {	1468	Pixel2Row(ev->xbutton.y)>(R->TermWin.nrow-1)) {
1571	int dist;	1469	int dist;
…		…
1620	&unused_root_x, &unused_root_y,	1518	&unused_root_x, &unused_root_y,
1621	&(ev->xbutton.x), &(ev->xbutton.y),	1519	&(ev->xbutton.x), &(ev->xbutton.y),
1622	&unused_mask);	1520	&unused_mask);
1623	rxvt_scr_move_to(aR_ scrollbar_position(ev->xbutton.y) - R->csrO,	1521	rxvt_scr_move_to(aR_ scrollbar_position(ev->xbutton.y) - R->csrO,
1624	scrollbar_size());	1522	scrollbar_size());
1625	rxvt_scr_refresh(aR_ R->refresh_type);	1523	R->scr_refresh (R->refresh_type);
1626	R->refresh_limit = 0;	1524	R->refresh_limit = 0;
1627	rxvt_scrollbar_show(aR_ 1);	1525	rxvt_scrollbar_show(aR_ 1);
1628	}	1526	}
1629	break;	1527	break;
1630	}	1528	}
…		…
1644	*/	1542	*/
1645	if (ev->window == R->TermWin.vt)	1543	if (ev->window == R->TermWin.vt)
1646	{	1544	{
1647	#if RXVT_GRAPHICS	1545	#if RXVT_GRAPHICS
1648	if (ev->subwindow != None)	1546	if (ev->subwindow != None)
1649	rxvt_Gr_ButtonPress(ev->x, ev->y);	1547	rxvt_Gr_ButtonPress (ev->x, ev->y);
1650	else	1548	else
1651	#endif	1549	#endif
1652	{	1550	{
1653	clickintime = ev->time - R->MEvent.time < MULTICLICK_TIME;	1551	clickintime = ev->time - R->MEvent.time < MULTICLICK_TIME;
1654	if (reportmode)	1552	if (reportmode)
…		…
1689	if (ev->button != R->MEvent.button)	1587	if (ev->button != R->MEvent.button)
1690	R->MEvent.clicks = 0;	1588	R->MEvent.clicks = 0;
1691	switch (ev->button)	1589	switch (ev->button)
1692	{	1590	{
1693	case Button1:	1591	case Button1:
		1592	/* allow shift+left click to extend selection */
		1593	if (ev->state & ShiftMask)
		1594	{
1694	if (R->MEvent.button == Button1 && clickintime)	1595	if (R->MEvent.button == Button1 && clickintime)
		1596	R->selection_rotate (ev->x, ev->y);
1695	R->MEvent.clicks++;	1597	else
		1598	R->selection_extend (ev->x, ev->y, 1);
		1599	}
1696	else	1600	else
		1601	{
		1602	if (R->MEvent.button == Button1 && clickintime)
		1603	R->MEvent.clicks++;
		1604	else
1697	R->MEvent.clicks = 1;	1605	R->MEvent.clicks = 1;
		1606
1698	rxvt_selection_click(aR_ R->MEvent.clicks, ev->x, ev->y);	1607	R->selection_click (R->MEvent.clicks, ev->x, ev->y);
		1608	}
		1609
1699	R->MEvent.button = Button1;	1610	R->MEvent.button = Button1;
1700	break;	1611	break;
1701		1612
1702	case Button3:	1613	case Button3:
1703	if (R->MEvent.button == Button3 && clickintime)	1614	if (R->MEvent.button == Button3 && clickintime)
1704	rxvt_selection_rotate(aR_ ev->x, ev->y);	1615	R->selection_rotate (ev->x, ev->y);
1705	else	1616	else
1706	rxvt_selection_extend(aR_ ev->x, ev->y, 1);	1617	R->selection_extend (ev->x, ev->y, 1);
1707	R->MEvent.button = Button3;	1618	R->MEvent.button = Button3;
1708	break;	1619	break;
1709	}	1620	}
1710	}	1621	}
1711	R->MEvent.time = ev->time;	1622	R->MEvent.time = ev->time;
…		…
1716	/*	1627	/*
1717	* Scrollbar window processing of button press	1628	* Scrollbar window processing of button press
1718	*/	1629	*/
1719	if (isScrollbarWindow(ev->window))	1630	if (isScrollbarWindow(ev->window))
1720	{	1631	{
1721	scrollbar_setIdle();	1632	R->scrollBar.setIdle ();
1722	/*	1633	/*
1723	* Rxvt-style scrollbar:	1634	* Rxvt-style scrollbar:
1724	* move up if mouse is above slider	1635	* move up if mouse is above slider
1725	* move dn if mouse is below slider	1636	* move dn if mouse is below slider
1726	*	1637	*
…		…
1738	*/	1649	*/
1739	if ((R->scrollBar.style == R_SB_NEXT	1650	if ((R->scrollBar.style == R_SB_NEXT
1740	&& scrollbarnext_upButton(ev->y))	1651	&& scrollbarnext_upButton(ev->y))
1741	|| (R->scrollBar.style == R_SB_RXVT	1652	|| (R->scrollBar.style == R_SB_RXVT
1742	&& scrollbarrxvt_upButton(ev->y)))	1653	&& scrollbarrxvt_upButton(ev->y)))
1743	rxvt_tt_printf(aR_ "\033[A");	1654	R->tt_printf("\033[A");
1744	else if ((R->scrollBar.style == R_SB_NEXT	1655	else if ((R->scrollBar.style == R_SB_NEXT
1745	&& scrollbarnext_dnButton(ev->y))	1656	&& scrollbarnext_dnButton(ev->y))
1746	|| (R->scrollBar.style == R_SB_RXVT	1657	|| (R->scrollBar.style == R_SB_RXVT
1747	&& scrollbarrxvt_dnButton(ev->y)))	1658	&& scrollbarrxvt_dnButton(ev->y)))
1748	rxvt_tt_printf(aR_ "\033[B");	1659	R->tt_printf("\033[B");
1749	else	1660	else
1750	switch (ev->button) {	1661	switch (ev->button) {
1751	case Button2:	1662	case Button2:
1752	rxvt_tt_printf(aR_ "\014");	1663	R->tt_printf("\014");
1753	break;	1664	break;
1754	case Button1:	1665	case Button1:
1755	rxvt_tt_printf(aR_ "\033[6~");	1666	R->tt_printf("\033[6~");
1756	break;	1667	break;
1757	case Button3:	1668	case Button3:
1758	rxvt_tt_printf(aR_ "\033[5~");	1669	R->tt_printf("\033[5~");
1759	break;	1670	break;
1760	}	1671	}
1761	}	1672	}
1762	else	1673	else
1763	#endif /* NO_SCROLLBAR_REPORT */	1674	#endif /* NO_SCROLLBAR_REPORT */
…		…
1779	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	1690	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1780	R->scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY;	1691	R->scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY;
1781	#endif	1692	#endif
1782	if (rxvt_scr_page(aR_ upordown < 0 ? UP : DN, 1)) {	1693	if (rxvt_scr_page(aR_ upordown < 0 ? UP : DN, 1)) {
1783	if (upordown < 0)	1694	if (upordown < 0)
1784	scrollbar_setUp();	1695	R->scrollBar.setUp ();
1785	else	1696	else
1786	scrollbar_setDn();	1697	R->scrollBar.setDn ();
1787	}	1698	}
1788	} else	1699	} else
1789	switch (ev->button) {	1700	switch (ev->button) {
1790	case Button2:	1701	case Button2:
1791	switch (R->scrollbar_align) {	1702	switch (R->scrollbar_align) {
…		…
1803	|| scrollbar_above_slider(ev->y)	1714	|| scrollbar_above_slider(ev->y)
1804	|| scrollbar_below_slider(ev->y))	1715	|| scrollbar_below_slider(ev->y))
1805	rxvt_scr_move_to(aR_	1716	rxvt_scr_move_to(aR_
1806	scrollbar_position(ev->y) - R->csrO,	1717	scrollbar_position(ev->y) - R->csrO,
1807	scrollbar_size());	1718	scrollbar_size());
1808	scrollbar_setMotion();	1719	R->scrollBar.setMotion ();
1809	break;	1720	break;
1810		1721
1811	case Button1:	1722	case Button1:
1812	if (R->scrollbar_align == R_SB_ALIGN_CENTRE)	1723	if (R->scrollbar_align == R_SB_ALIGN_CENTRE)
1813	R->csrO = ev->y - R->scrollBar.top;	1724	R->csrO = ev->y - R->scrollBar.top;
…		…
1826	rxvt_scr_page(aR_ DN, R->TermWin.nrow - 1);	1737	rxvt_scr_page(aR_ DN, R->TermWin.nrow - 1);
1827	# else	1738	# else
1828	rxvt_scr_page(aR_ DN, R->TermWin.nrow / 4);	1739	rxvt_scr_page(aR_ DN, R->TermWin.nrow / 4);
1829	# endif	1740	# endif
1830	else	1741	else
1831	scrollbar_setMotion();	1742	R->scrollBar.setMotion ();
1832	} else {	1743	} else {
1833	rxvt_scr_page(aR_ (ev->button == Button1 ? DN : UP),	1744	rxvt_scr_page(aR_ (ev->button == Button1 ? DN : UP),
1834	(R->TermWin.nrow	1745	(R->TermWin.nrow
1835	* scrollbar_position(ev->y)	1746	* scrollbar_position(ev->y)
1836	/ scrollbar_size()));	1747	/ scrollbar_size()));
…		…
1858	R->csrO = 0; /* reset csr Offset */	1769	R->csrO = 0; /* reset csr Offset */
1859	if (!R->bypass_keystate)	1770	if (!R->bypass_keystate)
1860	reportmode = !!(R->PrivateModes & PrivMode_mouse_report);	1771	reportmode = !!(R->PrivateModes & PrivMode_mouse_report);
1861		1772
1862	if (scrollbar_isUpDn()) {	1773	if (scrollbar_isUpDn()) {
1863	scrollbar_setIdle();	1774	R->scrollBar.setIdle ();
1864	rxvt_scrollbar_show(aR_ 0);	1775	rxvt_scrollbar_show(aR_ 0);
1865	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	1776	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1866	R->refresh_type &= ~SMOOTH_REFRESH;	1777	R->refresh_type &= ~SMOOTH_REFRESH;
1867	#endif	1778	#endif
1868	}	1779	}
…		…
1905	* when overriding mouse reporting	1816	* when overriding mouse reporting
1906	*/	1817	*/
1907	if (R->PrivateModes & PrivMode_mouse_report	1818	if (R->PrivateModes & PrivMode_mouse_report
1908	&& R->bypass_keystate	1819	&& R->bypass_keystate
1909	&& ev->button == Button1 && R->MEvent.clicks <= 1)	1820	&& ev->button == Button1 && R->MEvent.clicks <= 1)
1910	rxvt_selection_extend(aR_ ev->x, ev->y, 0);	1821	R->selection_extend (ev->x, ev->y, 0);
1911		1822
1912	switch (ev->button) {	1823	switch (ev->button) {
1913	case Button1:	1824	case Button1:
1914	case Button3:	1825	case Button3:
1915	rxvt_selection_make(aR_ ev->time);	1826	rxvt_selection_make(aR_ ev->time);
…		…
1919	break;	1830	break;
1920	#ifdef MOUSE_WHEEL	1831	#ifdef MOUSE_WHEEL
1921	case Button4:	1832	case Button4:
1922	case Button5:	1833	case Button5:
1923	{	1834	{
1924	int i, v;	1835	int i;
		1836	page_dirn v;
1925		1837
1926	v = (ev->button == Button4) ? UP : DN;	1838	v = (ev->button == Button4) ? UP : DN;
1927	if (ev->state & ShiftMask)	1839	if (ev->state & ShiftMask)
1928	i = 1;	1840	i = 1;
1929	else if ((R->Options & Opt_mouseWheelScrollPage))	1841	else if ((R->Options & Opt_mouseWheelScrollPage))
…		…
1937	R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;	1849	R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
1938	}	1850	}
1939	# endif	1851	# endif
1940	# ifdef JUMP_MOUSE_WHEEL	1852	# ifdef JUMP_MOUSE_WHEEL
1941	rxvt_scr_page(aR_ v, i);	1853	rxvt_scr_page(aR_ v, i);
1942	rxvt_scr_refresh(aR_ SMOOTH_REFRESH);	1854	R->scr_refresh (SMOOTH_REFRESH);
1943	rxvt_scrollbar_show(aR_ 1);	1855	rxvt_scrollbar_show(aR_ 1);
1944	# else	1856	# else
1945	for (; i--;)	1857	while (i--)
1946	{	1858	{
1947	rxvt_scr_page(aR_ v, 1);	1859	rxvt_scr_page(aR_ v, 1);
1948	rxvt_scr_refresh(aR_ SMOOTH_REFRESH);	1860	R->scr_refresh (SMOOTH_REFRESH);
1949	rxvt_scrollbar_show(aR_ 1);	1861	rxvt_scrollbar_show(aR_ 1);
1950	}	1862	}
1951	# endif	1863	# endif
1952	}	1864	}
1953	break;	1865	break;
…		…
2104	n = 0;	2016	n = 0;
2105	if (pchanged) {	2017	if (pchanged) {
2106	for (; n < (unsigned int)i; n++) {	2018	for (; n < (unsigned int)i; n++) {
2107	XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[n], &wattr);	2019	XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[n], &wattr);
2108	D_X((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));	2020	D_X((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2109	if (wattr.depth != rootdepth || wattr.class == InputOnly) {	2021	if (wattr.depth != rootdepth || wattr.c_class == InputOnly) {
2110	n = (int)(sizeof(R->TermWin.parent) / sizeof(Window)) + 1;	2022	n = (int)(sizeof(R->TermWin.parent) / sizeof(Window)) + 1;
2111	break;	2023	break;
2112	}	2024	}
2113	}	2025	}
2114	}	2026	}
…		…
2164	return stream;	2076	return stream;
2165	}	2077	}
2166		2078
2167	/* EXTPROTO */	2079	/* EXTPROTO */
2168	int	2080	int
2169	rxvt_pclose_printer(FILE *stream)	2081	rxvt_pclose_printer (FILE *stream)
2170	{	2082	{
2171	fflush(stream);	2083	fflush (stream);
2172	/* pclose() reported not to work on SunOS 4.1.3 */	2084	/* pclose() reported not to work on SunOS 4.1.3 */
2173	# if defined (__sun__) /* TODO: RESOLVE THIS */	2085	# if defined (__sun__) /* TODO: RESOLVE THIS */
2174	/* pclose works provided SIGCHLD handler uses waitpid */	2086	/* pclose works provided SIGCHLD handler uses waitpid */
2175	return pclose(stream); /* return fclose (stream); */	2087	return pclose (stream); /* return fclose (stream); */
2176	# else	2088	# else
2177	return pclose(stream);	2089	return pclose (stream);
2178	# endif	2090	# endif
2179	}	2091	}
2180		2092
2181	/*	2093	/*
2182	* simulate attached vt100 printer	2094	* simulate attached vt100 printer
…		…
2245	rxvt_process_nonprinting(pR_ unsigned char ch)	2157	rxvt_process_nonprinting(pR_ unsigned char ch)
2246	{	2158	{
2247	switch (ch) {	2159	switch (ch) {
2248	case C0_ENQ: /* terminal Status */	2160	case C0_ENQ: /* terminal Status */
2249	if (R->rs[Rs_answerbackstring])	2161	if (R->rs[Rs_answerbackstring])
2250	rxvt_tt_write(aR_	2162	R->tt_write(
2251	(const unsigned char *)R->rs[Rs_answerbackstring],	2163	(const unsigned char *)R->rs[Rs_answerbackstring],
2252	(unsigned int)STRLEN(R->rs[Rs_answerbackstring]));	2164	(unsigned int)STRLEN(R->rs[Rs_answerbackstring]));
2253	else	2165	else
2254	rxvt_tt_write(aR_ (unsigned char *)VT100_ANS,	2166	R->tt_write((unsigned char *)VT100_ANS,
2255	(unsigned int)STRLEN(VT100_ANS));	2167	(unsigned int)STRLEN(VT100_ANS));
2256	break;	2168	break;
2257	case C0_BEL: /* bell */	2169	case C0_BEL: /* bell */
2258	rxvt_scr_bell(aR);	2170	rxvt_scr_bell(aR);
2259	break;	2171	break;
…		…
2307	break;	2219	break;
2308	case 'I': /* cursor up and scroll down if needed */	2220	case 'I': /* cursor up and scroll down if needed */
2309	rxvt_scr_index(aR_ DN);	2221	rxvt_scr_index(aR_ DN);
2310	break;	2222	break;
2311	case 'J': /* erase to end of screen */	2223	case 'J': /* erase to end of screen */
2312	rxvt_scr_erase_screen(aR_ 0);	2224	R->scr_erase_screen (0);
2313	break;	2225	break;
2314	case 'K': /* erase to end of line */	2226	case 'K': /* erase to end of line */
2315	rxvt_scr_erase_line(aR_ 0);	2227	rxvt_scr_erase_line(aR_ 0);
2316	break;	2228	break;
2317	case 'Y': /* move to specified row and col */	2229	case 'Y': /* move to specified row and col */
…		…
2322	row = rxvt_cmd_getc(aR) - ' ';	2234	row = rxvt_cmd_getc(aR) - ' ';
2323	col = rxvt_cmd_getc(aR) - ' ';	2235	col = rxvt_cmd_getc(aR) - ' ';
2324	rxvt_scr_gotorc(aR_ row, col, 0);	2236	rxvt_scr_gotorc(aR_ row, col, 0);
2325	break;	2237	break;
2326	case 'Z': /* identify the terminal type */	2238	case 'Z': /* identify the terminal type */
2327	rxvt_tt_printf(aR_ "\033/Z"); /* I am a VT100 emulating a VT52 */	2239	R->tt_printf("\033/Z"); /* I am a VT100 emulating a VT52 */
2328	break;	2240	break;
2329	case '<': /* turn off VT52 mode */	2241	case '<': /* turn off VT52 mode */
2330	PrivMode(0, PrivMode_vt52);	2242	PrivMode(0, PrivMode_vt52);
2331	break;	2243	break;
2332	case 'F': /* use special graphics character set */	2244	case 'F': /* use special graphics character set */
…		…
2439	rxvt_process_dcs_seq(aR);	2351	rxvt_process_dcs_seq(aR);
2440	break;	2352	break;
2441		2353
2442	/* 8.3.110: SINGLE CHARACTER INTRODUCER */	2354	/* 8.3.110: SINGLE CHARACTER INTRODUCER */
2443	case C1_SCI: /* ESC Z */	2355	case C1_SCI: /* ESC Z */
2444	rxvt_tt_write(aR_ (const unsigned char *)ESCZ_ANSWER,	2356	R->tt_write((const unsigned char *)ESCZ_ANSWER,
2445	(unsigned int)(sizeof(ESCZ_ANSWER) - 1));	2357	(unsigned int)(sizeof(ESCZ_ANSWER) - 1));
2446	break; /* steal obsolete ESC [ c */	2358	break; /* steal obsolete ESC [ c */
2447		2359
2448	/* 8.3.16: CONTROL SEQUENCE INTRODUCER */	2360	/* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2449	case C1_CSI: /* ESC [ */	2361	case C1_CSI: /* ESC [ */
…		…
2570	*/	2482	*/
2571	if (priv) {	2483	if (priv) {
2572	switch (priv) {	2484	switch (priv) {
2573	case '>':	2485	case '>':
2574	if (ch == CSI_DA) /* secondary device attributes */	2486	if (ch == CSI_DA) /* secondary device attributes */
2575	rxvt_tt_printf(aR_ "\033[>%d;%-.8s;0c", 'R', VSTRING);	2487	R->tt_printf("\033[>%d;%-.8s;0c", 'R', VSTRING);
2576	break;	2488	break;
2577	case '?':	2489	case '?':
2578	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')	2490	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2579	rxvt_process_terminal_mode(aR_ ch, priv, nargs, arg);	2491	rxvt_process_terminal_mode(aR_ ch, priv, nargs, arg);
2580	break;	2492	break;
…		…
2652	case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */	2564	case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */
2653	rxvt_scr_tab(aR_ arg[0]);	2565	rxvt_scr_tab(aR_ arg[0]);
2654	break;	2566	break;
2655		2567
2656	case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */	2568	case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */
2657	rxvt_scr_erase_screen(aR_ arg[0]);	2569	R->scr_erase_screen (arg[0]);
2658	break;	2570	break;
2659		2571
2660	case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */	2572	case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */
2661	rxvt_scr_erase_line(aR_ arg[0]);	2573	rxvt_scr_erase_line(aR_ arg[0]);
2662	break;	2574	break;
…		…
2683		2595
2684	case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */	2596	case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2685	arg[0] = -arg[0];	2597	arg[0] = -arg[0];
2686	/* FALLTHROUGH */	2598	/* FALLTHROUGH */
2687	case CSI_SU: /* 8.3.148: (1) SCROLL UP */	2599	case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2688	rxvt_scroll_text(aR_ R->screen.tscroll, R->screen.bscroll, arg[0], 0);	2600	R->scr_scroll_text (R->screen.tscroll, R->screen.bscroll, arg[0], 0);
2689	break;	2601	break;
2690		2602
2691	case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */	2603	case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2692	rxvt_tt_write(aR_ (const unsigned char *)VT100_ANS,	2604	R->tt_write((const unsigned char *)VT100_ANS,
2693	(unsigned int)(sizeof(VT100_ANS) - 1));	2605	(unsigned int)(sizeof(VT100_ANS) - 1));
2694	break;	2606	break;
2695		2607
2696	case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */	2608	case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2697	rxvt_process_sgr_mode(aR_ nargs, arg);	2609	rxvt_process_sgr_mode(aR_ nargs, arg);
2698	break;	2610	break;
2699		2611
2700	case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */	2612	case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */
2701	switch (arg[0]) {	2613	switch (arg[0]) {
2702	case 5: /* DSR requested */	2614	case 5: /* DSR requested */
2703	rxvt_tt_printf(aR_ "\033[0n");	2615	R->tt_printf("\033[0n");
2704	break;	2616	break;
2705	case 6: /* CPR requested */	2617	case 6: /* CPR requested */
2706	rxvt_scr_report_position(aR);	2618	rxvt_scr_report_position(aR);
2707	break;	2619	break;
2708	#if defined (ENABLE_DISPLAY_ANSWER)	2620	#if defined (ENABLE_DISPLAY_ANSWER)
2709	case 7: /* unofficial extension */	2621	case 7: /* unofficial extension */
2710	rxvt_tt_printf(aR_ "%-.250s\n", R->rs[Rs_display_name]);	2622	R->tt_printf("%-.250s\n", R->rs[Rs_display_name]);
2711	break;	2623	break;
2712	#endif	2624	#endif
2713	case 8: /* unofficial extension */	2625	case 8: /* unofficial extension */
2714	rxvt_xterm_seq(aR_ XTerm_title, APL_NAME "-" VERSION, CHAR_ST);	2626	rxvt_xterm_seq(aR_ XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
2715	break;	2627	break;
…		…
2784	break;	2696	break;
2785	#endif	2697	#endif
2786		2698
2787	case CSI_78: /* DECREQTPARM */	2699	case CSI_78: /* DECREQTPARM */
2788	if (arg[0] == 0 || arg[0] == 1)	2700	if (arg[0] == 0 || arg[0] == 1)
2789	rxvt_tt_printf(aR_ "\033[%d;1;1;112;112;1;0x", arg[0] + 2);	2701	R->tt_printf("\033[%d;1;1;112;112;1;0x", arg[0] + 2);
2790	/* FALLTHROUGH */	2702	/* FALLTHROUGH */
2791		2703
2792	default:	2704	default:
2793	break;	2705	break;
2794	}	2706	}
…		…
2832	break;	2744	break;
2833	case 6: /* lower window */	2745	case 6: /* lower window */
2834	XLowerWindow(R->Xdisplay, R->TermWin.parent[0]);	2746	XLowerWindow(R->Xdisplay, R->TermWin.parent[0]);
2835	break;	2747	break;
2836	case 7: /* refresh window */	2748	case 7: /* refresh window */
2837	rxvt_scr_touch(aR_ True);	2749	R->scr_touch (true);
2838	break;	2750	break;
2839	case 8: /* set size (chars) */	2751	case 8: /* set size (chars) */
2840	rxvt_set_widthheight(aR_ (unsigned int)(args[2] * R->TermWin.fwidth),	2752	rxvt_set_widthheight(aR_ (unsigned int)(args[2] * R->TermWin.fwidth),
2841	(unsigned int)(args[1] * R->TermWin.fheight));	2753	(unsigned int)(args[1] * R->TermWin.fheight));
2842	break;	2754	break;
…		…
2848	/*	2760	/*
2849	* reports - some output format copied from XTerm	2761	* reports - some output format copied from XTerm
2850	*/	2762	*/
2851	case 11: /* report window state */	2763	case 11: /* report window state */
2852	XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);	2764	XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);
2853	rxvt_tt_printf(aR_ "\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	2765	R->tt_printf("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2854	break;	2766	break;
2855	case 13: /* report window position */	2767	case 13: /* report window position */
2856	XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);	2768	XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);
2857	XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], wattr.root,	2769	XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], wattr.root,
2858	-wattr.border_width, -wattr.border_width,	2770	-wattr.border_width, -wattr.border_width,
2859	&x, &y, &wdummy);	2771	&x, &y, &wdummy);
2860	rxvt_tt_printf(aR_ "\033[3;%d;%dt", x, y);	2772	R->tt_printf("\033[3;%d;%dt", x, y);
2861	break;	2773	break;
2862	case 14: /* report window size (pixels) */	2774	case 14: /* report window size (pixels) */
2863	XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);	2775	XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);
2864	rxvt_tt_printf(aR_ "\033[4;%d;%dt", wattr.height, wattr.width);	2776	R->tt_printf("\033[4;%d;%dt", wattr.height, wattr.width);
2865	break;	2777	break;
2866	case 18: /* report window size (chars) */	2778	case 18: /* report window size (chars) */
2867	rxvt_tt_printf(aR_ "\033[8;%d;%dt", R->TermWin.nrow, R->TermWin.ncol);	2779	R->tt_printf("\033[8;%d;%dt", R->TermWin.nrow, R->TermWin.ncol);
2868	break;	2780	break;
2869	#if 0 /* XXX: currently disabled due to security concerns */	2781	#if 0 /* XXX: currently disabled due to security concerns */
2870	case 20: /* report icon label */	2782	case 20: /* report icon label */
2871	XGetIconName(R->Xdisplay, R->TermWin.parent[0], &s);	2783	XGetIconName(R->Xdisplay, R->TermWin.parent[0], &s);
2872	rxvt_tt_printf(aR_ "\033]L%-.200s\234", s ? s : ""); /* 8bit ST */	2784	R->tt_printf("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */
2873	break;	2785	break;
2874	case 21: /* report window title */	2786	case 21: /* report window title */
2875	XFetchName(R->Xdisplay, R->TermWin.parent[0], &s);	2787	XFetchName(R->Xdisplay, R->TermWin.parent[0], &s);
2876	rxvt_tt_printf(aR_ "\033]l%-.200s\234", s ? s : ""); /* 8bit ST */	2788	R->tt_printf("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */
2877	break;	2789	break;
2878	#endif	2790	#endif
2879	}	2791	}
2880	}	2792	}
2881	#endif	2793	#endif
…		…
3053	if (*str != ';') {	2965	if (*str != ';') {
3054	#if XPM_BACKGROUND	2966	#if XPM_BACKGROUND
3055	rxvt_scale_pixmap(aR_ ""); /* reset to default scaling */	2967	rxvt_scale_pixmap(aR_ ""); /* reset to default scaling */
3056	rxvt_set_bgPixmap(aR_ str); /* change pixmap */	2968	rxvt_set_bgPixmap(aR_ str); /* change pixmap */
3057	#endif	2969	#endif
3058	rxvt_scr_touch(aR_ True);	2970	R->scr_touch (true);
3059	}	2971	}
3060	while ((str = STRCHR(str, ';')) != NULL) {	2972	while ((str = STRCHR(str, ';')) != NULL) {
3061	str++;	2973	str++;
3062	#if XPM_BACKGROUND	2974	#if XPM_BACKGROUND
3063	changed += rxvt_scale_pixmap(aR_ str);	2975	changed += rxvt_scale_pixmap(aR_ str);
…		…
3065	}	2977	}
3066	if (changed) {	2978	if (changed) {
3067	#ifdef XPM_BACKGROUND	2979	#ifdef XPM_BACKGROUND
3068	rxvt_resize_pixmap(aR);	2980	rxvt_resize_pixmap(aR);
3069	#endif	2981	#endif
3070	rxvt_scr_touch(aR_ True);	2982	R->scr_touch (true);
3071	}	2983	}
3072	break;	2984	break;
3073		2985
3074	case XTerm_restoreFG:	2986	case XTerm_restoreFG:
3075	rxvt_set_window_color(aR_ Color_fg, str);	2987	rxvt_set_window_color(aR_ Color_fg, str);
…		…
3241	break;	3153	break;
3242	#endif	3154	#endif
3243	#ifdef scrollBar_esc	3155	#ifdef scrollBar_esc
3244	case scrollBar_esc:	3156	case scrollBar_esc:
3245	if (rxvt_scrollbar_mapping(aR_ state)) {	3157	if (rxvt_scrollbar_mapping(aR_ state)) {
3246	rxvt_resize_all_windows(aR_ 0, 0, 0);	3158	R->resize_all_windows (0, 0, 0);
3247	rxvt_scr_touch(aR_ True);	3159	R->scr_touch (true);
3248	}	3160	}
3249	break;	3161	break;
3250	#endif	3162	#endif
3251	case 25: /* visible/invisible cursor */	3163	case 25: /* visible/invisible cursor */
3252	rxvt_scr_cursor_visible(aR_ state);	3164	rxvt_scr_cursor_visible(aR_ state);
…		…
3278	else	3190	else
3279	R->Options &= ~Opt_scrollTtyKeypress;	3191	R->Options &= ~Opt_scrollTtyKeypress;
3280	break;	3192	break;
3281	case 1047: /* secondary screen w/ clearing */	3193	case 1047: /* secondary screen w/ clearing */
3282	if (R->current_screen != PRIMARY)	3194	if (R->current_screen != PRIMARY)
3283	rxvt_scr_erase_screen(aR_ 2);	3195	R->scr_erase_screen (2);
3284	rxvt_scr_change_screen(aR_ state);	3196	rxvt_scr_change_screen(aR_ state);
3285	/* FALLTHROUGH */	3197	/* FALLTHROUGH */
3286	default:	3198	default:
3287	break;	3199	break;
3288	}	3200	}
…		…
3424	{	3336	{
3425	unsigned char ch, cmd = rxvt_cmd_getc(aR);	3337	unsigned char ch, cmd = rxvt_cmd_getc(aR);
3426		3338
3427	#ifndef RXVT_GRAPHICS	3339	#ifndef RXVT_GRAPHICS
3428	if (cmd == 'Q') { /* query graphics */	3340	if (cmd == 'Q') { /* query graphics */
3429	rxvt_tt_printf(aR_ "\033G0\n"); /* no graphics */	3341	R->tt_printf("\033G0\n"); /* no graphics */
3430	return;	3342	return;
3431	}	3343	}
3432	/* swallow other graphics sequences until terminating ':' */	3344	/* swallow other graphics sequences until terminating ':' */
3433	do	3345	do
3434	ch = rxvt_cmd_getc(aR);	3346	ch = rxvt_cmd_getc(aR);
…		…
3437	unsigned int nargs;	3349	unsigned int nargs;
3438	int args[NGRX_PTS];	3350	int args[NGRX_PTS];
3439	unsigned char *text = NULL;	3351	unsigned char *text = NULL;
3440		3352
3441	if (cmd == 'Q') { /* query graphics */	3353	if (cmd == 'Q') { /* query graphics */
3442	rxvt_tt_printf(aR_ "\033G1\n"); /* yes, graphics (color) */	3354	R->tt_printf("\033G1\n"); /* yes, graphics (color) */
3443	return;	3355	return;
3444	}	3356	}
3445	for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;) {	3357	for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;) {
3446	int neg;	3358	int neg;
3447		3359
…		…
3462	}	3374	}
3463		3375
3464	if ((cmd == 'T') && (nargs >= 5)) {	3376	if ((cmd == 'T') && (nargs >= 5)) {
3465	int i, len = args[4];	3377	int i, len = args[4];
3466		3378
3467	text = rxvt_malloc((len + 1) * sizeof(char));	3379	text = (unsigned char *)rxvt_malloc((len + 1) * sizeof(char));
3468		3380
3469	if (text != NULL) {	3381	if (text != NULL) {
3470	for (i = 0; i < len; i++)	3382	for (i = 0; i < len; i++)
3471	text[i] = rxvt_cmd_getc(aR);	3383	text[i] = rxvt_cmd_getc(aR);
3472	text[len] = '\0';	3384	text[len] = '\0';
…		…
3481		3393
3482	/*	3394	/*
3483	* Send printf() formatted output to the command.	3395	* Send printf() formatted output to the command.
3484	* Only use for small amounts of data.	3396	* Only use for small amounts of data.
3485	*/	3397	*/
3486	/* EXTPROTO */
3487	void	3398	void
3488	rxvt_tt_printf(pR_ const char *fmt,...)	3399	rxvt_term::tt_printf (const char *fmt,...)
3489	{	3400	{
3490	va_list arg_ptr;	3401	va_list arg_ptr;
3491	unsigned char buf[256];	3402	unsigned char buf[256];
3492		3403
3493	va_start(arg_ptr, fmt);	3404	va_start (arg_ptr, fmt);
3494	vsprintf((char *)buf, fmt, arg_ptr);	3405	vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3495	va_end(arg_ptr);	3406	va_end (arg_ptr);
3496	rxvt_tt_write(aR_ buf, (unsigned int)STRLEN(buf));	3407	tt_write (buf, STRLEN (buf));
3497	}	3408	}
3498		3409
3499	/* ---------------------------------------------------------------------- */	3410	/* ---------------------------------------------------------------------- */
3500	/* Addresses pasting large amounts of data and rxvt hang
3501	* code pinched from xterm (v_write()) and applied originally to
3502	* rxvt-2.18 - Hops
3503	* Write data to the pty as typed by the user, pasted with the mouse,	3411	/* Write data to the pty as typed by the user, pasted with the mouse,
3504	* or generated by us in response to a query ESC sequence.	3412	* or generated by us in response to a query ESC sequence.
3505	*/	3413	*/
3506	/* EXTPROTO */
3507	void	3414	void
3508	rxvt_tt_write(pR_ const unsigned char *d, unsigned int len)	3415	rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3509	{	3416	{
3510	#define MAX_PTY_WRITE 256 /* POSIX minimum MAX_INPUT */	3417	enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT
3511	int riten;
3512	unsigned int p;
3513	unsigned char *v_buffer, /* start of physical buffer */
3514	*v_bufstr, /* start of current buffer pending */
3515	*v_bufptr, /* end of current buffer pending */
3516	*v_bufend; /* end of physical buffer */
3517		3418
3518	if (R->v_bufstr == NULL && len > 0) {	3419	if (len)
3519	p = (len / MAX_PTY_WRITE + 1) * MAX_PTY_WRITE;
3520	v_buffer = v_bufstr = v_bufptr = (unsigned char *)rxvt_malloc(p);
3521	v_bufend = v_buffer + p;
3522	} else {
3523	v_buffer = R->v_buffer;
3524	v_bufstr = R->v_bufstr;
3525	v_bufptr = R->v_bufptr;
3526	v_bufend = R->v_bufend;
3527	}	3420	{
		3421	if (v_buflen == 0)
		3422	{
		3423	int written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
		3424	if (written == len)
		3425	return;
3528		3426
3529	/*	3427	data += written;
3530	* Append to the block we already have. Always doing this simplifies the	3428	len -= written;
3531	* code, and isn't too bad, either. If this is a short block, it isn't	3429	}
3532	* too expensive, and if this is a long block, we won't be able to write	3430
3533	* it all anyway.	3431
3534	*/	3432	v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3535	if (len > 0) {	3433
3536	if (v_bufend < v_bufptr + len) { /* run out of room */	3434	memcpy (v_buffer + v_buflen, data, len);
3537	if (v_bufstr != v_buffer) {	3435	v_buflen += len;
3538	/* there is unused space, move everything down */
3539	MEMMOVE(v_buffer, v_bufstr,
3540	(unsigned int)(v_bufptr - v_bufstr));
3541	v_bufptr -= v_bufstr - v_buffer;
3542	v_bufstr = v_buffer;
3543	}	3436	}
3544	if (v_bufend < v_bufptr + len) {
3545	/* still won't fit: get more space */
3546	/* use most basic realloc because an error is not fatal. */
3547	unsigned int size = v_bufptr - v_buffer;
3548	unsigned int reallocto;
3549		3437
3550	reallocto = ((size + len) / MAX_PTY_WRITE + 1) * MAX_PTY_WRITE;	3438	for (;;)
3551	v_buffer = (unsigned char *)realloc(v_buffer, reallocto);	3439	{
3552	/* save across realloc */	3440	int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3553	if (v_buffer) {	3441
3554	v_bufstr = v_buffer;	3442	if (written > 0)
3555	v_bufptr = v_buffer + size;	3443	{
3556	v_bufend = v_buffer + reallocto;	3444	v_buflen -= written;
3557	} else { /* no memory: ignore entire write request */	3445
3558	rxvt_print_error("data loss: cannot allocate buffer space");	3446	if (v_buflen == 0)
3559	v_buffer = v_bufstr; /* restore clobbered pointer */	3447	{
3560	}	3448	free (v_buffer);
		3449	v_buffer = 0;
		3450	v_buflen = 0;
		3451
		3452	pty_ev.set (EVENT_READ);
		3453	return;
		3454	}
		3455
		3456	memmove (v_buffer, v_buffer + written, v_buflen);
		3457	}
		3458	else if (written != -1 || (errno != EAGAIN && errno != EINTR))
		3459	// original code just ignores this...
		3460	destroy ();
		3461	else
		3462	{
		3463	pty_ev.set (EVENT_READ | EVENT_WRITE);
		3464	return;
		3465	}
3561	}	3466	}
3562	}
3563	if (v_bufend >= v_bufptr + len) { /* new stuff will fit */
3564	MEMCPY(v_bufptr, d, len);
3565	v_bufptr += len;
3566	}
3567	}
3568
3569	/*
3570	* Write out as much of the buffer as we can.
3571	* Be careful not to overflow the pty's input silo.
3572	* We are conservative here and only write a small amount at a time.
3573	*
3574	* If we can't push all the data into the pty yet, we expect write
3575	* to return a non-negative number less than the length requested
3576	* (if some data written) or -1 and set errno to EAGAIN,
3577	* EWOULDBLOCK, or EINTR (if no data written).
3578	*
3579	* (Not all systems do this, sigh, so the code is actually
3580	* a little more forgiving.)
3581	*/
3582	if ((p = v_bufptr - v_bufstr) > 0) {
3583	riten = write(R->cmd_fd, v_bufstr, min(p, MAX_PTY_WRITE));
3584	if (riten < 0)
3585	riten = 0;
3586	v_bufstr += riten;
3587	if (v_bufstr >= v_bufptr) /* we wrote it all */
3588	v_bufstr = v_bufptr = v_buffer;
3589	}
3590	/*
3591	* If we have lots of unused memory allocated, return it
3592	*/
3593	if (v_bufend - v_bufptr > MAX_PTY_WRITE * 8) { /* arbitrary hysteresis */
3594	/* save pointers across realloc */
3595	unsigned int start = v_bufstr - v_buffer;
3596	unsigned int size = v_bufptr - v_buffer;
3597	unsigned int reallocto;
3598
3599	reallocto = (size / MAX_PTY_WRITE + 1) * MAX_PTY_WRITE;
3600	v_buffer = (unsigned char *)realloc(v_buffer, reallocto);
3601	if (v_buffer) {
3602	v_bufstr = v_buffer + start;
3603	v_bufptr = v_buffer + size;
3604	v_bufend = v_buffer + reallocto;
3605	} else {
3606	/* should we print a warning if couldn't return memory? */
3607	v_buffer = v_bufstr - start; /* restore clobbered pointer */
3608	}
3609	}
3610	R->v_buffer = v_buffer;
3611	R->v_bufstr = v_bufstr;
3612	R->v_bufptr = v_bufptr;
3613	R->v_bufend = v_bufend;
3614	}	3467	}
		3468
3615	/*----------------------- end-of-file (C source) -----------------------*/	3469	/*----------------------- end-of-file (C source) -----------------------*/
3616		3470

Diff Legend

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