ViewVC Help

View File | Revision Log | Show Annotations | Download File

/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.410 by sf-exg, Thu Nov 24 18:09:54 2011 UTC

1	/*---------------------------------------------------------------------------*	1	/*---------------------------------------------------------------------------*
2	* File: screen.C	2	* File: screen.C
3	*---------------------------------------------------------------------------*	3	*---------------------------------------------------------------------------*
4	*	4	*
5	* Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>	5	* Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6	* Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>	6	* Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de>
7	*	7	*
8	* This program is free software; you can redistribute it and/or modify	8	* This program is free software; you can redistribute it and/or modify
9	* it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
10	* the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation; either version 2 of the License, or
11	* (at your option) any later version.	11	* (at your option) any later version.
…		…
28	#include "rxvt.h" /* NECESSARY */	28	#include "rxvt.h" /* NECESSARY */
29	#include "rxvtperl.h" /* NECESSARY */	29	#include "rxvtperl.h" /* NECESSARY */
30		30
31	#include <inttypes.h>	31	#include <inttypes.h>
32		32
33	#include "salloc.C" // HACK, should be a seperate compile!	33	#include "salloc.C" // HACK, should be a separate compile!
34		34
		35	static inline void
35	static inline void fill_text (text_t *start, text_t value, int len)	36	fill_text (text_t *start, text_t value, int len)
36	{	37	{
37	while (len--)	38	while (len--)
38	*start++ = value;	39	*start++ = value;
39	}	40	}
40		41
41	/* ------------------------------------------------------------------------- */	42	/* ------------------------------------------------------------------------- */
42	#define PROP_SIZE 256*1024
43	#define PASTE_SIZE 32768
44	#define TABSIZE 8 /* default tab size */	43	#define TABSIZE 8 /* default tab size */
45		44
46	/* ------------------------------------------------------------------------- *	45	/* ------------------------------------------------------------------------- *
47	* GENERAL SCREEN AND SELECTION UPDATE ROUTINES *	46	* GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
48	* ------------------------------------------------------------------------- */	47	* ------------------------------------------------------------------------- */
…		…
83	ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col)	82	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) \	83	#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)	84	ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
86		85
87	/*	86	/*
88	* CLEAR_ROWS : clear <num> rows starting from row <row>
89	* CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>	87	* 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	*/	88	*/
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) \	89	#define CLEAR_CHARS(x, y, num) \
99	if (mapped) \	90	if (mapped) \
100	XClearArea (dpy, vt, x, y, \	91	XClearArea (dpy, vt, x, y, \
101	(unsigned int)Width2Pixel (num), \	92	(unsigned int)Width2Pixel (num), \
102	(unsigned int)Height2Pixel (1), False)	93	(unsigned int)Height2Pixel (1), False)
103		94
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	/* ------------------------------------------------------------------------- *	95	/* ------------------------------------------------------------------------- *
111	* SCREEN `COMMON' ROUTINES *	96	* SCREEN `COMMON' ROUTINES *
112	* ------------------------------------------------------------------------- */	97	* ------------------------------------------------------------------------- */
113		98
114	/* Fill part/all of a line with blanks. */	99	/* Fill part/all of a line with blanks. */
…		…
146		131
147	l.l = 0;	132	l.l = 0;
148	l.f = 0;	133	l.f = 0;
149	}	134	}
150		135
		136	// nuke a single wide character at the given column
		137	void
		138	rxvt_term::scr_kill_char (line_t &l, int col) const NOTHROW
		139	{
		140	// find begin
		141	while (col > 0 && l.t[col] == NOCHAR)
		142	col--;
		143
		144	rend_t rend = l.r[col] & ~RS_baseattrMask;
		145	rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
		146
		147	l.touch ();
		148
		149	// found start, nuke
		150	do {
		151	l.t[col] = ' ';
		152	l.r[col] = rend;
		153	col++;
		154	} while (col < ncol && l.t[col] == NOCHAR);
		155	}
		156
151	/* ------------------------------------------------------------------------- *	157	/* ------------------------------------------------------------------------- *
152	* SCREEN INITIALISATION *	158	* SCREEN INITIALISATION *
153	* ------------------------------------------------------------------------- */	159	* ------------------------------------------------------------------------- */
154		160
155	void	161	void
…		…
157	{	163	{
158	#if ENABLE_OVERLAY	164	#if ENABLE_OVERLAY
159	scr_overlay_off ();	165	scr_overlay_off ();
160	#endif	166	#endif
161		167
162	rvideo_mode = false;
163	view_start = 0;	168	view_start = 0;
164	num_scr = 0;	169	num_scr = 0;
165		170
166	if (ncol == 0)	171	if (ncol == 0)
167	ncol = 80;	172	ncol = 80;
…		…
169	if (nrow == 0)	174	if (nrow == 0)
170	nrow = 24;	175	nrow = 24;
171		176
172	if (ncol == prev_ncol && nrow == prev_nrow)	177	if (ncol == prev_ncol && nrow == prev_nrow)
173	return;	178	return;
174
175	if (current_screen != PRIMARY)
176	scr_swap_screen ();
177		179
178	// we need at least two lines for wrapping to work correctly	180	// we need at least two lines for wrapping to work correctly
179	while (nrow + saveLines < 2)	181	while (nrow + saveLines < 2)
180	{	182	{
181	//TODO//FIXME	183	//TODO//FIXME
…		…
201	term_start = 0;	203	term_start = 0;
202		204
203	talloc = new rxvt_salloc (ncol * sizeof (text_t));	205	talloc = new rxvt_salloc (ncol * sizeof (text_t));
204	ralloc = new rxvt_salloc (ncol * sizeof (rend_t));	206	ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
205		207
206	row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));	208	row_buf = (line_t *)rxvt_calloc (total_rows , sizeof (line_t));
207	drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));	209	drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
208	swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));	210	swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
209		211
210	for (int row = nrow; row--; )	212	for (int row = nrow; row--; )
211	{	213	{
…		…
234	selection.text = NULL;	236	selection.text = NULL;
235	selection.len = 0;	237	selection.len = 0;
236	selection.op = SELECTION_CLEAR;	238	selection.op = SELECTION_CLEAR;
237	selection.screen = PRIMARY;	239	selection.screen = PRIMARY;
238	selection.clicks = 0;	240	selection.clicks = 0;
		241	selection.clip_text = NULL;
		242	selection.clip_len = 0;
239	}	243	}
240	else	244	else
241	{	245	{
242	/*	246	/*
243	* add or delete rows as appropriate	247	* add or delete rows as appropriate
…		…
271	swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);	275	swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
272	drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);	276	drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
273	}	277	}
274		278
275	line_t *old_buf = row_buf;	279	line_t *old_buf = row_buf;
276	row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));	280	row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
277		281
278	int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row	282	int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
279	int pend = MOD (term_start + top_row , prev_total_rows);	283	int pend = MOD (term_start + top_row , prev_total_rows);
280	int q = total_rows; // rewrapped row	284	int q = total_rows; // rewrapped row
281		285
282	if (top_row)	286	if (top_row)
283	{	287	{
284	// Re-wrap lines. This is rather ugly, possibly because I am too dumb	288	// Re-wrap lines. This is rather ugly, possibly because I am too dumb
285	// to come up with a lean and mean algorithm.	289	// to come up with a lean and mean algorithm.
		290	// TODO: maybe optimise when width didn't change
286		291
287	row_col_t ocur = screen.cur;	292	row_col_t ocur = screen.cur;
288	ocur.row = MOD (term_start + ocur.row, prev_total_rows);	293	ocur.row = MOD (term_start + ocur.row, prev_total_rows);
289		294
290	do	295	do
291	{	296	{
292	p = MOD (p - 1, prev_total_rows);	297	p = MOD (p - 1, prev_total_rows);
293	#ifdef DEBUG_STRICT
294	assert (old_buf [MOD (p, prev_total_rows)].t);	298	assert (old_buf [MOD (p, prev_total_rows)].t);
295	#endif
296	int plines = 1;	299	int plines = 1;
297	int llen = old_buf [MOD (p, prev_total_rows)].l;	300	int llen = old_buf [MOD (p, prev_total_rows)].l;
298		301
299	while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())	302	while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
300	{	303	{
…		…
394	delete old_ta;	397	delete old_ta;
395	delete old_ra;	398	delete old_ra;
396		399
397	clamp_it (screen.cur.row, 0, nrow - 1);	400	clamp_it (screen.cur.row, 0, nrow - 1);
398	clamp_it (screen.cur.col, 0, ncol - 1);	401	clamp_it (screen.cur.col, 0, ncol - 1);
		402	}
399		403
400	free (tabs);	404	free (tabs);
401	}	405	tabs = (char *)rxvt_malloc (ncol);
		406
		407	for (int col = ncol; col--; )
		408	tabs [col] = col % TABSIZE == 0;
402		409
403	CLEAR_ALL_SELECTION ();	410	CLEAR_ALL_SELECTION ();
404		411
405	prev_nrow = nrow;	412	prev_nrow = nrow;
406	prev_ncol = ncol;	413	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		414
416	tt_winch ();	415	tt_winch ();
417		416
418	HOOK_INVOKE ((this, HOOK_RESET, DT_END));	417	HOOK_INVOKE ((this, HOOK_RESET, DT_END));
419	}	418	}
…		…
431	delete ralloc; ralloc = 0;	430	delete ralloc; ralloc = 0;
432		431
433	free (row_buf);	432	free (row_buf);
434	free (swap_buf);	433	free (swap_buf);
435	free (drawn_buf);	434	free (drawn_buf);
		435	row_buf = 0; // signal that we freed all the arrays above
		436
436	free (tabs);	437	free (tabs);
437		438	tabs = 0;
438	row_buf = 0; // signal that we freed all the arrays
439	}	439	}
440	}	440	}
441		441
442	/* ------------------------------------------------------------------------- */	442	/* ------------------------------------------------------------------------- */
443	/*	443	/*
444	* Hard reset	444	* Hard/Soft reset
445	*/	445	*/
446	void	446	void
447	rxvt_term::scr_poweron ()	447	rxvt_term::scr_poweron ()
448	{	448	{
449	scr_release ();	449	scr_release ();
450	prev_nrow = prev_ncol = 0;	450	prev_nrow = prev_ncol = 0;
		451	rvideo_mode = false;
		452	scr_soft_reset ();
451	scr_reset ();	453	scr_reset ();
452		454
453	scr_clear (true);	455	scr_clear (true);
454	scr_refresh ();	456	scr_refresh ();
		457	}
		458
		459	void
		460	rxvt_term::scr_soft_reset ()
		461	{
		462	/* only affects modes, nothing drastic such as clearing the screen */
		463	#if ENABLE_OVERLAY
		464	scr_overlay_off ();
		465	#endif
		466
		467	if (current_screen != PRIMARY)
		468	scr_swap_screen ();
		469
		470	scr_scroll_region (0, MAX_ROWS - 1);
		471	scr_rendition (0, ~RS_None);
		472	scr_insert_mode (0);
455	}	473	}
456		474
457	/* ------------------------------------------------------------------------- *	475	/* ------------------------------------------------------------------------- *
458	* PROCESS SCREEN COMMANDS *	476	* PROCESS SCREEN COMMANDS *
459	* ------------------------------------------------------------------------- */	477	* ------------------------------------------------------------------------- */
…		…
497	}	515	}
498		516
499	/* boundary check in case screen size changed between SAVE and RESTORE */	517	/* boundary check in case screen size changed between SAVE and RESTORE */
500	min_it (s->cur.row, nrow - 1);	518	min_it (s->cur.row, nrow - 1);
501	min_it (s->cur.col, ncol - 1);	519	min_it (s->cur.col, ncol - 1);
502	#ifdef DEBUG_STRICT
503	assert (s->cur.row >= 0);	520	assert (s->cur.row >= 0);
504	assert (s->cur.col >= 0);	521	assert (s->cur.col >= 0);
505	#endif
506	}	522	}
507		523
508	void	524	void
509	rxvt_term::scr_swap_screen ()	525	rxvt_term::scr_swap_screen ()
510	{	526	{
…		…
533	return;	549	return;
534		550
535	want_refresh = 1;	551	want_refresh = 1;
536	view_start = 0;	552	view_start = 0;
537		553
538	selection_check (2); /* check for boundary cross */	554	/* check for boundary cross */
		555	row_col_t pos;
		556	pos.row = pos.col = 0;
		557	if (ROWCOL_IS_BEFORE (selection.beg, pos)
		558	&& ROWCOL_IS_AFTER (selection.end, pos))
		559	CLEAR_SELECTION ();
539		560
540	int i = current_screen; current_screen = scrn; scrn = i;	561	current_screen = scrn;
541		562
542	#if NSCREENS	563	#if NSCREENS
543	if (option (Opt_secondaryScreen))	564	if (option (Opt_secondaryScreen))
544	{	565	{
545	num_scr = 0;	566	num_scr = 0;
…		…
622		643
623	if (count > 0	644	if (count > 0
624	&& row1 == 0	645	&& row1 == 0
625	&& (current_screen == PRIMARY || option (Opt_secondaryScroll)))	646	&& (current_screen == PRIMARY || option (Opt_secondaryScroll)))
626	{	647	{
		648	min_it (count, total_rows - (nrow - (row2 + 1)));
		649
627	top_row = max (top_row - count, -saveLines);	650	top_row = max (top_row - count, -saveLines);
628
629	// scroll everything up 'count' lines
630	term_start = (term_start + count) % total_rows;
631		651
632	// sever bottommost line	652	// sever bottommost line
633	{	653	{
634	line_t &l = ROW(row2 - count);	654	line_t &l = ROW(row2);
635	l.is_longer (0);	655	l.is_longer (0);
636	l.touch ();	656	l.touch ();
637	}	657	}
638		658
		659	// scroll everything up 'count' lines
		660	term_start = (term_start + count) % total_rows;
		661
		662	// now copy lines below the scroll region bottom to the
		663	// bottom of the screen again, so they look as if they
		664	// hadn't moved.
		665	for (int i = nrow; --i > row2; )
		666	{
		667	line_t &l1 = ROW(i - count);
		668	line_t &l2 = ROW(i);
		669
		670	::swap (l1, l2);
		671	l2.touch ();
		672	}
		673
639	// erase newly scrolled-in lines	674	// erase newly scrolled-in lines
640	for (int i = count; i--; )	675	for (int i = count; i--; )
641	{	676	{
642	line_t &l = ROW(nrow - 1 - i);	677	line_t &l = ROW(row2 - i);
643		678
644	// optimize if already cleared, can be significant on slow machines	679	// optimise if already cleared, can be significant on slow machines
645	// could be rolled into scr_blank_screen_mem	680	// could be rolled into scr_blank_screen_mem
646	if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))	681	if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
647	{	682	{
648	scr_blank_line (l, 0, l.l, rstyle);	683	scr_blank_line (l, 0, l.l, rstyle);
649	l.l = 0;	684	l.l = 0;
…		…
651	}	686	}
652	else	687	else
653	scr_blank_screen_mem (l, rstyle);	688	scr_blank_screen_mem (l, rstyle);
654	}	689	}
655		690
656	// now copy lines below the scroll region bottom to the
657	// bottom of the screen again, so they look as if they
658	// hadn't moved.
659	for (int i = nrow; --i > row2; )
660	{
661	line_t &l1 = ROW(i - count);
662	line_t &l2 = ROW(i);
663
664	::swap (l1, l2);
665	l2.touch ();
666	}
667
668	// move and/or clear selection, if any	691	// move and/or clear selection, if any
669	if (selection.op && current_screen == selection.screen)	692	if (selection.op && current_screen == selection.screen
		693	&& selection.beg.row <= row2)
670	{	694	{
671	selection.beg.row -= count;	695	selection.beg.row -= count;
672	selection.end.row -= count;	696	selection.end.row -= count;
673	selection.mark.row -= count;	697	selection.mark.row -= count;
674		698
675	if (selection.beg.row < top_row	699	selection_check (0);
676	|| selection.end.row < top_row
677	|| selection.mark.row < top_row)
678	{
679	CLEAR_ALL_SELECTION ();
680	selection.op = SELECTION_CLEAR;
681	}
682	}	700	}
683		701
684	// finally move the view window, if desired	702	// finally move the view window, if desired
685	if (option (Opt_scrollWithBuffer)	703	if (option (Opt_scrollWithBuffer)
686	&& view_start != 0	704	&& view_start != 0
…		…
716	}	734	}
717		735
718	// use a simple and robust scrolling algorithm, this	736	// use a simple and robust scrolling algorithm, this
719	// part of scr_scroll_text is not time-critical.	737	// part of scr_scroll_text is not time-critical.
720		738
		739	// sever line above scroll region
		740	if (row1)
		741	{
		742	line_t &l = ROW(row1 - 1);
		743	l.is_longer (0);
		744	l.touch ();
		745	}
		746
721	int rows = row2 - row1 + 1;	747	int rows = row2 - row1 + 1;
722		748
723	min_it (count, rows);	749	min_it (count, rows);
724		750
725	line_t *temp_buf = row_buf + total_rows;	751	line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
726		752
727	for (int row = 0; row < rows; row++)	753	for (int row = 0; row < rows; row++)
728	{	754	{
729	temp_buf [row] = ROW(row1 + (row + count + rows) % rows);	755	temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
730		756
…		…
732	scr_blank_screen_mem (temp_buf [row], rstyle);	758	scr_blank_screen_mem (temp_buf [row], rstyle);
733	}	759	}
734		760
735	for (int row = 0; row < rows; row++)	761	for (int row = 0; row < rows; row++)
736	ROW(row1 + row) = temp_buf [row];	762	ROW(row1 + row) = temp_buf [row];
		763
		764	// sever bottommost line
		765	{
		766	line_t &l = ROW(row2);
		767	l.is_longer (0);
		768	l.touch ();
		769	}
737	}	770	}
738		771
739	return count;	772	return count;
740	}	773	}
741		774
…		…
747	rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW	780	rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
748	{	781	{
749	if (len <= 0) /* sanity */	782	if (len <= 0) /* sanity */
750	return;	783	return;
751		784
752	unsigned char checksel;	785	bool checksel;
753	unicode_t c;	786	unicode_t c;
754	int ncol = this->ncol;	787	int ncol = this->ncol;
755	const wchar_t *strend = str + len;	788	const wchar_t *strend = str + len;
756		789
757	want_refresh = 1;	790	want_refresh = 1;
…		…
770	scr_scroll_text (screen.tscroll, screen.bscroll, minlines);	803	scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
771	screen.cur.row -= minlines;	804	screen.cur.row -= minlines;
772	}	805	}
773	}	806	}
774		807
775	#ifdef DEBUG_STRICT
776	assert (screen.cur.col < ncol);	808	assert (screen.cur.col < ncol);
777	assert (screen.cur.row < nrow	809	assert (screen.cur.row < nrow
778	&& screen.cur.row >= top_row);	810	&& screen.cur.row >= top_row);
779	#endif
780	int row = screen.cur.row;	811	int row = screen.cur.row;
781		812
782	checksel = selection.op && current_screen == selection.screen ? 1 : 0;	813	checksel = selection.op && current_screen == selection.screen ? 1 : 0;
783		814
784	line_t *line = &ROW(row);	815	line_t *line = &ROW(row);
785		816
786	while (str < strend)	817	while (str < strend)
787	{	818	{
788	c = (unicode_t)*str++; // convert to rxvt-unicodes representation	819	c = (unicode_t)*str++; // convert to rxvt-unicodes representation
789		820
790	if (c < 0x20)	821	if (ecb_unlikely (c < 0x20))
791	if (c == C0_LF)	822	if (c == C0_LF)
792	{	823	{
793	max_it (line->l, screen.cur.col);	824	max_it (line->l, screen.cur.col);
794		825
795	screen.flags &= ~Screen_WrapNext;	826	screen.flags &= ~Screen_WrapNext;
…		…
814	{	845	{
815	scr_tab (1, true);	846	scr_tab (1, true);
816	continue;	847	continue;
817	}	848	}
818		849
		850	if (ecb_unlikely (
819	if (checksel /* see if we're writing within selection */	851	checksel /* see if we're writing within selection */
820	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)	852	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
821	&& ROWCOL_IS_BEFORE (screen.cur, selection.end))	853	&& ROWCOL_IS_BEFORE (screen.cur, selection.end)
		854	))
822	{	855	{
823	checksel = 0;	856	checksel = 0;
824	/*	857	/*
825	* If we wrote anywhere in the selected area, kill the selection	858	* If we wrote anywhere in the selected area, kill the selection
826	* XXX: should we kill the mark too? Possibly, but maybe that	859	* XXX: should we kill the mark too? Possibly, but maybe that
827	* should be a similar check.	860	* should be a similar check.
828	*/	861	*/
829	CLEAR_SELECTION ();	862	CLEAR_SELECTION ();
830	}	863	}
831		864
832	if (screen.flags & Screen_WrapNext)	865	if (ecb_unlikely (screen.flags & Screen_WrapNext))
833	{	866	{
834	scr_do_wrap ();	867	scr_do_wrap ();
835		868
836	line->l = ncol;	869	line->l = ncol;
837	line->is_longer (1);	870	line->is_longer (1);
…		…
839	row = screen.cur.row;	872	row = screen.cur.row;
840	line = &ROW(row); /* _must_ refresh */	873	line = &ROW(row); /* _must_ refresh */
841	}	874	}
842		875
843	// some utf-8 decoders "decode" surrogate characters: let's fix this.	876	// some utf-8 decoders "decode" surrogate characters: let's fix this.
844	if (IN_RANGE_INC (c, 0xd800, 0xdfff))	877	if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
845	c = 0xfffd;	878	c = 0xfffd;
846		879
847	// rely on wcwidth to tell us the character width, do wcwidth before	880	// rely on wcwidth to tell us the character width, do wcwidth before
848	// further replacements, as wcwidth might return -1 for the line	881	// further replacements, as wcwidth might return -1 for the line
849	// drawing characters below as they might be invalid in the current	882	// drawing characters below as they might be invalid in the current
850	// locale.	883	// locale.
851	int width = WCWIDTH (c);	884	int width = WCWIDTH (c);
852		885
853	if (charsets [screen.charset] == '0') // DEC SPECIAL	886	if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
854	{	887	{
855	// vt100 special graphics and line drawing	888	// vt100 special graphics and line drawing
856	// 5f-7e standard vt100	889	// 5f-7e standard vt100
857	// 40-5e rxvt extension for extra curses acs chars	890	// 40-5e rxvt extension for extra curses acs chars
858	static uint16_t vt100_0[62] = { // 41 .. 7e	891	static uint16_t vt100_0[62] = { // 41 .. 7e
…		…
871	c = vt100_0[c - 0x41];	904	c = vt100_0[c - 0x41];
872	width = 1; // vt100 line drawing characters are always single-width	905	width = 1; // vt100 line drawing characters are always single-width
873	}	906	}
874	}	907	}
875		908
876	if (screen.flags & Screen_Insert)	909	if (ecb_unlikely (screen.flags & Screen_Insert))
877	scr_insdel_chars (width, INSERT);	910	scr_insdel_chars (width, INSERT);
878		911
879	if (width != 0)	912	if (width != 0)
880	{	913	{
881	#if !UNICODE_3	914	#if !UNICODE_3
…		…
886	# else	919	# else
887	c = 0xfffd;	920	c = 0xfffd;
888	# endif	921	# endif
889	#endif	922	#endif
890		923
		924	rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
		925
		926	// if the character doesn't fit into the remaining columns...
		927	if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
		928	{
		929	if (screen.flags & Screen_Autowrap)
		930	{
		931	// ... artificially enlargen the previous one
		932	c = NOCHAR;
		933	// and try the same character next loop iteration
		934	--str;
		935	}
		936	else
		937	screen.cur.col = ncol - width;
		938	}
		939
891	// nuke the character at this position, if required	940	// nuke the character at this position, if required
		941	// due to wonderful coincidences everywhere else in this loop
		942	// we never have to check for overwriting a wide char itself,
		943	// only its tail.
892	if (line->t[screen.cur.col] == NOCHAR	944	if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
893	|| (screen.cur.col < ncol - 1	945	scr_kill_char (*line, screen.cur.col);
894	&& line->t[screen.cur.col + 1] == NOCHAR))
895	{
896	int col = screen.cur.col;
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 = ' ';
919	// and try the same character next loop iteration
920	--str;
921	}
922		946
923	line->touch ();	947	line->touch ();
924		948
925	do	949	do
926	{	950	{
927	line->t[screen.cur.col] = c;	951	line->t[screen.cur.col] = c;
928	line->r[screen.cur.col] = rend;	952	line->r[screen.cur.col] = rend;
929		953
930	if (screen.cur.col < ncol - 1)	954	if (ecb_likely (screen.cur.col < ncol - 1))
931	screen.cur.col++;	955	screen.cur.col++;
932	else	956	else
933	{	957	{
934	line->l = ncol;	958	line->l = ncol;
935	if (screen.flags & Screen_Autowrap)	959	if (screen.flags & Screen_Autowrap)
936	screen.flags |= Screen_WrapNext;	960	screen.flags |= Screen_WrapNext;
937	break;	961
		962	goto end_of_line;
938	}	963	}
939		964
940	c = NOCHAR;	965	c = NOCHAR;
941	}	966	}
942	while (--width > 0);	967	while (ecb_unlikely (--width > 0));
943		968
944	// pad with spaces when overwriting wide character with smaller one	969	// pad with spaces when overwriting wide character with smaller one
945	if (!width)	970	for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
946	{	971	{
947	line->touch ();	972	line->t[c] = ' ';
		973	line->r[c] = rend;
		974	}
948		975
949	for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)	976	end_of_line:
		977	;
		978	}
		979	#if ENABLE_COMBINING
		980	else // width == 0
		981	{
		982	if (c != 0xfeff) // ignore BOM
		983	{
		984	// handle combining characters
		985	// we just tag the accent on the previous on-screen character.
		986	// this is arguably not correct, but also arguably not wrong.
		987	// we don't handle double-width characters nicely yet.
		988	line_t *linep;
		989	text_t *tp;
		990	rend_t *rp;
		991
		992	if (screen.cur.col > 0)
950	{	993	{
951	line->t[c] = ' ';
952	line->r[c] = rend;	994	linep = line;
		995	tp = line->t + screen.cur.col - 1;
		996	rp = line->r + screen.cur.col - 1;
953	}	997	}
		998	else if (screen.cur.row > 0
		999	&& ROW(screen.cur.row - 1).is_longer ())
		1000	{
		1001	linep = &ROW(screen.cur.row - 1);
		1002	tp = line->t + ncol - 1;
		1003	rp = line->r + ncol - 1;
		1004	}
		1005	else
		1006	continue;
		1007
		1008	linep->touch ();
		1009
		1010	while (*tp == NOCHAR && tp > linep->t)
		1011	tp--, rp--;
		1012
		1013	// first try to find a precomposed character
		1014	unicode_t n = rxvt_compose (*tp, c);
		1015	if (n == NOCHAR)
		1016	n = rxvt_composite.compose (*tp, c);
		1017
		1018	*tp = n;
		1019	*rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
954	}	1020	}
955	}	1021	}
956	else // width == 0
957	{
958	#if ENABLE_COMBINING
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	{
969	linep = line;
970	tp = line->t + screen.cur.col - 1;
971	rp = line->r + screen.cur.col - 1;
972	}
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	}
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	1022	#endif
996	}
997	}	1023	}
998		1024
999	max_it (line->l, screen.cur.col);	1025	max_it (line->l, screen.cur.col);
1000		1026
1001	#ifdef DEBUG_STRICT
1002	assert (screen.cur.row >= 0);	1027	assert (screen.cur.row >= 0);
1003	#endif
1004	}	1028	}
1005		1029
1006	/* ------------------------------------------------------------------------- */	1030	/* ------------------------------------------------------------------------- */
1007	/*	1031	/*
1008	* Process Backspace. Move back the cursor back a position, wrap if have to	1032	* Process Backspace. Move back the cursor back a position, wrap if have to
…		…
1021		1045
1022	want_refresh = 1;	1046	want_refresh = 1;
1023	#endif	1047	#endif
1024	}	1048	}
1025	}	1049	}
		1050	else if (screen.flags & Screen_WrapNext)
		1051	screen.flags &= ~Screen_WrapNext;
1026	else	1052	else
1027	scr_gotorc (0, -1, RELATIVE);	1053	scr_gotorc (0, -1, RELATIVE);
1028	}	1054	}
1029		1055
1030	/* ------------------------------------------------------------------------- */	1056	/* ------------------------------------------------------------------------- */
…		…
1286	scr_blank_line (line, col, num, rstyle);	1312	scr_blank_line (line, col, num, rstyle);
1287	}	1313	}
1288		1314
1289	/* ------------------------------------------------------------------------- */	1315	/* ------------------------------------------------------------------------- */
1290	/*	1316	/*
1291	* Erase part of whole of the screen	1317	* Erase part or whole of the screen
1292	* XTERM_SEQ: Clear screen after cursor : ESC [ 0 J	1318	* XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1293	* XTERM_SEQ: Clear screen before cursor: ESC [ 1 J	1319	* XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1294	* XTERM_SEQ: Clear whole screen : ESC [ 2 J	1320	* XTERM_SEQ: Clear whole screen : ESC [ 2 J
1295	*/	1321	*/
1296	void	1322	void
…		…
1305	ZERO_SCROLLBACK ();	1331	ZERO_SCROLLBACK ();
1306		1332
1307	switch (mode)	1333	switch (mode)
1308	{	1334	{
1309	case 0: /* erase to end of screen */	1335	case 0: /* erase to end of screen */
1310	selection_check (1);
1311	scr_erase_line (0);	1336	scr_erase_line (0);
1312	row = screen.cur.row + 1; /* possible OOB */	1337	row = screen.cur.row + 1; /* possible OOB */
1313	num = nrow - row;	1338	num = nrow - row;
1314	break;	1339	break;
1315	case 1: /* erase to beginning of screen */	1340	case 1: /* erase to beginning of screen */
1316	selection_check (3);
1317	scr_erase_line (1);	1341	scr_erase_line (1);
1318	row = 0;	1342	row = 0;
1319	num = screen.cur.row;	1343	num = screen.cur.row;
1320	break;	1344	break;
1321	case 2: /* erase whole screen */	1345	case 2: /* erase whole screen */
1322	selection_check (3);
1323	row = 0;	1346	row = 0;
1324	num = nrow;	1347	num = nrow;
1325	break;	1348	break;
1326	default:	1349	default:
1327	return;	1350	return;
…		…
1336	if (row >= nrow) /* Out Of Bounds */	1359	if (row >= nrow) /* Out Of Bounds */
1337	return;	1360	return;
1338		1361
1339	min_it (num, nrow - row);	1362	min_it (num, nrow - row);
1340		1363
1341	if (rstyle & (RS_RVid | RS_Uline))	1364	if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1342	ren = (rend_t) ~RS_None;	1365	ren = (rend_t) ~RS_None;
1343	else if (GET_BASEBG (rstyle) == Color_bg)	1366	else if (GET_BASEBG (rstyle) == Color_bg)
1344	{	1367	{
1345	ren = DEFAULT_RSTYLE;	1368	ren = DEFAULT_RSTYLE;
1346	CLEAR_ROWS (row, num);	1369
		1370	if (mapped)
		1371	XClearArea (dpy, vt, 0,
		1372	Row2Pixel (row - view_start), (unsigned int)width,
		1373	(unsigned int)Height2Pixel (num), False);
1347	}	1374	}
1348	else	1375	else
1349	{	1376	{
1350	ren = rstyle & (RS_fgMask | RS_bgMask);	1377	ren = rstyle & (RS_fgMask | RS_bgMask);
		1378
		1379	if (mapped)
		1380	{
1351	gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];	1381	gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1352	XChangeGC (dpy, gc, GCForeground, &gcvalue);	1382	XChangeGC (dpy, gc, GCForeground, &gcvalue);
1353	ERASE_ROWS (row, num);	1383	XFillRectangle (dpy, vt, gc,
		1384	0, Row2Pixel (row - view_start),
		1385	(unsigned int)width,
		1386	(unsigned int)Height2Pixel (num));
1354	gcvalue.foreground = pix_colors[Color_fg];	1387	gcvalue.foreground = pix_colors[Color_fg];
1355	XChangeGC (dpy, gc, GCForeground, &gcvalue);	1388	XChangeGC (dpy, gc, GCForeground, &gcvalue);
		1389	}
1356	}	1390	}
1357		1391
1358	for (; num--; row++)	1392	for (; num--; row++)
1359	{	1393	{
1360	scr_blank_screen_mem (ROW(row), rstyle);	1394	scr_blank_screen_mem (ROW(row), rstyle);
		1395
		1396	if (row - view_start < nrow)
1361	scr_blank_line (drawn_buf [row], 0, ncol, ren);	1397	scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1362	}	1398	}
1363	}	1399	}
1364		1400
1365	#if !ENABLE_MINIMAL	1401	#if !ENABLE_MINIMAL
1366	void	1402	void
…		…
1385		1421
1386	want_refresh = 1;	1422	want_refresh = 1;
1387	ZERO_SCROLLBACK ();	1423	ZERO_SCROLLBACK ();
1388		1424
1389	num_scr_allow = 0;	1425	num_scr_allow = 0;
1390	selection_check (3);	1426
		1427	row_col_t pos;
		1428	pos.row = pos.col = 0;
		1429	if (ROWCOL_IS_AFTER (selection.end, pos))
		1430	CLEAR_SELECTION ();
1391		1431
1392	fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));	1432	fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1393	for (int row = nrow; row--; )	1433	for (int row = nrow; row--; )
1394	{	1434	{
1395	line_t &line = ROW(row);	1435	line_t &line = ROW(row);
…		…
1440	* Insert/Delete <count> characters from the current position	1480	* Insert/Delete <count> characters from the current position
1441	*/	1481	*/
1442	void	1482	void
1443	rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW	1483	rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1444	{	1484	{
1445	int col, row;
1446	rend_t tr;
1447
1448	want_refresh = 1;	1485	want_refresh = 1;
1449	ZERO_SCROLLBACK ();	1486	ZERO_SCROLLBACK ();
1450		1487
1451	if (count <= 0)	1488	if (count <= 0)
1452	return;	1489	return;
…		…
1454	scr_do_wrap ();	1491	scr_do_wrap ();
1455		1492
1456	selection_check (1);	1493	selection_check (1);
1457	min_it (count, ncol - screen.cur.col);	1494	min_it (count, ncol - screen.cur.col);
1458		1495
1459	row = screen.cur.row;	1496	int row = screen.cur.row;
1460		1497
1461	line_t *line = &ROW(row);	1498	line_t *line = &ROW(row);
1462		1499
1463	line->touch ();	1500	line->touch ();
1464	line->is_longer (0);	1501	line->is_longer (0);
1465		1502
		1503	// nuke wide spanning the start
		1504	if (line->t[screen.cur.col] == NOCHAR)
		1505	scr_kill_char (*line, screen.cur.col);
		1506
1466	switch (insdel)	1507	switch (insdel)
1467	{	1508	{
1468	case INSERT:	1509	case INSERT:
1469	for (col = ncol - 1; (col - count) >= screen.cur.col; col--)	1510	line->l = min (line->l + count, ncol);
		1511
		1512	if (line->t[screen.cur.col] == NOCHAR)
		1513	scr_kill_char (*line, screen.cur.col);
		1514
		1515	for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1470	{	1516	{
1471	line->t[col] = line->t[col - count];	1517	line->t[col] = line->t[col - count];
1472	line->r[col] = line->r[col - count];	1518	line->r[col] = line->r[col - count];
1473	}	1519	}
1474
1475	line->l = min (line->l + count, ncol);
1476		1520
1477	if (selection.op && current_screen == selection.screen	1521	if (selection.op && current_screen == selection.screen
1478	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))	1522	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1479	{	1523	{
1480	if (selection.end.row != screen.cur.row	1524	if (selection.end.row != screen.cur.row
…		…
1495	case ERASE:	1539	case ERASE:
1496	screen.cur.col += count; /* don't worry if > ncol */	1540	screen.cur.col += count; /* don't worry if > ncol */
1497	selection_check (1);	1541	selection_check (1);
1498	screen.cur.col -= count;	1542	screen.cur.col -= count;
1499		1543
1500	line->l = max (line->l - count, 0);	1544	// nuke wide char after the end
		1545	if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
		1546	scr_kill_char (*line, screen.cur.col + count);
		1547
1501	scr_blank_line (*line, screen.cur.col, count, rstyle);	1548	scr_blank_line (*line, screen.cur.col, count, rstyle);
1502	break;	1549	break;
1503		1550
1504	case DELETE:	1551	case DELETE:
1505	tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);	1552	line->l = max (line->l - count, 0);
1506		1553
		1554	// nuke wide char spanning the end
		1555	if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
		1556	scr_kill_char (*line, screen.cur.col + count);
		1557
1507	for (col = screen.cur.col; (col + count) < ncol; col++)	1558	for (int col = screen.cur.col; (col + count) < ncol; col++)
1508	{	1559	{
1509	line->t[col] = line->t[col + count];	1560	line->t[col] = line->t[col + count];
1510	line->r[col] = line->r[col + count];	1561	line->r[col] = line->r[col + count];
1511	}	1562	}
1512		1563
1513	line->l = max (line->l - count, 0);
1514	scr_blank_line (*line, ncol - count, count, tr);	1564	scr_blank_line (*line, ncol - count, count, rstyle);
1515		1565
1516	if (selection.op && current_screen == selection.screen	1566	if (selection.op && current_screen == selection.screen
1517	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))	1567	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1518	{	1568	{
1519	if (selection.end.row != screen.cur.row	1569	if (selection.end.row != screen.cur.row
…		…
1655	{	1705	{
1656	rvideo_state = on;	1706	rvideo_state = on;
1657		1707
1658	::swap (pix_colors[Color_fg], pix_colors[Color_bg]);	1708	::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1659	#ifdef HAVE_BG_PIXMAP	1709	#ifdef HAVE_BG_PIXMAP
1660	if (bgPixmap.pixmap == None)	1710	if (bg_pixmap == None)
1661	#endif	1711	#endif
1662	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);	1712	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1663		1713
1664	XGCValues gcvalue;	1714	XGCValues gcvalue;
1665	gcvalue.foreground = pix_colors[Color_fg];	1715	gcvalue.foreground = pix_colors[Color_fg];
…		…
1809	for (i = PART_BEG; i < RC_COUNT; i++)	1859	for (i = PART_BEG; i < RC_COUNT; i++)
1810	{	1860	{
1811	min_it (rc[i].col, ncol - 1);	1861	min_it (rc[i].col, ncol - 1);
1812	min_it (rc[i].row, nrow - 1);	1862	min_it (rc[i].row, nrow - 1);
1813	}	1863	}
1814	// TODO: this line somehow causes segfault if scr_expose() is called just after resize	1864
1815	for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)	1865	for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1816	fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);	1866	fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1817		1867
1818	num_scr_allow = 0;	1868	num_scr_allow = 0;
1819		1869
…		…
1892		1942
1893	# ifndef NO_MAPALERT	1943	# ifndef NO_MAPALERT
1894	# ifdef MAPALERT_OPTION	1944	# ifdef MAPALERT_OPTION
1895	if (option (Opt_mapAlert))	1945	if (option (Opt_mapAlert))
1896	# endif	1946	# endif
1897	XMapWindow (dpy, parent[0]);	1947	XMapWindow (dpy, parent);
1898	# endif	1948	# endif
1899		1949
1900	# if ENABLE_FRILLS	1950	# if ENABLE_FRILLS
1901	if (option (Opt_urgentOnBell))	1951	if (option (Opt_urgentOnBell))
1902	{	1952	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	1953	# endif
1910		1954
1911	if (option (Opt_visualBell))	1955	if (option (Opt_visualBell))
1912	{	1956	{
1913	rvideo_bell = true;	1957	rvideo_bell = true;
…		…
1916		1960
1917	bell_ev.start (VISUAL_BELL_DURATION);	1961	bell_ev.start (VISUAL_BELL_DURATION);
1918	}	1962	}
1919	else	1963	else
1920	XBell (dpy, 0);	1964	XBell (dpy, 0);
		1965	HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1921	#endif	1966	#endif
1922	}	1967	}
1923		1968
1924	/* ------------------------------------------------------------------------- */	1969	/* ------------------------------------------------------------------------- */
1925	/* ARGSUSED */
1926	void	1970	void
1927	rxvt_term::scr_printscreen (int fullhist) NOTHROW	1971	rxvt_term::scr_printscreen (int fullhist) NOTHROW
1928	{	1972	{
1929	#ifdef PRINTPIPE	1973	#ifdef PRINTPIPE
1930	int nrows, row_start;	1974	int nrows, row_start;
1931	FILE *fd;	1975	FILE *fd = popen_printer ();
1932		1976
1933	if ((fd = popen_printer ()) == NULL)	1977	if (!fd)
1934	return;	1978	return;
1935		1979
1936	if (fullhist)	1980	if (fullhist)
1937	{	1981	{
1938	nrows = nrow - top_row;	1982	nrows = nrow - top_row;
…		…
1944	row_start = view_start;	1988	row_start = view_start;
1945	}	1989	}
1946		1990
1947	wctomb (0, 0);	1991	wctomb (0, 0);
1948		1992
1949	for (int r1 = 0; r1 < nrows; r1++)	1993	for (int r1 = row_start; r1 < row_start + nrows; r1++)
1950	{	1994	{
1951	text_t *tp = ROW(r1).t;	1995	text_t *tp = ROW(r1).t;
1952	int len = ROW(r1).l;	1996	int len = ROW(r1).l;
1953		1997
1954	for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN	1998	for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
…		…
1983	* screen.text/screen.rend contain what the screen will change to.	2027	* screen.text/screen.rend contain what the screen will change to.
1984	*/	2028	*/
1985	void	2029	void
1986	rxvt_term::scr_refresh () NOTHROW	2030	rxvt_term::scr_refresh () NOTHROW
1987	{	2031	{
1988	unsigned char have_bg,
1989	showcursor; /* show the cursor */
1990	int16_t col, row, /* column/row we're processing */	2032	int16_t col, row, /* column/row we're processing */
1991	ocrow; /* old cursor row */	2033	ocrow; /* old cursor row */
1992	int i; /* tmp */	2034	int i; /* tmp */
1993	#ifndef NO_CURSORCOLOR	2035	#ifndef NO_CURSORCOLOR
1994	rend_t cc1; /* store colours at cursor position (s) */	2036	rend_t cc1; /* store colours at cursor position (s) */
…		…
2005	/*	2047	/*
2006	* A: set up vars	2048	* A: set up vars
2007	*/	2049	*/
2008	refresh_count = 0;	2050	refresh_count = 0;
2009		2051
		2052	unsigned int old_screen_flags = screen.flags;
2010	have_bg = 0;	2053	bool have_bg = 0;
2011	#ifdef HAVE_BG_PIXMAP	2054	#ifdef HAVE_BG_PIXMAP
2012	have_bg = bgPixmap.pixmap != None;	2055	have_bg = bg_pixmap != None;
2013	#endif	2056	#endif
2014	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */	2057	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2015		2058
2016	/*	2059	/*
2017	* B: reverse any characters which are selected	2060	* B: reverse any characters which are selected
2018	*/	2061	*/
2019	scr_reverse_selection ();	2062	scr_reverse_selection ();
2020		2063
		2064	HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
		2065	#if ENABLE_OVERLAY
		2066	scr_swap_overlay ();
		2067	#endif
		2068
		2069	bool showcursor = screen.flags & Screen_VisibleCursor;
		2070
2021	/*	2071	/*
2022	* C: set the cursor character (s)	2072	* C: set the cursor character (s)
2023	*/	2073	*/
2024	{	2074	{
2025	unsigned char setoldcursor;	2075	bool setoldcursor;
2026		2076
2027	showcursor = (screen.flags & Screen_VisibleCursor);
2028	#ifdef CURSOR_BLINK	2077	#ifdef CURSOR_BLINK
2029	if (hidden_cursor)	2078	if (hidden_cursor)
2030	showcursor = 0;	2079	showcursor = 0;
2031	#endif	2080	#endif
2032		2081
…		…
2060	ccol2 = bgcolor_of (rstyle);	2109	ccol2 = bgcolor_of (rstyle);
2061	#else	2110	#else
2062	ccol2 = Color_bg;	2111	ccol2 = Color_bg;
2063	#endif	2112	#endif
2064		2113
2065	if (showcursor && focus)	2114	if (focus)
2066	{	2115	{
2067	if (option (Opt_cursorUnderline))	2116	if (option (Opt_cursorUnderline))
2068	*crp ^= RS_Uline;	2117	*crp ^= RS_Uline;
2069	else	2118	else
2070	{	2119	{
…		…
2105	oldcursor.col = screen.cur.col;	2154	oldcursor.col = screen.cur.col;
2106	}	2155	}
2107	}	2156	}
2108	}	2157	}
2109		2158
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	2159	#ifndef NO_SLOW_LINK_SUPPORT
2116	/*	2160	/*
2117	* D: CopyArea pass - very useful for slower links	2161	* D: CopyArea pass - very useful for slower links
2118	* This has been deliberately kept simple.	2162	* This has been deliberately kept simple.
2119	*/	2163	*/
…		…
2123	{	2167	{
2124	int16_t nits;	2168	int16_t nits;
2125	int i = num_scr;	2169	int i = num_scr;
2126	int j;	2170	int j;
2127	int len, wlen;	2171	int len, wlen;
2128	dLocal (int, num_scr);
2129		2172
2130	j = nrow;	2173	j = nrow;
2131	wlen = len = -1;	2174	wlen = len = -1;
2132	row = i > 0 ? 0 : j - 1;	2175	row = i > 0 ? 0 : j - 1;
2133		2176
…		…
2208	continue;	2251	continue;
2209		2252
2210	// redraw one or more characters	2253	// redraw one or more characters
2211		2254
2212	// seek to the beginning of wide characters	2255	// seek to the beginning of wide characters
2213	while (stp[col] == NOCHAR && col > 0)	2256	while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2214	--col;	2257	--col;
2215		2258
2216	rend_t rend = srp[col]; /* screen rendition (target rendtion) */	2259	rend_t rend = srp[col]; /* screen rendition (target rendition) */
2217	text_t *text = stp + col;	2260	text_t *text = stp + col;
2218	int count = 1;	2261	int count = 1;
2219		2262
2220	dtp[col] = stp[col];	2263	dtp[col] = stp[col];
2221	drp[col] = rend;	2264	drp[col] = rend;
…		…
2225	for (i = 0; ++col < ncol; )	2268	for (i = 0; ++col < ncol; )
2226	{	2269	{
2227	if (stp[col] == NOCHAR)	2270	if (stp[col] == NOCHAR)
2228	{	2271	{
2229	dtp[col] = stp[col];	2272	dtp[col] = stp[col];
2230	drp[col] = rend;	2273	drp[col] = srp[col];
		2274
2231	count++;	2275	count++;
2232	i++;	2276	i++;
2233		2277
2234	continue;	2278	continue;
2235	}	2279	}
…		…
2255		2299
2256	col--; /* went one too far. move back */	2300	col--; /* went one too far. move back */
2257	count -= i; /* dump any matching trailing chars */	2301	count -= i; /* dump any matching trailing chars */
2258		2302
2259	// sometimes we optimize away the trailing NOCHAR's, add them back	2303	// sometimes we optimize away the trailing NOCHAR's, add them back
2260	while (i && text[count] == NOCHAR)	2304	while (ecb_unlikely (i && text[count] == NOCHAR))
2261	count++, i--;	2305	count++, i--;
2262		2306
2263	/*	2307	/*
2264	* Determine the attributes for the string	2308	* Determine the attributes for the string
2265	*/	2309	*/
2266	int fore = fgcolor_of (rend); // desired foreground	2310	int fore = fgcolor_of (rend); // desired foreground
2267	int back = bgcolor_of (rend); // desired background	2311	int back = bgcolor_of (rend); // desired background
2268		2312
2269	// only do special processing if any attributes are set, which is unlikely	2313	// 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))	2314	if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2271	{	2315	{
2272	bool invert = rend & RS_RVid;	2316	bool invert = rend & RS_RVid;
2273		2317
2274	#ifndef NO_BOLD_UNDERLINE_REVERSE	2318	#ifndef NO_BOLD_UNDERLINE_REVERSE
2275	if (rend & RS_Bold && fore == Color_fg)	2319	if (rend & RS_Bold && fore == Color_fg)
…		…
2294		2338
2295	if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))	2339	if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2296	fore = Color_UL;	2340	fore = Color_UL;
2297	#endif	2341	#endif
2298		2342
		2343	#ifdef OPTION_HC
		2344	if (rend & RS_Sel)
		2345	{
		2346	/* invert the column if no highlightColor is set or it is the
		2347	* current cursor column */
		2348	if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
		2349	&& ISSET_PIXCOLOR (Color_HC))
		2350	{
		2351	if (ISSET_PIXCOLOR (Color_HTC))
		2352	fore = Color_HTC;
		2353	// if invert is 0 reverse video is set so we use bg color as fg color
		2354	else if (!invert)
		2355	fore = back;
		2356
		2357	back = Color_HC;
		2358	invert = 0;
		2359	}
		2360	}
		2361	#endif
		2362
2299	if (invert)	2363	if (invert)
2300	{	2364	{
2301	#ifdef OPTION_HC
2302	if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2303	|| !ISSET_PIXCOLOR (Color_HC))
2304	#endif
2305	/* invert the column if no highlightColor is set or it is the
2306	* current cursor column */
2307	::swap (fore, back);	2365	::swap (fore, back);
2308	#ifdef OPTION_HC
2309	else if (ISSET_PIXCOLOR (Color_HC))
2310	back = Color_HC;
2311	#endif
2312		2366
2313	#ifndef NO_BOLD_UNDERLINE_REVERSE	2367	#ifndef NO_BOLD_UNDERLINE_REVERSE
2314	# ifndef OPTION_HC
2315	if (ISSET_PIXCOLOR (Color_RV))
2316	back = Color_RV;
2317	# endif
2318	if (fore == back)	2368	if (fore == back)
2319	{	2369	{
2320	fore = Color_bg;	2370	fore = Color_bg;
2321	back = Color_fg;	2371	back = Color_fg;
2322	}	2372	}
…		…
2358	/*	2408	/*
2359	* Actually do the drawing of the string here	2409	* Actually do the drawing of the string here
2360	*/	2410	*/
2361	rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];	2411	rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2362		2412
2363	if (have_bg && back == Color_bg)	2413	if (ecb_likely (have_bg && back == Color_bg))
2364	{	2414	{
2365	// this is very ugly, maybe push it into ->draw?	2415	// this is very ugly, maybe push it into ->draw?
2366		2416
2367	for (i = 0; i < count; i++) /* don't draw empty strings */	2417	for (i = 0; i < count; i++) /* don't draw empty strings */
2368	if (text[i] != ' ')	2418	if (text[i] != ' ')
…		…
2375	did_clear: ;	2425	did_clear: ;
2376	}	2426	}
2377	else	2427	else
2378	font->draw (*drawable, xpixel, ypixel, text, count, fore, back);	2428	font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2379		2429
2380	if (rend & RS_Uline && font->descent > 1 && fore != back)	2430	if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2381	{	2431	{
2382	#if ENABLE_FRILLS	2432	#if ENABLE_FRILLS
2383	if (ISSET_PIXCOLOR (Color_underline))	2433	if (ISSET_PIXCOLOR (Color_underline))
2384	XSetForeground (dpy, gc, pix_colors[Color_underline]);	2434	XSetForeground (dpy, gc, pix_colors[Color_underline]);
2385	else	2435	else
…		…
2390	xpixel, ypixel + font->ascent + 1,	2440	xpixel, ypixel + font->ascent + 1,
2391	xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);	2441	xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2392	}	2442	}
2393	} /* for (col....) */	2443	} /* for (col....) */
2394	} /* for (row....) */	2444	} /* for (row....) */
2395
2396	#if ENABLE_OVERLAY
2397	scr_swap_overlay ();
2398	#endif
2399	HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2400		2445
2401	/*	2446	/*
2402	* G: cleanup cursor and display outline cursor if necessary	2447	* G: cleanup cursor and display outline cursor if necessary
2403	*/	2448	*/
2404	if (showcursor)	2449	if (showcursor)
…		…
2443	}	2488	}
2444		2489
2445	/*	2490	/*
2446	* H: cleanup selection	2491	* H: cleanup selection
2447	*/	2492	*/
		2493	#if ENABLE_OVERLAY
		2494	scr_swap_overlay ();
		2495	#endif
		2496	HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
		2497
2448	scr_reverse_selection ();	2498	scr_reverse_selection ();
2449		2499
		2500	screen.flags = old_screen_flags;
2450	num_scr = 0;	2501	num_scr = 0;
2451	num_scr_allow = 1;	2502	num_scr_allow = 1;
2452	}	2503	}
2453		2504
2454	void	2505	void
…		…
2475	scr_remap_chars (swap_buf [i]);	2526	scr_remap_chars (swap_buf [i]);
2476	}	2527	}
2477	}	2528	}
2478		2529
2479	void	2530	void
2480	rxvt_term::scr_recolour () NOTHROW	2531	rxvt_term::scr_recolour (bool refresh) NOTHROW
2481	{	2532	{
		2533	bool transparent = false;
		2534
2482	#ifdef HAVE_BG_PIXMAP	2535	#ifdef HAVE_BG_PIXMAP
2483	bgPixmap.apply ();	2536	if (bg_pixmap != None)
2484	#else	2537	{
		2538	# ifdef ENABLE_TRANSPARENCY
		2539	if (bg_flags & BG_IS_TRANSPARENT)
		2540	{
		2541	XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap);
		2542	XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2485		2543
		2544	transparent = true;
		2545	}
		2546	else
		2547	# endif
		2548	{
		2549	XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
		2550	XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
		2551	}
		2552	}
		2553	else
		2554	#endif
		2555	{
2486	XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);	2556	XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2487	XClearWindow (dpy, parent[0]);
2488	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);	2557	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
		2558	}
		2559
		2560	XClearWindow (dpy, parent);
2489		2561
2490	if (scrollBar.win)	2562	if (scrollBar.win)
2491	{	2563	{
		2564	if (transparent)
		2565	XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
		2566	else
2492	XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);	2567	XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2493	scrollBar.state = STATE_IDLE;	2568	scrollBar.state = SB_STATE_IDLE;
2494	scrollBar.show (0);	2569	scrollBar.show (0);
2495	}	2570	}
2496		2571
2497	#endif	2572	if (refresh)
2498		2573	{
2499	/* bgPixmap.apply () does not do the following : */
2500	scr_clear ();	2574	scr_clear ();
2501	scr_touch (true);	2575	scr_touch (true);
		2576	}
2502	want_refresh = 1;	2577	want_refresh = 1;
2503	}	2578	}
2504		2579
2505	/* ------------------------------------------------------------------------- */	2580	/* ------------------------------------------------------------------------- */
2506	void	2581	void
…		…
2574	{	2649	{
2575	#if !ENABLE_MINIMAL	2650	#if !ENABLE_MINIMAL
2576	if (selection.rect)	2651	if (selection.rect)
2577	scr_xor_rect (selection.beg.row, selection.beg.col,	2652	scr_xor_rect (selection.beg.row, selection.beg.col,
2578	selection.end.row, selection.end.col,	2653	selection.end.row, selection.end.col,
2579	RS_RVid, RS_RVid | RS_Uline);	2654	RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2580	else	2655	else
2581	#endif	2656	#endif
2582	scr_xor_span (selection.beg.row, selection.beg.col,	2657	scr_xor_span (selection.beg.row, selection.beg.col,
2583	selection.end.row, selection.end.col,	2658	selection.end.row, selection.end.col,
2584	RS_RVid);	2659	RS_Sel | RS_RVid);
2585	}	2660	}
2586	}	2661	}
2587		2662
2588	/* ------------------------------------------------------------------------- */	2663	/* ------------------------------------------------------------------------- */
2589	/*	2664	/*
…		…
2592	*/	2667	*/
2593	#if 0	2668	#if 0
2594	void	2669	void
2595	rxvt_term::scr_dump (int fd) NOTHROW	2670	rxvt_term::scr_dump (int fd) NOTHROW
2596	{	2671	{
2597	int row, wrote;	2672	// if this method is needed, it can be implemented by factoring the
2598	unsigned int width, towrite;	2673	// relevant code in scr_printscreen
2599	char r1[] = "\n";
2600
2601	for (row = saveLines + top_row;
2602	row < saveLines + nrow - 1; row++)
2603	{
2604	width = row_buf[row].l >= 0 ? row_buf[row].l
2605	: ncol;
2606	for (towrite = width; towrite; towrite -= wrote)
2607	{
2608	wrote = write (fd, & (row_buf[row].t[width - towrite]),
2609	towrite);
2610	if (wrote < 0)
2611	return; /* XXX: death, no report */
2612	}
2613	if (row_buf[row].l >= 0)
2614	if (write (fd, r1, 1) <= 0)
2615	return; /* XXX: death, no report */
2616	}
2617	}	2674	}
2618	#endif	2675	#endif
2619		2676
2620	/* ------------------------------------------------------------------------- *	2677	/* ------------------------------------------------------------------------- *
2621	* CHARACTER SELECTION *	2678	* CHARACTER SELECTION *
2622	* ------------------------------------------------------------------------- */	2679	* ------------------------------------------------------------------------- */
2623	void	2680	void
2624	rxvt_term::selection_check (int check_more) NOTHROW	2681	rxvt_term::selection_check (int check_more) NOTHROW
2625	{	2682	{
2626	row_col_t pos;
2627
2628	if (!selection.op)	2683	if (!selection.op)
2629	return;	2684	return;
2630		2685
2631	pos.row = pos.col = 0;
2632	if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)	2686	if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2633	|| !IN_RANGE_EXC (selection.mark.row, top_row, nrow)	2687	|| !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2634	|| !IN_RANGE_EXC (selection.end.row, top_row, nrow)	2688	|| !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2635	|| (check_more == 1	2689	|| (check_more == 1
2636	&& current_screen == selection.screen	2690	&& current_screen == selection.screen
2637	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)	2691	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2638	&& ROWCOL_IS_BEFORE (screen.cur, selection.end))	2692	&& ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2639	|| (check_more == 2
2640	&& ROWCOL_IS_BEFORE (selection.beg, pos)
2641	&& ROWCOL_IS_AFTER (selection.end, pos))
2642	|| (check_more == 3
2643	&& ROWCOL_IS_AFTER (selection.end, pos))
2644	|| (check_more == 4 /* screen width change */
2645	&& (selection.beg.row != selection.end.row
2646	|| selection.end.col > ncol)))
2647	CLEAR_SELECTION ();	2693	CLEAR_ALL_SELECTION ();
2648	}	2694	}
2649		2695
2650	/* ------------------------------------------------------------------------- */	2696	/* ------------------------------------------------------------------------- */
2651	/*	2697	/*
2652	* Paste a selection direct to the command fd	2698	* Paste a selection direct to the command fd
2653	*/	2699	*/
2654	void	2700	void
2655	rxvt_term::paste (char *data, unsigned int len) NOTHROW	2701	rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2656	{	2702	{
2657	/* convert normal newline chars into common keyboard Return key sequence */	2703	/* convert normal newline chars into common keyboard Return key sequence */
2658	for (unsigned int i = 0; i < len; i++)	2704	for (unsigned int i = 0; i < len; i++)
2659	if (data[i] == C0_LF)	2705	if (data[i] == C0_LF)
2660	data[i] = C0_CR;	2706	data[i] = C0_CR;
…		…
2666		2712
2667	if (priv_modes & PrivMode_BracketPaste)	2713	if (priv_modes & PrivMode_BracketPaste)
2668	tt_printf ("\e[201~");	2714	tt_printf ("\e[201~");
2669	}	2715	}
2670		2716
2671	/* ------------------------------------------------------------------------- */
2672	/*
2673	* Respond to a notification that a primary selection has been sent
2674	* EXT: SelectionNotify
2675	*/
2676	void	2717	void
2677	rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW	2718	rxvt_term::paste (char *data, unsigned int len) NOTHROW
2678	{	2719	{
2679	if (prop == None) /* check for failed XConvertSelection */	2720	if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2680	{
2681	if ((selection_type & Sel_CompoundText))
2682	{
2683	int selnum = selection_type & Sel_whereMask;
2684
2685	selection_type = 0;
2686	if (selnum != Sel_direct)
2687	selection_request_other (XA_STRING, selnum);
2688	}
2689
2690	if ((selection_type & Sel_UTF8String))
2691	{
2692	int selnum = selection_type & Sel_whereMask;
2693
2694	selection_type = Sel_CompoundText;
2695	if (selnum != Sel_direct)
2696	selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2697	else
2698	selection_type = 0;
2699	}
2700
2701	return;
2702	}
2703
2704	unsigned long bytes_after;
2705	XTextProperty ct;
2706
2707	if (XGetWindowProperty (dpy, win, prop,
2708	0, PROP_SIZE / 4,
2709	delete_prop, AnyPropertyType,
2710	&ct.encoding, &ct.format,
2711	&ct.nitems, &bytes_after,
2712	&ct.value) != Success)
2713	{
2714	ct.value = 0;
2715	goto bailout;
2716	}
2717
2718	if (ct.encoding == None)
2719	goto bailout;
2720
2721	if (bytes_after)
2722	{
2723	// fetch and append remaining data
2724	XTextProperty ct2;
2725
2726	if (XGetWindowProperty (dpy, win, prop,
2727	ct.nitems / 4, (bytes_after + 3) / 4,
2728	delete_prop, AnyPropertyType,
2729	&ct2.encoding, &ct2.format,
2730	&ct2.nitems, &bytes_after,
2731	&ct2.value) != Success)
2732	goto bailout;
2733
2734	// realloc should be compatible to XFree, here, and elsewhere, too
2735	ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2736	memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2737	ct.nitems += ct2.nitems;
2738
2739	XFree (ct2.value);
2740	}
2741
2742	if (ct.value == 0)
2743	goto bailout;
2744
2745	if (ct.encoding == xa[XA_INCR])
2746	{
2747	// INCR selection, start handshake
2748	if (!delete_prop)
2749	XDeleteProperty (dpy, win, prop);
2750
2751	selection_wait = Sel_incr;
2752	incr_buf_fill = 0;
2753	incr_ev.start (10);
2754
2755	goto bailout;
2756	}
2757
2758	if (ct.nitems == 0)
2759	{
2760	if (selection_wait == Sel_incr)
2761	{
2762	XFree (ct.value);
2763
2764	// finally complete, now paste the whole thing
2765	selection_wait = Sel_normal;
2766	ct.value = (unsigned char *)incr_buf;
2767	ct.nitems = incr_buf_fill;
2768	incr_buf = 0;
2769	incr_buf_size = 0;
2770	incr_ev.stop ();
2771	}
2772	else
2773	{
2774	if (selection_wait == Sel_normal
2775	&& (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2776	{
2777	/*
2778	* pass through again trying CUT_BUFFER0 if we've come from
2779	* XConvertSelection () but nothing was presented
2780	*/
2781	selection_paste (display->root, XA_CUT_BUFFER0, False);
2782	}
2783
2784	goto bailout;
2785	}
2786	}
2787	else if (selection_wait == Sel_incr)
2788	{
2789	incr_ev.start (10);
2790
2791	while (incr_buf_fill + ct.nitems > incr_buf_size)
2792	{
2793	incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2794	incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2795	}
2796
2797	memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2798	incr_buf_fill += ct.nitems;
2799
2800	goto bailout;
2801	}
2802
2803	char **cl;
2804	int cr;
2805
2806	#if !ENABLE_MINIMAL
2807	// xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2808	// so recode it manually
2809	if (ct.encoding == xa[XA_UTF8_STRING])
2810	{
2811	wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2812	char *s = rxvt_wcstombs (w);
2813	free (w);
2814	// TODO: strlen == only the first element will be converted. well...
2815	paste (s, strlen (s));
2816	free (s);
2817	}
2818	else
2819	#endif
2820	if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2821	&& cl)
2822	{
2823	for (int i = 0; i < cr; i++)
2824	paste (cl[i], strlen (cl[i]));
2825
2826	XFreeStringList (cl);
2827	}
2828	else
2829	paste ((char *)ct.value, ct.nitems); // paste raw
2830
2831	bailout:
2832	XFree (ct.value);
2833
2834	if (selection_wait == Sel_normal)
2835	selection_wait = Sel_none;
2836	}
2837
2838	void
2839	rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2840	{
2841	selection_wait = Sel_none;
2842
2843	incr_buf_size = 0;
2844	free (incr_buf);
2845
2846	rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2847	}
2848
2849	void
2850	rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2851	{
2852	if (prop == None || selection_wait != Sel_incr)
2853	return;	2721	return;
2854		2722
2855	selection_paste (win, prop, true);	2723	tt_paste (data, len);
2856	}	2724	}
2857		2725
2858	/* ------------------------------------------------------------------------- */	2726	/* ------------------------------------------------------------------------- */
2859	/*	2727	/*
2860	* Request the current selection:	2728	* Request PRIMARY, SECONDARY or CLIPBOARD selection.
2861	* Order: > internal selection if available	2729	* if the requested selection has no owner or is empty CUT_BUFFER0 is used
2862	* > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)	2730	* as fallback
2863	* > CUT_BUFFER0
2864	* (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2865	* will auto fallback to CUT_BUFFER0
2866	* EXT: button 2 release	2731	* EXT: button 2 release
2867	*/	2732	*/
2868	void	2733	void
2869	rxvt_term::selection_request (Time tm, int selnum) NOTHROW	2734	rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2870	{	2735	{
2871	if (selection.text && selnum == Sel_Primary)	2736	if (!selection_req)
2872	{
2873	/* internal selection */
2874	char *str = rxvt_wcstombs (selection.text, selection.len);
2875	paste (str, strlen (str));
2876	free (str);
2877	return;
2878	}	2737	{
2879	else	2738	selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
		2739	selection_req->run ();
2880	{	2740	}
2881	selection_request_time = tm;
2882	selection_wait = Sel_normal;
2883
2884	#if X_HAVE_UTF8_STRING
2885	selection_type = Sel_UTF8String;
2886	if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2887	return;
2888	#else
2889	selection_type = Sel_CompoundText;
2890	if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2891	return;
2892	#endif
2893	}
2894
2895	selection_wait = Sel_none; /* don't loop in selection_paste () */
2896	selection_paste (display->root, XA_CUT_BUFFER0, false);
2897	}
2898
2899	int
2900	rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2901	{
2902	Atom sel;
2903
2904	selection_type |= selnum;
2905
2906	if (selnum == Sel_Primary)
2907	sel = XA_PRIMARY;
2908	else if (selnum == Sel_Secondary)
2909	sel = XA_SECONDARY;
2910	else
2911	sel = xa[XA_CLIPBOARD];
2912
2913	if (XGetSelectionOwner (dpy, sel) != None)
2914	{
2915	XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2916	vt, selection_request_time);
2917	return 1;
2918	}
2919
2920	return 0;
2921	}	2741	}
2922		2742
2923	/* ------------------------------------------------------------------------- */	2743	/* ------------------------------------------------------------------------- */
2924	/*	2744	/*
2925	* Clear all selected text	2745	* Clear all selected text
2926	* EXT: SelectionClear	2746	* EXT: SelectionClear
2927	*/	2747	*/
2928	void	2748	void
2929	rxvt_term::selection_clear () NOTHROW	2749	rxvt_term::selection_clear (bool clipboard) NOTHROW
2930	{	2750	{
		2751	if (!clipboard)
		2752	{
2931	want_refresh = 1;	2753	want_refresh = 1;
2932	free (selection.text);	2754	free (selection.text);
2933	selection.text = NULL;	2755	selection.text = NULL;
2934	selection.len = 0;	2756	selection.len = 0;
2935	CLEAR_SELECTION ();	2757	CLEAR_SELECTION ();
2936		2758
2937	if (display->selection_owner == this)	2759	if (display->selection_owner == this)
2938	display->selection_owner = 0;	2760	display->selection_owner = 0;
		2761	}
		2762	else
		2763	{
		2764	free (selection.clip_text);
		2765	selection.clip_text = NULL;
		2766	selection.clip_len = 0;
		2767
		2768	if (display->clipboard_owner == this)
		2769	display->clipboard_owner = 0;
		2770	}
2939	}	2771	}
2940		2772
2941	/* ------------------------------------------------------------------------- */	2773	/* ------------------------------------------------------------------------- */
2942	/*	2774	/*
2943	* Copy a selection into the cut buffer	2775	* Copy a selection into the cut buffer
2944	* EXT: button 1 or 3 release	2776	* EXT: button 1 or 3 release
2945	*/	2777	*/
2946	void	2778	void
2947	rxvt_term::selection_make (Time tm)	2779	rxvt_term::selection_make (Time tm)
2948	{	2780	{
2949	int i;	2781	int size;
2950	wchar_t *new_selection_text;	2782	wchar_t *new_selection_text;
2951	text_t *t;	2783	text_t *t;
2952		2784
2953	switch (selection.op)	2785	switch (selection.op)
2954	{	2786	{
…		…
2970	return; /* nothing selected, go away */	2802	return; /* nothing selected, go away */
2971		2803
2972	if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))	2804	if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2973	return;	2805	return;
2974		2806
2975	i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);	2807	size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2976	new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));	2808	new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
2977		2809
2978	int ofs = 0;	2810	int ofs = 0;
2979	int extra = 0;	2811	int extra = 0;
2980		2812
2981	int col = selection.beg.col;	2813	int col = selection.beg.col;
…		…
2987	{	2819	{
2988	#if !ENABLE_MINIMAL	2820	#if !ENABLE_MINIMAL
2989	if (selection.rect)	2821	if (selection.rect)
2990	{	2822	{
2991	col = selection.beg.col;	2823	col = selection.beg.col;
2992	end_col = ncol + 1;	2824	end_col = selection.end.col;
2993	}	2825	}
2994	else	2826	else
2995	#endif	2827	#endif
2996	end_col = ROW(row).l;	2828	end_col = ROW(row).l;
2997		2829
2998	col = max (col, 0);	2830	col = max (col, 0);
2999		2831
3000	if (row == selection.end.row	2832	if (row == selection.end.row)
3001	#if !ENABLE_MINIMAL
3002	|| selection.rect
3003	#endif
3004	)
3005	min_it (end_col, selection.end.col);	2833	min_it (end_col, selection.end.col);
3006		2834
3007	t = ROW(row).t + col;	2835	t = ROW(row).t + col;
3008		2836
3009	for (; col < end_col; col++)	2837	for (; col < end_col; col++)
…		…
3017		2845
3018	extra -= (len - 1);	2846	extra -= (len - 1);
3019		2847
3020	if (extra < 0)	2848	if (extra < 0)
3021	{	2849	{
3022	extra += i;	2850	extra += size;
3023	i += i;	2851	size += size;
3024	new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t));	2852	new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3025	}	2853	}
3026		2854
3027	ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);	2855	ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3028	}	2856	}
3029	#endif	2857	#endif
…		…
3041		2869
3042	new_selection_text[ofs++] = C0_LF;	2870	new_selection_text[ofs++] = C0_LF;
3043	}	2871	}
3044	else	2872	else
3045	#endif	2873	#endif
3046	if (!ROW(row).is_longer () && row != selection.end.row)	2874	if (!ROW(row).is_longer ()
		2875	&& (row != selection.end.row || end_col != selection.end.col)
		2876	&& (row != selection.beg.row || selection.beg.col < ncol))
3047	new_selection_text[ofs++] = C0_LF;	2877	new_selection_text[ofs++] = C0_LF;
3048	}	2878	}
3049
3050	if (end_col != selection.end.col)
3051	new_selection_text[ofs++] = C0_LF;
3052		2879
3053	new_selection_text[ofs] = 0;	2880	new_selection_text[ofs] = 0;
3054		2881
3055	if (ofs == 0)	2882	if (ofs == 0)
3056	{	2883	{
…		…
3069		2896
3070	selection_grab (tm);	2897	selection_grab (tm);
3071	}	2898	}
3072		2899
3073	bool	2900	bool
3074	rxvt_term::selection_grab (Time tm) NOTHROW	2901	rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3075	{	2902	{
		2903	Atom sel;
		2904
		2905	if (!clipboard)
		2906	{
3076	selection_time = tm;	2907	selection_time = tm;
		2908	sel = XA_PRIMARY;
		2909	}
		2910	else
		2911	{
		2912	clipboard_time = tm;
		2913	sel = xa[XA_CLIPBOARD];
		2914	}
3077		2915
3078	XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm);	2916	XSetSelectionOwner (dpy, sel, vt, tm);
3079	if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt)	2917	if (XGetSelectionOwner (dpy, sel) == vt)
3080	{	2918	{
3081	display->set_selection_owner (this);	2919	display->set_selection_owner (this, clipboard);
3082	return true;	2920	return true;
3083	}	2921	}
3084	else	2922	else
3085	{	2923	{
3086	selection_clear ();	2924	selection_clear (clipboard);
3087	return false;	2925	return false;
3088	}	2926	}
3089		2927
3090	#if 0	2928	#if 0
3091	XTextProperty ct;	2929	XTextProperty ct;
…		…
3551	* EXT: SelectionRequest	3389	* EXT: SelectionRequest
3552	*/	3390	*/
3553	void	3391	void
3554	rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW	3392	rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3555	{	3393	{
		3394	Atom property = rq.property == None ? rq.target : rq.property;
3556	XSelectionEvent ev;	3395	XSelectionEvent ev;
3557		3396
3558	ev.type = SelectionNotify;	3397	ev.type = SelectionNotify;
3559	ev.property = None;	3398	ev.property = None;
3560	ev.display = rq.display;	3399	ev.display = rq.display;
…		…
3575	*target++ = xa[XA_COMPOUND_TEXT];	3414	*target++ = xa[XA_COMPOUND_TEXT];
3576	#if X_HAVE_UTF8_STRING	3415	#if X_HAVE_UTF8_STRING
3577	*target++ = xa[XA_UTF8_STRING];	3416	*target++ = xa[XA_UTF8_STRING];
3578	#endif	3417	#endif
3579		3418
3580	XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,	3419	XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3581	32, PropModeReplace,	3420	32, PropModeReplace,
3582	(unsigned char *)target_list, target - target_list);	3421	(unsigned char *)target_list, target - target_list);
3583	ev.property = rq.property;	3422	ev.property = property;
3584	}	3423	}
3585	#if TODO // TODO	3424	#if TODO // TODO
3586	else if (rq.target == xa[XA_MULTIPLE])	3425	else if (rq.target == xa[XA_MULTIPLE])
3587	{	3426	{
3588	/* TODO: Handle MULTIPLE */	3427	/* TODO: Handle MULTIPLE */
3589	}	3428	}
3590	#endif	3429	#endif
3591	else if (rq.target == xa[XA_TIMESTAMP] && selection.text)	3430	else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3592	{	3431	{
3593	XChangeProperty (dpy, rq.requestor, rq.property, rq.target,	3432	XChangeProperty (dpy, rq.requestor, property, rq.target,
3594	32, PropModeReplace, (unsigned char *)&selection_time, 1);	3433	32, PropModeReplace, (unsigned char *)&selection_time, 1);
3595	ev.property = rq.property;	3434	ev.property = property;
		3435	}
		3436	else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
		3437	{
		3438	XChangeProperty (dpy, rq.requestor, property, rq.target,
		3439	32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
		3440	ev.property = property;
3596	}	3441	}
3597	else if (rq.target == XA_STRING	3442	else if (rq.target == XA_STRING
3598	|| rq.target == xa[XA_TEXT]	3443	|| rq.target == xa[XA_TEXT]
3599	|| rq.target == xa[XA_COMPOUND_TEXT]	3444	|| rq.target == xa[XA_COMPOUND_TEXT]
3600	|| rq.target == xa[XA_UTF8_STRING]	3445	|| rq.target == xa[XA_UTF8_STRING]
…		…
3632	{	3477	{
3633	target = xa[XA_COMPOUND_TEXT];	3478	target = xa[XA_COMPOUND_TEXT];
3634	style = enc_compound_text;	3479	style = enc_compound_text;
3635	}	3480	}
3636		3481
3637	if (selection.text)	3482	if (rq.selection == XA_PRIMARY && selection.text)
3638	{	3483	{
3639	cl = selection.text;	3484	cl = selection.text;
3640	selectlen = selection.len;	3485	selectlen = selection.len;
		3486	}
		3487	else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
		3488	{
		3489	cl = selection.clip_text;
		3490	selectlen = selection.clip_len;
3641	}	3491	}
3642	else	3492	else
3643	{	3493	{
3644	cl = L"";	3494	cl = L"";
3645	selectlen = 0;	3495	selectlen = 0;
…		…
3666	ct.value = (unsigned char *)cl;	3516	ct.value = (unsigned char *)cl;
3667	ct.nitems = selectlen;	3517	ct.nitems = selectlen;
3668	ct.encoding = target;	3518	ct.encoding = target;
3669	}	3519	}
3670		3520
3671	XChangeProperty (dpy, rq.requestor, rq.property,	3521	XChangeProperty (dpy, rq.requestor, property,
3672	ct.encoding, 8, PropModeReplace,	3522	ct.encoding, 8, PropModeReplace,
3673	ct.value, (int)ct.nitems);	3523	ct.value, (int)ct.nitems);
3674	ev.property = rq.property;	3524	ev.property = property;
3675		3525
3676	if (freect)	3526	if (freect)
3677	XFree (ct.value);	3527	XFree (ct.value);
3678	}	3528	}
3679		3529
…		…
3713	h += 2; min_it (h, nrow);	3563	h += 2; min_it (h, nrow);
3714		3564
3715	x -= 1; clamp_it (x, 0, ncol - w);	3565	x -= 1; clamp_it (x, 0, ncol - w);
3716	y -= 1; clamp_it (y, 0, nrow - h);	3566	y -= 1; clamp_it (y, 0, nrow - h);
3717		3567
3718	ov_x = x; ov_y = y;	3568	ov.x = x; ov.y = y;
3719	ov_w = w; ov_h = h;	3569	ov.w = w; ov.h = h;
3720		3570
3721	ov_text = new text_t *[h];	3571	ov.text = new text_t *[h];
3722	ov_rend = new rend_t *[h];	3572	ov.rend = new rend_t *[h];
3723		3573
3724	for (y = 0; y < h; y++)	3574	for (y = 0; y < h; y++)
3725	{	3575	{
3726	text_t *tp = ov_text[y] = new text_t[w];	3576	text_t *tp = ov.text[y] = new text_t[w];
3727	rend_t *rp = ov_rend[y] = new rend_t[w];	3577	rend_t *rp = ov.rend[y] = new rend_t[w];
3728		3578
3729	text_t t0, t1, t2;	3579	text_t t0, t1, t2;
3730	rend_t r = OVERLAY_RSTYLE;	3580	rend_t r = OVERLAY_RSTYLE;
3731		3581
3732	if (y == 0)	3582	if (y == 0)
…		…
3751	}	3601	}
3752		3602
3753	void	3603	void
3754	rxvt_term::scr_overlay_off () NOTHROW	3604	rxvt_term::scr_overlay_off () NOTHROW
3755	{	3605	{
3756	if (!ov_text)	3606	if (!ov.text)
3757	return;	3607	return;
3758		3608
3759	want_refresh = 1;	3609	want_refresh = 1;
3760		3610
3761	for (int y = 0; y < ov_h; y++)	3611	for (int y = 0; y < ov.h; y++)
3762	{	3612	{
3763	delete [] ov_text[y];	3613	delete [] ov.text[y];
3764	delete [] ov_rend[y];	3614	delete [] ov.rend[y];
3765	}	3615	}
3766		3616
3767	delete [] ov_text; ov_text = 0;	3617	delete [] ov.text; ov.text = 0;
3768	delete [] ov_rend; ov_rend = 0;	3618	delete [] ov.rend; ov.rend = 0;
3769	}	3619	}
3770		3620
3771	void	3621	void
3772	rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW	3622	rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3773	{	3623	{
3774	if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)	3624	if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3775	return;	3625	return;
3776		3626
3777	x++, y++;	3627	x++, y++;
3778		3628
3779	ov_text[y][x] = text;	3629	ov.text[y][x] = text;
3780	ov_rend[y][x] = rend;	3630	ov.rend[y][x] = rend;
3781	}	3631	}
3782		3632
3783	void	3633	void
3784	rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW	3634	rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3785	{	3635	{
…		…
3804	}	3654	}
3805		3655
3806	void	3656	void
3807	rxvt_term::scr_swap_overlay () NOTHROW	3657	rxvt_term::scr_swap_overlay () NOTHROW
3808	{	3658	{
3809	if (!ov_text)	3659	if (!ov.text)
3810	return;	3660	return;
3811		3661
		3662	// hide cursor if it is within the overlay area
		3663	if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
		3664	&& IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
		3665	screen.flags &= ~Screen_VisibleCursor;
		3666
3812	// swap screen mem with overlay	3667	// swap screen mem with overlay
3813	for (int y = ov_h; y--; )	3668	for (int y = ov.h; y--; )
3814	{	3669	{
3815	text_t *t1 = ov_text[y];	3670	text_t *t1 = ov.text[y];
3816	rend_t *r1 = ov_rend[y];	3671	rend_t *r1 = ov.rend[y];
3817		3672
3818	text_t *t2 = ROW(y + ov_y + view_start).t + ov_x;	3673	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;	3674	rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3820		3675
3821	for (int x = ov_w; x--; )	3676	for (int x = ov.w; x--; )
3822	{	3677	{
3823	text_t t = *t1; *t1++ = *t2; *t2++ = t;	3678	text_t t = *t1; *t1++ = *t2; *t2++ = t;
3824	rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));	3679	rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3825	}	3680	}
3826	}	3681	}

Diff Legend

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