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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.296 by root, Wed Jan 9 01:05:24 2008 UTC vs.
Revision 1.328 by root, Sun Mar 29 13:36:03 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 drawBuffer vt
93
94	#define CLEAR_ROWS(row, num) \
95	if (mapped) \
96	XClearArea (dpy, drawBuffer, 0, \
97	Row2Pixel (row), (unsigned int)width, \
98	(unsigned int)Height2Pixel (num), False)
99
100	#define CLEAR_CHARS(x, y, num) \	90	#define CLEAR_CHARS(x, y, num) \
101	if (mapped) \	91	if (mapped) \
102	XClearArea (dpy, drawBuffer, x, y, \	92	XClearArea (dpy, vt, x, y, \
103	(unsigned int)Width2Pixel (num), \	93	(unsigned int)Width2Pixel (num), \
104	(unsigned int)Height2Pixel (1), False)	94	(unsigned int)Height2Pixel (1), False)
105
106	#define ERASE_ROWS(row, num) \
107	XFillRectangle (dpy, drawBuffer, gc, \
108	0, Row2Pixel (row), \
109	(unsigned int)width, \
110	(unsigned int)Height2Pixel (num))
111		95
112	/* ------------------------------------------------------------------------- *	96	/* ------------------------------------------------------------------------- *
113	* SCREEN `COMMON' ROUTINES *	97	* SCREEN `COMMON' ROUTINES *
114	* ------------------------------------------------------------------------- */	98	* ------------------------------------------------------------------------- */
115		99
…		…
148		132
149	l.l = 0;	133	l.l = 0;
150	l.f = 0;	134	l.f = 0;
151	}	135	}
152		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
153	/* ------------------------------------------------------------------------- *	156	/* ------------------------------------------------------------------------- *
154	* SCREEN INITIALISATION *	157	* SCREEN INITIALISATION *
155	* ------------------------------------------------------------------------- */	158	* ------------------------------------------------------------------------- */
156		159
157	void	160	void
158	rxvt_term::scr_reset ()	161	rxvt_term::scr_reset ()
159	{	162	{
160	#if ENABLE_OVERLAY
161	scr_overlay_off ();
162	#endif
163
164	rvideo_mode = false;
165	view_start = 0;	163	view_start = 0;
166	num_scr = 0;	164	num_scr = 0;
167		165
168	if (ncol == 0)	166	if (ncol == 0)
169	ncol = 80;	167	ncol = 80;
…		…
171	if (nrow == 0)	169	if (nrow == 0)
172	nrow = 24;	170	nrow = 24;
173		171
174	if (ncol == prev_ncol && nrow == prev_nrow)	172	if (ncol == prev_ncol && nrow == prev_nrow)
175	return;	173	return;
176
177	if (current_screen != PRIMARY)
178	scr_swap_screen ();
179		174
180	// we need at least two lines for wrapping to work correctly	175	// we need at least two lines for wrapping to work correctly
181	while (nrow + saveLines < 2)	176	while (nrow + saveLines < 2)
182	{	177	{
183	//TODO//FIXME	178	//TODO//FIXME
…		…
283		278
284	if (top_row)	279	if (top_row)
285	{	280	{
286	// 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
287	// 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
288		284
289	row_col_t ocur = screen.cur;	285	row_col_t ocur = screen.cur;
290	ocur.row = MOD (term_start + ocur.row, prev_total_rows);	286	ocur.row = MOD (term_start + ocur.row, prev_total_rows);
291		287
292	do	288	do
…		…
396	delete old_ta;	392	delete old_ta;
397	delete old_ra;	393	delete old_ra;
398		394
399	clamp_it (screen.cur.row, 0, nrow - 1);	395	clamp_it (screen.cur.row, 0, nrow - 1);
400	clamp_it (screen.cur.col, 0, ncol - 1);	396	clamp_it (screen.cur.col, 0, ncol - 1);
		397	}
401		398
402	free (tabs);	399	free (tabs);
403	}	400	tabs = (char *)rxvt_malloc (ncol);
		401
		402	for (int col = ncol; --col; )
		403	tabs [col] = col % TABSIZE == 0;
404		404
405	CLEAR_ALL_SELECTION ();	405	CLEAR_ALL_SELECTION ();
406		406
407	prev_nrow = nrow;	407	prev_nrow = nrow;
408	prev_ncol = ncol;	408	prev_ncol = ncol;
409
410	tabs = (char *)rxvt_malloc (ncol);
411
412	for (int col = ncol; --col; )
413	tabs [col] = col % TABSIZE == 0;
414
415	if (current_screen != PRIMARY)
416	scr_swap_screen ();
417		409
418	tt_winch ();	410	tt_winch ();
419		411
420	HOOK_INVOKE ((this, HOOK_RESET, DT_END));	412	HOOK_INVOKE ((this, HOOK_RESET, DT_END));
421	}	413	}
…		…
433	delete ralloc; ralloc = 0;	425	delete ralloc; ralloc = 0;
434		426
435	free (row_buf);	427	free (row_buf);
436	free (swap_buf);	428	free (swap_buf);
437	free (drawn_buf);	429	free (drawn_buf);
		430	row_buf = 0; // signal that we freed all the arrays above
		431
438	free (tabs);	432	free (tabs);
439		433	tabs = 0;
440	row_buf = 0; // signal that we freed all the arrays
441	}	434	}
442	}	435	}
443		436
444	/* ------------------------------------------------------------------------- */	437	/* ------------------------------------------------------------------------- */
445	/*	438	/*
446	* Hard reset	439	* Hard/Soft reset
447	*/	440	*/
448	void	441	void
449	rxvt_term::scr_poweron ()	442	rxvt_term::scr_poweron ()
450	{	443	{
451	scr_release ();	444	scr_release ();
452	prev_nrow = prev_ncol = 0;	445	prev_nrow = prev_ncol = 0;
		446	rvideo_mode = false;
		447	scr_soft_reset ();
453	scr_reset ();	448	scr_reset ();
454		449
455	scr_clear (true);	450	scr_clear (true);
456	scr_refresh ();	451	scr_refresh ();
		452	}
		453
		454	void
		455	rxvt_term::scr_soft_reset ()
		456	{
		457	/* only affects modes, nothing drastic such as clearing the screen */
		458	#if ENABLE_OVERLAY
		459	scr_overlay_off ();
		460	#endif
		461
		462	if (current_screen != PRIMARY)
		463	scr_swap_screen ();
		464
		465	scr_scroll_region (0, MAX_ROWS - 1);
		466	scr_rendition (0, ~RS_None);
		467	scr_insert_mode (0);
457	}	468	}
458		469
459	/* ------------------------------------------------------------------------- *	470	/* ------------------------------------------------------------------------- *
460	* PROCESS SCREEN COMMANDS *	471	* PROCESS SCREEN COMMANDS *
461	* ------------------------------------------------------------------------- */	472	* ------------------------------------------------------------------------- */
…		…
787		798
788	while (str < strend)	799	while (str < strend)
789	{	800	{
790	c = (unicode_t)*str++; // convert to rxvt-unicodes representation	801	c = (unicode_t)*str++; // convert to rxvt-unicodes representation
791		802
792	if (c < 0x20)	803	if (expect_false (c < 0x20))
793	if (c == C0_LF)	804	if (c == C0_LF)
794	{	805	{
795	max_it (line->l, screen.cur.col);	806	max_it (line->l, screen.cur.col);
796		807
797	screen.flags &= ~Screen_WrapNext;	808	screen.flags &= ~Screen_WrapNext;
…		…
816	{	827	{
817	scr_tab (1, true);	828	scr_tab (1, true);
818	continue;	829	continue;
819	}	830	}
820		831
		832	if (expect_false (
821	if (checksel /* see if we're writing within selection */	833	checksel /* see if we're writing within selection */
822	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)	834	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
823	&& ROWCOL_IS_BEFORE (screen.cur, selection.end))	835	&& ROWCOL_IS_BEFORE (screen.cur, selection.end)
		836	))
824	{	837	{
825	checksel = 0;	838	checksel = 0;
826	/*	839	/*
827	* If we wrote anywhere in the selected area, kill the selection	840	* If we wrote anywhere in the selected area, kill the selection
828	* XXX: should we kill the mark too? Possibly, but maybe that	841	* XXX: should we kill the mark too? Possibly, but maybe that
829	* should be a similar check.	842	* should be a similar check.
830	*/	843	*/
831	CLEAR_SELECTION ();	844	CLEAR_SELECTION ();
832	}	845	}
833		846
834	if (screen.flags & Screen_WrapNext)	847	if (expect_false (screen.flags & Screen_WrapNext))
835	{	848	{
836	scr_do_wrap ();	849	scr_do_wrap ();
837		850
838	line->l = ncol;	851	line->l = ncol;
839	line->is_longer (1);	852	line->is_longer (1);
…		…
841	row = screen.cur.row;	854	row = screen.cur.row;
842	line = &ROW(row); /* _must_ refresh */	855	line = &ROW(row); /* _must_ refresh */
843	}	856	}
844		857
845	// some utf-8 decoders "decode" surrogate characters: let's fix this.	858	// some utf-8 decoders "decode" surrogate characters: let's fix this.
846	if (IN_RANGE_INC (c, 0xd800, 0xdfff))	859	if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff)))
847	c = 0xfffd;	860	c = 0xfffd;
848		861
849	// rely on wcwidth to tell us the character width, do wcwidth before	862	// rely on wcwidth to tell us the character width, do wcwidth before
850	// further replacements, as wcwidth might return -1 for the line	863	// further replacements, as wcwidth might return -1 for the line
851	// drawing characters below as they might be invalid in the current	864	// drawing characters below as they might be invalid in the current
852	// locale.	865	// locale.
853	int width = WCWIDTH (c);	866	int width = WCWIDTH (c);
854		867
855	if (charsets [screen.charset] == '0') // DEC SPECIAL	868	if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL
856	{	869	{
857	// vt100 special graphics and line drawing	870	// vt100 special graphics and line drawing
858	// 5f-7e standard vt100	871	// 5f-7e standard vt100
859	// 40-5e rxvt extension for extra curses acs chars	872	// 40-5e rxvt extension for extra curses acs chars
860	static uint16_t vt100_0[62] = { // 41 .. 7e	873	static uint16_t vt100_0[62] = { // 41 .. 7e
…		…
873	c = vt100_0[c - 0x41];	886	c = vt100_0[c - 0x41];
874	width = 1; // vt100 line drawing characters are always single-width	887	width = 1; // vt100 line drawing characters are always single-width
875	}	888	}
876	}	889	}
877		890
878	if (screen.flags & Screen_Insert)	891	if (expect_false (screen.flags & Screen_Insert))
879	scr_insdel_chars (width, INSERT);	892	scr_insdel_chars (width, INSERT);
880		893
881	if (width != 0)	894	if (width != 0)
882	{	895	{
883	#if !UNICODE_3	896	#if !UNICODE_3
…		…
889	c = 0xfffd;	902	c = 0xfffd;
890	# endif	903	# endif
891	#endif	904	#endif
892		905
893	// nuke the character at this position, if required	906	// nuke the character at this position, if required
		907	if (expect_false (
894	if (line->t[screen.cur.col] == NOCHAR	908	line->t[screen.cur.col] == NOCHAR
895	\|\| (screen.cur.col < ncol - 1	909	\|\| (screen.cur.col < ncol - 1
896	&& line->t[screen.cur.col + 1] == NOCHAR))	910	&& line->t[screen.cur.col + 1] == NOCHAR)
		911	))
		912	scr_kill_char (*line, screen.cur.col);
		913
		914	rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
		915
		916	// if the character doesn't fit into the remaining columns...
		917	if (expect_false (screen.cur.col > ncol - width && ncol >= width))
897	{	918	{
898	int col = screen.cur.col;	919	// ... artificially enlargen the previous one
899
900	// find begin
901	while (col > 0 && line->t[col] == NOCHAR)
902	col--;
903
904	rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
905
906	// found begin, nuke
907	do {
908	line->t[col] = ' ';
909	line->r[col] = rend;
910	col++;
911	} while (col < ncol && line->t[col] == NOCHAR);
912	}
913
914	rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
915
916	// if the character doesn't fit into the remaining columns...
917	if (screen.cur.col > ncol - width && ncol >= width)
918	{
919	// ...output spaces
920	c = ' ';	920	c = NOCHAR;
921	// and try the same character next loop iteration	921	// and try the same character next loop iteration
922	--str;	922	--str;
923	}	923	}
924		924
925	line->touch ();	925	line->touch ();
…		…
927	do	927	do
928	{	928	{
929	line->t[screen.cur.col] = c;	929	line->t[screen.cur.col] = c;
930	line->r[screen.cur.col] = rend;	930	line->r[screen.cur.col] = rend;
931		931
932	if (screen.cur.col < ncol - 1)	932	if (expect_true (screen.cur.col < ncol - 1))
933	screen.cur.col++;	933	screen.cur.col++;
934	else	934	else
935	{	935	{
936	line->l = ncol;	936	line->l = ncol;
937	if (screen.flags & Screen_Autowrap)	937	if (screen.flags & Screen_Autowrap)
…		…
939	break;	939	break;
940	}	940	}
941		941
942	c = NOCHAR;	942	c = NOCHAR;
943	}	943	}
944	while (--width > 0);	944	while (expect_false (--width > 0));
945		945
946	// pad with spaces when overwriting wide character with smaller one	946	// pad with spaces when overwriting wide character with smaller one
947	if (!width)	947	if (expect_false (!width))
948	{	948	{
949	line->touch ();	949	line->touch ();
950		950
951	for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)	951	for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
952	{	952	{
953	line->t[c] = ' ';	953	line->t[c] = ' ';
954	line->r[c] = rend;	954	line->r[c] = rend;
955	}	955	}
956	}	956	}
957	}	957	}
		958	#if ENABLE_COMBINING
958	else // width == 0	959	else // width == 0
959	{	960	{
960	#if ENABLE_COMBINING	961	if (c != 0xfeff) // ignore BOM
961	// handle combining characters
962	// we just tag the accent on the previous on-screen character.
963	// this is arguably not correct, but also arguably not wrong.
964	// we don't handle double-width characters nicely yet.
965	line_t *linep;
966	text_t *tp;
967	rend_t *rp;
968
969	if (screen.cur.col > 0)
970	{	962	{
		963	// handle combining characters
		964	// we just tag the accent on the previous on-screen character.
		965	// this is arguably not correct, but also arguably not wrong.
		966	// we don't handle double-width characters nicely yet.
		967	line_t *linep;
		968	text_t *tp;
		969	rend_t *rp;
		970
		971	if (screen.cur.col > 0)
		972	{
971	linep = line;	973	linep = line;
972	tp = line->t + screen.cur.col - 1;	974	tp = line->t + screen.cur.col - 1;
973	rp = line->r + screen.cur.col - 1;	975	rp = line->r + screen.cur.col - 1;
		976	}
		977	else if (screen.cur.row > 0
		978	&& ROW(screen.cur.row - 1).is_longer ())
		979	{
		980	linep = &ROW(screen.cur.row - 1);
		981	tp = line->t + ncol - 1;
		982	rp = line->r + ncol - 1;
		983	}
		984	else
		985	continue;
		986
		987	linep->touch ();
		988
		989	while (*tp == NOCHAR && tp > linep->t)
		990	tp--, rp--;
		991
		992	// first try to find a precomposed character
		993	unicode_t n = rxvt_compose (*tp, c);
		994	if (n == NOCHAR)
		995	n = rxvt_composite.compose (*tp, c);
		996
		997	*tp = n;
		998	rp = SET_FONT (rp, FONTSET (rp)->find_font (tp));
974	}	999	}
975	else if (screen.cur.row > 0
976	&& ROW(screen.cur.row - 1).is_longer ())
977	{
978	linep = &ROW(screen.cur.row - 1);
979	tp = line->t + ncol - 1;
980	rp = line->r + ncol - 1;
981	}	1000	}
982	else
983	continue;
984
985	linep->touch ();
986
987	while (*tp == NOCHAR && tp > linep->t)
988	tp--, rp--;
989
990	// first try to find a precomposed character
991	unicode_t n = rxvt_compose (*tp, c);
992	if (n == NOCHAR)
993	n = rxvt_composite.compose (*tp, c);
994
995	*tp = n;
996	rp = SET_FONT (rp, FONTSET (rp)->find_font (tp));
997	#endif	1001	#endif
998	}
999	}	1002	}
1000		1003
1001	max_it (line->l, screen.cur.col);	1004	max_it (line->l, screen.cur.col);
1002		1005
1003	#ifdef DEBUG_STRICT	1006	#ifdef DEBUG_STRICT
…		…
1017	{	1020	{
1018	if (screen.cur.row > 0)	1021	if (screen.cur.row > 0)
1019	{	1022	{
1020	#ifdef TERMCAP_HAS_BW	1023	#ifdef TERMCAP_HAS_BW
1021	screen.cur.col = ncol - 1;	1024	screen.cur.col = ncol - 1;
1022	screen.cur.row--;	1025	--screen.cur.row;
		1026
1023	want_refresh = 1;	1027	want_refresh = 1;
1024	#endif	1028	#endif
1025	}	1029	}
1026	}	1030	}
1027	else	1031	else
…		…
1226	/*	1230	/*
1227	* Erase part or whole of a line	1231	* Erase part or whole of a line
1228	* XTERM_SEQ: Clear line to right: ESC [ 0 K	1232	* XTERM_SEQ: Clear line to right: ESC [ 0 K
1229	* XTERM_SEQ: Clear line to left : ESC [ 1 K	1233	* XTERM_SEQ: Clear line to left : ESC [ 1 K
1230	* XTERM_SEQ: Clear whole line : ESC [ 2 K	1234	* XTERM_SEQ: Clear whole line : ESC [ 2 K
		1235	* extension: clear to right unless wrapped: ESC [ 3 K
1231	*/	1236	*/
1232	void	1237	void
1233	rxvt_term::scr_erase_line (int mode) NOTHROW	1238	rxvt_term::scr_erase_line (int mode) NOTHROW
1234	{	1239	{
1235	unsigned int col, num;	1240	unsigned int col, num;
…		…
1244	line.touch ();	1249	line.touch ();
1245	line.is_longer (0);	1250	line.is_longer (0);
1246		1251
1247	switch (mode)	1252	switch (mode)
1248	{	1253	{
		1254	case 3:
		1255	if (screen.flags & Screen_WrapNext)
		1256	return;
		1257
		1258	/* fall through */
		1259
1249	case 0: /* erase to end of line */	1260	case 0: /* erase to end of line */
1250	col = screen.cur.col;	1261	col = screen.cur.col;
1251	num = ncol - col;	1262	num = ncol - col;
1252	min_it (line.l, col);	1263	min_it (line.l, col);
		1264
1253	if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)	1265	if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1254	\|\| ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))	1266	\|\| ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1255	CLEAR_SELECTION ();	1267	CLEAR_SELECTION ();
1256	break;	1268	break;
		1269
1257	case 1: /* erase to beginning of line */	1270	case 1: /* erase to beginning of line */
1258	col = 0;	1271	col = 0;
1259	num = screen.cur.col + 1;	1272	num = screen.cur.col + 1;
		1273
1260	if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)	1274	if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1261	\|\| ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))	1275	\|\| ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1262	CLEAR_SELECTION ();	1276	CLEAR_SELECTION ();
1263	break;	1277	break;
		1278
1264	case 2: /* erase whole line */	1279	case 2: /* erase whole line */
1265	col = 0;	1280	col = 0;
1266	num = ncol;	1281	num = ncol;
1267	line.l = 0;	1282	line.l = 0;
1268	if (selection.beg.row <= screen.cur.row	1283	if (selection.beg.row <= screen.cur.row
…		…
1326	if (row >= nrow) /* Out Of Bounds */	1341	if (row >= nrow) /* Out Of Bounds */
1327	return;	1342	return;
1328		1343
1329	min_it (num, nrow - row);	1344	min_it (num, nrow - row);
1330		1345
		1346	// TODO: the code below does not work when view_start != 0
		1347	// the workaround is to disable the clear and use a normal refresh
		1348	// when view_start != 0. mysterious.
1331	if (rstyle & (RS_RVid \| RS_Uline))	1349	if (rstyle & (RS_RVid \| RS_Uline))
1332	ren = (rend_t) ~RS_None;	1350	ren = (rend_t) ~RS_None;
1333	else if (GET_BASEBG (rstyle) == Color_bg)	1351	else if (GET_BASEBG (rstyle) == Color_bg)
1334	{	1352	{
1335	ren = DEFAULT_RSTYLE;	1353	ren = DEFAULT_RSTYLE;
1336	CLEAR_ROWS (row, num);	1354
		1355	if (mapped && !view_start)
		1356	XClearArea (dpy, vt, 0,
		1357	Row2Pixel (row - view_start), (unsigned int)width,
		1358	(unsigned int)Height2Pixel (num), False);
1337	}	1359	}
1338	else	1360	else
1339	{	1361	{
1340	ren = rstyle & (RS_fgMask \| RS_bgMask);	1362	ren = rstyle & (RS_fgMask \| RS_bgMask);
		1363
		1364	if (mapped && !view_start)
		1365	{
1341	gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];	1366	gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1342	XChangeGC (dpy, gc, GCForeground, &gcvalue);	1367	XChangeGC (dpy, gc, GCForeground, &gcvalue);
1343	ERASE_ROWS (row, num);	1368	XFillRectangle (dpy, vt, gc,
		1369	0, Row2Pixel (row - view_start),
		1370	(unsigned int)width,
		1371	(unsigned int)Height2Pixel (num));
1344	gcvalue.foreground = pix_colors[Color_fg];	1372	gcvalue.foreground = pix_colors[Color_fg];
1345	XChangeGC (dpy, gc, GCForeground, &gcvalue);	1373	XChangeGC (dpy, gc, GCForeground, &gcvalue);
		1374	}
1346	}	1375	}
1347		1376
1348	for (; num--; row++)	1377	for (; num--; row++)
1349	{	1378	{
1350	scr_blank_screen_mem (ROW(row), rstyle);	1379	scr_blank_screen_mem (ROW(row), rstyle);
		1380
		1381	if (!view_start)
1351	scr_blank_line (drawn_buf [row], 0, ncol, ren);	1382	scr_blank_line (drawn_buf [row], 0, ncol, ren);
1352	}	1383	}
1353	}	1384	}
1354		1385
1355	#if !ENABLE_MINIMAL	1386	#if !ENABLE_MINIMAL
1356	void	1387	void
…		…
1430	* Insert/Delete <count> characters from the current position	1461	* Insert/Delete <count> characters from the current position
1431	*/	1462	*/
1432	void	1463	void
1433	rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW	1464	rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1434	{	1465	{
1435	int col, row;
1436	rend_t tr;
1437
1438	want_refresh = 1;	1466	want_refresh = 1;
1439	ZERO_SCROLLBACK ();	1467	ZERO_SCROLLBACK ();
1440		1468
1441	if (count <= 0)	1469	if (count <= 0)
1442	return;	1470	return;
…		…
1444	scr_do_wrap ();	1472	scr_do_wrap ();
1445		1473
1446	selection_check (1);	1474	selection_check (1);
1447	min_it (count, ncol - screen.cur.col);	1475	min_it (count, ncol - screen.cur.col);
1448		1476
1449	row = screen.cur.row;	1477	int row = screen.cur.row;
1450		1478
1451	line_t *line = &ROW(row);	1479	line_t *line = &ROW(row);
1452		1480
1453	line->touch ();	1481	line->touch ();
1454	line->is_longer (0);	1482	line->is_longer (0);
1455		1483
		1484	// nuke wide spanning the start
		1485	if (line->t[screen.cur.col] == NOCHAR)
		1486	scr_kill_char (*line, screen.cur.col);
		1487
1456	switch (insdel)	1488	switch (insdel)
1457	{	1489	{
1458	case INSERT:	1490	case INSERT:
1459	for (col = ncol - 1; (col - count) >= screen.cur.col; col--)	1491	line->l = min (line->l + count, ncol);
		1492
		1493	if (line->t[screen.cur.col] == NOCHAR)
		1494	scr_kill_char (*line, screen.cur.col);
		1495
		1496	for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1460	{	1497	{
1461	line->t[col] = line->t[col - count];	1498	line->t[col] = line->t[col - count];
1462	line->r[col] = line->r[col - count];	1499	line->r[col] = line->r[col - count];
1463	}	1500	}
1464
1465	line->l = min (line->l + count, ncol);
1466		1501
1467	if (selection.op && current_screen == selection.screen	1502	if (selection.op && current_screen == selection.screen
1468	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))	1503	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1469	{	1504	{
1470	if (selection.end.row != screen.cur.row	1505	if (selection.end.row != screen.cur.row
…		…
1485	case ERASE:	1520	case ERASE:
1486	screen.cur.col += count; /* don't worry if > ncol */	1521	screen.cur.col += count; /* don't worry if > ncol */
1487	selection_check (1);	1522	selection_check (1);
1488	screen.cur.col -= count;	1523	screen.cur.col -= count;
1489		1524
1490	line->l = max (line->l - count, 0);	1525	// nuke wide char after the end
		1526	if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
		1527	scr_kill_char (*line, screen.cur.col + count);
		1528
1491	scr_blank_line (*line, screen.cur.col, count, rstyle);	1529	scr_blank_line (*line, screen.cur.col, count, rstyle);
1492	break;	1530	break;
1493		1531
1494	case DELETE:	1532	case DELETE:
1495	tr = line->r[ncol - 1] & (RS_fgMask \| RS_bgMask \| RS_baseattrMask);	1533	line->l = max (line->l - count, 0);
1496		1534
		1535	// nuke wide char spanning the end
		1536	if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
		1537	scr_kill_char (*line, screen.cur.col + count);
		1538
1497	for (col = screen.cur.col; (col + count) < ncol; col++)	1539	for (int col = screen.cur.col; (col + count) < ncol; col++)
1498	{	1540	{
1499	line->t[col] = line->t[col + count];	1541	line->t[col] = line->t[col + count];
1500	line->r[col] = line->r[col + count];	1542	line->r[col] = line->r[col + count];
1501	}	1543	}
1502		1544
1503	line->l = max (line->l - count, 0);
1504	scr_blank_line (*line, ncol - count, count, tr);	1545	scr_blank_line (*line, ncol - count, count, rstyle);
1505		1546
1506	if (selection.op && current_screen == selection.screen	1547	if (selection.op && current_screen == selection.screen
1507	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))	1548	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1508	{	1549	{
1509	if (selection.end.row != screen.cur.row	1550	if (selection.end.row != screen.cur.row
…		…
1887	XMapWindow (dpy, parent[0]);	1928	XMapWindow (dpy, parent[0]);
1888	# endif	1929	# endif
1889		1930
1890	# if ENABLE_FRILLS	1931	# if ENABLE_FRILLS
1891	if (option (Opt_urgentOnBell))	1932	if (option (Opt_urgentOnBell))
1892	{	1933	set_urgency (1);
1893	if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1894	{
1895	h->flags \|= XUrgencyHint;
1896	XSetWMHints (dpy, parent[0], h);
1897	}
1898	}
1899	# endif	1934	# endif
1900		1935
1901	if (option (Opt_visualBell))	1936	if (option (Opt_visualBell))
1902	{	1937	{
1903	rvideo_bell = true;	1938	rvideo_bell = true;
…		…
1916	void	1951	void
1917	rxvt_term::scr_printscreen (int fullhist) NOTHROW	1952	rxvt_term::scr_printscreen (int fullhist) NOTHROW
1918	{	1953	{
1919	#ifdef PRINTPIPE	1954	#ifdef PRINTPIPE
1920	int nrows, row_start;	1955	int nrows, row_start;
1921	FILE *fd;	1956	FILE *fd = popen_printer ();
1922		1957
1923	if ((fd = popen_printer ()) == NULL)	1958	if (!fd)
1924	return;	1959	return;
1925		1960
1926	if (fullhist)	1961	if (fullhist)
1927	{	1962	{
1928	nrows = nrow - top_row;	1963	nrows = nrow - top_row;
…		…
1973	* screen.text/screen.rend contain what the screen will change to.	2008	* screen.text/screen.rend contain what the screen will change to.
1974	*/	2009	*/
1975	void	2010	void
1976	rxvt_term::scr_refresh () NOTHROW	2011	rxvt_term::scr_refresh () NOTHROW
1977	{	2012	{
1978	unsigned char have_bg,
1979	showcursor; /* show the cursor */
1980	int16_t col, row, /* column/row we're processing */	2013	int16_t col, row, /* column/row we're processing */
1981	ocrow; /* old cursor row */	2014	ocrow; /* old cursor row */
1982	int i; /* tmp */	2015	int i; /* tmp */
1983	#ifndef NO_CURSORCOLOR	2016	#ifndef NO_CURSORCOLOR
1984	rend_t cc1; /* store colours at cursor position (s) */	2017	rend_t cc1; /* store colours at cursor position (s) */
…		…
1993	return;	2026	return;
1994		2027
1995	/*	2028	/*
1996	* A: set up vars	2029	* A: set up vars
1997	*/	2030	*/
1998	have_bg = 0;
1999	refresh_count = 0;	2031	refresh_count = 0;
2000		2032
		2033	unsigned int old_screen_flags = screen.flags;
		2034	char have_bg = 0;
2001	#ifdef HAVE_BG_PIXMAP	2035	#ifdef HAVE_BG_PIXMAP
2002	have_bg \|= bgPixmap.pixmap != None;	2036	have_bg = bgPixmap.pixmap != None;
2003	#endif	2037	#endif
2004	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */	2038	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2005		2039
2006	/*	2040	/*
2007	* B: reverse any characters which are selected	2041	* B: reverse any characters which are selected
2008	*/	2042	*/
2009	scr_reverse_selection ();	2043	scr_reverse_selection ();
		2044
		2045	HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
		2046	#if ENABLE_OVERLAY
		2047	scr_swap_overlay ();
		2048	#endif
		2049
		2050	char showcursor = screen.flags & Screen_VisibleCursor;
2010		2051
2011	/*	2052	/*
2012	* C: set the cursor character (s)	2053	* C: set the cursor character (s)
2013	*/	2054	*/
2014	{	2055	{
2015	unsigned char setoldcursor;	2056	unsigned char setoldcursor;
2016		2057
2017	showcursor = (screen.flags & Screen_VisibleCursor);
2018	#ifdef CURSOR_BLINK	2058	#ifdef CURSOR_BLINK
2019	if (hidden_cursor)	2059	if (hidden_cursor)
2020	showcursor = 0;	2060	showcursor = 0;
2021	#endif	2061	#endif
2022		2062
…		…
2095	oldcursor.col = screen.cur.col;	2135	oldcursor.col = screen.cur.col;
2096	}	2136	}
2097	}	2137	}
2098	}	2138	}
2099		2139
2100	HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2101	#if ENABLE_OVERLAY
2102	scr_swap_overlay ();
2103	#endif
2104
2105	#ifndef NO_SLOW_LINK_SUPPORT	2140	#ifndef NO_SLOW_LINK_SUPPORT
2106	/*	2141	/*
2107	* D: CopyArea pass - very useful for slower links	2142	* D: CopyArea pass - very useful for slower links
2108	* This has been deliberately kept simple.	2143	* This has been deliberately kept simple.
2109	*/	2144	*/
…		…
2198	continue;	2233	continue;
2199		2234
2200	// redraw one or more characters	2235	// redraw one or more characters
2201		2236
2202	// seek to the beginning of wide characters	2237	// seek to the beginning of wide characters
2203	while (stp[col] == NOCHAR && col > 0)	2238	while (expect_false (stp[col] == NOCHAR && col > 0))
2204	--col;	2239	--col;
2205		2240
2206	rend_t rend = srp[col]; /* screen rendition (target rendtion) */	2241	rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2207	text_t *text = stp + col;	2242	text_t *text = stp + col;
2208	int count = 1;	2243	int count = 1;
…		…
2215	for (i = 0; ++col < ncol; )	2250	for (i = 0; ++col < ncol; )
2216	{	2251	{
2217	if (stp[col] == NOCHAR)	2252	if (stp[col] == NOCHAR)
2218	{	2253	{
2219	dtp[col] = stp[col];	2254	dtp[col] = stp[col];
2220	drp[col] = rend;	2255	drp[col] = srp[col];
		2256
2221	count++;	2257	count++;
2222	i++;	2258	i++;
2223		2259
2224	continue;	2260	continue;
2225	}	2261	}
…		…
2245		2281
2246	col--; /* went one too far. move back */	2282	col--; /* went one too far. move back */
2247	count -= i; /* dump any matching trailing chars */	2283	count -= i; /* dump any matching trailing chars */
2248		2284
2249	// sometimes we optimize away the trailing NOCHAR's, add them back	2285	// sometimes we optimize away the trailing NOCHAR's, add them back
2250	while (i && text[count] == NOCHAR)	2286	while (expect_false (i && text[count] == NOCHAR))
2251	count++, i--;	2287	count++, i--;
2252		2288
2253	/*	2289	/*
2254	* Determine the attributes for the string	2290	* Determine the attributes for the string
2255	*/	2291	*/
2256	int fore = fgcolor_of (rend); // desired foreground	2292	int fore = fgcolor_of (rend); // desired foreground
2257	int back = bgcolor_of (rend); // desired background	2293	int back = bgcolor_of (rend); // desired background
2258		2294
2259	// only do special processing if any attributes are set, which is unlikely	2295	// only do special processing if any attributes are set, which is unlikely
2260	if (rend & (RS_Bold \| RS_Italic \| RS_Uline \| RS_RVid \| RS_Blink \| RS_Careful))	2296	if (expect_false (rend & (RS_Bold \| RS_Italic \| RS_Uline \| RS_RVid \| RS_Blink \| RS_Careful)))
2261	{	2297	{
2262	bool invert = rend & RS_RVid;	2298	bool invert = rend & RS_RVid;
2263		2299
2264	#ifndef NO_BOLD_UNDERLINE_REVERSE	2300	#ifndef NO_BOLD_UNDERLINE_REVERSE
2265	if (rend & RS_Bold && fore == Color_fg)	2301	if (rend & RS_Bold && fore == Color_fg)
…		…
2348	/*	2384	/*
2349	* Actually do the drawing of the string here	2385	* Actually do the drawing of the string here
2350	*/	2386	*/
2351	rxvt_font font = (fontset[GET_STYLE (rend)])[GET_FONT (rend)];	2387	rxvt_font font = (fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2352		2388
2353	if (have_bg && back == Color_bg)	2389	if (expect_true (have_bg && back == Color_bg))
2354	{	2390	{
2355	// this is very ugly, maybe push it into ->draw?	2391	// this is very ugly, maybe push it into ->draw?
2356		2392
2357	for (i = 0; i < count; i++) /* don't draw empty strings */	2393	for (i = 0; i < count; i++) /* don't draw empty strings */
2358	if (text[i] != ' ')	2394	if (text[i] != ' ')
…		…
2365	did_clear: ;	2401	did_clear: ;
2366	}	2402	}
2367	else	2403	else
2368	font->draw (*drawable, xpixel, ypixel, text, count, fore, back);	2404	font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2369		2405
2370	if (rend & RS_Uline && font->descent > 1 && fore != back)	2406	if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))
2371	{	2407	{
2372	#if ENABLE_FRILLS	2408	#if ENABLE_FRILLS
2373	if (ISSET_PIXCOLOR (Color_underline))	2409	if (ISSET_PIXCOLOR (Color_underline))
2374	XSetForeground (dpy, gc, pix_colors[Color_underline]);	2410	XSetForeground (dpy, gc, pix_colors[Color_underline]);
2375	else	2411	else
2376	#endif	2412	#endif
2377	XSetForeground (dpy, gc, pix_colors[fore]);	2413	XSetForeground (dpy, gc, pix_colors[fore]);
2378		2414
2379	XDrawLine (dpy, drawBuffer, gc,	2415	XDrawLine (dpy, vt, gc,
2380	xpixel, ypixel + font->ascent + 1,	2416	xpixel, ypixel + font->ascent + 1,
2381	xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);	2417	xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2382	}	2418	}
2383	} /* for (col....) */	2419	} /* for (col....) */
2384	} /* for (row....) */	2420	} /* for (row....) */
2385
2386	#if ENABLE_OVERLAY
2387	scr_swap_overlay ();
2388	#endif
2389	HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2390		2421
2391	/*	2422	/*
2392	* G: cleanup cursor and display outline cursor if necessary	2423	* G: cleanup cursor and display outline cursor if necessary
2393	*/	2424	*/
2394	if (showcursor)	2425	if (showcursor)
…		…
2422	XSetForeground (dpy, gc, pix_colors[Color_cursor]);	2453	XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2423	else	2454	else
2424	#endif	2455	#endif
2425	XSetForeground (dpy, gc, pix_colors[ccol1]);	2456	XSetForeground (dpy, gc, pix_colors[ccol1]);
2426		2457
2427	XDrawRectangle (dpy, drawBuffer, gc,	2458	XDrawRectangle (dpy, vt, gc,
2428	Col2Pixel (col),	2459	Col2Pixel (col),
2429	Row2Pixel (oldcursor.row),	2460	Row2Pixel (oldcursor.row),
2430	(unsigned int) (Width2Pixel (cursorwidth) - 1),	2461	(unsigned int) (Width2Pixel (cursorwidth) - 1),
2431	(unsigned int) (Height2Pixel (1) - lineSpace - 1));	2462	(unsigned int) (Height2Pixel (1) - lineSpace - 1));
2432	}	2463	}
2433	}	2464	}
2434		2465
2435	/*	2466	/*
2436	* H: cleanup selection	2467	* H: cleanup selection
2437	*/	2468	*/
		2469	#if ENABLE_OVERLAY
		2470	scr_swap_overlay ();
		2471	#endif
		2472	HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
		2473
2438	scr_reverse_selection ();	2474	scr_reverse_selection ();
2439		2475
		2476	screen.flags = old_screen_flags;
2440	num_scr = 0;	2477	num_scr = 0;
2441	num_scr_allow = 1;	2478	num_scr_allow = 1;
2442	}	2479	}
2443		2480
2444	void	2481	void
…		…
2475		2512
2476	XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);	2513	XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2477	XClearWindow (dpy, parent[0]);	2514	XClearWindow (dpy, parent[0]);
2478	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);	2515	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2479		2516
2480	# if HAVE_SCROLLBARS
2481	if (scrollBar.win)	2517	if (scrollBar.win)
2482	{	2518	{
2483	XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);	2519	XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2484	scrollBar.setIdle ();	2520	scrollBar.state = STATE_IDLE;
2485	scrollbar_show (0);	2521	scrollBar.show (0);
2486	}	2522	}
		2523
2487	# endif	2524	#endif
2488		2525
		2526	/* bgPixmap.apply () does not do the following : */
2489	scr_clear ();	2527	scr_clear ();
2490	scr_touch (true);	2528	scr_touch (true);
2491	want_refresh = 1;	2529	want_refresh = 1;
2492
2493	#endif
2494	}	2530	}
2495		2531
2496	/* ------------------------------------------------------------------------- */	2532	/* ------------------------------------------------------------------------- */
2497	void	2533	void
2498	rxvt_term::scr_clear (bool really) NOTHROW	2534	rxvt_term::scr_clear (bool really) NOTHROW
…		…
2587	{	2623	{
2588	int row, wrote;	2624	int row, wrote;
2589	unsigned int width, towrite;	2625	unsigned int width, towrite;
2590	char r1[] = "\n";	2626	char r1[] = "\n";
2591		2627
2592	for (row = saveLines - nsaved;	2628	for (row = saveLines + top_row;
2593	row < saveLines + nrow - 1; row++)	2629	row < saveLines + nrow - 1; row++)
2594	{	2630	{
2595	width = row_buf[row].l >= 0 ? row_buf[row].l	2631	width = row_buf[row].l >= 0 ? row_buf[row].l
2596	: ncol;	2632	: ncol;
2597	for (towrite = width; towrite; towrite -= wrote)	2633	for (towrite = width; towrite; towrite -= wrote)
…		…
2648	/* convert normal newline chars into common keyboard Return key sequence */	2684	/* convert normal newline chars into common keyboard Return key sequence */
2649	for (unsigned int i = 0; i < len; i++)	2685	for (unsigned int i = 0; i < len; i++)
2650	if (data[i] == C0_LF)	2686	if (data[i] == C0_LF)
2651	data[i] = C0_CR;	2687	data[i] = C0_CR;
2652		2688
		2689	if (priv_modes & PrivMode_BracketPaste)
		2690	tt_printf ("\e[200~");
		2691
2653	tt_write (data, len);	2692	tt_write (data, len);
		2693
		2694	if (priv_modes & PrivMode_BracketPaste)
		2695	tt_printf ("\e[201~");
2654	}	2696	}
2655		2697
2656	/* ------------------------------------------------------------------------- */	2698	/* ------------------------------------------------------------------------- */
2657	/*	2699	/*
2658	* Respond to a notification that a primary selection has been sent	2700	* Respond to a notification that a primary selection has been sent
…		…
3698	h += 2; min_it (h, nrow);	3740	h += 2; min_it (h, nrow);
3699		3741
3700	x -= 1; clamp_it (x, 0, ncol - w);	3742	x -= 1; clamp_it (x, 0, ncol - w);
3701	y -= 1; clamp_it (y, 0, nrow - h);	3743	y -= 1; clamp_it (y, 0, nrow - h);
3702		3744
3703	ov_x = x; ov_y = y;	3745	ov.x = x; ov.y = y;
3704	ov_w = w; ov_h = h;	3746	ov.w = w; ov.h = h;
3705		3747
3706	ov_text = new text_t *[h];	3748	ov.text = new text_t *[h];
3707	ov_rend = new rend_t *[h];	3749	ov.rend = new rend_t *[h];
3708		3750
3709	for (y = 0; y < h; y++)	3751	for (y = 0; y < h; y++)
3710	{	3752	{
3711	text_t *tp = ov_text[y] = new text_t[w];	3753	text_t *tp = ov.text[y] = new text_t[w];
3712	rend_t *rp = ov_rend[y] = new rend_t[w];	3754	rend_t *rp = ov.rend[y] = new rend_t[w];
3713		3755
3714	text_t t0, t1, t2;	3756	text_t t0, t1, t2;
3715	rend_t r = OVERLAY_RSTYLE;	3757	rend_t r = OVERLAY_RSTYLE;
3716		3758
3717	if (y == 0)	3759	if (y == 0)
…		…
3736	}	3778	}
3737		3779
3738	void	3780	void
3739	rxvt_term::scr_overlay_off () NOTHROW	3781	rxvt_term::scr_overlay_off () NOTHROW
3740	{	3782	{
3741	if (!ov_text)	3783	if (!ov.text)
3742	return;	3784	return;
3743		3785
3744	want_refresh = 1;	3786	want_refresh = 1;
3745		3787
3746	for (int y = 0; y < ov_h; y++)	3788	for (int y = 0; y < ov.h; y++)
3747	{	3789	{
3748	delete [] ov_text[y];	3790	delete [] ov.text[y];
3749	delete [] ov_rend[y];	3791	delete [] ov.rend[y];
3750	}	3792	}
3751		3793
3752	delete [] ov_text; ov_text = 0;	3794	delete [] ov.text; ov.text = 0;
3753	delete [] ov_rend; ov_rend = 0;	3795	delete [] ov.rend; ov.rend = 0;
3754	}	3796	}
3755		3797
3756	void	3798	void
3757	rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW	3799	rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3758	{	3800	{
3759	if (!ov_text \|\| x >= ov_w - 2 \|\| y >= ov_h - 2)	3801	if (!ov.text \|\| x >= ov.w - 2 \|\| y >= ov.h - 2)
3760	return;	3802	return;
3761		3803
3762	x++, y++;	3804	x++, y++;
3763		3805
3764	ov_text[y][x] = text;	3806	ov.text[y][x] = text;
3765	ov_rend[y][x] = rend;	3807	ov.rend[y][x] = rend;
3766	}	3808	}
3767		3809
3768	void	3810	void
3769	rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW	3811	rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3770	{	3812	{
…		…
3789	}	3831	}
3790		3832
3791	void	3833	void
3792	rxvt_term::scr_swap_overlay () NOTHROW	3834	rxvt_term::scr_swap_overlay () NOTHROW
3793	{	3835	{
3794	if (!ov_text)	3836	if (!ov.text)
3795	return;	3837	return;
3796		3838
		3839	// hide cursor if it is within the overlay area
		3840	if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
		3841	&& IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
		3842	screen.flags &= ~Screen_VisibleCursor;
		3843
3797	// swap screen mem with overlay	3844	// swap screen mem with overlay
3798	for (int y = ov_h; y--; )	3845	for (int y = ov.h; y--; )
3799	{	3846	{
3800	text_t *t1 = ov_text[y];	3847	text_t *t1 = ov.text[y];
3801	rend_t *r1 = ov_rend[y];	3848	rend_t *r1 = ov.rend[y];
3802		3849
3803	text_t *t2 = ROW(y + ov_y + view_start).t + ov_x;	3850	text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3804	rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x;	3851	rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3805		3852
3806	for (int x = ov_w; x--; )	3853	for (int x = ov.w; x--; )
3807	{	3854	{
3808	text_t t = t1; t1++ = t2; t2++ = t;	3855	text_t t = t1; t1++ = t2; t2++ = t;
3809	rend_t r = r1; r1++ = r2; r2++ = SET_FONT (r, FONTSET (r)->find_font (t));	3856	rend_t r = r1; r1++ = r2; r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3810	}	3857	}
3811	}	3858	}

Diff Legend

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

Comparing rxvt-unicode/src/screen.C (file contents): Revision 1.296 by root, Wed Jan 9 01:05:24 2008 UTC vs. Revision 1.328 by root, Sun Mar 29 13:36:03 2009 UTC

Diff Legend

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.296 by root, Wed Jan 9 01:05:24 2008 UTC vs.
Revision 1.328 by root, Sun Mar 29 13:36:03 2009 UTC