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

Diff Legend

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