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

Diff Legend

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