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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.151 by root, Wed Dec 15 00:53:23 2004 UTC vs.
Revision 1.170 by root, Mon Nov 28 19:35:04 2005 UTC

…		…
28	#include "rxvt.h" /* NECESSARY */	28	#include "rxvt.h" /* NECESSARY */
29		29
30	#include <X11/Xmd.h> /* get the typedef for CARD32 */	30	#include <X11/Xmd.h> /* get the typedef for CARD32 */
31		31
32	#include <inttypes.h>	32	#include <inttypes.h>
33	#include <wchar.h>
34		33
35	#include "salloc.C" // HACK, should be a seperate compile!	34	#include "salloc.C" // HACK, should be a seperate compile!
36		35
37	inline void fill_text (text_t *start, text_t value, int len)	36	inline void fill_text (text_t *start, text_t value, int len)
38	{	37	{
…		…
203	/*	202	/*
204	* first time called so just malloc everything: don't rely on realloc	203	* first time called so just malloc everything: don't rely on realloc
205	* Note: this is still needed so that all the scrollback lines are NULL	204	* Note: this is still needed so that all the scrollback lines are NULL
206	*/	205	*/
207	screen.text = (text_t *)rxvt_calloc (total_rows, sizeof (text_t ));	206	screen.text = (text_t *)rxvt_calloc (total_rows, sizeof (text_t ));
208	buf_text = (text_t *)rxvt_calloc (total_rows, sizeof (text_t ));	207	buf_text = (text_t *)rxvt_calloc (total_rows, sizeof (text_t ));
209	drawn_text = (text_t *)rxvt_calloc (nrow, sizeof (text_t ));	208	drawn_text = (text_t *)rxvt_calloc (nrow, sizeof (text_t ));
210	swap.text = (text_t *)rxvt_calloc (nrow, sizeof (text_t ));	209	swap.text = (text_t *)rxvt_calloc (nrow, sizeof (text_t ));
211		210
212	screen.tlen = (int16_t *)rxvt_calloc (total_rows, sizeof (int16_t));	211	screen.tlen = (int16_t *)rxvt_calloc (total_rows, sizeof (int16_t));
213	swap.tlen = (int16_t *)rxvt_calloc (nrow, sizeof (int16_t));	212	swap.tlen = (int16_t *)rxvt_calloc (nrow, sizeof (int16_t));
214		213
215	screen.rend = (rend_t *)rxvt_calloc (total_rows, sizeof (rend_t ));	214	screen.rend = (rend_t *)rxvt_calloc (total_rows, sizeof (rend_t ));
216	buf_rend = (rend_t *)rxvt_calloc (total_rows, sizeof (rend_t ));	215	buf_rend = (rend_t *)rxvt_calloc (total_rows, sizeof (rend_t ));
217	drawn_rend = (rend_t *)rxvt_calloc (nrow, sizeof (rend_t ));	216	drawn_rend = (rend_t *)rxvt_calloc (nrow, sizeof (rend_t ));
218	swap.rend = (rend_t *)rxvt_calloc (nrow, sizeof (rend_t ));	217	swap.rend = (rend_t *)rxvt_calloc (nrow, sizeof (rend_t ));
219		218
220	for (p = 0; p < nrow; p++)	219	for (p = 0; p < nrow; p++)
221	{	220	{
222	q = p + TermWin.saveLines;	221	q = p + TermWin.saveLines;
223	scr_blank_screen_mem (screen.text, screen.rend, q, DEFAULT_RSTYLE);	222	scr_blank_screen_mem (screen.text, screen.rend, q, DEFAULT_RSTYLE);
…		…
294	ralloc->free (drawn_rend[p]);	293	ralloc->free (drawn_rend[p]);
295	}	294	}
296		295
297	/* we have fewer rows so fix up cursor position */	296	/* we have fewer rows so fix up cursor position */
298	MIN_IT (screen.cur.row, (int32_t)nrow - 1);	297	MIN_IT (screen.cur.row, (int32_t)nrow - 1);
299	MIN_IT (swap.cur.row, (int32_t)nrow - 1);
300		298
301	scr_reset_realloc (); /* realloc _last_ */	299	scr_reset_realloc (); /* realloc _last_ */
302	}	300	}
303	else if (nrow > prev_nrow)	301	else if (nrow > prev_nrow)
304	{	302	{
…		…
335	scr_scroll_text (0, (int)nrow - 1, -k, 1);	333	scr_scroll_text (0, (int)nrow - 1, -k, 1);
336	screen.cur.row += k;	334	screen.cur.row += k;
337	screen.s_cur.row += k;	335	screen.s_cur.row += k;
338	TermWin.nscrolled -= k;	336	TermWin.nscrolled -= k;
339	}	337	}
		338
340	#ifdef DEBUG_STRICT	339	#ifdef DEBUG_STRICT
341	assert (screen.cur.row < TermWin.nrow);	340	assert (screen.cur.row < TermWin.nrow);
342	assert (swap.cur.row < TermWin.nrow);
343	#else /* drive with your eyes closed */	341	#else /* drive with your eyes closed */
344
345	MIN_IT (screen.cur.row, nrow - 1);	342	MIN_IT (screen.cur.row, nrow - 1);
346	MIN_IT (swap.cur.row, nrow - 1);
347	#endif	343	#endif
348	TermWin.ncol = ncol; // save b/c scr_blank_screen_mem uses this	344	TermWin.ncol = ncol; // save b/c scr_blank_screen_mem uses this
349	}	345	}
350		346
351	/* resize columns */	347	/* resize columns */
…		…
394	}	390	}
395		391
396	}	392	}
397		393
398	MIN_IT (screen.cur.col, (int16_t)ncol - 1);	394	MIN_IT (screen.cur.col, (int16_t)ncol - 1);
399	MIN_IT (swap.cur.col, (int16_t)ncol - 1);
400		395
401	delete talloc; talloc = ta;	396	delete talloc; talloc = ta;
402	delete ralloc; ralloc = ra;	397	delete ralloc; ralloc = ra;
403	}	398	}
404		399
…		…
446	*/	441	*/
447	void	442	void
448	rxvt_term::scr_release ()	443	rxvt_term::scr_release ()
449	{	444	{
450	unsigned int total_rows;	445	unsigned int total_rows;
451	int i;
452		446
453	total_rows = TermWin.nrow + TermWin.saveLines;	447	total_rows = TermWin.nrow + TermWin.saveLines;
454		448
455	delete talloc; talloc = 0;	449	delete talloc; talloc = 0;
456	delete ralloc; ralloc = 0;	450	delete ralloc; ralloc = 0;
…		…
566	if (current_screen == scrn)	560	if (current_screen == scrn)
567	return scrn;	561	return scrn;
568		562
569	selection_check (2); /* check for boundary cross */	563	selection_check (2); /* check for boundary cross */
570		564
571	SWAP_IT (current_screen, scrn, int);	565	i = current_screen; current_screen = scrn; scrn = i;
572		566
573	SWAP_IT (screen.cur.row, swap.cur.row, int16_t);	567	SWAP_IT (screen.cur.row, swap.cur.row, int16_t);
574	SWAP_IT (screen.cur.col, swap.cur.col, int16_t);	568	SWAP_IT (screen.cur.col, swap.cur.col, int16_t);
575	# ifdef DEBUG_STRICT
576	assert (screen.cur.row >= 0 && screen.cur.row < prev_nrow);
577	assert (screen.cur.col >= 0 && screen.cur.col < prev_ncol);
578	# else /* drive with your eyes closed */
579	MAX_IT (screen.cur.row, 0);	569	MAX_IT (screen.cur.row, 0);
580	MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1);	570	MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1);
581	MAX_IT (screen.cur.col, 0);	571	MAX_IT (screen.cur.col, 0);
582	MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);	572	MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
583	# endif
584		573
585	#if NSCREENS	574	#if NSCREENS
586	if (options & Opt_secondaryScreen)	575	if (options & Opt_secondaryScreen)
587	{	576	{
588	num_scr = 0;	577	num_scr = 0;
…		…
709	selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */	698	selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */
710	}	699	}
711	else if (j >= row1 && j <= row2)	700	else if (j >= row1 && j <= row2)
712	{	701	{
713	/* move selected region too */	702	/* move selected region too */
714	selection.beg.row -= count;	703	selection.beg.row -= count;
715	selection.end.row -= count;	704	selection.end.row -= count;
716	selection.mark.row -= count;	705	selection.mark.row -= count;
717	}	706	}
718	}	707	}
719		708
720	selection_check (0); /* _after_ TermWin.nscrolled update */	709	selection_check (0); /* _after_ TermWin.nscrolled update */
…		…
728	i = row2 - row1 + 1;	717	i = row2 - row1 + 1;
729	MIN_IT (count, i);	718	MIN_IT (count, i);
730		719
731	if (j > 0)	720	if (j > 0)
732	{	721	{
733	/* A: scroll up */	722	/* scroll up */
734		723
735	/* A1: Copy lines that will get clobbered by the rotation */	724	/* Copy lines that will get clobbered by the rotation */
736	memcpy (buf_text, screen.text + row1, count * sizeof (text_t *));	725	memcpy (buf_text, screen.text + row1, count * sizeof (text_t *));
737	memcpy (buf_rend, screen.rend + row1, count * sizeof (rend_t *));	726	memcpy (buf_rend, screen.rend + row1, count * sizeof (rend_t *));
738		727
739	/* A2: Rotate lines */	728	/* Rotate lines */
740	i = row2 - row1 - count + 1;	729	i = row2 - row1 - count + 1;
741	memmove (screen.tlen + row1, screen.tlen + row1 + count, i * sizeof (int16_t));	730	memmove (screen.tlen + row1, screen.tlen + row1 + count, i * sizeof (int16_t));
742	memmove (screen.text + row1, screen.text + row1 + count, i * sizeof (text_t *));	731	memmove (screen.text + row1, screen.text + row1 + count, i * sizeof (text_t *));
743	memmove (screen.rend + row1, screen.rend + row1 + count, i * sizeof (rend_t *));	732	memmove (screen.rend + row1, screen.rend + row1 + count, i * sizeof (rend_t *));
744		733
745	j = row2 - count + 1, i = count;	734	j = row2 - count + 1, i = count;
746	}	735	}
747	else /* if (j < 0) */	736	else /* if (j < 0) */
748	{	737	{
749	/* B: scroll down */	738	/* scroll down */
750		739
751	/* B1: Copy lines that will get clobbered by the rotation */	740	/* Copy lines that will get clobbered by the rotation */
752	for (i = 0, j = row2; i < count; i++, j--)	741	for (i = 0, j = row2; i < count; i++, j--)
753	{	742	{
754	buf_text[i] = screen.text[j];	743	buf_text[i] = screen.text[j];
755	buf_rend[i] = screen.rend[j];	744	buf_rend[i] = screen.rend[j];
756	}	745	}
757		746
758	/* B2: Rotate lines */	747	/* Rotate lines */
759	for (j = row2, i = j - count; i >= row1; i--, j--)	748	for (j = row2, i = j - count; i >= row1; i--, j--)
760	{	749	{
761	screen.tlen[j] = screen.tlen[i];	750	screen.tlen[j] = screen.tlen[i];
762	screen.text[j] = screen.text[i];	751	screen.text[j] = screen.text[i];
763	screen.rend[j] = screen.rend[i];	752	screen.rend[j] = screen.rend[i];
…		…
765		754
766	j = row1, i = count;	755	j = row1, i = count;
767	count = -count;	756	count = -count;
768	}	757	}
769		758
770	/* C: Resurrect lines */	759	/* Resurrect lines */
771	memset (screen.tlen + j, 0, i * sizeof (int16_t));	760	memset (screen.tlen + j, 0, i * sizeof (int16_t));
772	memcpy (screen.text + j, buf_text, i * sizeof (text_t *));	761	memcpy (screen.text + j, buf_text, i * sizeof (text_t *));
773	memcpy (screen.rend + j, buf_rend, i * sizeof (text_t *));	762	memcpy (screen.rend + j, buf_rend, i * sizeof (text_t *));
774	if (!spec) /* line length may not equal TermWin.ncol */	763	if (!spec) /* line length may not equal TermWin.ncol */
775	for (; i--; j++)	764	for (; i--; j++)
…		…
783	* Add text given in <str> of length <len> to screen struct	772	* Add text given in <str> of length <len> to screen struct
784	*/	773	*/
785	void	774	void
786	rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len)	775	rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len)
787	{	776	{
		777	if (len <= 0) /* sanity */
		778	return;
		779
788	unsigned char checksel;	780	unsigned char checksel;
789	unicode_t c;	781	unicode_t c;
790	int i, row, last_col;	782	int row, last_col;
791	text_t *stp;	783	text_t *stp;
792	rend_t *srp;	784	rend_t *srp;
793		785	const unicode_t *strend = str + len;
794	if (len <= 0) /* sanity */
795	return;
796		786
797	want_refresh = 1;	787	want_refresh = 1;
798	ZERO_SCROLLBACK ();	788	ZERO_SCROLLBACK ();
799	last_col = TermWin.ncol;	789	last_col = TermWin.ncol;
800		790
…		…
825	checksel = selection.op && current_screen == selection.screen ? 1 : 0;	815	checksel = selection.op && current_screen == selection.screen ? 1 : 0;
826		816
827	stp = screen.text[row];	817	stp = screen.text[row];
828	srp = screen.rend[row];	818	srp = screen.rend[row];
829		819
830	while (len--)	820	while (str < strend)
831	{	821	{
832	c = *str++;	822	c = *str++;
833		823
834	if (c < 0x20)	824	if (c < 0x20)
835	switch (c)	825	if (c == C0_LF)
		826	{
		827	if (screen.tlen[row] != -1) /* XXX: think about this */
		828	MAX_IT (screen.tlen[row], screen.cur.col);
		829
		830	screen.flags &= ~Screen_WrapNext;
		831
		832	if (screen.cur.row == screen.bscroll)
		833	scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
		834	else if (screen.cur.row < (TermWin.nrow - 1))
		835	row = (++screen.cur.row) + TermWin.saveLines;
		836
		837	stp = screen.text[row]; /* _must_ refresh */
		838	srp = screen.rend[row]; /* _must_ refresh */
		839	continue;
		840	}
		841	else if (c == C0_CR)
836	{	842	{
837	case C0_HT:
838	scr_tab (1, true);
839	continue;
840
841	case C0_LF:
842	if (screen.tlen[row] != -1) /* XXX: think about this */	843	if (screen.tlen[row] != -1) /* XXX: think about this */
843	MAX_IT (screen.tlen[row], screen.cur.col);	844	MAX_IT (screen.tlen[row], screen.cur.col);
844		845
845	screen.flags &= ~Screen_WrapNext;	846	screen.flags &= ~Screen_WrapNext;
846
847	if (screen.cur.row == screen.bscroll)
848	scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
849	else if (screen.cur.row < (TermWin.nrow - 1))
850	row = (++screen.cur.row) + TermWin.saveLines;
851
852	stp = screen.text[row]; /* _must_ refresh */
853	srp = screen.rend[row]; /* _must_ refresh */
854	continue;
855
856	case C0_CR:
857	if (screen.tlen[row] != -1) /* XXX: think about this */
858	MAX_IT (screen.tlen[row], screen.cur.col);
859
860	screen.flags &= ~Screen_WrapNext;
861	screen.cur.col = 0;	847	screen.cur.col = 0;
862	continue;	848	continue;
		849	}
		850	else if (c == C0_HT)
		851	{
		852	scr_tab (1, true);
		853	continue;
863	}	854	}
864		855
865	if (checksel /* see if we're writing within selection */	856	if (checksel /* see if we're writing within selection */
866	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)	857	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
867	&& ROWCOL_IS_BEFORE (screen.cur, selection.end))	858	&& ROWCOL_IS_BEFORE (screen.cur, selection.end))
…		…
877		868
878	if (screen.flags & Screen_WrapNext)	869	if (screen.flags & Screen_WrapNext)
879	{	870	{
880	screen.tlen[row] = -1;	871	screen.tlen[row] = -1;
881		872
		873	scr_do_wrap ();
		874
882	scr_do_wrap (); row = screen.cur.row + TermWin.saveLines;	875	row = screen.cur.row + TermWin.saveLines;
883
884	stp = screen.text[row]; /* _must_ refresh */	876	stp = screen.text[row]; /* _must_ refresh */
885	srp = screen.rend[row]; /* _must_ refresh */	877	srp = screen.rend[row]; /* _must_ refresh */
886	}	878	}
887		879
		880	// some utf-8 decoders "decode" surrogate characters: let's fix this.
		881	if (IN_RANGE (c, 0xd800, 0xdfff))
		882	c = 0xfffd;
		883
888	// rely on wcwidth to tell us the character width, at least for non-latin1	884	// rely on wcwidth to tell us the character width, at least for non-latin1
889	// do wcwidth before further replacements, as wcwidth says that line-drawing	885	// do wcwidth before further replacements, as wcwidth might return -1
890	// characters have width -1 (DOH!) on GNU/Linux sometimes.	886	// for the line drawing characters below as they might be invalid in the current
		887	// locale.
891	int width = c < 0x100 ? 1 : wcwidth (c);	888	int width = c < 0x100 ? 1 : wcwidth (c);
892		889
893	if (charsets[screen.charset] == '0') // DEC SPECIAL	890	if (charsets[screen.charset] == '0') // DEC SPECIAL
894	{	891	{
895	// vt100 special graphics and line drawing	892	// vt100 special graphics and line drawing
896	// 5f-7e standard vt100	893	// 5f-7e standard vt100
897	// 40-5e rxvt extension for extra curses acs chars	894	// 40-5e rxvt extension for extra curses acs chars
898	static uint16_t vt100_0[63] = { // 40 .. 7e	895	static uint16_t vt100_0[62] = { // 41 .. 7e
899	0x0000, 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 40-47 hi mr. snowman!	896	0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 41-47 hi mr. snowman!
900	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 48-4f	897	0, 0, 0, 0, 0, 0, 0, 0, // 48-4f
901	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 50-57	898	0, 0, 0, 0, 0, 0, 0, 0, // 50-57
902	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0020, // 58-5f	899	0, 0, 0, 0, 0, 0, 0, 0x0020, // 58-5f
903	0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67	900	0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67
904	0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba, // 68-6f	901	0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba, // 68-6f
905	0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c, // 70-77	902	0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c, // 70-77
906	0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, // 78-7e	903	0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, // 78-7e
907	};	904	};
908		905
909	if (c >= 0x40 && c <= 0x7e && vt100_0[c - 0x40])	906	if (c >= 0x41 && c <= 0x7e && vt100_0[c - 0x41])
910	{	907	{
911	c = vt100_0[c - 0x40];	908	c = vt100_0[c - 0x41];
912	width = 1;	909	width = 1; // vt100 line drawing characters are always single-width
913	}	910	}
914	}	911	}
915		912
916	if (screen.flags & Screen_Insert)	913	if (screen.flags & Screen_Insert)
917	scr_insdel_chars (width, INSERT);	914	scr_insdel_chars (width, INSERT);
918		915
919	if (width != 0)	916	if (width != 0)
920	{	917	{
921	// some utf-8 decoders decode surrogate characters.
922	if (0xd800 <= c && c <= 0xdfff)
923	c = 0xfffd;
924
925	#if !UNICODE_3	918	#if !UNICODE_3
926	// trim characters we can't store directly :(	919	// trim characters we can't store directly :(
927	if (c >= 0x10000)	920	if (c >= 0x10000)
928	# if ENABLE_COMBINING	921	# if ENABLE_COMBINING
929	c = rxvt_composite.compose (c); // map to lower 16 bits	922	c = rxvt_composite.compose (c); // map to lower 16 bits
…		…
952	col++;	945	col++;
953	} while (col < TermWin.ncol && stp[col] == NOCHAR);	946	} while (col < TermWin.ncol && stp[col] == NOCHAR);
954	}	947	}
955		948
956	rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));	949	rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
		950
		951	// if the character doesn't fit into the remaining columns...
		952	if (screen.cur.col > last_col - width && last_col >= width)
		953	{
		954	// ...output spaces
		955	c = ' ';
		956	// and try the same character next loop iteration
		957	--str;
		958	}
957		959
958	do	960	do
959	{	961	{
960	stp[screen.cur.col] = c;	962	stp[screen.cur.col] = c;
961	srp[screen.cur.col] = rend;	963	srp[screen.cur.col] = rend;
…		…
980	{	982	{
981	stp[c] = ' ';	983	stp[c] = ' ';
982	srp[c] = rend;	984	srp[c] = rend;
983	}	985	}
984	}	986	}
985	else if (width == 0)	987	else // width == 0
986	{	988	{
987	#if ENABLE_COMBINING	989	#if ENABLE_COMBINING
988	// handle combining characters	990	// handle combining characters
989	// we just tag the accent on the previous on-screen character.	991	// we just tag the accent on the previous on-screen character.
990	// this is arguably not correct, but also arguably not wrong.	992	// this is arguably not correct, but also arguably not wrong.
991	// we don't handle double-width characters nicely yet.	993	// we don't handle double-width characters nicely yet.
992
993	text_t *tp;	994	text_t *tp;
994	rend_t *rp;	995	rend_t *rp;
995		996
996	if (screen.cur.col > 0)	997	if (screen.cur.col > 0)
997	{	998	{
…		…
1171	*/	1172	*/
1172	#if ENABLE_FRILLS	1173	#if ENABLE_FRILLS
1173	void	1174	void
1174	rxvt_term::scr_forwardindex ()	1175	rxvt_term::scr_forwardindex ()
1175	{	1176	{
1176	int row;	1177	int row;
1177		1178
1178	if (screen.cur.col < TermWin.ncol - 1)	1179	if (screen.cur.col < TermWin.ncol - 1)
1179	scr_gotorc (0, 1, R_RELATIVE \| C_RELATIVE);	1180	scr_gotorc (0, 1, R_RELATIVE \| C_RELATIVE);
1180	else	1181	else
1181	{	1182	{
…		…
1400	screen.tlen[row + row_offset] = 0;	1401	screen.tlen[row + row_offset] = 0;
1401	scr_blank_line (drawn_text[row], drawn_rend[row], (unsigned int)TermWin.ncol, ren);	1402	scr_blank_line (drawn_text[row], drawn_rend[row], (unsigned int)TermWin.ncol, ren);
1402	}	1403	}
1403	}	1404	}
1404		1405
		1406	#if ENABLE_FRILLS
		1407	void
		1408	rxvt_term::scr_erase_savelines ()
		1409	{
		1410	want_refresh = 1;
		1411	ZERO_SCROLLBACK ();
		1412
		1413	TermWin.nscrolled = 0;
		1414	}
		1415	#endif
		1416
1405	/* ------------------------------------------------------------------------- */	1417	/* ------------------------------------------------------------------------- */
1406	/*	1418	/*
1407	* Fill the screen with `E's	1419	* Fill the screen with `E's
1408	* XTERM_SEQ: Screen Alignment Test: ESC # 8	1420	* XTERM_SEQ: Screen Alignment Test: ESC # 8
1409	*/	1421	*/
1410	void	1422	void
1411	rxvt_term::scr_E ()	1423	rxvt_term::scr_E ()
1412	{	1424	{
1413	int i, j, k;	1425	int i, j, k;
1414	rend_t *r1, fs;	1426	rend_t *r1, fs;
1415		1427
1416	want_refresh = 1;	1428	want_refresh = 1;
1417	ZERO_SCROLLBACK ();	1429	ZERO_SCROLLBACK ();
1418		1430
1419	num_scr_allow = 0;	1431	num_scr_allow = 0;
…		…
1902	rxvt_term::scr_page (enum page_dirn direction, int nlines)	1914	rxvt_term::scr_page (enum page_dirn direction, int nlines)
1903	{	1915	{
1904	int n;	1916	int n;
1905	unsigned int oldviewstart;	1917	unsigned int oldviewstart;
1906		1918
1907	#ifdef DEBUG_STRICT
1908	assert ((nlines >= 0) && (nlines <= TermWin.nrow));
1909	#endif
1910	oldviewstart = TermWin.view_start;	1919	oldviewstart = TermWin.view_start;
		1920
1911	if (direction == UP)	1921	if (direction == UP)
1912	{	1922	{
1913	n = TermWin.view_start + nlines;	1923	n = TermWin.view_start + nlines;
1914	TermWin.view_start = min (n, TermWin.nscrolled);	1924	TermWin.view_start = min (n, TermWin.nscrolled);
1915	}	1925	}
1916	else	1926	else
1917	{	1927	{
1918	n = TermWin.view_start - nlines;	1928	n = TermWin.view_start - nlines;
1919	TermWin.view_start = max (n, 0);	1929	TermWin.view_start = max (n, 0);
1920	}	1930	}
		1931
1921	return scr_changeview (oldviewstart);	1932	return scr_changeview (oldviewstart);
1922	}	1933	}
1923		1934
1924	int	1935	int
1925	rxvt_term::scr_changeview (unsigned int oldviewstart)	1936	rxvt_term::scr_changeview (unsigned int oldviewstart)
…		…
1936	/* ------------------------------------------------------------------------- */	1947	/* ------------------------------------------------------------------------- */
1937	void	1948	void
1938	rxvt_term::scr_bell ()	1949	rxvt_term::scr_bell ()
1939	{	1950	{
1940	#ifndef NO_BELL	1951	#ifndef NO_BELL
		1952
1941	# ifndef NO_MAPALERT	1953	# ifndef NO_MAPALERT
1942	# ifdef MAPALERT_OPTION	1954	# ifdef MAPALERT_OPTION
1943	if (options & Opt_mapAlert)	1955	if (options & Opt_mapAlert)
1944	# endif	1956	# endif
1945	XMapWindow (display->display, TermWin.parent[0]);	1957	XMapWindow (display->display, TermWin.parent[0]);
1946	# endif	1958	# endif
		1959
1947	if (options & Opt_visualBell)	1960	if (options & Opt_visualBell)
1948	{	1961	{
1949	scr_rvideo_mode (!rvideo); /* refresh also done */	1962	scr_rvideo_mode (!rvideo); /* refresh also done */
		1963	rxvt_usleep (VISUAL_BELL_DURATION);
1950	scr_rvideo_mode (!rvideo); /* refresh also done */	1964	scr_rvideo_mode (!rvideo); /* refresh also done */
1951	}	1965	}
1952	else	1966	else
1953	XBell (display->display, 0);	1967	XBell (display->display, 0);
		1968
1954	#endif	1969	#endif
1955	}	1970	}
1956		1971
1957	/* ------------------------------------------------------------------------- */	1972	/* ------------------------------------------------------------------------- */
1958	/* ARGSUSED */	1973	/* ARGSUSED */
…		…
2013	/*	2028	/*
2014	* Refresh the screen	2029	* Refresh the screen
2015	* drawn_text/drawn_rend contain the screen information before the update.	2030	* drawn_text/drawn_rend contain the screen information before the update.
2016	* screen.text/screen.rend contain what the screen will change to.	2031	* screen.text/screen.rend contain what the screen will change to.
2017	*/	2032	*/
2018
2019	#define FONT_WIDTH(X, Y) \
2020	(X)->per_char[ (Y) - (X)->min_char_or_byte2].width
2021	#define FONT_RBEAR(X, Y) \
2022	(X)->per_char[ (Y) - (X)->min_char_or_byte2].rbearing
2023	#define FONT_LBEAR(X, Y) \
2024	(X)->per_char[ (Y) - (X)->min_char_or_byte2].lbearing
2025	#define IS_FONT_CHAR(X, Y) \
2026	((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2)
2027
2028	void	2033	void
2029	rxvt_term::scr_refresh (unsigned char refresh_type)	2034	rxvt_term::scr_refresh (unsigned char refresh_type)
2030	{	2035	{
2031	unsigned char must_clear, /* use draw_string not draw_image_string */	2036	unsigned char must_clear, /* use draw_string not draw_image_string */
2032	showcursor; /* show the cursor */	2037	showcursor; /* show the cursor */
…		…
2051	refresh_count = 0;	2056	refresh_count = 0;
2052		2057
2053	row_offset = TermWin.saveLines - TermWin.view_start;	2058	row_offset = TermWin.saveLines - TermWin.view_start;
2054		2059
2055	#if XPM_BACKGROUND	2060	#if XPM_BACKGROUND
2056	must_clear \|= (bgPixmap.pixmap != None);	2061	must_clear \|= bgPixmap.pixmap != None;
2057	#endif	2062	#endif
2058	#if TRANSPARENT	2063	#if TRANSPARENT
2059	must_clear \|= ((options & Opt_transparent) && am_transparent);	2064	must_clear \|= (options & Opt_transparent) && am_transparent;
2060	#endif	2065	#endif
2061	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */	2066	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2062		2067
2063	/*	2068	/*
2064	* B: reverse any characters which are selected	2069	* B: reverse any characters which are selected
…		…
2088		2093
2089	crp = &screen.rend[screen.cur.row + TermWin.saveLines][col];	2094	crp = &screen.rend[screen.cur.row + TermWin.saveLines][col];
2090		2095
2091	if (showcursor && TermWin.focus)	2096	if (showcursor && TermWin.focus)
2092	{	2097	{
		2098	if (options & Opt_cursorUnderline)
		2099	*crp ^= RS_Uline;
		2100	else
		2101	{
2093	*crp ^= RS_RVid;	2102	*crp ^= RS_RVid;
		2103
2094	#ifndef NO_CURSORCOLOR	2104	#ifndef NO_CURSORCOLOR
2095	cc1 = *crp & (RS_fgMask \| RS_bgMask);	2105	cc1 = *crp & (RS_fgMask \| RS_bgMask);
2096	if (ISSET_PIXCOLOR (Color_cursor))	2106	if (ISSET_PIXCOLOR (Color_cursor))
2097	ccol1 = Color_cursor;	2107	ccol1 = Color_cursor;
2098	else	2108	else
2099	#ifdef CURSOR_COLOR_IS_RENDITION_COLOR	2109	#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2100	ccol1 = GET_FGCOLOR (rstyle);	2110	ccol1 = GET_FGCOLOR (rstyle);
2101	#else	2111	#else
2102	ccol1 = Color_fg;	2112	ccol1 = Color_fg;
2103	#endif	2113	#endif
2104	if (ISSET_PIXCOLOR (Color_cursor2))	2114	if (ISSET_PIXCOLOR (Color_cursor2))
2105	ccol2 = Color_cursor2;	2115	ccol2 = Color_cursor2;
2106	else	2116	else
2107	#ifdef CURSOR_COLOR_IS_RENDITION_COLOR	2117	#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2108	ccol2 = GET_BGCOLOR (rstyle);	2118	ccol2 = GET_BGCOLOR (rstyle);
2109	#else	2119	#else
2110	ccol2 = Color_bg;	2120	ccol2 = Color_bg;
2111	#endif	2121	#endif
2112	crp = SET_FGCOLOR (crp, ccol1);	2122	crp = SET_FGCOLOR (crp, ccol1);
2113	crp = SET_BGCOLOR (crp, ccol2);	2123	crp = SET_BGCOLOR (crp, ccol2);
2114	#endif	2124	#endif
		2125	}
2115	}	2126	}
2116	}	2127	}
2117		2128
2118	/* make sure no outline cursor is left around */	2129	/* make sure no outline cursor is left around */
2119	setoldcursor = 0;	2130	setoldcursor = 0;
…		…
2149		2160
2150	#if ENABLE_OVERLAY	2161	#if ENABLE_OVERLAY
2151	scr_swap_overlay ();	2162	scr_swap_overlay ();
2152	#endif	2163	#endif
2153		2164
2154	rend_t drp, srp; /* drawn-rend-pointer, screen-rend-pointer */
2155	text_t dtp, stp; /* drawn-text-pointer, screen-text-pointer */
2156
2157	#ifndef NO_SLOW_LINK_SUPPORT	2165	#ifndef NO_SLOW_LINK_SUPPORT
2158	/*	2166	/*
2159	* D: CopyArea pass - very useful for slower links	2167	* D: CopyArea pass - very useful for slower links
2160	* This has been deliberately kept simple.	2168	* This has been deliberately kept simple.
2161	*/	2169	*/
…		…
2296		2304
2297	// sometimes we optimize away the trailing NOCHAR's, add them back	2305	// sometimes we optimize away the trailing NOCHAR's, add them back
2298	while (i && text[count] == NOCHAR)	2306	while (i && text[count] == NOCHAR)
2299	count++, i--;	2307	count++, i--;
2300		2308
2301	#if ENABLE_STYLES
2302	// force redraw after "careful" characters to avoid pixel droppings
2303	if (srp[col] & RS_Careful && col < TermWin.ncol - 1 && 0)
2304	drp[col + 1] = ~srp[col + 1];
2305
2306	// include previous careful character(s) if possible, looks nicer (best effort...)
2307	while (text > stp
2308	&& srp[text - stp - 1] & RS_Careful
2309	&& RS_SAME (rend, srp[text - stp - 1]))
2310	text--, count++, xpixel -= TermWin.fwidth;
2311	#endif
2312
2313	/*	2309	/*
2314	* Determine the attributes for the string	2310	* Determine the attributes for the string
2315	*/	2311	*/
2316	int fore = GET_FGCOLOR (rend); // desired foreground	2312	int fore = GET_FGCOLOR (rend); // desired foreground
2317	int back = GET_BGCOLOR (rend); // desired background	2313	int back = GET_BGCOLOR (rend); // desired background
2318		2314
2319	// only do special processing if ana attributes are set, which is rare	2315	// only do special processing if any attributes are set, which is rare
2320	if (rend & (RS_Bold \| RS_Italic \| RS_Uline \| RS_RVid \| RS_Blink))	2316	if (rend & (RS_Bold \| RS_Italic \| RS_Uline \| RS_RVid \| RS_Blink \| RS_Careful))
2321	{	2317	{
		2318	#if ENABLE_STYLES
		2319	// force redraw after "careful" characters to avoid pixel droppings
		2320	if (srp[col] & RS_Careful && col < TermWin.ncol - 1 && 0)
		2321	drp[col + 1] = ~srp[col + 1];
		2322
		2323	// include previous careful character(s) if possible, looks nicer (best effort...)
		2324	while (text > stp
		2325	&& srp[text - stp - 1] & RS_Careful
		2326	&& RS_SAME (rend, srp[text - stp - 1]))
		2327	text--, count++, xpixel -= TermWin.fwidth;
		2328	#endif
		2329
2322	bool invert = rend & RS_RVid;	2330	bool invert = rend & RS_RVid;
2323		2331
2324	#ifndef NO_BOLD_UNDERLINE_REVERSE	2332	#ifndef NO_BOLD_UNDERLINE_REVERSE
2325	if (rend & RS_Bold	2333	if (rend & RS_Bold
2326	&& fore == Color_fg)	2334	&& fore == Color_fg)
…		…
2353	SWAP_IT (fore, back, int);	2361	SWAP_IT (fore, back, int);
2354		2362
2355	#ifndef NO_BOLD_UNDERLINE_REVERSE	2363	#ifndef NO_BOLD_UNDERLINE_REVERSE
2356	if (ISSET_PIXCOLOR (Color_RV))	2364	if (ISSET_PIXCOLOR (Color_RV))
2357	back = Color_RV;	2365	back = Color_RV;
		2366
		2367	if (fore == back)
		2368	{
		2369	fore = Color_bg;
		2370	back = Color_fg;
		2371	}
2358	#endif	2372	#endif
2359	}	2373	}
2360		2374
2361	#ifdef TEXT_BLINK	2375	#ifdef TEXT_BLINK
2362	if (rend & RS_Blink && (back == Color_bg \|\| fore == Color_bg))	2376	if (rend & RS_Blink && (back == Color_bg \|\| fore == Color_bg))
…		…
2425	*/	2439	*/
2426	if (showcursor)	2440	if (showcursor)
2427	{	2441	{
2428	if (TermWin.focus)	2442	if (TermWin.focus)
2429	{	2443	{
		2444	if (options & Opt_cursorUnderline)
		2445	*crp ^= RS_Uline;
		2446	else
		2447	{
2430	*crp ^= RS_RVid;	2448	*crp ^= RS_RVid;
2431	#ifndef NO_CURSORCOLOR	2449	#ifndef NO_CURSORCOLOR
2432	crp = (crp & ~ (RS_fgMask \| RS_bgMask)) \| cc1;	2450	crp = (crp & ~ (RS_fgMask \| RS_bgMask)) \| cc1;
2433	#endif	2451	#endif
		2452	}
2434	}	2453	}
2435	else if (oldcursor.row >= 0)	2454	else if (oldcursor.row >= 0)
2436	{	2455	{
		2456	int cursorwidth = 1;
		2457	int col = oldcursor.col;
		2458
		2459	while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR)
		2460	col--;
		2461
		2462	while (col + cursorwidth < TermWin.ncol
		2463	&& drawn_text[oldcursor.row][col + cursorwidth] == NOCHAR)
		2464	cursorwidth++;
		2465
2437	#ifndef NO_CURSORCOLOR	2466	#ifndef NO_CURSORCOLOR
2438	if (ISSET_PIXCOLOR (Color_cursor))	2467	if (ISSET_PIXCOLOR (Color_cursor))
2439	XSetForeground (display->display, TermWin.gc, pix_colors[Color_cursor]);	2468	XSetForeground (display->display, TermWin.gc, pix_colors[Color_cursor]);
2440	#endif	2469	#endif
2441	int cursorwidth = 1;
2442	while (oldcursor.col + cursorwidth < TermWin.ncol
2443	&& drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR)
2444	cursorwidth++;
2445		2470
2446	XDrawRectangle (display->display, drawBuffer, TermWin.gc,	2471	XDrawRectangle (display->display, drawBuffer, TermWin.gc,
2447	Col2Pixel (oldcursor.col),	2472	Col2Pixel (col),
2448	Row2Pixel (oldcursor.row),	2473	Row2Pixel (oldcursor.row),
2449	(unsigned int) (Width2Pixel (cursorwidth) - 1),	2474	(unsigned int) (Width2Pixel (cursorwidth) - 1),
2450	(unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1));	2475	(unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1));
2451	}	2476	}
2452	}	2477	}
…		…
2523	if (!TermWin.mapped)	2548	if (!TermWin.mapped)
2524	return;	2549	return;
2525		2550
2526	num_scr_allow = 0;	2551	num_scr_allow = 0;
2527	want_refresh = 1;	2552	want_refresh = 1;
2528
2529	#if TRANSPARENT
2530	if ((options & Opt_transparent) && (am_pixmap_trans == 0))
2531	{
2532	int i;
2533
2534	if (!(options & Opt_transparent_all))
2535	i = 0;
2536	else
2537	i = (int) (sizeof (TermWin.parent) / sizeof (Window));
2538
2539	while (i--)
2540	if (TermWin.parent[i] != None)
2541	XClearWindow (display->display, TermWin.parent[i]);
2542	}
2543	#endif
2544		2553
2545	if (really)	2554	if (really)
2546	XClearWindow (display->display, TermWin.vt);	2555	XClearWindow (display->display, TermWin.vt);
2547	}	2556	}
2548		2557
…		…
2911		2920
2912	int	2921	int
2913	rxvt_term::selection_request_other (Atom target, int selnum)	2922	rxvt_term::selection_request_other (Atom target, int selnum)
2914	{	2923	{
2915	Atom sel;	2924	Atom sel;
2916	#ifdef DEBUG_SELECT
2917	char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" };
2918	#endif
2919		2925
2920	selection_type \|= selnum;	2926	selection_type \|= selnum;
2921		2927
2922	if (selnum == Sel_Primary)	2928	if (selnum == Sel_Primary)
2923	sel = XA_PRIMARY;	2929	sel = XA_PRIMARY;
…		…
3418	selection_delimit_word (DN, &selection.end, &selection.end);	3424	selection_delimit_word (DN, &selection.end, &selection.end);
3419	}	3425	}
3420	else if (selection.clicks == 3)	3426	else if (selection.clicks == 3)
3421	{	3427	{
3422	#if ENABLE_FRILLS	3428	#if ENABLE_FRILLS
3423	if ((options & Opt_tripleclickwords))	3429	if (options & Opt_tripleclickwords)
3424	{	3430	{
3425	int end_row;	3431	int end_row;
3426		3432
3427	selection_delimit_word (UP, &selection.beg, &selection.beg);	3433	selection_delimit_word (UP, &selection.beg, &selection.beg);
3428	end_row = screen.tlen[selection.mark.row + TermWin.saveLines];	3434	end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
…		…
3446	if (ROWCOL_IS_AFTER (selection.mark, selection.beg))	3452	if (ROWCOL_IS_AFTER (selection.mark, selection.beg))
3447	selection.mark.col++;	3453	selection.mark.col++;
3448		3454
3449	selection.beg.col = 0;	3455	selection.beg.col = 0;
3450	selection.end.col = ncol;	3456	selection.end.col = ncol;
		3457
		3458	// select a complete logical line
		3459	while (selection.beg.row > -TermWin.saveLines
		3460	&& screen.tlen[selection.beg.row - 1 + TermWin.saveLines] == -1)
		3461	selection.beg.row--;
		3462
		3463	while (selection.end.row < TermWin.nrow
		3464	&& screen.tlen[selection.end.row + TermWin.saveLines] == -1)
		3465	selection.end.row++;
3451	}	3466	}
3452	}	3467	}
3453		3468
3454	if (button3 && buttonpress)	3469	if (button3 && buttonpress)
3455	{ /* mark may need to be changed */	3470	{ /* mark may need to be changed */
…		…
3535	*/	3550	*/
3536	void	3551	void
3537	rxvt_term::selection_send (const XSelectionRequestEvent &rq)	3552	rxvt_term::selection_send (const XSelectionRequestEvent &rq)
3538	{	3553	{
3539	XSelectionEvent ev;	3554	XSelectionEvent ev;
		3555	dDisp;
3540		3556
3541	ev.type = SelectionNotify;	3557	ev.type = SelectionNotify;
3542	ev.property = None;	3558	ev.property = None;
3543	ev.display = rq.display;	3559	ev.display = rq.display;
3544	ev.requestor = rq.requestor;	3560	ev.requestor = rq.requestor;
…		…
3558	*target++ = xa[XA_COMPOUND_TEXT];	3574	*target++ = xa[XA_COMPOUND_TEXT];
3559	#if X_HAVE_UTF8_STRING	3575	#if X_HAVE_UTF8_STRING
3560	*target++ = xa[XA_UTF8_STRING];	3576	*target++ = xa[XA_UTF8_STRING];
3561	#endif	3577	#endif
3562		3578
3563	XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM,	3579	XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM,
3564	32, PropModeReplace,	3580	32, PropModeReplace,
3565	(unsigned char *)target_list, target - target_list);	3581	(unsigned char *)target_list, target - target_list);
3566	ev.property = rq.property;	3582	ev.property = rq.property;
3567	}	3583	}
3568	#if TODO // TODO	3584	#if TODO // TODO
…		…
3571	/* TODO: Handle MULTIPLE */	3587	/* TODO: Handle MULTIPLE */
3572	}	3588	}
3573	#endif	3589	#endif
3574	else if (rq.target == xa[XA_TIMESTAMP] && selection.text)	3590	else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3575	{	3591	{
3576	XChangeProperty (display->display, rq.requestor, rq.property, rq.target,	3592	XChangeProperty (disp, rq.requestor, rq.property, rq.target,
3577	32, PropModeReplace, (unsigned char *)&selection_time, 1);	3593	32, PropModeReplace, (unsigned char *)&selection_time, 1);
3578	ev.property = rq.property;	3594	ev.property = rq.property;
3579	}	3595	}
3580	else if (rq.target == XA_STRING	3596	else if (rq.target == XA_STRING
3581	\|\| rq.target == xa[XA_TEXT]	3597	\|\| rq.target == xa[XA_TEXT]
…		…
3639	ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);	3655	ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3640	ct.nitems = strlen ((char *)ct.value);	3656	ct.nitems = strlen ((char *)ct.value);
3641	}	3657	}
3642	else	3658	else
3643	#endif	3659	#endif
3644	if (XwcTextListToTextProperty (display->display, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)	3660	if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3645	freect = 1;	3661	freect = 1;
3646	else	3662	else
3647	{	3663	{
3648	/* if we failed to convert then send it raw */	3664	/* if we failed to convert then send it raw */
3649	ct.value = (unsigned char *)cl;	3665	ct.value = (unsigned char *)cl;
3650	ct.nitems = selectlen;	3666	ct.nitems = selectlen;
3651	ct.encoding = target;	3667	ct.encoding = target;
3652	}	3668	}
3653		3669
3654	XChangeProperty (display->display, rq.requestor, rq.property,	3670	XChangeProperty (disp, rq.requestor, rq.property,
3655	ct.encoding, 8, PropModeReplace,	3671	ct.encoding, 8, PropModeReplace,
3656	ct.value, (int)ct.nitems);	3672	ct.value, (int)ct.nitems);
3657	ev.property = rq.property;	3673	ev.property = rq.property;
3658		3674
3659	if (freect)	3675	if (freect)
3660	XFree (ct.value);	3676	XFree (ct.value);
3661	}	3677	}
3662		3678
3663	XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev);	3679	XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev);
3664	}	3680	}
3665		3681
3666	/* ------------------------------------------------------------------------- *	3682	/* ------------------------------------------------------------------------- *
3667	* MOUSE ROUTINES *	3683	* MOUSE ROUTINES *
3668	* ------------------------------------------------------------------------- */	3684	* ------------------------------------------------------------------------- */
…		…
3788	while (*s)	3804	while (*s)
3789	scr_overlay_set (x++, y, *s++);	3805	scr_overlay_set (x++, y, *s++);
3790	}	3806	}
3791		3807
3792	void	3808	void
		3809	rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s)
		3810	{
		3811	while (*s)
		3812	{
		3813	text_t t = *s++;
		3814	int width = wcwidth (t);
		3815
		3816	while (width--)
		3817	{
		3818	scr_overlay_set (x++, y, t);
		3819	t = NOCHAR;
		3820	}
		3821	}
		3822	}
		3823
		3824	void
3793	rxvt_term::scr_swap_overlay ()	3825	rxvt_term::scr_swap_overlay ()
3794	{	3826	{
3795	if (!ov_text)	3827	if (!ov_text)
3796	return;	3828	return;
3797		3829

Diff Legend

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

Comparing rxvt-unicode/src/screen.C (file contents): Revision 1.151 by root, Wed Dec 15 00:53:23 2004 UTC vs. Revision 1.170 by root, Mon Nov 28 19:35:04 2005 UTC

Diff Legend

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.151 by root, Wed Dec 15 00:53:23 2004 UTC vs.
Revision 1.170 by root, Mon Nov 28 19:35:04 2005 UTC