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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.302 by sasha, Wed Feb 6 16:44:47 2008 UTC vs.
Revision 1.330 by root, Tue Dec 29 04:18:10 2009 UTC

…		…
83	ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col)	83	ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col)
84	#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \	84	#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \
85	ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)	85	ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
86		86
87	/*	87	/*
88	* CLEAR_ROWS : clear <num> rows starting from row <row>
89	* CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>	88	* CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
90	* ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
91	*/	89	*/
92	#define CLEAR_ROWS(row, num) \
93	if (mapped) \
94	XClearArea (dpy, vt, 0, \
95	Row2Pixel (row), (unsigned int)width, \
96	(unsigned int)Height2Pixel (num), False)
97
98	#define CLEAR_CHARS(x, y, num) \	90	#define CLEAR_CHARS(x, y, num) \
99	if (mapped) \	91	if (mapped) \
100	XClearArea (dpy, vt, x, y, \	92	XClearArea (dpy, vt, x, y, \
101	(unsigned int)Width2Pixel (num), \	93	(unsigned int)Width2Pixel (num), \
102	(unsigned int)Height2Pixel (1), False)	94	(unsigned int)Height2Pixel (1), False)
103		95
104	#define ERASE_ROWS(row, num) \
105	XFillRectangle (dpy, vt, gc, \
106	0, Row2Pixel (row), \
107	(unsigned int)width, \
108	(unsigned int)Height2Pixel (num))
109
110	/* ------------------------------------------------------------------------- *	96	/* ------------------------------------------------------------------------- *
111	* SCREEN `COMMON' ROUTINES *	97	* SCREEN `COMMON' ROUTINES *
112	* ------------------------------------------------------------------------- */	98	* ------------------------------------------------------------------------- */
113		99
114	/* Fill part/all of a line with blanks. */	100	/* Fill part/all of a line with blanks. */
…		…
146		132
147	l.l = 0;	133	l.l = 0;
148	l.f = 0;	134	l.f = 0;
149	}	135	}
150		136
		137	// nuke a single wide character at the given column
		138	void
		139	rxvt_term::scr_kill_char (line_t &l, int col) const NOTHROW
		140	{
		141	// find begin
		142	while (col > 0 && l.t[col] == NOCHAR)
		143	col--;
		144
		145	rend_t rend = l.r[col] & ~RS_baseattrMask;
		146	rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
		147
		148	// found start, nuke
		149	do {
		150	l.t[col] = ' ';
		151	l.r[col] = rend;
		152	col++;
		153	} while (col < ncol && l.t[col] == NOCHAR);
		154	}
		155
151	/* ------------------------------------------------------------------------- *	156	/* ------------------------------------------------------------------------- *
152	* SCREEN INITIALISATION *	157	* SCREEN INITIALISATION *
153	* ------------------------------------------------------------------------- */	158	* ------------------------------------------------------------------------- */
154		159
155	void	160	void
156	rxvt_term::scr_reset ()	161	rxvt_term::scr_reset ()
157	{	162	{
158	#if ENABLE_OVERLAY
159	scr_overlay_off ();
160	#endif
161
162	rvideo_mode = false;
163	view_start = 0;	163	view_start = 0;
164	num_scr = 0;	164	num_scr = 0;
165		165
166	if (ncol == 0)	166	if (ncol == 0)
167	ncol = 80;	167	ncol = 80;
…		…
169	if (nrow == 0)	169	if (nrow == 0)
170	nrow = 24;	170	nrow = 24;
171		171
172	if (ncol == prev_ncol && nrow == prev_nrow)	172	if (ncol == prev_ncol && nrow == prev_nrow)
173	return;	173	return;
174
175	if (current_screen != PRIMARY)
176	scr_swap_screen ();
177		174
178	// we need at least two lines for wrapping to work correctly	175	// we need at least two lines for wrapping to work correctly
179	while (nrow + saveLines < 2)	176	while (nrow + saveLines < 2)
180	{	177	{
181	//TODO//FIXME	178	//TODO//FIXME
…		…
281		278
282	if (top_row)	279	if (top_row)
283	{	280	{
284	// Re-wrap lines. This is rather ugly, possibly because I am too dumb	281	// Re-wrap lines. This is rather ugly, possibly because I am too dumb
285	// to come up with a lean and mean algorithm.	282	// to come up with a lean and mean algorithm.
		283	// TODO: maybe optimise when width didn't change
286		284
287	row_col_t ocur = screen.cur;	285	row_col_t ocur = screen.cur;
288	ocur.row = MOD (term_start + ocur.row, prev_total_rows);	286	ocur.row = MOD (term_start + ocur.row, prev_total_rows);
289		287
290	do	288	do
291	{	289	{
292	p = MOD (p - 1, prev_total_rows);	290	p = MOD (p - 1, prev_total_rows);
293	#ifdef DEBUG_STRICT
294	assert (old_buf [MOD (p, prev_total_rows)].t);	291	assert (old_buf [MOD (p, prev_total_rows)].t);
295	#endif
296	int plines = 1;	292	int plines = 1;
297	int llen = old_buf [MOD (p, prev_total_rows)].l;	293	int llen = old_buf [MOD (p, prev_total_rows)].l;
298		294
299	while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())	295	while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
300	{	296	{
…		…
394	delete old_ta;	390	delete old_ta;
395	delete old_ra;	391	delete old_ra;
396		392
397	clamp_it (screen.cur.row, 0, nrow - 1);	393	clamp_it (screen.cur.row, 0, nrow - 1);
398	clamp_it (screen.cur.col, 0, ncol - 1);	394	clamp_it (screen.cur.col, 0, ncol - 1);
		395	}
399		396
400	free (tabs);	397	free (tabs);
401	}	398	tabs = (char *)rxvt_malloc (ncol);
		399
		400	for (int col = ncol; --col; )
		401	tabs [col] = col % TABSIZE == 0;
402		402
403	CLEAR_ALL_SELECTION ();	403	CLEAR_ALL_SELECTION ();
404		404
405	prev_nrow = nrow;	405	prev_nrow = nrow;
406	prev_ncol = ncol;	406	prev_ncol = ncol;
407
408	tabs = (char *)rxvt_malloc (ncol);
409
410	for (int col = ncol; --col; )
411	tabs [col] = col % TABSIZE == 0;
412
413	if (current_screen != PRIMARY)
414	scr_swap_screen ();
415		407
416	tt_winch ();	408	tt_winch ();
417		409
418	HOOK_INVOKE ((this, HOOK_RESET, DT_END));	410	HOOK_INVOKE ((this, HOOK_RESET, DT_END));
419	}	411	}
…		…
431	delete ralloc; ralloc = 0;	423	delete ralloc; ralloc = 0;
432		424
433	free (row_buf);	425	free (row_buf);
434	free (swap_buf);	426	free (swap_buf);
435	free (drawn_buf);	427	free (drawn_buf);
		428	row_buf = 0; // signal that we freed all the arrays above
		429
436	free (tabs);	430	free (tabs);
437		431	tabs = 0;
438	row_buf = 0; // signal that we freed all the arrays
439	}	432	}
440	}	433	}
441		434
442	/* ------------------------------------------------------------------------- */	435	/* ------------------------------------------------------------------------- */
443	/*	436	/*
444	* Hard reset	437	* Hard/Soft reset
445	*/	438	*/
446	void	439	void
447	rxvt_term::scr_poweron ()	440	rxvt_term::scr_poweron ()
448	{	441	{
449	scr_release ();	442	scr_release ();
450	prev_nrow = prev_ncol = 0;	443	prev_nrow = prev_ncol = 0;
		444	rvideo_mode = false;
		445	scr_soft_reset ();
451	scr_reset ();	446	scr_reset ();
452		447
453	scr_clear (true);	448	scr_clear (true);
454	scr_refresh ();	449	scr_refresh ();
		450	}
		451
		452	void
		453	rxvt_term::scr_soft_reset ()
		454	{
		455	/* only affects modes, nothing drastic such as clearing the screen */
		456	#if ENABLE_OVERLAY
		457	scr_overlay_off ();
		458	#endif
		459
		460	if (current_screen != PRIMARY)
		461	scr_swap_screen ();
		462
		463	scr_scroll_region (0, MAX_ROWS - 1);
		464	scr_rendition (0, ~RS_None);
		465	scr_insert_mode (0);
455	}	466	}
456		467
457	/* ------------------------------------------------------------------------- *	468	/* ------------------------------------------------------------------------- *
458	* PROCESS SCREEN COMMANDS *	469	* PROCESS SCREEN COMMANDS *
459	* ------------------------------------------------------------------------- */	470	* ------------------------------------------------------------------------- */
…		…
497	}	508	}
498		509
499	/* boundary check in case screen size changed between SAVE and RESTORE */	510	/* boundary check in case screen size changed between SAVE and RESTORE */
500	min_it (s->cur.row, nrow - 1);	511	min_it (s->cur.row, nrow - 1);
501	min_it (s->cur.col, ncol - 1);	512	min_it (s->cur.col, ncol - 1);
502	#ifdef DEBUG_STRICT
503	assert (s->cur.row >= 0);	513	assert (s->cur.row >= 0);
504	assert (s->cur.col >= 0);	514	assert (s->cur.col >= 0);
505	#endif
506	}	515	}
507		516
508	void	517	void
509	rxvt_term::scr_swap_screen ()	518	rxvt_term::scr_swap_screen ()
510	{	519	{
…		…
770	scr_scroll_text (screen.tscroll, screen.bscroll, minlines);	779	scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
771	screen.cur.row -= minlines;	780	screen.cur.row -= minlines;
772	}	781	}
773	}	782	}
774		783
775	#ifdef DEBUG_STRICT
776	assert (screen.cur.col < ncol);	784	assert (screen.cur.col < ncol);
777	assert (screen.cur.row < nrow	785	assert (screen.cur.row < nrow
778	&& screen.cur.row >= top_row);	786	&& screen.cur.row >= top_row);
779	#endif
780	int row = screen.cur.row;	787	int row = screen.cur.row;
781		788
782	checksel = selection.op && current_screen == selection.screen ? 1 : 0;	789	checksel = selection.op && current_screen == selection.screen ? 1 : 0;
783		790
784	line_t *line = &ROW(row);	791	line_t *line = &ROW(row);
785		792
786	while (str < strend)	793	while (str < strend)
787	{	794	{
788	c = (unicode_t)*str++; // convert to rxvt-unicodes representation	795	c = (unicode_t)*str++; // convert to rxvt-unicodes representation
789		796
790	if (c < 0x20)	797	if (expect_false (c < 0x20))
791	if (c == C0_LF)	798	if (c == C0_LF)
792	{	799	{
793	max_it (line->l, screen.cur.col);	800	max_it (line->l, screen.cur.col);
794		801
795	screen.flags &= ~Screen_WrapNext;	802	screen.flags &= ~Screen_WrapNext;
…		…
814	{	821	{
815	scr_tab (1, true);	822	scr_tab (1, true);
816	continue;	823	continue;
817	}	824	}
818		825
		826	if (expect_false (
819	if (checksel /* see if we're writing within selection */	827	checksel /* see if we're writing within selection */
820	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)	828	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
821	&& ROWCOL_IS_BEFORE (screen.cur, selection.end))	829	&& ROWCOL_IS_BEFORE (screen.cur, selection.end)
		830	))
822	{	831	{
823	checksel = 0;	832	checksel = 0;
824	/*	833	/*
825	* If we wrote anywhere in the selected area, kill the selection	834	* If we wrote anywhere in the selected area, kill the selection
826	* XXX: should we kill the mark too? Possibly, but maybe that	835	* XXX: should we kill the mark too? Possibly, but maybe that
827	* should be a similar check.	836	* should be a similar check.
828	*/	837	*/
829	CLEAR_SELECTION ();	838	CLEAR_SELECTION ();
830	}	839	}
831		840
832	if (screen.flags & Screen_WrapNext)	841	if (expect_false (screen.flags & Screen_WrapNext))
833	{	842	{
834	scr_do_wrap ();	843	scr_do_wrap ();
835		844
836	line->l = ncol;	845	line->l = ncol;
837	line->is_longer (1);	846	line->is_longer (1);
…		…
839	row = screen.cur.row;	848	row = screen.cur.row;
840	line = &ROW(row); /* _must_ refresh */	849	line = &ROW(row); /* _must_ refresh */
841	}	850	}
842		851
843	// some utf-8 decoders "decode" surrogate characters: let's fix this.	852	// some utf-8 decoders "decode" surrogate characters: let's fix this.
844	if (IN_RANGE_INC (c, 0xd800, 0xdfff))	853	if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff)))
845	c = 0xfffd;	854	c = 0xfffd;
846		855
847	// rely on wcwidth to tell us the character width, do wcwidth before	856	// rely on wcwidth to tell us the character width, do wcwidth before
848	// further replacements, as wcwidth might return -1 for the line	857	// further replacements, as wcwidth might return -1 for the line
849	// drawing characters below as they might be invalid in the current	858	// drawing characters below as they might be invalid in the current
850	// locale.	859	// locale.
851	int width = WCWIDTH (c);	860	int width = WCWIDTH (c);
852		861
853	if (charsets [screen.charset] == '0') // DEC SPECIAL	862	if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL
854	{	863	{
855	// vt100 special graphics and line drawing	864	// vt100 special graphics and line drawing
856	// 5f-7e standard vt100	865	// 5f-7e standard vt100
857	// 40-5e rxvt extension for extra curses acs chars	866	// 40-5e rxvt extension for extra curses acs chars
858	static uint16_t vt100_0[62] = { // 41 .. 7e	867	static uint16_t vt100_0[62] = { // 41 .. 7e
…		…
871	c = vt100_0[c - 0x41];	880	c = vt100_0[c - 0x41];
872	width = 1; // vt100 line drawing characters are always single-width	881	width = 1; // vt100 line drawing characters are always single-width
873	}	882	}
874	}	883	}
875		884
876	if (screen.flags & Screen_Insert)	885	if (expect_false (screen.flags & Screen_Insert))
877	scr_insdel_chars (width, INSERT);	886	scr_insdel_chars (width, INSERT);
878		887
879	if (width != 0)	888	if (width != 0)
880	{	889	{
881	#if !UNICODE_3	890	#if !UNICODE_3
…		…
887	c = 0xfffd;	896	c = 0xfffd;
888	# endif	897	# endif
889	#endif	898	#endif
890		899
891	// nuke the character at this position, if required	900	// nuke the character at this position, if required
		901	if (expect_false (
892	if (line->t[screen.cur.col] == NOCHAR	902	line->t[screen.cur.col] == NOCHAR
893	\|\| (screen.cur.col < ncol - 1	903	\|\| (screen.cur.col < ncol - 1
894	&& line->t[screen.cur.col + 1] == NOCHAR))	904	&& line->t[screen.cur.col + 1] == NOCHAR)
		905	))
		906	scr_kill_char (*line, screen.cur.col);
		907
		908	rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
		909
		910	// if the character doesn't fit into the remaining columns...
		911	if (expect_false (screen.cur.col > ncol - width && ncol >= width))
895	{	912	{
896	int col = screen.cur.col;	913	// ... artificially enlargen the previous one
897
898	// find begin
899	while (col > 0 && line->t[col] == NOCHAR)
900	col--;
901
902	rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
903
904	// found begin, nuke
905	do {
906	line->t[col] = ' ';
907	line->r[col] = rend;
908	col++;
909	} while (col < ncol && line->t[col] == NOCHAR);
910	}
911
912	rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
913
914	// if the character doesn't fit into the remaining columns...
915	if (screen.cur.col > ncol - width && ncol >= width)
916	{
917	// ...output spaces
918	c = ' ';	914	c = NOCHAR;
919	// and try the same character next loop iteration	915	// and try the same character next loop iteration
920	--str;	916	--str;
921	}	917	}
922		918
923	line->touch ();	919	line->touch ();
…		…
925	do	921	do
926	{	922	{
927	line->t[screen.cur.col] = c;	923	line->t[screen.cur.col] = c;
928	line->r[screen.cur.col] = rend;	924	line->r[screen.cur.col] = rend;
929		925
930	if (screen.cur.col < ncol - 1)	926	if (expect_true (screen.cur.col < ncol - 1))
931	screen.cur.col++;	927	screen.cur.col++;
932	else	928	else
933	{	929	{
934	line->l = ncol;	930	line->l = ncol;
935	if (screen.flags & Screen_Autowrap)	931	if (screen.flags & Screen_Autowrap)
…		…
937	break;	933	break;
938	}	934	}
939		935
940	c = NOCHAR;	936	c = NOCHAR;
941	}	937	}
942	while (--width > 0);	938	while (expect_false (--width > 0));
943		939
944	// pad with spaces when overwriting wide character with smaller one	940	// pad with spaces when overwriting wide character with smaller one
945	if (!width)	941	if (expect_false (!width))
946	{	942	{
947	line->touch ();	943	line->touch ();
948		944
949	for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)	945	for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
950	{	946	{
951	line->t[c] = ' ';	947	line->t[c] = ' ';
952	line->r[c] = rend;	948	line->r[c] = rend;
953	}	949	}
954	}	950	}
955	}	951	}
		952	#if ENABLE_COMBINING
956	else // width == 0	953	else // width == 0
957	{	954	{
958	#if ENABLE_COMBINING	955	if (c != 0xfeff) // ignore BOM
959	// handle combining characters
960	// we just tag the accent on the previous on-screen character.
961	// this is arguably not correct, but also arguably not wrong.
962	// we don't handle double-width characters nicely yet.
963	line_t *linep;
964	text_t *tp;
965	rend_t *rp;
966
967	if (screen.cur.col > 0)
968	{	956	{
		957	// handle combining characters
		958	// we just tag the accent on the previous on-screen character.
		959	// this is arguably not correct, but also arguably not wrong.
		960	// we don't handle double-width characters nicely yet.
		961	line_t *linep;
		962	text_t *tp;
		963	rend_t *rp;
		964
		965	if (screen.cur.col > 0)
		966	{
969	linep = line;	967	linep = line;
970	tp = line->t + screen.cur.col - 1;	968	tp = line->t + screen.cur.col - 1;
971	rp = line->r + screen.cur.col - 1;	969	rp = line->r + screen.cur.col - 1;
		970	}
		971	else if (screen.cur.row > 0
		972	&& ROW(screen.cur.row - 1).is_longer ())
		973	{
		974	linep = &ROW(screen.cur.row - 1);
		975	tp = line->t + ncol - 1;
		976	rp = line->r + ncol - 1;
		977	}
		978	else
		979	continue;
		980
		981	linep->touch ();
		982
		983	while (*tp == NOCHAR && tp > linep->t)
		984	tp--, rp--;
		985
		986	// first try to find a precomposed character
		987	unicode_t n = rxvt_compose (*tp, c);
		988	if (n == NOCHAR)
		989	n = rxvt_composite.compose (*tp, c);
		990
		991	*tp = n;
		992	rp = SET_FONT (rp, FONTSET (rp)->find_font (tp));
972	}	993	}
973	else if (screen.cur.row > 0
974	&& ROW(screen.cur.row - 1).is_longer ())
975	{
976	linep = &ROW(screen.cur.row - 1);
977	tp = line->t + ncol - 1;
978	rp = line->r + ncol - 1;
979	}	994	}
980	else
981	continue;
982
983	linep->touch ();
984
985	while (*tp == NOCHAR && tp > linep->t)
986	tp--, rp--;
987
988	// first try to find a precomposed character
989	unicode_t n = rxvt_compose (*tp, c);
990	if (n == NOCHAR)
991	n = rxvt_composite.compose (*tp, c);
992
993	*tp = n;
994	rp = SET_FONT (rp, FONTSET (rp)->find_font (tp));
995	#endif	995	#endif
996	}
997	}	996	}
998		997
999	max_it (line->l, screen.cur.col);	998	max_it (line->l, screen.cur.col);
1000		999
1001	#ifdef DEBUG_STRICT
1002	assert (screen.cur.row >= 0);	1000	assert (screen.cur.row >= 0);
1003	#endif
1004	}	1001	}
1005		1002
1006	/* ------------------------------------------------------------------------- */	1003	/* ------------------------------------------------------------------------- */
1007	/*	1004	/*
1008	* Process Backspace. Move back the cursor back a position, wrap if have to	1005	* Process Backspace. Move back the cursor back a position, wrap if have to
…		…
1225	/*	1222	/*
1226	* Erase part or whole of a line	1223	* Erase part or whole of a line
1227	* XTERM_SEQ: Clear line to right: ESC [ 0 K	1224	* XTERM_SEQ: Clear line to right: ESC [ 0 K
1228	* XTERM_SEQ: Clear line to left : ESC [ 1 K	1225	* XTERM_SEQ: Clear line to left : ESC [ 1 K
1229	* XTERM_SEQ: Clear whole line : ESC [ 2 K	1226	* XTERM_SEQ: Clear whole line : ESC [ 2 K
		1227	* extension: clear to right unless wrapped: ESC [ 3 K
1230	*/	1228	*/
1231	void	1229	void
1232	rxvt_term::scr_erase_line (int mode) NOTHROW	1230	rxvt_term::scr_erase_line (int mode) NOTHROW
1233	{	1231	{
1234	unsigned int col, num;	1232	unsigned int col, num;
…		…
1243	line.touch ();	1241	line.touch ();
1244	line.is_longer (0);	1242	line.is_longer (0);
1245		1243
1246	switch (mode)	1244	switch (mode)
1247	{	1245	{
		1246	case 3:
		1247	if (screen.flags & Screen_WrapNext)
		1248	return;
		1249
		1250	/* fall through */
		1251
1248	case 0: /* erase to end of line */	1252	case 0: /* erase to end of line */
1249	col = screen.cur.col;	1253	col = screen.cur.col;
1250	num = ncol - col;	1254	num = ncol - col;
1251	min_it (line.l, col);	1255	min_it (line.l, col);
		1256
1252	if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)	1257	if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1253	\|\| ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))	1258	\|\| ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1254	CLEAR_SELECTION ();	1259	CLEAR_SELECTION ();
1255	break;	1260	break;
		1261
1256	case 1: /* erase to beginning of line */	1262	case 1: /* erase to beginning of line */
1257	col = 0;	1263	col = 0;
1258	num = screen.cur.col + 1;	1264	num = screen.cur.col + 1;
		1265
1259	if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)	1266	if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1260	\|\| ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))	1267	\|\| ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1261	CLEAR_SELECTION ();	1268	CLEAR_SELECTION ();
1262	break;	1269	break;
		1270
1263	case 2: /* erase whole line */	1271	case 2: /* erase whole line */
1264	col = 0;	1272	col = 0;
1265	num = ncol;	1273	num = ncol;
1266	line.l = 0;	1274	line.l = 0;
1267	if (selection.beg.row <= screen.cur.row	1275	if (selection.beg.row <= screen.cur.row
…		…
1325	if (row >= nrow) /* Out Of Bounds */	1333	if (row >= nrow) /* Out Of Bounds */
1326	return;	1334	return;
1327		1335
1328	min_it (num, nrow - row);	1336	min_it (num, nrow - row);
1329		1337
		1338	// TODO: the code below does not work when view_start != 0
		1339	// the workaround is to disable the clear and use a normal refresh
		1340	// when view_start != 0. mysterious.
1330	if (rstyle & (RS_RVid \| RS_Uline))	1341	if (rstyle & (RS_RVid \| RS_Uline))
1331	ren = (rend_t) ~RS_None;	1342	ren = (rend_t) ~RS_None;
1332	else if (GET_BASEBG (rstyle) == Color_bg)	1343	else if (GET_BASEBG (rstyle) == Color_bg)
1333	{	1344	{
1334	ren = DEFAULT_RSTYLE;	1345	ren = DEFAULT_RSTYLE;
1335	CLEAR_ROWS (row, num);	1346
		1347	if (mapped && !view_start)
		1348	XClearArea (dpy, vt, 0,
		1349	Row2Pixel (row - view_start), (unsigned int)width,
		1350	(unsigned int)Height2Pixel (num), False);
1336	}	1351	}
1337	else	1352	else
1338	{	1353	{
1339	ren = rstyle & (RS_fgMask \| RS_bgMask);	1354	ren = rstyle & (RS_fgMask \| RS_bgMask);
		1355
		1356	if (mapped && !view_start)
		1357	{
1340	gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];	1358	gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1341	XChangeGC (dpy, gc, GCForeground, &gcvalue);	1359	XChangeGC (dpy, gc, GCForeground, &gcvalue);
1342	ERASE_ROWS (row, num);	1360	XFillRectangle (dpy, vt, gc,
		1361	0, Row2Pixel (row - view_start),
		1362	(unsigned int)width,
		1363	(unsigned int)Height2Pixel (num));
1343	gcvalue.foreground = pix_colors[Color_fg];	1364	gcvalue.foreground = pix_colors[Color_fg];
1344	XChangeGC (dpy, gc, GCForeground, &gcvalue);	1365	XChangeGC (dpy, gc, GCForeground, &gcvalue);
		1366	}
1345	}	1367	}
1346		1368
1347	for (; num--; row++)	1369	for (; num--; row++)
1348	{	1370	{
1349	scr_blank_screen_mem (ROW(row), rstyle);	1371	scr_blank_screen_mem (ROW(row), rstyle);
		1372
		1373	if (!view_start)
1350	scr_blank_line (drawn_buf [row], 0, ncol, ren);	1374	scr_blank_line (drawn_buf [row], 0, ncol, ren);
1351	}	1375	}
1352	}	1376	}
1353		1377
1354	#if !ENABLE_MINIMAL	1378	#if !ENABLE_MINIMAL
1355	void	1379	void
…		…
1429	* Insert/Delete <count> characters from the current position	1453	* Insert/Delete <count> characters from the current position
1430	*/	1454	*/
1431	void	1455	void
1432	rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW	1456	rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1433	{	1457	{
1434	int col, row;
1435	rend_t tr;
1436
1437	want_refresh = 1;	1458	want_refresh = 1;
1438	ZERO_SCROLLBACK ();	1459	ZERO_SCROLLBACK ();
1439		1460
1440	if (count <= 0)	1461	if (count <= 0)
1441	return;	1462	return;
…		…
1443	scr_do_wrap ();	1464	scr_do_wrap ();
1444		1465
1445	selection_check (1);	1466	selection_check (1);
1446	min_it (count, ncol - screen.cur.col);	1467	min_it (count, ncol - screen.cur.col);
1447		1468
1448	row = screen.cur.row;	1469	int row = screen.cur.row;
1449		1470
1450	line_t *line = &ROW(row);	1471	line_t *line = &ROW(row);
1451		1472
1452	line->touch ();	1473	line->touch ();
1453	line->is_longer (0);	1474	line->is_longer (0);
1454		1475
		1476	// nuke wide spanning the start
		1477	if (line->t[screen.cur.col] == NOCHAR)
		1478	scr_kill_char (*line, screen.cur.col);
		1479
1455	switch (insdel)	1480	switch (insdel)
1456	{	1481	{
1457	case INSERT:	1482	case INSERT:
1458	for (col = ncol - 1; (col - count) >= screen.cur.col; col--)	1483	line->l = min (line->l + count, ncol);
		1484
		1485	if (line->t[screen.cur.col] == NOCHAR)
		1486	scr_kill_char (*line, screen.cur.col);
		1487
		1488	for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1459	{	1489	{
1460	line->t[col] = line->t[col - count];	1490	line->t[col] = line->t[col - count];
1461	line->r[col] = line->r[col - count];	1491	line->r[col] = line->r[col - count];
1462	}	1492	}
1463
1464	line->l = min (line->l + count, ncol);
1465		1493
1466	if (selection.op && current_screen == selection.screen	1494	if (selection.op && current_screen == selection.screen
1467	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))	1495	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1468	{	1496	{
1469	if (selection.end.row != screen.cur.row	1497	if (selection.end.row != screen.cur.row
…		…
1484	case ERASE:	1512	case ERASE:
1485	screen.cur.col += count; /* don't worry if > ncol */	1513	screen.cur.col += count; /* don't worry if > ncol */
1486	selection_check (1);	1514	selection_check (1);
1487	screen.cur.col -= count;	1515	screen.cur.col -= count;
1488		1516
1489	line->l = max (line->l - count, 0);	1517	// nuke wide char after the end
		1518	if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
		1519	scr_kill_char (*line, screen.cur.col + count);
		1520
1490	scr_blank_line (*line, screen.cur.col, count, rstyle);	1521	scr_blank_line (*line, screen.cur.col, count, rstyle);
1491	break;	1522	break;
1492		1523
1493	case DELETE:	1524	case DELETE:
1494	tr = line->r[ncol - 1] & (RS_fgMask \| RS_bgMask \| RS_baseattrMask);	1525	line->l = max (line->l - count, 0);
1495		1526
		1527	// nuke wide char spanning the end
		1528	if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
		1529	scr_kill_char (*line, screen.cur.col + count);
		1530
1496	for (col = screen.cur.col; (col + count) < ncol; col++)	1531	for (int col = screen.cur.col; (col + count) < ncol; col++)
1497	{	1532	{
1498	line->t[col] = line->t[col + count];	1533	line->t[col] = line->t[col + count];
1499	line->r[col] = line->r[col + count];	1534	line->r[col] = line->r[col + count];
1500	}	1535	}
1501		1536
1502	line->l = max (line->l - count, 0);
1503	scr_blank_line (*line, ncol - count, count, tr);	1537	scr_blank_line (*line, ncol - count, count, rstyle);
1504		1538
1505	if (selection.op && current_screen == selection.screen	1539	if (selection.op && current_screen == selection.screen
1506	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))	1540	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1507	{	1541	{
1508	if (selection.end.row != screen.cur.row	1542	if (selection.end.row != screen.cur.row
…		…
1886	XMapWindow (dpy, parent[0]);	1920	XMapWindow (dpy, parent[0]);
1887	# endif	1921	# endif
1888		1922
1889	# if ENABLE_FRILLS	1923	# if ENABLE_FRILLS
1890	if (option (Opt_urgentOnBell))	1924	if (option (Opt_urgentOnBell))
1891	{	1925	set_urgency (1);
1892	if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1893	{
1894	h->flags \|= XUrgencyHint;
1895	XSetWMHints (dpy, parent[0], h);
1896	}
1897	}
1898	# endif	1926	# endif
1899		1927
1900	if (option (Opt_visualBell))	1928	if (option (Opt_visualBell))
1901	{	1929	{
1902	rvideo_bell = true;	1930	rvideo_bell = true;
…		…
1915	void	1943	void
1916	rxvt_term::scr_printscreen (int fullhist) NOTHROW	1944	rxvt_term::scr_printscreen (int fullhist) NOTHROW
1917	{	1945	{
1918	#ifdef PRINTPIPE	1946	#ifdef PRINTPIPE
1919	int nrows, row_start;	1947	int nrows, row_start;
1920	FILE *fd;	1948	FILE *fd = popen_printer ();
1921		1949
1922	if ((fd = popen_printer ()) == NULL)	1950	if (!fd)
1923	return;	1951	return;
1924		1952
1925	if (fullhist)	1953	if (fullhist)
1926	{	1954	{
1927	nrows = nrow - top_row;	1955	nrows = nrow - top_row;
…		…
1933	row_start = view_start;	1961	row_start = view_start;
1934	}	1962	}
1935		1963
1936	wctomb (0, 0);	1964	wctomb (0, 0);
1937		1965
1938	for (int r1 = 0; r1 < nrows; r1++)	1966	for (int r1 = row_start; r1 < row_start + nrows; r1++)
1939	{	1967	{
1940	text_t *tp = ROW(r1).t;	1968	text_t *tp = ROW(r1).t;
1941	int len = ROW(r1).l;	1969	int len = ROW(r1).l;
1942		1970
1943	for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN	1971	for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
…		…
1972	* screen.text/screen.rend contain what the screen will change to.	2000	* screen.text/screen.rend contain what the screen will change to.
1973	*/	2001	*/
1974	void	2002	void
1975	rxvt_term::scr_refresh () NOTHROW	2003	rxvt_term::scr_refresh () NOTHROW
1976	{	2004	{
1977	unsigned char have_bg,
1978	showcursor; /* show the cursor */
1979	int16_t col, row, /* column/row we're processing */	2005	int16_t col, row, /* column/row we're processing */
1980	ocrow; /* old cursor row */	2006	ocrow; /* old cursor row */
1981	int i; /* tmp */	2007	int i; /* tmp */
1982	#ifndef NO_CURSORCOLOR	2008	#ifndef NO_CURSORCOLOR
1983	rend_t cc1; /* store colours at cursor position (s) */	2009	rend_t cc1; /* store colours at cursor position (s) */
…		…
1992	return;	2018	return;
1993		2019
1994	/*	2020	/*
1995	* A: set up vars	2021	* A: set up vars
1996	*/	2022	*/
1997	have_bg = 0;
1998	refresh_count = 0;	2023	refresh_count = 0;
1999		2024
		2025	unsigned int old_screen_flags = screen.flags;
		2026	char have_bg = 0;
2000	#ifdef HAVE_BG_PIXMAP	2027	#ifdef HAVE_BG_PIXMAP
2001	have_bg \|= bgPixmap.pixmap != None;	2028	have_bg = bgPixmap.pixmap != None;
2002	#endif	2029	#endif
2003	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */	2030	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2004		2031
2005	/*	2032	/*
2006	* B: reverse any characters which are selected	2033	* B: reverse any characters which are selected
2007	*/	2034	*/
2008	scr_reverse_selection ();	2035	scr_reverse_selection ();
		2036
		2037	HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
		2038	#if ENABLE_OVERLAY
		2039	scr_swap_overlay ();
		2040	#endif
		2041
		2042	char showcursor = screen.flags & Screen_VisibleCursor;
2009		2043
2010	/*	2044	/*
2011	* C: set the cursor character (s)	2045	* C: set the cursor character (s)
2012	*/	2046	*/
2013	{	2047	{
2014	unsigned char setoldcursor;	2048	unsigned char setoldcursor;
2015		2049
2016	showcursor = (screen.flags & Screen_VisibleCursor);
2017	#ifdef CURSOR_BLINK	2050	#ifdef CURSOR_BLINK
2018	if (hidden_cursor)	2051	if (hidden_cursor)
2019	showcursor = 0;	2052	showcursor = 0;
2020	#endif	2053	#endif
2021		2054
…		…
2094	oldcursor.col = screen.cur.col;	2127	oldcursor.col = screen.cur.col;
2095	}	2128	}
2096	}	2129	}
2097	}	2130	}
2098		2131
2099	HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2100	#if ENABLE_OVERLAY
2101	scr_swap_overlay ();
2102	#endif
2103
2104	#ifndef NO_SLOW_LINK_SUPPORT	2132	#ifndef NO_SLOW_LINK_SUPPORT
2105	/*	2133	/*
2106	* D: CopyArea pass - very useful for slower links	2134	* D: CopyArea pass - very useful for slower links
2107	* This has been deliberately kept simple.	2135	* This has been deliberately kept simple.
2108	*/	2136	*/
…		…
2197	continue;	2225	continue;
2198		2226
2199	// redraw one or more characters	2227	// redraw one or more characters
2200		2228
2201	// seek to the beginning of wide characters	2229	// seek to the beginning of wide characters
2202	while (stp[col] == NOCHAR && col > 0)	2230	while (expect_false (stp[col] == NOCHAR && col > 0))
2203	--col;	2231	--col;
2204		2232
2205	rend_t rend = srp[col]; /* screen rendition (target rendtion) */	2233	rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2206	text_t *text = stp + col;	2234	text_t *text = stp + col;
2207	int count = 1;	2235	int count = 1;
…		…
2214	for (i = 0; ++col < ncol; )	2242	for (i = 0; ++col < ncol; )
2215	{	2243	{
2216	if (stp[col] == NOCHAR)	2244	if (stp[col] == NOCHAR)
2217	{	2245	{
2218	dtp[col] = stp[col];	2246	dtp[col] = stp[col];
2219	drp[col] = rend;	2247	drp[col] = srp[col];
		2248
2220	count++;	2249	count++;
2221	i++;	2250	i++;
2222		2251
2223	continue;	2252	continue;
2224	}	2253	}
…		…
2244		2273
2245	col--; /* went one too far. move back */	2274	col--; /* went one too far. move back */
2246	count -= i; /* dump any matching trailing chars */	2275	count -= i; /* dump any matching trailing chars */
2247		2276
2248	// sometimes we optimize away the trailing NOCHAR's, add them back	2277	// sometimes we optimize away the trailing NOCHAR's, add them back
2249	while (i && text[count] == NOCHAR)	2278	while (expect_false (i && text[count] == NOCHAR))
2250	count++, i--;	2279	count++, i--;
2251		2280
2252	/*	2281	/*
2253	* Determine the attributes for the string	2282	* Determine the attributes for the string
2254	*/	2283	*/
2255	int fore = fgcolor_of (rend); // desired foreground	2284	int fore = fgcolor_of (rend); // desired foreground
2256	int back = bgcolor_of (rend); // desired background	2285	int back = bgcolor_of (rend); // desired background
2257		2286
2258	// only do special processing if any attributes are set, which is unlikely	2287	// only do special processing if any attributes are set, which is unlikely
2259	if (rend & (RS_Bold \| RS_Italic \| RS_Uline \| RS_RVid \| RS_Blink \| RS_Careful))	2288	if (expect_false (rend & (RS_Bold \| RS_Italic \| RS_Uline \| RS_RVid \| RS_Blink \| RS_Careful)))
2260	{	2289	{
2261	bool invert = rend & RS_RVid;	2290	bool invert = rend & RS_RVid;
2262		2291
2263	#ifndef NO_BOLD_UNDERLINE_REVERSE	2292	#ifndef NO_BOLD_UNDERLINE_REVERSE
2264	if (rend & RS_Bold && fore == Color_fg)	2293	if (rend & RS_Bold && fore == Color_fg)
…		…
2347	/*	2376	/*
2348	* Actually do the drawing of the string here	2377	* Actually do the drawing of the string here
2349	*/	2378	*/
2350	rxvt_font font = (fontset[GET_STYLE (rend)])[GET_FONT (rend)];	2379	rxvt_font font = (fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2351		2380
2352	if (have_bg && back == Color_bg)	2381	if (expect_true (have_bg && back == Color_bg))
2353	{	2382	{
2354	// this is very ugly, maybe push it into ->draw?	2383	// this is very ugly, maybe push it into ->draw?
2355		2384
2356	for (i = 0; i < count; i++) /* don't draw empty strings */	2385	for (i = 0; i < count; i++) /* don't draw empty strings */
2357	if (text[i] != ' ')	2386	if (text[i] != ' ')
…		…
2364	did_clear: ;	2393	did_clear: ;
2365	}	2394	}
2366	else	2395	else
2367	font->draw (*drawable, xpixel, ypixel, text, count, fore, back);	2396	font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2368		2397
2369	if (rend & RS_Uline && font->descent > 1 && fore != back)	2398	if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))
2370	{	2399	{
2371	#if ENABLE_FRILLS	2400	#if ENABLE_FRILLS
2372	if (ISSET_PIXCOLOR (Color_underline))	2401	if (ISSET_PIXCOLOR (Color_underline))
2373	XSetForeground (dpy, gc, pix_colors[Color_underline]);	2402	XSetForeground (dpy, gc, pix_colors[Color_underline]);
2374	else	2403	else
…		…
2379	xpixel, ypixel + font->ascent + 1,	2408	xpixel, ypixel + font->ascent + 1,
2380	xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);	2409	xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2381	}	2410	}
2382	} /* for (col....) */	2411	} /* for (col....) */
2383	} /* for (row....) */	2412	} /* for (row....) */
2384
2385	#if ENABLE_OVERLAY
2386	scr_swap_overlay ();
2387	#endif
2388	HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2389		2413
2390	/*	2414	/*
2391	* G: cleanup cursor and display outline cursor if necessary	2415	* G: cleanup cursor and display outline cursor if necessary
2392	*/	2416	*/
2393	if (showcursor)	2417	if (showcursor)
…		…
2432	}	2456	}
2433		2457
2434	/*	2458	/*
2435	* H: cleanup selection	2459	* H: cleanup selection
2436	*/	2460	*/
		2461	#if ENABLE_OVERLAY
		2462	scr_swap_overlay ();
		2463	#endif
		2464	HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
		2465
2437	scr_reverse_selection ();	2466	scr_reverse_selection ();
2438		2467
		2468	screen.flags = old_screen_flags;
2439	num_scr = 0;	2469	num_scr = 0;
2440	num_scr_allow = 1;	2470	num_scr_allow = 1;
2441	}	2471	}
2442		2472
2443	void	2473	void
…		…
2478		2508
2479	if (scrollBar.win)	2509	if (scrollBar.win)
2480	{	2510	{
2481	XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);	2511	XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2482	scrollBar.state = STATE_IDLE;	2512	scrollBar.state = STATE_IDLE;
2483	scrollbar_show (0);	2513	scrollBar.show (0);
2484	}	2514	}
2485		2515
2486	#endif	2516	#endif
2487		2517
2488	/* bgPixmap.apply () does not do the following : */	2518	/* bgPixmap.apply () does not do the following : */
…		…
2585	{	2615	{
2586	int row, wrote;	2616	int row, wrote;
2587	unsigned int width, towrite;	2617	unsigned int width, towrite;
2588	char r1[] = "\n";	2618	char r1[] = "\n";
2589		2619
2590	for (row = saveLines - nsaved;	2620	for (row = saveLines + top_row;
2591	row < saveLines + nrow - 1; row++)	2621	row < saveLines + nrow - 1; row++)
2592	{	2622	{
2593	width = row_buf[row].l >= 0 ? row_buf[row].l	2623	width = row_buf[row].l >= 0 ? row_buf[row].l
2594	: ncol;	2624	: ncol;
2595	for (towrite = width; towrite; towrite -= wrote)	2625	for (towrite = width; towrite; towrite -= wrote)
…		…
3702	h += 2; min_it (h, nrow);	3732	h += 2; min_it (h, nrow);
3703		3733
3704	x -= 1; clamp_it (x, 0, ncol - w);	3734	x -= 1; clamp_it (x, 0, ncol - w);
3705	y -= 1; clamp_it (y, 0, nrow - h);	3735	y -= 1; clamp_it (y, 0, nrow - h);
3706		3736
3707	ov_x = x; ov_y = y;	3737	ov.x = x; ov.y = y;
3708	ov_w = w; ov_h = h;	3738	ov.w = w; ov.h = h;
3709		3739
3710	ov_text = new text_t *[h];	3740	ov.text = new text_t *[h];
3711	ov_rend = new rend_t *[h];	3741	ov.rend = new rend_t *[h];
3712		3742
3713	for (y = 0; y < h; y++)	3743	for (y = 0; y < h; y++)
3714	{	3744	{
3715	text_t *tp = ov_text[y] = new text_t[w];	3745	text_t *tp = ov.text[y] = new text_t[w];
3716	rend_t *rp = ov_rend[y] = new rend_t[w];	3746	rend_t *rp = ov.rend[y] = new rend_t[w];
3717		3747
3718	text_t t0, t1, t2;	3748	text_t t0, t1, t2;
3719	rend_t r = OVERLAY_RSTYLE;	3749	rend_t r = OVERLAY_RSTYLE;
3720		3750
3721	if (y == 0)	3751	if (y == 0)
…		…
3740	}	3770	}
3741		3771
3742	void	3772	void
3743	rxvt_term::scr_overlay_off () NOTHROW	3773	rxvt_term::scr_overlay_off () NOTHROW
3744	{	3774	{
3745	if (!ov_text)	3775	if (!ov.text)
3746	return;	3776	return;
3747		3777
3748	want_refresh = 1;	3778	want_refresh = 1;
3749		3779
3750	for (int y = 0; y < ov_h; y++)	3780	for (int y = 0; y < ov.h; y++)
3751	{	3781	{
3752	delete [] ov_text[y];	3782	delete [] ov.text[y];
3753	delete [] ov_rend[y];	3783	delete [] ov.rend[y];
3754	}	3784	}
3755		3785
3756	delete [] ov_text; ov_text = 0;	3786	delete [] ov.text; ov.text = 0;
3757	delete [] ov_rend; ov_rend = 0;	3787	delete [] ov.rend; ov.rend = 0;
3758	}	3788	}
3759		3789
3760	void	3790	void
3761	rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW	3791	rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3762	{	3792	{
3763	if (!ov_text \|\| x >= ov_w - 2 \|\| y >= ov_h - 2)	3793	if (!ov.text \|\| x >= ov.w - 2 \|\| y >= ov.h - 2)
3764	return;	3794	return;
3765		3795
3766	x++, y++;	3796	x++, y++;
3767		3797
3768	ov_text[y][x] = text;	3798	ov.text[y][x] = text;
3769	ov_rend[y][x] = rend;	3799	ov.rend[y][x] = rend;
3770	}	3800	}
3771		3801
3772	void	3802	void
3773	rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW	3803	rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3774	{	3804	{
…		…
3793	}	3823	}
3794		3824
3795	void	3825	void
3796	rxvt_term::scr_swap_overlay () NOTHROW	3826	rxvt_term::scr_swap_overlay () NOTHROW
3797	{	3827	{
3798	if (!ov_text)	3828	if (!ov.text)
3799	return;	3829	return;
3800		3830
		3831	// hide cursor if it is within the overlay area
		3832	if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
		3833	&& IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
		3834	screen.flags &= ~Screen_VisibleCursor;
		3835
3801	// swap screen mem with overlay	3836	// swap screen mem with overlay
3802	for (int y = ov_h; y--; )	3837	for (int y = ov.h; y--; )
3803	{	3838	{
3804	text_t *t1 = ov_text[y];	3839	text_t *t1 = ov.text[y];
3805	rend_t *r1 = ov_rend[y];	3840	rend_t *r1 = ov.rend[y];
3806		3841
3807	text_t *t2 = ROW(y + ov_y + view_start).t + ov_x;	3842	text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3808	rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x;	3843	rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3809		3844
3810	for (int x = ov_w; x--; )	3845	for (int x = ov.w; x--; )
3811	{	3846	{
3812	text_t t = t1; t1++ = t2; t2++ = t;	3847	text_t t = t1; t1++ = t2; t2++ = t;
3813	rend_t r = r1; r1++ = r2; r2++ = SET_FONT (r, FONTSET (r)->find_font (t));	3848	rend_t r = r1; r1++ = r2; r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3814	}	3849	}
3815	}	3850	}

Diff Legend

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

Comparing rxvt-unicode/src/screen.C (file contents): Revision 1.302 by sasha, Wed Feb 6 16:44:47 2008 UTC vs. Revision 1.330 by root, Tue Dec 29 04:18:10 2009 UTC

Diff Legend

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.302 by sasha, Wed Feb 6 16:44:47 2008 UTC vs.
Revision 1.330 by root, Tue Dec 29 04:18:10 2009 UTC