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

Diff Legend

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