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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.153 by root, Fri Jan 14 17:15:26 2005 UTC vs.
Revision 1.165 by root, Sun Jun 26 19:59:29 2005 UTC

…		…
28	#include "rxvt.h" /* NECESSARY */	28	#include "rxvt.h" /* NECESSARY */
29		29
30	#include <X11/Xmd.h> /* get the typedef for CARD32 */	30	#include <X11/Xmd.h> /* get the typedef for CARD32 */
31		31
32	#include <inttypes.h>	32	#include <inttypes.h>
33	#include <wchar.h>
34		33
35	#include "salloc.C" // HACK, should be a seperate compile!	34	#include "salloc.C" // HACK, should be a seperate compile!
36		35
37	inline void fill_text (text_t *start, text_t value, int len)	36	inline void fill_text (text_t *start, text_t value, int len)
38	{	37	{
…		…
203	/*	202	/*
204	* first time called so just malloc everything: don't rely on realloc	203	* first time called so just malloc everything: don't rely on realloc
205	* Note: this is still needed so that all the scrollback lines are NULL	204	* Note: this is still needed so that all the scrollback lines are NULL
206	*/	205	*/
207	screen.text = (text_t *)rxvt_calloc (total_rows, sizeof (text_t ));	206	screen.text = (text_t *)rxvt_calloc (total_rows, sizeof (text_t ));
208	buf_text = (text_t *)rxvt_calloc (total_rows, sizeof (text_t ));	207	buf_text = (text_t *)rxvt_calloc (total_rows, sizeof (text_t ));
209	drawn_text = (text_t *)rxvt_calloc (nrow, sizeof (text_t ));	208	drawn_text = (text_t *)rxvt_calloc (nrow, sizeof (text_t ));
210	swap.text = (text_t *)rxvt_calloc (nrow, sizeof (text_t ));	209	swap.text = (text_t *)rxvt_calloc (nrow, sizeof (text_t ));
211		210
212	screen.tlen = (int16_t *)rxvt_calloc (total_rows, sizeof (int16_t));	211	screen.tlen = (int16_t *)rxvt_calloc (total_rows, sizeof (int16_t));
213	swap.tlen = (int16_t *)rxvt_calloc (nrow, sizeof (int16_t));	212	swap.tlen = (int16_t *)rxvt_calloc (nrow, sizeof (int16_t));
214		213
215	screen.rend = (rend_t *)rxvt_calloc (total_rows, sizeof (rend_t ));	214	screen.rend = (rend_t *)rxvt_calloc (total_rows, sizeof (rend_t ));
216	buf_rend = (rend_t *)rxvt_calloc (total_rows, sizeof (rend_t ));	215	buf_rend = (rend_t *)rxvt_calloc (total_rows, sizeof (rend_t ));
217	drawn_rend = (rend_t *)rxvt_calloc (nrow, sizeof (rend_t ));	216	drawn_rend = (rend_t *)rxvt_calloc (nrow, sizeof (rend_t ));
218	swap.rend = (rend_t *)rxvt_calloc (nrow, sizeof (rend_t ));	217	swap.rend = (rend_t *)rxvt_calloc (nrow, sizeof (rend_t ));
219		218
220	for (p = 0; p < nrow; p++)	219	for (p = 0; p < nrow; p++)
221	{	220	{
222	q = p + TermWin.saveLines;	221	q = p + TermWin.saveLines;
223	scr_blank_screen_mem (screen.text, screen.rend, q, DEFAULT_RSTYLE);	222	scr_blank_screen_mem (screen.text, screen.rend, q, DEFAULT_RSTYLE);
…		…
334	scr_scroll_text (0, (int)nrow - 1, -k, 1);	333	scr_scroll_text (0, (int)nrow - 1, -k, 1);
335	screen.cur.row += k;	334	screen.cur.row += k;
336	screen.s_cur.row += k;	335	screen.s_cur.row += k;
337	TermWin.nscrolled -= k;	336	TermWin.nscrolled -= k;
338	}	337	}
		338
339	#ifdef DEBUG_STRICT	339	#ifdef DEBUG_STRICT
340	assert (screen.cur.row < TermWin.nrow);	340	assert (screen.cur.row < TermWin.nrow);
341	#else /* drive with your eyes closed */	341	#else /* drive with your eyes closed */
342
343	MIN_IT (screen.cur.row, nrow - 1);	342	MIN_IT (screen.cur.row, nrow - 1);
344	#endif	343	#endif
345	TermWin.ncol = ncol; // save b/c scr_blank_screen_mem uses this	344	TermWin.ncol = ncol; // save b/c scr_blank_screen_mem uses this
346	}	345	}
347		346
…		…
700	selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */	699	selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */
701	}	700	}
702	else if (j >= row1 && j <= row2)	701	else if (j >= row1 && j <= row2)
703	{	702	{
704	/* move selected region too */	703	/* move selected region too */
705	selection.beg.row -= count;	704	selection.beg.row -= count;
706	selection.end.row -= count;	705	selection.end.row -= count;
707	selection.mark.row -= count;	706	selection.mark.row -= count;
708	}	707	}
709	}	708	}
710		709
711	selection_check (0); /* _after_ TermWin.nscrolled update */	710	selection_check (0); /* _after_ TermWin.nscrolled update */
…		…
719	i = row2 - row1 + 1;	718	i = row2 - row1 + 1;
720	MIN_IT (count, i);	719	MIN_IT (count, i);
721		720
722	if (j > 0)	721	if (j > 0)
723	{	722	{
724	/* A: scroll up */	723	/* scroll up */
725		724
726	/* A1: Copy lines that will get clobbered by the rotation */	725	/* Copy lines that will get clobbered by the rotation */
727	memcpy (buf_text, screen.text + row1, count * sizeof (text_t *));	726	memcpy (buf_text, screen.text + row1, count * sizeof (text_t *));
728	memcpy (buf_rend, screen.rend + row1, count * sizeof (rend_t *));	727	memcpy (buf_rend, screen.rend + row1, count * sizeof (rend_t *));
729		728
730	/* A2: Rotate lines */	729	/* Rotate lines */
731	i = row2 - row1 - count + 1;	730	i = row2 - row1 - count + 1;
732	memmove (screen.tlen + row1, screen.tlen + row1 + count, i * sizeof (int16_t));	731	memmove (screen.tlen + row1, screen.tlen + row1 + count, i * sizeof (int16_t));
733	memmove (screen.text + row1, screen.text + row1 + count, i * sizeof (text_t *));	732	memmove (screen.text + row1, screen.text + row1 + count, i * sizeof (text_t *));
734	memmove (screen.rend + row1, screen.rend + row1 + count, i * sizeof (rend_t *));	733	memmove (screen.rend + row1, screen.rend + row1 + count, i * sizeof (rend_t *));
735		734
736	j = row2 - count + 1, i = count;	735	j = row2 - count + 1, i = count;
737	}	736	}
738	else /* if (j < 0) */	737	else /* if (j < 0) */
739	{	738	{
740	/* B: scroll down */	739	/* scroll down */
741		740
742	/* B1: Copy lines that will get clobbered by the rotation */	741	/* Copy lines that will get clobbered by the rotation */
743	for (i = 0, j = row2; i < count; i++, j--)	742	for (i = 0, j = row2; i < count; i++, j--)
744	{	743	{
745	buf_text[i] = screen.text[j];	744	buf_text[i] = screen.text[j];
746	buf_rend[i] = screen.rend[j];	745	buf_rend[i] = screen.rend[j];
747	}	746	}
748		747
749	/* B2: Rotate lines */	748	/* Rotate lines */
750	for (j = row2, i = j - count; i >= row1; i--, j--)	749	for (j = row2, i = j - count; i >= row1; i--, j--)
751	{	750	{
752	screen.tlen[j] = screen.tlen[i];	751	screen.tlen[j] = screen.tlen[i];
753	screen.text[j] = screen.text[i];	752	screen.text[j] = screen.text[i];
754	screen.rend[j] = screen.rend[i];	753	screen.rend[j] = screen.rend[i];
…		…
756		755
757	j = row1, i = count;	756	j = row1, i = count;
758	count = -count;	757	count = -count;
759	}	758	}
760		759
761	/* C: Resurrect lines */	760	/* Resurrect lines */
762	memset (screen.tlen + j, 0, i * sizeof (int16_t));	761	memset (screen.tlen + j, 0, i * sizeof (int16_t));
763	memcpy (screen.text + j, buf_text, i * sizeof (text_t *));	762	memcpy (screen.text + j, buf_text, i * sizeof (text_t *));
764	memcpy (screen.rend + j, buf_rend, i * sizeof (text_t *));	763	memcpy (screen.rend + j, buf_rend, i * sizeof (text_t *));
765	if (!spec) /* line length may not equal TermWin.ncol */	764	if (!spec) /* line length may not equal TermWin.ncol */
766	for (; i--; j++)	765	for (; i--; j++)
…		…
774	* Add text given in <str> of length <len> to screen struct	773	* Add text given in <str> of length <len> to screen struct
775	*/	774	*/
776	void	775	void
777	rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len)	776	rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len)
778	{	777	{
		778	if (len <= 0) /* sanity */
		779	return;
		780
779	unsigned char checksel;	781	unsigned char checksel;
780	unicode_t c;	782	unicode_t c;
781	int i, row, last_col;	783	int i, row, last_col;
782	text_t *stp;	784	text_t *stp;
783	rend_t *srp;	785	rend_t *srp;
784		786	const unicode_t *strend = str + len;
785	if (len <= 0) /* sanity */
786	return;
787		787
788	want_refresh = 1;	788	want_refresh = 1;
789	ZERO_SCROLLBACK ();	789	ZERO_SCROLLBACK ();
790	last_col = TermWin.ncol;	790	last_col = TermWin.ncol;
791		791
…		…
816	checksel = selection.op && current_screen == selection.screen ? 1 : 0;	816	checksel = selection.op && current_screen == selection.screen ? 1 : 0;
817		817
818	stp = screen.text[row];	818	stp = screen.text[row];
819	srp = screen.rend[row];	819	srp = screen.rend[row];
820		820
821	while (len--)	821	while (str < strend)
822	{	822	{
823	c = *str++;	823	c = *str++;
824		824
825	if (c < 0x20)	825	if (c < 0x20)
826	switch (c)	826	if (c == C0_LF)
		827	{
		828	if (screen.tlen[row] != -1) /* XXX: think about this */
		829	MAX_IT (screen.tlen[row], screen.cur.col);
		830
		831	screen.flags &= ~Screen_WrapNext;
		832
		833	if (screen.cur.row == screen.bscroll)
		834	scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
		835	else if (screen.cur.row < (TermWin.nrow - 1))
		836	row = (++screen.cur.row) + TermWin.saveLines;
		837
		838	stp = screen.text[row]; /* _must_ refresh */
		839	srp = screen.rend[row]; /* _must_ refresh */
		840	continue;
		841	}
		842	else if (c == C0_CR)
827	{	843	{
828	case C0_HT:
829	scr_tab (1, true);
830	continue;
831
832	case C0_LF:
833	if (screen.tlen[row] != -1) /* XXX: think about this */	844	if (screen.tlen[row] != -1) /* XXX: think about this */
834	MAX_IT (screen.tlen[row], screen.cur.col);	845	MAX_IT (screen.tlen[row], screen.cur.col);
835		846
836	screen.flags &= ~Screen_WrapNext;	847	screen.flags &= ~Screen_WrapNext;
837
838	if (screen.cur.row == screen.bscroll)
839	scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
840	else if (screen.cur.row < (TermWin.nrow - 1))
841	row = (++screen.cur.row) + TermWin.saveLines;
842
843	stp = screen.text[row]; /* _must_ refresh */
844	srp = screen.rend[row]; /* _must_ refresh */
845	continue;
846
847	case C0_CR:
848	if (screen.tlen[row] != -1) /* XXX: think about this */
849	MAX_IT (screen.tlen[row], screen.cur.col);
850
851	screen.flags &= ~Screen_WrapNext;
852	screen.cur.col = 0;	848	screen.cur.col = 0;
853	continue;	849	continue;
		850	}
		851	else if (c == C0_HT)
		852	{
		853	scr_tab (1, true);
		854	continue;
854	}	855	}
855		856
856	if (checksel /* see if we're writing within selection */	857	if (checksel /* see if we're writing within selection */
857	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)	858	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
858	&& ROWCOL_IS_BEFORE (screen.cur, selection.end))	859	&& ROWCOL_IS_BEFORE (screen.cur, selection.end))
…		…
868		869
869	if (screen.flags & Screen_WrapNext)	870	if (screen.flags & Screen_WrapNext)
870	{	871	{
871	screen.tlen[row] = -1;	872	screen.tlen[row] = -1;
872		873
		874	scr_do_wrap ();
		875
873	scr_do_wrap (); row = screen.cur.row + TermWin.saveLines;	876	row = screen.cur.row + TermWin.saveLines;
874
875	stp = screen.text[row]; /* _must_ refresh */	877	stp = screen.text[row]; /* _must_ refresh */
876	srp = screen.rend[row]; /* _must_ refresh */	878	srp = screen.rend[row]; /* _must_ refresh */
877	}	879	}
878		880
		881	// some utf-8 decoders "decode" surrogate characters: let's fix this.
		882	if (IN_RANGE (c, 0xd800, 0xdfff))
		883	c = 0xfffd;
		884
879	// rely on wcwidth to tell us the character width, at least for non-latin1	885	// rely on wcwidth to tell us the character width, at least for non-latin1
880	// do wcwidth before further replacements, as wcwidth says that line-drawing	886	// do wcwidth before further replacements, as wcwidth might return -1
881	// characters have width -1 (DOH!) on GNU/Linux sometimes.	887	// for the line drawing characters below as they might be invalid in the current
		888	// locale.
882	int width = c < 0x100 ? 1 : wcwidth (c);	889	int width = c < 0x100 ? 1 : wcwidth (c);
883		890
884	if (charsets[screen.charset] == '0') // DEC SPECIAL	891	if (charsets[screen.charset] == '0') // DEC SPECIAL
885	{	892	{
886	// vt100 special graphics and line drawing	893	// vt100 special graphics and line drawing
887	// 5f-7e standard vt100	894	// 5f-7e standard vt100
888	// 40-5e rxvt extension for extra curses acs chars	895	// 40-5e rxvt extension for extra curses acs chars
889	static uint16_t vt100_0[63] = { // 40 .. 7e	896	static uint16_t vt100_0[62] = { // 41 .. 7e
890	0x0000, 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 40-47 hi mr. snowman!	897	0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 41-47 hi mr. snowman!
891	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 48-4f	898	0, 0, 0, 0, 0, 0, 0, 0, // 48-4f
892	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 50-57	899	0, 0, 0, 0, 0, 0, 0, 0, // 50-57
893	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0020, // 58-5f	900	0, 0, 0, 0, 0, 0, 0, 0x0020, // 58-5f
894	0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67	901	0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67
895	0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba, // 68-6f	902	0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba, // 68-6f
896	0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c, // 70-77	903	0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c, // 70-77
897	0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, // 78-7e	904	0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, // 78-7e
898	};	905	};
899		906
900	if (c >= 0x40 && c <= 0x7e && vt100_0[c - 0x40])	907	if (c >= 0x41 && c <= 0x7e && vt100_0[c - 0x41])
901	{	908	{
902	c = vt100_0[c - 0x40];	909	c = vt100_0[c - 0x41];
903	width = 1;	910	width = 1; // vt100 line drawing characters are always single-width
904	}	911	}
905	}	912	}
906		913
907	if (screen.flags & Screen_Insert)	914	if (screen.flags & Screen_Insert)
908	scr_insdel_chars (width, INSERT);	915	scr_insdel_chars (width, INSERT);
909		916
910	if (width != 0)	917	if (width != 0)
911	{	918	{
912	// some utf-8 decoders decode surrogate characters.
913	if (0xd800 <= c && c <= 0xdfff)
914	c = 0xfffd;
915
916	#if !UNICODE_3	919	#if !UNICODE_3
917	// trim characters we can't store directly :(	920	// trim characters we can't store directly :(
918	if (c >= 0x10000)	921	if (c >= 0x10000)
919	# if ENABLE_COMBINING	922	# if ENABLE_COMBINING
920	c = rxvt_composite.compose (c); // map to lower 16 bits	923	c = rxvt_composite.compose (c); // map to lower 16 bits
…		…
943	col++;	946	col++;
944	} while (col < TermWin.ncol && stp[col] == NOCHAR);	947	} while (col < TermWin.ncol && stp[col] == NOCHAR);
945	}	948	}
946		949
947	rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));	950	rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
		951
		952	// if the character doesn't fit into the remaining columns...
		953	if (screen.cur.col >= last_col - width && last_col >= width)
		954	{
		955	// ...output spaces
		956	c = ' ';
		957	// and try the same character next loop iteration
		958	--str;
		959	}
948		960
949	do	961	do
950	{	962	{
951	stp[screen.cur.col] = c;	963	stp[screen.cur.col] = c;
952	srp[screen.cur.col] = rend;	964	srp[screen.cur.col] = rend;
…		…
971	{	983	{
972	stp[c] = ' ';	984	stp[c] = ' ';
973	srp[c] = rend;	985	srp[c] = rend;
974	}	986	}
975	}	987	}
976	else if (width == 0)	988	else // width == 0
977	{	989	{
978	#if ENABLE_COMBINING	990	#if ENABLE_COMBINING
979	// handle combining characters	991	// handle combining characters
980	// we just tag the accent on the previous on-screen character.	992	// we just tag the accent on the previous on-screen character.
981	// this is arguably not correct, but also arguably not wrong.	993	// this is arguably not correct, but also arguably not wrong.
982	// we don't handle double-width characters nicely yet.	994	// we don't handle double-width characters nicely yet.
983
984	text_t *tp;	995	text_t *tp;
985	rend_t *rp;	996	rend_t *rp;
986		997
987	if (screen.cur.col > 0)	998	if (screen.cur.col > 0)
988	{	999	{
…		…
1162	*/	1173	*/
1163	#if ENABLE_FRILLS	1174	#if ENABLE_FRILLS
1164	void	1175	void
1165	rxvt_term::scr_forwardindex ()	1176	rxvt_term::scr_forwardindex ()
1166	{	1177	{
1167	int row;	1178	int row;
1168		1179
1169	if (screen.cur.col < TermWin.ncol - 1)	1180	if (screen.cur.col < TermWin.ncol - 1)
1170	scr_gotorc (0, 1, R_RELATIVE \| C_RELATIVE);	1181	scr_gotorc (0, 1, R_RELATIVE \| C_RELATIVE);
1171	else	1182	else
1172	{	1183	{
…		…
1391	screen.tlen[row + row_offset] = 0;	1402	screen.tlen[row + row_offset] = 0;
1392	scr_blank_line (drawn_text[row], drawn_rend[row], (unsigned int)TermWin.ncol, ren);	1403	scr_blank_line (drawn_text[row], drawn_rend[row], (unsigned int)TermWin.ncol, ren);
1393	}	1404	}
1394	}	1405	}
1395		1406
		1407	#if ENABLE_FRILLS
		1408	void
		1409	rxvt_term::scr_erase_savelines ()
		1410	{
		1411	want_refresh = 1;
		1412	ZERO_SCROLLBACK ();
		1413
		1414	TermWin.nscrolled = 0;
		1415	}
		1416	#endif
		1417
1396	/* ------------------------------------------------------------------------- */	1418	/* ------------------------------------------------------------------------- */
1397	/*	1419	/*
1398	* Fill the screen with `E's	1420	* Fill the screen with `E's
1399	* XTERM_SEQ: Screen Alignment Test: ESC # 8	1421	* XTERM_SEQ: Screen Alignment Test: ESC # 8
1400	*/	1422	*/
1401	void	1423	void
1402	rxvt_term::scr_E ()	1424	rxvt_term::scr_E ()
1403	{	1425	{
1404	int i, j, k;	1426	int i, j, k;
1405	rend_t *r1, fs;	1427	rend_t *r1, fs;
1406		1428
1407	want_refresh = 1;	1429	want_refresh = 1;
1408	ZERO_SCROLLBACK ();	1430	ZERO_SCROLLBACK ();
1409		1431
1410	num_scr_allow = 0;	1432	num_scr_allow = 0;
…		…
1893	rxvt_term::scr_page (enum page_dirn direction, int nlines)	1915	rxvt_term::scr_page (enum page_dirn direction, int nlines)
1894	{	1916	{
1895	int n;	1917	int n;
1896	unsigned int oldviewstart;	1918	unsigned int oldviewstart;
1897		1919
1898	#ifdef DEBUG_STRICT
1899	assert ((nlines >= 0) && (nlines <= TermWin.nrow));
1900	#endif
1901	oldviewstart = TermWin.view_start;	1920	oldviewstart = TermWin.view_start;
		1921
1902	if (direction == UP)	1922	if (direction == UP)
1903	{	1923	{
1904	n = TermWin.view_start + nlines;	1924	n = TermWin.view_start + nlines;
1905	TermWin.view_start = min (n, TermWin.nscrolled);	1925	TermWin.view_start = min (n, TermWin.nscrolled);
1906	}	1926	}
1907	else	1927	else
1908	{	1928	{
1909	n = TermWin.view_start - nlines;	1929	n = TermWin.view_start - nlines;
1910	TermWin.view_start = max (n, 0);	1930	TermWin.view_start = max (n, 0);
1911	}	1931	}
		1932
1912	return scr_changeview (oldviewstart);	1933	return scr_changeview (oldviewstart);
1913	}	1934	}
1914		1935
1915	int	1936	int
1916	rxvt_term::scr_changeview (unsigned int oldviewstart)	1937	rxvt_term::scr_changeview (unsigned int oldviewstart)
…		…
2004	/*	2025	/*
2005	* Refresh the screen	2026	* Refresh the screen
2006	* drawn_text/drawn_rend contain the screen information before the update.	2027	* drawn_text/drawn_rend contain the screen information before the update.
2007	* screen.text/screen.rend contain what the screen will change to.	2028	* screen.text/screen.rend contain what the screen will change to.
2008	*/	2029	*/
2009
2010	#define FONT_WIDTH(X, Y) \
2011	(X)->per_char[ (Y) - (X)->min_char_or_byte2].width
2012	#define FONT_RBEAR(X, Y) \
2013	(X)->per_char[ (Y) - (X)->min_char_or_byte2].rbearing
2014	#define FONT_LBEAR(X, Y) \
2015	(X)->per_char[ (Y) - (X)->min_char_or_byte2].lbearing
2016	#define IS_FONT_CHAR(X, Y) \
2017	((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2)
2018
2019	void	2030	void
2020	rxvt_term::scr_refresh (unsigned char refresh_type)	2031	rxvt_term::scr_refresh (unsigned char refresh_type)
2021	{	2032	{
2022	unsigned char must_clear, /* use draw_string not draw_image_string */	2033	unsigned char must_clear, /* use draw_string not draw_image_string */
2023	showcursor; /* show the cursor */	2034	showcursor; /* show the cursor */
…		…
2042	refresh_count = 0;	2053	refresh_count = 0;
2043		2054
2044	row_offset = TermWin.saveLines - TermWin.view_start;	2055	row_offset = TermWin.saveLines - TermWin.view_start;
2045		2056
2046	#if XPM_BACKGROUND	2057	#if XPM_BACKGROUND
2047	must_clear \|= (bgPixmap.pixmap != None);	2058	must_clear \|= bgPixmap.pixmap != None;
2048	#endif	2059	#endif
2049	#if TRANSPARENT	2060	#if TRANSPARENT
2050	must_clear \|= ((options & Opt_transparent) && am_transparent);	2061	must_clear \|= (options & Opt_transparent) && am_transparent;
2051	#endif	2062	#endif
2052	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */	2063	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2053		2064
2054	/*	2065	/*
2055	* B: reverse any characters which are selected	2066	* B: reverse any characters which are selected
…		…
2079		2090
2080	crp = &screen.rend[screen.cur.row + TermWin.saveLines][col];	2091	crp = &screen.rend[screen.cur.row + TermWin.saveLines][col];
2081		2092
2082	if (showcursor && TermWin.focus)	2093	if (showcursor && TermWin.focus)
2083	{	2094	{
		2095	if (options & Opt_cursorUnderline)
		2096	*crp ^= RS_Uline;
		2097	else
		2098	{
2084	*crp ^= RS_RVid;	2099	*crp ^= RS_RVid;
		2100
2085	#ifndef NO_CURSORCOLOR	2101	#ifndef NO_CURSORCOLOR
2086	cc1 = *crp & (RS_fgMask \| RS_bgMask);	2102	cc1 = *crp & (RS_fgMask \| RS_bgMask);
2087	if (ISSET_PIXCOLOR (Color_cursor))	2103	if (ISSET_PIXCOLOR (Color_cursor))
2088	ccol1 = Color_cursor;	2104	ccol1 = Color_cursor;
2089	else	2105	else
2090	#ifdef CURSOR_COLOR_IS_RENDITION_COLOR	2106	#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2091	ccol1 = GET_FGCOLOR (rstyle);	2107	ccol1 = GET_FGCOLOR (rstyle);
2092	#else	2108	#else
2093	ccol1 = Color_fg;	2109	ccol1 = Color_fg;
2094	#endif	2110	#endif
2095	if (ISSET_PIXCOLOR (Color_cursor2))	2111	if (ISSET_PIXCOLOR (Color_cursor2))
2096	ccol2 = Color_cursor2;	2112	ccol2 = Color_cursor2;
2097	else	2113	else
2098	#ifdef CURSOR_COLOR_IS_RENDITION_COLOR	2114	#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2099	ccol2 = GET_BGCOLOR (rstyle);	2115	ccol2 = GET_BGCOLOR (rstyle);
2100	#else	2116	#else
2101	ccol2 = Color_bg;	2117	ccol2 = Color_bg;
2102	#endif	2118	#endif
2103	crp = SET_FGCOLOR (crp, ccol1);	2119	crp = SET_FGCOLOR (crp, ccol1);
2104	crp = SET_BGCOLOR (crp, ccol2);	2120	crp = SET_BGCOLOR (crp, ccol2);
2105	#endif	2121	#endif
		2122	}
2106	}	2123	}
2107	}	2124	}
2108		2125
2109	/* make sure no outline cursor is left around */	2126	/* make sure no outline cursor is left around */
2110	setoldcursor = 0;	2127	setoldcursor = 0;
…		…
2416	*/	2433	*/
2417	if (showcursor)	2434	if (showcursor)
2418	{	2435	{
2419	if (TermWin.focus)	2436	if (TermWin.focus)
2420	{	2437	{
		2438	if (options & Opt_cursorUnderline)
		2439	*crp ^= RS_Uline;
		2440	else
		2441	{
2421	*crp ^= RS_RVid;	2442	*crp ^= RS_RVid;
2422	#ifndef NO_CURSORCOLOR	2443	#ifndef NO_CURSORCOLOR
2423	crp = (crp & ~ (RS_fgMask \| RS_bgMask)) \| cc1;	2444	crp = (crp & ~ (RS_fgMask \| RS_bgMask)) \| cc1;
2424	#endif	2445	#endif
		2446	}
2425	}	2447	}
2426	else if (oldcursor.row >= 0)	2448	else if (oldcursor.row >= 0)
2427	{	2449	{
		2450	int cursorwidth = 1;
		2451	int col = oldcursor.col;
		2452
		2453	while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR)
		2454	col--;
		2455
		2456	while (col + cursorwidth < TermWin.ncol
		2457	&& drawn_text[oldcursor.row][col + cursorwidth] == NOCHAR)
		2458	cursorwidth++;
		2459
2428	#ifndef NO_CURSORCOLOR	2460	#ifndef NO_CURSORCOLOR
2429	if (ISSET_PIXCOLOR (Color_cursor))	2461	if (ISSET_PIXCOLOR (Color_cursor))
2430	XSetForeground (display->display, TermWin.gc, pix_colors[Color_cursor]);	2462	XSetForeground (display->display, TermWin.gc, pix_colors[Color_cursor]);
2431	#endif	2463	#endif
2432	int cursorwidth = 1;
2433	while (oldcursor.col + cursorwidth < TermWin.ncol
2434	&& drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR)
2435	cursorwidth++;
2436		2464
2437	XDrawRectangle (display->display, drawBuffer, TermWin.gc,	2465	XDrawRectangle (display->display, drawBuffer, TermWin.gc,
2438	Col2Pixel (oldcursor.col),	2466	Col2Pixel (col),
2439	Row2Pixel (oldcursor.row),	2467	Row2Pixel (oldcursor.row),
2440	(unsigned int) (Width2Pixel (cursorwidth) - 1),	2468	(unsigned int) (Width2Pixel (cursorwidth) - 1),
2441	(unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1));	2469	(unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1));
2442	}	2470	}
2443	}	2471	}
…		…
2902		2930
2903	int	2931	int
2904	rxvt_term::selection_request_other (Atom target, int selnum)	2932	rxvt_term::selection_request_other (Atom target, int selnum)
2905	{	2933	{
2906	Atom sel;	2934	Atom sel;
2907	#ifdef DEBUG_SELECT
2908	char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" };
2909	#endif
2910		2935
2911	selection_type \|= selnum;	2936	selection_type \|= selnum;
2912		2937
2913	if (selnum == Sel_Primary)	2938	if (selnum == Sel_Primary)
2914	sel = XA_PRIMARY;	2939	sel = XA_PRIMARY;
…		…
3409	selection_delimit_word (DN, &selection.end, &selection.end);	3434	selection_delimit_word (DN, &selection.end, &selection.end);
3410	}	3435	}
3411	else if (selection.clicks == 3)	3436	else if (selection.clicks == 3)
3412	{	3437	{
3413	#if ENABLE_FRILLS	3438	#if ENABLE_FRILLS
3414	if ((options & Opt_tripleclickwords))	3439	if (options & Opt_tripleclickwords)
3415	{	3440	{
3416	int end_row;	3441	int end_row;
3417		3442
3418	selection_delimit_word (UP, &selection.beg, &selection.beg);	3443	selection_delimit_word (UP, &selection.beg, &selection.beg);
3419	end_row = screen.tlen[selection.mark.row + TermWin.saveLines];	3444	end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
…		…
3437	if (ROWCOL_IS_AFTER (selection.mark, selection.beg))	3462	if (ROWCOL_IS_AFTER (selection.mark, selection.beg))
3438	selection.mark.col++;	3463	selection.mark.col++;
3439		3464
3440	selection.beg.col = 0;	3465	selection.beg.col = 0;
3441	selection.end.col = ncol;	3466	selection.end.col = ncol;
		3467
		3468	// select a complete logical line
		3469	while (selection.beg.row > -TermWin.saveLines
		3470	&& screen.tlen[selection.beg.row - 1 + TermWin.saveLines] == -1)
		3471	selection.beg.row--;
		3472
		3473	while (selection.end.row < TermWin.nrow
		3474	&& screen.tlen[selection.end.row + TermWin.saveLines] == -1)
		3475	selection.end.row++;
3442	}	3476	}
3443	}	3477	}
3444		3478
3445	if (button3 && buttonpress)	3479	if (button3 && buttonpress)
3446	{ /* mark may need to be changed */	3480	{ /* mark may need to be changed */
…		…
3526	*/	3560	*/
3527	void	3561	void
3528	rxvt_term::selection_send (const XSelectionRequestEvent &rq)	3562	rxvt_term::selection_send (const XSelectionRequestEvent &rq)
3529	{	3563	{
3530	XSelectionEvent ev;	3564	XSelectionEvent ev;
		3565	dDisp;
3531		3566
3532	ev.type = SelectionNotify;	3567	ev.type = SelectionNotify;
3533	ev.property = None;	3568	ev.property = None;
3534	ev.display = rq.display;	3569	ev.display = rq.display;
3535	ev.requestor = rq.requestor;	3570	ev.requestor = rq.requestor;
…		…
3549	*target++ = xa[XA_COMPOUND_TEXT];	3584	*target++ = xa[XA_COMPOUND_TEXT];
3550	#if X_HAVE_UTF8_STRING	3585	#if X_HAVE_UTF8_STRING
3551	*target++ = xa[XA_UTF8_STRING];	3586	*target++ = xa[XA_UTF8_STRING];
3552	#endif	3587	#endif
3553		3588
3554	XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM,	3589	XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM,
3555	32, PropModeReplace,	3590	32, PropModeReplace,
3556	(unsigned char *)target_list, target - target_list);	3591	(unsigned char *)target_list, target - target_list);
3557	ev.property = rq.property;	3592	ev.property = rq.property;
3558	}	3593	}
3559	#if TODO // TODO	3594	#if TODO // TODO
…		…
3562	/* TODO: Handle MULTIPLE */	3597	/* TODO: Handle MULTIPLE */
3563	}	3598	}
3564	#endif	3599	#endif
3565	else if (rq.target == xa[XA_TIMESTAMP] && selection.text)	3600	else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3566	{	3601	{
3567	XChangeProperty (display->display, rq.requestor, rq.property, rq.target,	3602	XChangeProperty (disp, rq.requestor, rq.property, rq.target,
3568	32, PropModeReplace, (unsigned char *)&selection_time, 1);	3603	32, PropModeReplace, (unsigned char *)&selection_time, 1);
3569	ev.property = rq.property;	3604	ev.property = rq.property;
3570	}	3605	}
3571	else if (rq.target == XA_STRING	3606	else if (rq.target == XA_STRING
3572	\|\| rq.target == xa[XA_TEXT]	3607	\|\| rq.target == xa[XA_TEXT]
…		…
3630	ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);	3665	ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3631	ct.nitems = strlen ((char *)ct.value);	3666	ct.nitems = strlen ((char *)ct.value);
3632	}	3667	}
3633	else	3668	else
3634	#endif	3669	#endif
3635	if (XwcTextListToTextProperty (display->display, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)	3670	if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3636	freect = 1;	3671	freect = 1;
3637	else	3672	else
3638	{	3673	{
3639	/* if we failed to convert then send it raw */	3674	/* if we failed to convert then send it raw */
3640	ct.value = (unsigned char *)cl;	3675	ct.value = (unsigned char *)cl;
3641	ct.nitems = selectlen;	3676	ct.nitems = selectlen;
3642	ct.encoding = target;	3677	ct.encoding = target;
3643	}	3678	}
3644		3679
3645	XChangeProperty (display->display, rq.requestor, rq.property,	3680	XChangeProperty (disp, rq.requestor, rq.property,
3646	ct.encoding, 8, PropModeReplace,	3681	ct.encoding, 8, PropModeReplace,
3647	ct.value, (int)ct.nitems);	3682	ct.value, (int)ct.nitems);
3648	ev.property = rq.property;	3683	ev.property = rq.property;
3649		3684
3650	if (freect)	3685	if (freect)
3651	XFree (ct.value);	3686	XFree (ct.value);
3652	}	3687	}
3653		3688
3654	XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev);	3689	XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev);
3655	}	3690	}
3656		3691
3657	/* ------------------------------------------------------------------------- *	3692	/* ------------------------------------------------------------------------- *
3658	* MOUSE ROUTINES *	3693	* MOUSE ROUTINES *
3659	* ------------------------------------------------------------------------- */	3694	* ------------------------------------------------------------------------- */
…		…
3779	while (*s)	3814	while (*s)
3780	scr_overlay_set (x++, y, *s++);	3815	scr_overlay_set (x++, y, *s++);
3781	}	3816	}
3782		3817
3783	void	3818	void
		3819	rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s)
		3820	{
		3821	while (*s)
		3822	{
		3823	text_t t = *s++;
		3824	int width = wcwidth (t);
		3825
		3826	while (width--)
		3827	{
		3828	scr_overlay_set (x++, y, t);
		3829	t = NOCHAR;
		3830	}
		3831	}
		3832	}
		3833
		3834	void
3784	rxvt_term::scr_swap_overlay ()	3835	rxvt_term::scr_swap_overlay ()
3785	{	3836	{
3786	if (!ov_text)	3837	if (!ov_text)
3787	return;	3838	return;
3788		3839

Diff Legend

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

Comparing rxvt-unicode/src/screen.C (file contents): Revision 1.153 by root, Fri Jan 14 17:15:26 2005 UTC vs. Revision 1.165 by root, Sun Jun 26 19:59:29 2005 UTC

Diff Legend

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.153 by root, Fri Jan 14 17:15:26 2005 UTC vs.
Revision 1.165 by root, Sun Jun 26 19:59:29 2005 UTC