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

Diff Legend

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