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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.157 by root, Sun Feb 13 08:56:28 2005 UTC vs.
Revision 1.166 by root, Sun Jun 26 20:06:52 2005 UTC

…		…
202	/*	202	/*
203	* 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
204	* 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
205	*/	205	*/
206	screen.text = (text_t *)rxvt_calloc (total_rows, sizeof (text_t ));	206	screen.text = (text_t *)rxvt_calloc (total_rows, sizeof (text_t ));
207	buf_text = (text_t *)rxvt_calloc (total_rows, sizeof (text_t ));	207	buf_text = (text_t *)rxvt_calloc (total_rows, sizeof (text_t ));
208	drawn_text = (text_t *)rxvt_calloc (nrow, sizeof (text_t ));	208	drawn_text = (text_t *)rxvt_calloc (nrow, sizeof (text_t ));
209	swap.text = (text_t *)rxvt_calloc (nrow, sizeof (text_t ));	209	swap.text = (text_t *)rxvt_calloc (nrow, sizeof (text_t ));
210		210
211	screen.tlen = (int16_t *)rxvt_calloc (total_rows, sizeof (int16_t));	211	screen.tlen = (int16_t *)rxvt_calloc (total_rows, sizeof (int16_t));
212	swap.tlen = (int16_t *)rxvt_calloc (nrow, sizeof (int16_t));	212	swap.tlen = (int16_t *)rxvt_calloc (nrow, sizeof (int16_t));
213		213
214	screen.rend = (rend_t *)rxvt_calloc (total_rows, sizeof (rend_t ));	214	screen.rend = (rend_t *)rxvt_calloc (total_rows, sizeof (rend_t ));
215	buf_rend = (rend_t *)rxvt_calloc (total_rows, sizeof (rend_t ));	215	buf_rend = (rend_t *)rxvt_calloc (total_rows, sizeof (rend_t ));
216	drawn_rend = (rend_t *)rxvt_calloc (nrow, sizeof (rend_t ));	216	drawn_rend = (rend_t *)rxvt_calloc (nrow, sizeof (rend_t ));
217	swap.rend = (rend_t *)rxvt_calloc (nrow, sizeof (rend_t ));	217	swap.rend = (rend_t *)rxvt_calloc (nrow, sizeof (rend_t ));
218		218
219	for (p = 0; p < nrow; p++)	219	for (p = 0; p < nrow; p++)
220	{	220	{
221	q = p + TermWin.saveLines;	221	q = p + TermWin.saveLines;
222	scr_blank_screen_mem (screen.text, screen.rend, q, DEFAULT_RSTYLE);	222	scr_blank_screen_mem (screen.text, screen.rend, q, DEFAULT_RSTYLE);
…		…
699	selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */	699	selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */
700	}	700	}
701	else if (j >= row1 && j <= row2)	701	else if (j >= row1 && j <= row2)
702	{	702	{
703	/* move selected region too */	703	/* move selected region too */
704	selection.beg.row -= count;	704	selection.beg.row -= count;
705	selection.end.row -= count;	705	selection.end.row -= count;
706	selection.mark.row -= count;	706	selection.mark.row -= count;
707	}	707	}
708	}	708	}
709		709
710	selection_check (0); /* _after_ TermWin.nscrolled update */	710	selection_check (0); /* _after_ TermWin.nscrolled update */
…		…
718	i = row2 - row1 + 1;	718	i = row2 - row1 + 1;
719	MIN_IT (count, i);	719	MIN_IT (count, i);
720		720
721	if (j > 0)	721	if (j > 0)
722	{	722	{
723	/* A: scroll up */	723	/* scroll up */
724		724
725	/* A1: Copy lines that will get clobbered by the rotation */	725	/* Copy lines that will get clobbered by the rotation */
726	memcpy (buf_text, screen.text + row1, count * sizeof (text_t *));	726	memcpy (buf_text, screen.text + row1, count * sizeof (text_t *));
727	memcpy (buf_rend, screen.rend + row1, count * sizeof (rend_t *));	727	memcpy (buf_rend, screen.rend + row1, count * sizeof (rend_t *));
728		728
729	/* A2: Rotate lines */	729	/* Rotate lines */
730	i = row2 - row1 - count + 1;	730	i = row2 - row1 - count + 1;
731	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));
732	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 *));
733	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 *));
734		734
735	j = row2 - count + 1, i = count;	735	j = row2 - count + 1, i = count;
736	}	736	}
737	else /* if (j < 0) */	737	else /* if (j < 0) */
738	{	738	{
739	/* B: scroll down */	739	/* scroll down */
740		740
741	/* B1: Copy lines that will get clobbered by the rotation */	741	/* Copy lines that will get clobbered by the rotation */
742	for (i = 0, j = row2; i < count; i++, j--)	742	for (i = 0, j = row2; i < count; i++, j--)
743	{	743	{
744	buf_text[i] = screen.text[j];	744	buf_text[i] = screen.text[j];
745	buf_rend[i] = screen.rend[j];	745	buf_rend[i] = screen.rend[j];
746	}	746	}
747		747
748	/* B2: Rotate lines */	748	/* Rotate lines */
749	for (j = row2, i = j - count; i >= row1; i--, j--)	749	for (j = row2, i = j - count; i >= row1; i--, j--)
750	{	750	{
751	screen.tlen[j] = screen.tlen[i];	751	screen.tlen[j] = screen.tlen[i];
752	screen.text[j] = screen.text[i];	752	screen.text[j] = screen.text[i];
753	screen.rend[j] = screen.rend[i];	753	screen.rend[j] = screen.rend[i];
…		…
755		755
756	j = row1, i = count;	756	j = row1, i = count;
757	count = -count;	757	count = -count;
758	}	758	}
759		759
760	/* C: Resurrect lines */	760	/* Resurrect lines */
761	memset (screen.tlen + j, 0, i * sizeof (int16_t));	761	memset (screen.tlen + j, 0, i * sizeof (int16_t));
762	memcpy (screen.text + j, buf_text, i * sizeof (text_t *));	762	memcpy (screen.text + j, buf_text, i * sizeof (text_t *));
763	memcpy (screen.rend + j, buf_rend, i * sizeof (text_t *));	763	memcpy (screen.rend + j, buf_rend, i * sizeof (text_t *));
764	if (!spec) /* line length may not equal TermWin.ncol */	764	if (!spec) /* line length may not equal TermWin.ncol */
765	for (; i--; j++)	765	for (; i--; j++)
…		…
773	* Add text given in <str> of length <len> to screen struct	773	* Add text given in <str> of length <len> to screen struct
774	*/	774	*/
775	void	775	void
776	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)
777	{	777	{
		778	if (len <= 0) /* sanity */
		779	return;
		780
778	unsigned char checksel;	781	unsigned char checksel;
779	unicode_t c;	782	unicode_t c;
780	int i, row, last_col;	783	int i, row, last_col;
781	text_t *stp;	784	text_t *stp;
782	rend_t *srp;	785	rend_t *srp;
783		786	const unicode_t *strend = str + len;
784	if (len <= 0) /* sanity */
785	return;
786		787
787	want_refresh = 1;	788	want_refresh = 1;
788	ZERO_SCROLLBACK ();	789	ZERO_SCROLLBACK ();
789	last_col = TermWin.ncol;	790	last_col = TermWin.ncol;
790		791
…		…
815	checksel = selection.op && current_screen == selection.screen ? 1 : 0;	816	checksel = selection.op && current_screen == selection.screen ? 1 : 0;
816		817
817	stp = screen.text[row];	818	stp = screen.text[row];
818	srp = screen.rend[row];	819	srp = screen.rend[row];
819		820
820	while (len--)	821	while (str < strend)
821	{	822	{
822	c = *str++;	823	c = *str++;
823		824
824	if (c < 0x20)	825	if (c < 0x20)
825	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)
826	{	843	{
827	case C0_HT:
828	scr_tab (1, true);
829	continue;
830
831	case C0_LF:
832	if (screen.tlen[row] != -1) /* XXX: think about this */	844	if (screen.tlen[row] != -1) /* XXX: think about this */
833	MAX_IT (screen.tlen[row], screen.cur.col);	845	MAX_IT (screen.tlen[row], screen.cur.col);
834		846
835	screen.flags &= ~Screen_WrapNext;	847	screen.flags &= ~Screen_WrapNext;
836
837	if (screen.cur.row == screen.bscroll)
838	scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
839	else if (screen.cur.row < (TermWin.nrow - 1))
840	row = (++screen.cur.row) + TermWin.saveLines;
841
842	stp = screen.text[row]; /* _must_ refresh */
843	srp = screen.rend[row]; /* _must_ refresh */
844	continue;
845
846	case C0_CR:
847	if (screen.tlen[row] != -1) /* XXX: think about this */
848	MAX_IT (screen.tlen[row], screen.cur.col);
849
850	screen.flags &= ~Screen_WrapNext;
851	screen.cur.col = 0;	848	screen.cur.col = 0;
852	continue;	849	continue;
		850	}
		851	else if (c == C0_HT)
		852	{
		853	scr_tab (1, true);
		854	continue;
853	}	855	}
854		856
855	if (checksel /* see if we're writing within selection */	857	if (checksel /* see if we're writing within selection */
856	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)	858	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
857	&& ROWCOL_IS_BEFORE (screen.cur, selection.end))	859	&& ROWCOL_IS_BEFORE (screen.cur, selection.end))
…		…
867		869
868	if (screen.flags & Screen_WrapNext)	870	if (screen.flags & Screen_WrapNext)
869	{	871	{
870	screen.tlen[row] = -1;	872	screen.tlen[row] = -1;
871		873
		874	scr_do_wrap ();
		875
872	scr_do_wrap (); row = screen.cur.row + TermWin.saveLines;	876	row = screen.cur.row + TermWin.saveLines;
873
874	stp = screen.text[row]; /* _must_ refresh */	877	stp = screen.text[row]; /* _must_ refresh */
875	srp = screen.rend[row]; /* _must_ refresh */	878	srp = screen.rend[row]; /* _must_ refresh */
876	}	879	}
877		880
		881	// some utf-8 decoders "decode" surrogate characters: let's fix this.
		882	if (IN_RANGE (c, 0xd800, 0xdfff))
		883	c = 0xfffd;
		884
878	// 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
879	// do wcwidth before further replacements, as wcwidth says that line-drawing	886	// do wcwidth before further replacements, as wcwidth might return -1
880	// 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.
881	int width = c < 0x100 ? 1 : wcwidth (c);	889	int width = c < 0x100 ? 1 : wcwidth (c);
882		890
883	if (charsets[screen.charset] == '0') // DEC SPECIAL	891	if (charsets[screen.charset] == '0') // DEC SPECIAL
884	{	892	{
885	// vt100 special graphics and line drawing	893	// vt100 special graphics and line drawing
886	// 5f-7e standard vt100	894	// 5f-7e standard vt100
887	// 40-5e rxvt extension for extra curses acs chars	895	// 40-5e rxvt extension for extra curses acs chars
888	static uint16_t vt100_0[63] = { // 40 .. 7e	896	static uint16_t vt100_0[62] = { // 41 .. 7e
889	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!
890	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 48-4f	898	0, 0, 0, 0, 0, 0, 0, 0, // 48-4f
891	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 50-57	899	0, 0, 0, 0, 0, 0, 0, 0, // 50-57
892	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0020, // 58-5f	900	0, 0, 0, 0, 0, 0, 0, 0x0020, // 58-5f
893	0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67	901	0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67
894	0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba, // 68-6f	902	0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba, // 68-6f
895	0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c, // 70-77	903	0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c, // 70-77
896	0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, // 78-7e	904	0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, // 78-7e
897	};	905	};
898		906
899	if (c >= 0x40 && c <= 0x7e && vt100_0[c - 0x40])	907	if (c >= 0x41 && c <= 0x7e && vt100_0[c - 0x41])
900	{	908	{
901	c = vt100_0[c - 0x40];	909	c = vt100_0[c - 0x41];
902	width = 1;	910	width = 1; // vt100 line drawing characters are always single-width
903	}	911	}
904	}	912	}
905		913
906	if (screen.flags & Screen_Insert)	914	if (screen.flags & Screen_Insert)
907	scr_insdel_chars (width, INSERT);	915	scr_insdel_chars (width, INSERT);
908		916
909	if (width != 0)	917	if (width != 0)
910	{	918	{
911	// some utf-8 decoders decode surrogate characters.
912	if (0xd800 <= c && c <= 0xdfff)
913	c = 0xfffd;
914
915	#if !UNICODE_3	919	#if !UNICODE_3
916	// trim characters we can't store directly :(	920	// trim characters we can't store directly :(
917	if (c >= 0x10000)	921	if (c >= 0x10000)
918	# if ENABLE_COMBINING	922	# if ENABLE_COMBINING
919	c = rxvt_composite.compose (c); // map to lower 16 bits	923	c = rxvt_composite.compose (c); // map to lower 16 bits
…		…
942	col++;	946	col++;
943	} while (col < TermWin.ncol && stp[col] == NOCHAR);	947	} while (col < TermWin.ncol && stp[col] == NOCHAR);
944	}	948	}
945		949
946	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	}
947		960
948	do	961	do
949	{	962	{
950	stp[screen.cur.col] = c;	963	stp[screen.cur.col] = c;
951	srp[screen.cur.col] = rend;	964	srp[screen.cur.col] = rend;
…		…
970	{	983	{
971	stp[c] = ' ';	984	stp[c] = ' ';
972	srp[c] = rend;	985	srp[c] = rend;
973	}	986	}
974	}	987	}
975	else if (width == 0)	988	else // width == 0
976	{	989	{
977	#if ENABLE_COMBINING	990	#if ENABLE_COMBINING
978	// handle combining characters	991	// handle combining characters
979	// we just tag the accent on the previous on-screen character.	992	// we just tag the accent on the previous on-screen character.
980	// this is arguably not correct, but also arguably not wrong.	993	// this is arguably not correct, but also arguably not wrong.
981	// we don't handle double-width characters nicely yet.	994	// we don't handle double-width characters nicely yet.
982
983	text_t *tp;	995	text_t *tp;
984	rend_t *rp;	996	rend_t *rp;
985		997
986	if (screen.cur.col > 0)	998	if (screen.cur.col > 0)
987	{	999	{
…		…
1161	*/	1173	*/
1162	#if ENABLE_FRILLS	1174	#if ENABLE_FRILLS
1163	void	1175	void
1164	rxvt_term::scr_forwardindex ()	1176	rxvt_term::scr_forwardindex ()
1165	{	1177	{
1166	int row;	1178	int row;
1167		1179
1168	if (screen.cur.col < TermWin.ncol - 1)	1180	if (screen.cur.col < TermWin.ncol - 1)
1169	scr_gotorc (0, 1, R_RELATIVE \| C_RELATIVE);	1181	scr_gotorc (0, 1, R_RELATIVE \| C_RELATIVE);
1170	else	1182	else
1171	{	1183	{
…		…
1390	screen.tlen[row + row_offset] = 0;	1402	screen.tlen[row + row_offset] = 0;
1391	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);
1392	}	1404	}
1393	}	1405	}
1394		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
1395	/* ------------------------------------------------------------------------- */	1418	/* ------------------------------------------------------------------------- */
1396	/*	1419	/*
1397	* Fill the screen with `E's	1420	* Fill the screen with `E's
1398	* XTERM_SEQ: Screen Alignment Test: ESC # 8	1421	* XTERM_SEQ: Screen Alignment Test: ESC # 8
1399	*/	1422	*/
1400	void	1423	void
1401	rxvt_term::scr_E ()	1424	rxvt_term::scr_E ()
1402	{	1425	{
1403	int i, j, k;	1426	int i, j, k;
1404	rend_t *r1, fs;	1427	rend_t *r1, fs;
1405		1428
1406	want_refresh = 1;	1429	want_refresh = 1;
1407	ZERO_SCROLLBACK ();	1430	ZERO_SCROLLBACK ();
1408		1431
1409	num_scr_allow = 0;	1432	num_scr_allow = 0;
…		…
1892	rxvt_term::scr_page (enum page_dirn direction, int nlines)	1915	rxvt_term::scr_page (enum page_dirn direction, int nlines)
1893	{	1916	{
1894	int n;	1917	int n;
1895	unsigned int oldviewstart;	1918	unsigned int oldviewstart;
1896		1919
1897	#ifdef DEBUG_STRICT
1898	assert ((nlines >= 0) && (nlines <= TermWin.nrow));
1899	#endif
1900	oldviewstart = TermWin.view_start;	1920	oldviewstart = TermWin.view_start;
		1921
1901	if (direction == UP)	1922	if (direction == UP)
1902	{	1923	{
1903	n = TermWin.view_start + nlines;	1924	n = TermWin.view_start + nlines;
1904	TermWin.view_start = min (n, TermWin.nscrolled);	1925	TermWin.view_start = min (n, TermWin.nscrolled);
1905	}	1926	}
1906	else	1927	else
1907	{	1928	{
1908	n = TermWin.view_start - nlines;	1929	n = TermWin.view_start - nlines;
1909	TermWin.view_start = max (n, 0);	1930	TermWin.view_start = max (n, 0);
1910	}	1931	}
		1932
1911	return scr_changeview (oldviewstart);	1933	return scr_changeview (oldviewstart);
1912	}	1934	}
1913		1935
1914	int	1936	int
1915	rxvt_term::scr_changeview (unsigned int oldviewstart)	1937	rxvt_term::scr_changeview (unsigned int oldviewstart)
…		…
2003	/*	2025	/*
2004	* Refresh the screen	2026	* Refresh the screen
2005	* drawn_text/drawn_rend contain the screen information before the update.	2027	* drawn_text/drawn_rend contain the screen information before the update.
2006	* screen.text/screen.rend contain what the screen will change to.	2028	* screen.text/screen.rend contain what the screen will change to.
2007	*/	2029	*/
2008
2009	#define FONT_WIDTH(X, Y) \
2010	(X)->per_char[ (Y) - (X)->min_char_or_byte2].width
2011	#define FONT_RBEAR(X, Y) \
2012	(X)->per_char[ (Y) - (X)->min_char_or_byte2].rbearing
2013	#define FONT_LBEAR(X, Y) \
2014	(X)->per_char[ (Y) - (X)->min_char_or_byte2].lbearing
2015	#define IS_FONT_CHAR(X, Y) \
2016	((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2)
2017
2018	void	2030	void
2019	rxvt_term::scr_refresh (unsigned char refresh_type)	2031	rxvt_term::scr_refresh (unsigned char refresh_type)
2020	{	2032	{
2021	unsigned char must_clear, /* use draw_string not draw_image_string */	2033	unsigned char must_clear, /* use draw_string not draw_image_string */
2022	showcursor; /* show the cursor */	2034	showcursor; /* show the cursor */
…		…
2041	refresh_count = 0;	2053	refresh_count = 0;
2042		2054
2043	row_offset = TermWin.saveLines - TermWin.view_start;	2055	row_offset = TermWin.saveLines - TermWin.view_start;
2044		2056
2045	#if XPM_BACKGROUND	2057	#if XPM_BACKGROUND
2046	must_clear \|= (bgPixmap.pixmap != None);	2058	must_clear \|= bgPixmap.pixmap != None;
2047	#endif	2059	#endif
2048	#if TRANSPARENT	2060	#if TRANSPARENT
2049	must_clear \|= ((options & Opt_transparent) && am_transparent);	2061	must_clear \|= (options & Opt_transparent) && am_transparent;
2050	#endif	2062	#endif
2051	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */	2063	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2052		2064
2053	/*	2065	/*
2054	* B: reverse any characters which are selected	2066	* B: reverse any characters which are selected
…		…
2078		2090
2079	crp = &screen.rend[screen.cur.row + TermWin.saveLines][col];	2091	crp = &screen.rend[screen.cur.row + TermWin.saveLines][col];
2080		2092
2081	if (showcursor && TermWin.focus)	2093	if (showcursor && TermWin.focus)
2082	{	2094	{
		2095	if (options & Opt_cursorUnderline)
		2096	*crp ^= RS_Uline;
		2097	else
		2098	{
2083	*crp ^= RS_RVid;	2099	*crp ^= RS_RVid;
		2100
2084	#ifndef NO_CURSORCOLOR	2101	#ifndef NO_CURSORCOLOR
2085	cc1 = *crp & (RS_fgMask \| RS_bgMask);	2102	cc1 = *crp & (RS_fgMask \| RS_bgMask);
2086	if (ISSET_PIXCOLOR (Color_cursor))	2103	if (ISSET_PIXCOLOR (Color_cursor))
2087	ccol1 = Color_cursor;	2104	ccol1 = Color_cursor;
2088	else	2105	else
2089	#ifdef CURSOR_COLOR_IS_RENDITION_COLOR	2106	#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2090	ccol1 = GET_FGCOLOR (rstyle);	2107	ccol1 = GET_FGCOLOR (rstyle);
2091	#else	2108	#else
2092	ccol1 = Color_fg;	2109	ccol1 = Color_fg;
2093	#endif	2110	#endif
2094	if (ISSET_PIXCOLOR (Color_cursor2))	2111	if (ISSET_PIXCOLOR (Color_cursor2))
2095	ccol2 = Color_cursor2;	2112	ccol2 = Color_cursor2;
2096	else	2113	else
2097	#ifdef CURSOR_COLOR_IS_RENDITION_COLOR	2114	#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2098	ccol2 = GET_BGCOLOR (rstyle);	2115	ccol2 = GET_BGCOLOR (rstyle);
2099	#else	2116	#else
2100	ccol2 = Color_bg;	2117	ccol2 = Color_bg;
2101	#endif	2118	#endif
2102	crp = SET_FGCOLOR (crp, ccol1);	2119	crp = SET_FGCOLOR (crp, ccol1);
2103	crp = SET_BGCOLOR (crp, ccol2);	2120	crp = SET_BGCOLOR (crp, ccol2);
2104	#endif	2121	#endif
		2122	}
2105	}	2123	}
2106	}	2124	}
2107		2125
2108	/* make sure no outline cursor is left around */	2126	/* make sure no outline cursor is left around */
2109	setoldcursor = 0;	2127	setoldcursor = 0;
…		…
2415	*/	2433	*/
2416	if (showcursor)	2434	if (showcursor)
2417	{	2435	{
2418	if (TermWin.focus)	2436	if (TermWin.focus)
2419	{	2437	{
		2438	if (options & Opt_cursorUnderline)
		2439	*crp ^= RS_Uline;
		2440	else
		2441	{
2420	*crp ^= RS_RVid;	2442	*crp ^= RS_RVid;
2421	#ifndef NO_CURSORCOLOR	2443	#ifndef NO_CURSORCOLOR
2422	crp = (crp & ~ (RS_fgMask \| RS_bgMask)) \| cc1;	2444	crp = (crp & ~ (RS_fgMask \| RS_bgMask)) \| cc1;
2423	#endif	2445	#endif
		2446	}
2424	}	2447	}
2425	else if (oldcursor.row >= 0)	2448	else if (oldcursor.row >= 0)
2426	{	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
2427	#ifndef NO_CURSORCOLOR	2460	#ifndef NO_CURSORCOLOR
2428	if (ISSET_PIXCOLOR (Color_cursor))	2461	if (ISSET_PIXCOLOR (Color_cursor))
2429	XSetForeground (display->display, TermWin.gc, pix_colors[Color_cursor]);	2462	XSetForeground (display->display, TermWin.gc, pix_colors[Color_cursor]);
2430	#endif	2463	#endif
2431	int cursorwidth = 1;
2432	while (oldcursor.col + cursorwidth < TermWin.ncol
2433	&& drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR)
2434	cursorwidth++;
2435		2464
2436	XDrawRectangle (display->display, drawBuffer, TermWin.gc,	2465	XDrawRectangle (display->display, drawBuffer, TermWin.gc,
2437	Col2Pixel (oldcursor.col),	2466	Col2Pixel (col),
2438	Row2Pixel (oldcursor.row),	2467	Row2Pixel (oldcursor.row),
2439	(unsigned int) (Width2Pixel (cursorwidth) - 1),	2468	(unsigned int) (Width2Pixel (cursorwidth) - 1),
2440	(unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1));	2469	(unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1));
2441	}	2470	}
2442	}	2471	}
…		…
2901		2930
2902	int	2931	int
2903	rxvt_term::selection_request_other (Atom target, int selnum)	2932	rxvt_term::selection_request_other (Atom target, int selnum)
2904	{	2933	{
2905	Atom sel;	2934	Atom sel;
2906	#ifdef DEBUG_SELECT
2907	char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" };
2908	#endif
2909		2935
2910	selection_type \|= selnum;	2936	selection_type \|= selnum;
2911		2937
2912	if (selnum == Sel_Primary)	2938	if (selnum == Sel_Primary)
2913	sel = XA_PRIMARY;	2939	sel = XA_PRIMARY;
…		…
3788	while (*s)	3814	while (*s)
3789	scr_overlay_set (x++, y, *s++);	3815	scr_overlay_set (x++, y, *s++);
3790	}	3816	}
3791		3817
3792	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
3793	rxvt_term::scr_swap_overlay ()	3835	rxvt_term::scr_swap_overlay ()
3794	{	3836	{
3795	if (!ov_text)	3837	if (!ov_text)
3796	return;	3838	return;
3797		3839

Diff Legend

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

Comparing rxvt-unicode/src/screen.C (file contents): Revision 1.157 by root, Sun Feb 13 08:56:28 2005 UTC vs. Revision 1.166 by root, Sun Jun 26 20:06:52 2005 UTC

Diff Legend

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.157 by root, Sun Feb 13 08:56:28 2005 UTC vs.
Revision 1.166 by root, Sun Jun 26 20:06:52 2005 UTC