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.27 by pcg, Tue Dec 30 01:35:58 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.27 2003/12/30 01:35:58 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[KBUFSZ];
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.
74	*	74	*
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	}
		701
		702	void
		703	rxvt_term::check_cb (check_watcher &w)
		704	{
		705	SET_R (this);
		706	SET_LOCALE (locale);
		707
		708	flush ();
		709	}
		710
		711	void
661	rxvt_term::process_x_events ()	712	rxvt_term::process_x_events ()
662	{	713	{
663	do	714	do
664	{	715	{
665	XEvent xev;	716	XEvent xev;
666		717
667	XNextEvent (Xdisplay, &xev);	718	XNextEvent (Xdisplay, &xev);
668		719
669	#if defined(CURSOR_BLINK)	720	#if defined(CURSOR_BLINK)
670	if ((Options & Opt_cursorBlink)	721	if ((Options & Opt_cursorBlink)
671	&& xev.type == KeyPress) {	722	&& xev.type == KeyPress)
		723	{
672	if (hidden_cursor) {	724	if (hidden_cursor)
		725	{
673	hidden_cursor = 0;	726	hidden_cursor = 0;
674	want_refresh = 1;	727	want_refresh = 1;
675	}	728	}
		729
676	blink_ev.start (NOW + BLINK_INTERVAL);	730	blink_ev.start (NOW + BLINK_INTERVAL);
677	}	731	}
678	#endif	732	#endif
679		733
680	#if defined(POINTER_BLANK)	734	#if defined(POINTER_BLANK)
681	if ((Options & Opt_pointerBlank)	735	if ((Options & Opt_pointerBlank)
682	&& (pointerBlankDelay > 0)) {	736	&& (pointerBlankDelay > 0))
		737	{
683	if (xev.type == MotionNotify	738	if (xev.type == MotionNotify
684	|| xev.type == ButtonPress	739	|| xev.type == ButtonPress
685	|| xev.type == ButtonRelease) {	740	|| xev.type == ButtonRelease)
686	if (hidden_pointer)	741	if (hidden_pointer)
687	rxvt_pointer_unblank(aR);	742	pointer_unblank ();
688	want_motion_time = 1;	743
689	}
690	if (xev.type == KeyPress && hidden_pointer == 0)	744	if (xev.type == KeyPress && hidden_pointer == 0)
691	rxvt_pointer_blank (this);	745	pointer_blank ();
692	}	746	}
693	#endif	747	#endif
694		748
695	#ifdef USE_XIM	749	#ifdef USE_XIM
696	if (!XFilterEvent (&xev, xev.xany.window))	750	if (!XFilterEvent (&xev, xev.xany.window))
697	#endif	751	#endif
698	rxvt_process_x_event (this, &xev);	752	rxvt_process_x_event (this, &xev);
699	}	753	}
700	while (XPending (Xdisplay));	754	while (XPending (Xdisplay));
701	}	755	}
702		756
		757	#ifdef CURSOR_BLINK
703	void	758	void
704	rxvt_term::blink_cb (time_watcher &w)	759	rxvt_term::blink_cb (time_watcher &w)
705	{	760	{
706	w.at += BLINK_INTERVAL;	761	w.at += BLINK_INTERVAL;
707	hidden_cursor = !hidden_cursor;	762	hidden_cursor = !hidden_cursor;
708	want_refresh = 1;	763	want_refresh = 1;
709	flush();
710	}	764	}
		765	#endif
711		766
712	void	767	void
713	rxvt_term::x_cb (io_watcher &w, short revents)	768	rxvt_term::x_cb (io_watcher &w, short revents)
714	{	769	{
		770	SET_R (this);
		771	SET_LOCALE (locale);
		772
715	process_x_events ();	773	process_x_events ();
		774	}
716		775
717	flush ();	776	bool
		777	rxvt_term::pty_fill ()
		778	{
		779	ssize_t n = cmdbuf_endp - cmdbuf_ptr;
		780
		781	memmove (cmdbuf_base, cmdbuf_ptr, n);
		782	cmdbuf_ptr = cmdbuf_base;
		783	cmdbuf_endp = cmdbuf_ptr + n;
		784
		785	n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n);
		786
		787	if (n > 0)
		788	{
		789	cmdbuf_endp += n;
		790	return true;
		791	}
		792	else if (n < 0 && errno != EAGAIN)
		793	destroy ();
		794
		795	return false;
		796	}
		797
		798	void
		799	rxvt_term::pty_cb (io_watcher &w, short revents)
		800	{
		801	SET_R (this);
		802	SET_LOCALE (locale);
		803
		804	if (revents & EVENT_WRITE)
		805	tt_write (0, 0);
		806	else if (revents & EVENT_READ)
		807	{
		808	bool flag = true;
		809
		810	// loop, but don't allow a single term to monopolize us
		811	// the number of loops is fully arbitrary, and thus wrong
		812	while (flag && pty_fill ())
		813	{
		814	if (!seen_input)
		815	{
		816	seen_input = 1;
		817	/* once we know the shell is running, send the screen size. Again! */
		818	tt_winch ();
		819	}
		820
		821	uint32_t ch = NOCHAR;
		822
		823	for (;;)
		824	{
		825	if (ch == NOCHAR)
		826	ch = next_char ();
		827
		828	if (ch == NOCHAR) // TODO: improve
		829	break;
		830
		831	if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
		832	{
		833	/* Read a text string from the input buffer */
		834	uint32_t buf[BUFSIZ];
		835	bool refreshnow = false;
		836	int nlines = 0;
		837	uint32_t *str = buf;
		838
		839	*str++ = ch;
		840
		841	for (;;)
		842	{
		843	ch = next_char ();
		844
		845	if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
		846	break;
		847	else
		848	{
		849	*str++ = ch;
		850
		851	if (ch == '\n')
		852	{
		853	nlines++;
		854	refresh_count++;
		855
		856	if (!(Options & Opt_jumpScroll)
		857	|| (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
		858	{
		859	refreshnow = true;
		860	flag = false;
		861	ch = NOCHAR;
		862	break;
		863	}
		864	}
		865
		866	if (str >= buf + BUFSIZ)
		867	{
		868	ch = NOCHAR;
		869	break;
		870	}
		871	}
		872	}
		873
		874	rxvt_scr_add_lines (this, buf, nlines, str - buf);
		875
		876	/*
		877	* If there have been a lot of new lines, then update the screen
		878	* What the heck I'll cheat and only refresh less than every page-full.
		879	* the number of pages between refreshes is refresh_limit, which
		880	* is incremented here because we must be doing flat-out scrolling.
		881	*
		882	* refreshing should be correct for small scrolls, because of the
		883	* time-out
		884	*/
		885	if (refreshnow)
		886	{
		887	if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
		888	refresh_limit++;
		889
		890	scr_refresh (refresh_type);
		891	}
		892
		893	}
		894	else
		895	{
		896	switch (ch)
		897	{
		898	default:
		899	rxvt_process_nonprinting (this, ch);
		900	break;
		901	case C0_ESC: /* escape char */
		902	rxvt_process_escape_seq (this);
		903	break;
		904	/*case 0x9b: */ /* CSI */
		905	/* rxvt_process_csi_seq (this); */
		906	}
		907
		908	ch = NOCHAR;
		909	}
		910	}
		911	}
		912	}
718	}	913	}
719		914
720	// read the next character, currently handles UTF-8	915	// read the next character, currently handles UTF-8
721	// will probably handle all sorts of other stuff in the future	916	// will probably handle all sorts of other stuff in the future
722	uint32_t	917	uint32_t
723	rxvt_term::next_char ()	918	rxvt_term::next_char ()
724	{	919	{
725	struct mbstate &s = mbstate;
726
727	while (cmdbuf_ptr < cmdbuf_endp)	920	while (cmdbuf_ptr < cmdbuf_endp)
728	{	921	{
729	uint8_t ch = *cmdbuf_ptr;	922	if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh
730
731	if (s.cnt)
732	{
733	if ((ch & 0xc0) == 0x80)
734	{
735	cmdbuf_ptr++;
736
737	/* continuation */
738	s.reg = (s.reg << 6) | (ch & 0x7f);
739
740	if (--s.cnt == 0 && s.reg >= 128) /* if !inrange then corruption or Racking */
741	return s.reg;
742
743	continue;
744	}
745	else
746	{
747	s.cnt = 0;
748	return s.orig; /* the _occasional_ non-utf-8 character may slip through... */
749	}
750	}
751
752	if ((ch & 0xc0) == 0xc0)
753	{
754	cmdbuf_ptr++;	923	return *cmdbuf_ptr++;
755		924
756	/* first byte */	925	wchar_t wc;
757	s.orig = ch; /* for broken encodings */	926	int len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, &mbstate.mbs);
758	s.reg = ch;	927
759	if ((ch & 0xe0) == 0xc0) { s.reg &= 0x1f; s.cnt = 1; }	928	if (len == (size_t)-2)
760	if ((ch & 0xf0) == 0xe0) { s.reg &= 0x0f; s.cnt = 2; }	929	return NOCHAR;
761	if ((ch & 0xf8) == 0xf0) { s.reg &= 0x07; s.cnt = 3; }	930
762	if ((ch & 0xfc) == 0xf8) { s.reg &= 0x03; s.cnt = 4; }	931	if (len == (size_t)-1)
763	if ((ch & 0xfe) == 0xfc) { s.reg &= 0x01; s.cnt = 5; }	932	return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
764	}	933
765	else	934	// assume wchar == unicode
766	{	935	cmdbuf_ptr += len;
767	cmdbuf_ptr++; /* _occasional_ non-utf8 may slip through... */
768	return ch;	936	return wc;
769	}
770	}	937	}
771		938
772	return NOCHAR;	939	return NOCHAR;
773	}
774
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	}	940	}
925		941
926	/* rxvt_cmd_getc() - Return next input character */	942	/* rxvt_cmd_getc() - Return next input character */
927	/*	943	/*
928	* Return the next input character after first passing any keyboard input	944	* Return the next input character after first passing any keyboard input
…		…
939	return c;	955	return c;
940		956
941	// incomplete sequences should occur rarely, still, a better solution	957	// incomplete sequences should occur rarely, still, a better solution
942	// would be preferred. either setjmp/longjmp or better design.	958	// would be preferred. either setjmp/longjmp or better design.
943	fcntl (R->cmd_fd, F_SETFL, 0);	959	fcntl (R->cmd_fd, F_SETFL, 0);
944	R->pty_fill (1);	960	R->pty_fill ();
945	fcntl (R->cmd_fd, F_SETFL, O_NONBLOCK);	961	fcntl (R->cmd_fd, F_SETFL, O_NONBLOCK);
946	}	962	}
947		963
		964	#if 0
948	#define TIMEOUT_USEC 5000	965	#define TIMEOUT_USEC 5000
949	fd_set readfds;	966	fd_set readfds;
950	int quick_timeout, select_res;	967	int quick_timeout, select_res;
951	int want_motion_time, want_keypress_time;	968	int want_motion_time, want_keypress_time;
952	struct timeval value;	969	struct timeval value;
…		…
956		973
957	for (;;) {	974	for (;;) {
958	/* loop until we can return something */	975	/* loop until we can return something */
959		976
960	if (R->v_bufstr < R->v_bufptr) /* output any pending chars */	977	if (R->v_bufstr < R->v_bufptr) /* output any pending chars */
961	rxvt_tt_write(aR_ NULL, 0);	978	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		979
1003	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	980	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1004	if (R->mouse_slip_wheel_speed) {	981	if (R->mouse_slip_wheel_speed) {
1005	quick_timeout = 1;	982	quick_timeout = 1;
1006	if (!R->mouse_slip_wheel_delay--	983	if (!R->mouse_slip_wheel_delay--
…		…
1016	if (R->pending_scroll_selection) {	993	if (R->pending_scroll_selection) {
1017	quick_timeout = 1;	994	quick_timeout = 1;
1018	if (!R->scroll_selection_delay--	995	if (!R->scroll_selection_delay--
1019	&& rxvt_scr_page(aR_ R->scroll_selection_dir,	996	&& rxvt_scr_page(aR_ R->scroll_selection_dir,
1020	R->scroll_selection_lines)) {	997	R->scroll_selection_lines)) {
1021	rxvt_selection_extend(aR_ R->selection_save_x,	998	R->selection_extend (R->selection_save_x,
1022	R->selection_save_y, R->selection_save_state);	999	R->selection_save_y, R->selection_save_state);
1023	R->scroll_selection_delay = SCROLLBAR_CONTINUOUS_DELAY;	1000	R->scroll_selection_delay = SCROLLBAR_CONTINUOUS_DELAY;
1024	R->refresh_type |= SMOOTH_REFRESH;	1001	R->refresh_type |= SMOOTH_REFRESH;
1025	R->want_refresh = 1;	1002	R->want_refresh = 1;
1026	}	1003	}
…		…
1036	R->want_refresh = 1;	1013	R->want_refresh = 1;
1037	}	1014	}
1038	}	1015	}
1039	#endif /* NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING */	1016	#endif /* NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING */
1040		1017
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	1018	#ifdef TRANSPARENT
1052	quick_timeout |= R->want_full_refresh;	1019	quick_timeout |= R->want_full_refresh;
1053	#endif	1020	#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	1021	#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	}	1022	}
1122		1023
1123	/* EXTPROTO */
1124	void	1024	void
1125	rxvt_pointer_unblank(pR)	1025	rxvt_term::pointer_unblank ()
1126	{	1026	{
1127	XDefineCursor(R->Xdisplay, R->TermWin.vt, R->TermWin_cursor);	1027	XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor);
1128	rxvt_recolour_cursor(aR);	1028	recolour_cursor ();
		1029
1129	#ifdef POINTER_BLANK	1030	#ifdef POINTER_BLANK
1130	R->hidden_pointer = 0;	1031	hidden_pointer = 0;
1131	if (R->pointerBlankDelay > 0) {
1132	struct timeval tp;
1133		1032
1134	(void)gettimeofday(&tp, NULL);	1033	if (Options & Opt_pointerBlank)
1135	R->lastmotion.tv_sec = tp.tv_sec;	1034	pointer_ev.start (NOW + pointerBlankDelay);
1136	R->lastmotion.tv_usec = tp.tv_usec;
1137	}
1138	#endif	1035	#endif
1139	}	1036	}
1140		1037
1141	#ifdef POINTER_BLANK	1038	#ifdef POINTER_BLANK
1142	/* INTPROTO */
1143	void	1039	void
1144	rxvt_pointer_blank(pR)	1040	rxvt_term::pointer_blank ()
1145	{	1041	{
		1042	pointer_ev.stop ();
		1043
		1044	if (!(Options & Opt_pointerBlank))
		1045	return;
		1046
1146	XDefineCursor(R->Xdisplay, R->TermWin.vt, R->pointer_blank);	1047	XDefineCursor (Xdisplay, TermWin.vt, blank_cursor);
1147	XFlush(R->Xdisplay);	1048	XFlush (Xdisplay);
		1049
1148	R->hidden_pointer = 1;	1050	hidden_pointer = 1;
		1051	}
		1052
		1053	void
		1054	rxvt_term::pointer_cb (time_watcher &w)
		1055	{
		1056	SET_R (this);
		1057	SET_LOCALE (locale);
		1058
		1059	pointer_blank ();
1149	}	1060	}
1150	#endif	1061	#endif
1151		1062
1152	/* INTPROTO */	1063	/* INTPROTO */
1153	void	1064	void
…		…
1156	int button_number, key_state = 0;	1067	int button_number, key_state = 0;
1157	int x, y;	1068	int x, y;
1158		1069
1159	x = ev->x;	1070	x = ev->x;
1160	y = ev->y;	1071	y = ev->y;
1161	rxvt_pixel_position(aR_ &x, &y);	1072	R->pixel_position (&x, &y);
1162		1073
1163	if (R->MEvent.button == AnyButton) {	1074	if (R->MEvent.button == AnyButton) {
1164	button_number = 3;	1075	button_number = 3;
1165	} else {	1076	} else {
1166	button_number = R->MEvent.button - Button1;	1077	button_number = R->MEvent.button - Button1;
…		…
1206	fprintf(stderr, "]: <%d>, %d/%d\n",	1117	fprintf(stderr, "]: <%d>, %d/%d\n",
1207	button_number,	1118	button_number,
1208	x + 1,	1119	x + 1,
1209	y + 1);	1120	y + 1);
1210	#else	1121	#else
1211	rxvt_tt_printf(aR_ "\033[M%c%c%c",	1122	R->tt_printf("\033[M%c%c%c",
1212	(32 + button_number + key_state),	1123	(32 + button_number + key_state),
1213	(32 + x + 1),	1124	(32 + x + 1),
1214	(32 + y + 1));	1125	(32 + y + 1));
1215	#endif	1126	#endif
1216	}	1127	}
…		…
1233	{	1144	{
1234	int i, want_timeout;	1145	int i, want_timeout;
1235	Window unused_root, unused_child;	1146	Window unused_root, unused_child;
1236	int unused_root_x, unused_root_y;	1147	int unused_root_x, unused_root_y;
1237	unsigned int unused_mask;	1148	unsigned int unused_mask;
1238	struct timeval tp;
1239		1149
1240	#ifdef DEBUG_X	1150	#ifdef DEBUG_X
1241	const char *const eventnames[] =	1151	const char *const eventnames[] =
1242	{ /* mason - this matches my system */	1152	{ /* mason - this matches my system */
1243	"",	1153	"",
…		…
1274	"SelectionNotify",	1184	"SelectionNotify",
1275	"ColormapNotify",	1185	"ColormapNotify",
1276	"ClientMessage",	1186	"ClientMessage",
1277	"MappingNotify"	1187	"MappingNotify"
1278	};	1188	};
		1189	#endif
		1190
		1191	#ifdef DEBUG_X
		1192	struct timeval tp;
1279	struct tm *ltt;	1193	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);	1194	(void)gettimeofday(&tp, NULL);
1296
1297	#ifdef DEBUG_X
1298	ltt = localtime(&(tp.tv_sec));	1195	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));	1196	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	1197	#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		1198
1322	switch (ev->type) {	1199	switch (ev->type) {
1323	case KeyPress:	1200	case KeyPress:
1324	rxvt_lookup_key(aR_ (XKeyEvent *)ev);	1201	rxvt_lookup_key(aR_ (XKeyEvent *)ev);
1325	break;	1202	break;
…		…
1349	break;	1226	break;
1350		1227
1351	case ClientMessage:	1228	case ClientMessage:
1352	if (ev->xclient.format == 32	1229	if (ev->xclient.format == 32
1353	&& (Atom)ev->xclient.data.l[0] == R->xa[XA_WMDELETEWINDOW])	1230	&& (Atom)ev->xclient.data.l[0] == R->xa[XA_WMDELETEWINDOW])
1354	exit(EXIT_SUCCESS);	1231	R->destroy ();
1355	#ifdef OFFIX_DND	1232	#ifdef OFFIX_DND
1356	/* OffiX Dnd (drag 'n' drop) protocol */	1233	/* OffiX Dnd (drag 'n' drop) protocol */
1357	if (ev->xclient.message_type == R->xa[XA_DNDPROTOCOL]	1234	else if (ev->xclient.message_type == R->xa[XA_DNDPROTOCOL]
1358	&& (ev->xclient.data.l[0] == DndFile	1235	&& (ev->xclient.data.l[0] == DndFile
1359	|| ev->xclient.data.l[0] == DndDir	1236	|| ev->xclient.data.l[0] == DndDir
1360	|| ev->xclient.data.l[0] == DndLink)) {	1237	|| ev->xclient.data.l[0] == DndLink)) {
1361	/* Get Dnd data */	1238	/* Get Dnd data */
1362	Atom ActualType;	1239	Atom ActualType;
…		…
1394	* in the GraphicsExpose parts, which means that after each refresh,	1271	* in the GraphicsExpose parts, which means that after each refresh,
1395	* we need to wait for the graphics expose or Noexpose events,	1272	* we need to wait for the graphics expose or Noexpose events,
1396	* which ought to make things real slow!	1273	* which ought to make things real slow!
1397	*/	1274	*/
1398	case VisibilityNotify:	1275	case VisibilityNotify:
1399	switch (ev->xvisibility.state) {	1276	switch (ev->xvisibility.state)
		1277	{
1400	case VisibilityUnobscured:	1278	case VisibilityUnobscured:
1401	R->refresh_type = FAST_REFRESH;	1279	R->refresh_type = FAST_REFRESH;
1402	break;	1280	break;
1403	case VisibilityPartiallyObscured:	1281	case VisibilityPartiallyObscured:
1404	R->refresh_type = SLOW_REFRESH;	1282	R->refresh_type = SLOW_REFRESH;
1405	break;	1283	break;
1406	default:	1284	default:
1407	R->refresh_type = NO_REFRESH;	1285	R->refresh_type = NO_REFRESH;
1408	break;	1286	break;
1409	}	1287	}
1410	break;	1288	break;
1411		1289
1412	case FocusIn:	1290	case FocusIn:
1413	if (!R->TermWin.focus) {	1291	if (!R->TermWin.focus) {
1414	R->TermWin.focus = 1;	1292	R->TermWin.focus = 1;
…		…
1450	D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));	1328	D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1451	} while (XCheckTypedWindowEvent(R->Xdisplay, ev->xconfigure.window,	1329	} while (XCheckTypedWindowEvent(R->Xdisplay, ev->xconfigure.window,
1452	ConfigureNotify, ev));	1330	ConfigureNotify, ev));
1453	if (R->szHint.width != width || R->szHint.height != height) {	1331	if (R->szHint.width != width || R->szHint.height != height) {
1454	D_SIZE((stderr, "Size: Resizing from: %4d x %4d", R->szHint.width, R->szHint.height));	1332	D_SIZE((stderr, "Size: Resizing from: %4d x %4d", R->szHint.width, R->szHint.height));
1455	rxvt_resize_all_windows(aR_ (unsigned int)width,	1333	R->resize_all_windows (width, height, 1);
1456	(unsigned int)height, 1);
1457	}	1334	}
1458	#ifdef DEBUG_SIZE	1335	#ifdef DEBUG_SIZE
1459	else {	1336	else {
1460	D_SIZE((stderr, "Size: Not resizing"));	1337	D_SIZE((stderr, "Size: Not resizing"));
1461	}	1338	}
…		…
1520		1397
1521	case GraphicsExpose:	1398	case GraphicsExpose:
1522	case Expose:	1399	case Expose:
1523	if (ev->xany.window == R->TermWin.vt) {	1400	if (ev->xany.window == R->TermWin.vt) {
1524	#ifdef NO_SLOW_LINK_SUPPORT	1401	#ifdef NO_SLOW_LINK_SUPPORT
1525	rxvt_scr_expose(aR_ ev->xexpose.x, ev->xexpose.y,	1402	R->scr_expose (ev->xexpose.x, ev->xexpose.y,
1526	ev->xexpose.width, ev->xexpose.height, False);	1403	ev->xexpose.width, ev->xexpose.height, False);
1527	#else	1404	#else
1528	// don't understand this, so commented it out	1405	// don't understand this, so commented it out
1529	rxvt_scr_expose(aR_ ev->xexpose.x, ev->xexpose.y,	1406	R->scr_expose (ev->xexpose.x, ev->xexpose.y,
1530	ev->xexpose.width, ev->xexpose.height, False);	1407	ev->xexpose.width, ev->xexpose.height, False);
1531	//rxvt_scr_expose(aR_ ev->xexpose.x, 0,	1408	//rxvt_scr_expose(aR_ ev->xexpose.x, 0,
1532	// ev->xexpose.width, R->TermWin.height, False);	1409	// ev->xexpose.width, R->TermWin.height, False);
1533	#endif	1410	#endif
1534	R->want_refresh = 1;	1411	R->want_refresh = 1;
1535	} else {	1412	} else {
…		…
1540	&unused_xevent)) ;	1417	&unused_xevent)) ;
1541	while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window,	1418	while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window,
1542	GraphicsExpose,	1419	GraphicsExpose,
1543	&unused_xevent)) ;	1420	&unused_xevent)) ;
1544	if (isScrollbarWindow(ev->xany.window)) {	1421	if (isScrollbarWindow(ev->xany.window)) {
1545	scrollbar_setIdle();	1422	R->scrollBar.setIdle();
1546	rxvt_scrollbar_show(aR_ 0);	1423	rxvt_scrollbar_show(aR_ 0);
1547	}	1424	}
1548	#ifdef MENUBAR	1425	#ifdef MENUBAR
1549	if (menubar_visible(aR) && isMenuBarWindow(ev->xany.window))	1426	if (menubar_visible(aR) && isMenuBarWindow(ev->xany.window))
1550	rxvt_menubar_expose(aR);	1427	rxvt_menubar_expose(aR);
…		…
1556	break;	1433	break;
1557		1434
1558	case MotionNotify:	1435	case MotionNotify:
1559	#ifdef POINTER_BLANK	1436	#ifdef POINTER_BLANK
1560	if (R->hidden_pointer)	1437	if (R->hidden_pointer)
1561	rxvt_pointer_unblank(aR);	1438	R->pointer_unblank ();
1562	#endif	1439	#endif
1563	#if MENUBAR	1440	#if MENUBAR
1564	if (isMenuBarWindow(ev->xany.window)) {	1441	if (isMenuBarWindow(ev->xany.window)) {
1565	rxvt_menubar_control(aR_ &(ev->xbutton));	1442	rxvt_menubar_control(aR_ &(ev->xbutton));
1566	break;	1443	break;
…		…
1580	&unused_mask);	1457	&unused_mask);
1581	#ifdef MOUSE_THRESHOLD	1458	#ifdef MOUSE_THRESHOLD
1582	/* deal with a `jumpy' mouse */	1459	/* deal with a `jumpy' mouse */
1583	if ((ev->xmotion.time - R->MEvent.time) > MOUSE_THRESHOLD) {	1460	if ((ev->xmotion.time - R->MEvent.time) > MOUSE_THRESHOLD) {
1584	#endif	1461	#endif
1585	rxvt_selection_extend(aR_ (ev->xbutton.x), (ev->xbutton.y),	1462	R->selection_extend ((ev->xbutton.x), (ev->xbutton.y),
1586	(ev->xbutton.state & Button3Mask) ? 2 : 0);	1463	(ev->xbutton.state & Button3Mask) ? 2 : 0);
1587	#ifdef SELECTION_SCROLLING	1464	#ifdef SELECTION_SCROLLING
1588	if (ev->xbutton.y<R->TermWin.int_bwidth ||	1465	if (ev->xbutton.y<R->TermWin.int_bwidth ||
1589	Pixel2Row(ev->xbutton.y)>(R->TermWin.nrow-1)) {	1466	Pixel2Row(ev->xbutton.y)>(R->TermWin.nrow-1)) {
1590	int dist;	1467	int dist;
…		…
1639	&unused_root_x, &unused_root_y,	1516	&unused_root_x, &unused_root_y,
1640	&(ev->xbutton.x), &(ev->xbutton.y),	1517	&(ev->xbutton.x), &(ev->xbutton.y),
1641	&unused_mask);	1518	&unused_mask);
1642	rxvt_scr_move_to(aR_ scrollbar_position(ev->xbutton.y) - R->csrO,	1519	rxvt_scr_move_to(aR_ scrollbar_position(ev->xbutton.y) - R->csrO,
1643	scrollbar_size());	1520	scrollbar_size());
1644	rxvt_scr_refresh(aR_ R->refresh_type);	1521	R->scr_refresh (R->refresh_type);
1645	R->refresh_limit = 0;	1522	R->refresh_limit = 0;
1646	rxvt_scrollbar_show(aR_ 1);	1523	rxvt_scrollbar_show(aR_ 1);
1647	}	1524	}
1648	break;	1525	break;
1649	}	1526	}
…		…
1651		1528
1652	/* INTPROTO */	1529	/* INTPROTO */
1653	void	1530	void
1654	rxvt_button_press(pR_ XButtonEvent *ev)	1531	rxvt_button_press(pR_ XButtonEvent *ev)
1655	{	1532	{
1656	int reportmode = 0, clickintime;	1533	int reportmode = 0, clickintime;
1657		1534
1658	R->bypass_keystate = ev->state & (R->ModMetaMask | ShiftMask);	1535	R->bypass_keystate = ev->state & (R->ModMetaMask | ShiftMask);
1659	if (!R->bypass_keystate)	1536	if (!R->bypass_keystate)
1660	reportmode = !!(R->PrivateModes & PrivMode_mouse_report);	1537	reportmode = !!(R->PrivateModes & PrivMode_mouse_report);
1661	/*	1538	/*
…		…
1663	*/	1540	*/
1664	if (ev->window == R->TermWin.vt)	1541	if (ev->window == R->TermWin.vt)
1665	{	1542	{
1666	#if RXVT_GRAPHICS	1543	#if RXVT_GRAPHICS
1667	if (ev->subwindow != None)	1544	if (ev->subwindow != None)
1668	rxvt_Gr_ButtonPress(ev->x, ev->y);	1545	rxvt_Gr_ButtonPress (ev->x, ev->y);
1669	else	1546	else
1670	#endif	1547	#endif
1671	{	1548	{
1672	clickintime = ev->time - R->MEvent.time < MULTICLICK_TIME;	1549	clickintime = ev->time - R->MEvent.time < MULTICLICK_TIME;
1673	if (reportmode)	1550	if (reportmode)
…		…
1708	if (ev->button != R->MEvent.button)	1585	if (ev->button != R->MEvent.button)
1709	R->MEvent.clicks = 0;	1586	R->MEvent.clicks = 0;
1710	switch (ev->button)	1587	switch (ev->button)
1711	{	1588	{
1712	case Button1:	1589	case Button1:
		1590	/* allow shift+left click to extend selection */
		1591	if (ev->state & ShiftMask && !(R->PrivateModes & PrivMode_mouse_report))
		1592	{
1713	if (R->MEvent.button == Button1 && clickintime)	1593	if (R->MEvent.button == Button1 && clickintime)
		1594	R->selection_rotate (ev->x, ev->y);
1714	R->MEvent.clicks++;	1595	else
		1596	R->selection_extend (ev->x, ev->y, 1);
		1597	}
1715	else	1598	else
		1599	{
		1600	if (R->MEvent.button == Button1 && clickintime)
		1601	R->MEvent.clicks++;
		1602	else
1716	R->MEvent.clicks = 1;	1603	R->MEvent.clicks = 1;
		1604
1717	rxvt_selection_click(aR_ R->MEvent.clicks, ev->x, ev->y);	1605	R->selection_click (R->MEvent.clicks, ev->x, ev->y);
		1606	}
		1607
1718	R->MEvent.button = Button1;	1608	R->MEvent.button = Button1;
1719	break;	1609	break;
1720		1610
1721	case Button3:	1611	case Button3:
1722	if (R->MEvent.button == Button3 && clickintime)	1612	if (R->MEvent.button == Button3 && clickintime)
1723	rxvt_selection_rotate(aR_ ev->x, ev->y);	1613	R->selection_rotate (ev->x, ev->y);
1724	else	1614	else
1725	rxvt_selection_extend(aR_ ev->x, ev->y, 1);	1615	R->selection_extend (ev->x, ev->y, 1);
1726	R->MEvent.button = Button3;	1616	R->MEvent.button = Button3;
1727	break;	1617	break;
1728	}	1618	}
1729	}	1619	}
1730	R->MEvent.time = ev->time;	1620	R->MEvent.time = ev->time;
…		…
1735	/*	1625	/*
1736	* Scrollbar window processing of button press	1626	* Scrollbar window processing of button press
1737	*/	1627	*/
1738	if (isScrollbarWindow(ev->window))	1628	if (isScrollbarWindow(ev->window))
1739	{	1629	{
1740	scrollbar_setIdle();	1630	R->scrollBar.setIdle ();
1741	/*	1631	/*
1742	* Rxvt-style scrollbar:	1632	* Rxvt-style scrollbar:
1743	* move up if mouse is above slider	1633	* move up if mouse is above slider
1744	* move dn if mouse is below slider	1634	* move dn if mouse is below slider
1745	*	1635	*
…		…
1757	*/	1647	*/
1758	if ((R->scrollBar.style == R_SB_NEXT	1648	if ((R->scrollBar.style == R_SB_NEXT
1759	&& scrollbarnext_upButton(ev->y))	1649	&& scrollbarnext_upButton(ev->y))
1760	|| (R->scrollBar.style == R_SB_RXVT	1650	|| (R->scrollBar.style == R_SB_RXVT
1761	&& scrollbarrxvt_upButton(ev->y)))	1651	&& scrollbarrxvt_upButton(ev->y)))
1762	rxvt_tt_printf(aR_ "\033[A");	1652	R->tt_printf("\033[A");
1763	else if ((R->scrollBar.style == R_SB_NEXT	1653	else if ((R->scrollBar.style == R_SB_NEXT
1764	&& scrollbarnext_dnButton(ev->y))	1654	&& scrollbarnext_dnButton(ev->y))
1765	|| (R->scrollBar.style == R_SB_RXVT	1655	|| (R->scrollBar.style == R_SB_RXVT
1766	&& scrollbarrxvt_dnButton(ev->y)))	1656	&& scrollbarrxvt_dnButton(ev->y)))
1767	rxvt_tt_printf(aR_ "\033[B");	1657	R->tt_printf("\033[B");
1768	else	1658	else
1769	switch (ev->button) {	1659	switch (ev->button) {
1770	case Button2:	1660	case Button2:
1771	rxvt_tt_printf(aR_ "\014");	1661	R->tt_printf("\014");
1772	break;	1662	break;
1773	case Button1:	1663	case Button1:
1774	rxvt_tt_printf(aR_ "\033[6~");	1664	R->tt_printf("\033[6~");
1775	break;	1665	break;
1776	case Button3:	1666	case Button3:
1777	rxvt_tt_printf(aR_ "\033[5~");	1667	R->tt_printf("\033[5~");
1778	break;	1668	break;
1779	}	1669	}
1780	}	1670	}
1781	else	1671	else
1782	#endif /* NO_SCROLLBAR_REPORT */	1672	#endif /* NO_SCROLLBAR_REPORT */
…		…
1798	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	1688	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1799	R->scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY;	1689	R->scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY;
1800	#endif	1690	#endif
1801	if (rxvt_scr_page(aR_ upordown < 0 ? UP : DN, 1)) {	1691	if (rxvt_scr_page(aR_ upordown < 0 ? UP : DN, 1)) {
1802	if (upordown < 0)	1692	if (upordown < 0)
1803	scrollbar_setUp();	1693	R->scrollBar.setUp ();
1804	else	1694	else
1805	scrollbar_setDn();	1695	R->scrollBar.setDn ();
1806	}	1696	}
1807	} else	1697	} else
1808	switch (ev->button) {	1698	switch (ev->button) {
1809	case Button2:	1699	case Button2:
1810	switch (R->scrollbar_align) {	1700	switch (R->scrollbar_align) {
…		…
1822	|| scrollbar_above_slider(ev->y)	1712	|| scrollbar_above_slider(ev->y)
1823	|| scrollbar_below_slider(ev->y))	1713	|| scrollbar_below_slider(ev->y))
1824	rxvt_scr_move_to(aR_	1714	rxvt_scr_move_to(aR_
1825	scrollbar_position(ev->y) - R->csrO,	1715	scrollbar_position(ev->y) - R->csrO,
1826	scrollbar_size());	1716	scrollbar_size());
1827	scrollbar_setMotion();	1717	R->scrollBar.setMotion ();
1828	break;	1718	break;
1829		1719
1830	case Button1:	1720	case Button1:
1831	if (R->scrollbar_align == R_SB_ALIGN_CENTRE)	1721	if (R->scrollbar_align == R_SB_ALIGN_CENTRE)
1832	R->csrO = ev->y - R->scrollBar.top;	1722	R->csrO = ev->y - R->scrollBar.top;
…		…
1845	rxvt_scr_page(aR_ DN, R->TermWin.nrow - 1);	1735	rxvt_scr_page(aR_ DN, R->TermWin.nrow - 1);
1846	# else	1736	# else
1847	rxvt_scr_page(aR_ DN, R->TermWin.nrow / 4);	1737	rxvt_scr_page(aR_ DN, R->TermWin.nrow / 4);
1848	# endif	1738	# endif
1849	else	1739	else
1850	scrollbar_setMotion();	1740	R->scrollBar.setMotion ();
1851	} else {	1741	} else {
1852	rxvt_scr_page(aR_ (ev->button == Button1 ? DN : UP),	1742	rxvt_scr_page(aR_ (ev->button == Button1 ? DN : UP),
1853	(R->TermWin.nrow	1743	(R->TermWin.nrow
1854	* scrollbar_position(ev->y)	1744	* scrollbar_position(ev->y)
1855	/ scrollbar_size()));	1745	/ scrollbar_size()));
…		…
1877	R->csrO = 0; /* reset csr Offset */	1767	R->csrO = 0; /* reset csr Offset */
1878	if (!R->bypass_keystate)	1768	if (!R->bypass_keystate)
1879	reportmode = !!(R->PrivateModes & PrivMode_mouse_report);	1769	reportmode = !!(R->PrivateModes & PrivMode_mouse_report);
1880		1770
1881	if (scrollbar_isUpDn()) {	1771	if (scrollbar_isUpDn()) {
1882	scrollbar_setIdle();	1772	R->scrollBar.setIdle ();
1883	rxvt_scrollbar_show(aR_ 0);	1773	rxvt_scrollbar_show(aR_ 0);
1884	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	1774	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1885	R->refresh_type &= ~SMOOTH_REFRESH;	1775	R->refresh_type &= ~SMOOTH_REFRESH;
1886	#endif	1776	#endif
1887	}	1777	}
…		…
1924	* when overriding mouse reporting	1814	* when overriding mouse reporting
1925	*/	1815	*/
1926	if (R->PrivateModes & PrivMode_mouse_report	1816	if (R->PrivateModes & PrivMode_mouse_report
1927	&& R->bypass_keystate	1817	&& R->bypass_keystate
1928	&& ev->button == Button1 && R->MEvent.clicks <= 1)	1818	&& ev->button == Button1 && R->MEvent.clicks <= 1)
1929	rxvt_selection_extend(aR_ ev->x, ev->y, 0);	1819	R->selection_extend (ev->x, ev->y, 0);
1930		1820
1931	switch (ev->button) {	1821	switch (ev->button) {
1932	case Button1:	1822	case Button1:
1933	case Button3:	1823	case Button3:
1934	rxvt_selection_make(aR_ ev->time);	1824	rxvt_selection_make(aR_ ev->time);
…		…
1938	break;	1828	break;
1939	#ifdef MOUSE_WHEEL	1829	#ifdef MOUSE_WHEEL
1940	case Button4:	1830	case Button4:
1941	case Button5:	1831	case Button5:
1942	{	1832	{
1943	int i, v;	1833	int i;
		1834	page_dirn v;
1944		1835
1945	v = (ev->button == Button4) ? UP : DN;	1836	v = (ev->button == Button4) ? UP : DN;
1946	if (ev->state & ShiftMask)	1837	if (ev->state & ShiftMask)
1947	i = 1;	1838	i = 1;
1948	else if ((R->Options & Opt_mouseWheelScrollPage))	1839	else if ((R->Options & Opt_mouseWheelScrollPage))
…		…
1956	R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;	1847	R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
1957	}	1848	}
1958	# endif	1849	# endif
1959	# ifdef JUMP_MOUSE_WHEEL	1850	# ifdef JUMP_MOUSE_WHEEL
1960	rxvt_scr_page(aR_ v, i);	1851	rxvt_scr_page(aR_ v, i);
1961	rxvt_scr_refresh(aR_ SMOOTH_REFRESH);	1852	R->scr_refresh (SMOOTH_REFRESH);
1962	rxvt_scrollbar_show(aR_ 1);	1853	rxvt_scrollbar_show(aR_ 1);
1963	# else	1854	# else
1964	for (; i--;)	1855	while (i--)
1965	{	1856	{
1966	rxvt_scr_page(aR_ v, 1);	1857	rxvt_scr_page(aR_ v, 1);
1967	rxvt_scr_refresh(aR_ SMOOTH_REFRESH);	1858	R->scr_refresh (SMOOTH_REFRESH);
1968	rxvt_scrollbar_show(aR_ 1);	1859	rxvt_scrollbar_show(aR_ 1);
1969	}	1860	}
1970	# endif	1861	# endif
1971	}	1862	}
1972	break;	1863	break;
…		…
2123	n = 0;	2014	n = 0;
2124	if (pchanged) {	2015	if (pchanged) {
2125	for (; n < (unsigned int)i; n++) {	2016	for (; n < (unsigned int)i; n++) {
2126	XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[n], &wattr);	2017	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"));	2018	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) {	2019	if (wattr.depth != rootdepth || wattr.c_class == InputOnly) {
2129	n = (int)(sizeof(R->TermWin.parent) / sizeof(Window)) + 1;	2020	n = (int)(sizeof(R->TermWin.parent) / sizeof(Window)) + 1;
2130	break;	2021	break;
2131	}	2022	}
2132	}	2023	}
2133	}	2024	}
…		…
2183	return stream;	2074	return stream;
2184	}	2075	}
2185		2076
2186	/* EXTPROTO */	2077	/* EXTPROTO */
2187	int	2078	int
2188	rxvt_pclose_printer(FILE *stream)	2079	rxvt_pclose_printer (FILE *stream)
2189	{	2080	{
2190	fflush(stream);	2081	fflush (stream);
2191	/* pclose() reported not to work on SunOS 4.1.3 */	2082	/* pclose() reported not to work on SunOS 4.1.3 */
2192	# if defined (__sun__) /* TODO: RESOLVE THIS */	2083	# if defined (__sun__) /* TODO: RESOLVE THIS */
2193	/* pclose works provided SIGCHLD handler uses waitpid */	2084	/* pclose works provided SIGCHLD handler uses waitpid */
2194	return pclose(stream); /* return fclose (stream); */	2085	return pclose (stream); /* return fclose (stream); */
2195	# else	2086	# else
2196	return pclose(stream);	2087	return pclose (stream);
2197	# endif	2088	# endif
2198	}	2089	}
2199		2090
2200	/*	2091	/*
2201	* simulate attached vt100 printer	2092	* simulate attached vt100 printer
…		…
2264	rxvt_process_nonprinting(pR_ unsigned char ch)	2155	rxvt_process_nonprinting(pR_ unsigned char ch)
2265	{	2156	{
2266	switch (ch) {	2157	switch (ch) {
2267	case C0_ENQ: /* terminal Status */	2158	case C0_ENQ: /* terminal Status */
2268	if (R->rs[Rs_answerbackstring])	2159	if (R->rs[Rs_answerbackstring])
2269	rxvt_tt_write(aR_	2160	R->tt_write(
2270	(const unsigned char *)R->rs[Rs_answerbackstring],	2161	(const unsigned char *)R->rs[Rs_answerbackstring],
2271	(unsigned int)STRLEN(R->rs[Rs_answerbackstring]));	2162	(unsigned int)STRLEN(R->rs[Rs_answerbackstring]));
2272	else	2163	else
2273	rxvt_tt_write(aR_ (unsigned char *)VT100_ANS,	2164	R->tt_write((unsigned char *)VT100_ANS,
2274	(unsigned int)STRLEN(VT100_ANS));	2165	(unsigned int)STRLEN(VT100_ANS));
2275	break;	2166	break;
2276	case C0_BEL: /* bell */	2167	case C0_BEL: /* bell */
2277	rxvt_scr_bell(aR);	2168	rxvt_scr_bell(aR);
2278	break;	2169	break;
…		…
2326	break;	2217	break;
2327	case 'I': /* cursor up and scroll down if needed */	2218	case 'I': /* cursor up and scroll down if needed */
2328	rxvt_scr_index(aR_ DN);	2219	rxvt_scr_index(aR_ DN);
2329	break;	2220	break;
2330	case 'J': /* erase to end of screen */	2221	case 'J': /* erase to end of screen */
2331	rxvt_scr_erase_screen(aR_ 0);	2222	R->scr_erase_screen (0);
2332	break;	2223	break;
2333	case 'K': /* erase to end of line */	2224	case 'K': /* erase to end of line */
2334	rxvt_scr_erase_line(aR_ 0);	2225	rxvt_scr_erase_line(aR_ 0);
2335	break;	2226	break;
2336	case 'Y': /* move to specified row and col */	2227	case 'Y': /* move to specified row and col */
…		…
2341	row = rxvt_cmd_getc(aR) - ' ';	2232	row = rxvt_cmd_getc(aR) - ' ';
2342	col = rxvt_cmd_getc(aR) - ' ';	2233	col = rxvt_cmd_getc(aR) - ' ';
2343	rxvt_scr_gotorc(aR_ row, col, 0);	2234	rxvt_scr_gotorc(aR_ row, col, 0);
2344	break;	2235	break;
2345	case 'Z': /* identify the terminal type */	2236	case 'Z': /* identify the terminal type */
2346	rxvt_tt_printf(aR_ "\033/Z"); /* I am a VT100 emulating a VT52 */	2237	R->tt_printf("\033/Z"); /* I am a VT100 emulating a VT52 */
2347	break;	2238	break;
2348	case '<': /* turn off VT52 mode */	2239	case '<': /* turn off VT52 mode */
2349	PrivMode(0, PrivMode_vt52);	2240	PrivMode(0, PrivMode_vt52);
2350	break;	2241	break;
2351	case 'F': /* use special graphics character set */	2242	case 'F': /* use special graphics character set */
…		…
2458	rxvt_process_dcs_seq(aR);	2349	rxvt_process_dcs_seq(aR);
2459	break;	2350	break;
2460		2351
2461	/* 8.3.110: SINGLE CHARACTER INTRODUCER */	2352	/* 8.3.110: SINGLE CHARACTER INTRODUCER */
2462	case C1_SCI: /* ESC Z */	2353	case C1_SCI: /* ESC Z */
2463	rxvt_tt_write(aR_ (const unsigned char *)ESCZ_ANSWER,	2354	R->tt_write((const unsigned char *)ESCZ_ANSWER,
2464	(unsigned int)(sizeof(ESCZ_ANSWER) - 1));	2355	(unsigned int)(sizeof(ESCZ_ANSWER) - 1));
2465	break; /* steal obsolete ESC [ c */	2356	break; /* steal obsolete ESC [ c */
2466		2357
2467	/* 8.3.16: CONTROL SEQUENCE INTRODUCER */	2358	/* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2468	case C1_CSI: /* ESC [ */	2359	case C1_CSI: /* ESC [ */
…		…
2589	*/	2480	*/
2590	if (priv) {	2481	if (priv) {
2591	switch (priv) {	2482	switch (priv) {
2592	case '>':	2483	case '>':
2593	if (ch == CSI_DA) /* secondary device attributes */	2484	if (ch == CSI_DA) /* secondary device attributes */
2594	rxvt_tt_printf(aR_ "\033[>%d;%-.8s;0c", 'R', VSTRING);	2485	R->tt_printf("\033[>%d;%-.8s;0c", 'R', VSTRING);
2595	break;	2486	break;
2596	case '?':	2487	case '?':
2597	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')	2488	if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2598	rxvt_process_terminal_mode(aR_ ch, priv, nargs, arg);	2489	rxvt_process_terminal_mode(aR_ ch, priv, nargs, arg);
2599	break;	2490	break;
…		…
2671	case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */	2562	case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */
2672	rxvt_scr_tab(aR_ arg[0]);	2563	rxvt_scr_tab(aR_ arg[0]);
2673	break;	2564	break;
2674		2565
2675	case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */	2566	case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */
2676	rxvt_scr_erase_screen(aR_ arg[0]);	2567	R->scr_erase_screen (arg[0]);
2677	break;	2568	break;
2678		2569
2679	case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */	2570	case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */
2680	rxvt_scr_erase_line(aR_ arg[0]);	2571	rxvt_scr_erase_line(aR_ arg[0]);
2681	break;	2572	break;
…		…
2702		2593
2703	case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */	2594	case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2704	arg[0] = -arg[0];	2595	arg[0] = -arg[0];
2705	/* FALLTHROUGH */	2596	/* FALLTHROUGH */
2706	case CSI_SU: /* 8.3.148: (1) SCROLL UP */	2597	case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2707	rxvt_scroll_text(aR_ R->screen.tscroll, R->screen.bscroll, arg[0], 0);	2598	R->scr_scroll_text (R->screen.tscroll, R->screen.bscroll, arg[0], 0);
2708	break;	2599	break;
2709		2600
2710	case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */	2601	case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2711	rxvt_tt_write(aR_ (const unsigned char *)VT100_ANS,	2602	R->tt_write((const unsigned char *)VT100_ANS,
2712	(unsigned int)(sizeof(VT100_ANS) - 1));	2603	(unsigned int)(sizeof(VT100_ANS) - 1));
2713	break;	2604	break;
2714		2605
2715	case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */	2606	case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2716	rxvt_process_sgr_mode(aR_ nargs, arg);	2607	rxvt_process_sgr_mode(aR_ nargs, arg);
2717	break;	2608	break;
2718		2609
2719	case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */	2610	case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */
2720	switch (arg[0]) {	2611	switch (arg[0]) {
2721	case 5: /* DSR requested */	2612	case 5: /* DSR requested */
2722	rxvt_tt_printf(aR_ "\033[0n");	2613	R->tt_printf("\033[0n");
2723	break;	2614	break;
2724	case 6: /* CPR requested */	2615	case 6: /* CPR requested */
2725	rxvt_scr_report_position(aR);	2616	rxvt_scr_report_position(aR);
2726	break;	2617	break;
2727	#if defined (ENABLE_DISPLAY_ANSWER)	2618	#if defined (ENABLE_DISPLAY_ANSWER)
2728	case 7: /* unofficial extension */	2619	case 7: /* unofficial extension */
2729	rxvt_tt_printf(aR_ "%-.250s\n", R->rs[Rs_display_name]);	2620	R->tt_printf("%-.250s\n", R->rs[Rs_display_name]);
2730	break;	2621	break;
2731	#endif	2622	#endif
2732	case 8: /* unofficial extension */	2623	case 8: /* unofficial extension */
2733	rxvt_xterm_seq(aR_ XTerm_title, APL_NAME "-" VERSION, CHAR_ST);	2624	rxvt_xterm_seq(aR_ XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
2734	break;	2625	break;
…		…
2803	break;	2694	break;
2804	#endif	2695	#endif
2805		2696
2806	case CSI_78: /* DECREQTPARM */	2697	case CSI_78: /* DECREQTPARM */
2807	if (arg[0] == 0 || arg[0] == 1)	2698	if (arg[0] == 0 || arg[0] == 1)
2808	rxvt_tt_printf(aR_ "\033[%d;1;1;112;112;1;0x", arg[0] + 2);	2699	R->tt_printf("\033[%d;1;1;112;112;1;0x", arg[0] + 2);
2809	/* FALLTHROUGH */	2700	/* FALLTHROUGH */
2810		2701
2811	default:	2702	default:
2812	break;	2703	break;
2813	}	2704	}
…		…
2851	break;	2742	break;
2852	case 6: /* lower window */	2743	case 6: /* lower window */
2853	XLowerWindow(R->Xdisplay, R->TermWin.parent[0]);	2744	XLowerWindow(R->Xdisplay, R->TermWin.parent[0]);
2854	break;	2745	break;
2855	case 7: /* refresh window */	2746	case 7: /* refresh window */
2856	rxvt_scr_touch(aR_ True);	2747	R->scr_touch (true);
2857	break;	2748	break;
2858	case 8: /* set size (chars) */	2749	case 8: /* set size (chars) */
2859	rxvt_set_widthheight(aR_ (unsigned int)(args[2] * R->TermWin.fwidth),	2750	rxvt_set_widthheight(aR_ (unsigned int)(args[2] * R->TermWin.fwidth),
2860	(unsigned int)(args[1] * R->TermWin.fheight));	2751	(unsigned int)(args[1] * R->TermWin.fheight));
2861	break;	2752	break;
…		…
2867	/*	2758	/*
2868	* reports - some output format copied from XTerm	2759	* reports - some output format copied from XTerm
2869	*/	2760	*/
2870	case 11: /* report window state */	2761	case 11: /* report window state */
2871	XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);	2762	XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);
2872	rxvt_tt_printf(aR_ "\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	2763	R->tt_printf("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2873	break;	2764	break;
2874	case 13: /* report window position */	2765	case 13: /* report window position */
2875	XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);	2766	XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);
2876	XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], wattr.root,	2767	XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], wattr.root,
2877	-wattr.border_width, -wattr.border_width,	2768	-wattr.border_width, -wattr.border_width,
2878	&x, &y, &wdummy);	2769	&x, &y, &wdummy);
2879	rxvt_tt_printf(aR_ "\033[3;%d;%dt", x, y);	2770	R->tt_printf("\033[3;%d;%dt", x, y);
2880	break;	2771	break;
2881	case 14: /* report window size (pixels) */	2772	case 14: /* report window size (pixels) */
2882	XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);	2773	XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr);
2883	rxvt_tt_printf(aR_ "\033[4;%d;%dt", wattr.height, wattr.width);	2774	R->tt_printf("\033[4;%d;%dt", wattr.height, wattr.width);
2884	break;	2775	break;
2885	case 18: /* report window size (chars) */	2776	case 18: /* report window size (chars) */
2886	rxvt_tt_printf(aR_ "\033[8;%d;%dt", R->TermWin.nrow, R->TermWin.ncol);	2777	R->tt_printf("\033[8;%d;%dt", R->TermWin.nrow, R->TermWin.ncol);
2887	break;	2778	break;
2888	#if 0 /* XXX: currently disabled due to security concerns */	2779	#if 0 /* XXX: currently disabled due to security concerns */
2889	case 20: /* report icon label */	2780	case 20: /* report icon label */
2890	XGetIconName(R->Xdisplay, R->TermWin.parent[0], &s);	2781	XGetIconName(R->Xdisplay, R->TermWin.parent[0], &s);
2891	rxvt_tt_printf(aR_ "\033]L%-.200s\234", s ? s : ""); /* 8bit ST */	2782	R->tt_printf("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */
2892	break;	2783	break;
2893	case 21: /* report window title */	2784	case 21: /* report window title */
2894	XFetchName(R->Xdisplay, R->TermWin.parent[0], &s);	2785	XFetchName(R->Xdisplay, R->TermWin.parent[0], &s);
2895	rxvt_tt_printf(aR_ "\033]l%-.200s\234", s ? s : ""); /* 8bit ST */	2786	R->tt_printf("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */
2896	break;	2787	break;
2897	#endif	2788	#endif
2898	}	2789	}
2899	}	2790	}
2900	#endif	2791	#endif
…		…
3072	if (*str != ';') {	2963	if (*str != ';') {
3073	#if XPM_BACKGROUND	2964	#if XPM_BACKGROUND
3074	rxvt_scale_pixmap(aR_ ""); /* reset to default scaling */	2965	rxvt_scale_pixmap(aR_ ""); /* reset to default scaling */
3075	rxvt_set_bgPixmap(aR_ str); /* change pixmap */	2966	rxvt_set_bgPixmap(aR_ str); /* change pixmap */
3076	#endif	2967	#endif
3077	rxvt_scr_touch(aR_ True);	2968	R->scr_touch (true);
3078	}	2969	}
3079	while ((str = STRCHR(str, ';')) != NULL) {	2970	while ((str = STRCHR(str, ';')) != NULL) {
3080	str++;	2971	str++;
3081	#if XPM_BACKGROUND	2972	#if XPM_BACKGROUND
3082	changed += rxvt_scale_pixmap(aR_ str);	2973	changed += rxvt_scale_pixmap(aR_ str);
…		…
3084	}	2975	}
3085	if (changed) {	2976	if (changed) {
3086	#ifdef XPM_BACKGROUND	2977	#ifdef XPM_BACKGROUND
3087	rxvt_resize_pixmap(aR);	2978	rxvt_resize_pixmap(aR);
3088	#endif	2979	#endif
3089	rxvt_scr_touch(aR_ True);	2980	R->scr_touch (true);
3090	}	2981	}
3091	break;	2982	break;
3092		2983
3093	case XTerm_restoreFG:	2984	case XTerm_restoreFG:
3094	rxvt_set_window_color(aR_ Color_fg, str);	2985	rxvt_set_window_color(aR_ Color_fg, str);
…		…
3260	break;	3151	break;
3261	#endif	3152	#endif
3262	#ifdef scrollBar_esc	3153	#ifdef scrollBar_esc
3263	case scrollBar_esc:	3154	case scrollBar_esc:
3264	if (rxvt_scrollbar_mapping(aR_ state)) {	3155	if (rxvt_scrollbar_mapping(aR_ state)) {
3265	rxvt_resize_all_windows(aR_ 0, 0, 0);	3156	R->resize_all_windows (0, 0, 0);
3266	rxvt_scr_touch(aR_ True);	3157	R->scr_touch (true);
3267	}	3158	}
3268	break;	3159	break;
3269	#endif	3160	#endif
3270	case 25: /* visible/invisible cursor */	3161	case 25: /* visible/invisible cursor */
3271	rxvt_scr_cursor_visible(aR_ state);	3162	rxvt_scr_cursor_visible(aR_ state);
…		…
3297	else	3188	else
3298	R->Options &= ~Opt_scrollTtyKeypress;	3189	R->Options &= ~Opt_scrollTtyKeypress;
3299	break;	3190	break;
3300	case 1047: /* secondary screen w/ clearing */	3191	case 1047: /* secondary screen w/ clearing */
3301	if (R->current_screen != PRIMARY)	3192	if (R->current_screen != PRIMARY)
3302	rxvt_scr_erase_screen(aR_ 2);	3193	R->scr_erase_screen (2);
3303	rxvt_scr_change_screen(aR_ state);	3194	rxvt_scr_change_screen(aR_ state);
3304	/* FALLTHROUGH */	3195	/* FALLTHROUGH */
3305	default:	3196	default:
3306	break;	3197	break;
3307	}	3198	}
…		…
3443	{	3334	{
3444	unsigned char ch, cmd = rxvt_cmd_getc(aR);	3335	unsigned char ch, cmd = rxvt_cmd_getc(aR);
3445		3336
3446	#ifndef RXVT_GRAPHICS	3337	#ifndef RXVT_GRAPHICS
3447	if (cmd == 'Q') { /* query graphics */	3338	if (cmd == 'Q') { /* query graphics */
3448	rxvt_tt_printf(aR_ "\033G0\n"); /* no graphics */	3339	R->tt_printf("\033G0\n"); /* no graphics */
3449	return;	3340	return;
3450	}	3341	}
3451	/* swallow other graphics sequences until terminating ':' */	3342	/* swallow other graphics sequences until terminating ':' */
3452	do	3343	do
3453	ch = rxvt_cmd_getc(aR);	3344	ch = rxvt_cmd_getc(aR);
…		…
3456	unsigned int nargs;	3347	unsigned int nargs;
3457	int args[NGRX_PTS];	3348	int args[NGRX_PTS];
3458	unsigned char *text = NULL;	3349	unsigned char *text = NULL;
3459		3350
3460	if (cmd == 'Q') { /* query graphics */	3351	if (cmd == 'Q') { /* query graphics */
3461	rxvt_tt_printf(aR_ "\033G1\n"); /* yes, graphics (color) */	3352	R->tt_printf("\033G1\n"); /* yes, graphics (color) */
3462	return;	3353	return;
3463	}	3354	}
3464	for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;) {	3355	for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;) {
3465	int neg;	3356	int neg;
3466		3357
…		…
3481	}	3372	}
3482		3373
3483	if ((cmd == 'T') && (nargs >= 5)) {	3374	if ((cmd == 'T') && (nargs >= 5)) {
3484	int i, len = args[4];	3375	int i, len = args[4];
3485		3376
3486	text = rxvt_malloc((len + 1) * sizeof(char));	3377	text = (unsigned char *)rxvt_malloc((len + 1) * sizeof(char));
3487		3378
3488	if (text != NULL) {	3379	if (text != NULL) {
3489	for (i = 0; i < len; i++)	3380	for (i = 0; i < len; i++)
3490	text[i] = rxvt_cmd_getc(aR);	3381	text[i] = rxvt_cmd_getc(aR);
3491	text[len] = '\0';	3382	text[len] = '\0';
…		…
3500		3391
3501	/*	3392	/*
3502	* Send printf() formatted output to the command.	3393	* Send printf() formatted output to the command.
3503	* Only use for small amounts of data.	3394	* Only use for small amounts of data.
3504	*/	3395	*/
3505	/* EXTPROTO */
3506	void	3396	void
3507	rxvt_tt_printf(pR_ const char *fmt,...)	3397	rxvt_term::tt_printf (const char *fmt,...)
3508	{	3398	{
3509	va_list arg_ptr;	3399	va_list arg_ptr;
3510	unsigned char buf[256];	3400	unsigned char buf[256];
3511		3401
3512	va_start(arg_ptr, fmt);	3402	va_start (arg_ptr, fmt);
3513	vsprintf((char *)buf, fmt, arg_ptr);	3403	vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3514	va_end(arg_ptr);	3404	va_end (arg_ptr);
3515	rxvt_tt_write(aR_ buf, (unsigned int)STRLEN(buf));	3405	tt_write (buf, STRLEN (buf));
3516	}	3406	}
3517		3407
3518	/* ---------------------------------------------------------------------- */	3408	/* ---------------------------------------------------------------------- */
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,	3409	/* 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.	3410	* or generated by us in response to a query ESC sequence.
3524	*/	3411	*/
3525	/* EXTPROTO */
3526	void	3412	void
3527	rxvt_tt_write(pR_ const unsigned char *d, unsigned int len)	3413	rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3528	{	3414	{
3529	#define MAX_PTY_WRITE 256 /* POSIX minimum MAX_INPUT */	3415	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		3416
3537	if (R->v_bufstr == NULL && len > 0) {	3417	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	}	3418	{
		3419	if (v_buflen == 0)
		3420	{
		3421	int written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
		3422	if (written == len)
		3423	return;
3547		3424
3548	/*	3425	data += written;
3549	* Append to the block we already have. Always doing this simplifies the	3426	len -= written;
3550	* code, and isn't too bad, either. If this is a short block, it isn't	3427	}
3551	* too expensive, and if this is a long block, we won't be able to write	3428
3552	* it all anyway.	3429
3553	*/	3430	v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3554	if (len > 0) {	3431
3555	if (v_bufend < v_bufptr + len) { /* run out of room */	3432	memcpy (v_buffer + v_buflen, data, len);
3556	if (v_bufstr != v_buffer) {	3433	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	}	3434	}
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		3435
3569	reallocto = ((size + len) / MAX_PTY_WRITE + 1) * MAX_PTY_WRITE;	3436	for (;;)
3570	v_buffer = (unsigned char *)realloc(v_buffer, reallocto);	3437	{
3571	/* save across realloc */	3438	int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3572	if (v_buffer) {	3439
3573	v_bufstr = v_buffer;	3440	if (written > 0)
3574	v_bufptr = v_buffer + size;	3441	{
3575	v_bufend = v_buffer + reallocto;	3442	v_buflen -= written;
3576	} else { /* no memory: ignore entire write request */	3443
3577	rxvt_print_error("data loss: cannot allocate buffer space");	3444	if (v_buflen == 0)
3578	v_buffer = v_bufstr; /* restore clobbered pointer */	3445	{
3579	}	3446	free (v_buffer);
		3447	v_buffer = 0;
		3448	v_buflen = 0;
		3449
		3450	pty_ev.set (EVENT_READ);
		3451	return;
		3452	}
		3453
		3454	memmove (v_buffer, v_buffer + written, v_buflen);
		3455	}
		3456	else if (written != -1 || (errno != EAGAIN && errno != EINTR))
		3457	// original code just ignores this...
		3458	destroy ();
		3459	else
		3460	{
		3461	pty_ev.set (EVENT_READ | EVENT_WRITE);
		3462	return;
		3463	}
3580	}	3464	}
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	}	3465	}
		3466
3634	/*----------------------- end-of-file (C source) -----------------------*/	3467	/*----------------------- end-of-file (C source) -----------------------*/
3635		3468

Diff Legend

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