[ViewVC] Diff of: cvs/rxvt-unicode/src/command.C

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.11 by pcg, Tue Dec 2 21:49:46 2003 UTC vs.
Revision 1.33 by pcg, Fri Jan 30 18:12:17 2004 UTC

…		…
1	/---------------------------------C----------------------------------	1	/---------------------------------C----------------------------------
2	* File: command.c	2	* File: command.c
3	----------------------------------------------------------------------	3	----------------------------------------------------------------------
4	* $Id: command.C,v 1.11 2003/12/02 21:49:46 pcg Exp $	4	* $Id: command.C,v 1.33 2004/01/30 18:12:17 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	R->tt_write(&ch, 1);	259	R->tt_write (&ch, 1);
243	R->tt_write(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)
…		…
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	R->tt_write(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() /
…		…
662	{	679	{
663	#ifdef TRANSPARENT	680	#ifdef TRANSPARENT
664	if (want_full_refresh)	681	if (want_full_refresh)
665	{	682	{
666	want_full_refresh = 0;	683	want_full_refresh = 0;
667	rxvt_scr_clear (this);	684	scr_clear ();
668	rxvt_scr_touch (this, False);	685	scr_touch (false);
669	want_refresh = 1;	686	want_refresh = 1;
670	}	687	}
671	#endif	688	#endif
672		689
673	if (want_refresh)	690	if (want_refresh)
674	{	691	{
675	rxvt_scr_refresh (this, refresh_type);	692	scr_refresh (refresh_type);
676	rxvt_scrollbar_show (this, 1);	693	rxvt_scrollbar_show (this, 1);
677	#ifdef USE_XIM	694	#ifdef USE_XIM
678	rxvt_IMSendSpot (this);	695	rxvt_IMSendSpot (this);
679	#endif	696	#endif
680	}	697	}
681		698
682	XFlush (Xdisplay);	699	XFlush (Xdisplay);
683	#if 0
684	if (XPending (Xdisplay)) process_x_events ();
685	if (XPending (Xdisplay)) process_x_events ();
686	#endif
687	}	700	}
688		701
689	void	702	void
690	rxvt_term::check_cb (check_watcher &w)	703	rxvt_term::check_cb (check_watcher &w)
691	{	704	{
692	SET_R (this);	705	SET_R (this);
		706	SET_LOCALE (locale);
693		707
694	flush ();	708	flush ();
695	}	709	}
696		710
697	void	711	void
…		…
702	XEvent xev;	716	XEvent xev;
703		717
704	XNextEvent (Xdisplay, &xev);	718	XNextEvent (Xdisplay, &xev);
705		719
706	#if defined(CURSOR_BLINK)	720	#if defined(CURSOR_BLINK)
707	if ((Options & Opt_cursorBlink)	721	if ((Options & Opt_cursorBlink) && xev.type == KeyPress)
708	&& xev.type == KeyPress)
709	{	722	{
710	if (hidden_cursor)	723	if (hidden_cursor)
711	{	724	{
712	hidden_cursor = 0;	725	hidden_cursor = 0;
713	want_refresh = 1;	726	want_refresh = 1;
714	}	727	}
715		728
716	blink_ev.start (NOW + BLINK_INTERVAL);	729	cursor_blink_ev.start (NOW + BLINK_INTERVAL);
717	}	730	}
718	#endif	731	#endif
719		732
720	#if defined(POINTER_BLANK)	733	#if defined(POINTER_BLANK)
721	if ((Options & Opt_pointerBlank)	734	if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0)
722	&& (pointerBlankDelay > 0))
723	{	735	{
724	if (xev.type == MotionNotify	736	if (xev.type == MotionNotify
725	\|\| xev.type == ButtonPress	737	\|\| xev.type == ButtonPress
726	\|\| xev.type == ButtonRelease)	738	\|\| xev.type == ButtonRelease)
727	if (hidden_pointer)	739	if (hidden_pointer)
…		…
738	rxvt_process_x_event (this, &xev);	750	rxvt_process_x_event (this, &xev);
739	}	751	}
740	while (XPending (Xdisplay));	752	while (XPending (Xdisplay));
741	}	753	}
742		754
		755	#ifdef CURSOR_BLINK
743	void	756	void
744	rxvt_term::blink_cb (time_watcher &w)	757	rxvt_term::cursor_blink_cb (time_watcher &w)
745	{	758	{
746	SET_R (this);
747
748	w.at += BLINK_INTERVAL;
749	hidden_cursor = !hidden_cursor;	759	hidden_cursor = !hidden_cursor;
750	want_refresh = 1;	760	want_refresh = 1;
		761
		762	w.start (w.at + BLINK_INTERVAL);
751	}	763	}
		764	#endif
		765
		766	#ifdef TEXT_BLINK
		767	void
		768	rxvt_term::text_blink_cb (time_watcher &w)
		769	{
		770	if (scr_refresh_rend (RS_Blink, RS_Blink))
		771	{
		772	hidden_text = !hidden_text;
		773	want_refresh = 1;
		774	w.start (w.at + TEXT_BLINK_INTERVAL);
		775	}
		776	}
		777	#endif
752		778
753	void	779	void
754	rxvt_term::x_cb (io_watcher &w, short revents)	780	rxvt_term::x_cb (io_watcher &w, short revents)
755	{	781	{
756	SET_R (this);	782	SET_R (this);
		783	SET_LOCALE (locale);
757		784
758	process_x_events ();	785	process_x_events ();
759	}	786	}
760		787
761	bool	788	bool
…		…
772	if (n > 0)	799	if (n > 0)
773	{	800	{
774	cmdbuf_endp += n;	801	cmdbuf_endp += n;
775	return true;	802	return true;
776	}	803	}
777	else if (n < 0 && errno == EAGAIN)	804	else if (n < 0 && errno != EAGAIN)
		805	destroy ();
		806
778	return false;	807	return false;
779
780	destroy ();
781	}	808	}
782		809
783	void	810	void
784	rxvt_term::pty_cb (io_watcher &w, short revents)	811	rxvt_term::pty_cb (io_watcher &w, short revents)
785	{	812	{
786	SET_R (this);	813	SET_R (this);
		814	SET_LOCALE (locale);
787		815
788	if (revents & EVENT_WRITE)	816	if (revents & EVENT_WRITE)
789	tt_write (0, 0);	817	tt_write (0, 0);
790	else if (revents & EVENT_READ)	818	else if (revents & EVENT_READ)
		819	{
		820	bool flag = true;
		821
791	// loop, but don't allow a single term to monopolize us	822	// loop, but don't allow a single term to monopolize us
792	// the number of loops is fully arbitrary, and thus wrong	823	// the number of loops is fully arbitrary, and thus wrong
793	for (int i = 1; i-- && pty_fill (); )	824	while (flag && pty_fill ())
794	{	825	{
795	if (!seen_input)	826	if (!seen_input)
796	{	827	{
797	seen_input = 1;	828	seen_input = 1;
798	/* once we know the shell is running, send the screen size. Again! */	829	/* once we know the shell is running, send the screen size. Again! */
799	tt_winch ();	830	tt_winch ();
800	}	831	}
801		832
802	uint32_t ch = NOCHAR;	833	uint32_t ch = NOCHAR;
803		834
804	for (;;)	835	for (;;)
805	{	836	{
806	if (ch == NOCHAR)	837	if (ch == NOCHAR)
807	ch = next_char ();	838	ch = next_char ();
808		839
809	if (ch == NOCHAR) // TODO: improve	840	if (ch == NOCHAR) // TODO: improve
810	break;	841	break;
811		842
812	if (ch >= ' ' \|\| ch == '\t' \|\| ch == '\n' \|\| ch == '\r')	843	if (ch >= ' ' \|\| ch == '\t' \|\| ch == '\n' \|\| ch == '\r')
813	{	844	{
814	/* Read a text string from the input buffer */	845	/* Read a text string from the input buffer */
815	uint32_t buf[BUFSIZ];	846	uint32_t buf[BUFSIZ];
816	bool refreshnow = false;	847	bool refreshnow = false;
817	int nlines = 0;	848	int nlines = 0;
818	uint32_t *str = buf;	849	uint32_t *str = buf;
819		850
820	*str++ = ch;	851	*str++ = ch;
821		852
822	for (;;)	853	for (;;)
823	{	854	{
824	ch = next_char ();	855	ch = next_char ();
825		856
826	if (ch == NOCHAR \|\| (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))	857	if (ch == NOCHAR \|\| (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
827	break;	858	break;
828	else	859	else
829	{	860	{
830	*str++ = ch;	861	*str++ = ch;
831		862
832	if (ch == '\n')	863	if (ch == '\n')
833	{	864	{
834	nlines++;	865	nlines++;
835	refresh_count++;	866	refresh_count++;
836		867
837	if (!(Options & Opt_jumpScroll)	868	if (!(Options & Opt_jumpScroll)
838	\|\| (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))	869	\|\| (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
839	{	870	{
840	refreshnow = true;	871	refreshnow = true;
		872	flag = false;
841	ch = NOCHAR;	873	ch = NOCHAR;
842	break;	874	break;
843	}	875	}
844	}	876	}
845		877
846	if (str >= buf + BUFSIZ)	878	if (str >= buf + BUFSIZ)
847	{	879	{
848	ch = NOCHAR;	880	ch = NOCHAR;
849	break;	881	break;
850	}	882	}
851	}	883	}
852	}	884	}
853		885
854	rxvt_scr_add_lines (this, buf, nlines, str - buf);	886	rxvt_scr_add_lines (this, buf, nlines, str - buf);
855		887
856	/*	888	/*
857	* If there have been a lot of new lines, then update the screen	889	* If there have been a lot of new lines, then update the screen
858	* What the heck I'll cheat and only refresh less than every page-full.	890	* What the heck I'll cheat and only refresh less than every page-full.
859	* the number of pages between refreshes is refresh_limit, which	891	* the number of pages between refreshes is refresh_limit, which
860	* is incremented here because we must be doing flat-out scrolling.	892	* is incremented here because we must be doing flat-out scrolling.
861	*	893	*
862	* refreshing should be correct for small scrolls, because of the	894	* refreshing should be correct for small scrolls, because of the
863	* time-out	895	* time-out
864	*/	896	*/
865	if (refreshnow)	897	if (refreshnow)
866	{	898	{
867	if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)	899	if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
868	refresh_limit++;	900	refresh_limit++;
869		901
870	rxvt_scr_refresh (this, refresh_type);	902	scr_refresh (refresh_type);
871	}	903	}
872		904
873	}	905	}
874	else	906	else
875	{	907	{
876	switch (ch)	908	switch (ch)
877	{	909	{
878	default:	910	default:
879	rxvt_process_nonprinting (this, ch);	911	rxvt_process_nonprinting (this, ch);
880	break;	912	break;
881	case C0_ESC: /* escape char */	913	case C0_ESC: /* escape char */
882	rxvt_process_escape_seq (this);	914	rxvt_process_escape_seq (this);
883	break;	915	break;
884	/case 0x9b: / /* CSI */	916	/case 0x9b: / /* CSI */
885	/* rxvt_process_csi_seq (this); */	917	/* rxvt_process_csi_seq (this); */
886	}	918	}
887		919
888	ch = NOCHAR;	920	ch = NOCHAR;
889	}	921	}
890	}	922	}
891	}	923	}
		924	}
892	}	925	}
893		926
894	// read the next character, currently handles UTF-8	927	// read the next character, currently handles UTF-8
895	// will probably handle all sorts of other stuff in the future	928	// will probably handle all sorts of other stuff in the future
896	uint32_t	929	uint32_t
897	rxvt_term::next_char ()	930	rxvt_term::next_char ()
898	{	931	{
899	struct mbstate &s = mbstate;
900
901	while (cmdbuf_ptr < cmdbuf_endp)	932	while (cmdbuf_ptr < cmdbuf_endp)
902	{	933	{
903	uint8_t ch = *cmdbuf_ptr;	934	if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh
904
905	if (s.cnt)
906	{
907	if ((ch & 0xc0) == 0x80)
908	{
909	cmdbuf_ptr++;
910
911	/* continuation */
912	s.reg = (s.reg << 6) \| (ch & 0x7f);
913
914	if (--s.cnt == 0 && s.reg >= 128) /* if !inrange then corruption or Racking */
915	return s.reg;
916
917	continue;
918	}
919	else
920	{
921	s.cnt = 0;
922	return s.orig; /* the _occasional_ non-utf-8 character may slip through... */
923	}
924	}
925
926	if ((ch & 0xc0) == 0xc0)
927	{
928	cmdbuf_ptr++;	935	return *cmdbuf_ptr++;
929		936
930	/* first byte */	937	wchar_t wc;
931	s.orig = ch; /* for broken encodings */	938	int len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, &mbstate.mbs);
932	s.reg = ch;	939
933	if ((ch & 0xe0) == 0xc0) { s.reg &= 0x1f; s.cnt = 1; }	940	if (len == (size_t)-2)
934	if ((ch & 0xf0) == 0xe0) { s.reg &= 0x0f; s.cnt = 2; }	941	return NOCHAR;
935	if ((ch & 0xf8) == 0xf0) { s.reg &= 0x07; s.cnt = 3; }	942
936	if ((ch & 0xfc) == 0xf8) { s.reg &= 0x03; s.cnt = 4; }	943	if (len == (size_t)-1)
937	if ((ch & 0xfe) == 0xfc) { s.reg &= 0x01; s.cnt = 5; }	944	return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
938	}	945
939	else	946	// assume wchar == unicode
940	{	947	cmdbuf_ptr += len;
941	cmdbuf_ptr++; /* _occasional_ non-utf8 may slip through... */
942	return ch;	948	return wc;
943	}
944	}	949	}
945		950
946	return NOCHAR;	951	return NOCHAR;
947	}	952	}
948		953
…		…
1000	if (R->pending_scroll_selection) {	1005	if (R->pending_scroll_selection) {
1001	quick_timeout = 1;	1006	quick_timeout = 1;
1002	if (!R->scroll_selection_delay--	1007	if (!R->scroll_selection_delay--
1003	&& rxvt_scr_page(aR_ R->scroll_selection_dir,	1008	&& rxvt_scr_page(aR_ R->scroll_selection_dir,
1004	R->scroll_selection_lines)) {	1009	R->scroll_selection_lines)) {
1005	rxvt_selection_extend(aR_ R->selection_save_x,	1010	R->selection_extend (R->selection_save_x,
1006	R->selection_save_y, R->selection_save_state);	1011	R->selection_save_y, R->selection_save_state);
1007	R->scroll_selection_delay = SCROLLBAR_CONTINUOUS_DELAY;	1012	R->scroll_selection_delay = SCROLLBAR_CONTINUOUS_DELAY;
1008	R->refresh_type \|= SMOOTH_REFRESH;	1013	R->refresh_type \|= SMOOTH_REFRESH;
1009	R->want_refresh = 1;	1014	R->want_refresh = 1;
1010	}	1015	}
…		…
1026	quick_timeout \|= R->want_full_refresh;	1031	quick_timeout \|= R->want_full_refresh;
1027	#endif	1032	#endif
1028	#endif	1033	#endif
1029	}	1034	}
1030		1035
		1036	#ifdef POINTER_BLANK
1031	void	1037	void
1032	rxvt_term::pointer_unblank ()	1038	rxvt_term::pointer_unblank ()
1033	{	1039	{
1034	XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor);	1040	XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor);
1035	rxvt_recolour_cursor (this);	1041	recolour_cursor ();
1036		1042
1037	#ifdef POINTER_BLANK
1038	hidden_pointer = 0;	1043	hidden_pointer = 0;
1039		1044
1040	if (Options & Opt_pointerBlank)	1045	if (Options & Opt_pointerBlank)
1041	pointer_ev.start (NOW + pointerBlankDelay);	1046	pointer_ev.start (NOW + pointerBlankDelay);
1042	#endif
1043	}	1047	}
1044		1048
1045	#ifdef POINTER_BLANK
1046	void	1049	void
1047	rxvt_term::pointer_blank ()	1050	rxvt_term::pointer_blank ()
1048	{	1051	{
1049	pointer_ev.stop ();
1050
1051	if (!(Options & Opt_pointerBlank))	1052	if (!(Options & Opt_pointerBlank))
1052	return;	1053	return;
1053		1054
1054	XDefineCursor (Xdisplay, TermWin.vt, blank_cursor);	1055	XDefineCursor (Xdisplay, TermWin.vt, blank_cursor);
1055	XFlush (Xdisplay);	1056	XFlush (Xdisplay);
…		…
1059		1060
1060	void	1061	void
1061	rxvt_term::pointer_cb (time_watcher &w)	1062	rxvt_term::pointer_cb (time_watcher &w)
1062	{	1063	{
1063	SET_R (this);	1064	SET_R (this);
		1065	SET_LOCALE (locale);
1064		1066
1065	pointer_blank ();	1067	pointer_blank ();
1066	}	1068	}
1067	#endif	1069	#endif
1068		1070
…		…
1073	int button_number, key_state = 0;	1075	int button_number, key_state = 0;
1074	int x, y;	1076	int x, y;
1075		1077
1076	x = ev->x;	1078	x = ev->x;
1077	y = ev->y;	1079	y = ev->y;
1078	rxvt_pixel_position(aR_ &x, &y);	1080	R->pixel_position (&x, &y);
1079		1081
1080	if (R->MEvent.button == AnyButton) {	1082	if (R->MEvent.button == AnyButton) {
1081	button_number = 3;	1083	button_number = 3;
1082	} else {	1084	} else {
1083	button_number = R->MEvent.button - Button1;	1085	button_number = R->MEvent.button - Button1;
…		…
1150	{	1152	{
1151	int i, want_timeout;	1153	int i, want_timeout;
1152	Window unused_root, unused_child;	1154	Window unused_root, unused_child;
1153	int unused_root_x, unused_root_y;	1155	int unused_root_x, unused_root_y;
1154	unsigned int unused_mask;	1156	unsigned int unused_mask;
1155	struct timeval tp;
1156		1157
1157	#ifdef DEBUG_X	1158	#ifdef DEBUG_X
1158	const char *const eventnames[] =	1159	const char *const eventnames[] =
1159	{ /* mason - this matches my system */	1160	{ /* mason - this matches my system */
1160	"",	1161	"",
…		…
1191	"SelectionNotify",	1192	"SelectionNotify",
1192	"ColormapNotify",	1193	"ColormapNotify",
1193	"ClientMessage",	1194	"ClientMessage",
1194	"MappingNotify"	1195	"MappingNotify"
1195	};	1196	};
		1197	#endif
		1198
		1199	#ifdef DEBUG_X
		1200	struct timeval tp;
1196	struct tm *ltt;	1201	struct tm *ltt;
1197	#endif
1198
1199	/*
1200	* check if we need to get the time for any timeouts
1201	*/
1202
1203	for (i = NUM_TIMEOUTS; i--; )
1204	if (R->timeout[i].tv_sec) {
1205	want_timeout = 1;
1206	break;
1207	}
1208
1209	#ifndef DEBUG_X
1210	if (want_timeout)
1211	#endif
1212	(void)gettimeofday(&tp, NULL);	1202	(void)gettimeofday(&tp, NULL);
1213
1214	#ifdef DEBUG_X
1215	ltt = localtime(&(tp.tv_sec));	1203	ltt = localtime(&(tp.tv_sec));
1216	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));	1204	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));
1217	#endif	1205	#endif
1218
1219	/* X event timeouts */
1220	if (want_timeout)
1221	for (i = NUM_TIMEOUTS; i--; ) {
1222	if (R->timeout[i].tv_sec == 0)
1223	continue;
1224	if ((tp.tv_sec < R->timeout[i].tv_sec)
1225	\|\| (tp.tv_sec == R->timeout[i].tv_sec
1226	&& tp.tv_usec < R->timeout[i].tv_usec))
1227	continue;
1228	R->timeout[i].tv_sec = 0;
1229	switch(i) {
1230	case TIMEOUT_INCR:
1231	rxvt_print_error("data loss: timeout on INCR selection paste");
1232	R->selection_wait = Sel_none;
1233	break;
1234	default:
1235	break;
1236	}
1237	}
1238		1206
1239	switch (ev->type) {	1207	switch (ev->type) {
1240	case KeyPress:	1208	case KeyPress:
1241	rxvt_lookup_key(aR_ (XKeyEvent *)ev);	1209	rxvt_lookup_key(aR_ (XKeyEvent *)ev);
1242	break;	1210	break;
…		…
1335	if (R->Input_Context != NULL)	1303	if (R->Input_Context != NULL)
1336	XSetICFocus(R->Input_Context);	1304	XSetICFocus(R->Input_Context);
1337	#endif	1305	#endif
1338	#ifdef CURSOR_BLINK	1306	#ifdef CURSOR_BLINK
1339	if (R->Options & Opt_cursorBlink)	1307	if (R->Options & Opt_cursorBlink)
1340	R->blink_ev.start (NOW + BLINK_INTERVAL);	1308	R->cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1341	#endif	1309	#endif
1342	}	1310	}
1343	break;	1311	break;
1344		1312
1345	case FocusOut:	1313	case FocusOut:
…		…
1350	if (R->Input_Context != NULL)	1318	if (R->Input_Context != NULL)
1351	XUnsetICFocus(R->Input_Context);	1319	XUnsetICFocus(R->Input_Context);
1352	#endif	1320	#endif
1353	#ifdef CURSOR_BLINK	1321	#ifdef CURSOR_BLINK
1354	if (R->Options & Opt_cursorBlink)	1322	if (R->Options & Opt_cursorBlink)
1355	R->blink_ev.stop ();	1323	R->cursor_blink_ev.stop ();
1356	R->hidden_cursor = 0;	1324	R->hidden_cursor = 0;
1357	#endif	1325	#endif
1358	}	1326	}
1359	break;	1327	break;
1360		1328
…		…
1368	D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));	1336	D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1369	} while (XCheckTypedWindowEvent(R->Xdisplay, ev->xconfigure.window,	1337	} while (XCheckTypedWindowEvent(R->Xdisplay, ev->xconfigure.window,
1370	ConfigureNotify, ev));	1338	ConfigureNotify, ev));
1371	if (R->szHint.width != width \|\| R->szHint.height != height) {	1339	if (R->szHint.width != width \|\| R->szHint.height != height) {
1372	D_SIZE((stderr, "Size: Resizing from: %4d x %4d", R->szHint.width, R->szHint.height));	1340	D_SIZE((stderr, "Size: Resizing from: %4d x %4d", R->szHint.width, R->szHint.height));
1373	rxvt_resize_all_windows(aR_ (unsigned int)width,	1341	R->resize_all_windows (width, height, 1);
1374	(unsigned int)height, 1);
1375	}	1342	}
1376	#ifdef DEBUG_SIZE	1343	#ifdef DEBUG_SIZE
1377	else {	1344	else {
1378	D_SIZE((stderr, "Size: Not resizing"));	1345	D_SIZE((stderr, "Size: Not resizing"));
1379	}	1346	}
…		…
1402	rxvt_selection_send(aR_ &(ev->xselectionrequest));	1369	rxvt_selection_send(aR_ &(ev->xselectionrequest));
1403	break;	1370	break;
1404		1371
1405	case UnmapNotify:	1372	case UnmapNotify:
1406	R->TermWin.mapped = 0;	1373	R->TermWin.mapped = 0;
		1374	#ifdef TEXT_BLINK
		1375	R->text_blink_ev.stop ();
		1376	#endif
1407	break;	1377	break;
1408		1378
1409	case MapNotify:	1379	case MapNotify:
1410	R->TermWin.mapped = 1;	1380	R->TermWin.mapped = 1;
		1381	#ifdef TEXT_BLINK
		1382	R->text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
		1383	#endif
1411	break;	1384	break;
1412		1385
1413	case PropertyNotify:	1386	case PropertyNotify:
1414	if (ev->xproperty.atom == R->xa[XA_VT_SELECTION]) {	1387	if (ev->xproperty.atom == R->xa[XA_VT_SELECTION]) {
1415	if (ev->xproperty.state == PropertyNewValue)	1388	if (ev->xproperty.state == PropertyNewValue)
…		…
1438		1411
1439	case GraphicsExpose:	1412	case GraphicsExpose:
1440	case Expose:	1413	case Expose:
1441	if (ev->xany.window == R->TermWin.vt) {	1414	if (ev->xany.window == R->TermWin.vt) {
1442	#ifdef NO_SLOW_LINK_SUPPORT	1415	#ifdef NO_SLOW_LINK_SUPPORT
1443	rxvt_scr_expose(aR_ ev->xexpose.x, ev->xexpose.y,	1416	R->scr_expose (ev->xexpose.x, ev->xexpose.y,
1444	ev->xexpose.width, ev->xexpose.height, False);	1417	ev->xexpose.width, ev->xexpose.height, False);
1445	#else	1418	#else
1446	// don't understand this, so commented it out	1419	// don't understand this, so commented it out
1447	rxvt_scr_expose(aR_ ev->xexpose.x, ev->xexpose.y,	1420	R->scr_expose (ev->xexpose.x, ev->xexpose.y,
1448	ev->xexpose.width, ev->xexpose.height, False);	1421	ev->xexpose.width, ev->xexpose.height, False);
1449	//rxvt_scr_expose(aR_ ev->xexpose.x, 0,	1422	//rxvt_scr_expose(aR_ ev->xexpose.x, 0,
1450	// ev->xexpose.width, R->TermWin.height, False);	1423	// ev->xexpose.width, R->TermWin.height, False);
1451	#endif	1424	#endif
1452	R->want_refresh = 1;	1425	R->want_refresh = 1;
1453	} else {	1426	} else {
…		…
1458	&unused_xevent)) ;	1431	&unused_xevent)) ;
1459	while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window,	1432	while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window,
1460	GraphicsExpose,	1433	GraphicsExpose,
1461	&unused_xevent)) ;	1434	&unused_xevent)) ;
1462	if (isScrollbarWindow(ev->xany.window)) {	1435	if (isScrollbarWindow(ev->xany.window)) {
1463	scrollbar_setIdle();	1436	R->scrollBar.setIdle();
1464	rxvt_scrollbar_show(aR_ 0);	1437	rxvt_scrollbar_show(aR_ 0);
1465	}	1438	}
1466	#ifdef MENUBAR	1439	#ifdef MENUBAR
1467	if (menubar_visible(aR) && isMenuBarWindow(ev->xany.window))	1440	if (menubar_visible(aR) && isMenuBarWindow(ev->xany.window))
1468	rxvt_menubar_expose(aR);	1441	rxvt_menubar_expose(aR);
…		…
1498	&unused_mask);	1471	&unused_mask);
1499	#ifdef MOUSE_THRESHOLD	1472	#ifdef MOUSE_THRESHOLD
1500	/* deal with a `jumpy' mouse */	1473	/* deal with a `jumpy' mouse */
1501	if ((ev->xmotion.time - R->MEvent.time) > MOUSE_THRESHOLD) {	1474	if ((ev->xmotion.time - R->MEvent.time) > MOUSE_THRESHOLD) {
1502	#endif	1475	#endif
1503	rxvt_selection_extend(aR_ (ev->xbutton.x), (ev->xbutton.y),	1476	R->selection_extend ((ev->xbutton.x), (ev->xbutton.y),
1504	(ev->xbutton.state & Button3Mask) ? 2 : 0);	1477	(ev->xbutton.state & Button3Mask) ? 2 : 0);
1505	#ifdef SELECTION_SCROLLING	1478	#ifdef SELECTION_SCROLLING
1506	if (ev->xbutton.y<R->TermWin.int_bwidth \|\|	1479	if (ev->xbutton.y < R->TermWin.int_bwidth
1507	Pixel2Row(ev->xbutton.y)>(R->TermWin.nrow-1)) {	1480	\|\| Pixel2Row(ev->xbutton.y) > (R->TermWin.nrow-1)) {
1508	int dist;	1481	int dist;
1509		1482
1510	R->pending_scroll_selection=1;	1483	R->pending_scroll_selection=1;
1511		1484
1512	/* don't clobber the current delay if we are	1485	/* don't clobber the current delay if we are
…		…
1557	&unused_root_x, &unused_root_y,	1530	&unused_root_x, &unused_root_y,
1558	&(ev->xbutton.x), &(ev->xbutton.y),	1531	&(ev->xbutton.x), &(ev->xbutton.y),
1559	&unused_mask);	1532	&unused_mask);
1560	rxvt_scr_move_to(aR_ scrollbar_position(ev->xbutton.y) - R->csrO,	1533	rxvt_scr_move_to(aR_ scrollbar_position(ev->xbutton.y) - R->csrO,
1561	scrollbar_size());	1534	scrollbar_size());
1562	rxvt_scr_refresh(aR_ R->refresh_type);	1535	R->scr_refresh (R->refresh_type);
1563	R->refresh_limit = 0;	1536	R->refresh_limit = 0;
1564	rxvt_scrollbar_show(aR_ 1);	1537	rxvt_scrollbar_show(aR_ 1);
1565	}	1538	}
1566	break;	1539	break;
1567	}	1540	}
…		…
1569		1542
1570	/* INTPROTO */	1543	/* INTPROTO */
1571	void	1544	void
1572	rxvt_button_press(pR_ XButtonEvent *ev)	1545	rxvt_button_press(pR_ XButtonEvent *ev)
1573	{	1546	{
1574	int reportmode = 0, clickintime;	1547	int reportmode = 0, clickintime;
1575		1548
1576	R->bypass_keystate = ev->state & (R->ModMetaMask \| ShiftMask);	1549	R->bypass_keystate = ev->state & (R->ModMetaMask \| ShiftMask);
1577	if (!R->bypass_keystate)	1550	if (!R->bypass_keystate)
1578	reportmode = !!(R->PrivateModes & PrivMode_mouse_report);	1551	reportmode = !!(R->PrivateModes & PrivMode_mouse_report);
1579	/*	1552	/*
…		…
1581	*/	1554	*/
1582	if (ev->window == R->TermWin.vt)	1555	if (ev->window == R->TermWin.vt)
1583	{	1556	{
1584	#if RXVT_GRAPHICS	1557	#if RXVT_GRAPHICS
1585	if (ev->subwindow != None)	1558	if (ev->subwindow != None)
1586	rxvt_Gr_ButtonPress(ev->x, ev->y);	1559	rxvt_Gr_ButtonPress (ev->x, ev->y);
1587	else	1560	else
1588	#endif	1561	#endif
1589	{	1562	{
1590	clickintime = ev->time - R->MEvent.time < MULTICLICK_TIME;	1563	clickintime = ev->time - R->MEvent.time < MULTICLICK_TIME;
1591	if (reportmode)	1564	if (reportmode)
…		…
1626	if (ev->button != R->MEvent.button)	1599	if (ev->button != R->MEvent.button)
1627	R->MEvent.clicks = 0;	1600	R->MEvent.clicks = 0;
1628	switch (ev->button)	1601	switch (ev->button)
1629	{	1602	{
1630	case Button1:	1603	case Button1:
		1604	/* allow shift+left click to extend selection */
		1605	if (ev->state & ShiftMask && !(R->PrivateModes & PrivMode_mouse_report))
		1606	{
1631	if (R->MEvent.button == Button1 && clickintime)	1607	if (R->MEvent.button == Button1 && clickintime)
		1608	R->selection_rotate (ev->x, ev->y);
1632	R->MEvent.clicks++;	1609	else
		1610	R->selection_extend (ev->x, ev->y, 1);
		1611	}
1633	else	1612	else
		1613	{
		1614	if (R->MEvent.button == Button1 && clickintime)
		1615	R->MEvent.clicks++;
		1616	else
1634	R->MEvent.clicks = 1;	1617	R->MEvent.clicks = 1;
		1618
1635	rxvt_selection_click(aR_ R->MEvent.clicks, ev->x, ev->y);	1619	R->selection_click (R->MEvent.clicks, ev->x, ev->y);
		1620	}
		1621
1636	R->MEvent.button = Button1;	1622	R->MEvent.button = Button1;
1637	break;	1623	break;
1638		1624
1639	case Button3:	1625	case Button3:
1640	if (R->MEvent.button == Button3 && clickintime)	1626	if (R->MEvent.button == Button3 && clickintime)
1641	rxvt_selection_rotate(aR_ ev->x, ev->y);	1627	R->selection_rotate (ev->x, ev->y);
1642	else	1628	else
1643	rxvt_selection_extend(aR_ ev->x, ev->y, 1);	1629	R->selection_extend (ev->x, ev->y, 1);
1644	R->MEvent.button = Button3;	1630	R->MEvent.button = Button3;
1645	break;	1631	break;
1646	}	1632	}
1647	}	1633	}
1648	R->MEvent.time = ev->time;	1634	R->MEvent.time = ev->time;
…		…
1653	/*	1639	/*
1654	* Scrollbar window processing of button press	1640	* Scrollbar window processing of button press
1655	*/	1641	*/
1656	if (isScrollbarWindow(ev->window))	1642	if (isScrollbarWindow(ev->window))
1657	{	1643	{
1658	scrollbar_setIdle();	1644	R->scrollBar.setIdle ();
1659	/*	1645	/*
1660	* Rxvt-style scrollbar:	1646	* Rxvt-style scrollbar:
1661	* move up if mouse is above slider	1647	* move up if mouse is above slider
1662	* move dn if mouse is below slider	1648	* move dn if mouse is below slider
1663	*	1649	*
…		…
1716	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	1702	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1717	R->scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY;	1703	R->scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY;
1718	#endif	1704	#endif
1719	if (rxvt_scr_page(aR_ upordown < 0 ? UP : DN, 1)) {	1705	if (rxvt_scr_page(aR_ upordown < 0 ? UP : DN, 1)) {
1720	if (upordown < 0)	1706	if (upordown < 0)
1721	scrollbar_setUp();	1707	R->scrollBar.setUp ();
1722	else	1708	else
1723	scrollbar_setDn();	1709	R->scrollBar.setDn ();
1724	}	1710	}
1725	} else	1711	} else
1726	switch (ev->button) {	1712	switch (ev->button) {
1727	case Button2:	1713	case Button2:
1728	switch (R->scrollbar_align) {	1714	switch (R->scrollbar_align) {
…		…
1740	\|\| scrollbar_above_slider(ev->y)	1726	\|\| scrollbar_above_slider(ev->y)
1741	\|\| scrollbar_below_slider(ev->y))	1727	\|\| scrollbar_below_slider(ev->y))
1742	rxvt_scr_move_to(aR_	1728	rxvt_scr_move_to(aR_
1743	scrollbar_position(ev->y) - R->csrO,	1729	scrollbar_position(ev->y) - R->csrO,
1744	scrollbar_size());	1730	scrollbar_size());
1745	scrollbar_setMotion();	1731	R->scrollBar.setMotion ();
1746	break;	1732	break;
1747		1733
1748	case Button1:	1734	case Button1:
1749	if (R->scrollbar_align == R_SB_ALIGN_CENTRE)	1735	if (R->scrollbar_align == R_SB_ALIGN_CENTRE)
1750	R->csrO = ev->y - R->scrollBar.top;	1736	R->csrO = ev->y - R->scrollBar.top;
…		…
1763	rxvt_scr_page(aR_ DN, R->TermWin.nrow - 1);	1749	rxvt_scr_page(aR_ DN, R->TermWin.nrow - 1);
1764	# else	1750	# else
1765	rxvt_scr_page(aR_ DN, R->TermWin.nrow / 4);	1751	rxvt_scr_page(aR_ DN, R->TermWin.nrow / 4);
1766	# endif	1752	# endif
1767	else	1753	else
1768	scrollbar_setMotion();	1754	R->scrollBar.setMotion ();
1769	} else {	1755	} else {
1770	rxvt_scr_page(aR_ (ev->button == Button1 ? DN : UP),	1756	rxvt_scr_page(aR_ (ev->button == Button1 ? DN : UP),
1771	(R->TermWin.nrow	1757	(R->TermWin.nrow
1772	* scrollbar_position(ev->y)	1758	* scrollbar_position(ev->y)
1773	/ scrollbar_size()));	1759	/ scrollbar_size()));
…		…
1795	R->csrO = 0; /* reset csr Offset */	1781	R->csrO = 0; /* reset csr Offset */
1796	if (!R->bypass_keystate)	1782	if (!R->bypass_keystate)
1797	reportmode = !!(R->PrivateModes & PrivMode_mouse_report);	1783	reportmode = !!(R->PrivateModes & PrivMode_mouse_report);
1798		1784
1799	if (scrollbar_isUpDn()) {	1785	if (scrollbar_isUpDn()) {
1800	scrollbar_setIdle();	1786	R->scrollBar.setIdle ();
1801	rxvt_scrollbar_show(aR_ 0);	1787	rxvt_scrollbar_show(aR_ 0);
1802	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	1788	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1803	R->refresh_type &= ~SMOOTH_REFRESH;	1789	R->refresh_type &= ~SMOOTH_REFRESH;
1804	#endif	1790	#endif
1805	}	1791	}
…		…
1842	* when overriding mouse reporting	1828	* when overriding mouse reporting
1843	*/	1829	*/
1844	if (R->PrivateModes & PrivMode_mouse_report	1830	if (R->PrivateModes & PrivMode_mouse_report
1845	&& R->bypass_keystate	1831	&& R->bypass_keystate
1846	&& ev->button == Button1 && R->MEvent.clicks <= 1)	1832	&& ev->button == Button1 && R->MEvent.clicks <= 1)
1847	rxvt_selection_extend(aR_ ev->x, ev->y, 0);	1833	R->selection_extend (ev->x, ev->y, 0);
1848		1834
1849	switch (ev->button) {	1835	switch (ev->button) {
1850	case Button1:	1836	case Button1:
1851	case Button3:	1837	case Button3:
1852	rxvt_selection_make(aR_ ev->time);	1838	rxvt_selection_make(aR_ ev->time);
…		…
1856	break;	1842	break;
1857	#ifdef MOUSE_WHEEL	1843	#ifdef MOUSE_WHEEL
1858	case Button4:	1844	case Button4:
1859	case Button5:	1845	case Button5:
1860	{	1846	{
1861	int i, v;	1847	int i;
		1848	page_dirn v;
1862		1849
1863	v = (ev->button == Button4) ? UP : DN;	1850	v = (ev->button == Button4) ? UP : DN;
1864	if (ev->state & ShiftMask)	1851	if (ev->state & ShiftMask)
1865	i = 1;	1852	i = 1;
1866	else if ((R->Options & Opt_mouseWheelScrollPage))	1853	else if ((R->Options & Opt_mouseWheelScrollPage))
…		…
1874	R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;	1861	R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
1875	}	1862	}
1876	# endif	1863	# endif
1877	# ifdef JUMP_MOUSE_WHEEL	1864	# ifdef JUMP_MOUSE_WHEEL
1878	rxvt_scr_page(aR_ v, i);	1865	rxvt_scr_page(aR_ v, i);
1879	rxvt_scr_refresh(aR_ SMOOTH_REFRESH);	1866	R->scr_refresh (SMOOTH_REFRESH);
1880	rxvt_scrollbar_show(aR_ 1);	1867	rxvt_scrollbar_show(aR_ 1);
1881	# else	1868	# else
1882	for (; i--;)	1869	while (i--)
1883	{	1870	{
1884	rxvt_scr_page(aR_ v, 1);	1871	rxvt_scr_page(aR_ v, 1);
1885	rxvt_scr_refresh(aR_ SMOOTH_REFRESH);	1872	R->scr_refresh (SMOOTH_REFRESH);
1886	rxvt_scrollbar_show(aR_ 1);	1873	rxvt_scrollbar_show(aR_ 1);
1887	}	1874	}
1888	# endif	1875	# endif
1889	}	1876	}
1890	break;	1877	break;
…		…
2041	n = 0;	2028	n = 0;
2042	if (pchanged) {	2029	if (pchanged) {
2043	for (; n < (unsigned int)i; n++) {	2030	for (; n < (unsigned int)i; n++) {
2044	XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[n], &wattr);	2031	XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[n], &wattr);
2045	D_X((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));	2032	D_X((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2046	if (wattr.depth != rootdepth \|\| wattr.class == InputOnly) {	2033	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly) {
2047	n = (int)(sizeof(R->TermWin.parent) / sizeof(Window)) + 1;	2034	n = (int)(sizeof(R->TermWin.parent) / sizeof(Window)) + 1;
2048	break;	2035	break;
2049	}	2036	}
2050	}	2037	}
2051	}	2038	}
…		…
2244	break;	2231	break;
2245	case 'I': /* cursor up and scroll down if needed */	2232	case 'I': /* cursor up and scroll down if needed */
2246	rxvt_scr_index(aR_ DN);	2233	rxvt_scr_index(aR_ DN);
2247	break;	2234	break;
2248	case 'J': /* erase to end of screen */	2235	case 'J': /* erase to end of screen */
2249	rxvt_scr_erase_screen(aR_ 0);	2236	R->scr_erase_screen (0);
2250	break;	2237	break;
2251	case 'K': /* erase to end of line */	2238	case 'K': /* erase to end of line */
2252	rxvt_scr_erase_line(aR_ 0);	2239	rxvt_scr_erase_line(aR_ 0);
2253	break;	2240	break;
2254	case 'Y': /* move to specified row and col */	2241	case 'Y': /* move to specified row and col */
…		…
2589	case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */	2576	case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */
2590	rxvt_scr_tab(aR_ arg[0]);	2577	rxvt_scr_tab(aR_ arg[0]);
2591	break;	2578	break;
2592		2579
2593	case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */	2580	case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */
2594	rxvt_scr_erase_screen(aR_ arg[0]);	2581	R->scr_erase_screen (arg[0]);
2595	break;	2582	break;
2596		2583
2597	case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */	2584	case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */
2598	rxvt_scr_erase_line(aR_ arg[0]);	2585	rxvt_scr_erase_line(aR_ arg[0]);
2599	break;	2586	break;
…		…
2620		2607
2621	case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */	2608	case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2622	arg[0] = -arg[0];	2609	arg[0] = -arg[0];
2623	/* FALLTHROUGH */	2610	/* FALLTHROUGH */
2624	case CSI_SU: /* 8.3.148: (1) SCROLL UP */	2611	case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2625	rxvt_scroll_text(aR_ R->screen.tscroll, R->screen.bscroll, arg[0], 0);	2612	R->scr_scroll_text (R->screen.tscroll, R->screen.bscroll, arg[0], 0);
2626	break;	2613	break;
2627		2614
2628	case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */	2615	case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2629	R->tt_write((const unsigned char *)VT100_ANS,	2616	R->tt_write((const unsigned char *)VT100_ANS,
2630	(unsigned int)(sizeof(VT100_ANS) - 1));	2617	(unsigned int)(sizeof(VT100_ANS) - 1));
…		…
2721	break;	2708	break;
2722	#endif	2709	#endif
2723		2710
2724	case CSI_78: /* DECREQTPARM */	2711	case CSI_78: /* DECREQTPARM */
2725	if (arg[0] == 0 \|\| arg[0] == 1)	2712	if (arg[0] == 0 \|\| arg[0] == 1)
2726	R->tt_printf("\033[%d;1;1;112;112;1;0x", arg[0] + 2);	2713	R->tt_printf("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2727	/* FALLTHROUGH */	2714	/* FALLTHROUGH */
2728		2715
2729	default:	2716	default:
2730	break;	2717	break;
2731	}	2718	}
…		…
2769	break;	2756	break;
2770	case 6: /* lower window */	2757	case 6: /* lower window */
2771	XLowerWindow(R->Xdisplay, R->TermWin.parent[0]);	2758	XLowerWindow(R->Xdisplay, R->TermWin.parent[0]);
2772	break;	2759	break;
2773	case 7: /* refresh window */	2760	case 7: /* refresh window */
2774	rxvt_scr_touch(aR_ True);	2761	R->scr_touch (true);
2775	break;	2762	break;
2776	case 8: /* set size (chars) */	2763	case 8: /* set size (chars) */
2777	rxvt_set_widthheight(aR_ (unsigned int)(args[2] * R->TermWin.fwidth),	2764	rxvt_set_widthheight(aR_ (unsigned int)(args[2] * R->TermWin.fwidth),
2778	(unsigned int)(args[1] * R->TermWin.fheight));	2765	(unsigned int)(args[1] * R->TermWin.fheight));
2779	break;	2766	break;
…		…
2990	if (*str != ';') {	2977	if (*str != ';') {
2991	#if XPM_BACKGROUND	2978	#if XPM_BACKGROUND
2992	rxvt_scale_pixmap(aR_ ""); /* reset to default scaling */	2979	rxvt_scale_pixmap(aR_ ""); /* reset to default scaling */
2993	rxvt_set_bgPixmap(aR_ str); /* change pixmap */	2980	rxvt_set_bgPixmap(aR_ str); /* change pixmap */
2994	#endif	2981	#endif
2995	rxvt_scr_touch(aR_ True);	2982	R->scr_touch (true);
2996	}	2983	}
2997	while ((str = STRCHR(str, ';')) != NULL) {	2984	while ((str = STRCHR(str, ';')) != NULL) {
2998	str++;	2985	str++;
2999	#if XPM_BACKGROUND	2986	#if XPM_BACKGROUND
3000	changed += rxvt_scale_pixmap(aR_ str);	2987	changed += rxvt_scale_pixmap(aR_ str);
…		…
3002	}	2989	}
3003	if (changed) {	2990	if (changed) {
3004	#ifdef XPM_BACKGROUND	2991	#ifdef XPM_BACKGROUND
3005	rxvt_resize_pixmap(aR);	2992	rxvt_resize_pixmap(aR);
3006	#endif	2993	#endif
3007	rxvt_scr_touch(aR_ True);	2994	R->scr_touch (true);
3008	}	2995	}
3009	break;	2996	break;
3010		2997
3011	case XTerm_restoreFG:	2998	case XTerm_restoreFG:
3012	rxvt_set_window_color(aR_ Color_fg, str);	2999	rxvt_set_window_color(aR_ Color_fg, str);
…		…
3098	#endif	3085	#endif
3099	{ 1000, PrivMode_MouseX11 },	3086	{ 1000, PrivMode_MouseX11 },
3100	{ 1010, PrivMode_TtyOutputInh },	3087	{ 1010, PrivMode_TtyOutputInh },
3101	{ 1011, PrivMode_Keypress },	3088	{ 1011, PrivMode_Keypress },
3102	{ 1047, PrivMode_Screen },	3089	{ 1047, PrivMode_Screen },
		3090	{ 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */
3103	};	3091	};
3104		3092
3105	if (nargs == 0)	3093	if (nargs == 0)
3106	return;	3094	return;
3107		3095
…		…
3178	break;	3166	break;
3179	#endif	3167	#endif
3180	#ifdef scrollBar_esc	3168	#ifdef scrollBar_esc
3181	case scrollBar_esc:	3169	case scrollBar_esc:
3182	if (rxvt_scrollbar_mapping(aR_ state)) {	3170	if (rxvt_scrollbar_mapping(aR_ state)) {
3183	rxvt_resize_all_windows(aR_ 0, 0, 0);	3171	R->resize_all_windows (0, 0, 0);
3184	rxvt_scr_touch(aR_ True);	3172	R->scr_touch (true);
3185	}	3173	}
3186	break;	3174	break;
3187	#endif	3175	#endif
3188	case 25: /* visible/invisible cursor */	3176	case 25: /* visible/invisible cursor */
3189	rxvt_scr_cursor_visible(aR_ state);	3177	rxvt_scr_cursor_visible(aR_ state);
…		…
3214	R->Options \|= Opt_scrollTtyKeypress;	3202	R->Options \|= Opt_scrollTtyKeypress;
3215	else	3203	else
3216	R->Options &= ~Opt_scrollTtyKeypress;	3204	R->Options &= ~Opt_scrollTtyKeypress;
3217	break;	3205	break;
3218	case 1047: /* secondary screen w/ clearing */	3206	case 1047: /* secondary screen w/ clearing */
		3207	case 1049: /* better secondary screen w/ clearing, but not fully implemented */
3219	if (R->current_screen != PRIMARY)	3208	if (R->current_screen != PRIMARY)
3220	rxvt_scr_erase_screen(aR_ 2);	3209	R->scr_erase_screen (2);
3221	rxvt_scr_change_screen(aR_ state);	3210	rxvt_scr_change_screen(aR_ state);
3222	/* FALLTHROUGH */	3211	/* FALLTHROUGH */
3223	default:	3212	default:
3224	break;	3213	break;
3225	}	3214	}
…		…
3399	}	3388	}
3400		3389
3401	if ((cmd == 'T') && (nargs >= 5)) {	3390	if ((cmd == 'T') && (nargs >= 5)) {
3402	int i, len = args[4];	3391	int i, len = args[4];
3403		3392
3404	text = rxvt_malloc((len + 1) * sizeof(char));	3393	text = (unsigned char )rxvt_malloc((len + 1) sizeof(char));
3405		3394
3406	if (text != NULL) {	3395	if (text != NULL) {
3407	for (i = 0; i < len; i++)	3396	for (i = 0; i < len; i++)
3408	text[i] = rxvt_cmd_getc(aR);	3397	text[i] = rxvt_cmd_getc(aR);
3409	text[len] = '\0';	3398	text[len] = '\0';

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.11 by pcg, Tue Dec 2 21:49:46 2003 UTC vs. Revision 1.33 by pcg, Fri Jan 30 18:12:17 2004 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.11 by pcg, Tue Dec 2 21:49:46 2003 UTC vs.
Revision 1.33 by pcg, Fri Jan 30 18:12:17 2004 UTC