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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.306 by root, Sun Jun 15 10:15:39 2008 UTC vs.
Revision 1.332 by sf-exg, Mon Jan 18 10:05:55 2010 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	{
…		…
535	want_refresh = 1;	544	want_refresh = 1;
536	view_start = 0;	545	view_start = 0;
537		546
538	selection_check (2); /* check for boundary cross */	547	selection_check (2); /* check for boundary cross */
539		548
540	int i = current_screen; current_screen = scrn; scrn = i;	549	current_screen = scrn;
541		550
542	#if NSCREENS	551	#if NSCREENS
543	if (option (Opt_secondaryScreen))	552	if (option (Opt_secondaryScreen))
544	{	553	{
545	num_scr = 0;	554	num_scr = 0;
…		…
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
…		…
1336	if (row >= nrow) /* Out Of Bounds */	1333	if (row >= nrow) /* Out Of Bounds */
1337	return;	1334	return;
1338		1335
1339	min_it (num, nrow - row);	1336	min_it (num, nrow - row);
1340		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.
1341	if (rstyle & (RS_RVid \| RS_Uline))	1341	if (rstyle & (RS_RVid \| RS_Uline))
1342	ren = (rend_t) ~RS_None;	1342	ren = (rend_t) ~RS_None;
1343	else if (GET_BASEBG (rstyle) == Color_bg)	1343	else if (GET_BASEBG (rstyle) == Color_bg)
1344	{	1344	{
1345	ren = DEFAULT_RSTYLE;	1345	ren = DEFAULT_RSTYLE;
1346	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);
1347	}	1351	}
1348	else	1352	else
1349	{	1353	{
1350	ren = rstyle & (RS_fgMask \| RS_bgMask);	1354	ren = rstyle & (RS_fgMask \| RS_bgMask);
		1355
		1356	if (mapped && !view_start)
		1357	{
1351	gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];	1358	gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1352	XChangeGC (dpy, gc, GCForeground, &gcvalue);	1359	XChangeGC (dpy, gc, GCForeground, &gcvalue);
1353	ERASE_ROWS (row, num);	1360	XFillRectangle (dpy, vt, gc,
		1361	0, Row2Pixel (row - view_start),
		1362	(unsigned int)width,
		1363	(unsigned int)Height2Pixel (num));
1354	gcvalue.foreground = pix_colors[Color_fg];	1364	gcvalue.foreground = pix_colors[Color_fg];
1355	XChangeGC (dpy, gc, GCForeground, &gcvalue);	1365	XChangeGC (dpy, gc, GCForeground, &gcvalue);
		1366	}
1356	}	1367	}
1357		1368
1358	for (; num--; row++)	1369	for (; num--; row++)
1359	{	1370	{
1360	scr_blank_screen_mem (ROW(row), rstyle);	1371	scr_blank_screen_mem (ROW(row), rstyle);
		1372
		1373	if (!view_start)
1361	scr_blank_line (drawn_buf [row], 0, ncol, ren);	1374	scr_blank_line (drawn_buf [row], 0, ncol, ren);
1362	}	1375	}
1363	}	1376	}
1364		1377
1365	#if !ENABLE_MINIMAL	1378	#if !ENABLE_MINIMAL
1366	void	1379	void
…		…
1440	* Insert/Delete <count> characters from the current position	1453	* Insert/Delete <count> characters from the current position
1441	*/	1454	*/
1442	void	1455	void
1443	rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW	1456	rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1444	{	1457	{
1445	int col, row;
1446	rend_t tr;
1447
1448	want_refresh = 1;	1458	want_refresh = 1;
1449	ZERO_SCROLLBACK ();	1459	ZERO_SCROLLBACK ();
1450		1460
1451	if (count <= 0)	1461	if (count <= 0)
1452	return;	1462	return;
…		…
1454	scr_do_wrap ();	1464	scr_do_wrap ();
1455		1465
1456	selection_check (1);	1466	selection_check (1);
1457	min_it (count, ncol - screen.cur.col);	1467	min_it (count, ncol - screen.cur.col);
1458		1468
1459	row = screen.cur.row;	1469	int row = screen.cur.row;
1460		1470
1461	line_t *line = &ROW(row);	1471	line_t *line = &ROW(row);
1462		1472
1463	line->touch ();	1473	line->touch ();
1464	line->is_longer (0);	1474	line->is_longer (0);
1465		1475
		1476	// nuke wide spanning the start
		1477	if (line->t[screen.cur.col] == NOCHAR)
		1478	scr_kill_char (*line, screen.cur.col);
		1479
1466	switch (insdel)	1480	switch (insdel)
1467	{	1481	{
1468	case INSERT:	1482	case INSERT:
1469	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--)
1470	{	1489	{
1471	line->t[col] = line->t[col - count];	1490	line->t[col] = line->t[col - count];
1472	line->r[col] = line->r[col - count];	1491	line->r[col] = line->r[col - count];
1473	}	1492	}
1474
1475	line->l = min (line->l + count, ncol);
1476		1493
1477	if (selection.op && current_screen == selection.screen	1494	if (selection.op && current_screen == selection.screen
1478	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))	1495	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1479	{	1496	{
1480	if (selection.end.row != screen.cur.row	1497	if (selection.end.row != screen.cur.row
…		…
1495	case ERASE:	1512	case ERASE:
1496	screen.cur.col += count; /* don't worry if > ncol */	1513	screen.cur.col += count; /* don't worry if > ncol */
1497	selection_check (1);	1514	selection_check (1);
1498	screen.cur.col -= count;	1515	screen.cur.col -= count;
1499		1516
1500	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
1501	scr_blank_line (*line, screen.cur.col, count, rstyle);	1521	scr_blank_line (*line, screen.cur.col, count, rstyle);
1502	break;	1522	break;
1503		1523
1504	case DELETE:	1524	case DELETE:
1505	tr = line->r[ncol - 1] & (RS_fgMask \| RS_bgMask \| RS_baseattrMask);	1525	line->l = max (line->l - count, 0);
1506		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
1507	for (col = screen.cur.col; (col + count) < ncol; col++)	1531	for (int col = screen.cur.col; (col + count) < ncol; col++)
1508	{	1532	{
1509	line->t[col] = line->t[col + count];	1533	line->t[col] = line->t[col + count];
1510	line->r[col] = line->r[col + count];	1534	line->r[col] = line->r[col + count];
1511	}	1535	}
1512		1536
1513	line->l = max (line->l - count, 0);
1514	scr_blank_line (*line, ncol - count, count, tr);	1537	scr_blank_line (*line, ncol - count, count, rstyle);
1515		1538
1516	if (selection.op && current_screen == selection.screen	1539	if (selection.op && current_screen == selection.screen
1517	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))	1540	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1518	{	1541	{
1519	if (selection.end.row != screen.cur.row	1542	if (selection.end.row != screen.cur.row
…		…
1897	XMapWindow (dpy, parent[0]);	1920	XMapWindow (dpy, parent[0]);
1898	# endif	1921	# endif
1899		1922
1900	# if ENABLE_FRILLS	1923	# if ENABLE_FRILLS
1901	if (option (Opt_urgentOnBell))	1924	if (option (Opt_urgentOnBell))
1902	{	1925	set_urgency (1);
1903	if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1904	{
1905	h->flags \|= XUrgencyHint;
1906	XSetWMHints (dpy, parent[0], h);
1907	}
1908	}
1909	# endif	1926	# endif
1910		1927
1911	if (option (Opt_visualBell))	1928	if (option (Opt_visualBell))
1912	{	1929	{
1913	rvideo_bell = true;	1930	rvideo_bell = true;
…		…
1916		1933
1917	bell_ev.start (VISUAL_BELL_DURATION);	1934	bell_ev.start (VISUAL_BELL_DURATION);
1918	}	1935	}
1919	else	1936	else
1920	XBell (dpy, 0);	1937	XBell (dpy, 0);
		1938	HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1921	#endif	1939	#endif
1922	}	1940	}
1923		1941
1924	/* ------------------------------------------------------------------------- */	1942	/* ------------------------------------------------------------------------- */
1925	/* ARGSUSED */	1943	/* ARGSUSED */
1926	void	1944	void
1927	rxvt_term::scr_printscreen (int fullhist) NOTHROW	1945	rxvt_term::scr_printscreen (int fullhist) NOTHROW
1928	{	1946	{
1929	#ifdef PRINTPIPE	1947	#ifdef PRINTPIPE
1930	int nrows, row_start;	1948	int nrows, row_start;
1931	FILE *fd;	1949	FILE *fd = popen_printer ();
1932		1950
1933	if ((fd = popen_printer ()) == NULL)	1951	if (!fd)
1934	return;	1952	return;
1935		1953
1936	if (fullhist)	1954	if (fullhist)
1937	{	1955	{
1938	nrows = nrow - top_row;	1956	nrows = nrow - top_row;
…		…
1944	row_start = view_start;	1962	row_start = view_start;
1945	}	1963	}
1946		1964
1947	wctomb (0, 0);	1965	wctomb (0, 0);
1948		1966
1949	for (int r1 = 0; r1 < nrows; r1++)	1967	for (int r1 = row_start; r1 < row_start + nrows; r1++)
1950	{	1968	{
1951	text_t *tp = ROW(r1).t;	1969	text_t *tp = ROW(r1).t;
1952	int len = ROW(r1).l;	1970	int len = ROW(r1).l;
1953		1971
1954	for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN	1972	for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
…		…
1983	* screen.text/screen.rend contain what the screen will change to.	2001	* screen.text/screen.rend contain what the screen will change to.
1984	*/	2002	*/
1985	void	2003	void
1986	rxvt_term::scr_refresh () NOTHROW	2004	rxvt_term::scr_refresh () NOTHROW
1987	{	2005	{
1988	unsigned char have_bg,
1989	showcursor; /* show the cursor */
1990	int16_t col, row, /* column/row we're processing */	2006	int16_t col, row, /* column/row we're processing */
1991	ocrow; /* old cursor row */	2007	ocrow; /* old cursor row */
1992	int i; /* tmp */	2008	int i; /* tmp */
1993	#ifndef NO_CURSORCOLOR	2009	#ifndef NO_CURSORCOLOR
1994	rend_t cc1; /* store colours at cursor position (s) */	2010	rend_t cc1; /* store colours at cursor position (s) */
…		…
2005	/*	2021	/*
2006	* A: set up vars	2022	* A: set up vars
2007	*/	2023	*/
2008	refresh_count = 0;	2024	refresh_count = 0;
2009		2025
		2026	unsigned int old_screen_flags = screen.flags;
2010	have_bg = 0;	2027	char have_bg = 0;
2011	#ifdef HAVE_BG_PIXMAP	2028	#ifdef HAVE_BG_PIXMAP
2012	have_bg = bgPixmap.pixmap != None;	2029	have_bg = bgPixmap.pixmap != None;
2013	#endif	2030	#endif
2014	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */	2031	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2015		2032
2016	/*	2033	/*
2017	* B: reverse any characters which are selected	2034	* B: reverse any characters which are selected
2018	*/	2035	*/
2019	scr_reverse_selection ();	2036	scr_reverse_selection ();
		2037
		2038	HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
		2039	#if ENABLE_OVERLAY
		2040	scr_swap_overlay ();
		2041	#endif
		2042
		2043	char showcursor = screen.flags & Screen_VisibleCursor;
2020		2044
2021	/*	2045	/*
2022	* C: set the cursor character (s)	2046	* C: set the cursor character (s)
2023	*/	2047	*/
2024	{	2048	{
2025	unsigned char setoldcursor;	2049	unsigned char setoldcursor;
2026		2050
2027	showcursor = (screen.flags & Screen_VisibleCursor);
2028	#ifdef CURSOR_BLINK	2051	#ifdef CURSOR_BLINK
2029	if (hidden_cursor)	2052	if (hidden_cursor)
2030	showcursor = 0;	2053	showcursor = 0;
2031	#endif	2054	#endif
2032		2055
…		…
2105	oldcursor.col = screen.cur.col;	2128	oldcursor.col = screen.cur.col;
2106	}	2129	}
2107	}	2130	}
2108	}	2131	}
2109		2132
2110	HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2111	#if ENABLE_OVERLAY
2112	scr_swap_overlay ();
2113	#endif
2114
2115	#ifndef NO_SLOW_LINK_SUPPORT	2133	#ifndef NO_SLOW_LINK_SUPPORT
2116	/*	2134	/*
2117	* D: CopyArea pass - very useful for slower links	2135	* D: CopyArea pass - very useful for slower links
2118	* This has been deliberately kept simple.	2136	* This has been deliberately kept simple.
2119	*/	2137	*/
…		…
2208	continue;	2226	continue;
2209		2227
2210	// redraw one or more characters	2228	// redraw one or more characters
2211		2229
2212	// seek to the beginning of wide characters	2230	// seek to the beginning of wide characters
2213	while (stp[col] == NOCHAR && col > 0)	2231	while (expect_false (stp[col] == NOCHAR && col > 0))
2214	--col;	2232	--col;
2215		2233
2216	rend_t rend = srp[col]; /* screen rendition (target rendtion) */	2234	rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2217	text_t *text = stp + col;	2235	text_t *text = stp + col;
2218	int count = 1;	2236	int count = 1;
…		…
2225	for (i = 0; ++col < ncol; )	2243	for (i = 0; ++col < ncol; )
2226	{	2244	{
2227	if (stp[col] == NOCHAR)	2245	if (stp[col] == NOCHAR)
2228	{	2246	{
2229	dtp[col] = stp[col];	2247	dtp[col] = stp[col];
2230	drp[col] = rend;	2248	drp[col] = srp[col];
		2249
2231	count++;	2250	count++;
2232	i++;	2251	i++;
2233		2252
2234	continue;	2253	continue;
2235	}	2254	}
…		…
2255		2274
2256	col--; /* went one too far. move back */	2275	col--; /* went one too far. move back */
2257	count -= i; /* dump any matching trailing chars */	2276	count -= i; /* dump any matching trailing chars */
2258		2277
2259	// sometimes we optimize away the trailing NOCHAR's, add them back	2278	// sometimes we optimize away the trailing NOCHAR's, add them back
2260	while (i && text[count] == NOCHAR)	2279	while (expect_false (i && text[count] == NOCHAR))
2261	count++, i--;	2280	count++, i--;
2262		2281
2263	/*	2282	/*
2264	* Determine the attributes for the string	2283	* Determine the attributes for the string
2265	*/	2284	*/
2266	int fore = fgcolor_of (rend); // desired foreground	2285	int fore = fgcolor_of (rend); // desired foreground
2267	int back = bgcolor_of (rend); // desired background	2286	int back = bgcolor_of (rend); // desired background
2268		2287
2269	// only do special processing if any attributes are set, which is unlikely	2288	// only do special processing if any attributes are set, which is unlikely
2270	if (rend & (RS_Bold \| RS_Italic \| RS_Uline \| RS_RVid \| RS_Blink \| RS_Careful))	2289	if (expect_false (rend & (RS_Bold \| RS_Italic \| RS_Uline \| RS_RVid \| RS_Blink \| RS_Careful)))
2271	{	2290	{
2272	bool invert = rend & RS_RVid;	2291	bool invert = rend & RS_RVid;
2273		2292
2274	#ifndef NO_BOLD_UNDERLINE_REVERSE	2293	#ifndef NO_BOLD_UNDERLINE_REVERSE
2275	if (rend & RS_Bold && fore == Color_fg)	2294	if (rend & RS_Bold && fore == Color_fg)
…		…
2358	/*	2377	/*
2359	* Actually do the drawing of the string here	2378	* Actually do the drawing of the string here
2360	*/	2379	*/
2361	rxvt_font font = (fontset[GET_STYLE (rend)])[GET_FONT (rend)];	2380	rxvt_font font = (fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2362		2381
2363	if (have_bg && back == Color_bg)	2382	if (expect_true (have_bg && back == Color_bg))
2364	{	2383	{
2365	// this is very ugly, maybe push it into ->draw?	2384	// this is very ugly, maybe push it into ->draw?
2366		2385
2367	for (i = 0; i < count; i++) /* don't draw empty strings */	2386	for (i = 0; i < count; i++) /* don't draw empty strings */
2368	if (text[i] != ' ')	2387	if (text[i] != ' ')
…		…
2375	did_clear: ;	2394	did_clear: ;
2376	}	2395	}
2377	else	2396	else
2378	font->draw (*drawable, xpixel, ypixel, text, count, fore, back);	2397	font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2379		2398
2380	if (rend & RS_Uline && font->descent > 1 && fore != back)	2399	if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))
2381	{	2400	{
2382	#if ENABLE_FRILLS	2401	#if ENABLE_FRILLS
2383	if (ISSET_PIXCOLOR (Color_underline))	2402	if (ISSET_PIXCOLOR (Color_underline))
2384	XSetForeground (dpy, gc, pix_colors[Color_underline]);	2403	XSetForeground (dpy, gc, pix_colors[Color_underline]);
2385	else	2404	else
…		…
2390	xpixel, ypixel + font->ascent + 1,	2409	xpixel, ypixel + font->ascent + 1,
2391	xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);	2410	xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2392	}	2411	}
2393	} /* for (col....) */	2412	} /* for (col....) */
2394	} /* for (row....) */	2413	} /* for (row....) */
2395
2396	#if ENABLE_OVERLAY
2397	scr_swap_overlay ();
2398	#endif
2399	HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2400		2414
2401	/*	2415	/*
2402	* G: cleanup cursor and display outline cursor if necessary	2416	* G: cleanup cursor and display outline cursor if necessary
2403	*/	2417	*/
2404	if (showcursor)	2418	if (showcursor)
…		…
2443	}	2457	}
2444		2458
2445	/*	2459	/*
2446	* H: cleanup selection	2460	* H: cleanup selection
2447	*/	2461	*/
		2462	#if ENABLE_OVERLAY
		2463	scr_swap_overlay ();
		2464	#endif
		2465	HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
		2466
2448	scr_reverse_selection ();	2467	scr_reverse_selection ();
2449		2468
		2469	screen.flags = old_screen_flags;
2450	num_scr = 0;	2470	num_scr = 0;
2451	num_scr_allow = 1;	2471	num_scr_allow = 1;
2452	}	2472	}
2453		2473
2454	void	2474	void
…		…
3713	h += 2; min_it (h, nrow);	3733	h += 2; min_it (h, nrow);
3714		3734
3715	x -= 1; clamp_it (x, 0, ncol - w);	3735	x -= 1; clamp_it (x, 0, ncol - w);
3716	y -= 1; clamp_it (y, 0, nrow - h);	3736	y -= 1; clamp_it (y, 0, nrow - h);
3717		3737
3718	ov_x = x; ov_y = y;	3738	ov.x = x; ov.y = y;
3719	ov_w = w; ov_h = h;	3739	ov.w = w; ov.h = h;
3720		3740
3721	ov_text = new text_t *[h];	3741	ov.text = new text_t *[h];
3722	ov_rend = new rend_t *[h];	3742	ov.rend = new rend_t *[h];
3723		3743
3724	for (y = 0; y < h; y++)	3744	for (y = 0; y < h; y++)
3725	{	3745	{
3726	text_t *tp = ov_text[y] = new text_t[w];	3746	text_t *tp = ov.text[y] = new text_t[w];
3727	rend_t *rp = ov_rend[y] = new rend_t[w];	3747	rend_t *rp = ov.rend[y] = new rend_t[w];
3728		3748
3729	text_t t0, t1, t2;	3749	text_t t0, t1, t2;
3730	rend_t r = OVERLAY_RSTYLE;	3750	rend_t r = OVERLAY_RSTYLE;
3731		3751
3732	if (y == 0)	3752	if (y == 0)
…		…
3751	}	3771	}
3752		3772
3753	void	3773	void
3754	rxvt_term::scr_overlay_off () NOTHROW	3774	rxvt_term::scr_overlay_off () NOTHROW
3755	{	3775	{
3756	if (!ov_text)	3776	if (!ov.text)
3757	return;	3777	return;
3758		3778
3759	want_refresh = 1;	3779	want_refresh = 1;
3760		3780
3761	for (int y = 0; y < ov_h; y++)	3781	for (int y = 0; y < ov.h; y++)
3762	{	3782	{
3763	delete [] ov_text[y];	3783	delete [] ov.text[y];
3764	delete [] ov_rend[y];	3784	delete [] ov.rend[y];
3765	}	3785	}
3766		3786
3767	delete [] ov_text; ov_text = 0;	3787	delete [] ov.text; ov.text = 0;
3768	delete [] ov_rend; ov_rend = 0;	3788	delete [] ov.rend; ov.rend = 0;
3769	}	3789	}
3770		3790
3771	void	3791	void
3772	rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW	3792	rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3773	{	3793	{
3774	if (!ov_text \|\| x >= ov_w - 2 \|\| y >= ov_h - 2)	3794	if (!ov.text \|\| x >= ov.w - 2 \|\| y >= ov.h - 2)
3775	return;	3795	return;
3776		3796
3777	x++, y++;	3797	x++, y++;
3778		3798
3779	ov_text[y][x] = text;	3799	ov.text[y][x] = text;
3780	ov_rend[y][x] = rend;	3800	ov.rend[y][x] = rend;
3781	}	3801	}
3782		3802
3783	void	3803	void
3784	rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW	3804	rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3785	{	3805	{
…		…
3804	}	3824	}
3805		3825
3806	void	3826	void
3807	rxvt_term::scr_swap_overlay () NOTHROW	3827	rxvt_term::scr_swap_overlay () NOTHROW
3808	{	3828	{
3809	if (!ov_text)	3829	if (!ov.text)
3810	return;	3830	return;
3811		3831
		3832	// hide cursor if it is within the overlay area
		3833	if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
		3834	&& IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
		3835	screen.flags &= ~Screen_VisibleCursor;
		3836
3812	// swap screen mem with overlay	3837	// swap screen mem with overlay
3813	for (int y = ov_h; y--; )	3838	for (int y = ov.h; y--; )
3814	{	3839	{
3815	text_t *t1 = ov_text[y];	3840	text_t *t1 = ov.text[y];
3816	rend_t *r1 = ov_rend[y];	3841	rend_t *r1 = ov.rend[y];
3817		3842
3818	text_t *t2 = ROW(y + ov_y + view_start).t + ov_x;	3843	text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3819	rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x;	3844	rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3820		3845
3821	for (int x = ov_w; x--; )	3846	for (int x = ov.w; x--; )
3822	{	3847	{
3823	text_t t = t1; t1++ = t2; t2++ = t;	3848	text_t t = t1; t1++ = t2; t2++ = t;
3824	rend_t r = r1; r1++ = r2; r2++ = SET_FONT (r, FONTSET (r)->find_font (t));	3849	rend_t r = r1; r1++ = r2; r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3825	}	3850	}
3826	}	3851	}

Diff Legend

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

Comparing rxvt-unicode/src/screen.C (file contents): Revision 1.306 by root, Sun Jun 15 10:15:39 2008 UTC vs. Revision 1.332 by sf-exg, Mon Jan 18 10:05:55 2010 UTC

Diff Legend

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.306 by root, Sun Jun 15 10:15:39 2008 UTC vs.
Revision 1.332 by sf-exg, Mon Jan 18 10:05:55 2010 UTC