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.319 by root, Tue Nov 4 23:08:44 2008 UTC vs.
Revision 1.415 by root, Mon May 28 14:25:16 2012 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	* ------------------------------------------------------------------------- */
…		…
99		98
100	/* Fill part/all of a line with blanks. */	99	/* Fill part/all of a line with blanks. */
101	void	100	void
102	rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW	101	rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW
103	{	102	{
104	if (!l.t)	103	if (!l.valid ())
105	{	104	{
106	lalloc (l);	105	l.alloc ();
107	col = 0;	106	col = 0;
108	width = ncol;	107	width = ncol;
109	}	108	}
110		109
111	l.touch ();	110	l.touch ();
…		…
142	while (col > 0 && l.t[col] == NOCHAR)	141	while (col > 0 && l.t[col] == NOCHAR)
143	col--;	142	col--;
144		143
145	rend_t rend = l.r[col] & ~RS_baseattrMask;	144	rend_t rend = l.r[col] & ~RS_baseattrMask;
146	rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));	145	rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
		146
		147	l.touch ();
147		148
148	// found start, nuke	149	// found start, nuke
149	do {	150	do {
150	l.t[col] = ' ';	151	l.t[col] = ' ';
151	l.r[col] = rend;	152	l.r[col] = rend;
…		…
156	/* ------------------------------------------------------------------------- *	157	/* ------------------------------------------------------------------------- *
157	* SCREEN INITIALISATION *	158	* SCREEN INITIALISATION *
158	* ------------------------------------------------------------------------- */	159	* ------------------------------------------------------------------------- */
159		160
160	void	161	void
		162	rxvt_term::scr_alloc ()
		163	{
		164	int tsize = sizeof (text_t) * ncol;
		165	int rsize = sizeof (rend_t) * ncol;
		166
		167	// we assume that rend_t size is a sufficient alignment
		168	// factor for tetx_t and line_t values, and we only
		169	// need to adjust tsize.
		170	tsize = (tsize + sizeof (rend_t) - 1);
		171	tsize -= tsize % sizeof (rend_t);
		172
		173	int all_rows = total_rows + nrow + nrow;
		174
		175	chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows;
		176	chunk = rxvt_malloc (chunk_size);
		177
		178	char *base = (char *)chunk + sizeof (line_t) * all_rows;
		179
		180	for (int row = 0; row < all_rows; ++row)
		181	{
		182	line_t &l = ((line_t *)chunk) [row];
		183
		184	l.t = (text_t *)base; base += tsize;
		185	l.r = (rend_t *)base; base += rsize;
		186	l.l = -1;
		187	l.f = 0;
		188	}
		189
		190	drawn_buf = (line_t *)chunk;
		191	swap_buf = drawn_buf + nrow;
		192	row_buf = swap_buf + nrow;
		193	}
		194
		195	void
161	rxvt_term::scr_reset ()	196	rxvt_term::scr_reset ()
162	{	197	{
		198	#if ENABLE_OVERLAY
		199	scr_overlay_off ();
		200	#endif
		201
163	view_start = 0;	202	view_start = 0;
164	num_scr = 0;	203	num_scr = 0;
165		204
166	if (ncol == 0)	205	if (ncol == 0)
167	ncol = 80;	206	ncol = 80;
…		…
187	total_rows = nrow + saveLines;	226	total_rows = nrow + saveLines;
188		227
189	screen.tscroll = 0;	228	screen.tscroll = 0;
190	screen.bscroll = nrow - 1;	229	screen.bscroll = nrow - 1;
191		230
		231	void *prev_chunk = chunk;
		232	line_t *prev_drawn_buf = drawn_buf;
		233	line_t *prev_swap_buf = swap_buf;
		234	line_t *prev_row_buf = row_buf;
		235
		236	int common_col = min (prev_ncol, ncol);
		237
		238	scr_alloc ();
		239
192	if (!row_buf)	240	if (!prev_row_buf)
193	{	241	{
194	/*	242	/*
195	* first time called so just malloc everything: don't rely on realloc	243	* first time called so just malloc everything: don't rely on realloc
196	*/	244	*/
197	top_row = 0;	245	top_row = 0;
198	term_start = 0;	246	term_start = 0;
199
200	talloc = new rxvt_salloc (ncol * sizeof (text_t));
201	ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
202
203	row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
204	drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
205	swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
206
207	for (int row = nrow; row--; )
208	{
209	scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
210	scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
211	scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
212	}
213		247
214	memset (charsets, 'B', sizeof (charsets));	248	memset (charsets, 'B', sizeof (charsets));
215	rstyle = DEFAULT_RSTYLE;	249	rstyle = DEFAULT_RSTYLE;
216	screen.flags = Screen_DefaultFlags;	250	screen.flags = Screen_DefaultFlags;
217	screen.cur.row = screen.cur.col = 0;	251	screen.cur.row = screen.cur.col = 0;
…		…
231	selection.text = NULL;	265	selection.text = NULL;
232	selection.len = 0;	266	selection.len = 0;
233	selection.op = SELECTION_CLEAR;	267	selection.op = SELECTION_CLEAR;
234	selection.screen = PRIMARY;	268	selection.screen = PRIMARY;
235	selection.clicks = 0;	269	selection.clicks = 0;
		270	selection.clip_text = NULL;
		271	selection.clip_len = 0;
236	}	272	}
237	else	273	else
238	{	274	{
239	/*	275	/*
240	* add or delete rows as appropriate	276	* add or delete rows as appropriate
241	*/	277	*/
242		278
243	rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
244	rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
245
246	#if 0
247	if (nrow < prev_nrow)
248	{
249	for (int row = nrow; row < prev_nrow; row++)
250	{
251	lfree (swap_buf [row]);
252	lfree (drawn_buf[row]);
253	}
254	}
255	#endif
256
257	drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
258	swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
259
260	for (int row = min (nrow, prev_nrow); row--; )	279	for (int row = min (nrow, prev_nrow); row--; )
261	{	280	{
262	lresize (drawn_buf[row]);	281	scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
263	lresize (swap_buf [row]);	282	scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
264	}
265		283
266	for (int row = prev_nrow; row < nrow; row++)	284	memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
		285	memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
		286	memcpy (swap_buf [row].t, prev_swap_buf [row].t, sizeof (text_t) * common_col);
		287	memcpy (swap_buf [row].r, prev_swap_buf [row].r, sizeof (rend_t) * common_col);
267	{	288	}
268	swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
269	drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
270	}
271
272	line_t *old_buf = row_buf;
273	row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
274		289
275	int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row	290	int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
276	int pend = MOD (term_start + top_row , prev_total_rows);	291	int pend = MOD (term_start + top_row , prev_total_rows);
277	int q = total_rows; // rewrapped row	292	int q = total_rows; // rewrapped row
278		293
279	if (top_row)	294	if (top_row)
280	{	295	{
281	// Re-wrap lines. This is rather ugly, possibly because I am too dumb	296	// Re-wrap lines. This is rather ugly, possibly because I am too dumb
282	// to come up with a lean and mean algorithm.	297	// to come up with a lean and mean algorithm.
		298	// TODO: maybe optimise when width didn't change
283		299
284	row_col_t ocur = screen.cur;	300	row_col_t ocur = screen.cur;
285	ocur.row = MOD (term_start + ocur.row, prev_total_rows);	301	ocur.row = MOD (term_start + ocur.row, prev_total_rows);
286		302
287	do	303	do
288	{	304	{
289	p = MOD (p - 1, prev_total_rows);	305	p = MOD (p - 1, prev_total_rows);
290	#ifdef DEBUG_STRICT
291	assert (old_buf [MOD (p, prev_total_rows)].t);	306	assert (prev_row_buf [MOD (p, prev_total_rows)].t);
292	#endif
293	int plines = 1;	307	int plines = 1;
294	int llen = old_buf [MOD (p, prev_total_rows)].l;	308	int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
295		309
296	while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())	310	while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ())
297	{	311	{
298	p = MOD (p - 1, prev_total_rows);	312	p = MOD (p - 1, prev_total_rows);
299		313
300	plines++;	314	plines++;
301	llen += prev_ncol;	315	llen += prev_ncol;
…		…
314		328
315	// re-assemble the full line by destination lines	329	// re-assemble the full line by destination lines
316	for (int qrow = q; qlines--; qrow++)	330	for (int qrow = q; qlines--; qrow++)
317	{	331	{
318	qline = row_buf + qrow;	332	qline = row_buf + qrow;
319	lalloc (*qline);	333	qline->alloc (); // redundant with next line
320	qline->l = ncol;	334	qline->l = ncol;
321	qline->is_longer (1);	335	qline->is_longer (1);
322		336
323	int qcol = 0;	337	int qcol = 0;
324		338
…		…
339	// this seems to upset applications/shells/readline	353	// this seems to upset applications/shells/readline
340	// least.	354	// least.
341	if (prow == ocur.row)	355	if (prow == ocur.row)
342	screen.cur.row = q - (total_rows - nrow);	356	screen.cur.row = q - (total_rows - nrow);
343		357
344	line_t &pline = old_buf [prow];	358	line_t &pline = prev_row_buf [prow];
345		359
346	int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);	360	int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
347		361
348	memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));	362	memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
349	memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));	363	memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
…		…
370	{	384	{
371	// if no scrollback exists (yet), wing, instead of wrap	385	// if no scrollback exists (yet), wing, instead of wrap
372		386
373	for (int row = min (nrow, prev_nrow); row--; )	387	for (int row = min (nrow, prev_nrow); row--; )
374	{	388	{
375	line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];	389	line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
376	line_t &qline = row_buf [row];	390	line_t &dst = row_buf [row];
377		391
378	qline = pline;	392	scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
379	lresize (qline);	393
		394	memcpy (dst.t, src.t, sizeof (text_t) * common_col);
		395	memcpy (dst.r, src.r, sizeof (rend_t) * common_col);
380	}	396	}
381		397
382	for (int row = prev_nrow; row < nrow; row++)	398	for (int row = prev_nrow; row < nrow; row++)
383	{
384	row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);	399	scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
385	}
386		400
387	term_start = 0;	401	term_start = 0;
388	}	402	}
389
390	free (old_buf);
391	delete old_ta;
392	delete old_ra;
393		403
394	clamp_it (screen.cur.row, 0, nrow - 1);	404	clamp_it (screen.cur.row, 0, nrow - 1);
395	clamp_it (screen.cur.col, 0, ncol - 1);	405	clamp_it (screen.cur.col, 0, ncol - 1);
396	}	406	}
397		407
		408	for (int row = nrow; row--; )
		409	{
		410	if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
		411	if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
		412	if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
		413	}
		414
		415	free (prev_chunk);
		416
		417	free (tabs);
		418	tabs = (char *)rxvt_malloc (ncol);
		419
		420	for (int col = ncol; col--; )
		421	tabs [col] = col % TABSIZE == 0;
		422
398	CLEAR_ALL_SELECTION ();	423	CLEAR_ALL_SELECTION ();
399		424
400	prev_nrow = nrow;	425	prev_nrow = nrow;
401	prev_ncol = ncol;	426	prev_ncol = ncol;
402		427
…		…
410	* Free everything. That way malloc debugging can find leakage.	435	* Free everything. That way malloc debugging can find leakage.
411	*/	436	*/
412	void	437	void
413	rxvt_term::scr_release () NOTHROW	438	rxvt_term::scr_release () NOTHROW
414	{	439	{
415	if (row_buf)	440	free (chunk);
416	{
417	delete talloc; talloc = 0;
418	delete ralloc; ralloc = 0;
419
420	free (row_buf);
421	free (swap_buf);
422	free (drawn_buf);
423	row_buf = 0; // signal that we freed all the arrays above
424
425	free (tabs);	441	free (tabs);
426	tabs = 0;
427	}
428	}	442	}
429		443
430	/* ------------------------------------------------------------------------- */	444	/* ------------------------------------------------------------------------- */
431	/*	445	/*
432	* Hard/Soft reset	446	* Hard/Soft reset
433	*/	447	*/
434	void	448	void
435	rxvt_term::scr_poweron ()	449	rxvt_term::scr_poweron ()
436	{	450	{
437	scr_release ();	451	scr_release ();
		452
		453	row_buf = 0;
		454	tabs = 0;
438	prev_nrow = prev_ncol = 0;	455	prev_nrow = prev_ncol = 0;
		456	rvideo_mode = false;
439	scr_soft_reset ();	457	scr_soft_reset ();
440	scr_reset ();	458	scr_reset ();
441		459
442	scr_clear (true);	460	scr_clear (true);
443	scr_refresh ();	461	scr_refresh ();
444	}	462	}
445		463
446	void	464	void
447	rxvt_term::scr_soft_reset ()	465	rxvt_term::scr_soft_reset () NOTHROW
448	{	466	{
449	/* only affects modes, nothing drastic such as clearing the screen */	467	/* only affects modes, nothing drastic such as clearing the screen */
450	#if ENABLE_OVERLAY	468	#if ENABLE_OVERLAY
451	scr_overlay_off ();	469	scr_overlay_off ();
452	#endif	470	#endif
453		471
454	rvideo_mode = false;
455
456	if (current_screen != PRIMARY)	472	if (current_screen != PRIMARY)
457	scr_swap_screen ();	473	scr_swap_screen ();
458
459	free (tabs);
460	tabs = (char *)rxvt_malloc (ncol);
461
462	for (int col = ncol; --col; )
463	tabs [col] = col % TABSIZE == 0;
464		474
465	scr_scroll_region (0, MAX_ROWS - 1);	475	scr_scroll_region (0, MAX_ROWS - 1);
466	scr_rendition (0, ~RS_None);	476	scr_rendition (0, ~RS_None);
467	scr_insert_mode (0);	477	scr_insert_mode (0);
468	}	478	}
…		…
510	}	520	}
511		521
512	/* boundary check in case screen size changed between SAVE and RESTORE */	522	/* boundary check in case screen size changed between SAVE and RESTORE */
513	min_it (s->cur.row, nrow - 1);	523	min_it (s->cur.row, nrow - 1);
514	min_it (s->cur.col, ncol - 1);	524	min_it (s->cur.col, ncol - 1);
515	#ifdef DEBUG_STRICT
516	assert (s->cur.row >= 0);	525	assert (s->cur.row >= 0);
517	assert (s->cur.col >= 0);	526	assert (s->cur.col >= 0);
518	#endif
519	}	527	}
520		528
521	void	529	void
522	rxvt_term::scr_swap_screen ()	530	rxvt_term::scr_swap_screen () NOTHROW
523	{	531	{
524	if (!option (Opt_secondaryScreen))	532	if (!option (Opt_secondaryScreen))
525	return;	533	return;
526		534
527	for (int i = prev_nrow; i--; )	535	for (int i = prev_nrow; i--; )
…		…
546	return;	554	return;
547		555
548	want_refresh = 1;	556	want_refresh = 1;
549	view_start = 0;	557	view_start = 0;
550		558
551	selection_check (2); /* check for boundary cross */	559	/* check for boundary cross */
		560	row_col_t pos;
		561	pos.row = pos.col = 0;
		562	if (ROWCOL_IS_BEFORE (selection.beg, pos)
		563	&& ROWCOL_IS_AFTER (selection.end, pos))
		564	CLEAR_SELECTION ();
552		565
553	int i = current_screen; current_screen = scrn; scrn = i;	566	current_screen = scrn;
554		567
555	#if NSCREENS	568	#if NSCREENS
556	if (option (Opt_secondaryScreen))	569	if (option (Opt_secondaryScreen))
557	{	570	{
558	num_scr = 0;	571	num_scr = 0;
…		…
635		648
636	if (count > 0	649	if (count > 0
637	&& row1 == 0	650	&& row1 == 0
638	&& (current_screen == PRIMARY || option (Opt_secondaryScroll)))	651	&& (current_screen == PRIMARY || option (Opt_secondaryScroll)))
639	{	652	{
		653	min_it (count, total_rows - (nrow - (row2 + 1)));
		654
640	top_row = max (top_row - count, -saveLines);	655	top_row = max (top_row - count, -saveLines);
641
642	// scroll everything up 'count' lines
643	term_start = (term_start + count) % total_rows;
644		656
645	// sever bottommost line	657	// sever bottommost line
646	{	658	{
647	line_t &l = ROW(row2 - count);	659	line_t &l = ROW(row2);
648	l.is_longer (0);	660	l.is_longer (0);
649	l.touch ();	661	l.touch ();
650	}	662	}
651		663
		664	// scroll everything up 'count' lines
		665	term_start = (term_start + count) % total_rows;
		666
		667	// now copy lines below the scroll region bottom to the
		668	// bottom of the screen again, so they look as if they
		669	// hadn't moved.
		670	for (int i = nrow; --i > row2; )
		671	{
		672	line_t &l1 = ROW(i - count);
		673	line_t &l2 = ROW(i);
		674
		675	::swap (l1, l2);
		676	l2.touch ();
		677	}
		678
652	// erase newly scrolled-in lines	679	// erase newly scrolled-in lines
653	for (int i = count; i--; )	680	for (int i = count; i--; )
654	{	681	{
655	line_t &l = ROW(nrow - 1 - i);	682	line_t &l = ROW(row2 - i);
656		683
657	// optimize if already cleared, can be significant on slow machines	684	// optimise if already cleared, can be significant on slow machines
658	// could be rolled into scr_blank_screen_mem	685	// could be rolled into scr_blank_screen_mem
659	if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))	686	if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
660	{	687	{
661	scr_blank_line (l, 0, l.l, rstyle);	688	scr_blank_line (l, 0, l.l, rstyle);
662	l.l = 0;	689	l.l = 0;
…		…
664	}	691	}
665	else	692	else
666	scr_blank_screen_mem (l, rstyle);	693	scr_blank_screen_mem (l, rstyle);
667	}	694	}
668		695
669	// now copy lines below the scroll region bottom to the
670	// bottom of the screen again, so they look as if they
671	// hadn't moved.
672	for (int i = nrow; --i > row2; )
673	{
674	line_t &l1 = ROW(i - count);
675	line_t &l2 = ROW(i);
676
677	::swap (l1, l2);
678	l2.touch ();
679	}
680
681	// move and/or clear selection, if any	696	// move and/or clear selection, if any
682	if (selection.op && current_screen == selection.screen)	697	if (selection.op && current_screen == selection.screen
		698	&& selection.beg.row <= row2)
683	{	699	{
684	selection.beg.row -= count;	700	selection.beg.row -= count;
685	selection.end.row -= count;	701	selection.end.row -= count;
686	selection.mark.row -= count;	702	selection.mark.row -= count;
687		703
688	if (selection.beg.row < top_row	704	selection_check (0);
689	|| selection.end.row < top_row
690	|| selection.mark.row < top_row)
691	{
692	CLEAR_ALL_SELECTION ();
693	selection.op = SELECTION_CLEAR;
694	}
695	}	705	}
696		706
697	// finally move the view window, if desired	707	// finally move the view window, if desired
698	if (option (Opt_scrollWithBuffer)	708	if (option (Opt_scrollWithBuffer)
699	&& view_start != 0	709	&& view_start != 0
…		…
729	}	739	}
730		740
731	// use a simple and robust scrolling algorithm, this	741	// use a simple and robust scrolling algorithm, this
732	// part of scr_scroll_text is not time-critical.	742	// part of scr_scroll_text is not time-critical.
733		743
		744	// sever line above scroll region
		745	if (row1)
		746	{
		747	line_t &l = ROW(row1 - 1);
		748	l.is_longer (0);
		749	l.touch ();
		750	}
		751
734	int rows = row2 - row1 + 1;	752	int rows = row2 - row1 + 1;
735		753
736	min_it (count, rows);	754	min_it (count, rows);
737		755
738	line_t *temp_buf = row_buf + total_rows;	756	line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
739		757
740	for (int row = 0; row < rows; row++)	758	for (int row = 0; row < rows; row++)
741	{	759	{
742	temp_buf [row] = ROW(row1 + (row + count + rows) % rows);	760	temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
743		761
…		…
745	scr_blank_screen_mem (temp_buf [row], rstyle);	763	scr_blank_screen_mem (temp_buf [row], rstyle);
746	}	764	}
747		765
748	for (int row = 0; row < rows; row++)	766	for (int row = 0; row < rows; row++)
749	ROW(row1 + row) = temp_buf [row];	767	ROW(row1 + row) = temp_buf [row];
		768
		769	// sever bottommost line
		770	{
		771	line_t &l = ROW(row2);
		772	l.is_longer (0);
		773	l.touch ();
		774	}
750	}	775	}
751		776
752	return count;	777	return count;
753	}	778	}
754		779
…		…
760	rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW	785	rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
761	{	786	{
762	if (len <= 0) /* sanity */	787	if (len <= 0) /* sanity */
763	return;	788	return;
764		789
765	unsigned char checksel;	790	bool checksel;
766	unicode_t c;	791	unicode_t c;
767	int ncol = this->ncol;	792	int ncol = this->ncol;
768	const wchar_t *strend = str + len;	793	const wchar_t *strend = str + len;
769		794
770	want_refresh = 1;	795	want_refresh = 1;
…		…
783	scr_scroll_text (screen.tscroll, screen.bscroll, minlines);	808	scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
784	screen.cur.row -= minlines;	809	screen.cur.row -= minlines;
785	}	810	}
786	}	811	}
787		812
788	#ifdef DEBUG_STRICT
789	assert (screen.cur.col < ncol);	813	assert (screen.cur.col < ncol);
790	assert (screen.cur.row < nrow	814	assert (screen.cur.row < nrow
791	&& screen.cur.row >= top_row);	815	&& screen.cur.row >= top_row);
792	#endif
793	int row = screen.cur.row;	816	int row = screen.cur.row;
794		817
795	checksel = selection.op && current_screen == selection.screen ? 1 : 0;	818	checksel = selection.op && current_screen == selection.screen ? 1 : 0;
796		819
797	line_t *line = &ROW(row);	820	line_t *line = &ROW(row);
798		821
799	while (str < strend)	822	while (str < strend)
800	{	823	{
801	c = (unicode_t)*str++; // convert to rxvt-unicodes representation	824	c = (unicode_t)*str++; // convert to rxvt-unicodes representation
802		825
803	if (expect_false (c < 0x20))	826	if (ecb_unlikely (c < 0x20))
804	if (c == C0_LF)	827	if (c == C0_LF)
805	{	828	{
806	max_it (line->l, screen.cur.col);	829	max_it (line->l, screen.cur.col);
807		830
808	screen.flags &= ~Screen_WrapNext;	831	screen.flags &= ~Screen_WrapNext;
…		…
827	{	850	{
828	scr_tab (1, true);	851	scr_tab (1, true);
829	continue;	852	continue;
830	}	853	}
831		854
832	if (expect_false (	855	if (ecb_unlikely (
833	checksel /* see if we're writing within selection */	856	checksel /* see if we're writing within selection */
834	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)	857	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
835	&& ROWCOL_IS_BEFORE (screen.cur, selection.end)	858	&& ROWCOL_IS_BEFORE (screen.cur, selection.end)
836	))	859	))
837	{	860	{
…		…
842	* should be a similar check.	865	* should be a similar check.
843	*/	866	*/
844	CLEAR_SELECTION ();	867	CLEAR_SELECTION ();
845	}	868	}
846		869
847	if (expect_false (screen.flags & Screen_WrapNext))	870	if (ecb_unlikely (screen.flags & Screen_WrapNext))
848	{	871	{
849	scr_do_wrap ();	872	scr_do_wrap ();
850		873
851	line->l = ncol;	874	line->l = ncol;
852	line->is_longer (1);	875	line->is_longer (1);
…		…
854	row = screen.cur.row;	877	row = screen.cur.row;
855	line = &ROW(row); /* _must_ refresh */	878	line = &ROW(row); /* _must_ refresh */
856	}	879	}
857		880
858	// some utf-8 decoders "decode" surrogate characters: let's fix this.	881	// some utf-8 decoders "decode" surrogate characters: let's fix this.
859	if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff)))	882	if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
860	c = 0xfffd;	883	c = 0xfffd;
861		884
862	// rely on wcwidth to tell us the character width, do wcwidth before	885	// rely on wcwidth to tell us the character width, do wcwidth before
863	// further replacements, as wcwidth might return -1 for the line	886	// further replacements, as wcwidth might return -1 for the line
864	// drawing characters below as they might be invalid in the current	887	// drawing characters below as they might be invalid in the current
865	// locale.	888	// locale.
866	int width = WCWIDTH (c);	889	int width = WCWIDTH (c);
867		890
868	if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL	891	if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
869	{	892	{
870	// vt100 special graphics and line drawing	893	// vt100 special graphics and line drawing
871	// 5f-7e standard vt100	894	// 5f-7e standard vt100
872	// 40-5e rxvt extension for extra curses acs chars	895	// 40-5e rxvt extension for extra curses acs chars
873	static uint16_t vt100_0[62] = { // 41 .. 7e	896	static uint16_t vt100_0[62] = { // 41 .. 7e
…		…
886	c = vt100_0[c - 0x41];	909	c = vt100_0[c - 0x41];
887	width = 1; // vt100 line drawing characters are always single-width	910	width = 1; // vt100 line drawing characters are always single-width
888	}	911	}
889	}	912	}
890		913
891	if (expect_false (screen.flags & Screen_Insert))	914	if (ecb_unlikely (screen.flags & Screen_Insert))
892	scr_insdel_chars (width, INSERT);	915	scr_insdel_chars (width, INSERT);
893		916
894	if (width != 0)	917	if (width != 0)
895	{	918	{
896	#if !UNICODE_3	919	#if !UNICODE_3
…		…
901	# else	924	# else
902	c = 0xfffd;	925	c = 0xfffd;
903	# endif	926	# endif
904	#endif	927	#endif
905		928
		929	rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
		930
		931	// if the character doesn't fit into the remaining columns...
		932	if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
		933	{
		934	if (screen.flags & Screen_Autowrap)
		935	{
		936	// ... artificially enlargen the previous one
		937	c = NOCHAR;
		938	// and try the same character next loop iteration
		939	--str;
		940	}
		941	else
		942	screen.cur.col = ncol - width;
		943	}
		944
906	// nuke the character at this position, if required	945	// nuke the character at this position, if required
907	if (expect_false (	946	// due to wonderful coincidences everywhere else in this loop
		947	// we never have to check for overwriting a wide char itself,
		948	// only its tail.
908	line->t[screen.cur.col] == NOCHAR	949	if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
909	|| (screen.cur.col < ncol - 1
910	&& line->t[screen.cur.col + 1] == NOCHAR)
911	))
912	scr_kill_char (*line, screen.cur.col);	950	scr_kill_char (*line, screen.cur.col);
913
914	rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
915
916	// if the character doesn't fit into the remaining columns...
917	if (expect_false (screen.cur.col > ncol - width && ncol >= width))
918	{
919	// ... artificially enlargen the previous one
920	c = NOCHAR;
921	// and try the same character next loop iteration
922	--str;
923	}
924		951
925	line->touch ();	952	line->touch ();
926		953
927	do	954	do
928	{	955	{
929	line->t[screen.cur.col] = c;	956	line->t[screen.cur.col] = c;
930	line->r[screen.cur.col] = rend;	957	line->r[screen.cur.col] = rend;
931		958
932	if (expect_true (screen.cur.col < ncol - 1))	959	if (ecb_likely (screen.cur.col < ncol - 1))
933	screen.cur.col++;	960	screen.cur.col++;
934	else	961	else
935	{	962	{
936	line->l = ncol;	963	line->l = ncol;
937	if (screen.flags & Screen_Autowrap)	964	if (screen.flags & Screen_Autowrap)
938	screen.flags |= Screen_WrapNext;	965	screen.flags |= Screen_WrapNext;
939	break;	966
		967	goto end_of_line;
940	}	968	}
941		969
942	c = NOCHAR;	970	c = NOCHAR;
943	}	971	}
944	while (expect_false (--width > 0));	972	while (ecb_unlikely (--width > 0));
945		973
946	// pad with spaces when overwriting wide character with smaller one	974	// pad with spaces when overwriting wide character with smaller one
947	if (expect_false (!width))	975	for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
948	{	976	{
949	line->touch ();
950
951	for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
952	{
953	line->t[c] = ' ';	977	line->t[c] = ' ';
954	line->r[c] = rend;	978	line->r[c] = rend;
955	}
956	}	979	}
		980
		981	end_of_line:
		982	;
957	}	983	}
958	#if ENABLE_COMBINING	984	#if ENABLE_COMBINING
959	else // width == 0	985	else // width == 0
960	{	986	{
961	if (c != 0xfeff) // ignore BOM	987	if (c != 0xfeff) // ignore BOM
…		…
1001	#endif	1027	#endif
1002	}	1028	}
1003		1029
1004	max_it (line->l, screen.cur.col);	1030	max_it (line->l, screen.cur.col);
1005		1031
1006	#ifdef DEBUG_STRICT
1007	assert (screen.cur.row >= 0);	1032	assert (screen.cur.row >= 0);
1008	#endif
1009	}	1033	}
1010		1034
1011	/* ------------------------------------------------------------------------- */	1035	/* ------------------------------------------------------------------------- */
1012	/*	1036	/*
1013	* Process Backspace. Move back the cursor back a position, wrap if have to	1037	* Process Backspace. Move back the cursor back a position, wrap if have to
…		…
1026		1050
1027	want_refresh = 1;	1051	want_refresh = 1;
1028	#endif	1052	#endif
1029	}	1053	}
1030	}	1054	}
		1055	else if (screen.flags & Screen_WrapNext)
		1056	screen.flags &= ~Screen_WrapNext;
1031	else	1057	else
1032	scr_gotorc (0, -1, RELATIVE);	1058	scr_gotorc (0, -1, RELATIVE);
1033	}	1059	}
1034		1060
1035	/* ------------------------------------------------------------------------- */	1061	/* ------------------------------------------------------------------------- */
…		…
1291	scr_blank_line (line, col, num, rstyle);	1317	scr_blank_line (line, col, num, rstyle);
1292	}	1318	}
1293		1319
1294	/* ------------------------------------------------------------------------- */	1320	/* ------------------------------------------------------------------------- */
1295	/*	1321	/*
1296	* Erase part of whole of the screen	1322	* Erase part or whole of the screen
1297	* XTERM_SEQ: Clear screen after cursor : ESC [ 0 J	1323	* XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1298	* XTERM_SEQ: Clear screen before cursor: ESC [ 1 J	1324	* XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1299	* XTERM_SEQ: Clear whole screen : ESC [ 2 J	1325	* XTERM_SEQ: Clear whole screen : ESC [ 2 J
1300	*/	1326	*/
1301	void	1327	void
…		…
1310	ZERO_SCROLLBACK ();	1336	ZERO_SCROLLBACK ();
1311		1337
1312	switch (mode)	1338	switch (mode)
1313	{	1339	{
1314	case 0: /* erase to end of screen */	1340	case 0: /* erase to end of screen */
1315	selection_check (1);
1316	scr_erase_line (0);	1341	scr_erase_line (0);
1317	row = screen.cur.row + 1; /* possible OOB */	1342	row = screen.cur.row + 1; /* possible OOB */
1318	num = nrow - row;	1343	num = nrow - row;
1319	break;	1344	break;
1320	case 1: /* erase to beginning of screen */	1345	case 1: /* erase to beginning of screen */
1321	selection_check (3);
1322	scr_erase_line (1);	1346	scr_erase_line (1);
1323	row = 0;	1347	row = 0;
1324	num = screen.cur.row;	1348	num = screen.cur.row;
1325	break;	1349	break;
1326	case 2: /* erase whole screen */	1350	case 2: /* erase whole screen */
1327	selection_check (3);
1328	row = 0;	1351	row = 0;
1329	num = nrow;	1352	num = nrow;
1330	break;	1353	break;
1331	default:	1354	default:
1332	return;	1355	return;
…		…
1341	if (row >= nrow) /* Out Of Bounds */	1364	if (row >= nrow) /* Out Of Bounds */
1342	return;	1365	return;
1343		1366
1344	min_it (num, nrow - row);	1367	min_it (num, nrow - row);
1345		1368
1346	/*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */
1347	if (rstyle & (RS_RVid | RS_Uline))	1369	if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1348	ren = (rend_t) ~RS_None;	1370	ren = (rend_t) ~RS_None;
1349	else if (GET_BASEBG (rstyle) == Color_bg)	1371	else if (GET_BASEBG (rstyle) == Color_bg)
1350	{	1372	{
1351	ren = DEFAULT_RSTYLE;	1373	ren = DEFAULT_RSTYLE;
1352		1374
1353	if (mapped)	1375	if (mapped)
1354	XClearArea (dpy, vt, 0,	1376	XClearArea (dpy, vt, 0,
1355	Row2Pixel (row), (unsigned int)width,	1377	Row2Pixel (row - view_start), (unsigned int)vt_width,
1356	(unsigned int)Height2Pixel (num), False);	1378	(unsigned int)Height2Pixel (num), False);
1357	}	1379	}
1358	else	1380	else
1359	{	1381	{
1360	ren = rstyle & (RS_fgMask | RS_bgMask);	1382	ren = rstyle & (RS_fgMask | RS_bgMask);
1361		1383
		1384	if (mapped)
		1385	{
1362	gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];	1386	gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1363	XChangeGC (dpy, gc, GCForeground, &gcvalue);	1387	XChangeGC (dpy, gc, GCForeground, &gcvalue);
1364	XFillRectangle (dpy, vt, gc,	1388	XFillRectangle (dpy, vt, gc,
1365	0, Row2Pixel (row),	1389	0, Row2Pixel (row - view_start),
1366	(unsigned int)width,	1390	(unsigned int)vt_width,
1367	(unsigned int)Height2Pixel (num));	1391	(unsigned int)Height2Pixel (num));
1368	gcvalue.foreground = pix_colors[Color_fg];	1392	gcvalue.foreground = pix_colors[Color_fg];
1369	XChangeGC (dpy, gc, GCForeground, &gcvalue);	1393	XChangeGC (dpy, gc, GCForeground, &gcvalue);
		1394	}
1370	}	1395	}
1371		1396
1372	for (; num--; row++)	1397	for (; num--; row++)
1373	{	1398	{
1374	scr_blank_screen_mem (ROW(row), rstyle);	1399	scr_blank_screen_mem (ROW(row), rstyle);
		1400
		1401	if (row - view_start < nrow)
1375	scr_blank_line (drawn_buf [row], 0, ncol, ren);	1402	scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1376	}	1403	}
1377	}	1404	}
1378		1405
1379	#if !ENABLE_MINIMAL	1406	#if !ENABLE_MINIMAL
1380	void	1407	void
…		…
1399		1426
1400	want_refresh = 1;	1427	want_refresh = 1;
1401	ZERO_SCROLLBACK ();	1428	ZERO_SCROLLBACK ();
1402		1429
1403	num_scr_allow = 0;	1430	num_scr_allow = 0;
1404	selection_check (3);	1431
		1432	row_col_t pos;
		1433	pos.row = pos.col = 0;
		1434	if (ROWCOL_IS_AFTER (selection.end, pos))
		1435	CLEAR_SELECTION ();
1405		1436
1406	fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));	1437	fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1407	for (int row = nrow; row--; )	1438	for (int row = nrow; row--; )
1408	{	1439	{
1409	line_t &line = ROW(row);	1440	line_t &line = ROW(row);
…		…
1533	{	1564	{
1534	line->t[col] = line->t[col + count];	1565	line->t[col] = line->t[col + count];
1535	line->r[col] = line->r[col + count];	1566	line->r[col] = line->r[col + count];
1536	}	1567	}
1537		1568
1538	scr_blank_line (*line, ncol - count, count,	1569	scr_blank_line (*line, ncol - count, count, rstyle);
1539	line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask));
1540		1570
1541	if (selection.op && current_screen == selection.screen	1571	if (selection.op && current_screen == selection.screen
1542	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))	1572	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1543	{	1573	{
1544	if (selection.end.row != screen.cur.row	1574	if (selection.end.row != screen.cur.row
…		…
1680	{	1710	{
1681	rvideo_state = on;	1711	rvideo_state = on;
1682		1712
1683	::swap (pix_colors[Color_fg], pix_colors[Color_bg]);	1713	::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1684	#ifdef HAVE_BG_PIXMAP	1714	#ifdef HAVE_BG_PIXMAP
1685	if (bgPixmap.pixmap == None)	1715	if (bg_pixmap == None)
1686	#endif	1716	#endif
1687	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);	1717	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1688		1718
1689	XGCValues gcvalue;	1719	XGCValues gcvalue;
1690	gcvalue.foreground = pix_colors[Color_fg];	1720	gcvalue.foreground = pix_colors[Color_fg];
…		…
1834	for (i = PART_BEG; i < RC_COUNT; i++)	1864	for (i = PART_BEG; i < RC_COUNT; i++)
1835	{	1865	{
1836	min_it (rc[i].col, ncol - 1);	1866	min_it (rc[i].col, ncol - 1);
1837	min_it (rc[i].row, nrow - 1);	1867	min_it (rc[i].row, nrow - 1);
1838	}	1868	}
1839	// TODO: this line somehow causes segfault if scr_expose() is called just after resize	1869
1840	for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)	1870	for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1841	fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);	1871	fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1842		1872
1843	num_scr_allow = 0;	1873	num_scr_allow = 0;
1844		1874
…		…
1851	* Refresh the entire screen	1881	* Refresh the entire screen
1852	*/	1882	*/
1853	void	1883	void
1854	rxvt_term::scr_touch (bool refresh) NOTHROW	1884	rxvt_term::scr_touch (bool refresh) NOTHROW
1855	{	1885	{
1856	scr_expose (0, 0, width, height, refresh);	1886	scr_expose (0, 0, vt_width, vt_height, refresh);
1857	}	1887	}
1858		1888
1859	/* ------------------------------------------------------------------------- */	1889	/* ------------------------------------------------------------------------- */
1860	/*	1890	/*
1861	* Move the display so that the line represented by scrollbar value Y is at	1891	* Move the display so that the line represented by scrollbar value Y is at
…		…
1917		1947
1918	# ifndef NO_MAPALERT	1948	# ifndef NO_MAPALERT
1919	# ifdef MAPALERT_OPTION	1949	# ifdef MAPALERT_OPTION
1920	if (option (Opt_mapAlert))	1950	if (option (Opt_mapAlert))
1921	# endif	1951	# endif
1922	XMapWindow (dpy, parent[0]);	1952	XMapWindow (dpy, parent);
1923	# endif	1953	# endif
1924		1954
1925	# if ENABLE_FRILLS	1955	# if ENABLE_FRILLS
1926	if (option (Opt_urgentOnBell))	1956	if (option (Opt_urgentOnBell))
1927	set_urgency (1);	1957	set_urgency (1);
…		…
1935		1965
1936	bell_ev.start (VISUAL_BELL_DURATION);	1966	bell_ev.start (VISUAL_BELL_DURATION);
1937	}	1967	}
1938	else	1968	else
1939	XBell (dpy, 0);	1969	XBell (dpy, 0);
		1970	HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1940	#endif	1971	#endif
1941	}	1972	}
1942		1973
1943	/* ------------------------------------------------------------------------- */	1974	/* ------------------------------------------------------------------------- */
1944	/* ARGSUSED */
1945	void	1975	void
1946	rxvt_term::scr_printscreen (int fullhist) NOTHROW	1976	rxvt_term::scr_printscreen (int fullhist) NOTHROW
1947	{	1977	{
1948	#ifdef PRINTPIPE	1978	#ifdef PRINTPIPE
1949	int nrows, row_start;	1979	int nrows, row_start;
…		…
1963	row_start = view_start;	1993	row_start = view_start;
1964	}	1994	}
1965		1995
1966	wctomb (0, 0);	1996	wctomb (0, 0);
1967		1997
1968	for (int r1 = 0; r1 < nrows; r1++)	1998	for (int r1 = row_start; r1 < row_start + nrows; r1++)
1969	{	1999	{
1970	text_t *tp = ROW(r1).t;	2000	text_t *tp = ROW(r1).t;
1971	int len = ROW(r1).l;	2001	int len = ROW(r1).l;
1972		2002
1973	for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN	2003	for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
…		…
2002	* screen.text/screen.rend contain what the screen will change to.	2032	* screen.text/screen.rend contain what the screen will change to.
2003	*/	2033	*/
2004	void	2034	void
2005	rxvt_term::scr_refresh () NOTHROW	2035	rxvt_term::scr_refresh () NOTHROW
2006	{	2036	{
2007	unsigned char have_bg,
2008	showcursor; /* show the cursor */
2009	int16_t col, row, /* column/row we're processing */	2037	int16_t col, row, /* column/row we're processing */
2010	ocrow; /* old cursor row */	2038	ocrow; /* old cursor row */
2011	int i; /* tmp */	2039	int i; /* tmp */
2012	#ifndef NO_CURSORCOLOR	2040	#ifndef NO_CURSORCOLOR
2013	rend_t cc1; /* store colours at cursor position (s) */	2041	rend_t cc1; /* store colours at cursor position (s) */
…		…
2024	/*	2052	/*
2025	* A: set up vars	2053	* A: set up vars
2026	*/	2054	*/
2027	refresh_count = 0;	2055	refresh_count = 0;
2028		2056
		2057	unsigned int old_screen_flags = screen.flags;
2029	have_bg = 0;	2058	bool have_bg = 0;
2030	#ifdef HAVE_BG_PIXMAP	2059	#ifdef HAVE_BG_PIXMAP
2031	have_bg = bgPixmap.pixmap != None;	2060	have_bg = bg_pixmap != None;
2032	#endif	2061	#endif
2033	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */	2062	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2034		2063
2035	/*	2064	/*
2036	* B: reverse any characters which are selected	2065	* B: reverse any characters which are selected
2037	*/	2066	*/
2038	scr_reverse_selection ();	2067	scr_reverse_selection ();
2039		2068
		2069	HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
		2070	#if ENABLE_OVERLAY
		2071	scr_swap_overlay ();
		2072	#endif
		2073
		2074	bool showcursor = screen.flags & Screen_VisibleCursor;
		2075
2040	/*	2076	/*
2041	* C: set the cursor character (s)	2077	* C: set the cursor character (s)
2042	*/	2078	*/
2043	{	2079	{
2044	unsigned char setoldcursor;	2080	bool setoldcursor;
2045		2081
2046	showcursor = (screen.flags & Screen_VisibleCursor);
2047	#ifdef CURSOR_BLINK	2082	#ifdef CURSOR_BLINK
2048	if (hidden_cursor)	2083	if (hidden_cursor)
2049	showcursor = 0;	2084	showcursor = 0;
2050	#endif	2085	#endif
2051		2086
…		…
2079	ccol2 = bgcolor_of (rstyle);	2114	ccol2 = bgcolor_of (rstyle);
2080	#else	2115	#else
2081	ccol2 = Color_bg;	2116	ccol2 = Color_bg;
2082	#endif	2117	#endif
2083		2118
2084	if (showcursor && focus)	2119	if (focus)
2085	{	2120	{
2086	if (option (Opt_cursorUnderline))	2121	if (option (Opt_cursorUnderline))
2087	*crp ^= RS_Uline;	2122	*crp ^= RS_Uline;
2088	else	2123	else
2089	{	2124	{
…		…
2124	oldcursor.col = screen.cur.col;	2159	oldcursor.col = screen.cur.col;
2125	}	2160	}
2126	}	2161	}
2127	}	2162	}
2128		2163
2129	HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2130	#if ENABLE_OVERLAY
2131	scr_swap_overlay ();
2132	#endif
2133
2134	#ifndef NO_SLOW_LINK_SUPPORT	2164	#ifndef NO_SLOW_LINK_SUPPORT
2135	/*	2165	/*
2136	* D: CopyArea pass - very useful for slower links	2166	* D: CopyArea pass - very useful for slower links
2137	* This has been deliberately kept simple.	2167	* This has been deliberately kept simple.
2138	*/	2168	*/
…		…
2142	{	2172	{
2143	int16_t nits;	2173	int16_t nits;
2144	int i = num_scr;	2174	int i = num_scr;
2145	int j;	2175	int j;
2146	int len, wlen;	2176	int len, wlen;
2147	dLocal (int, num_scr);
2148		2177
2149	j = nrow;	2178	j = nrow;
2150	wlen = len = -1;	2179	wlen = len = -1;
2151	row = i > 0 ? 0 : j - 1;	2180	row = i > 0 ? 0 : j - 1;
2152		2181
…		…
2227	continue;	2256	continue;
2228		2257
2229	// redraw one or more characters	2258	// redraw one or more characters
2230		2259
2231	// seek to the beginning of wide characters	2260	// seek to the beginning of wide characters
2232	while (expect_false (stp[col] == NOCHAR && col > 0))	2261	while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2233	--col;	2262	--col;
2234		2263
2235	rend_t rend = srp[col]; /* screen rendition (target rendtion) */	2264	rend_t rend = srp[col]; /* screen rendition (target rendition) */
2236	text_t *text = stp + col;	2265	text_t *text = stp + col;
2237	int count = 1;	2266	int count = 1;
2238		2267
2239	dtp[col] = stp[col];	2268	dtp[col] = stp[col];
2240	drp[col] = rend;	2269	drp[col] = rend;
…		…
2244	for (i = 0; ++col < ncol; )	2273	for (i = 0; ++col < ncol; )
2245	{	2274	{
2246	if (stp[col] == NOCHAR)	2275	if (stp[col] == NOCHAR)
2247	{	2276	{
2248	dtp[col] = stp[col];	2277	dtp[col] = stp[col];
2249	drp[col] = rend;	2278	drp[col] = srp[col];
		2279
2250	count++;	2280	count++;
2251	i++;	2281	i++;
2252		2282
2253	continue;	2283	continue;
2254	}	2284	}
…		…
2274		2304
2275	col--; /* went one too far. move back */	2305	col--; /* went one too far. move back */
2276	count -= i; /* dump any matching trailing chars */	2306	count -= i; /* dump any matching trailing chars */
2277		2307
2278	// sometimes we optimize away the trailing NOCHAR's, add them back	2308	// sometimes we optimize away the trailing NOCHAR's, add them back
2279	while (expect_false (i && text[count] == NOCHAR))	2309	while (ecb_unlikely (i && text[count] == NOCHAR))
2280	count++, i--;	2310	count++, i--;
2281		2311
2282	/*	2312	/*
2283	* Determine the attributes for the string	2313	* Determine the attributes for the string
2284	*/	2314	*/
2285	int fore = fgcolor_of (rend); // desired foreground	2315	int fore = fgcolor_of (rend); // desired foreground
2286	int back = bgcolor_of (rend); // desired background	2316	int back = bgcolor_of (rend); // desired background
2287		2317
2288	// only do special processing if any attributes are set, which is unlikely	2318	// only do special processing if any attributes are set, which is unlikely
2289	if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)))	2319	if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2290	{	2320	{
2291	bool invert = rend & RS_RVid;	2321	bool invert = rend & RS_RVid;
2292		2322
2293	#ifndef NO_BOLD_UNDERLINE_REVERSE	2323	#ifndef NO_BOLD_UNDERLINE_REVERSE
2294	if (rend & RS_Bold && fore == Color_fg)	2324	if (rend & RS_Bold && fore == Color_fg)
…		…
2313		2343
2314	if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))	2344	if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2315	fore = Color_UL;	2345	fore = Color_UL;
2316	#endif	2346	#endif
2317		2347
		2348	#ifdef OPTION_HC
		2349	if (rend & RS_Sel)
		2350	{
		2351	/* invert the column if no highlightColor is set or it is the
		2352	* current cursor column */
		2353	if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
		2354	&& ISSET_PIXCOLOR (Color_HC))
		2355	{
		2356	if (ISSET_PIXCOLOR (Color_HTC))
		2357	fore = Color_HTC;
		2358	// if invert is 0 reverse video is set so we use bg color as fg color
		2359	else if (!invert)
		2360	fore = back;
		2361
		2362	back = Color_HC;
		2363	invert = 0;
		2364	}
		2365	}
		2366	#endif
		2367
2318	if (invert)	2368	if (invert)
2319	{	2369	{
2320	#ifdef OPTION_HC
2321	if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2322	|| !ISSET_PIXCOLOR (Color_HC))
2323	#endif
2324	/* invert the column if no highlightColor is set or it is the
2325	* current cursor column */
2326	::swap (fore, back);	2370	::swap (fore, back);
2327	#ifdef OPTION_HC
2328	else if (ISSET_PIXCOLOR (Color_HC))
2329	back = Color_HC;
2330	#endif
2331		2371
2332	#ifndef NO_BOLD_UNDERLINE_REVERSE	2372	#ifndef NO_BOLD_UNDERLINE_REVERSE
2333	# ifndef OPTION_HC
2334	if (ISSET_PIXCOLOR (Color_RV))
2335	back = Color_RV;
2336	# endif
2337	if (fore == back)	2373	if (fore == back)
2338	{	2374	{
2339	fore = Color_bg;	2375	fore = Color_bg;
2340	back = Color_fg;	2376	back = Color_fg;
2341	}	2377	}
…		…
2377	/*	2413	/*
2378	* Actually do the drawing of the string here	2414	* Actually do the drawing of the string here
2379	*/	2415	*/
2380	rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];	2416	rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2381		2417
2382	if (expect_true (have_bg && back == Color_bg))	2418	if (ecb_likely (have_bg && back == Color_bg))
2383	{	2419	{
2384	// this is very ugly, maybe push it into ->draw?	2420	// this is very ugly, maybe push it into ->draw?
2385		2421
2386	for (i = 0; i < count; i++) /* don't draw empty strings */	2422	for (i = 0; i < count; i++) /* don't draw empty strings */
2387	if (text[i] != ' ')	2423	if (text[i] != ' ')
…		…
2394	did_clear: ;	2430	did_clear: ;
2395	}	2431	}
2396	else	2432	else
2397	font->draw (*drawable, xpixel, ypixel, text, count, fore, back);	2433	font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2398		2434
2399	if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))	2435	if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2400	{	2436	{
2401	#if ENABLE_FRILLS	2437	#if ENABLE_FRILLS
2402	if (ISSET_PIXCOLOR (Color_underline))	2438	if (ISSET_PIXCOLOR (Color_underline))
2403	XSetForeground (dpy, gc, pix_colors[Color_underline]);	2439	XSetForeground (dpy, gc, pix_colors[Color_underline]);
2404	else	2440	else
…		…
2409	xpixel, ypixel + font->ascent + 1,	2445	xpixel, ypixel + font->ascent + 1,
2410	xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);	2446	xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2411	}	2447	}
2412	} /* for (col....) */	2448	} /* for (col....) */
2413	} /* for (row....) */	2449	} /* for (row....) */
2414
2415	#if ENABLE_OVERLAY
2416	scr_swap_overlay ();
2417	#endif
2418	HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2419		2450
2420	/*	2451	/*
2421	* G: cleanup cursor and display outline cursor if necessary	2452	* G: cleanup cursor and display outline cursor if necessary
2422	*/	2453	*/
2423	if (showcursor)	2454	if (showcursor)
…		…
2455		2486
2456	XDrawRectangle (dpy, vt, gc,	2487	XDrawRectangle (dpy, vt, gc,
2457	Col2Pixel (col),	2488	Col2Pixel (col),
2458	Row2Pixel (oldcursor.row),	2489	Row2Pixel (oldcursor.row),
2459	(unsigned int) (Width2Pixel (cursorwidth) - 1),	2490	(unsigned int) (Width2Pixel (cursorwidth) - 1),
2460	(unsigned int) (Height2Pixel (1) - lineSpace - 1));	2491	(unsigned int) (Height2Pixel (1) - 1));
2461	}	2492	}
2462	}	2493	}
2463		2494
2464	/*	2495	/*
2465	* H: cleanup selection	2496	* H: cleanup selection
2466	*/	2497	*/
		2498	#if ENABLE_OVERLAY
		2499	scr_swap_overlay ();
		2500	#endif
		2501	HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
		2502
2467	scr_reverse_selection ();	2503	scr_reverse_selection ();
2468		2504
		2505	screen.flags = old_screen_flags;
2469	num_scr = 0;	2506	num_scr = 0;
2470	num_scr_allow = 1;	2507	num_scr_allow = 1;
2471	}	2508	}
2472		2509
2473	void	2510	void
2474	rxvt_term::scr_remap_chars (line_t &l) NOTHROW	2511	rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2475	{	2512	{
2476	if (!l.t)	2513	if (!l.valid ())
2477	return;	2514	return;
2478		2515
2479	l.touch (); // maybe a bit of an overkill, but it's not performance-relevant	2516	l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2480		2517
2481	for (int i = ncol; i--; )	2518	for (int i = ncol; i--; )
…		…
2494	scr_remap_chars (swap_buf [i]);	2531	scr_remap_chars (swap_buf [i]);
2495	}	2532	}
2496	}	2533	}
2497		2534
2498	void	2535	void
2499	rxvt_term::scr_recolour () NOTHROW	2536	rxvt_term::scr_recolour (bool refresh) NOTHROW
2500	{	2537	{
		2538	bool transparent = false;
		2539
2501	#ifdef HAVE_BG_PIXMAP	2540	#ifdef HAVE_BG_PIXMAP
2502	bgPixmap.apply ();	2541	if (bg_pixmap != None)
2503	#else	2542	{
		2543	# ifdef ENABLE_TRANSPARENCY
		2544	if (bg_flags & BG_IS_TRANSPARENT)
		2545	{
		2546	XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap);
		2547	XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2504		2548
		2549	transparent = true;
		2550	}
		2551	else
		2552	# endif
		2553	{
		2554	XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
		2555	XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
		2556	}
		2557	}
		2558	else
		2559	#endif
		2560	{
2505	XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);	2561	XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2506	XClearWindow (dpy, parent[0]);
2507	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);	2562	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
		2563	}
		2564
		2565	XClearWindow (dpy, parent);
2508		2566
2509	if (scrollBar.win)	2567	if (scrollBar.win)
2510	{	2568	{
		2569	if (transparent)
		2570	XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
		2571	else
2511	XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);	2572	XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2512	scrollBar.state = STATE_IDLE;	2573	scrollBar.state = SB_STATE_IDLE;
2513	scrollBar.show (0);	2574	scrollBar.show (0);
2514	}	2575	}
2515		2576
2516	#endif	2577	if (refresh)
2517		2578	{
2518	/* bgPixmap.apply () does not do the following : */
2519	scr_clear ();	2579	scr_clear ();
2520	scr_touch (true);	2580	scr_touch (true);
		2581	}
2521	want_refresh = 1;	2582	want_refresh = 1;
2522	}	2583	}
2523		2584
2524	/* ------------------------------------------------------------------------- */	2585	/* ------------------------------------------------------------------------- */
2525	void	2586	void
…		…
2593	{	2654	{
2594	#if !ENABLE_MINIMAL	2655	#if !ENABLE_MINIMAL
2595	if (selection.rect)	2656	if (selection.rect)
2596	scr_xor_rect (selection.beg.row, selection.beg.col,	2657	scr_xor_rect (selection.beg.row, selection.beg.col,
2597	selection.end.row, selection.end.col,	2658	selection.end.row, selection.end.col,
2598	RS_RVid, RS_RVid | RS_Uline);	2659	RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2599	else	2660	else
2600	#endif	2661	#endif
2601	scr_xor_span (selection.beg.row, selection.beg.col,	2662	scr_xor_span (selection.beg.row, selection.beg.col,
2602	selection.end.row, selection.end.col,	2663	selection.end.row, selection.end.col,
2603	RS_RVid);	2664	RS_Sel | RS_RVid);
2604	}	2665	}
2605	}	2666	}
2606		2667
2607	/* ------------------------------------------------------------------------- */	2668	/* ------------------------------------------------------------------------- */
2608	/*	2669	/*
…		…
2611	*/	2672	*/
2612	#if 0	2673	#if 0
2613	void	2674	void
2614	rxvt_term::scr_dump (int fd) NOTHROW	2675	rxvt_term::scr_dump (int fd) NOTHROW
2615	{	2676	{
2616	int row, wrote;	2677	// if this method is needed, it can be implemented by factoring the
2617	unsigned int width, towrite;	2678	// relevant code in scr_printscreen
2618	char r1[] = "\n";
2619
2620	for (row = saveLines + top_row;
2621	row < saveLines + nrow - 1; row++)
2622	{
2623	width = row_buf[row].l >= 0 ? row_buf[row].l
2624	: ncol;
2625	for (towrite = width; towrite; towrite -= wrote)
2626	{
2627	wrote = write (fd, & (row_buf[row].t[width - towrite]),
2628	towrite);
2629	if (wrote < 0)
2630	return; /* XXX: death, no report */
2631	}
2632	if (row_buf[row].l >= 0)
2633	if (write (fd, r1, 1) <= 0)
2634	return; /* XXX: death, no report */
2635	}
2636	}	2679	}
2637	#endif	2680	#endif
2638		2681
2639	/* ------------------------------------------------------------------------- *	2682	/* ------------------------------------------------------------------------- *
2640	* CHARACTER SELECTION *	2683	* CHARACTER SELECTION *
2641	* ------------------------------------------------------------------------- */	2684	* ------------------------------------------------------------------------- */
2642	void	2685	void
2643	rxvt_term::selection_check (int check_more) NOTHROW	2686	rxvt_term::selection_check (int check_more) NOTHROW
2644	{	2687	{
2645	row_col_t pos;
2646
2647	if (!selection.op)	2688	if (!selection.op)
2648	return;	2689	return;
2649		2690
2650	pos.row = pos.col = 0;
2651	if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)	2691	if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2652	|| !IN_RANGE_EXC (selection.mark.row, top_row, nrow)	2692	|| !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2653	|| !IN_RANGE_EXC (selection.end.row, top_row, nrow)	2693	|| !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2654	|| (check_more == 1	2694	|| (check_more == 1
2655	&& current_screen == selection.screen	2695	&& current_screen == selection.screen
2656	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)	2696	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2657	&& ROWCOL_IS_BEFORE (screen.cur, selection.end))	2697	&& ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2658	|| (check_more == 2
2659	&& ROWCOL_IS_BEFORE (selection.beg, pos)
2660	&& ROWCOL_IS_AFTER (selection.end, pos))
2661	|| (check_more == 3
2662	&& ROWCOL_IS_AFTER (selection.end, pos))
2663	|| (check_more == 4 /* screen width change */
2664	&& (selection.beg.row != selection.end.row
2665	|| selection.end.col > ncol)))
2666	CLEAR_SELECTION ();	2698	CLEAR_ALL_SELECTION ();
2667	}	2699	}
2668		2700
2669	/* ------------------------------------------------------------------------- */	2701	/* ------------------------------------------------------------------------- */
2670	/*	2702	/*
2671	* Paste a selection direct to the command fd	2703	* Paste a selection direct to the command fd
2672	*/	2704	*/
2673	void	2705	void
2674	rxvt_term::paste (char *data, unsigned int len) NOTHROW	2706	rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2675	{	2707	{
2676	/* convert normal newline chars into common keyboard Return key sequence */	2708	/* convert normal newline chars into common keyboard Return key sequence */
2677	for (unsigned int i = 0; i < len; i++)	2709	for (unsigned int i = 0; i < len; i++)
2678	if (data[i] == C0_LF)	2710	if (data[i] == C0_LF)
2679	data[i] = C0_CR;	2711	data[i] = C0_CR;
2680		2712
2681	if (priv_modes & PrivMode_BracketPaste)	2713	if (priv_modes & PrivMode_BracketPaste)
2682	tt_printf ("\e[200~");	2714	tt_printf ("\x1b[200~");
2683		2715
2684	tt_write (data, len);	2716	tt_write (data, len);
2685		2717
2686	if (priv_modes & PrivMode_BracketPaste)	2718	if (priv_modes & PrivMode_BracketPaste)
2687	tt_printf ("\e[201~");	2719	tt_printf ("\x1b[201~");
2688	}	2720	}
2689		2721
2690	/* ------------------------------------------------------------------------- */
2691	/*
2692	* Respond to a notification that a primary selection has been sent
2693	* EXT: SelectionNotify
2694	*/
2695	void	2722	void
2696	rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW	2723	rxvt_term::paste (char *data, unsigned int len) NOTHROW
2697	{	2724	{
2698	if (prop == None) /* check for failed XConvertSelection */	2725	if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2699	{
2700	if ((selection_type & Sel_CompoundText))
2701	{
2702	int selnum = selection_type & Sel_whereMask;
2703
2704	selection_type = 0;
2705	if (selnum != Sel_direct)
2706	selection_request_other (XA_STRING, selnum);
2707	}
2708
2709	if ((selection_type & Sel_UTF8String))
2710	{
2711	int selnum = selection_type & Sel_whereMask;
2712
2713	selection_type = Sel_CompoundText;
2714	if (selnum != Sel_direct)
2715	selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2716	else
2717	selection_type = 0;
2718	}
2719
2720	return;
2721	}
2722
2723	unsigned long bytes_after;
2724	XTextProperty ct;
2725
2726	if (XGetWindowProperty (dpy, win, prop,
2727	0, PROP_SIZE / 4,
2728	delete_prop, AnyPropertyType,
2729	&ct.encoding, &ct.format,
2730	&ct.nitems, &bytes_after,
2731	&ct.value) != Success)
2732	{
2733	ct.value = 0;
2734	goto bailout;
2735	}
2736
2737	if (ct.encoding == None)
2738	goto bailout;
2739
2740	if (bytes_after)
2741	{
2742	// fetch and append remaining data
2743	XTextProperty ct2;
2744
2745	if (XGetWindowProperty (dpy, win, prop,
2746	ct.nitems / 4, (bytes_after + 3) / 4,
2747	delete_prop, AnyPropertyType,
2748	&ct2.encoding, &ct2.format,
2749	&ct2.nitems, &bytes_after,
2750	&ct2.value) != Success)
2751	goto bailout;
2752
2753	// realloc should be compatible to XFree, here, and elsewhere, too
2754	ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2755	memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2756	ct.nitems += ct2.nitems;
2757
2758	XFree (ct2.value);
2759	}
2760
2761	if (ct.value == 0)
2762	goto bailout;
2763
2764	if (ct.encoding == xa[XA_INCR])
2765	{
2766	// INCR selection, start handshake
2767	if (!delete_prop)
2768	XDeleteProperty (dpy, win, prop);
2769
2770	selection_wait = Sel_incr;
2771	incr_buf_fill = 0;
2772	incr_ev.start (10);
2773
2774	goto bailout;
2775	}
2776
2777	if (ct.nitems == 0)
2778	{
2779	if (selection_wait == Sel_incr)
2780	{
2781	XFree (ct.value);
2782
2783	// finally complete, now paste the whole thing
2784	selection_wait = Sel_normal;
2785	ct.value = (unsigned char *)incr_buf;
2786	ct.nitems = incr_buf_fill;
2787	incr_buf = 0;
2788	incr_buf_size = 0;
2789	incr_ev.stop ();
2790	}
2791	else
2792	{
2793	if (selection_wait == Sel_normal
2794	&& (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2795	{
2796	/*
2797	* pass through again trying CUT_BUFFER0 if we've come from
2798	* XConvertSelection () but nothing was presented
2799	*/
2800	selection_paste (display->root, XA_CUT_BUFFER0, False);
2801	}
2802
2803	goto bailout;
2804	}
2805	}
2806	else if (selection_wait == Sel_incr)
2807	{
2808	incr_ev.start (10);
2809
2810	while (incr_buf_fill + ct.nitems > incr_buf_size)
2811	{
2812	incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2813	incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2814	}
2815
2816	memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2817	incr_buf_fill += ct.nitems;
2818
2819	goto bailout;
2820	}
2821
2822	char **cl;
2823	int cr;
2824
2825	#if !ENABLE_MINIMAL
2826	// xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2827	// so recode it manually
2828	if (ct.encoding == xa[XA_UTF8_STRING])
2829	{
2830	wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2831	char *s = rxvt_wcstombs (w);
2832	free (w);
2833	// TODO: strlen == only the first element will be converted. well...
2834	paste (s, strlen (s));
2835	free (s);
2836	}
2837	else
2838	#endif
2839	if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2840	&& cl)
2841	{
2842	for (int i = 0; i < cr; i++)
2843	paste (cl[i], strlen (cl[i]));
2844
2845	XFreeStringList (cl);
2846	}
2847	else
2848	paste ((char *)ct.value, ct.nitems); // paste raw
2849
2850	bailout:
2851	XFree (ct.value);
2852
2853	if (selection_wait == Sel_normal)
2854	selection_wait = Sel_none;
2855	}
2856
2857	void
2858	rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2859	{
2860	selection_wait = Sel_none;
2861
2862	incr_buf_size = 0;
2863	free (incr_buf);
2864
2865	rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2866	}
2867
2868	void
2869	rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2870	{
2871	if (prop == None || selection_wait != Sel_incr)
2872	return;	2726	return;
2873		2727
2874	selection_paste (win, prop, true);	2728	tt_paste (data, len);
2875	}	2729	}
2876		2730
2877	/* ------------------------------------------------------------------------- */	2731	/* ------------------------------------------------------------------------- */
2878	/*	2732	/*
2879	* Request the current selection:	2733	* Request PRIMARY, SECONDARY or CLIPBOARD selection.
2880	* Order: > internal selection if available	2734	* if the requested selection has no owner or is empty CUT_BUFFER0 is used
2881	* > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)	2735	* as fallback
2882	* > CUT_BUFFER0
2883	* (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2884	* will auto fallback to CUT_BUFFER0
2885	* EXT: button 2 release	2736	* EXT: button 2 release
2886	*/	2737	*/
2887	void	2738	void
2888	rxvt_term::selection_request (Time tm, int selnum) NOTHROW	2739	rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2889	{	2740	{
2890	if (selection.text && selnum == Sel_Primary)	2741	if (!selection_req)
2891	{
2892	/* internal selection */
2893	char *str = rxvt_wcstombs (selection.text, selection.len);
2894	paste (str, strlen (str));
2895	free (str);
2896	return;
2897	}	2742	{
2898	else	2743	selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
		2744	selection_req->run ();
2899	{	2745	}
2900	selection_request_time = tm;
2901	selection_wait = Sel_normal;
2902
2903	#if X_HAVE_UTF8_STRING
2904	selection_type = Sel_UTF8String;
2905	if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2906	return;
2907	#else
2908	selection_type = Sel_CompoundText;
2909	if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2910	return;
2911	#endif
2912	}
2913
2914	selection_wait = Sel_none; /* don't loop in selection_paste () */
2915	selection_paste (display->root, XA_CUT_BUFFER0, false);
2916	}
2917
2918	int
2919	rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2920	{
2921	Atom sel;
2922
2923	selection_type |= selnum;
2924
2925	if (selnum == Sel_Primary)
2926	sel = XA_PRIMARY;
2927	else if (selnum == Sel_Secondary)
2928	sel = XA_SECONDARY;
2929	else
2930	sel = xa[XA_CLIPBOARD];
2931
2932	if (XGetSelectionOwner (dpy, sel) != None)
2933	{
2934	XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2935	vt, selection_request_time);
2936	return 1;
2937	}
2938
2939	return 0;
2940	}	2746	}
2941		2747
2942	/* ------------------------------------------------------------------------- */	2748	/* ------------------------------------------------------------------------- */
2943	/*	2749	/*
2944	* Clear all selected text	2750	* Clear all selected text
2945	* EXT: SelectionClear	2751	* EXT: SelectionClear
2946	*/	2752	*/
2947	void	2753	void
2948	rxvt_term::selection_clear () NOTHROW	2754	rxvt_term::selection_clear (bool clipboard) NOTHROW
2949	{	2755	{
		2756	if (!clipboard)
		2757	{
2950	want_refresh = 1;	2758	want_refresh = 1;
2951	free (selection.text);	2759	free (selection.text);
2952	selection.text = NULL;	2760	selection.text = NULL;
2953	selection.len = 0;	2761	selection.len = 0;
2954	CLEAR_SELECTION ();	2762	CLEAR_SELECTION ();
2955		2763
2956	if (display->selection_owner == this)	2764	if (display->selection_owner == this)
2957	display->selection_owner = 0;	2765	display->selection_owner = 0;
		2766	}
		2767	else
		2768	{
		2769	free (selection.clip_text);
		2770	selection.clip_text = NULL;
		2771	selection.clip_len = 0;
		2772
		2773	if (display->clipboard_owner == this)
		2774	display->clipboard_owner = 0;
		2775	}
2958	}	2776	}
2959		2777
2960	/* ------------------------------------------------------------------------- */	2778	/* ------------------------------------------------------------------------- */
2961	/*	2779	/*
2962	* Copy a selection into the cut buffer	2780	* Copy a selection into the cut buffer
2963	* EXT: button 1 or 3 release	2781	* EXT: button 1 or 3 release
2964	*/	2782	*/
2965	void	2783	void
2966	rxvt_term::selection_make (Time tm)	2784	rxvt_term::selection_make (Time tm)
2967	{	2785	{
2968	int i;	2786	int size;
2969	wchar_t *new_selection_text;	2787	wchar_t *new_selection_text;
2970	text_t *t;	2788	text_t *t;
2971		2789
2972	switch (selection.op)	2790	switch (selection.op)
2973	{	2791	{
…		…
2989	return; /* nothing selected, go away */	2807	return; /* nothing selected, go away */
2990		2808
2991	if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))	2809	if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2992	return;	2810	return;
2993		2811
2994	i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);	2812	size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2995	new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));	2813	new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
2996		2814
2997	int ofs = 0;	2815	int ofs = 0;
2998	int extra = 0;	2816	int extra = 0;
2999		2817
3000	int col = selection.beg.col;	2818	int col = selection.beg.col;
…		…
3006	{	2824	{
3007	#if !ENABLE_MINIMAL	2825	#if !ENABLE_MINIMAL
3008	if (selection.rect)	2826	if (selection.rect)
3009	{	2827	{
3010	col = selection.beg.col;	2828	col = selection.beg.col;
3011	end_col = ncol + 1;	2829	end_col = selection.end.col;
3012	}	2830	}
3013	else	2831	else
3014	#endif	2832	#endif
3015	end_col = ROW(row).l;	2833	end_col = ROW(row).l;
3016		2834
3017	col = max (col, 0);	2835	col = max (col, 0);
3018		2836
3019	if (row == selection.end.row	2837	if (row == selection.end.row)
3020	#if !ENABLE_MINIMAL
3021	|| selection.rect
3022	#endif
3023	)
3024	min_it (end_col, selection.end.col);	2838	min_it (end_col, selection.end.col);
3025		2839
3026	t = ROW(row).t + col;	2840	t = ROW(row).t + col;
3027		2841
3028	for (; col < end_col; col++)	2842	for (; col < end_col; col++)
…		…
3036		2850
3037	extra -= (len - 1);	2851	extra -= (len - 1);
3038		2852
3039	if (extra < 0)	2853	if (extra < 0)
3040	{	2854	{
3041	extra += i;	2855	extra += size;
3042	i += i;	2856	size += size;
3043	new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t));	2857	new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3044	}	2858	}
3045		2859
3046	ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);	2860	ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3047	}	2861	}
3048	#endif	2862	#endif
…		…
3060		2874
3061	new_selection_text[ofs++] = C0_LF;	2875	new_selection_text[ofs++] = C0_LF;
3062	}	2876	}
3063	else	2877	else
3064	#endif	2878	#endif
3065	if (!ROW(row).is_longer () && row != selection.end.row)	2879	if (!ROW(row).is_longer ()
		2880	&& (row != selection.end.row || end_col != selection.end.col)
		2881	&& (row != selection.beg.row || selection.beg.col < ncol))
3066	new_selection_text[ofs++] = C0_LF;	2882	new_selection_text[ofs++] = C0_LF;
3067	}	2883	}
3068
3069	if (end_col != selection.end.col)
3070	new_selection_text[ofs++] = C0_LF;
3071		2884
3072	new_selection_text[ofs] = 0;	2885	new_selection_text[ofs] = 0;
3073		2886
3074	if (ofs == 0)	2887	if (ofs == 0)
3075	{	2888	{
…		…
3088		2901
3089	selection_grab (tm);	2902	selection_grab (tm);
3090	}	2903	}
3091		2904
3092	bool	2905	bool
3093	rxvt_term::selection_grab (Time tm) NOTHROW	2906	rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3094	{	2907	{
		2908	Atom sel;
		2909
		2910	if (!clipboard)
		2911	{
3095	selection_time = tm;	2912	selection_time = tm;
		2913	sel = XA_PRIMARY;
		2914	}
		2915	else
		2916	{
		2917	clipboard_time = tm;
		2918	sel = xa[XA_CLIPBOARD];
		2919	}
3096		2920
3097	XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm);	2921	XSetSelectionOwner (dpy, sel, vt, tm);
3098	if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt)	2922	if (XGetSelectionOwner (dpy, sel) == vt)
3099	{	2923	{
3100	display->set_selection_owner (this);	2924	display->set_selection_owner (this, clipboard);
3101	return true;	2925	return true;
3102	}	2926	}
3103	else	2927	else
3104	{	2928	{
3105	selection_clear ();	2929	selection_clear (clipboard);
3106	return false;	2930	return false;
3107	}	2931	}
3108		2932
3109	#if 0	2933	#if 0
3110	XTextProperty ct;	2934	XTextProperty ct;
…		…
3570	* EXT: SelectionRequest	3394	* EXT: SelectionRequest
3571	*/	3395	*/
3572	void	3396	void
3573	rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW	3397	rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3574	{	3398	{
		3399	Atom property = rq.property == None ? rq.target : rq.property;
3575	XSelectionEvent ev;	3400	XSelectionEvent ev;
3576		3401
3577	ev.type = SelectionNotify;	3402	ev.type = SelectionNotify;
3578	ev.property = None;	3403	ev.property = None;
3579	ev.display = rq.display;	3404	ev.display = rq.display;
…		…
3594	*target++ = xa[XA_COMPOUND_TEXT];	3419	*target++ = xa[XA_COMPOUND_TEXT];
3595	#if X_HAVE_UTF8_STRING	3420	#if X_HAVE_UTF8_STRING
3596	*target++ = xa[XA_UTF8_STRING];	3421	*target++ = xa[XA_UTF8_STRING];
3597	#endif	3422	#endif
3598		3423
3599	XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,	3424	XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3600	32, PropModeReplace,	3425	32, PropModeReplace,
3601	(unsigned char *)target_list, target - target_list);	3426	(unsigned char *)target_list, target - target_list);
3602	ev.property = rq.property;	3427	ev.property = property;
3603	}	3428	}
3604	#if TODO // TODO	3429	#if TODO // TODO
3605	else if (rq.target == xa[XA_MULTIPLE])	3430	else if (rq.target == xa[XA_MULTIPLE])
3606	{	3431	{
3607	/* TODO: Handle MULTIPLE */	3432	/* TODO: Handle MULTIPLE */
3608	}	3433	}
3609	#endif	3434	#endif
3610	else if (rq.target == xa[XA_TIMESTAMP] && selection.text)	3435	else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3611	{	3436	{
3612	XChangeProperty (dpy, rq.requestor, rq.property, rq.target,	3437	XChangeProperty (dpy, rq.requestor, property, rq.target,
3613	32, PropModeReplace, (unsigned char *)&selection_time, 1);	3438	32, PropModeReplace, (unsigned char *)&selection_time, 1);
3614	ev.property = rq.property;	3439	ev.property = property;
		3440	}
		3441	else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
		3442	{
		3443	XChangeProperty (dpy, rq.requestor, property, rq.target,
		3444	32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
		3445	ev.property = property;
3615	}	3446	}
3616	else if (rq.target == XA_STRING	3447	else if (rq.target == XA_STRING
3617	|| rq.target == xa[XA_TEXT]	3448	|| rq.target == xa[XA_TEXT]
3618	|| rq.target == xa[XA_COMPOUND_TEXT]	3449	|| rq.target == xa[XA_COMPOUND_TEXT]
3619	|| rq.target == xa[XA_UTF8_STRING]	3450	|| rq.target == xa[XA_UTF8_STRING]
…		…
3651	{	3482	{
3652	target = xa[XA_COMPOUND_TEXT];	3483	target = xa[XA_COMPOUND_TEXT];
3653	style = enc_compound_text;	3484	style = enc_compound_text;
3654	}	3485	}
3655		3486
3656	if (selection.text)	3487	if (rq.selection == XA_PRIMARY && selection.text)
3657	{	3488	{
3658	cl = selection.text;	3489	cl = selection.text;
3659	selectlen = selection.len;	3490	selectlen = selection.len;
		3491	}
		3492	else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
		3493	{
		3494	cl = selection.clip_text;
		3495	selectlen = selection.clip_len;
3660	}	3496	}
3661	else	3497	else
3662	{	3498	{
3663	cl = L"";	3499	cl = L"";
3664	selectlen = 0;	3500	selectlen = 0;
…		…
3685	ct.value = (unsigned char *)cl;	3521	ct.value = (unsigned char *)cl;
3686	ct.nitems = selectlen;	3522	ct.nitems = selectlen;
3687	ct.encoding = target;	3523	ct.encoding = target;
3688	}	3524	}
3689		3525
3690	XChangeProperty (dpy, rq.requestor, rq.property,	3526	XChangeProperty (dpy, rq.requestor, property,
3691	ct.encoding, 8, PropModeReplace,	3527	ct.encoding, 8, PropModeReplace,
3692	ct.value, (int)ct.nitems);	3528	ct.value, (int)ct.nitems);
3693	ev.property = rq.property;	3529	ev.property = property;
3694		3530
3695	if (freect)	3531	if (freect)
3696	XFree (ct.value);	3532	XFree (ct.value);
3697	}	3533	}
3698		3534
…		…
3732	h += 2; min_it (h, nrow);	3568	h += 2; min_it (h, nrow);
3733		3569
3734	x -= 1; clamp_it (x, 0, ncol - w);	3570	x -= 1; clamp_it (x, 0, ncol - w);
3735	y -= 1; clamp_it (y, 0, nrow - h);	3571	y -= 1; clamp_it (y, 0, nrow - h);
3736		3572
3737	ov_x = x; ov_y = y;	3573	ov.x = x; ov.y = y;
3738	ov_w = w; ov_h = h;	3574	ov.w = w; ov.h = h;
3739		3575
3740	ov_text = new text_t *[h];	3576	ov.text = new text_t *[h];
3741	ov_rend = new rend_t *[h];	3577	ov.rend = new rend_t *[h];
3742		3578
3743	for (y = 0; y < h; y++)	3579	for (y = 0; y < h; y++)
3744	{	3580	{
3745	text_t *tp = ov_text[y] = new text_t[w];	3581	text_t *tp = ov.text[y] = new text_t[w];
3746	rend_t *rp = ov_rend[y] = new rend_t[w];	3582	rend_t *rp = ov.rend[y] = new rend_t[w];
3747		3583
3748	text_t t0, t1, t2;	3584	text_t t0, t1, t2;
3749	rend_t r = OVERLAY_RSTYLE;	3585	rend_t r = OVERLAY_RSTYLE;
3750		3586
3751	if (y == 0)	3587	if (y == 0)
…		…
3770	}	3606	}
3771		3607
3772	void	3608	void
3773	rxvt_term::scr_overlay_off () NOTHROW	3609	rxvt_term::scr_overlay_off () NOTHROW
3774	{	3610	{
3775	if (!ov_text)	3611	if (!ov.text)
3776	return;	3612	return;
3777		3613
3778	want_refresh = 1;	3614	want_refresh = 1;
3779		3615
3780	for (int y = 0; y < ov_h; y++)	3616	for (int y = 0; y < ov.h; y++)
3781	{	3617	{
3782	delete [] ov_text[y];	3618	delete [] ov.text[y];
3783	delete [] ov_rend[y];	3619	delete [] ov.rend[y];
3784	}	3620	}
3785		3621
3786	delete [] ov_text; ov_text = 0;	3622	delete [] ov.text; ov.text = 0;
3787	delete [] ov_rend; ov_rend = 0;	3623	delete [] ov.rend; ov.rend = 0;
3788	}	3624	}
3789		3625
3790	void	3626	void
3791	rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW	3627	rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3792	{	3628	{
3793	if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)	3629	if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3794	return;	3630	return;
3795		3631
3796	x++, y++;	3632	x++, y++;
3797		3633
3798	ov_text[y][x] = text;	3634	ov.text[y][x] = text;
3799	ov_rend[y][x] = rend;	3635	ov.rend[y][x] = rend;
3800	}	3636	}
3801		3637
3802	void	3638	void
3803	rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW	3639	rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3804	{	3640	{
…		…
3823	}	3659	}
3824		3660
3825	void	3661	void
3826	rxvt_term::scr_swap_overlay () NOTHROW	3662	rxvt_term::scr_swap_overlay () NOTHROW
3827	{	3663	{
3828	if (!ov_text)	3664	if (!ov.text)
3829	return;	3665	return;
3830		3666
		3667	// hide cursor if it is within the overlay area
		3668	if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
		3669	&& IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
		3670	screen.flags &= ~Screen_VisibleCursor;
		3671
3831	// swap screen mem with overlay	3672	// swap screen mem with overlay
3832	for (int y = ov_h; y--; )	3673	for (int y = ov.h; y--; )
3833	{	3674	{
3834	text_t *t1 = ov_text[y];	3675	text_t *t1 = ov.text[y];
3835	rend_t *r1 = ov_rend[y];	3676	rend_t *r1 = ov.rend[y];
3836		3677
3837	text_t *t2 = ROW(y + ov_y + view_start).t + ov_x;	3678	text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3838	rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x;	3679	rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3839		3680
3840	for (int x = ov_w; x--; )	3681	for (int x = ov.w; x--; )
3841	{	3682	{
3842	text_t t = *t1; *t1++ = *t2; *t2++ = t;	3683	text_t t = *t1; *t1++ = *t2; *t2++ = t;
3843	rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));	3684	rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3844	}	3685	}
3845	}	3686	}

Diff Legend

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