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.367 by sf-exg, Mon Jan 31 15:40:22 2011 UTC vs.
Revision 1.435 by sf-exg, Sun Mar 24 10:12:04 2013 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 separate compile!
34
35	static inline void	33	static inline void
36	fill_text (text_t *start, text_t value, int len)	34	fill_text (text_t *start, text_t value, int len)
37	{	35	{
38	while (len--)	36	while (len--)
39	*start++ = value;	37	*start++ = value;
40	}	38	}
41		39
42	/* ------------------------------------------------------------------------- */	40	/* ------------------------------------------------------------------------- */
43	#define PROP_SIZE 256*1024
44	#define PASTE_SIZE 32768
45	#define TABSIZE 8 /* default tab size */	41	#define TABSIZE 8 /* default tab size */
46		42
47	/* ------------------------------------------------------------------------- *	43	/* ------------------------------------------------------------------------- *
48	* GENERAL SCREEN AND SELECTION UPDATE ROUTINES *	44	* GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
49	* ------------------------------------------------------------------------- */	45	* ------------------------------------------------------------------------- */
…		…
100		96
101	/* Fill part/all of a line with blanks. */	97	/* Fill part/all of a line with blanks. */
102	void	98	void
103	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
104	{	100	{
105	if (!l.t)	101	if (!l.valid ())
106	{	102	{
107	lalloc (l);	103	l.alloc ();
108	col = 0;	104	col = 0;
109	width = ncol;	105	width = ncol;
110	}	106	}
111		107
112	l.touch ();	108	l.touch ();
…		…
154	l.r[col] = rend;	150	l.r[col] = rend;
155	col++;	151	col++;
156	} while (col < ncol && l.t[col] == NOCHAR);	152	} while (col < ncol && l.t[col] == NOCHAR);
157	}	153	}
158		154
		155	// set the rendition of a single wide character beginning at the given column
		156	void
		157	rxvt_term::scr_set_char_rend (line_t &l, int col, rend_t rend)
		158	{
		159	do {
		160	l.r[col] = rend;
		161	col++;
		162	} while (col < ncol && l.t[col] == NOCHAR);
		163	}
		164
159	/* ------------------------------------------------------------------------- *	165	/* ------------------------------------------------------------------------- *
160	* SCREEN INITIALISATION *	166	* SCREEN INITIALISATION *
161	* ------------------------------------------------------------------------- */	167	* ------------------------------------------------------------------------- */
162		168
163	void	169	void
		170	rxvt_term::scr_alloc () NOTHROW
		171	{
		172	int tsize = sizeof (text_t) * ncol;
		173	int rsize = sizeof (rend_t) * ncol;
		174
		175	// we assume that rend_t size is a sufficient alignment
		176	// factor for text_t and line_t values, and we only
		177	// need to adjust tsize.
		178	tsize = (tsize + sizeof (rend_t) - 1);
		179	tsize -= tsize % sizeof (rend_t);
		180
		181	int all_rows = total_rows + nrow + nrow;
		182
		183	chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows;
		184	chunk = chunk_alloc (chunk_size, 0);
		185
		186	char *base = (char *)chunk + sizeof (line_t) * all_rows;
		187
		188	for (int row = 0; row < all_rows; ++row)
		189	{
		190	line_t &l = ((line_t *)chunk) [row];
		191
		192	l.t = (text_t *)base; base += tsize;
		193	l.r = (rend_t *)base; base += rsize;
		194	l.l = -1;
		195	l.f = 0;
		196	}
		197
		198	drawn_buf = (line_t *)chunk;
		199	swap_buf = drawn_buf + nrow;
		200	row_buf = swap_buf + nrow;
		201	}
		202
		203	void
		204	rxvt_term::copy_line (line_t &dst, line_t &src)
		205	{
		206	scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
		207	dst.l = min (src.l, ncol);
		208	memcpy (dst.t, src.t, sizeof (text_t) * dst.l);
		209	memcpy (dst.r, src.r, sizeof (rend_t) * dst.l);
		210	dst.f = src.f;
		211	}
		212
		213	void ecb_cold
164	rxvt_term::scr_reset ()	214	rxvt_term::scr_reset ()
165	{	215	{
		216	#if ENABLE_OVERLAY
		217	scr_overlay_off ();
		218	#endif
		219
166	view_start = 0;	220	view_start = 0;
167	num_scr = 0;	221	num_scr = 0;
168		222
169	if (ncol == 0)	223	if (ncol == 0)
170	ncol = 80;	224	ncol = 80;
…		…
190	total_rows = nrow + saveLines;	244	total_rows = nrow + saveLines;
191		245
192	screen.tscroll = 0;	246	screen.tscroll = 0;
193	screen.bscroll = nrow - 1;	247	screen.bscroll = nrow - 1;
194		248
		249	void *prev_chunk = chunk;
		250	size_t prev_chunk_size = chunk_size;
		251	line_t *prev_drawn_buf = drawn_buf;
		252	line_t *prev_swap_buf = swap_buf;
		253	line_t *prev_row_buf = row_buf;
		254
		255	scr_alloc ();
		256
195	if (!row_buf)	257	if (!prev_row_buf)
196	{	258	{
197	/*	259	/*
198	* first time called so just malloc everything: don't rely on realloc	260	* first time called (or after scr_release) so just malloc everything: don't rely on realloc
199	*/	261	*/
200	top_row = 0;	262	top_row = 0;
201	term_start = 0;	263	term_start = 0;
202
203	talloc = new rxvt_salloc (ncol * sizeof (text_t));
204	ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
205
206	row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
207	drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
208	swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
209
210	for (int row = nrow; row--; )
211	{
212	scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
213	scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
214	scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
215	}
216		264
217	memset (charsets, 'B', sizeof (charsets));	265	memset (charsets, 'B', sizeof (charsets));
218	rstyle = DEFAULT_RSTYLE;	266	rstyle = DEFAULT_RSTYLE;
219	screen.flags = Screen_DefaultFlags;	267	screen.flags = Screen_DefaultFlags;
220	screen.cur.row = screen.cur.col = 0;	268	screen.cur.row = screen.cur.col = 0;
…		…
243	{	291	{
244	/*	292	/*
245	* add or delete rows as appropriate	293	* add or delete rows as appropriate
246	*/	294	*/
247		295
248	rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));	296	int common_col = min (prev_ncol, ncol);
249	rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
250
251	#if 0
252	if (nrow < prev_nrow)
253	{
254	for (int row = nrow; row < prev_nrow; row++)
255	{
256	lfree (swap_buf [row]);
257	lfree (drawn_buf[row]);
258	}
259	}
260	#endif
261
262	drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
263	swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
264		297
265	for (int row = min (nrow, prev_nrow); row--; )	298	for (int row = min (nrow, prev_nrow); row--; )
266	{	299	{
267	lresize (drawn_buf[row]);	300	scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
268	lresize (swap_buf [row]);	301	memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
269	}	302	memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
270		303
271	for (int row = prev_nrow; row < nrow; row++)	304	copy_line (swap_buf [row], prev_swap_buf [row]);
272	{	305	}
273	swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
274	drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
275	}
276
277	line_t *old_buf = row_buf;
278	row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
279		306
280	int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row	307	int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
281	int pend = MOD (term_start + top_row , prev_total_rows);	308	int pend = MOD (term_start + top_row , prev_total_rows);
282	int q = total_rows; // rewrapped row	309	int q = total_rows; // rewrapped row
283		310
…		…
291	ocur.row = MOD (term_start + ocur.row, prev_total_rows);	318	ocur.row = MOD (term_start + ocur.row, prev_total_rows);
292		319
293	do	320	do
294	{	321	{
295	p = MOD (p - 1, prev_total_rows);	322	p = MOD (p - 1, prev_total_rows);
296	assert (old_buf [MOD (p, prev_total_rows)].t);	323	assert (prev_row_buf [MOD (p, prev_total_rows)].t);
297	int plines = 1;	324	int plines = 1;
298	int llen = old_buf [MOD (p, prev_total_rows)].l;	325	int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
299		326
300	while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())	327	while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ())
301	{	328	{
302	p = MOD (p - 1, prev_total_rows);	329	p = MOD (p - 1, prev_total_rows);
303		330
304	plines++;	331	plines++;
305	llen += prev_ncol;	332	llen += prev_ncol;
…		…
318		345
319	// re-assemble the full line by destination lines	346	// re-assemble the full line by destination lines
320	for (int qrow = q; qlines--; qrow++)	347	for (int qrow = q; qlines--; qrow++)
321	{	348	{
322	qline = row_buf + qrow;	349	qline = row_buf + qrow;
323	lalloc (*qline);	350	qline->alloc (); // redundant with next line
324	qline->l = ncol;	351	qline->l = ncol;
325	qline->is_longer (1);	352	qline->is_longer (1);
326		353
327	int qcol = 0;	354	int qcol = 0;
328		355
…		…
343	// this seems to upset applications/shells/readline	370	// this seems to upset applications/shells/readline
344	// least.	371	// least.
345	if (prow == ocur.row)	372	if (prow == ocur.row)
346	screen.cur.row = q - (total_rows - nrow);	373	screen.cur.row = q - (total_rows - nrow);
347		374
348	line_t &pline = old_buf [prow];	375	line_t &pline = prev_row_buf [prow];
349		376
350	int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);	377	int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
351		378
352	memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));	379	memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
353	memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));	380	memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
…		…
374	{	401	{
375	// if no scrollback exists (yet), wing, instead of wrap	402	// if no scrollback exists (yet), wing, instead of wrap
376		403
377	for (int row = min (nrow, prev_nrow); row--; )	404	for (int row = min (nrow, prev_nrow); row--; )
378	{	405	{
379	line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];	406	line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
380	line_t &qline = row_buf [row];	407	line_t &dst = row_buf [row];
381		408
382	qline = pline;	409	copy_line (dst, src);
383	lresize (qline);
384	}	410	}
385		411
386	for (int row = prev_nrow; row < nrow; row++)	412	for (int row = prev_nrow; row < nrow; row++)
387	{
388	row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);	413	scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
389	}
390		414
391	term_start = 0;	415	term_start = 0;
392	}	416	}
393
394	free (old_buf);
395	delete old_ta;
396	delete old_ra;
397		417
398	clamp_it (screen.cur.row, 0, nrow - 1);	418	clamp_it (screen.cur.row, 0, nrow - 1);
399	clamp_it (screen.cur.col, 0, ncol - 1);	419	clamp_it (screen.cur.col, 0, ncol - 1);
400	}	420	}
401		421
		422	for (int row = nrow; row--; )
		423	{
		424	if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
		425	if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
		426	if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
		427	}
		428
		429	chunk_free (prev_chunk, prev_chunk_size);
		430
402	free (tabs);	431	free (tabs);
403	tabs = (char *)rxvt_malloc (ncol);	432	tabs = (char *)rxvt_malloc (ncol);
404		433
405	for (int col = ncol; col--; )	434	for (int col = ncol; col--; )
406	tabs [col] = col % TABSIZE == 0;	435	tabs [col] = col % TABSIZE == 0;
…		…
413	tt_winch ();	442	tt_winch ();
414		443
415	HOOK_INVOKE ((this, HOOK_RESET, DT_END));	444	HOOK_INVOKE ((this, HOOK_RESET, DT_END));
416	}	445	}
417		446
418	/* ------------------------------------------------------------------------- */	447	void ecb_cold
419	/*
420	* Free everything. That way malloc debugging can find leakage.
421	*/
422	void
423	rxvt_term::scr_release () NOTHROW	448	rxvt_term::scr_release () NOTHROW
424	{	449	{
425	if (row_buf)	450	chunk_free (chunk, chunk_size);
426	{	451	chunk = 0;
427	delete talloc; talloc = 0;	452	row_buf = 0;
428	delete ralloc; ralloc = 0;
429		453
430	free (row_buf);
431	free (swap_buf);
432	free (drawn_buf);
433	row_buf = 0; // signal that we freed all the arrays above
434
435	free (tabs);	454	free (tabs);
436	tabs = 0;	455	tabs = 0;
437	}
438	}	456	}
439		457
440	/* ------------------------------------------------------------------------- */	458	/* ------------------------------------------------------------------------- */
441	/*	459	/*
442	* Hard/Soft reset	460	* Hard/Soft reset
443	*/	461	*/
444	void	462	void ecb_cold
445	rxvt_term::scr_poweron ()	463	rxvt_term::scr_poweron ()
446	{	464	{
447	scr_release ();	465	scr_release ();
		466
448	prev_nrow = prev_ncol = 0;	467	prev_nrow = prev_ncol = 0;
449	rvideo_mode = false;	468	rvideo_mode = false;
450	scr_soft_reset ();	469	scr_soft_reset ();
451	scr_reset ();	470	scr_reset ();
452		471
453	scr_clear (true);	472	scr_clear (true);
454	scr_refresh ();	473	scr_refresh ();
455	}	474	}
456		475
457	void	476	void ecb_cold
458	rxvt_term::scr_soft_reset ()	477	rxvt_term::scr_soft_reset () NOTHROW
459	{	478	{
460	/* only affects modes, nothing drastic such as clearing the screen */	479	/* only affects modes, nothing drastic such as clearing the screen */
461	#if ENABLE_OVERLAY	480	#if ENABLE_OVERLAY
462	scr_overlay_off ();	481	scr_overlay_off ();
463	#endif	482	#endif
…		…
518	assert (s->cur.row >= 0);	537	assert (s->cur.row >= 0);
519	assert (s->cur.col >= 0);	538	assert (s->cur.col >= 0);
520	}	539	}
521		540
522	void	541	void
523	rxvt_term::scr_swap_screen ()	542	rxvt_term::scr_swap_screen () NOTHROW
524	{	543	{
525	if (!option (Opt_secondaryScreen))	544	if (!option (Opt_secondaryScreen))
526	return;	545	return;
527		546
528	for (int i = prev_nrow; i--; )	547	for (int i = prev_nrow; i--; )
…		…
547	return;	566	return;
548		567
549	want_refresh = 1;	568	want_refresh = 1;
550	view_start = 0;	569	view_start = 0;
551		570
552	selection_check (2); /* check for boundary cross */	571	/* check for boundary cross */
		572	row_col_t pos;
		573	pos.row = pos.col = 0;
		574	if (ROWCOL_IS_BEFORE (selection.beg, pos)
		575	&& ROWCOL_IS_AFTER (selection.end, pos))
		576	CLEAR_SELECTION ();
553		577
554	current_screen = scrn;	578	current_screen = scrn;
555		579
556	#if NSCREENS	580	#if NSCREENS
557	if (option (Opt_secondaryScreen))	581	if (option (Opt_secondaryScreen))
…		…
623	/*	647	/*
624	* Scroll text between <row1> and <row2> inclusive, by <count> lines	648	* Scroll text between <row1> and <row2> inclusive, by <count> lines
625	* count positive ==> scroll up	649	* count positive ==> scroll up
626	* count negative ==> scroll down	650	* count negative ==> scroll down
627	*/	651	*/
628	int	652	int ecb_hot
629	rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW	653	rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
630	{	654	{
631	if (count == 0 || (row1 > row2))	655	if (count == 0 || (row1 > row2))
632	return 0;	656	return 0;
633		657
…		…
636		660
637	if (count > 0	661	if (count > 0
638	&& row1 == 0	662	&& row1 == 0
639	&& (current_screen == PRIMARY || option (Opt_secondaryScroll)))	663	&& (current_screen == PRIMARY || option (Opt_secondaryScroll)))
640	{	664	{
		665	min_it (count, total_rows - (nrow - (row2 + 1)));
		666
641	top_row = max (top_row - count, -saveLines);	667	top_row = max (top_row - count, -saveLines);
642
643	// scroll everything up 'count' lines
644	term_start = (term_start + count) % total_rows;
645		668
646	// sever bottommost line	669	// sever bottommost line
647	{	670	{
648	line_t &l = ROW(row2 - count);	671	line_t &l = ROW(row2);
649	l.is_longer (0);	672	l.is_longer (0);
650	l.touch ();	673	l.touch ();
651	}	674	}
652		675
		676	// scroll everything up 'count' lines
		677	term_start = (term_start + count) % total_rows;
		678
		679	// now copy lines below the scroll region bottom to the
		680	// bottom of the screen again, so they look as if they
		681	// hadn't moved.
		682	for (int i = nrow; --i > row2; )
		683	{
		684	line_t &l1 = ROW(i - count);
		685	line_t &l2 = ROW(i);
		686
		687	::swap (l1, l2);
		688	l2.touch ();
		689	}
		690
653	// erase newly scrolled-in lines	691	// erase newly scrolled-in lines
654	for (int i = count; i--; )	692	for (int i = count; i--; )
655	{	693	{
656	line_t &l = ROW(nrow - 1 - i);	694	line_t &l = ROW(row2 - i);
657		695
658	// optimize if already cleared, can be significant on slow machines	696	// optimise if already cleared, can be significant on slow machines
659	// could be rolled into scr_blank_screen_mem	697	// could be rolled into scr_blank_screen_mem
660	if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))	698	if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
661	{	699	{
662	scr_blank_line (l, 0, l.l, rstyle);	700	scr_blank_line (l, 0, l.l, rstyle);
663	l.l = 0;	701	l.l = 0;
…		…
665	}	703	}
666	else	704	else
667	scr_blank_screen_mem (l, rstyle);	705	scr_blank_screen_mem (l, rstyle);
668	}	706	}
669		707
670	// now copy lines below the scroll region bottom to the
671	// bottom of the screen again, so they look as if they
672	// hadn't moved.
673	for (int i = nrow; --i > row2; )
674	{
675	line_t &l1 = ROW(i - count);
676	line_t &l2 = ROW(i);
677
678	::swap (l1, l2);
679	l2.touch ();
680	}
681
682	// move and/or clear selection, if any	708	// move and/or clear selection, if any
683	if (selection.op && current_screen == selection.screen)	709	if (selection.op && current_screen == selection.screen
		710	&& selection.beg.row <= row2)
684	{	711	{
685	selection.beg.row -= count;	712	selection.beg.row -= count;
686	selection.end.row -= count;	713	selection.end.row -= count;
687	selection.mark.row -= count;	714	selection.mark.row -= count;
688		715
689	if (selection.beg.row < top_row	716	selection_check (0);
690	|| selection.end.row < top_row
691	|| selection.mark.row < top_row)
692	{
693	CLEAR_ALL_SELECTION ();
694	selection.op = SELECTION_CLEAR;
695	}
696	}	717	}
697		718
698	// finally move the view window, if desired	719	// finally move the view window, if desired
699	if (option (Opt_scrollWithBuffer)	720	if (option (Opt_scrollWithBuffer)
700	&& view_start != 0	721	&& view_start != 0
…		…
730	}	751	}
731		752
732	// use a simple and robust scrolling algorithm, this	753	// use a simple and robust scrolling algorithm, this
733	// part of scr_scroll_text is not time-critical.	754	// part of scr_scroll_text is not time-critical.
734		755
		756	// sever line above scroll region
		757	if (row1)
		758	{
		759	line_t &l = ROW(row1 - 1);
		760	l.is_longer (0);
		761	l.touch ();
		762	}
		763
735	int rows = row2 - row1 + 1;	764	int rows = row2 - row1 + 1;
736		765
737	min_it (count, rows);	766	min_it (count, rows);
738		767
739	line_t *temp_buf = row_buf + total_rows;	768	line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
740		769
741	for (int row = 0; row < rows; row++)	770	for (int row = 0; row < rows; row++)
742	{	771	{
743	temp_buf [row] = ROW(row1 + (row + count + rows) % rows);	772	temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
744		773
…		…
746	scr_blank_screen_mem (temp_buf [row], rstyle);	775	scr_blank_screen_mem (temp_buf [row], rstyle);
747	}	776	}
748		777
749	for (int row = 0; row < rows; row++)	778	for (int row = 0; row < rows; row++)
750	ROW(row1 + row) = temp_buf [row];	779	ROW(row1 + row) = temp_buf [row];
		780
		781	// sever bottommost line
		782	{
		783	line_t &l = ROW(row2);
		784	l.is_longer (0);
		785	l.touch ();
		786	}
751	}	787	}
752		788
753	return count;	789	return count;
754	}	790	}
755		791
756	/* ------------------------------------------------------------------------- */	792	/* ------------------------------------------------------------------------- */
757	/*	793	/*
758	* Add text given in <str> of length <len> to screen struct	794	* Add text given in <str> of length <len> to screen struct
759	*/	795	*/
760	void	796	void ecb_hot
761	rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW	797	rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
762	{	798	{
763	if (len <= 0) /* sanity */	799	if (len <= 0) /* sanity */
764	return;	800	return;
765		801
766	unsigned char checksel;	802	bool checksel;
767	unicode_t c;	803	unicode_t c;
768	int ncol = this->ncol;	804	int ncol = this->ncol;
769	const wchar_t *strend = str + len;	805	const wchar_t *strend = str + len;
770		806
771	want_refresh = 1;	807	want_refresh = 1;
…		…
797		833
798	while (str < strend)	834	while (str < strend)
799	{	835	{
800	c = (unicode_t)*str++; // convert to rxvt-unicodes representation	836	c = (unicode_t)*str++; // convert to rxvt-unicodes representation
801		837
802	if (expect_false (c < 0x20))	838	if (ecb_unlikely (c < 0x20))
803	if (c == C0_LF)	839	if (c == C0_LF)
804	{	840	{
805	max_it (line->l, screen.cur.col);	841	max_it (line->l, screen.cur.col);
806		842
807	screen.flags &= ~Screen_WrapNext;	843	screen.flags &= ~Screen_WrapNext;
…		…
826	{	862	{
827	scr_tab (1, true);	863	scr_tab (1, true);
828	continue;	864	continue;
829	}	865	}
830		866
831	if (expect_false (	867	if (ecb_unlikely (
832	checksel /* see if we're writing within selection */	868	checksel /* see if we're writing within selection */
833	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)	869	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
834	&& ROWCOL_IS_BEFORE (screen.cur, selection.end)	870	&& ROWCOL_IS_BEFORE (screen.cur, selection.end)
835	))	871	))
836	{	872	{
…		…
841	* should be a similar check.	877	* should be a similar check.
842	*/	878	*/
843	CLEAR_SELECTION ();	879	CLEAR_SELECTION ();
844	}	880	}
845		881
846	if (expect_false (screen.flags & Screen_WrapNext))	882	if (ecb_unlikely (screen.flags & Screen_WrapNext))
847	{	883	{
848	scr_do_wrap ();	884	scr_do_wrap ();
849		885
850	line->l = ncol;	886	line->l = ncol;
851	line->is_longer (1);	887	line->is_longer (1);
…		…
853	row = screen.cur.row;	889	row = screen.cur.row;
854	line = &ROW(row); /* _must_ refresh */	890	line = &ROW(row); /* _must_ refresh */
855	}	891	}
856		892
857	// some utf-8 decoders "decode" surrogate characters: let's fix this.	893	// some utf-8 decoders "decode" surrogate characters: let's fix this.
858	if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff)))	894	if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
859	c = 0xfffd;	895	c = 0xfffd;
860		896
861	// rely on wcwidth to tell us the character width, do wcwidth before	897	// rely on wcwidth to tell us the character width, do wcwidth before
862	// further replacements, as wcwidth might return -1 for the line	898	// further replacements, as wcwidth might return -1 for the line
863	// drawing characters below as they might be invalid in the current	899	// drawing characters below as they might be invalid in the current
864	// locale.	900	// locale.
865	int width = WCWIDTH (c);	901	int width = WCWIDTH (c);
866		902
867	if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL	903	if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
868	{	904	{
869	// vt100 special graphics and line drawing	905	// vt100 special graphics and line drawing
870	// 5f-7e standard vt100	906	// 5f-7e standard vt100
871	// 40-5e rxvt extension for extra curses acs chars	907	// 40-5e rxvt extension for extra curses acs chars
872	static uint16_t vt100_0[62] = { // 41 .. 7e	908	static uint16_t vt100_0[62] = { // 41 .. 7e
…		…
885	c = vt100_0[c - 0x41];	921	c = vt100_0[c - 0x41];
886	width = 1; // vt100 line drawing characters are always single-width	922	width = 1; // vt100 line drawing characters are always single-width
887	}	923	}
888	}	924	}
889		925
890	if (expect_false (screen.flags & Screen_Insert))	926	if (ecb_unlikely (screen.flags & Screen_Insert))
891	scr_insdel_chars (width, INSERT);	927	scr_insdel_chars (width, INSERT);
892		928
893	if (width != 0)	929	if (width != 0)
894	{	930	{
895	#if !UNICODE_3	931	#if !UNICODE_3
…		…
903	#endif	939	#endif
904		940
905	rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));	941	rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
906		942
907	// if the character doesn't fit into the remaining columns...	943	// if the character doesn't fit into the remaining columns...
908	if (expect_false (screen.cur.col > ncol - width && ncol >= width))	944	if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
909	{	945	{
910	if (screen.flags & Screen_Autowrap)	946	if (screen.flags & Screen_Autowrap)
911	{	947	{
912	// ... artificially enlargen the previous one	948	// ... artificially enlargen the previous one
913	c = NOCHAR;	949	c = NOCHAR;
…		…
920		956
921	// nuke the character at this position, if required	957	// nuke the character at this position, if required
922	// due to wonderful coincidences everywhere else in this loop	958	// due to wonderful coincidences everywhere else in this loop
923	// we never have to check for overwriting a wide char itself,	959	// we never have to check for overwriting a wide char itself,
924	// only its tail.	960	// only its tail.
925	if (expect_false (line->t[screen.cur.col] == NOCHAR))	961	if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
926	scr_kill_char (*line, screen.cur.col);	962	scr_kill_char (*line, screen.cur.col);
927		963
928	line->touch ();	964	line->touch ();
929		965
930	do	966	do
931	{	967	{
932	line->t[screen.cur.col] = c;	968	line->t[screen.cur.col] = c;
933	line->r[screen.cur.col] = rend;	969	line->r[screen.cur.col] = rend;
934		970
935	if (expect_true (screen.cur.col < ncol - 1))	971	if (ecb_likely (screen.cur.col < ncol - 1))
936	screen.cur.col++;	972	screen.cur.col++;
937	else	973	else
938	{	974	{
939	line->l = ncol;	975	line->l = ncol;
940	if (screen.flags & Screen_Autowrap)	976	if (screen.flags & Screen_Autowrap)
…		…
943	goto end_of_line;	979	goto end_of_line;
944	}	980	}
945		981
946	c = NOCHAR;	982	c = NOCHAR;
947	}	983	}
948	while (expect_false (--width > 0));	984	while (ecb_unlikely (--width > 0));
949		985
950	// pad with spaces when overwriting wide character with smaller one	986	// pad with spaces when overwriting wide character with smaller one
951	for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++)	987	for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
952	{	988	{
953	line->t[c] = ' ';	989	line->t[c] = ' ';
954	line->r[c] = rend;	990	line->r[c] = rend;
955	}	991	}
956		992
…		…
1115	* XTERM_SEQ: ESC 6	1151	* XTERM_SEQ: ESC 6
1116	* Move cursor left in row. If we're at the left boundary, shift everything	1152	* Move cursor left in row. If we're at the left boundary, shift everything
1117	* in that row right. Clear left column.	1153	* in that row right. Clear left column.
1118	*/	1154	*/
1119	#if !ENABLE_MINIMAL	1155	#if !ENABLE_MINIMAL
1120	void	1156	void ecb_cold
1121	rxvt_term::scr_backindex () NOTHROW	1157	rxvt_term::scr_backindex () NOTHROW
1122	{	1158	{
1123	if (screen.cur.col > 0)	1159	if (screen.cur.col > 0)
1124	scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);	1160	scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1125	else	1161	else
…		…
1132	* XTERM_SEQ: ESC 9	1168	* XTERM_SEQ: ESC 9
1133	* Move cursor right in row. If we're at the right boundary, shift everything	1169	* Move cursor right in row. If we're at the right boundary, shift everything
1134	* in that row left. Clear right column.	1170	* in that row left. Clear right column.
1135	*/	1171	*/
1136	#if !ENABLE_MINIMAL	1172	#if !ENABLE_MINIMAL
1137	void	1173	void ecb_cold
1138	rxvt_term::scr_forwardindex () NOTHROW	1174	rxvt_term::scr_forwardindex () NOTHROW
1139	{	1175	{
1140	if (screen.cur.col < ncol - 1)	1176	if (screen.cur.col < ncol - 1)
1141	scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);	1177	scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1142	else	1178	else
…		…
1293	scr_blank_line (line, col, num, rstyle);	1329	scr_blank_line (line, col, num, rstyle);
1294	}	1330	}
1295		1331
1296	/* ------------------------------------------------------------------------- */	1332	/* ------------------------------------------------------------------------- */
1297	/*	1333	/*
1298	* Erase part of whole of the screen	1334	* Erase part or whole of the screen
1299	* XTERM_SEQ: Clear screen after cursor : ESC [ 0 J	1335	* XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1300	* XTERM_SEQ: Clear screen before cursor: ESC [ 1 J	1336	* XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1301	* XTERM_SEQ: Clear whole screen : ESC [ 2 J	1337	* XTERM_SEQ: Clear whole screen : ESC [ 2 J
1302	*/	1338	*/
1303	void	1339	void
…		…
1312	ZERO_SCROLLBACK ();	1348	ZERO_SCROLLBACK ();
1313		1349
1314	switch (mode)	1350	switch (mode)
1315	{	1351	{
1316	case 0: /* erase to end of screen */	1352	case 0: /* erase to end of screen */
1317	selection_check (1);
1318	scr_erase_line (0);	1353	scr_erase_line (0);
1319	row = screen.cur.row + 1; /* possible OOB */	1354	row = screen.cur.row + 1; /* possible OOB */
1320	num = nrow - row;	1355	num = nrow - row;
1321	break;	1356	break;
1322	case 1: /* erase to beginning of screen */	1357	case 1: /* erase to beginning of screen */
1323	selection_check (3);
1324	scr_erase_line (1);	1358	scr_erase_line (1);
1325	row = 0;	1359	row = 0;
1326	num = screen.cur.row;	1360	num = screen.cur.row;
1327	break;	1361	break;
1328	case 2: /* erase whole screen */	1362	case 2: /* erase whole screen */
1329	selection_check (3);
1330	row = 0;	1363	row = 0;
1331	num = nrow;	1364	num = nrow;
1332	break;	1365	break;
1333	default:	1366	default:
1334	return;	1367	return;
…		…
1351	{	1384	{
1352	ren = DEFAULT_RSTYLE;	1385	ren = DEFAULT_RSTYLE;
1353		1386
1354	if (mapped)	1387	if (mapped)
1355	XClearArea (dpy, vt, 0,	1388	XClearArea (dpy, vt, 0,
1356	Row2Pixel (row - view_start), (unsigned int)width,	1389	Row2Pixel (row - view_start), (unsigned int)vt_width,
1357	(unsigned int)Height2Pixel (num), False);	1390	(unsigned int)Height2Pixel (num), False);
1358	}	1391	}
1359	else	1392	else
1360	{	1393	{
1361	ren = rstyle & (RS_fgMask | RS_bgMask);	1394	ren = rstyle & (RS_fgMask | RS_bgMask);
…		…
1364	{	1397	{
1365	gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];	1398	gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1366	XChangeGC (dpy, gc, GCForeground, &gcvalue);	1399	XChangeGC (dpy, gc, GCForeground, &gcvalue);
1367	XFillRectangle (dpy, vt, gc,	1400	XFillRectangle (dpy, vt, gc,
1368	0, Row2Pixel (row - view_start),	1401	0, Row2Pixel (row - view_start),
1369	(unsigned int)width,	1402	(unsigned int)vt_width,
1370	(unsigned int)Height2Pixel (num));	1403	(unsigned int)Height2Pixel (num));
1371	gcvalue.foreground = pix_colors[Color_fg];	1404	gcvalue.foreground = pix_colors[Color_fg];
1372	XChangeGC (dpy, gc, GCForeground, &gcvalue);	1405	XChangeGC (dpy, gc, GCForeground, &gcvalue);
1373	}	1406	}
1374	}	1407	}
…		…
1396	/* ------------------------------------------------------------------------- */	1429	/* ------------------------------------------------------------------------- */
1397	/*	1430	/*
1398	* Fill the screen with `E's	1431	* Fill the screen with `E's
1399	* XTERM_SEQ: Screen Alignment Test: ESC # 8	1432	* XTERM_SEQ: Screen Alignment Test: ESC # 8
1400	*/	1433	*/
1401	void	1434	void ecb_cold
1402	rxvt_term::scr_E () NOTHROW	1435	rxvt_term::scr_E () NOTHROW
1403	{	1436	{
1404	rend_t fs;	1437	rend_t fs;
1405		1438
1406	want_refresh = 1;	1439	want_refresh = 1;
1407	ZERO_SCROLLBACK ();	1440	ZERO_SCROLLBACK ();
1408		1441
1409	num_scr_allow = 0;	1442	num_scr_allow = 0;
1410	selection_check (3);	1443
		1444	row_col_t pos;
		1445	pos.row = pos.col = 0;
		1446	if (ROWCOL_IS_AFTER (selection.end, pos))
		1447	CLEAR_SELECTION ();
1411		1448
1412	fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));	1449	fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1413	for (int row = nrow; row--; )	1450	for (int row = nrow; row--; )
1414	{	1451	{
1415	line_t &line = ROW(row);	1452	line_t &line = ROW(row);
…		…
1566	/* ------------------------------------------------------------------------- */	1603	/* ------------------------------------------------------------------------- */
1567	/*	1604	/*
1568	* Set the scrolling region	1605	* Set the scrolling region
1569	* XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r	1606	* XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1570	*/	1607	*/
1571	void	1608	void ecb_cold
1572	rxvt_term::scr_scroll_region (int top, int bot) NOTHROW	1609	rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1573	{	1610	{
1574	max_it (top, 0);	1611	max_it (top, 0);
1575	min_it (bot, nrow - 1);	1612	min_it (bot, nrow - 1);
1576		1613
…		…
1586	/*	1623	/*
1587	* Make the cursor visible/invisible	1624	* Make the cursor visible/invisible
1588	* XTERM_SEQ: Make cursor visible : ESC [ ? 25 h	1625	* XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1589	* XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l	1626	* XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1590	*/	1627	*/
1591	void	1628	void ecb_cold
1592	rxvt_term::scr_cursor_visible (int mode) NOTHROW	1629	rxvt_term::scr_cursor_visible (int mode) NOTHROW
1593	{	1630	{
1594	want_refresh = 1;	1631	want_refresh = 1;
1595		1632
1596	if (mode)	1633	if (mode)
…		…
1603	/*	1640	/*
1604	* Set/unset automatic wrapping	1641	* Set/unset automatic wrapping
1605	* XTERM_SEQ: Set Wraparound : ESC [ ? 7 h	1642	* XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1606	* XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l	1643	* XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1607	*/	1644	*/
1608	void	1645	void ecb_cold
1609	rxvt_term::scr_autowrap (int mode) NOTHROW	1646	rxvt_term::scr_autowrap (int mode) NOTHROW
1610	{	1647	{
1611	if (mode)	1648	if (mode)
1612	screen.flags |= Screen_Autowrap;	1649	screen.flags |= Screen_Autowrap;
1613	else	1650	else
…		…
1622	* Relative mode: line numbers are relative to top margin of scrolling region	1659	* Relative mode: line numbers are relative to top margin of scrolling region
1623	* and the cursor cannot be moved outside.	1660	* and the cursor cannot be moved outside.
1624	* XTERM_SEQ: Set Absolute: ESC [ ? 6 h	1661	* XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1625	* XTERM_SEQ: Set Relative: ESC [ ? 6 l	1662	* XTERM_SEQ: Set Relative: ESC [ ? 6 l
1626	*/	1663	*/
1627	void	1664	void ecb_cold
1628	rxvt_term::scr_relative_origin (int mode) NOTHROW	1665	rxvt_term::scr_relative_origin (int mode) NOTHROW
1629	{	1666	{
1630	if (mode)	1667	if (mode)
1631	screen.flags |= Screen_Relative;	1668	screen.flags |= Screen_Relative;
1632	else	1669	else
…		…
1639	/*	1676	/*
1640	* Set insert/replace mode	1677	* Set insert/replace mode
1641	* XTERM_SEQ: Set Insert mode : ESC [ ? 4 h	1678	* XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1642	* XTERM_SEQ: Set Replace mode: ESC [ ? 4 l	1679	* XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1643	*/	1680	*/
1644	void	1681	void ecb_cold
1645	rxvt_term::scr_insert_mode (int mode) NOTHROW	1682	rxvt_term::scr_insert_mode (int mode) NOTHROW
1646	{	1683	{
1647	if (mode)	1684	if (mode)
1648	screen.flags |= Screen_Insert;	1685	screen.flags |= Screen_Insert;
1649	else	1686	else
…		…
1655	* Set/Unset tabs	1692	* Set/Unset tabs
1656	* XTERM_SEQ: Set tab at current column : ESC H	1693	* XTERM_SEQ: Set tab at current column : ESC H
1657	* XTERM_SEQ: Clear tab at current column: ESC [ 0 g	1694	* XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1658	* XTERM_SEQ: Clear all tabs : ESC [ 3 g	1695	* XTERM_SEQ: Clear all tabs : ESC [ 3 g
1659	*/	1696	*/
1660	void	1697	void ecb_cold
1661	rxvt_term::scr_set_tab (int mode) NOTHROW	1698	rxvt_term::scr_set_tab (int mode) NOTHROW
1662	{	1699	{
1663	if (mode < 0)	1700	if (mode < 0)
1664	memset (tabs, 0, ncol);	1701	memset (tabs, 0, ncol);
1665	else if (screen.cur.col < ncol)	1702	else if (screen.cur.col < ncol)
…		…
1684	if (rvideo_state != on)	1721	if (rvideo_state != on)
1685	{	1722	{
1686	rvideo_state = on;	1723	rvideo_state = on;
1687		1724
1688	::swap (pix_colors[Color_fg], pix_colors[Color_bg]);	1725	::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1689	#ifdef HAVE_BG_PIXMAP	1726	#ifdef HAVE_IMG
1690	if (bg_pixmap == None)	1727	if (bg_img == 0)
1691	#endif	1728	#endif
1692	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);	1729	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1693		1730
1694	XGCValues gcvalue;	1731	XGCValues gcvalue;
1695	gcvalue.foreground = pix_colors[Color_fg];	1732	gcvalue.foreground = pix_colors[Color_fg];
…		…
1704	/* ------------------------------------------------------------------------- */	1741	/* ------------------------------------------------------------------------- */
1705	/*	1742	/*
1706	* Report current cursor position	1743	* Report current cursor position
1707	* XTERM_SEQ: Report position: ESC [ 6 n	1744	* XTERM_SEQ: Report position: ESC [ 6 n
1708	*/	1745	*/
1709	void	1746	void ecb_cold
1710	rxvt_term::scr_report_position () NOTHROW	1747	rxvt_term::scr_report_position () NOTHROW
1711	{	1748	{
1712	tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);	1749	tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1713	}	1750	}
1714		1751
…		…
1717	* ------------------------------------------------------------------------- */	1754	* ------------------------------------------------------------------------- */
1718		1755
1719	/*	1756	/*
1720	* Set font style	1757	* Set font style
1721	*/	1758	*/
1722	void	1759	void ecb_cold
1723	rxvt_term::set_font_style () NOTHROW	1760	rxvt_term::set_font_style () NOTHROW
1724	{	1761	{
1725	#if 0	1762	#if 0
1726	switch (charsets [screen.charset])	1763	switch (charsets [screen.charset])
1727	{	1764	{
…		…
1749	* XTERM_SEQ: Invoke G0 character set: CTRL-O	1786	* XTERM_SEQ: Invoke G0 character set: CTRL-O
1750	* XTERM_SEQ: Invoke G1 character set: CTRL-N	1787	* XTERM_SEQ: Invoke G1 character set: CTRL-N
1751	* XTERM_SEQ: Invoke G2 character set: ESC N	1788	* XTERM_SEQ: Invoke G2 character set: ESC N
1752	* XTERM_SEQ: Invoke G3 character set: ESC O	1789	* XTERM_SEQ: Invoke G3 character set: ESC O
1753	*/	1790	*/
1754	void	1791	void ecb_cold
1755	rxvt_term::scr_charset_choose (int set) NOTHROW	1792	rxvt_term::scr_charset_choose (int set) NOTHROW
1756	{	1793	{
1757	screen.charset = set;	1794	screen.charset = set;
1758	set_font_style ();	1795	set_font_style ();
1759	}	1796	}
…		…
1780	* ------------------------------------------------------------------------- */	1817	* ------------------------------------------------------------------------- */
1781		1818
1782	/*	1819	/*
1783	* refresh matching text.	1820	* refresh matching text.
1784	*/	1821	*/
1785	bool	1822	bool ecb_cold
1786	rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW	1823	rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1787	{	1824	{
1788	bool found = false;	1825	bool found = false;
1789		1826
1790	for (int i = 0; i < nrow; i++)	1827	for (int i = 0; i < nrow; i++)
…		…
1809	PART_BEG = 0,	1846	PART_BEG = 0,
1810	PART_END,	1847	PART_END,
1811	RC_COUNT	1848	RC_COUNT
1812	};	1849	};
1813		1850
1814	void	1851	void ecb_hot
1815	rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW	1852	rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1816	{	1853	{
1817	int i;	1854	int i;
1818	row_col_t rc[RC_COUNT];	1855	row_col_t rc[RC_COUNT];
1819		1856
…		…
1856	* Refresh the entire screen	1893	* Refresh the entire screen
1857	*/	1894	*/
1858	void	1895	void
1859	rxvt_term::scr_touch (bool refresh) NOTHROW	1896	rxvt_term::scr_touch (bool refresh) NOTHROW
1860	{	1897	{
1861	scr_expose (0, 0, width, height, refresh);	1898	scr_expose (0, 0, vt_width, vt_height, refresh);
1862	}	1899	}
1863		1900
1864	/* ------------------------------------------------------------------------- */	1901	/* ------------------------------------------------------------------------- */
1865	/*	1902	/*
1866	* Move the display so that the line represented by scrollbar value Y is at	1903	* Move the display so that the line represented by scrollbar value Y is at
…		…
1922		1959
1923	# ifndef NO_MAPALERT	1960	# ifndef NO_MAPALERT
1924	# ifdef MAPALERT_OPTION	1961	# ifdef MAPALERT_OPTION
1925	if (option (Opt_mapAlert))	1962	if (option (Opt_mapAlert))
1926	# endif	1963	# endif
1927	XMapWindow (dpy, parent[0]);	1964	XMapWindow (dpy, parent);
1928	# endif	1965	# endif
1929		1966
1930	# if ENABLE_FRILLS	1967	# if ENABLE_FRILLS
1931	if (option (Opt_urgentOnBell))	1968	if (option (Opt_urgentOnBell))
1932	set_urgency (1);	1969	set_urgency (1);
…		…
1945	HOOK_INVOKE ((this, HOOK_BELL, DT_END));	1982	HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1946	#endif	1983	#endif
1947	}	1984	}
1948		1985
1949	/* ------------------------------------------------------------------------- */	1986	/* ------------------------------------------------------------------------- */
1950	/* ARGSUSED */	1987	void ecb_cold
1951	void
1952	rxvt_term::scr_printscreen (int fullhist) NOTHROW	1988	rxvt_term::scr_printscreen (int fullhist) NOTHROW
1953	{	1989	{
1954	#ifdef PRINTPIPE	1990	#ifdef PRINTPIPE
1955	int nrows, row_start;	1991	int nrows, row_start;
1956	FILE *fd = popen_printer ();	1992	FILE *fd = popen_printer ();
…		…
2005	/*	2041	/*
2006	* Refresh the screen	2042	* Refresh the screen
2007	* drawn_text/drawn_rend contain the screen information before the update.	2043	* drawn_text/drawn_rend contain the screen information before the update.
2008	* screen.text/screen.rend contain what the screen will change to.	2044	* screen.text/screen.rend contain what the screen will change to.
2009	*/	2045	*/
2010	void	2046	void ecb_hot
2011	rxvt_term::scr_refresh () NOTHROW	2047	rxvt_term::scr_refresh () NOTHROW
2012	{	2048	{
2013	int16_t col, row, /* column/row we're processing */	2049	int16_t col, row, /* column/row we're processing */
2014	ocrow; /* old cursor row */	2050	ocrow; /* old cursor row */
2015	int i; /* tmp */	2051	int i; /* tmp */
2016	#ifndef NO_CURSORCOLOR
2017	rend_t cc1; /* store colours at cursor position (s) */
2018	#endif
2019	rend_t *crp; // cursor rendition pointer
2020	rend_t ccol1, /* Cursor colour */	2052	rend_t ccol1, /* Cursor colour */
2021	ccol2; /* Cursor colour2 */	2053	ccol2; /* Cursor colour2 */
		2054	rend_t cur_rend;
		2055	int cur_col;
2022		2056
2023	want_refresh = 0; /* screen is current */	2057	want_refresh = 0; /* screen is current */
2024		2058
2025	if (refresh_type == NO_REFRESH || !mapped)	2059	if (refresh_type == NO_REFRESH || !mapped)
2026	return;	2060	return;
…		…
2029	* A: set up vars	2063	* A: set up vars
2030	*/	2064	*/
2031	refresh_count = 0;	2065	refresh_count = 0;
2032		2066
2033	unsigned int old_screen_flags = screen.flags;	2067	unsigned int old_screen_flags = screen.flags;
2034	char have_bg = 0;	2068	bool have_bg = 0;
2035	#ifdef HAVE_BG_PIXMAP	2069	#ifdef HAVE_IMG
2036	have_bg = bg_pixmap != None;	2070	have_bg = bg_img != 0;
2037	#endif	2071	#endif
2038	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */	2072	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2039		2073
2040	/*	2074	/*
2041	* B: reverse any characters which are selected	2075	* B: reverse any characters which are selected
…		…
2045	HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));	2079	HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2046	#if ENABLE_OVERLAY	2080	#if ENABLE_OVERLAY
2047	scr_swap_overlay ();	2081	scr_swap_overlay ();
2048	#endif	2082	#endif
2049		2083
2050	char showcursor = screen.flags & Screen_VisibleCursor;	2084	bool showcursor = screen.flags & Screen_VisibleCursor;
2051		2085
2052	/*	2086	/*
2053	* C: set the cursor character (s)	2087	* C: set the cursor character (s)
2054	*/	2088	*/
2055	{	2089	{
2056	unsigned char setoldcursor;	2090	bool setoldcursor;
2057		2091
2058	#ifdef CURSOR_BLINK	2092	#ifdef CURSOR_BLINK
2059	if (hidden_cursor)	2093	if (hidden_cursor)
2060	showcursor = 0;	2094	showcursor = 0;
2061	#endif	2095	#endif
…		…
2065	int col = screen.cur.col;	2099	int col = screen.cur.col;
2066		2100
2067	while (col && ROW(screen.cur.row).t[col] == NOCHAR)	2101	while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2068	col--;	2102	col--;
2069		2103
2070	crp = &ROW(screen.cur.row).r[col];	2104	cur_rend = ROW(screen.cur.row).r[col];
		2105	cur_col = col;
2071		2106
2072	#ifndef NO_CURSORCOLOR	2107	#ifndef NO_CURSORCOLOR
2073	cc1 = *crp & (RS_fgMask | RS_bgMask);
2074	if (ISSET_PIXCOLOR (Color_cursor))	2108	if (ISSET_PIXCOLOR (Color_cursor))
2075	ccol1 = Color_cursor;	2109	ccol1 = Color_cursor;
2076	else	2110	else
2077	#endif	2111	#endif
2078	#ifdef CURSOR_COLOR_IS_RENDITION_COLOR	2112	#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
…		…
2092	ccol2 = Color_bg;	2126	ccol2 = Color_bg;
2093	#endif	2127	#endif
2094		2128
2095	if (focus)	2129	if (focus)
2096	{	2130	{
		2131	rend_t rend = cur_rend;
		2132
2097	if (option (Opt_cursorUnderline))	2133	if (option (Opt_cursorUnderline))
2098	*crp ^= RS_Uline;	2134	rend ^= RS_Uline;
2099	else	2135	else
2100	{	2136	{
2101	*crp ^= RS_RVid;	2137	rend ^= RS_RVid;
2102	*crp = SET_FGCOLOR (*crp, ccol1);	2138	rend = SET_FGCOLOR (rend, ccol1);
2103	*crp = SET_BGCOLOR (*crp, ccol2);	2139	rend = SET_BGCOLOR (rend, ccol2);
2104	}	2140	}
		2141
		2142	scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
2105	}	2143	}
2106	}	2144	}
2107		2145
2108	/* make sure no outline cursor is left around */	2146	/* make sure no outline cursor is left around */
2109	setoldcursor = 0;	2147	setoldcursor = 0;
…		…
2148	{	2186	{
2149	int16_t nits;	2187	int16_t nits;
2150	int i = num_scr;	2188	int i = num_scr;
2151	int j;	2189	int j;
2152	int len, wlen;	2190	int len, wlen;
2153	dLocal (int, num_scr);
2154		2191
2155	j = nrow;	2192	j = nrow;
2156	wlen = len = -1;	2193	wlen = len = -1;
2157	row = i > 0 ? 0 : j - 1;	2194	row = i > 0 ? 0 : j - 1;
2158		2195
…		…
2233	continue;	2270	continue;
2234		2271
2235	// redraw one or more characters	2272	// redraw one or more characters
2236		2273
2237	// seek to the beginning of wide characters	2274	// seek to the beginning of wide characters
2238	while (expect_false (stp[col] == NOCHAR && col > 0))	2275	while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2239	--col;	2276	--col;
2240		2277
2241	rend_t rend = srp[col]; /* screen rendition (target rendition) */	2278	rend_t rend = srp[col]; /* screen rendition (target rendition) */
2242	text_t *text = stp + col;	2279	text_t *text = stp + col;
2243	int count = 1;	2280	int count = 1;
…		…
2281		2318
2282	col--; /* went one too far. move back */	2319	col--; /* went one too far. move back */
2283	count -= i; /* dump any matching trailing chars */	2320	count -= i; /* dump any matching trailing chars */
2284		2321
2285	// sometimes we optimize away the trailing NOCHAR's, add them back	2322	// sometimes we optimize away the trailing NOCHAR's, add them back
2286	while (expect_false (i && text[count] == NOCHAR))	2323	while (ecb_unlikely (i && text[count] == NOCHAR))
2287	count++, i--;	2324	count++, i--;
2288		2325
2289	/*	2326	/*
2290	* Determine the attributes for the string	2327	* Determine the attributes for the string
2291	*/	2328	*/
2292	int fore = fgcolor_of (rend); // desired foreground	2329	int fore = fgcolor_of (rend); // desired foreground
2293	int back = bgcolor_of (rend); // desired background	2330	int back = bgcolor_of (rend); // desired background
2294		2331
2295	// only do special processing if any attributes are set, which is unlikely	2332	// only do special processing if any attributes are set, which is unlikely
2296	if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))	2333	if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2297	{	2334	{
2298	bool invert = rend & RS_RVid;	2335	bool invert = rend & RS_RVid;
2299		2336
2300	#ifndef NO_BOLD_UNDERLINE_REVERSE	2337	#ifndef NO_BOLD_UNDERLINE_REVERSE
2301	if (rend & RS_Bold && fore == Color_fg)	2338	if (rend & RS_Bold && fore == Color_fg)
…		…
2390	/*	2427	/*
2391	* Actually do the drawing of the string here	2428	* Actually do the drawing of the string here
2392	*/	2429	*/
2393	rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];	2430	rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2394		2431
2395	if (expect_true (have_bg && back == Color_bg))	2432	if (ecb_likely (have_bg && back == Color_bg))
2396	{	2433	{
2397	// this is very ugly, maybe push it into ->draw?	2434	// this is very ugly, maybe push it into ->draw?
2398		2435
2399	for (i = 0; i < count; i++) /* don't draw empty strings */	2436	for (i = 0; i < count; i++) /* don't draw empty strings */
2400	if (text[i] != ' ')	2437	if (text[i] != ' ')
…		…
2407	did_clear: ;	2444	did_clear: ;
2408	}	2445	}
2409	else	2446	else
2410	font->draw (*drawable, xpixel, ypixel, text, count, fore, back);	2447	font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2411		2448
2412	if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))	2449	if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2413	{	2450	{
2414	#if ENABLE_FRILLS	2451	#if ENABLE_FRILLS
2415	if (ISSET_PIXCOLOR (Color_underline))	2452	if (ISSET_PIXCOLOR (Color_underline))
2416	XSetForeground (dpy, gc, pix_colors[Color_underline]);	2453	XSetForeground (dpy, gc, pix_colors[Color_underline]);
2417	else	2454	else
…		…
2429	* G: cleanup cursor and display outline cursor if necessary	2466	* G: cleanup cursor and display outline cursor if necessary
2430	*/	2467	*/
2431	if (showcursor)	2468	if (showcursor)
2432	{	2469	{
2433	if (focus)	2470	if (focus)
2434	{	2471	scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend);
2435	if (option (Opt_cursorUnderline))
2436	*crp ^= RS_Uline;
2437	else
2438	{
2439	*crp ^= RS_RVid;
2440	#ifndef NO_CURSORCOLOR
2441	*crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2442	#endif
2443	}
2444	}
2445	else if (oldcursor.row >= 0)	2472	else if (oldcursor.row >= 0)
2446	{	2473	{
2447	int cursorwidth = 1;	2474	int cursorwidth = 1;
2448	int col = oldcursor.col;	2475	int col = oldcursor.col;
2449		2476
…		…
2463		2490
2464	XDrawRectangle (dpy, vt, gc,	2491	XDrawRectangle (dpy, vt, gc,
2465	Col2Pixel (col),	2492	Col2Pixel (col),
2466	Row2Pixel (oldcursor.row),	2493	Row2Pixel (oldcursor.row),
2467	(unsigned int) (Width2Pixel (cursorwidth) - 1),	2494	(unsigned int) (Width2Pixel (cursorwidth) - 1),
2468	(unsigned int) (Height2Pixel (1) - lineSpace - 1));	2495	(unsigned int) (Height2Pixel (1) - 1));
2469	}	2496	}
2470	}	2497	}
2471		2498
2472	/*	2499	/*
2473	* H: cleanup selection	2500	* H: cleanup selection
…		…
2482	screen.flags = old_screen_flags;	2509	screen.flags = old_screen_flags;
2483	num_scr = 0;	2510	num_scr = 0;
2484	num_scr_allow = 1;	2511	num_scr_allow = 1;
2485	}	2512	}
2486		2513
2487	void	2514	void ecb_cold
2488	rxvt_term::scr_remap_chars (line_t &l) NOTHROW	2515	rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2489	{	2516	{
2490	if (!l.t)	2517	if (!l.valid ())
2491	return;	2518	return;
2492		2519
2493	l.touch (); // maybe a bit of an overkill, but it's not performance-relevant	2520	l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2494		2521
2495	for (int i = ncol; i--; )	2522	for (int i = ncol; i--; )
2496	l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));	2523	l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2497	}	2524	}
2498		2525
2499	void	2526	void ecb_cold
2500	rxvt_term::scr_remap_chars () NOTHROW	2527	rxvt_term::scr_remap_chars () NOTHROW
2501	{	2528	{
2502	for (int i = total_rows; i--; )	2529	for (int i = total_rows; i--; )
2503	scr_remap_chars (row_buf [i]);	2530	scr_remap_chars (row_buf [i]);
2504		2531
…		…
2507	scr_remap_chars (drawn_buf [i]);	2534	scr_remap_chars (drawn_buf [i]);
2508	scr_remap_chars (swap_buf [i]);	2535	scr_remap_chars (swap_buf [i]);
2509	}	2536	}
2510	}	2537	}
2511		2538
2512	void	2539	void ecb_cold
2513	rxvt_term::scr_recolour (bool refresh) NOTHROW	2540	rxvt_term::scr_recolour (bool refresh) NOTHROW
2514	{	2541	{
2515	bool transparent = false;	2542	bool transparent = false;
2516		2543
2517	#ifdef HAVE_BG_PIXMAP	2544	#ifdef HAVE_IMG
2518	if (bg_pixmap != None)	2545	if (bg_img != 0)
2519	{	2546	{
2520	# ifdef ENABLE_TRANSPARENCY	2547	# if ENABLE_TRANSPARENCY
2521	if (bg_flags & BG_IS_TRANSPARENT)	2548	if (bg_flags & BG_IS_TRANSPARENT)
2522	{	2549	{
2523	XSetWindowBackgroundPixmap (dpy, parent[0], bg_pixmap);	2550	XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2524	XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);	2551	XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2525		2552
2526	transparent = true;	2553	transparent = true;
2527	}	2554	}
2528	else	2555	else
2529	# endif	2556	# endif
2530	{	2557	{
2531	XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);	2558	XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2532	XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);	2559	XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2533	}	2560	}
2534	}	2561	}
2535	else	2562	else
2536	#endif	2563	#endif
2537	{	2564	{
2538	XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);	2565	XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2539	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);	2566	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2540	}	2567	}
2541		2568
2542	XClearWindow (dpy, parent[0]);	2569	XClearWindow (dpy, parent);
2543		2570
2544	if (scrollBar.win)	2571	if (scrollBar.win)
2545	{	2572	{
2546	if (transparent)	2573	if (transparent)
2547	XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);	2574	XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2548	else	2575	else
2549	XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);	2576	XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2550	scrollBar.state = STATE_IDLE;	2577	scrollBar.state = SB_STATE_IDLE;
2551	scrollBar.show (0);	2578	scrollBar.show (0);
2552	}	2579	}
2553		2580
2554	if (refresh)	2581	if (refresh)
2555	{	2582	{
…		…
2620	for (rend_t *srp = ROW(row).r; col < end_col; col++)	2647	for (rend_t *srp = ROW(row).r; col < end_col; col++)
2621	srp[col] ^= rstyle;	2648	srp[col] ^= rstyle;
2622	}	2649	}
2623		2650
2624	/* ------------------------------------------------------------------------- */	2651	/* ------------------------------------------------------------------------- */
2625	void	2652	void ecb_hot
2626	rxvt_term::scr_reverse_selection () NOTHROW	2653	rxvt_term::scr_reverse_selection () NOTHROW
2627	{	2654	{
2628	if (selection.op	2655	if (selection.op
2629	&& current_screen == selection.screen	2656	&& current_screen == selection.screen
2630	&& selection.end.row >= view_start)	2657	&& selection.end.row >= view_start)
…		…
2649	*/	2676	*/
2650	#if 0	2677	#if 0
2651	void	2678	void
2652	rxvt_term::scr_dump (int fd) NOTHROW	2679	rxvt_term::scr_dump (int fd) NOTHROW
2653	{	2680	{
2654	int row, wrote;	2681	// if this method is needed, it can be implemented by factoring the
2655	unsigned int width, towrite;	2682	// relevant code in scr_printscreen
2656	const char r1[] = "\n";
2657
2658	for (row = saveLines + top_row;
2659	row < saveLines + nrow - 1; row++)
2660	{
2661	width = row_buf[row].l >= 0 ? row_buf[row].l
2662	: ncol;
2663	for (towrite = width; towrite; towrite -= wrote)
2664	{
2665	wrote = write (fd, & (row_buf[row].t[width - towrite]),
2666	towrite);
2667	if (wrote < 0)
2668	return; /* XXX: death, no report */
2669	}
2670	if (row_buf[row].l >= 0)
2671	if (write (fd, r1, 1) <= 0)
2672	return; /* XXX: death, no report */
2673	}
2674	}	2683	}
2675	#endif	2684	#endif
2676		2685
2677	/* ------------------------------------------------------------------------- *	2686	/* ------------------------------------------------------------------------- *
2678	* CHARACTER SELECTION *	2687	* CHARACTER SELECTION *
2679	* ------------------------------------------------------------------------- */	2688	* ------------------------------------------------------------------------- */
2680	void	2689	void
2681	rxvt_term::selection_check (int check_more) NOTHROW	2690	rxvt_term::selection_check (int check_more) NOTHROW
2682	{	2691	{
2683	row_col_t pos;
2684
2685	if (!selection.op)	2692	if (!selection.op)
2686	return;	2693	return;
2687		2694
2688	pos.row = pos.col = 0;
2689	if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)	2695	if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2690	|| !IN_RANGE_EXC (selection.mark.row, top_row, nrow)	2696	|| !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2691	|| !IN_RANGE_EXC (selection.end.row, top_row, nrow)	2697	|| !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2692	|| (check_more == 1	2698	|| (check_more == 1
2693	&& current_screen == selection.screen	2699	&& current_screen == selection.screen
2694	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)	2700	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2695	&& ROWCOL_IS_BEFORE (screen.cur, selection.end))	2701	&& ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2696	|| (check_more == 2
2697	&& ROWCOL_IS_BEFORE (selection.beg, pos)
2698	&& ROWCOL_IS_AFTER (selection.end, pos))
2699	|| (check_more == 3
2700	&& ROWCOL_IS_AFTER (selection.end, pos))
2701	|| (check_more == 4 /* screen width change */
2702	&& (selection.beg.row != selection.end.row
2703	|| selection.end.col > ncol)))
2704	CLEAR_SELECTION ();	2702	CLEAR_ALL_SELECTION ();
		2703	}
		2704
		2705	void
		2706	rxvt_term::selection_changed () NOTHROW
		2707	{
		2708	line_t &r1 = ROW (selection.beg.row);
		2709	while (selection.beg.col > 0 && r1.t [selection.beg.col] == NOCHAR)
		2710	--selection.beg.col;
		2711
		2712	line_t &r2 = ROW (selection.end.row);
		2713	while (selection.end.col < r2.l && r2.t [selection.end.col] == NOCHAR)
		2714	++selection.end.col;
		2715
		2716	want_refresh = 1;
2705	}	2717	}
2706		2718
2707	/* ------------------------------------------------------------------------- */	2719	/* ------------------------------------------------------------------------- */
2708	/*	2720	/*
2709	* Paste a selection direct to the command fd	2721	* Paste a selection direct to the command fd
…		…
2715	for (unsigned int i = 0; i < len; i++)	2727	for (unsigned int i = 0; i < len; i++)
2716	if (data[i] == C0_LF)	2728	if (data[i] == C0_LF)
2717	data[i] = C0_CR;	2729	data[i] = C0_CR;
2718		2730
2719	if (priv_modes & PrivMode_BracketPaste)	2731	if (priv_modes & PrivMode_BracketPaste)
2720	tt_printf ("\e[200~");	2732	tt_printf ("\x1b[200~");
2721		2733
2722	tt_write (data, len);	2734	tt_write (data, len);
2723		2735
2724	if (priv_modes & PrivMode_BracketPaste)	2736	if (priv_modes & PrivMode_BracketPaste)
2725	tt_printf ("\e[201~");	2737	tt_printf ("\x1b[201~");
2726	}	2738	}
2727		2739
2728	void	2740	void
2729	rxvt_term::paste (char *data, unsigned int len) NOTHROW	2741	rxvt_term::paste (char *data, unsigned int len) NOTHROW
2730	{	2742	{
…		…
2734	tt_paste (data, len);	2746	tt_paste (data, len);
2735	}	2747	}
2736		2748
2737	/* ------------------------------------------------------------------------- */	2749	/* ------------------------------------------------------------------------- */
2738	/*	2750	/*
2739	* Respond to a notification that a primary selection has been sent	2751	* Request PRIMARY, SECONDARY or CLIPBOARD selection.
2740	* EXT: SelectionNotify	2752	* if the requested selection has no owner or is empty CUT_BUFFER0 is used
2741	*/	2753	* as fallback
2742	void
2743	rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2744	{
2745	if (prop == None) /* check for failed XConvertSelection */
2746	{
2747	int selnum = selection_type & Sel_whereMask;
2748
2749	if (selnum == Sel_direct)
2750	selection_type = 0;
2751
2752	if ((selection_type & Sel_CompoundText))
2753	{
2754	selection_type = 0;
2755	selection_request_other (XA_STRING, selnum);
2756	}
2757
2758	if ((selection_type & Sel_UTF8String))
2759	{
2760	selection_type = Sel_CompoundText;
2761	selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2762	}
2763
2764	return;
2765	}
2766
2767	unsigned long bytes_after;
2768	XTextProperty ct;
2769
2770	if (XGetWindowProperty (dpy, win, prop,
2771	0, PROP_SIZE / 4,
2772	delete_prop, AnyPropertyType,
2773	&ct.encoding, &ct.format,
2774	&ct.nitems, &bytes_after,
2775	&ct.value) != Success)
2776	{
2777	ct.value = 0;
2778	goto bailout;
2779	}
2780
2781	if (ct.encoding == None)
2782	goto bailout;
2783
2784	if (bytes_after)
2785	{
2786	// fetch and append remaining data
2787	XTextProperty ct2;
2788
2789	if (XGetWindowProperty (dpy, win, prop,
2790	ct.nitems / 4, (bytes_after + 3) / 4,
2791	delete_prop, AnyPropertyType,
2792	&ct2.encoding, &ct2.format,
2793	&ct2.nitems, &bytes_after,
2794	&ct2.value) != Success)
2795	goto bailout;
2796
2797	// realloc should be compatible to XFree, here, and elsewhere, too
2798	ct.value = (unsigned char *)rxvt_realloc (ct.value, ct.nitems + ct2.nitems + 1);
2799	memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2800	ct.nitems += ct2.nitems;
2801
2802	XFree (ct2.value);
2803	}
2804
2805	if (ct.value == 0)
2806	goto bailout;
2807
2808	if (ct.encoding == xa[XA_INCR])
2809	{
2810	// INCR selection, start handshake
2811	if (!delete_prop)
2812	XDeleteProperty (dpy, win, prop);
2813
2814	selection_wait = Sel_incr;
2815	incr_buf_fill = 0;
2816	incr_ev.start (10);
2817
2818	goto bailout;
2819	}
2820
2821	if (ct.nitems == 0)
2822	{
2823	if (selection_wait == Sel_incr)
2824	{
2825	XFree (ct.value);
2826
2827	// finally complete, now paste the whole thing
2828	selection_wait = Sel_normal;
2829	ct.value = (unsigned char *)incr_buf;
2830	ct.nitems = incr_buf_fill;
2831	incr_buf = 0;
2832	incr_buf_size = 0;
2833	incr_ev.stop ();
2834	}
2835	else
2836	{
2837	if (selection_wait == Sel_normal
2838	&& (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2839	{
2840	/*
2841	* pass through again trying CUT_BUFFER0 if we've come from
2842	* XConvertSelection () but nothing was presented
2843	*/
2844	selection_paste (display->root, XA_CUT_BUFFER0, False);
2845	}
2846
2847	goto bailout;
2848	}
2849	}
2850	else if (selection_wait == Sel_incr)
2851	{
2852	incr_ev.start (10);
2853
2854	while (incr_buf_fill + ct.nitems > incr_buf_size)
2855	{
2856	incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2857	incr_buf = (char *)rxvt_realloc (incr_buf, incr_buf_size);
2858	}
2859
2860	memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2861	incr_buf_fill += ct.nitems;
2862
2863	goto bailout;
2864	}
2865
2866	char **cl;
2867	int cr;
2868
2869	#if !ENABLE_MINIMAL
2870	// xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2871	// so recode it manually
2872	if (ct.encoding == xa[XA_UTF8_STRING])
2873	{
2874	wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2875	char *s = rxvt_wcstombs (w);
2876	free (w);
2877	// TODO: strlen == only the first element will be converted. well...
2878	paste (s, strlen (s));
2879	free (s);
2880	}
2881	else
2882	#endif
2883	if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2884	&& cl)
2885	{
2886	for (int i = 0; i < cr; i++)
2887	paste (cl[i], strlen (cl[i]));
2888
2889	XFreeStringList (cl);
2890	}
2891	else
2892	paste ((char *)ct.value, ct.nitems); // paste raw
2893
2894	bailout:
2895	XFree (ct.value);
2896
2897	if (selection_wait == Sel_normal)
2898	selection_wait = Sel_none;
2899	}
2900
2901	void
2902	rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2903	{
2904	selection_wait = Sel_none;
2905
2906	incr_buf_size = 0;
2907	free (incr_buf);
2908
2909	rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2910	}
2911
2912	void
2913	rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2914	{
2915	if (prop == None || selection_wait != Sel_incr)
2916	return;
2917
2918	selection_paste (win, prop, true);
2919	}
2920
2921	/* ------------------------------------------------------------------------- */
2922	/*
2923	* Request the current selection:
2924	* Order: > internal selection if available
2925	* > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2926	* > CUT_BUFFER0
2927	* (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2928	* will auto fallback to CUT_BUFFER0
2929	* EXT: button 2 release	2754	* EXT: button 2 release
2930	*/	2755	*/
2931	void	2756	void
2932	rxvt_term::selection_request (Time tm, int selnum) NOTHROW	2757	rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2933	{	2758	{
2934	if (selection.text && selnum == Sel_Primary)	2759	if (!selection_req)
2935	{
2936	/* internal selection */
2937	char *str = rxvt_wcstombs (selection.text, selection.len);
2938	paste (str, strlen (str));
2939	free (str);
2940	return;
2941	}	2760	{
2942	else	2761	selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
		2762	selection_req->run ();
2943	{	2763	}
2944	selection_request_time = tm;
2945	selection_wait = Sel_normal;
2946
2947	#if X_HAVE_UTF8_STRING
2948	selection_type = Sel_UTF8String;
2949	if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2950	return;
2951	#else
2952	selection_type = Sel_CompoundText;
2953	if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2954	return;
2955	#endif
2956	}
2957
2958	selection_wait = Sel_none; /* don't loop in selection_paste () */
2959	selection_paste (display->root, XA_CUT_BUFFER0, false);
2960	}
2961
2962	int
2963	rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2964	{
2965	Atom sel;
2966
2967	selection_type |= selnum;
2968
2969	if (selnum == Sel_Primary)
2970	sel = XA_PRIMARY;
2971	else if (selnum == Sel_Secondary)
2972	sel = XA_SECONDARY;
2973	else
2974	sel = xa[XA_CLIPBOARD];
2975
2976	if (XGetSelectionOwner (dpy, sel) != None)
2977	{
2978	XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2979	vt, selection_request_time);
2980	return 1;
2981	}
2982
2983	return 0;
2984	}	2764	}
2985		2765
2986	/* ------------------------------------------------------------------------- */	2766	/* ------------------------------------------------------------------------- */
2987	/*	2767	/*
2988	* Clear all selected text	2768	* Clear all selected text
…		…
3182	/* ------------------------------------------------------------------------- */	2962	/* ------------------------------------------------------------------------- */
3183	/*	2963	/*
3184	* Mark or select text based upon number of clicks: 1, 2, or 3	2964	* Mark or select text based upon number of clicks: 1, 2, or 3
3185	* EXT: button 1 press	2965	* EXT: button 1 press
3186	*/	2966	*/
3187	void	2967	void ecb_cold
3188	rxvt_term::selection_click (int clicks, int x, int y) NOTHROW	2968	rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3189	{	2969	{
3190	clicks = ((clicks - 1) % 3) + 1;	2970	clicks = ((clicks - 1) % 3) + 1;
3191	selection.clicks = clicks; /* save clicks so extend will work */	2971	selection.clicks = clicks; /* save clicks so extend will work */
3192		2972
…		…
3211		2991
3212	/* ------------------------------------------------------------------------- */	2992	/* ------------------------------------------------------------------------- */
3213	/*	2993	/*
3214	* Mark a selection at the specified col/row	2994	* Mark a selection at the specified col/row
3215	*/	2995	*/
3216	void	2996	void ecb_cold
3217	rxvt_term::selection_start_colrow (int col, int row) NOTHROW	2997	rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3218	{	2998	{
3219	want_refresh = 1;	2999	want_refresh = 1;
3220		3000
3221	selection.mark.row = row + view_start;	3001	selection.mark.row = row + view_start;
…		…
3244	* Word select: select text for 2 clicks	3024	* Word select: select text for 2 clicks
3245	* We now only find out the boundary in one direction	3025	* We now only find out the boundary in one direction
3246	*/	3026	*/
3247		3027
3248	/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */	3028	/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3249	#define DELIMIT_TEXT(x) \	3029	#define DELIMIT_TEXT(x) \
3250	(unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))	3030	(unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3251	#define DELIMIT_REND(x) 1	3031	#define DELIMIT_REND(x) 1
3252		3032
3253	void	3033	void ecb_cold
3254	rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW	3034	rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3255	{	3035	{
3256	int col, row, dirnadd, tcol, trow, w1, w2;	3036	int col, row, dirnadd, tcol, trow, w1, w2;
3257	row_col_t bound;	3037	row_col_t bound;
3258	text_t *stp;	3038	text_t *stp;
…		…
3332	* EXT: button 3 press; button 1 or 3 drag	3112	* EXT: button 3 press; button 1 or 3 drag
3333	* flag == 0 ==> button 1	3113	* flag == 0 ==> button 1
3334	* flag == 1 ==> button 3 press	3114	* flag == 1 ==> button 3 press
3335	* flag == 2 ==> button 3 motion	3115	* flag == 2 ==> button 3 motion
3336	*/	3116	*/
3337	void	3117	void ecb_cold
3338	rxvt_term::selection_extend (int x, int y, int flag) NOTHROW	3118	rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3339	{	3119	{
3340	int col = clamp (Pixel2Col (x), 0, ncol);	3120	int col = clamp (Pixel2Col (x), 0, ncol);
3341	int row = clamp (Pixel2Row (y), 0, nrow - 1);	3121	int row = clamp (Pixel2Row (y), 0, nrow - 1);
3342		3122
…		…
3368		3148
3369	/* ------------------------------------------------------------------------- */	3149	/* ------------------------------------------------------------------------- */
3370	/*	3150	/*
3371	* Extend the selection to the specified col/row	3151	* Extend the selection to the specified col/row
3372	*/	3152	*/
3373	void	3153	void ecb_cold
3374	rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW	3154	rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3375	{	3155	{
3376	row_col_t pos;	3156	row_col_t pos;
3377	enum {	3157	enum {
3378	LEFT, RIGHT	3158	LEFT, RIGHT
3379	} closeto = RIGHT;	3159	} closeto = RIGHT;
3380
3381	want_refresh = 1;
3382		3160
3383	switch (selection.op)	3161	switch (selection.op)
3384	{	3162	{
3385	case SELECTION_INIT:	3163	case SELECTION_INIT:
3386	CLEAR_SELECTION ();	3164	CLEAR_SELECTION ();
…		…
3566		3344
3567	#if !ENABLE_MINIMAL	3345	#if !ENABLE_MINIMAL
3568	if (selection.rect && selection.beg.col > selection.end.col)	3346	if (selection.rect && selection.beg.col > selection.end.col)
3569	::swap (selection.beg.col, selection.end.col);	3347	::swap (selection.beg.col, selection.end.col);
3570	#endif	3348	#endif
		3349
		3350	selection_changed ();
3571	}	3351	}
3572		3352
3573	#if !ENABLE_MINIMAL	3353	#if !ENABLE_MINIMAL
3574	void	3354	void ecb_cold
3575	rxvt_term::selection_remove_trailing_spaces () NOTHROW	3355	rxvt_term::selection_remove_trailing_spaces () NOTHROW
3576	{	3356	{
3577	int32_t end_col, end_row;	3357	int32_t end_col, end_row;
3578	text_t *stp;	3358	text_t *stp;
3579		3359
…		…
3617	/* ------------------------------------------------------------------------- */	3397	/* ------------------------------------------------------------------------- */
3618	/*	3398	/*
3619	* Double click on button 3 when already selected	3399	* Double click on button 3 when already selected
3620	* EXT: button 3 double click	3400	* EXT: button 3 double click
3621	*/	3401	*/
3622	void	3402	void ecb_cold
3623	rxvt_term::selection_rotate (int x, int y) NOTHROW	3403	rxvt_term::selection_rotate (int x, int y) NOTHROW
3624	{	3404	{
3625	selection.clicks = selection.clicks % 3 + 1;	3405	selection.clicks = selection.clicks % 3 + 1;
3626	selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);	3406	selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3627	}	3407	}
…		…
3629	/* ------------------------------------------------------------------------- */	3409	/* ------------------------------------------------------------------------- */
3630	/*	3410	/*
3631	* Respond to a request for our current selection	3411	* Respond to a request for our current selection
3632	* EXT: SelectionRequest	3412	* EXT: SelectionRequest
3633	*/	3413	*/
3634	void	3414	void ecb_cold
3635	rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW	3415	rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3636	{	3416	{
		3417	Atom property = rq.property == None ? rq.target : rq.property;
3637	XSelectionEvent ev;	3418	XSelectionEvent ev;
3638		3419
3639	ev.type = SelectionNotify;	3420	ev.type = SelectionNotify;
3640	ev.property = None;	3421	ev.property = None;
3641	ev.display = rq.display;	3422	ev.display = rq.display;
…		…
3656	*target++ = xa[XA_COMPOUND_TEXT];	3437	*target++ = xa[XA_COMPOUND_TEXT];
3657	#if X_HAVE_UTF8_STRING	3438	#if X_HAVE_UTF8_STRING
3658	*target++ = xa[XA_UTF8_STRING];	3439	*target++ = xa[XA_UTF8_STRING];
3659	#endif	3440	#endif
3660		3441
3661	XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,	3442	XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3662	32, PropModeReplace,	3443	32, PropModeReplace,
3663	(unsigned char *)target_list, target - target_list);	3444	(unsigned char *)target_list, target - target_list);
3664	ev.property = rq.property;	3445	ev.property = property;
3665	}	3446	}
3666	#if TODO // TODO	3447	#if TODO // TODO
3667	else if (rq.target == xa[XA_MULTIPLE])	3448	else if (rq.target == xa[XA_MULTIPLE])
3668	{	3449	{
3669	/* TODO: Handle MULTIPLE */	3450	/* TODO: Handle MULTIPLE */
3670	}	3451	}
3671	#endif	3452	#endif
3672	else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)	3453	else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3673	{	3454	{
3674	XChangeProperty (dpy, rq.requestor, rq.property, rq.target,	3455	XChangeProperty (dpy, rq.requestor, property, rq.target,
3675	32, PropModeReplace, (unsigned char *)&selection_time, 1);	3456	32, PropModeReplace, (unsigned char *)&selection_time, 1);
3676	ev.property = rq.property;	3457	ev.property = property;
3677	}	3458	}
3678	else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)	3459	else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3679	{	3460	{
3680	XChangeProperty (dpy, rq.requestor, rq.property, rq.target,	3461	XChangeProperty (dpy, rq.requestor, property, rq.target,
3681	32, PropModeReplace, (unsigned char *)&clipboard_time, 1);	3462	32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3682	ev.property = rq.property;	3463	ev.property = property;
3683	}	3464	}
3684	else if (rq.target == XA_STRING	3465	else if (rq.target == XA_STRING
3685	|| rq.target == xa[XA_TEXT]	3466	|| rq.target == xa[XA_TEXT]
3686	|| rq.target == xa[XA_COMPOUND_TEXT]	3467	|| rq.target == xa[XA_COMPOUND_TEXT]
3687	|| rq.target == xa[XA_UTF8_STRING]	3468	|| rq.target == xa[XA_UTF8_STRING]
…		…
3758	ct.value = (unsigned char *)cl;	3539	ct.value = (unsigned char *)cl;
3759	ct.nitems = selectlen;	3540	ct.nitems = selectlen;
3760	ct.encoding = target;	3541	ct.encoding = target;
3761	}	3542	}
3762		3543
3763	XChangeProperty (dpy, rq.requestor, rq.property,	3544	XChangeProperty (dpy, rq.requestor, property,
3764	ct.encoding, 8, PropModeReplace,	3545	ct.encoding, 8, PropModeReplace,
3765	ct.value, (int)ct.nitems);	3546	ct.value, (int)ct.nitems);
3766	ev.property = rq.property;	3547	ev.property = property;
3767		3548
3768	if (freect)	3549	if (freect)
3769	XFree (ct.value);	3550	XFree (ct.value);
3770	}	3551	}
3771		3552
3772	XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);	3553	XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3773	}	3554	}
3774		3555
3775	/* ------------------------------------------------------------------------- */	3556	/* ------------------------------------------------------------------------- */
3776	#ifdef USE_XIM	3557	#if USE_XIM
3777	void	3558	void ecb_cold
3778	rxvt_term::im_set_position (XPoint &pos) NOTHROW	3559	rxvt_term::im_set_position (XPoint &pos) NOTHROW
3779	{	3560	{
3780	XWindowAttributes xwa;	3561	XWindowAttributes xwa;
3781		3562
3782	XGetWindowAttributes (dpy, vt, &xwa);	3563	XGetWindowAttributes (dpy, vt, &xwa);

Diff Legend

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