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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.10 by pcg, Thu Nov 27 16:49:45 2003 UTC vs.
Revision 1.29 by pcg, Mon Jan 19 17:26:43 2004 UTC

…		…
1	/---------------------------------C----------------------------------	1	/---------------------------------C----------------------------------
2	* File: command.c	2	* File: command.c
3	----------------------------------------------------------------------	3	----------------------------------------------------------------------
4	* $Id: command.C,v 1.10 2003/11/27 16:49:45 pcg Exp $	4	* $Id: command.C,v 1.29 2004/01/19 17:26:43 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() /
…		…
654	R->cmdbuf_ptr = cmdbuf_ptr;	671	R->cmdbuf_ptr = cmdbuf_ptr;
655	R->cmdbuf_endp = cmdbuf_endp;	672	R->cmdbuf_endp = cmdbuf_endp;
656	return 0;	673	return 0;
657	}	674	}
658	#endif /* MENUBAR_MAX */	675	#endif /* MENUBAR_MAX */
		676
		677	void
		678	rxvt_term::flush ()
		679	{
		680	#ifdef TRANSPARENT
		681	if (want_full_refresh)
		682	{
		683	want_full_refresh = 0;
		684	scr_clear ();
		685	scr_touch (false);
		686	want_refresh = 1;
		687	}
		688	#endif
		689
		690	if (want_refresh)
		691	{
		692	scr_refresh (refresh_type);
		693	rxvt_scrollbar_show (this, 1);
		694	#ifdef USE_XIM
		695	rxvt_IMSendSpot (this);
		696	#endif
		697	}
		698
		699	XFlush (Xdisplay);
		700	}
		701
		702	void
		703	rxvt_term::check_cb (check_watcher &w)
		704	{
		705	SET_R (this);
		706	SET_LOCALE (locale);
		707
		708	flush ();
		709	}
659		710
660	void	711	void
661	rxvt_term::process_x_events ()	712	rxvt_term::process_x_events ()
662	{	713	{
663	do	714	do
…		…
701	rxvt_process_x_event (this, &xev);	752	rxvt_process_x_event (this, &xev);
702	}	753	}
703	while (XPending (Xdisplay));	754	while (XPending (Xdisplay));
704	}	755	}
705		756
		757	#ifdef CURSOR_BLINK
706	void	758	void
707	rxvt_term::blink_cb (time_watcher &w)	759	rxvt_term::blink_cb (time_watcher &w)
708	{	760	{
709	SET_R (this);
710
711	w.at += BLINK_INTERVAL;
712	hidden_cursor = !hidden_cursor;	761	hidden_cursor = !hidden_cursor;
713	want_refresh = 1;	762	want_refresh = 1;
714	flush ();	763
		764	w.start (w.at + BLINK_INTERVAL);
715	}	765	}
		766	#endif
716		767
717	void	768	void
718	rxvt_term::x_cb (io_watcher &w, short revents)	769	rxvt_term::x_cb (io_watcher &w, short revents)
719	{	770	{
720	SET_R (this);	771	SET_R (this);
		772	SET_LOCALE (locale);
721		773
722	process_x_events ();	774	process_x_events ();
723
724	flush ();
725	}
726
727	// read the next character, currently handles UTF-8
728	// will probably handle all sorts of other stuff in the future
729	uint32_t
730	rxvt_term::next_char ()
731	{
732	struct mbstate &s = mbstate;
733
734	while (cmdbuf_ptr < cmdbuf_endp)
735	{
736	uint8_t ch = *cmdbuf_ptr;
737
738	if (s.cnt)
739	{
740	if ((ch & 0xc0) == 0x80)
741	{
742	cmdbuf_ptr++;
743
744	/* continuation */
745	s.reg = (s.reg << 6) \| (ch & 0x7f);
746
747	if (--s.cnt == 0 && s.reg >= 128) /* if !inrange then corruption or Racking */
748	return s.reg;
749
750	continue;
751	}
752	else
753	{
754	s.cnt = 0;
755	return s.orig; /* the _occasional_ non-utf-8 character may slip through... */
756	}
757	}
758
759	if ((ch & 0xc0) == 0xc0)
760	{
761	cmdbuf_ptr++;
762
763	/* first byte */
764	s.orig = ch; /* for broken encodings */
765	s.reg = ch;
766	if ((ch & 0xe0) == 0xc0) { s.reg &= 0x1f; s.cnt = 1; }
767	if ((ch & 0xf0) == 0xe0) { s.reg &= 0x0f; s.cnt = 2; }
768	if ((ch & 0xf8) == 0xf0) { s.reg &= 0x07; s.cnt = 3; }
769	if ((ch & 0xfc) == 0xf8) { s.reg &= 0x03; s.cnt = 4; }
770	if ((ch & 0xfe) == 0xfc) { s.reg &= 0x01; s.cnt = 5; }
771	}
772	else
773	{
774	cmdbuf_ptr++; /* _occasional_ non-utf8 may slip through... */
775	return ch;
776	}
777	}
778
779	return NOCHAR;
780	}	775	}
781		776
782	bool	777	bool
783	rxvt_term::pty_fill ()	778	rxvt_term::pty_fill ()
784	{	779	{
…		…
793	if (n > 0)	788	if (n > 0)
794	{	789	{
795	cmdbuf_endp += n;	790	cmdbuf_endp += n;
796	return true;	791	return true;
797	}	792	}
798	else if (n < 0 && errno == EAGAIN)	793	else if (n < 0 && errno != EAGAIN)
		794	destroy ();
		795
799	return false;	796	return false;
800
801	destroy ();
802	}	797	}
803		798
804	void	799	void
805	rxvt_term::pty_cb (io_watcher &w, short revents)	800	rxvt_term::pty_cb (io_watcher &w, short revents)
806	{	801	{
807	SET_R (this);	802	SET_R (this);
		803	SET_LOCALE (locale);
808		804
809	if (revents & EVENT_WRITE)	805	if (revents & EVENT_WRITE)
810	tt_write (0, 0);	806	tt_write (0, 0);
811	else if (revents & EVENT_READ)	807	else if (revents & EVENT_READ)
812	// loop, but don't allow a single term to monopolize us
813	// the number of loops is fully arbitrary, and thus wrong
814	for (int i = 7; i-- && pty_fill (); )
815	{
816	//TODO:
817	/* once we know the shell is running, send the screen size. Again! */
818	//ch = rxvt_cmd_getc(aR); /* wait for something */
819	//rxvt_tt_winsize(cmd_fd, TermWin.ncol, TermWin.nrow, cmd_pid);
820
821	uint32_t ch = NOCHAR;
822
823	for (;;)
824	{
825	if (ch == NOCHAR)
826	ch = next_char ();
827
828	if (ch == NOCHAR) // TODO: improve
829	break;
830
831	if (ch >= ' ' \|\| ch == '\t' \|\| ch == '\n' \|\| ch == '\r')
832	{
833	/* Read a text string from the input buffer */
834	uint32_t buf[BUFSIZ];
835	bool refreshnow = false;
836	int nlines = 0;
837	uint32_t *str = buf;
838
839	*str++ = ch;
840
841	for (;;)
842	{
843	ch = next_char ();
844
845	if (ch == NOCHAR \|\| (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
846	break;
847	else
848	{
849	*str++ = ch;
850
851	if (ch == '\n')
852	{
853	nlines++;
854	refresh_count++;
855
856	if (!(Options & Opt_jumpScroll)
857	\|\| (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
858	{
859	refreshnow = true;
860	ch = NOCHAR;
861	break;
862	}
863	}
864
865	if (str >= buf + BUFSIZ)
866	{
867	ch = NOCHAR;
868	break;
869	}
870	}
871	}
872
873	rxvt_scr_add_lines (this, buf, nlines, str - buf);
874
875	/*
876	* If there have been a lot of new lines, then update the screen
877	* What the heck I'll cheat and only refresh less than every page-full.
878	* the number of pages between refreshes is refresh_limit, which
879	* is incremented here because we must be doing flat-out scrolling.
880	*
881	* refreshing should be correct for small scrolls, because of the
882	* time-out
883	*/
884	if (refreshnow)
885	{
886	if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
887	refresh_limit++;
888
889	rxvt_scr_refresh (this, refresh_type);
890	}
891
892	}
893	else
894	{
895	switch (ch)
896	{
897	default:
898	rxvt_process_nonprinting (this, ch);
899	break;
900	case C0_ESC: /* escape char */
901	rxvt_process_escape_seq (this);
902	break;
903	/case 0x9b: / /* CSI */
904	/* rxvt_process_csi_seq (this); */
905	}
906
907	ch = NOCHAR;
908	}
909	}
910	}
911
912	flush ();
913	}
914
915	void
916	rxvt_term::flush ()
917	{
918	#ifdef TRANSPARENT
919	if (want_full_refresh)
920	{	808	{
921	want_full_refresh = 0;	809	bool flag = true;
922	rxvt_scr_clear (this);
923	rxvt_scr_touch (this, False);
924	want_refresh = 1;
925	}
926	#endif
927		810
928	if (want_refresh)	811	// loop, but don't allow a single term to monopolize us
		812	// the number of loops is fully arbitrary, and thus wrong
		813	while (flag && pty_fill ())
		814	{
		815	if (!seen_input)
		816	{
		817	seen_input = 1;
		818	/* once we know the shell is running, send the screen size. Again! */
		819	tt_winch ();
		820	}
		821
		822	uint32_t ch = NOCHAR;
		823
		824	for (;;)
		825	{
		826	if (ch == NOCHAR)
		827	ch = next_char ();
		828
		829	if (ch == NOCHAR) // TODO: improve
		830	break;
		831
		832	if (ch >= ' ' \|\| ch == '\t' \|\| ch == '\n' \|\| ch == '\r')
		833	{
		834	/* Read a text string from the input buffer */
		835	uint32_t buf[BUFSIZ];
		836	bool refreshnow = false;
		837	int nlines = 0;
		838	uint32_t *str = buf;
		839
		840	*str++ = ch;
		841
		842	for (;;)
		843	{
		844	ch = next_char ();
		845
		846	if (ch == NOCHAR \|\| (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
		847	break;
		848	else
		849	{
		850	*str++ = ch;
		851
		852	if (ch == '\n')
		853	{
		854	nlines++;
		855	refresh_count++;
		856
		857	if (!(Options & Opt_jumpScroll)
		858	\|\| (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
		859	{
		860	refreshnow = true;
		861	flag = false;
		862	ch = NOCHAR;
		863	break;
		864	}
		865	}
		866
		867	if (str >= buf + BUFSIZ)
		868	{
		869	ch = NOCHAR;
		870	break;
		871	}
		872	}
		873	}
		874
		875	rxvt_scr_add_lines (this, buf, nlines, str - buf);
		876
		877	/*
		878	* If there have been a lot of new lines, then update the screen
		879	* What the heck I'll cheat and only refresh less than every page-full.
		880	* the number of pages between refreshes is refresh_limit, which
		881	* is incremented here because we must be doing flat-out scrolling.
		882	*
		883	* refreshing should be correct for small scrolls, because of the
		884	* time-out
		885	*/
		886	if (refreshnow)
		887	{
		888	if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
		889	refresh_limit++;
		890
		891	scr_refresh (refresh_type);
		892	}
		893
		894	}
		895	else
		896	{
		897	switch (ch)
		898	{
		899	default:
		900	rxvt_process_nonprinting (this, ch);
		901	break;
		902	case C0_ESC: /* escape char */
		903	rxvt_process_escape_seq (this);
		904	break;
		905	/case 0x9b: / /* CSI */
		906	/* rxvt_process_csi_seq (this); */
		907	}
		908
		909	ch = NOCHAR;
		910	}
		911	}
		912	}
		913	}
		914	}
		915
		916	// read the next character, currently handles UTF-8
		917	// will probably handle all sorts of other stuff in the future
		918	uint32_t
		919	rxvt_term::next_char ()
		920	{
		921	while (cmdbuf_ptr < cmdbuf_endp)
929	{	922	{
930	rxvt_scr_refresh (this, refresh_type);	923	if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh
931	rxvt_scrollbar_show (this, 1);	924	return *cmdbuf_ptr++;
932	#ifdef USE_XIM
933	rxvt_IMSendSpot (this);
934	#endif
935	}
936		925
937	if (XPending (Xdisplay)) process_x_events ();	926	wchar_t wc;
938	XFlush (Xdisplay);	927	int len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, &mbstate.mbs);
939	if (XPending (Xdisplay)) process_x_events ();	928
		929	if (len == (size_t)-2)
		930	return NOCHAR;
		931
		932	if (len == (size_t)-1)
		933	return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
		934
		935	// assume wchar == unicode
		936	cmdbuf_ptr += len;
		937	return wc;
		938	}
		939
		940	return NOCHAR;
940	}	941	}
941		942
942	/* rxvt_cmd_getc() - Return next input character */	943	/* rxvt_cmd_getc() - Return next input character */
943	/*	944	/*
944	* Return the next input character after first passing any keyboard input	945	* Return the next input character after first passing any keyboard input
…		…
993	if (R->pending_scroll_selection) {	994	if (R->pending_scroll_selection) {
994	quick_timeout = 1;	995	quick_timeout = 1;
995	if (!R->scroll_selection_delay--	996	if (!R->scroll_selection_delay--
996	&& rxvt_scr_page(aR_ R->scroll_selection_dir,	997	&& rxvt_scr_page(aR_ R->scroll_selection_dir,
997	R->scroll_selection_lines)) {	998	R->scroll_selection_lines)) {
998	rxvt_selection_extend(aR_ R->selection_save_x,	999	R->selection_extend (R->selection_save_x,
999	R->selection_save_y, R->selection_save_state);	1000	R->selection_save_y, R->selection_save_state);
1000	R->scroll_selection_delay = SCROLLBAR_CONTINUOUS_DELAY;	1001	R->scroll_selection_delay = SCROLLBAR_CONTINUOUS_DELAY;
1001	R->refresh_type \|= SMOOTH_REFRESH;	1002	R->refresh_type \|= SMOOTH_REFRESH;
1002	R->want_refresh = 1;	1003	R->want_refresh = 1;
1003	}	1004	}
…		…
1019	quick_timeout \|= R->want_full_refresh;	1020	quick_timeout \|= R->want_full_refresh;
1020	#endif	1021	#endif
1021	#endif	1022	#endif
1022	}	1023	}
1023		1024
		1025	#ifdef POINTER_BLANK
1024	void	1026	void
1025	rxvt_term::pointer_unblank ()	1027	rxvt_term::pointer_unblank ()
1026	{	1028	{
1027	XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor);	1029	XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor);
1028	rxvt_recolour_cursor (this);	1030	recolour_cursor ();
1029		1031
1030	#ifdef POINTER_BLANK
1031	hidden_pointer = 0;	1032	hidden_pointer = 0;
1032		1033
1033	if (Options & Opt_pointerBlank)	1034	if (Options & Opt_pointerBlank)
1034	pointer_ev.start (NOW + pointerBlankDelay);	1035	pointer_ev.start (NOW + pointerBlankDelay);
1035	#endif
1036	}	1036	}
1037		1037
1038	#ifdef POINTER_BLANK
1039	void	1038	void
1040	rxvt_term::pointer_blank ()	1039	rxvt_term::pointer_blank ()
1041	{	1040	{
1042	pointer_ev.stop ();
1043
1044	if (!(Options & Opt_pointerBlank))	1041	if (!(Options & Opt_pointerBlank))
1045	return;	1042	return;
1046		1043
1047	XDefineCursor (Xdisplay, TermWin.vt, blank_cursor);	1044	XDefineCursor (Xdisplay, TermWin.vt, blank_cursor);
1048	XFlush (Xdisplay);	1045	XFlush (Xdisplay);
…		…
1052		1049
1053	void	1050	void
1054	rxvt_term::pointer_cb (time_watcher &w)	1051	rxvt_term::pointer_cb (time_watcher &w)
1055	{	1052	{
1056	SET_R (this);	1053	SET_R (this);
		1054	SET_LOCALE (locale);
1057		1055
1058	pointer_blank ();	1056	pointer_blank ();
1059	}	1057	}
1060	#endif	1058	#endif
1061		1059
…		…
1066	int button_number, key_state = 0;	1064	int button_number, key_state = 0;
1067	int x, y;	1065	int x, y;
1068		1066
1069	x = ev->x;	1067	x = ev->x;
1070	y = ev->y;	1068	y = ev->y;
1071	rxvt_pixel_position(aR_ &x, &y);	1069	R->pixel_position (&x, &y);
1072		1070
1073	if (R->MEvent.button == AnyButton) {	1071	if (R->MEvent.button == AnyButton) {
1074	button_number = 3;	1072	button_number = 3;
1075	} else {	1073	} else {
1076	button_number = R->MEvent.button - Button1;	1074	button_number = R->MEvent.button - Button1;
…		…
1143	{	1141	{
1144	int i, want_timeout;	1142	int i, want_timeout;
1145	Window unused_root, unused_child;	1143	Window unused_root, unused_child;
1146	int unused_root_x, unused_root_y;	1144	int unused_root_x, unused_root_y;
1147	unsigned int unused_mask;	1145	unsigned int unused_mask;
1148	struct timeval tp;
1149		1146
1150	#ifdef DEBUG_X	1147	#ifdef DEBUG_X
1151	const char *const eventnames[] =	1148	const char *const eventnames[] =
1152	{ /* mason - this matches my system */	1149	{ /* mason - this matches my system */
1153	"",	1150	"",
…		…
1184	"SelectionNotify",	1181	"SelectionNotify",
1185	"ColormapNotify",	1182	"ColormapNotify",
1186	"ClientMessage",	1183	"ClientMessage",
1187	"MappingNotify"	1184	"MappingNotify"
1188	};	1185	};
		1186	#endif
		1187
		1188	#ifdef DEBUG_X
		1189	struct timeval tp;
1189	struct tm *ltt;	1190	struct tm *ltt;
1190	#endif
1191
1192	/*
1193	* check if we need to get the time for any timeouts
1194	*/
1195
1196	for (i = NUM_TIMEOUTS; i--; )
1197	if (R->timeout[i].tv_sec) {
1198	want_timeout = 1;
1199	break;
1200	}
1201
1202	#ifndef DEBUG_X
1203	if (want_timeout)
1204	#endif
1205	(void)gettimeofday(&tp, NULL);	1191	(void)gettimeofday(&tp, NULL);
1206
1207	#ifdef DEBUG_X
1208	ltt = localtime(&(tp.tv_sec));	1192	ltt = localtime(&(tp.tv_sec));
1209	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));	1193	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));
1210	#endif	1194	#endif
1211
1212	/* X event timeouts */
1213	if (want_timeout)
1214	for (i = NUM_TIMEOUTS; i--; ) {
1215	if (R->timeout[i].tv_sec == 0)
1216	continue;
1217	if ((tp.tv_sec < R->timeout[i].tv_sec)
1218	\|\| (tp.tv_sec == R->timeout[i].tv_sec
1219	&& tp.tv_usec < R->timeout[i].tv_usec))
1220	continue;
1221	R->timeout[i].tv_sec = 0;
1222	switch(i) {
1223	case TIMEOUT_INCR:
1224	rxvt_print_error("data loss: timeout on INCR selection paste");
1225	R->selection_wait = Sel_none;
1226	break;
1227	default:
1228	break;
1229	}
1230	}
1231		1195
1232	switch (ev->type) {	1196	switch (ev->type) {
1233	case KeyPress:	1197	case KeyPress:
1234	rxvt_lookup_key(aR_ (XKeyEvent *)ev);	1198	rxvt_lookup_key(aR_ (XKeyEvent *)ev);
1235	break;	1199	break;
…		…
1361	D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));	1325	D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1362	} while (XCheckTypedWindowEvent(R->Xdisplay, ev->xconfigure.window,	1326	} while (XCheckTypedWindowEvent(R->Xdisplay, ev->xconfigure.window,
1363	ConfigureNotify, ev));	1327	ConfigureNotify, ev));
1364	if (R->szHint.width != width \|\| R->szHint.height != height) {	1328	if (R->szHint.width != width \|\| R->szHint.height != height) {
1365	D_SIZE((stderr, "Size: Resizing from: %4d x %4d", R->szHint.width, R->szHint.height));	1329	D_SIZE((stderr, "Size: Resizing from: %4d x %4d", R->szHint.width, R->szHint.height));
1366	rxvt_resize_all_windows(aR_ (unsigned int)width,	1330	R->resize_all_windows (width, height, 1);
1367	(unsigned int)height, 1);
1368	}	1331	}
1369	#ifdef DEBUG_SIZE	1332	#ifdef DEBUG_SIZE
1370	else {	1333	else {
1371	D_SIZE((stderr, "Size: Not resizing"));	1334	D_SIZE((stderr, "Size: Not resizing"));
1372	}	1335	}
…		…
1431		1394
1432	case GraphicsExpose:	1395	case GraphicsExpose:
1433	case Expose:	1396	case Expose:
1434	if (ev->xany.window == R->TermWin.vt) {	1397	if (ev->xany.window == R->TermWin.vt) {
1435	#ifdef NO_SLOW_LINK_SUPPORT	1398	#ifdef NO_SLOW_LINK_SUPPORT
1436	rxvt_scr_expose(aR_ ev->xexpose.x, ev->xexpose.y,	1399	R->scr_expose (ev->xexpose.x, ev->xexpose.y,
1437	ev->xexpose.width, ev->xexpose.height, False);	1400	ev->xexpose.width, ev->xexpose.height, False);
1438	#else	1401	#else
1439	// don't understand this, so commented it out	1402	// don't understand this, so commented it out
1440	rxvt_scr_expose(aR_ ev->xexpose.x, ev->xexpose.y,	1403	R->scr_expose (ev->xexpose.x, ev->xexpose.y,
1441	ev->xexpose.width, ev->xexpose.height, False);	1404	ev->xexpose.width, ev->xexpose.height, False);
1442	//rxvt_scr_expose(aR_ ev->xexpose.x, 0,	1405	//rxvt_scr_expose(aR_ ev->xexpose.x, 0,
1443	// ev->xexpose.width, R->TermWin.height, False);	1406	// ev->xexpose.width, R->TermWin.height, False);
1444	#endif	1407	#endif
1445	R->want_refresh = 1;	1408	R->want_refresh = 1;
1446	} else {	1409	} else {
…		…
1451	&unused_xevent)) ;	1414	&unused_xevent)) ;
1452	while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window,	1415	while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window,
1453	GraphicsExpose,	1416	GraphicsExpose,
1454	&unused_xevent)) ;	1417	&unused_xevent)) ;
1455	if (isScrollbarWindow(ev->xany.window)) {	1418	if (isScrollbarWindow(ev->xany.window)) {
1456	scrollbar_setIdle();	1419	R->scrollBar.setIdle();
1457	rxvt_scrollbar_show(aR_ 0);	1420	rxvt_scrollbar_show(aR_ 0);
1458	}	1421	}
1459	#ifdef MENUBAR	1422	#ifdef MENUBAR
1460	if (menubar_visible(aR) && isMenuBarWindow(ev->xany.window))	1423	if (menubar_visible(aR) && isMenuBarWindow(ev->xany.window))
1461	rxvt_menubar_expose(aR);	1424	rxvt_menubar_expose(aR);
…		…
1491	&unused_mask);	1454	&unused_mask);
1492	#ifdef MOUSE_THRESHOLD	1455	#ifdef MOUSE_THRESHOLD
1493	/* deal with a `jumpy' mouse */	1456	/* deal with a `jumpy' mouse */
1494	if ((ev->xmotion.time - R->MEvent.time) > MOUSE_THRESHOLD) {	1457	if ((ev->xmotion.time - R->MEvent.time) > MOUSE_THRESHOLD) {
1495	#endif	1458	#endif
1496	rxvt_selection_extend(aR_ (ev->xbutton.x), (ev->xbutton.y),	1459	R->selection_extend ((ev->xbutton.x), (ev->xbutton.y),
1497	(ev->xbutton.state & Button3Mask) ? 2 : 0);	1460	(ev->xbutton.state & Button3Mask) ? 2 : 0);
1498	#ifdef SELECTION_SCROLLING	1461	#ifdef SELECTION_SCROLLING
1499	if (ev->xbutton.y<R->TermWin.int_bwidth \|\|	1462	if (ev->xbutton.y<R->TermWin.int_bwidth \|\|
1500	Pixel2Row(ev->xbutton.y)>(R->TermWin.nrow-1)) {	1463	Pixel2Row(ev->xbutton.y)>(R->TermWin.nrow-1)) {
1501	int dist;	1464	int dist;
…		…
1550	&unused_root_x, &unused_root_y,	1513	&unused_root_x, &unused_root_y,
1551	&(ev->xbutton.x), &(ev->xbutton.y),	1514	&(ev->xbutton.x), &(ev->xbutton.y),
1552	&unused_mask);	1515	&unused_mask);
1553	rxvt_scr_move_to(aR_ scrollbar_position(ev->xbutton.y) - R->csrO,	1516	rxvt_scr_move_to(aR_ scrollbar_position(ev->xbutton.y) - R->csrO,
1554	scrollbar_size());	1517	scrollbar_size());
1555	rxvt_scr_refresh(aR_ R->refresh_type);	1518	R->scr_refresh (R->refresh_type);
1556	R->refresh_limit = 0;	1519	R->refresh_limit = 0;
1557	rxvt_scrollbar_show(aR_ 1);	1520	rxvt_scrollbar_show(aR_ 1);
1558	}	1521	}
1559	break;	1522	break;
1560	}	1523	}
…		…
1562		1525
1563	/* INTPROTO */	1526	/* INTPROTO */
1564	void	1527	void
1565	rxvt_button_press(pR_ XButtonEvent *ev)	1528	rxvt_button_press(pR_ XButtonEvent *ev)
1566	{	1529	{
1567	int reportmode = 0, clickintime;	1530	int reportmode = 0, clickintime;
1568		1531
1569	R->bypass_keystate = ev->state & (R->ModMetaMask \| ShiftMask);	1532	R->bypass_keystate = ev->state & (R->ModMetaMask \| ShiftMask);
1570	if (!R->bypass_keystate)	1533	if (!R->bypass_keystate)
1571	reportmode = !!(R->PrivateModes & PrivMode_mouse_report);	1534	reportmode = !!(R->PrivateModes & PrivMode_mouse_report);
1572	/*	1535	/*
…		…
1574	*/	1537	*/
1575	if (ev->window == R->TermWin.vt)	1538	if (ev->window == R->TermWin.vt)
1576	{	1539	{
1577	#if RXVT_GRAPHICS	1540	#if RXVT_GRAPHICS
1578	if (ev->subwindow != None)	1541	if (ev->subwindow != None)
1579	rxvt_Gr_ButtonPress(ev->x, ev->y);	1542	rxvt_Gr_ButtonPress (ev->x, ev->y);
1580	else	1543	else
1581	#endif	1544	#endif
1582	{	1545	{
1583	clickintime = ev->time - R->MEvent.time < MULTICLICK_TIME;	1546	clickintime = ev->time - R->MEvent.time < MULTICLICK_TIME;
1584	if (reportmode)	1547	if (reportmode)
…		…
1619	if (ev->button != R->MEvent.button)	1582	if (ev->button != R->MEvent.button)
1620	R->MEvent.clicks = 0;	1583	R->MEvent.clicks = 0;
1621	switch (ev->button)	1584	switch (ev->button)
1622	{	1585	{
1623	case Button1:	1586	case Button1:
		1587	/* allow shift+left click to extend selection */
		1588	if (ev->state & ShiftMask && !(R->PrivateModes & PrivMode_mouse_report))
		1589	{
1624	if (R->MEvent.button == Button1 && clickintime)	1590	if (R->MEvent.button == Button1 && clickintime)
		1591	R->selection_rotate (ev->x, ev->y);
1625	R->MEvent.clicks++;	1592	else
		1593	R->selection_extend (ev->x, ev->y, 1);
		1594	}
1626	else	1595	else
		1596	{
		1597	if (R->MEvent.button == Button1 && clickintime)
		1598	R->MEvent.clicks++;
		1599	else
1627	R->MEvent.clicks = 1;	1600	R->MEvent.clicks = 1;
		1601
1628	rxvt_selection_click(aR_ R->MEvent.clicks, ev->x, ev->y);	1602	R->selection_click (R->MEvent.clicks, ev->x, ev->y);
		1603	}
		1604
1629	R->MEvent.button = Button1;	1605	R->MEvent.button = Button1;
1630	break;	1606	break;
1631		1607
1632	case Button3:	1608	case Button3:
1633	if (R->MEvent.button == Button3 && clickintime)	1609	if (R->MEvent.button == Button3 && clickintime)
1634	rxvt_selection_rotate(aR_ ev->x, ev->y);	1610	R->selection_rotate (ev->x, ev->y);
1635	else	1611	else
1636	rxvt_selection_extend(aR_ ev->x, ev->y, 1);	1612	R->selection_extend (ev->x, ev->y, 1);
1637	R->MEvent.button = Button3;	1613	R->MEvent.button = Button3;
1638	break;	1614	break;
1639	}	1615	}
1640	}	1616	}
1641	R->MEvent.time = ev->time;	1617	R->MEvent.time = ev->time;
…		…
1646	/*	1622	/*
1647	* Scrollbar window processing of button press	1623	* Scrollbar window processing of button press
1648	*/	1624	*/
1649	if (isScrollbarWindow(ev->window))	1625	if (isScrollbarWindow(ev->window))
1650	{	1626	{
1651	scrollbar_setIdle();	1627	R->scrollBar.setIdle ();
1652	/*	1628	/*
1653	* Rxvt-style scrollbar:	1629	* Rxvt-style scrollbar:
1654	* move up if mouse is above slider	1630	* move up if mouse is above slider
1655	* move dn if mouse is below slider	1631	* move dn if mouse is below slider
1656	*	1632	*
…		…
1709	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	1685	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1710	R->scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY;	1686	R->scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY;
1711	#endif	1687	#endif
1712	if (rxvt_scr_page(aR_ upordown < 0 ? UP : DN, 1)) {	1688	if (rxvt_scr_page(aR_ upordown < 0 ? UP : DN, 1)) {
1713	if (upordown < 0)	1689	if (upordown < 0)
1714	scrollbar_setUp();	1690	R->scrollBar.setUp ();
1715	else	1691	else
1716	scrollbar_setDn();	1692	R->scrollBar.setDn ();
1717	}	1693	}
1718	} else	1694	} else
1719	switch (ev->button) {	1695	switch (ev->button) {
1720	case Button2:	1696	case Button2:
1721	switch (R->scrollbar_align) {	1697	switch (R->scrollbar_align) {
…		…
1733	\|\| scrollbar_above_slider(ev->y)	1709	\|\| scrollbar_above_slider(ev->y)
1734	\|\| scrollbar_below_slider(ev->y))	1710	\|\| scrollbar_below_slider(ev->y))
1735	rxvt_scr_move_to(aR_	1711	rxvt_scr_move_to(aR_
1736	scrollbar_position(ev->y) - R->csrO,	1712	scrollbar_position(ev->y) - R->csrO,
1737	scrollbar_size());	1713	scrollbar_size());
1738	scrollbar_setMotion();	1714	R->scrollBar.setMotion ();
1739	break;	1715	break;
1740		1716
1741	case Button1:	1717	case Button1:
1742	if (R->scrollbar_align == R_SB_ALIGN_CENTRE)	1718	if (R->scrollbar_align == R_SB_ALIGN_CENTRE)
1743	R->csrO = ev->y - R->scrollBar.top;	1719	R->csrO = ev->y - R->scrollBar.top;
…		…
1756	rxvt_scr_page(aR_ DN, R->TermWin.nrow - 1);	1732	rxvt_scr_page(aR_ DN, R->TermWin.nrow - 1);
1757	# else	1733	# else
1758	rxvt_scr_page(aR_ DN, R->TermWin.nrow / 4);	1734	rxvt_scr_page(aR_ DN, R->TermWin.nrow / 4);
1759	# endif	1735	# endif
1760	else	1736	else
1761	scrollbar_setMotion();	1737	R->scrollBar.setMotion ();
1762	} else {	1738	} else {
1763	rxvt_scr_page(aR_ (ev->button == Button1 ? DN : UP),	1739	rxvt_scr_page(aR_ (ev->button == Button1 ? DN : UP),
1764	(R->TermWin.nrow	1740	(R->TermWin.nrow
1765	* scrollbar_position(ev->y)	1741	* scrollbar_position(ev->y)
1766	/ scrollbar_size()));	1742	/ scrollbar_size()));
…		…
1788	R->csrO = 0; /* reset csr Offset */	1764	R->csrO = 0; /* reset csr Offset */
1789	if (!R->bypass_keystate)	1765	if (!R->bypass_keystate)
1790	reportmode = !!(R->PrivateModes & PrivMode_mouse_report);	1766	reportmode = !!(R->PrivateModes & PrivMode_mouse_report);
1791		1767
1792	if (scrollbar_isUpDn()) {	1768	if (scrollbar_isUpDn()) {
1793	scrollbar_setIdle();	1769	R->scrollBar.setIdle ();
1794	rxvt_scrollbar_show(aR_ 0);	1770	rxvt_scrollbar_show(aR_ 0);
1795	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	1771	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1796	R->refresh_type &= ~SMOOTH_REFRESH;	1772	R->refresh_type &= ~SMOOTH_REFRESH;
1797	#endif	1773	#endif
1798	}	1774	}
…		…
1835	* when overriding mouse reporting	1811	* when overriding mouse reporting
1836	*/	1812	*/
1837	if (R->PrivateModes & PrivMode_mouse_report	1813	if (R->PrivateModes & PrivMode_mouse_report
1838	&& R->bypass_keystate	1814	&& R->bypass_keystate
1839	&& ev->button == Button1 && R->MEvent.clicks <= 1)	1815	&& ev->button == Button1 && R->MEvent.clicks <= 1)
1840	rxvt_selection_extend(aR_ ev->x, ev->y, 0);	1816	R->selection_extend (ev->x, ev->y, 0);
1841		1817
1842	switch (ev->button) {	1818	switch (ev->button) {
1843	case Button1:	1819	case Button1:
1844	case Button3:	1820	case Button3:
1845	rxvt_selection_make(aR_ ev->time);	1821	rxvt_selection_make(aR_ ev->time);
…		…
1849	break;	1825	break;
1850	#ifdef MOUSE_WHEEL	1826	#ifdef MOUSE_WHEEL
1851	case Button4:	1827	case Button4:
1852	case Button5:	1828	case Button5:
1853	{	1829	{
1854	int i, v;	1830	int i;
		1831	page_dirn v;
1855		1832
1856	v = (ev->button == Button4) ? UP : DN;	1833	v = (ev->button == Button4) ? UP : DN;
1857	if (ev->state & ShiftMask)	1834	if (ev->state & ShiftMask)
1858	i = 1;	1835	i = 1;
1859	else if ((R->Options & Opt_mouseWheelScrollPage))	1836	else if ((R->Options & Opt_mouseWheelScrollPage))
…		…
1867	R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;	1844	R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
1868	}	1845	}
1869	# endif	1846	# endif
1870	# ifdef JUMP_MOUSE_WHEEL	1847	# ifdef JUMP_MOUSE_WHEEL
1871	rxvt_scr_page(aR_ v, i);	1848	rxvt_scr_page(aR_ v, i);
1872	rxvt_scr_refresh(aR_ SMOOTH_REFRESH);	1849	R->scr_refresh (SMOOTH_REFRESH);
1873	rxvt_scrollbar_show(aR_ 1);	1850	rxvt_scrollbar_show(aR_ 1);
1874	# else	1851	# else
1875	for (; i--;)	1852	while (i--)
1876	{	1853	{
1877	rxvt_scr_page(aR_ v, 1);	1854	rxvt_scr_page(aR_ v, 1);
1878	rxvt_scr_refresh(aR_ SMOOTH_REFRESH);	1855	R->scr_refresh (SMOOTH_REFRESH);
1879	rxvt_scrollbar_show(aR_ 1);	1856	rxvt_scrollbar_show(aR_ 1);
1880	}	1857	}
1881	# endif	1858	# endif
1882	}	1859	}
1883	break;	1860	break;
…		…
2034	n = 0;	2011	n = 0;
2035	if (pchanged) {	2012	if (pchanged) {
2036	for (; n < (unsigned int)i; n++) {	2013	for (; n < (unsigned int)i; n++) {
2037	XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[n], &wattr);	2014	XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[n], &wattr);
2038	D_X((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));	2015	D_X((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2039	if (wattr.depth != rootdepth \|\| wattr.class == InputOnly) {	2016	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly) {
2040	n = (int)(sizeof(R->TermWin.parent) / sizeof(Window)) + 1;	2017	n = (int)(sizeof(R->TermWin.parent) / sizeof(Window)) + 1;
2041	break;	2018	break;
2042	}	2019	}
2043	}	2020	}
2044	}	2021	}
…		…
2094	return stream;	2071	return stream;
2095	}	2072	}
2096		2073
2097	/* EXTPROTO */	2074	/* EXTPROTO */
2098	int	2075	int
2099	rxvt_pclose_printer(FILE *stream)	2076	rxvt_pclose_printer (FILE *stream)
2100	{	2077	{
2101	fflush(stream);	2078	fflush (stream);
2102	/* pclose() reported not to work on SunOS 4.1.3 */	2079	/* pclose() reported not to work on SunOS 4.1.3 */
2103	# if defined (__sun__) /* TODO: RESOLVE THIS */	2080	# if defined (__sun__) /* TODO: RESOLVE THIS */
2104	/* pclose works provided SIGCHLD handler uses waitpid */	2081	/* pclose works provided SIGCHLD handler uses waitpid */
2105	return pclose(stream); /* return fclose (stream); */	2082	return pclose (stream); /* return fclose (stream); */
2106	# else	2083	# else
2107	return pclose(stream);	2084	return pclose (stream);
2108	# endif	2085	# endif
2109	}	2086	}
2110		2087
2111	/*	2088	/*
2112	* simulate attached vt100 printer	2089	* simulate attached vt100 printer
…		…
2237	break;	2214	break;
2238	case 'I': /* cursor up and scroll down if needed */	2215	case 'I': /* cursor up and scroll down if needed */
2239	rxvt_scr_index(aR_ DN);	2216	rxvt_scr_index(aR_ DN);
2240	break;	2217	break;
2241	case 'J': /* erase to end of screen */	2218	case 'J': /* erase to end of screen */
2242	rxvt_scr_erase_screen(aR_ 0);	2219	R->scr_erase_screen (0);
2243	break;	2220	break;
2244	case 'K': /* erase to end of line */	2221	case 'K': /* erase to end of line */
2245	rxvt_scr_erase_line(aR_ 0);	2222	rxvt_scr_erase_line(aR_ 0);
2246	break;	2223	break;
2247	case 'Y': /* move to specified row and col */	2224	case 'Y': /* move to specified row and col */
…		…
2582	case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */	2559	case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */
2583	rxvt_scr_tab(aR_ arg[0]);	2560	rxvt_scr_tab(aR_ arg[0]);
2584	break;	2561	break;
2585		2562
2586	case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */	2563	case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */
2587	rxvt_scr_erase_screen(aR_ arg[0]);	2564	R->scr_erase_screen (arg[0]);
2588	break;	2565	break;
2589		2566
2590	case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */	2567	case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */
2591	rxvt_scr_erase_line(aR_ arg[0]);	2568	rxvt_scr_erase_line(aR_ arg[0]);
2592	break;	2569	break;
…		…
2613		2590
2614	case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */	2591	case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2615	arg[0] = -arg[0];	2592	arg[0] = -arg[0];
2616	/* FALLTHROUGH */	2593	/* FALLTHROUGH */
2617	case CSI_SU: /* 8.3.148: (1) SCROLL UP */	2594	case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2618	rxvt_scroll_text(aR_ R->screen.tscroll, R->screen.bscroll, arg[0], 0);	2595	R->scr_scroll_text (R->screen.tscroll, R->screen.bscroll, arg[0], 0);
2619	break;	2596	break;
2620		2597
2621	case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */	2598	case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2622	R->tt_write((const unsigned char *)VT100_ANS,	2599	R->tt_write((const unsigned char *)VT100_ANS,
2623	(unsigned int)(sizeof(VT100_ANS) - 1));	2600	(unsigned int)(sizeof(VT100_ANS) - 1));
…		…
2762	break;	2739	break;
2763	case 6: /* lower window */	2740	case 6: /* lower window */
2764	XLowerWindow(R->Xdisplay, R->TermWin.parent[0]);	2741	XLowerWindow(R->Xdisplay, R->TermWin.parent[0]);
2765	break;	2742	break;
2766	case 7: /* refresh window */	2743	case 7: /* refresh window */
2767	rxvt_scr_touch(aR_ True);	2744	R->scr_touch (true);
2768	break;	2745	break;
2769	case 8: /* set size (chars) */	2746	case 8: /* set size (chars) */
2770	rxvt_set_widthheight(aR_ (unsigned int)(args[2] * R->TermWin.fwidth),	2747	rxvt_set_widthheight(aR_ (unsigned int)(args[2] * R->TermWin.fwidth),
2771	(unsigned int)(args[1] * R->TermWin.fheight));	2748	(unsigned int)(args[1] * R->TermWin.fheight));
2772	break;	2749	break;
…		…
2983	if (*str != ';') {	2960	if (*str != ';') {
2984	#if XPM_BACKGROUND	2961	#if XPM_BACKGROUND
2985	rxvt_scale_pixmap(aR_ ""); /* reset to default scaling */	2962	rxvt_scale_pixmap(aR_ ""); /* reset to default scaling */
2986	rxvt_set_bgPixmap(aR_ str); /* change pixmap */	2963	rxvt_set_bgPixmap(aR_ str); /* change pixmap */
2987	#endif	2964	#endif
2988	rxvt_scr_touch(aR_ True);	2965	R->scr_touch (true);
2989	}	2966	}
2990	while ((str = STRCHR(str, ';')) != NULL) {	2967	while ((str = STRCHR(str, ';')) != NULL) {
2991	str++;	2968	str++;
2992	#if XPM_BACKGROUND	2969	#if XPM_BACKGROUND
2993	changed += rxvt_scale_pixmap(aR_ str);	2970	changed += rxvt_scale_pixmap(aR_ str);
…		…
2995	}	2972	}
2996	if (changed) {	2973	if (changed) {
2997	#ifdef XPM_BACKGROUND	2974	#ifdef XPM_BACKGROUND
2998	rxvt_resize_pixmap(aR);	2975	rxvt_resize_pixmap(aR);
2999	#endif	2976	#endif
3000	rxvt_scr_touch(aR_ True);	2977	R->scr_touch (true);
3001	}	2978	}
3002	break;	2979	break;
3003		2980
3004	case XTerm_restoreFG:	2981	case XTerm_restoreFG:
3005	rxvt_set_window_color(aR_ Color_fg, str);	2982	rxvt_set_window_color(aR_ Color_fg, str);
…		…
3171	break;	3148	break;
3172	#endif	3149	#endif
3173	#ifdef scrollBar_esc	3150	#ifdef scrollBar_esc
3174	case scrollBar_esc:	3151	case scrollBar_esc:
3175	if (rxvt_scrollbar_mapping(aR_ state)) {	3152	if (rxvt_scrollbar_mapping(aR_ state)) {
3176	rxvt_resize_all_windows(aR_ 0, 0, 0);	3153	R->resize_all_windows (0, 0, 0);
3177	rxvt_scr_touch(aR_ True);	3154	R->scr_touch (true);
3178	}	3155	}
3179	break;	3156	break;
3180	#endif	3157	#endif
3181	case 25: /* visible/invisible cursor */	3158	case 25: /* visible/invisible cursor */
3182	rxvt_scr_cursor_visible(aR_ state);	3159	rxvt_scr_cursor_visible(aR_ state);
…		…
3208	else	3185	else
3209	R->Options &= ~Opt_scrollTtyKeypress;	3186	R->Options &= ~Opt_scrollTtyKeypress;
3210	break;	3187	break;
3211	case 1047: /* secondary screen w/ clearing */	3188	case 1047: /* secondary screen w/ clearing */
3212	if (R->current_screen != PRIMARY)	3189	if (R->current_screen != PRIMARY)
3213	rxvt_scr_erase_screen(aR_ 2);	3190	R->scr_erase_screen (2);
3214	rxvt_scr_change_screen(aR_ state);	3191	rxvt_scr_change_screen(aR_ state);
3215	/* FALLTHROUGH */	3192	/* FALLTHROUGH */
3216	default:	3193	default:
3217	break;	3194	break;
3218	}	3195	}
…		…
3392	}	3369	}
3393		3370
3394	if ((cmd == 'T') && (nargs >= 5)) {	3371	if ((cmd == 'T') && (nargs >= 5)) {
3395	int i, len = args[4];	3372	int i, len = args[4];
3396		3373
3397	text = rxvt_malloc((len + 1) * sizeof(char));	3374	text = (unsigned char )rxvt_malloc((len + 1) sizeof(char));
3398		3375
3399	if (text != NULL) {	3376	if (text != NULL) {
3400	for (i = 0; i < len; i++)	3377	for (i = 0; i < len; i++)
3401	text[i] = rxvt_cmd_getc(aR);	3378	text[i] = rxvt_cmd_getc(aR);
3402	text[len] = '\0';	3379	text[len] = '\0';

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.10 by pcg, Thu Nov 27 16:49:45 2003 UTC vs. Revision 1.29 by pcg, Mon Jan 19 17:26:43 2004 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.10 by pcg, Thu Nov 27 16:49:45 2003 UTC vs.
Revision 1.29 by pcg, Mon Jan 19 17:26:43 2004 UTC