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.383 by sf-exg, Fri Apr 29 13:08:24 2011 UTC vs.
Revision 1.459 by root, Tue Jun 25 03:35:01 2019 UTC

…		…
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 <schmorp@schmorp.de>	6	* Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de>
		7	* Copyright (c) 2015 Emanuele Giaquinta <e.giaquinta@glauco.it>
7	*	8	*
8	* This program is free software; you can redistribute it and/or modify	9	* 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	10	* 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	11	* the Free Software Foundation; either version 3 of the License, or
11	* (at your option) any later version.	12	* (at your option) any later version.
12	*	13	*
13	* This program is distributed in the hope that it will be useful,	14	* This program is distributed in the hope that it will be useful,
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of	15	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	16	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
…		…
27	#include "../config.h" /* NECESSARY */	28	#include "../config.h" /* NECESSARY */
28	#include "rxvt.h" /* NECESSARY */	29	#include "rxvt.h" /* NECESSARY */
29	#include "rxvtperl.h" /* NECESSARY */	30	#include "rxvtperl.h" /* NECESSARY */
30		31
31	#include <inttypes.h>	32	#include <inttypes.h>
32
33	#include "salloc.C" // HACK, should be a separate compile!
34		33
35	static inline void	34	static inline void
36	fill_text (text_t *start, text_t value, int len)	35	fill_text (text_t *start, text_t value, int len)
37	{	36	{
38	while (len--)	37	while (len--)
…		…
98		97
99	/* Fill part/all of a line with blanks. */	98	/* Fill part/all of a line with blanks. */
100	void	99	void
101	rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW	100	rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW
102	{	101	{
103	if (!l.t)	102	if (!l.valid ())
104	{	103	{
105	lalloc (l);	104	l.alloc ();
106	col = 0;	105	col = 0;
107	width = ncol;	106	width = ncol;
108	}	107	}
109		108
110	l.touch ();	109	l.touch ();
…		…
152	l.r[col] = rend;	151	l.r[col] = rend;
153	col++;	152	col++;
154	} while (col < ncol && l.t[col] == NOCHAR);	153	} while (col < ncol && l.t[col] == NOCHAR);
155	}	154	}
156		155
		156	// set the rendition of a single wide character beginning at the given column
		157	void
		158	rxvt_term::scr_set_char_rend (line_t &l, int col, rend_t rend)
		159	{
		160	do {
		161	l.r[col] = rend;
		162	col++;
		163	} while (col < ncol && l.t[col] == NOCHAR);
		164	}
		165
157	/* ------------------------------------------------------------------------- *	166	/* ------------------------------------------------------------------------- *
158	* SCREEN INITIALISATION *	167	* SCREEN INITIALISATION *
159	* ------------------------------------------------------------------------- */	168	* ------------------------------------------------------------------------- */
160		169
161	void	170	void
		171	rxvt_term::scr_alloc () NOTHROW
		172	{
		173	int tsize = sizeof (text_t) * ncol;
		174	int rsize = sizeof (rend_t) * ncol;
		175
		176	// we assume that rend_t size is a sufficient alignment
		177	// factor for text_t and line_t values, and we only
		178	// need to adjust tsize.
		179	tsize = (tsize + sizeof (rend_t) - 1);
		180	tsize -= tsize % sizeof (rend_t);
		181
		182	int all_rows = total_rows + nrow + nrow;
		183
		184	chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows;
		185	chunk = chunk_alloc (chunk_size, 0);
		186
		187	char *base = (char *)chunk + sizeof (line_t) * all_rows;
		188
		189	for (int row = 0; row < all_rows; ++row)
		190	{
		191	line_t &l = ((line_t *)chunk) [row];
		192
		193	l.t = (text_t *)base; base += tsize;
		194	l.r = (rend_t *)base; base += rsize;
		195	l.l = -1;
		196	l.f = 0;
		197	}
		198
		199	drawn_buf = (line_t *)chunk;
		200	swap_buf = drawn_buf + nrow;
		201	row_buf = swap_buf + nrow;
		202	}
		203
		204	void
		205	rxvt_term::copy_line (line_t &dst, line_t &src)
		206	{
		207	scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
		208	dst.l = min (src.l, ncol);
		209	memcpy (dst.t, src.t, sizeof (text_t) * dst.l);
		210	memcpy (dst.r, src.r, sizeof (rend_t) * dst.l);
		211	dst.f = src.f;
		212	}
		213
		214	void ecb_cold
162	rxvt_term::scr_reset ()	215	rxvt_term::scr_reset ()
163	{	216	{
164	#if ENABLE_OVERLAY	217	#if ENABLE_OVERLAY
165	scr_overlay_off ();	218	scr_overlay_off ();
166	#endif	219	#endif
…		…
192	total_rows = nrow + saveLines;	245	total_rows = nrow + saveLines;
193		246
194	screen.tscroll = 0;	247	screen.tscroll = 0;
195	screen.bscroll = nrow - 1;	248	screen.bscroll = nrow - 1;
196		249
		250	void *prev_chunk = chunk;
		251	size_t prev_chunk_size = chunk_size;
		252	line_t *prev_drawn_buf = drawn_buf;
		253	line_t *prev_swap_buf = swap_buf;
		254	line_t *prev_row_buf = row_buf;
		255
		256	scr_alloc ();
		257
197	if (!row_buf)	258	if (!prev_row_buf)
198	{	259	{
199	/*
200	* first time called so just malloc everything: don't rely on realloc
201	*/
202	top_row = 0;	260	top_row = 0;
203	term_start = 0;	261	term_start = 0;
204
205	talloc = new rxvt_salloc (ncol * sizeof (text_t));
206	ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
207
208	row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
209	drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
210	swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
211
212	for (int row = nrow; row--; )
213	{
214	scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
215	scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
216	scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
217	}
218		262
219	memset (charsets, 'B', sizeof (charsets));	263	memset (charsets, 'B', sizeof (charsets));
220	rstyle = DEFAULT_RSTYLE;	264	rstyle = DEFAULT_RSTYLE;
221	screen.flags = Screen_DefaultFlags;	265	screen.flags = Screen_DefaultFlags;
222	screen.cur.row = screen.cur.col = 0;	266	screen.cur.row = screen.cur.col = 0;
…		…
245	{	289	{
246	/*	290	/*
247	* add or delete rows as appropriate	291	* add or delete rows as appropriate
248	*/	292	*/
249		293
250	rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));	294	int common_col = min (prev_ncol, ncol);
251	rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
252
253	#if 0
254	if (nrow < prev_nrow)
255	{
256	for (int row = nrow; row < prev_nrow; row++)
257	{
258	lfree (swap_buf [row]);
259	lfree (drawn_buf[row]);
260	}
261	}
262	#endif
263
264	drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
265	swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
266		295
267	for (int row = min (nrow, prev_nrow); row--; )	296	for (int row = min (nrow, prev_nrow); row--; )
268	{	297	{
269	lresize (drawn_buf[row]);	298	scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
270	lresize (swap_buf [row]);	299	memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
271	}	300	memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
272		301
273	for (int row = prev_nrow; row < nrow; row++)	302	copy_line (swap_buf [row], prev_swap_buf [row]);
274	{	303	}
275	swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
276	drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
277	}
278
279	line_t *old_buf = row_buf;
280	row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
281		304
282	int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row	305	int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
283	int pend = MOD (term_start + top_row , prev_total_rows);	306	int pend = MOD (term_start + top_row , prev_total_rows);
284	int q = total_rows; // rewrapped row	307	int q = total_rows; // rewrapped row
285		308
…		…
293	ocur.row = MOD (term_start + ocur.row, prev_total_rows);	316	ocur.row = MOD (term_start + ocur.row, prev_total_rows);
294		317
295	do	318	do
296	{	319	{
297	p = MOD (p - 1, prev_total_rows);	320	p = MOD (p - 1, prev_total_rows);
298	assert (old_buf [MOD (p, prev_total_rows)].t);	321	assert (prev_row_buf [MOD (p, prev_total_rows)].t);
299	int plines = 1;	322	int plines = 1;
300	int llen = old_buf [MOD (p, prev_total_rows)].l;	323	int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
301		324
302	while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())	325	while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ())
303	{	326	{
304	p = MOD (p - 1, prev_total_rows);	327	p = MOD (p - 1, prev_total_rows);
305		328
306	plines++;	329	plines++;
307	llen += prev_ncol;	330	llen += prev_ncol;
…		…
320		343
321	// re-assemble the full line by destination lines	344	// re-assemble the full line by destination lines
322	for (int qrow = q; qlines--; qrow++)	345	for (int qrow = q; qlines--; qrow++)
323	{	346	{
324	qline = row_buf + qrow;	347	qline = row_buf + qrow;
325	lalloc (*qline);	348	qline->alloc (); // redundant with next line
326	qline->l = ncol;	349	qline->l = ncol;
327	qline->is_longer (1);	350	qline->is_longer (1);
328		351
329	int qcol = 0;	352	int qcol = 0;
330		353
…		…
345	// this seems to upset applications/shells/readline	368	// this seems to upset applications/shells/readline
346	// least.	369	// least.
347	if (prow == ocur.row)	370	if (prow == ocur.row)
348	screen.cur.row = q - (total_rows - nrow);	371	screen.cur.row = q - (total_rows - nrow);
349		372
350	line_t &pline = old_buf [prow];	373	line_t &pline = prev_row_buf [prow];
351		374
352	int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);	375	int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
353		376
354	memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));	377	memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
355	memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));	378	memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
…		…
376	{	399	{
377	// if no scrollback exists (yet), wing, instead of wrap	400	// if no scrollback exists (yet), wing, instead of wrap
378		401
379	for (int row = min (nrow, prev_nrow); row--; )	402	for (int row = min (nrow, prev_nrow); row--; )
380	{	403	{
381	line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];	404	line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
382	line_t &qline = row_buf [row];	405	line_t &dst = row_buf [row];
383		406
384	qline = pline;	407	copy_line (dst, src);
385	lresize (qline);
386	}	408	}
387		409
388	for (int row = prev_nrow; row < nrow; row++)	410	for (int row = prev_nrow; row < nrow; row++)
389	{
390	row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);	411	scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
391	}
392		412
393	term_start = 0;	413	term_start = 0;
394	}	414	}
395
396	free (old_buf);
397	delete old_ta;
398	delete old_ra;
399		415
400	clamp_it (screen.cur.row, 0, nrow - 1);	416	clamp_it (screen.cur.row, 0, nrow - 1);
401	clamp_it (screen.cur.col, 0, ncol - 1);	417	clamp_it (screen.cur.col, 0, ncol - 1);
402	}	418	}
403		419
		420	for (int row = nrow; row--; )
		421	{
		422	if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
		423	if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
		424	if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
		425	}
		426
		427	chunk_free (prev_chunk, prev_chunk_size);
		428
404	free (tabs);	429	free (tabs);
405	tabs = (char *)rxvt_malloc (ncol);	430	tabs = (char *)rxvt_malloc (ncol);
406		431
407	for (int col = ncol; col--; )	432	for (int col = ncol; col--; )
408	tabs [col] = col % TABSIZE == 0;	433	tabs [col] = col % TABSIZE == 0;
…		…
415	tt_winch ();	440	tt_winch ();
416		441
417	HOOK_INVOKE ((this, HOOK_RESET, DT_END));	442	HOOK_INVOKE ((this, HOOK_RESET, DT_END));
418	}	443	}
419		444
420	/* ------------------------------------------------------------------------- */	445	void ecb_cold
421	/*
422	* Free everything. That way malloc debugging can find leakage.
423	*/
424	void
425	rxvt_term::scr_release () NOTHROW	446	rxvt_term::scr_release () NOTHROW
426	{	447	{
427	if (row_buf)	448	chunk_free (chunk, chunk_size);
428	{	449	chunk = 0;
429	delete talloc; talloc = 0;	450	row_buf = 0;
430	delete ralloc; ralloc = 0;
431		451
432	free (row_buf);
433	free (swap_buf);
434	free (drawn_buf);
435	row_buf = 0; // signal that we freed all the arrays above
436
437	free (tabs);	452	free (tabs);
438	tabs = 0;	453	tabs = 0;
439	}
440	}	454	}
441		455
442	/* ------------------------------------------------------------------------- */	456	/* ------------------------------------------------------------------------- */
443	/*	457	/*
444	* Hard/Soft reset	458	* Hard/Soft reset
445	*/	459	*/
446	void	460	void ecb_cold
447	rxvt_term::scr_poweron ()	461	rxvt_term::scr_poweron ()
448	{	462	{
449	scr_release ();	463	scr_release ();
		464
450	prev_nrow = prev_ncol = 0;	465	prev_nrow = prev_ncol = 0;
451	rvideo_mode = false;	466	rvideo_mode = false;
452	scr_soft_reset ();	467	scr_soft_reset ();
453	scr_reset ();	468	scr_reset ();
454		469
455	scr_clear (true);	470	scr_clear (true);
456	scr_refresh ();	471	scr_refresh ();
457	}	472	}
458		473
459	void	474	void ecb_cold
460	rxvt_term::scr_soft_reset ()	475	rxvt_term::scr_soft_reset () NOTHROW
461	{	476	{
462	/* only affects modes, nothing drastic such as clearing the screen */	477	/* only affects modes, nothing drastic such as clearing the screen */
463	#if ENABLE_OVERLAY	478	#if ENABLE_OVERLAY
464	scr_overlay_off ();	479	scr_overlay_off ();
465	#endif	480	#endif
…		…
520	assert (s->cur.row >= 0);	535	assert (s->cur.row >= 0);
521	assert (s->cur.col >= 0);	536	assert (s->cur.col >= 0);
522	}	537	}
523		538
524	void	539	void
525	rxvt_term::scr_swap_screen ()	540	rxvt_term::scr_swap_screen () NOTHROW
526	{	541	{
527	if (!option (Opt_secondaryScreen))	542	if (!option (Opt_secondaryScreen))
528	return;	543	return;
529		544
530	for (int i = prev_nrow; i--; )	545	for (int i = prev_nrow; i--; )
…		…
549	return;	564	return;
550		565
551	want_refresh = 1;	566	want_refresh = 1;
552	view_start = 0;	567	view_start = 0;
553		568
554	selection_check (2); /* check for boundary cross */	569	/* check for boundary cross */
		570	row_col_t pos;
		571	pos.row = pos.col = 0;
		572	if (ROWCOL_IS_BEFORE (selection.beg, pos)
		573	&& ROWCOL_IS_AFTER (selection.end, pos))
		574	CLEAR_SELECTION ();
555		575
556	current_screen = scrn;	576	current_screen = scrn;
557		577
558	#if NSCREENS	578	#if NSCREENS
559	if (option (Opt_secondaryScreen))	579	if (option (Opt_secondaryScreen))
…		…
595	* Change the colour for following text	615	* Change the colour for following text
596	*/	616	*/
597	void	617	void
598	rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW	618	rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW
599	{	619	{
600	if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))	620	if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR24))
601	color = fgbg;	621	color = fgbg;
602		622
603	if (fgbg == Color_fg)	623	if (fgbg == Color_fg)
604	rstyle = SET_FGCOLOR (rstyle, color);	624	rstyle = SET_FGCOLOR (rstyle, color);
605	else	625	else
…		…
625	/*	645	/*
626	* Scroll text between <row1> and <row2> inclusive, by <count> lines	646	* Scroll text between <row1> and <row2> inclusive, by <count> lines
627	* count positive ==> scroll up	647	* count positive ==> scroll up
628	* count negative ==> scroll down	648	* count negative ==> scroll down
629	*/	649	*/
630	int	650	int ecb_hot
631	rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW	651	rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
632	{	652	{
633	if (count == 0 || (row1 > row2))	653	if (count == 0 || (row1 > row2))
634	return 0;	654	return 0;
635		655
…		…
638		658
639	if (count > 0	659	if (count > 0
640	&& row1 == 0	660	&& row1 == 0
641	&& (current_screen == PRIMARY || option (Opt_secondaryScroll)))	661	&& (current_screen == PRIMARY || option (Opt_secondaryScroll)))
642	{	662	{
		663	min_it (count, total_rows - (nrow - (row2 + 1)));
		664
643	top_row = max (top_row - count, -saveLines);	665	top_row = max (top_row - count, -saveLines);
644
645	// scroll everything up 'count' lines
646	term_start = (term_start + count) % total_rows;
647		666
648	// sever bottommost line	667	// sever bottommost line
649	{	668	{
650	line_t &l = ROW(row2 - count);	669	line_t &l = ROW(row2);
651	l.is_longer (0);	670	l.is_longer (0);
652	l.touch ();	671	l.touch ();
653	}	672	}
654		673
		674	// scroll everything up 'count' lines
		675	term_start = (term_start + count) % total_rows;
		676
		677	// now copy lines below the scroll region bottom to the
		678	// bottom of the screen again, so they look as if they
		679	// hadn't moved.
		680	for (int i = nrow; --i > row2; )
		681	{
		682	line_t &l1 = ROW(i - count);
		683	line_t &l2 = ROW(i);
		684
		685	::swap (l1, l2);
		686	l2.touch ();
		687	}
		688
655	// erase newly scrolled-in lines	689	// erase newly scrolled-in lines
656	for (int i = count; i--; )	690	for (int i = count; i--; )
657	{	691	{
658	line_t &l = ROW(nrow - 1 - i);	692	line_t &l = ROW(row2 - i);
659		693
660	// optimize if already cleared, can be significant on slow machines	694	// optimise if already cleared, can be significant on slow machines
661	// could be rolled into scr_blank_screen_mem	695	// could be rolled into scr_blank_screen_mem
662	if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))	696	if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
663	{	697	{
664	scr_blank_line (l, 0, l.l, rstyle);	698	scr_blank_line (l, 0, l.l, rstyle);
665	l.l = 0;	699	l.l = 0;
…		…
667	}	701	}
668	else	702	else
669	scr_blank_screen_mem (l, rstyle);	703	scr_blank_screen_mem (l, rstyle);
670	}	704	}
671		705
672	// now copy lines below the scroll region bottom to the
673	// bottom of the screen again, so they look as if they
674	// hadn't moved.
675	for (int i = nrow; --i > row2; )
676	{
677	line_t &l1 = ROW(i - count);
678	line_t &l2 = ROW(i);
679
680	::swap (l1, l2);
681	l2.touch ();
682	}
683
684	// move and/or clear selection, if any	706	// move and/or clear selection, if any
685	if (selection.op && current_screen == selection.screen)	707	if (selection.op && current_screen == selection.screen
		708	&& selection.beg.row <= row2)
686	{	709	{
687	selection.beg.row -= count;	710	selection.beg.row -= count;
688	selection.end.row -= count;	711	selection.end.row -= count;
689	selection.mark.row -= count;	712	selection.mark.row -= count;
690		713
691	if (selection.beg.row < top_row	714	selection_check (0);
692	|| selection.end.row < top_row
693	|| selection.mark.row < top_row)
694	{
695	CLEAR_ALL_SELECTION ();
696	selection.op = SELECTION_CLEAR;
697	}
698	}	715	}
699		716
700	// finally move the view window, if desired	717	// finally move the view window, if desired
701	if (option (Opt_scrollWithBuffer)	718	if (option (Opt_scrollWithBuffer)
702	&& view_start != 0	719	&& view_start != 0
703	&& view_start != -saveLines)	720	&& view_start != -saveLines)
704	scr_page (UP, count);	721	scr_page (count);
705		722
706	if (SHOULD_INVOKE (HOOK_SCROLL_BACK))	723	if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
707	HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));	724	HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
708	}	725	}
709	else	726	else
…		…
732	}	749	}
733		750
734	// use a simple and robust scrolling algorithm, this	751	// use a simple and robust scrolling algorithm, this
735	// part of scr_scroll_text is not time-critical.	752	// part of scr_scroll_text is not time-critical.
736		753
		754	// sever line above scroll region
		755	if (row1)
		756	{
		757	line_t &l = ROW(row1 - 1);
		758	l.is_longer (0);
		759	l.touch ();
		760	}
		761
737	int rows = row2 - row1 + 1;	762	int rows = row2 - row1 + 1;
738		763
739	min_it (count, rows);	764	min_it (count, rows);
740		765
741	line_t *temp_buf = row_buf + total_rows;	766	line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
742		767
743	for (int row = 0; row < rows; row++)	768	for (int row = 0; row < rows; row++)
744	{	769	{
745	temp_buf [row] = ROW(row1 + (row + count + rows) % rows);	770	temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
746		771
…		…
748	scr_blank_screen_mem (temp_buf [row], rstyle);	773	scr_blank_screen_mem (temp_buf [row], rstyle);
749	}	774	}
750		775
751	for (int row = 0; row < rows; row++)	776	for (int row = 0; row < rows; row++)
752	ROW(row1 + row) = temp_buf [row];	777	ROW(row1 + row) = temp_buf [row];
		778
		779	// sever bottommost line
		780	{
		781	line_t &l = ROW(row2);
		782	l.is_longer (0);
		783	l.touch ();
		784	}
753	}	785	}
754		786
755	return count;	787	return count;
756	}	788	}
757		789
758	/* ------------------------------------------------------------------------- */	790	/* ------------------------------------------------------------------------- */
759	/*	791	/*
760	* Add text given in <str> of length <len> to screen struct	792	* Add text given in <str> of length <len> to screen struct
761	*/	793	*/
762	void	794	void ecb_hot
763	rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW	795	rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
764	{	796	{
765	if (len <= 0) /* sanity */	797	if (len <= 0) /* sanity */
766	return;	798	return;
767		799
768	unsigned char checksel;	800	bool checksel;
769	unicode_t c;	801	unicode_t c;
770	int ncol = this->ncol;	802	int ncol = this->ncol;
771	const wchar_t *strend = str + len;	803	const wchar_t *strend = str + len;
772		804
773	want_refresh = 1;	805	want_refresh = 1;
…		…
799		831
800	while (str < strend)	832	while (str < strend)
801	{	833	{
802	c = (unicode_t)*str++; // convert to rxvt-unicodes representation	834	c = (unicode_t)*str++; // convert to rxvt-unicodes representation
803		835
804	if (expect_false (c < 0x20))	836	if (ecb_unlikely (c < 0x20))
805	if (c == C0_LF)	837	if (c == C0_LF)
806	{	838	{
807	max_it (line->l, screen.cur.col);	839	max_it (line->l, screen.cur.col);
808		840
809	screen.flags &= ~Screen_WrapNext;	841	screen.flags &= ~Screen_WrapNext;
…		…
828	{	860	{
829	scr_tab (1, true);	861	scr_tab (1, true);
830	continue;	862	continue;
831	}	863	}
832		864
833	if (expect_false (	865	if (ecb_unlikely (
834	checksel /* see if we're writing within selection */	866	checksel /* see if we're writing within selection */
835	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)	867	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
836	&& ROWCOL_IS_BEFORE (screen.cur, selection.end)	868	&& ROWCOL_IS_BEFORE (screen.cur, selection.end)
837	))	869	))
838	{	870	{
…		…
843	* should be a similar check.	875	* should be a similar check.
844	*/	876	*/
845	CLEAR_SELECTION ();	877	CLEAR_SELECTION ();
846	}	878	}
847		879
848	if (expect_false (screen.flags & Screen_WrapNext))	880	if (ecb_unlikely (screen.flags & Screen_WrapNext))
849	{	881	{
850	scr_do_wrap ();	882	scr_do_wrap ();
851		883
852	line->l = ncol;	884	line->l = ncol;
853	line->is_longer (1);	885	line->is_longer (1);
…		…
855	row = screen.cur.row;	887	row = screen.cur.row;
856	line = &ROW(row); /* _must_ refresh */	888	line = &ROW(row); /* _must_ refresh */
857	}	889	}
858		890
859	// some utf-8 decoders "decode" surrogate characters: let's fix this.	891	// some utf-8 decoders "decode" surrogate characters: let's fix this.
860	if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff)))	892	if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
861	c = 0xfffd;	893	c = 0xfffd;
862		894
863	// rely on wcwidth to tell us the character width, do wcwidth before	895	// rely on wcwidth to tell us the character width, do wcwidth before
864	// further replacements, as wcwidth might return -1 for the line	896	// further replacements, as wcwidth might return -1 for the line
865	// drawing characters below as they might be invalid in the current	897	// drawing characters below as they might be invalid in the current
866	// locale.	898	// locale.
867	int width = WCWIDTH (c);	899	int width = WCWIDTH (c);
868		900
869	if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL	901	if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
870	{	902	{
871	// vt100 special graphics and line drawing	903	// vt100 special graphics and line drawing
872	// 5f-7e standard vt100	904	// 5f-7e standard vt100
873	// 40-5e rxvt extension for extra curses acs chars	905	// 40-5e rxvt extension for extra curses acs chars
874	static uint16_t vt100_0[62] = { // 41 .. 7e	906	static uint16_t vt100_0[62] = { // 41 .. 7e
…		…
887	c = vt100_0[c - 0x41];	919	c = vt100_0[c - 0x41];
888	width = 1; // vt100 line drawing characters are always single-width	920	width = 1; // vt100 line drawing characters are always single-width
889	}	921	}
890	}	922	}
891		923
892	if (expect_false (screen.flags & Screen_Insert))	924	if (ecb_unlikely (screen.flags & Screen_Insert))
893	scr_insdel_chars (width, INSERT);	925	scr_insdel_chars (width, INSERT);
894		926
895	if (width != 0)	927	if (width != 0)
896	{	928	{
897	#if !UNICODE_3	929	#if !UNICODE_3
…		…
905	#endif	937	#endif
906		938
907	rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));	939	rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
908		940
909	// if the character doesn't fit into the remaining columns...	941	// if the character doesn't fit into the remaining columns...
910	if (expect_false (screen.cur.col > ncol - width && ncol >= width))	942	if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
911	{	943	{
912	if (screen.flags & Screen_Autowrap)	944	if (screen.flags & Screen_Autowrap)
913	{	945	{
914	// ... artificially enlargen the previous one	946	// ... artificially enlargen the previous one
915	c = NOCHAR;	947	c = NOCHAR;
…		…
922		954
923	// nuke the character at this position, if required	955	// nuke the character at this position, if required
924	// due to wonderful coincidences everywhere else in this loop	956	// due to wonderful coincidences everywhere else in this loop
925	// we never have to check for overwriting a wide char itself,	957	// we never have to check for overwriting a wide char itself,
926	// only its tail.	958	// only its tail.
927	if (expect_false (line->t[screen.cur.col] == NOCHAR))	959	if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
928	scr_kill_char (*line, screen.cur.col);	960	scr_kill_char (*line, screen.cur.col);
929		961
930	line->touch ();	962	line->touch ();
931		963
932	do	964	do
933	{	965	{
934	line->t[screen.cur.col] = c;	966	line->t[screen.cur.col] = c;
935	line->r[screen.cur.col] = rend;	967	line->r[screen.cur.col] = rend;
936		968
937	if (expect_true (screen.cur.col < ncol - 1))	969	if (ecb_likely (screen.cur.col < ncol - 1))
938	screen.cur.col++;	970	screen.cur.col++;
939	else	971	else
940	{	972	{
941	line->l = ncol;	973	line->l = ncol;
942	if (screen.flags & Screen_Autowrap)	974	if (screen.flags & Screen_Autowrap)
…		…
945	goto end_of_line;	977	goto end_of_line;
946	}	978	}
947		979
948	c = NOCHAR;	980	c = NOCHAR;
949	}	981	}
950	while (expect_false (--width > 0));	982	while (ecb_unlikely (--width > 0));
951		983
952	// pad with spaces when overwriting wide character with smaller one	984	// pad with spaces when overwriting wide character with smaller one
953	for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++)	985	for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
954	{	986	{
955	line->t[c] = ' ';	987	line->t[c] = ' ';
956	line->r[c] = rend;	988	line->r[c] = rend;
957	}	989	}
958		990
…		…
980	}	1012	}
981	else if (screen.cur.row > 0	1013	else if (screen.cur.row > 0
982	&& ROW(screen.cur.row - 1).is_longer ())	1014	&& ROW(screen.cur.row - 1).is_longer ())
983	{	1015	{
984	linep = &ROW(screen.cur.row - 1);	1016	linep = &ROW(screen.cur.row - 1);
985	tp = line->t + ncol - 1;	1017	tp = linep->t + ncol - 1;
986	rp = line->r + ncol - 1;	1018	rp = linep->r + ncol - 1;
987	}	1019	}
988	else	1020	else
989	continue;	1021	continue;
990		1022
991	linep->touch ();	1023	linep->touch ();
…		…
1117	* XTERM_SEQ: ESC 6	1149	* XTERM_SEQ: ESC 6
1118	* Move cursor left in row. If we're at the left boundary, shift everything	1150	* Move cursor left in row. If we're at the left boundary, shift everything
1119	* in that row right. Clear left column.	1151	* in that row right. Clear left column.
1120	*/	1152	*/
1121	#if !ENABLE_MINIMAL	1153	#if !ENABLE_MINIMAL
1122	void	1154	void ecb_cold
1123	rxvt_term::scr_backindex () NOTHROW	1155	rxvt_term::scr_backindex () NOTHROW
1124	{	1156	{
1125	if (screen.cur.col > 0)	1157	if (screen.cur.col > 0)
1126	scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);	1158	scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1127	else	1159	else
…		…
1134	* XTERM_SEQ: ESC 9	1166	* XTERM_SEQ: ESC 9
1135	* Move cursor right in row. If we're at the right boundary, shift everything	1167	* Move cursor right in row. If we're at the right boundary, shift everything
1136	* in that row left. Clear right column.	1168	* in that row left. Clear right column.
1137	*/	1169	*/
1138	#if !ENABLE_MINIMAL	1170	#if !ENABLE_MINIMAL
1139	void	1171	void ecb_cold
1140	rxvt_term::scr_forwardindex () NOTHROW	1172	rxvt_term::scr_forwardindex () NOTHROW
1141	{	1173	{
1142	if (screen.cur.col < ncol - 1)	1174	if (screen.cur.col < ncol - 1)
1143	scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);	1175	scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1144	else	1176	else
…		…
1209	* direction should be UP or DN	1241	* direction should be UP or DN
1210	*/	1242	*/
1211	void	1243	void
1212	rxvt_term::scr_index (enum page_dirn direction) NOTHROW	1244	rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1213	{	1245	{
1214	int dirn;
1215
1216	want_refresh = 1;	1246	want_refresh = 1;
1217	ZERO_SCROLLBACK ();	1247	ZERO_SCROLLBACK ();
1218		1248
1219	dirn = ((direction == UP) ? 1 : -1);
1220
1221	screen.flags &= ~Screen_WrapNext;	1249	screen.flags &= ~Screen_WrapNext;
1222		1250
1223	if ((screen.cur.row == screen.bscroll && direction == UP)	1251	if ((screen.cur.row == screen.bscroll && direction == UP)
1224	|| (screen.cur.row == screen.tscroll && direction == DN))	1252	|| (screen.cur.row == screen.tscroll && direction == DN))
1225	scr_scroll_text (screen.tscroll, screen.bscroll, dirn);	1253	scr_scroll_text (screen.tscroll, screen.bscroll, direction);
1226	else	1254	else
1227	screen.cur.row += dirn;	1255	screen.cur.row += direction;
1228		1256
1229	clamp_it (screen.cur.row, 0, nrow - 1);	1257	clamp_it (screen.cur.row, 0, nrow - 1);
1230	selection_check (0);	1258	selection_check (0);
1231	}	1259	}
1232		1260
…		…
1295	scr_blank_line (line, col, num, rstyle);	1323	scr_blank_line (line, col, num, rstyle);
1296	}	1324	}
1297		1325
1298	/* ------------------------------------------------------------------------- */	1326	/* ------------------------------------------------------------------------- */
1299	/*	1327	/*
1300	* Erase part of whole of the screen	1328	* Erase part or whole of the screen
1301	* XTERM_SEQ: Clear screen after cursor : ESC [ 0 J	1329	* XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1302	* XTERM_SEQ: Clear screen before cursor: ESC [ 1 J	1330	* XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1303	* XTERM_SEQ: Clear whole screen : ESC [ 2 J	1331	* XTERM_SEQ: Clear whole screen : ESC [ 2 J
1304	*/	1332	*/
1305	void	1333	void
…		…
1314	ZERO_SCROLLBACK ();	1342	ZERO_SCROLLBACK ();
1315		1343
1316	switch (mode)	1344	switch (mode)
1317	{	1345	{
1318	case 0: /* erase to end of screen */	1346	case 0: /* erase to end of screen */
1319	selection_check (1);
1320	scr_erase_line (0);	1347	scr_erase_line (0);
1321	row = screen.cur.row + 1; /* possible OOB */	1348	row = screen.cur.row + 1; /* possible OOB */
1322	num = nrow - row;	1349	num = nrow - row;
1323	break;	1350	break;
1324	case 1: /* erase to beginning of screen */	1351	case 1: /* erase to beginning of screen */
1325	selection_check (3);
1326	scr_erase_line (1);	1352	scr_erase_line (1);
1327	row = 0;	1353	row = 0;
1328	num = screen.cur.row;	1354	num = screen.cur.row;
1329	break;	1355	break;
1330	case 2: /* erase whole screen */	1356	case 2: /* erase whole screen */
1331	selection_check (3);
1332	row = 0;	1357	row = 0;
1333	num = nrow;	1358	num = nrow;
1334	break;	1359	break;
1335	default:	1360	default:
1336	return;	1361	return;
…		…
1353	{	1378	{
1354	ren = DEFAULT_RSTYLE;	1379	ren = DEFAULT_RSTYLE;
1355		1380
1356	if (mapped)	1381	if (mapped)
1357	XClearArea (dpy, vt, 0,	1382	XClearArea (dpy, vt, 0,
1358	Row2Pixel (row - view_start), (unsigned int)width,	1383	Row2Pixel (row - view_start), (unsigned int)vt_width,
1359	(unsigned int)Height2Pixel (num), False);	1384	(unsigned int)Height2Pixel (num), False);
1360	}	1385	}
1361	else	1386	else
1362	{	1387	{
1363	ren = rstyle & (RS_fgMask | RS_bgMask);	1388	ren = rstyle & (RS_fgMask | RS_bgMask);
…		…
1366	{	1391	{
1367	gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];	1392	gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1368	XChangeGC (dpy, gc, GCForeground, &gcvalue);	1393	XChangeGC (dpy, gc, GCForeground, &gcvalue);
1369	XFillRectangle (dpy, vt, gc,	1394	XFillRectangle (dpy, vt, gc,
1370	0, Row2Pixel (row - view_start),	1395	0, Row2Pixel (row - view_start),
1371	(unsigned int)width,	1396	(unsigned int)vt_width,
1372	(unsigned int)Height2Pixel (num));	1397	(unsigned int)Height2Pixel (num));
1373	gcvalue.foreground = pix_colors[Color_fg];	1398	gcvalue.foreground = pix_colors[Color_fg];
1374	XChangeGC (dpy, gc, GCForeground, &gcvalue);	1399	XChangeGC (dpy, gc, GCForeground, &gcvalue);
1375	}	1400	}
1376	}	1401	}
…		…
1398	/* ------------------------------------------------------------------------- */	1423	/* ------------------------------------------------------------------------- */
1399	/*	1424	/*
1400	* Fill the screen with `E's	1425	* Fill the screen with `E's
1401	* XTERM_SEQ: Screen Alignment Test: ESC # 8	1426	* XTERM_SEQ: Screen Alignment Test: ESC # 8
1402	*/	1427	*/
1403	void	1428	void ecb_cold
1404	rxvt_term::scr_E () NOTHROW	1429	rxvt_term::scr_E () NOTHROW
1405	{	1430	{
1406	rend_t fs;	1431	rend_t fs;
1407		1432
1408	want_refresh = 1;	1433	want_refresh = 1;
1409	ZERO_SCROLLBACK ();	1434	ZERO_SCROLLBACK ();
1410		1435
1411	num_scr_allow = 0;	1436	num_scr_allow = 0;
1412	selection_check (3);	1437
		1438	row_col_t pos;
		1439	pos.row = pos.col = 0;
		1440	if (ROWCOL_IS_AFTER (selection.end, pos))
		1441	CLEAR_SELECTION ();
1413		1442
1414	fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));	1443	fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1415	for (int row = nrow; row--; )	1444	for (int row = nrow; row--; )
1416	{	1445	{
1417	line_t &line = ROW(row);	1446	line_t &line = ROW(row);
…		…
1568	/* ------------------------------------------------------------------------- */	1597	/* ------------------------------------------------------------------------- */
1569	/*	1598	/*
1570	* Set the scrolling region	1599	* Set the scrolling region
1571	* XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r	1600	* XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1572	*/	1601	*/
1573	void	1602	void ecb_cold
1574	rxvt_term::scr_scroll_region (int top, int bot) NOTHROW	1603	rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1575	{	1604	{
1576	max_it (top, 0);	1605	max_it (top, 0);
1577	min_it (bot, nrow - 1);	1606	min_it (bot, nrow - 1);
1578		1607
…		…
1588	/*	1617	/*
1589	* Make the cursor visible/invisible	1618	* Make the cursor visible/invisible
1590	* XTERM_SEQ: Make cursor visible : ESC [ ? 25 h	1619	* XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1591	* XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l	1620	* XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1592	*/	1621	*/
1593	void	1622	void ecb_cold
1594	rxvt_term::scr_cursor_visible (int mode) NOTHROW	1623	rxvt_term::scr_cursor_visible (int mode) NOTHROW
1595	{	1624	{
1596	want_refresh = 1;	1625	want_refresh = 1;
1597		1626
1598	if (mode)	1627	if (mode)
…		…
1605	/*	1634	/*
1606	* Set/unset automatic wrapping	1635	* Set/unset automatic wrapping
1607	* XTERM_SEQ: Set Wraparound : ESC [ ? 7 h	1636	* XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1608	* XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l	1637	* XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1609	*/	1638	*/
1610	void	1639	void ecb_cold
1611	rxvt_term::scr_autowrap (int mode) NOTHROW	1640	rxvt_term::scr_autowrap (int mode) NOTHROW
1612	{	1641	{
1613	if (mode)	1642	if (mode)
1614	screen.flags |= Screen_Autowrap;	1643	screen.flags |= Screen_Autowrap;
1615	else	1644	else
…		…
1624	* Relative mode: line numbers are relative to top margin of scrolling region	1653	* Relative mode: line numbers are relative to top margin of scrolling region
1625	* and the cursor cannot be moved outside.	1654	* and the cursor cannot be moved outside.
1626	* XTERM_SEQ: Set Absolute: ESC [ ? 6 h	1655	* XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1627	* XTERM_SEQ: Set Relative: ESC [ ? 6 l	1656	* XTERM_SEQ: Set Relative: ESC [ ? 6 l
1628	*/	1657	*/
1629	void	1658	void ecb_cold
1630	rxvt_term::scr_relative_origin (int mode) NOTHROW	1659	rxvt_term::scr_relative_origin (int mode) NOTHROW
1631	{	1660	{
1632	if (mode)	1661	if (mode)
1633	screen.flags |= Screen_Relative;	1662	screen.flags |= Screen_Relative;
1634	else	1663	else
…		…
1641	/*	1670	/*
1642	* Set insert/replace mode	1671	* Set insert/replace mode
1643	* XTERM_SEQ: Set Insert mode : ESC [ ? 4 h	1672	* XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1644	* XTERM_SEQ: Set Replace mode: ESC [ ? 4 l	1673	* XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1645	*/	1674	*/
1646	void	1675	void ecb_cold
1647	rxvt_term::scr_insert_mode (int mode) NOTHROW	1676	rxvt_term::scr_insert_mode (int mode) NOTHROW
1648	{	1677	{
1649	if (mode)	1678	if (mode)
1650	screen.flags |= Screen_Insert;	1679	screen.flags |= Screen_Insert;
1651	else	1680	else
…		…
1657	* Set/Unset tabs	1686	* Set/Unset tabs
1658	* XTERM_SEQ: Set tab at current column : ESC H	1687	* XTERM_SEQ: Set tab at current column : ESC H
1659	* XTERM_SEQ: Clear tab at current column: ESC [ 0 g	1688	* XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1660	* XTERM_SEQ: Clear all tabs : ESC [ 3 g	1689	* XTERM_SEQ: Clear all tabs : ESC [ 3 g
1661	*/	1690	*/
1662	void	1691	void ecb_cold
1663	rxvt_term::scr_set_tab (int mode) NOTHROW	1692	rxvt_term::scr_set_tab (int mode) NOTHROW
1664	{	1693	{
1665	if (mode < 0)	1694	if (mode < 0)
1666	memset (tabs, 0, ncol);	1695	memset (tabs, 0, ncol);
1667	else if (screen.cur.col < ncol)	1696	else if (screen.cur.col < ncol)
…		…
1685		1714
1686	if (rvideo_state != on)	1715	if (rvideo_state != on)
1687	{	1716	{
1688	rvideo_state = on;	1717	rvideo_state = on;
1689		1718
		1719	#if OFF_FOCUS_FADING
		1720	if (rs[Rs_fade])
		1721	{
		1722	::swap (pix_colors_focused[Color_fg], pix_colors_focused[Color_bg]);
		1723	::swap (pix_colors_unfocused[Color_fg], pix_colors_unfocused[Color_bg]);
		1724	}
		1725	else
		1726	#endif
1690	::swap (pix_colors[Color_fg], pix_colors[Color_bg]);	1727	::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1691	#ifdef HAVE_BG_PIXMAP	1728	#ifdef HAVE_IMG
1692	if (bg_pixmap == None)	1729	if (bg_img == 0)
1693	#endif	1730	#endif
1694	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);	1731	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1695		1732
1696	XGCValues gcvalue;	1733	XGCValues gcvalue;
1697	gcvalue.foreground = pix_colors[Color_fg];	1734	gcvalue.foreground = pix_colors[Color_fg];
…		…
1706	/* ------------------------------------------------------------------------- */	1743	/* ------------------------------------------------------------------------- */
1707	/*	1744	/*
1708	* Report current cursor position	1745	* Report current cursor position
1709	* XTERM_SEQ: Report position: ESC [ 6 n	1746	* XTERM_SEQ: Report position: ESC [ 6 n
1710	*/	1747	*/
1711	void	1748	void ecb_cold
1712	rxvt_term::scr_report_position () NOTHROW	1749	rxvt_term::scr_report_position () NOTHROW
1713	{	1750	{
1714	tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);	1751	tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1715	}	1752	}
1716		1753
…		…
1719	* ------------------------------------------------------------------------- */	1756	* ------------------------------------------------------------------------- */
1720		1757
1721	/*	1758	/*
1722	* Set font style	1759	* Set font style
1723	*/	1760	*/
1724	void	1761	void ecb_cold
1725	rxvt_term::set_font_style () NOTHROW	1762	rxvt_term::set_font_style () NOTHROW
1726	{	1763	{
1727	#if 0	1764	#if 0
1728	switch (charsets [screen.charset])	1765	switch (charsets [screen.charset])
1729	{	1766	{
…		…
1751	* XTERM_SEQ: Invoke G0 character set: CTRL-O	1788	* XTERM_SEQ: Invoke G0 character set: CTRL-O
1752	* XTERM_SEQ: Invoke G1 character set: CTRL-N	1789	* XTERM_SEQ: Invoke G1 character set: CTRL-N
1753	* XTERM_SEQ: Invoke G2 character set: ESC N	1790	* XTERM_SEQ: Invoke G2 character set: ESC N
1754	* XTERM_SEQ: Invoke G3 character set: ESC O	1791	* XTERM_SEQ: Invoke G3 character set: ESC O
1755	*/	1792	*/
1756	void	1793	void ecb_cold
1757	rxvt_term::scr_charset_choose (int set) NOTHROW	1794	rxvt_term::scr_charset_choose (int set) NOTHROW
1758	{	1795	{
1759	screen.charset = set;	1796	screen.charset = set;
1760	set_font_style ();	1797	set_font_style ();
1761	}	1798	}
…		…
1782	* ------------------------------------------------------------------------- */	1819	* ------------------------------------------------------------------------- */
1783		1820
1784	/*	1821	/*
1785	* refresh matching text.	1822	* refresh matching text.
1786	*/	1823	*/
1787	bool	1824	bool ecb_cold
1788	rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW	1825	rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1789	{	1826	{
1790	bool found = false;	1827	bool found = false;
1791		1828
1792	for (int i = 0; i < nrow; i++)	1829	for (int i = 0; i < nrow; i++)
…		…
1811	PART_BEG = 0,	1848	PART_BEG = 0,
1812	PART_END,	1849	PART_END,
1813	RC_COUNT	1850	RC_COUNT
1814	};	1851	};
1815		1852
1816	void	1853	void ecb_hot
1817	rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW	1854	rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1818	{	1855	{
1819	int i;	1856	int i;
1820	row_col_t rc[RC_COUNT];	1857	row_col_t rc[RC_COUNT];
1821		1858
…		…
1858	* Refresh the entire screen	1895	* Refresh the entire screen
1859	*/	1896	*/
1860	void	1897	void
1861	rxvt_term::scr_touch (bool refresh) NOTHROW	1898	rxvt_term::scr_touch (bool refresh) NOTHROW
1862	{	1899	{
1863	scr_expose (0, 0, width, height, refresh);	1900	scr_expose (0, 0, vt_width, vt_height, refresh);
1864	}	1901	}
1865		1902
1866	/* ------------------------------------------------------------------------- */	1903	/* ------------------------------------------------------------------------- */
1867	/*	1904	/*
1868	* Move the display so that the line represented by scrollbar value Y is at	1905	* Move the display so that the line represented by scrollbar value Y is at
1869	* the top of the screen	1906	* the top of the screen
1870	*/	1907	*/
1871	void	1908	void
1872	rxvt_term::scr_move_to (int y, int len) NOTHROW	1909	rxvt_term::scr_move_to (int y, int len) NOTHROW
1873	{	1910	{
1874	scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));	1911	// lerp (y, 0, len, top_row, nrow - 1)
		1912	scr_changeview (top_row + (nrow - 1 - top_row) * y / len);
1875	}	1913	}
1876		1914
1877	/* ------------------------------------------------------------------------- */	1915	/* ------------------------------------------------------------------------- */
1878	/*	1916	/*
1879	* Page the screen up/down nlines	1917	* Page the screen up/down nlines
1880	* direction should be UP or DN	1918	* direction should be UP or DN
1881	*/	1919	*/
1882	bool	1920	bool
1883	rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW	1921	rxvt_term::scr_page (int nlines) NOTHROW
1884	{	1922	{
1885	int new_view_start =
1886	direction == UP ? view_start - nlines
1887	: view_start + nlines;
1888
1889	return scr_changeview (new_view_start);	1923	return scr_changeview (view_start - nlines);
1890	}	1924	}
1891		1925
1892	bool	1926	bool
1893	rxvt_term::scr_changeview (int new_view_start) NOTHROW	1927	rxvt_term::scr_changeview (int new_view_start) NOTHROW
1894	{	1928	{
…		…
1947	HOOK_INVOKE ((this, HOOK_BELL, DT_END));	1981	HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1948	#endif	1982	#endif
1949	}	1983	}
1950		1984
1951	/* ------------------------------------------------------------------------- */	1985	/* ------------------------------------------------------------------------- */
1952	void	1986	void ecb_cold
1953	rxvt_term::scr_printscreen (int fullhist) NOTHROW	1987	rxvt_term::scr_printscreen (int fullhist) NOTHROW
1954	{	1988	{
1955	#ifdef PRINTPIPE	1989	#ifdef PRINTPIPE
1956	int nrows, row_start;	1990	int nrows, row_start;
1957	FILE *fd = popen_printer ();	1991	FILE *fd = popen_printer ();
…		…
2006	/*	2040	/*
2007	* Refresh the screen	2041	* Refresh the screen
2008	* drawn_text/drawn_rend contain the screen information before the update.	2042	* drawn_text/drawn_rend contain the screen information before the update.
2009	* screen.text/screen.rend contain what the screen will change to.	2043	* screen.text/screen.rend contain what the screen will change to.
2010	*/	2044	*/
2011	void	2045	void ecb_hot
2012	rxvt_term::scr_refresh () NOTHROW	2046	rxvt_term::scr_refresh () NOTHROW
2013	{	2047	{
2014	int16_t col, row, /* column/row we're processing */	2048	int16_t col, row, /* column/row we're processing */
2015	ocrow; /* old cursor row */	2049	ocrow; /* old cursor row */
2016	int i; /* tmp */	2050	int i; /* tmp */
2017	#ifndef NO_CURSORCOLOR
2018	rend_t cc1; /* store colours at cursor position (s) */
2019	#endif
2020	rend_t *crp; // cursor rendition pointer
2021	rend_t ccol1, /* Cursor colour */	2051	rend_t ccol1, /* Cursor colour */
2022	ccol2; /* Cursor colour2 */	2052	ccol2; /* Cursor colour2 */
		2053	rend_t cur_rend;
		2054	int cur_col;
		2055	int cursorwidth;
2023		2056
2024	want_refresh = 0; /* screen is current */	2057	want_refresh = 0; /* screen is current */
2025		2058
2026	if (refresh_type == NO_REFRESH || !mapped)	2059	if (refresh_type == NO_REFRESH || !mapped)
2027	return;	2060	return;
…		…
2030	* A: set up vars	2063	* A: set up vars
2031	*/	2064	*/
2032	refresh_count = 0;	2065	refresh_count = 0;
2033		2066
2034	unsigned int old_screen_flags = screen.flags;	2067	unsigned int old_screen_flags = screen.flags;
2035	char have_bg = 0;	2068	bool have_bg = 0;
2036	#ifdef HAVE_BG_PIXMAP	2069	#ifdef HAVE_IMG
2037	have_bg = bg_pixmap != None;	2070	have_bg = bg_img != 0;
2038	#endif	2071	#endif
2039	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */	2072	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2040		2073
2041	/*	2074	/*
2042	* B: reverse any characters which are selected	2075	* B: reverse any characters which are selected
…		…
2046	HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));	2079	HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2047	#if ENABLE_OVERLAY	2080	#if ENABLE_OVERLAY
2048	scr_swap_overlay ();	2081	scr_swap_overlay ();
2049	#endif	2082	#endif
2050		2083
2051	char showcursor = screen.flags & Screen_VisibleCursor;	2084	bool showcursor = screen.flags & Screen_VisibleCursor;
2052		2085
2053	/*	2086	/*
2054	* C: set the cursor character (s)	2087	* C: set the cursor character (s)
2055	*/	2088	*/
2056	{	2089	{
2057	unsigned char setoldcursor;
2058
2059	#ifdef CURSOR_BLINK	2090	#ifdef CURSOR_BLINK
2060	if (hidden_cursor)	2091	if (hidden_cursor)
2061	showcursor = 0;	2092	showcursor = 0;
2062	#endif	2093	#endif
2063		2094
…		…
2066	int col = screen.cur.col;	2097	int col = screen.cur.col;
2067		2098
2068	while (col && ROW(screen.cur.row).t[col] == NOCHAR)	2099	while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2069	col--;	2100	col--;
2070		2101
		2102	cursorwidth = 1;
		2103	while (col + cursorwidth < ncol
		2104	&& ROW(screen.cur.row).t[col + cursorwidth] == NOCHAR)
		2105	cursorwidth++;
		2106
2071	crp = &ROW(screen.cur.row).r[col];	2107	cur_rend = ROW(screen.cur.row).r[col];
		2108	cur_col = col;
2072		2109
2073	#ifndef NO_CURSORCOLOR	2110	#ifndef NO_CURSORCOLOR
2074	cc1 = *crp & (RS_fgMask | RS_bgMask);
2075	if (ISSET_PIXCOLOR (Color_cursor))	2111	if (ISSET_PIXCOLOR (Color_cursor))
2076	ccol1 = Color_cursor;	2112	ccol1 = Color_cursor;
2077	else	2113	else
2078	#endif	2114	#endif
2079	#ifdef CURSOR_COLOR_IS_RENDITION_COLOR	2115	#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
…		…
2091	ccol2 = bgcolor_of (rstyle);	2127	ccol2 = bgcolor_of (rstyle);
2092	#else	2128	#else
2093	ccol2 = Color_bg;	2129	ccol2 = Color_bg;
2094	#endif	2130	#endif
2095		2131
2096	if (focus)	2132	if (focus && cursor_type == 0)
2097	{	2133	{
2098	if (option (Opt_cursorUnderline))	2134	rend_t rend = cur_rend;
2099	*crp ^= RS_Uline;	2135
2100	else
2101	{
2102	*crp ^= RS_RVid;	2136	rend ^= RS_RVid;
2103	*crp = SET_FGCOLOR (*crp, ccol1);	2137	rend = SET_FGCOLOR (rend, ccol1);
2104	*crp = SET_BGCOLOR (*crp, ccol2);	2138	rend = SET_BGCOLOR (rend, ccol2);
2105	}	2139
		2140	scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
2106	}	2141	}
2107	}	2142	}
2108		2143
2109	/* make sure no outline cursor is left around */	2144	/* make sure no outline cursor is left around */
2110	setoldcursor = 0;	2145	if (ocrow != -1 && ocrow < nrow && oldcursor.col < ncol)
2111	if (ocrow != -1)	2146	drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
		2147
		2148	// save the current cursor coordinates if the cursor is visible
		2149	// and either the window is unfocused or the cursor style is
		2150	// underline or vertical bar, so as to clear the outline cursor in
		2151	// the next refresh if the cursor moves or becomes invisible
		2152	if (showcursor && (!focus || cursor_type != 0) && screen.cur.row - view_start < nrow)
2112	{	2153	{
2113	if (screen.cur.row - view_start != ocrow	2154	oldcursor.row = screen.cur.row - view_start;
2114	|| screen.cur.col != oldcursor.col)	2155	oldcursor.col = screen.cur.col;
2115	{
2116	if (ocrow < nrow
2117	&& oldcursor.col < ncol)
2118	drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2119
2120	if (focus || !showcursor)
2121	oldcursor.row = -1;
2122	else
2123	setoldcursor = 1;
2124	}
2125	}	2156	}
2126	else if (!focus)	2157	else
2127	setoldcursor = 1;
2128
2129	if (setoldcursor)
2130	{
2131	if (screen.cur.row - view_start >= nrow)
2132	oldcursor.row = -1;	2158	oldcursor.row = -1;
2133	else
2134	{
2135	oldcursor.row = screen.cur.row - view_start;
2136	oldcursor.col = screen.cur.col;
2137	}
2138	}
2139	}	2159	}
2140		2160
2141	#ifndef NO_SLOW_LINK_SUPPORT	2161	#ifndef NO_SLOW_LINK_SUPPORT
2142	/*	2162	/*
2143	* D: CopyArea pass - very useful for slower links	2163	* D: CopyArea pass - very useful for slower links
…		…
2149	{	2169	{
2150	int16_t nits;	2170	int16_t nits;
2151	int i = num_scr;	2171	int i = num_scr;
2152	int j;	2172	int j;
2153	int len, wlen;	2173	int len, wlen;
2154	dLocal (int, num_scr);
2155		2174
2156	j = nrow;	2175	j = nrow;
2157	wlen = len = -1;	2176	wlen = len = -1;
2158	row = i > 0 ? 0 : j - 1;	2177	row = i > 0 ? 0 : j - 1;
2159		2178
…		…
2225	int ypixel = (int)Row2Pixel (row);	2244	int ypixel = (int)Row2Pixel (row);
2226		2245
2227	for (col = 0; col < ncol; col++)	2246	for (col = 0; col < ncol; col++)
2228	{	2247	{
2229	/* compare new text with old - if exactly the same then continue */	2248	/* compare new text with old - if exactly the same then continue */
2230	if (stp[col] == dtp[col] /* Must match characters to skip. */	2249	if (stp[col] == dtp[col] && RS_SAME (srp[col], drp[col]))
2231	&& (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2232	|| (stp[col] == ' ' /* space w/ no background change */
2233	&& GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2234	continue;	2250	continue;
2235		2251
2236	// redraw one or more characters	2252	// redraw one or more characters
2237		2253
2238	// seek to the beginning of wide characters	2254	// seek to the beginning of wide characters
2239	while (expect_false (stp[col] == NOCHAR && col > 0))	2255	while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2240	--col;	2256	--col;
2241		2257
2242	rend_t rend = srp[col]; /* screen rendition (target rendition) */	2258	rend_t rend = srp[col]; /* screen rendition (target rendition) */
2243	text_t *text = stp + col;	2259	text_t *text = stp + col;
2244	int count = 1;	2260	int count = 1;
…		…
2282		2298
2283	col--; /* went one too far. move back */	2299	col--; /* went one too far. move back */
2284	count -= i; /* dump any matching trailing chars */	2300	count -= i; /* dump any matching trailing chars */
2285		2301
2286	// sometimes we optimize away the trailing NOCHAR's, add them back	2302	// sometimes we optimize away the trailing NOCHAR's, add them back
2287	while (expect_false (i && text[count] == NOCHAR))	2303	while (ecb_unlikely (i && text[count] == NOCHAR))
2288	count++, i--;	2304	count++, i--;
2289		2305
2290	/*	2306	/*
2291	* Determine the attributes for the string	2307	* Determine the attributes for the string
2292	*/	2308	*/
2293	int fore = fgcolor_of (rend); // desired foreground	2309	int fore = fgcolor_of (rend); // desired foreground
2294	int back = bgcolor_of (rend); // desired background	2310	int back = bgcolor_of (rend); // desired background
2295		2311
2296	// only do special processing if any attributes are set, which is unlikely	2312	// only do special processing if any attributes are set, which is unlikely
2297	if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))	2313	if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2298	{	2314	{
2299	bool invert = rend & RS_RVid;	2315	bool invert = rend & RS_RVid;
2300		2316
2301	#ifndef NO_BOLD_UNDERLINE_REVERSE	2317	#ifndef NO_BOLD_UNDERLINE_REVERSE
2302	if (rend & RS_Bold && fore == Color_fg)	2318	if (rend & RS_Bold && fore == Color_fg)
…		…
2391	/*	2407	/*
2392	* Actually do the drawing of the string here	2408	* Actually do the drawing of the string here
2393	*/	2409	*/
2394	rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];	2410	rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2395		2411
2396	if (expect_true (have_bg && back == Color_bg))	2412	if (ecb_likely (have_bg && back == Color_bg))
2397	{	2413	{
2398	// this is very ugly, maybe push it into ->draw?	2414	// this is very ugly, maybe push it into ->draw?
2399		2415
2400	for (i = 0; i < count; i++) /* don't draw empty strings */	2416	for (i = 0; i < count; i++) /* don't draw empty strings */
2401	if (text[i] != ' ')	2417	if (text[i] != ' ')
…		…
2408	did_clear: ;	2424	did_clear: ;
2409	}	2425	}
2410	else	2426	else
2411	font->draw (*drawable, xpixel, ypixel, text, count, fore, back);	2427	font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2412		2428
2413	if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))	2429	if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2414	{	2430	{
		2431	if (showcursor && focus && row == screen.cur.row
		2432	&& IN_RANGE_EXC (col, cur_col, cur_col + cursorwidth))
		2433	XSetForeground (dpy, gc, pix_colors[ccol1]);
		2434	else
2415	#if ENABLE_FRILLS	2435	#if ENABLE_FRILLS
2416	if (ISSET_PIXCOLOR (Color_underline))	2436	if (ISSET_PIXCOLOR (Color_underline))
2417	XSetForeground (dpy, gc, pix_colors[Color_underline]);	2437	XSetForeground (dpy, gc, pix_colors[Color_underline]);
2418	else	2438	else
2419	#endif	2439	#endif
…		…
2431	*/	2451	*/
2432	if (showcursor)	2452	if (showcursor)
2433	{	2453	{
2434	if (focus)	2454	if (focus)
2435	{	2455	{
2436	if (option (Opt_cursorUnderline))	2456	if (cursor_type == 0)
2437	*crp ^= RS_Uline;	2457	scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend);
2438	else	2458	else if (oldcursor.row >= 0)
2439	{	2459	{
2440	*crp ^= RS_RVid;	2460	XSetForeground (dpy, gc, pix_colors[ccol1]);
2441	#ifndef NO_CURSORCOLOR	2461	if (cursor_type == 1)
2442	*crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;	2462	XFillRectangle (dpy, vt, gc,
2443	#endif	2463	Col2Pixel (cur_col),
		2464	Row2Pixel (oldcursor.row + 1) - 2,
		2465	Width2Pixel (1),
		2466	2);
		2467	else
		2468	XFillRectangle (dpy, vt, gc,
		2469	Col2Pixel (cur_col),
		2470	Row2Pixel (oldcursor.row),
		2471	2,
		2472	Height2Pixel (1));
2444	}	2473	}
2445	}	2474	}
2446	else if (oldcursor.row >= 0)	2475	else if (oldcursor.row >= 0)
2447	{	2476	{
2448	int cursorwidth = 1;
2449	int col = oldcursor.col;
2450
2451	while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2452	col--;
2453
2454	while (col + cursorwidth < ncol
2455	&& drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2456	cursorwidth++;
2457
2458	#ifndef NO_CURSORCOLOR
2459	if (ISSET_PIXCOLOR (Color_cursor))
2460	XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2461	else
2462	#endif
2463	XSetForeground (dpy, gc, pix_colors[ccol1]);	2477	XSetForeground (dpy, gc, pix_colors[ccol1]);
2464		2478
2465	XDrawRectangle (dpy, vt, gc,	2479	XDrawRectangle (dpy, vt, gc,
2466	Col2Pixel (col),	2480	Col2Pixel (cur_col),
2467	Row2Pixel (oldcursor.row),	2481	Row2Pixel (oldcursor.row),
2468	(unsigned int) (Width2Pixel (cursorwidth) - 1),	2482	(unsigned int) (Width2Pixel (cursorwidth) - 1),
2469	(unsigned int) (Height2Pixel (1) - lineSpace - 1));	2483	(unsigned int) (Height2Pixel (1) - 1));
2470	}	2484	}
2471	}	2485	}
2472		2486
2473	/*	2487	/*
2474	* H: cleanup selection	2488	* H: cleanup selection
…		…
2483	screen.flags = old_screen_flags;	2497	screen.flags = old_screen_flags;
2484	num_scr = 0;	2498	num_scr = 0;
2485	num_scr_allow = 1;	2499	num_scr_allow = 1;
2486	}	2500	}
2487		2501
2488	void	2502	void ecb_cold
2489	rxvt_term::scr_remap_chars (line_t &l) NOTHROW	2503	rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2490	{	2504	{
2491	if (!l.t)	2505	if (!l.valid ())
2492	return;	2506	return;
2493		2507
2494	l.touch (); // maybe a bit of an overkill, but it's not performance-relevant	2508	l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2495		2509
2496	for (int i = ncol; i--; )	2510	for (int i = ncol; i--; )
2497	l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));	2511	l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2498	}	2512	}
2499		2513
2500	void	2514	void ecb_cold
2501	rxvt_term::scr_remap_chars () NOTHROW	2515	rxvt_term::scr_remap_chars () NOTHROW
2502	{	2516	{
2503	for (int i = total_rows; i--; )	2517	for (int i = total_rows; i--; )
2504	scr_remap_chars (row_buf [i]);	2518	scr_remap_chars (row_buf [i]);
2505		2519
…		…
2508	scr_remap_chars (drawn_buf [i]);	2522	scr_remap_chars (drawn_buf [i]);
2509	scr_remap_chars (swap_buf [i]);	2523	scr_remap_chars (swap_buf [i]);
2510	}	2524	}
2511	}	2525	}
2512		2526
2513	void	2527	void ecb_cold
2514	rxvt_term::scr_recolour (bool refresh) NOTHROW	2528	rxvt_term::scr_recolor (bool refresh) NOTHROW
2515	{	2529	{
2516	bool transparent = false;	2530	bool transparent = false;
2517		2531
2518	#ifdef HAVE_BG_PIXMAP	2532	#ifdef HAVE_IMG
2519	if (bg_pixmap != None)	2533	if (bg_img != 0)
2520	{	2534	{
2521	# ifdef ENABLE_TRANSPARENCY	2535	# if ENABLE_TRANSPARENCY
2522	if (bg_flags & BG_IS_TRANSPARENT)	2536	if (bg_flags & BG_IS_TRANSPARENT)
2523	{	2537	{
2524	XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap);	2538	XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2525	XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);	2539	XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2526		2540
2527	transparent = true;	2541	transparent = true;
2528	}	2542	}
2529	else	2543	else
2530	# endif	2544	# endif
2531	{	2545	{
2532	XSetWindowBackground (dpy, parent, pix_colors[Color_border]);	2546	XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2533	XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);	2547	XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2534	}	2548	}
2535	}	2549	}
2536	else	2550	else
2537	#endif	2551	#endif
2538	{	2552	{
…		…
2540	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);	2554	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2541	}	2555	}
2542		2556
2543	XClearWindow (dpy, parent);	2557	XClearWindow (dpy, parent);
2544		2558
2545	if (scrollBar.win)	2559	if (scrollBar.state && scrollBar.win)
2546	{	2560	{
2547	if (transparent)	2561	if (transparent)
2548	XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);	2562	XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2549	else	2563	else
2550	XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);	2564	XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2551	scrollBar.state = STATE_IDLE;	2565	scrollBar.state = SB_STATE_IDLE;
2552	scrollBar.show (0);	2566	scrollBar.show (0);
2553	}	2567	}
2554		2568
2555	if (refresh)	2569	if (refresh)
2556	{	2570	{
…		…
2621	for (rend_t *srp = ROW(row).r; col < end_col; col++)	2635	for (rend_t *srp = ROW(row).r; col < end_col; col++)
2622	srp[col] ^= rstyle;	2636	srp[col] ^= rstyle;
2623	}	2637	}
2624		2638
2625	/* ------------------------------------------------------------------------- */	2639	/* ------------------------------------------------------------------------- */
2626	void	2640	void ecb_hot
2627	rxvt_term::scr_reverse_selection () NOTHROW	2641	rxvt_term::scr_reverse_selection () NOTHROW
2628	{	2642	{
2629	if (selection.op	2643	if (selection.op
2630	&& current_screen == selection.screen	2644	&& current_screen == selection.screen
2631	&& selection.end.row >= view_start)	2645	&& selection.end.row >= view_start)
…		…
2650	*/	2664	*/
2651	#if 0	2665	#if 0
2652	void	2666	void
2653	rxvt_term::scr_dump (int fd) NOTHROW	2667	rxvt_term::scr_dump (int fd) NOTHROW
2654	{	2668	{
2655	int row, wrote;	2669	// if this method is needed, it can be implemented by factoring the
2656	unsigned int width, towrite;	2670	// relevant code in scr_printscreen
2657	const char r1[] = "\n";
2658
2659	for (row = saveLines + top_row;
2660	row < saveLines + nrow - 1; row++)
2661	{
2662	width = row_buf[row].l >= 0 ? row_buf[row].l
2663	: ncol;
2664	for (towrite = width; towrite; towrite -= wrote)
2665	{
2666	wrote = write (fd, & (row_buf[row].t[width - towrite]),
2667	towrite);
2668	if (wrote < 0)
2669	return; /* XXX: death, no report */
2670	}
2671	if (row_buf[row].l >= 0)
2672	if (write (fd, r1, 1) <= 0)
2673	return; /* XXX: death, no report */
2674	}
2675	}	2671	}
2676	#endif	2672	#endif
2677		2673
2678	/* ------------------------------------------------------------------------- *	2674	/* ------------------------------------------------------------------------- *
2679	* CHARACTER SELECTION *	2675	* CHARACTER SELECTION *
2680	* ------------------------------------------------------------------------- */	2676	* ------------------------------------------------------------------------- */
2681	void	2677	void
2682	rxvt_term::selection_check (int check_more) NOTHROW	2678	rxvt_term::selection_check (int check_more) NOTHROW
2683	{	2679	{
2684	row_col_t pos;
2685
2686	if (!selection.op)	2680	if (!selection.op)
2687	return;	2681	return;
2688		2682
2689	pos.row = pos.col = 0;
2690	if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)	2683	if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2691	|| !IN_RANGE_EXC (selection.mark.row, top_row, nrow)	2684	|| !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2692	|| !IN_RANGE_EXC (selection.end.row, top_row, nrow)	2685	|| !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2693	|| (check_more == 1	2686	|| (check_more == 1
2694	&& current_screen == selection.screen	2687	&& current_screen == selection.screen
2695	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)	2688	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2696	&& ROWCOL_IS_BEFORE (screen.cur, selection.end))	2689	&& ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2697	|| (check_more == 2
2698	&& ROWCOL_IS_BEFORE (selection.beg, pos)
2699	&& ROWCOL_IS_AFTER (selection.end, pos))
2700	|| (check_more == 3
2701	&& ROWCOL_IS_AFTER (selection.end, pos))
2702	|| (check_more == 4 /* screen width change */
2703	&& (selection.beg.row != selection.end.row
2704	|| selection.end.col > ncol)))
2705	CLEAR_SELECTION ();	2690	CLEAR_ALL_SELECTION ();
		2691	}
		2692
		2693	void
		2694	rxvt_term::selection_changed () NOTHROW
		2695	{
		2696	line_t &r1 = ROW (selection.beg.row);
		2697	while (selection.beg.col < r1.l && r1.t [selection.beg.col] == NOCHAR)
		2698	++selection.beg.col;
		2699
		2700	line_t &r2 = ROW (selection.end.row);
		2701	while (selection.end.col < r2.l && r2.t [selection.end.col] == NOCHAR)
		2702	++selection.end.col;
		2703
		2704	want_refresh = 1;
2706	}	2705	}
2707		2706
2708	/* ------------------------------------------------------------------------- */	2707	/* ------------------------------------------------------------------------- */
2709	/*	2708	/*
2710	* Paste a selection direct to the command fd	2709	* Paste a selection direct to the command fd
…		…
2716	for (unsigned int i = 0; i < len; i++)	2715	for (unsigned int i = 0; i < len; i++)
2717	if (data[i] == C0_LF)	2716	if (data[i] == C0_LF)
2718	data[i] = C0_CR;	2717	data[i] = C0_CR;
2719		2718
2720	if (priv_modes & PrivMode_BracketPaste)	2719	if (priv_modes & PrivMode_BracketPaste)
2721	tt_printf ("\e[200~");	2720	tt_printf ("\x1b[200~");
2722		2721
2723	tt_write (data, len);	2722	tt_write (data, len);
2724		2723
2725	if (priv_modes & PrivMode_BracketPaste)	2724	if (priv_modes & PrivMode_BracketPaste)
2726	tt_printf ("\e[201~");	2725	tt_printf ("\x1b[201~");
2727	}	2726	}
2728		2727
2729	void	2728	void
2730	rxvt_term::paste (char *data, unsigned int len) NOTHROW	2729	rxvt_term::paste (char *data, unsigned int len) NOTHROW
2731	{	2730	{
…		…
2951	/* ------------------------------------------------------------------------- */	2950	/* ------------------------------------------------------------------------- */
2952	/*	2951	/*
2953	* Mark or select text based upon number of clicks: 1, 2, or 3	2952	* Mark or select text based upon number of clicks: 1, 2, or 3
2954	* EXT: button 1 press	2953	* EXT: button 1 press
2955	*/	2954	*/
2956	void	2955	void ecb_cold
2957	rxvt_term::selection_click (int clicks, int x, int y) NOTHROW	2956	rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
2958	{	2957	{
2959	clicks = ((clicks - 1) % 3) + 1;	2958	clicks = ((clicks - 1) % 3) + 1;
2960	selection.clicks = clicks; /* save clicks so extend will work */	2959	selection.clicks = clicks; /* save clicks so extend will work */
2961		2960
…		…
2980		2979
2981	/* ------------------------------------------------------------------------- */	2980	/* ------------------------------------------------------------------------- */
2982	/*	2981	/*
2983	* Mark a selection at the specified col/row	2982	* Mark a selection at the specified col/row
2984	*/	2983	*/
2985	void	2984	void ecb_cold
2986	rxvt_term::selection_start_colrow (int col, int row) NOTHROW	2985	rxvt_term::selection_start_colrow (int col, int row) NOTHROW
2987	{	2986	{
2988	want_refresh = 1;	2987	want_refresh = 1;
2989		2988
2990	selection.mark.row = row + view_start;	2989	selection.mark.row = row + view_start;
…		…
3013	* Word select: select text for 2 clicks	3012	* Word select: select text for 2 clicks
3014	* We now only find out the boundary in one direction	3013	* We now only find out the boundary in one direction
3015	*/	3014	*/
3016		3015
3017	/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */	3016	/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3018	#define DELIMIT_TEXT(x) \	3017	#define DELIMIT_TEXT(x) \
3019	(unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))	3018	(unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3020	#define DELIMIT_REND(x) 1	3019	#define DELIMIT_REND(x) 1
3021		3020
3022	void	3021	void ecb_cold
3023	rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW	3022	rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3024	{	3023	{
3025	int col, row, dirnadd, tcol, trow, w1, w2;	3024	int col, row, dirnadd, tcol, trow, w1, w2;
3026	row_col_t bound;	3025	row_col_t bound;
3027	text_t *stp;	3026	text_t *stp;
…		…
3101	* EXT: button 3 press; button 1 or 3 drag	3100	* EXT: button 3 press; button 1 or 3 drag
3102	* flag == 0 ==> button 1	3101	* flag == 0 ==> button 1
3103	* flag == 1 ==> button 3 press	3102	* flag == 1 ==> button 3 press
3104	* flag == 2 ==> button 3 motion	3103	* flag == 2 ==> button 3 motion
3105	*/	3104	*/
3106	void	3105	void ecb_cold
3107	rxvt_term::selection_extend (int x, int y, int flag) NOTHROW	3106	rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3108	{	3107	{
3109	int col = clamp (Pixel2Col (x), 0, ncol);	3108	int col = clamp (Pixel2Col (x), 0, ncol);
3110	int row = clamp (Pixel2Row (y), 0, nrow - 1);	3109	int row = clamp (Pixel2Row (y), 0, nrow - 1);
3111		3110
…		…
3137		3136
3138	/* ------------------------------------------------------------------------- */	3137	/* ------------------------------------------------------------------------- */
3139	/*	3138	/*
3140	* Extend the selection to the specified col/row	3139	* Extend the selection to the specified col/row
3141	*/	3140	*/
3142	void	3141	void ecb_cold
3143	rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW	3142	rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3144	{	3143	{
3145	row_col_t pos;	3144	row_col_t pos;
3146	enum {	3145	enum {
3147	LEFT, RIGHT	3146	LEFT, RIGHT
3148	} closeto = RIGHT;	3147	} closeto = RIGHT;
3149
3150	want_refresh = 1;
3151		3148
3152	switch (selection.op)	3149	switch (selection.op)
3153	{	3150	{
3154	case SELECTION_INIT:	3151	case SELECTION_INIT:
3155	CLEAR_SELECTION ();	3152	CLEAR_SELECTION ();
…		…
3335		3332
3336	#if !ENABLE_MINIMAL	3333	#if !ENABLE_MINIMAL
3337	if (selection.rect && selection.beg.col > selection.end.col)	3334	if (selection.rect && selection.beg.col > selection.end.col)
3338	::swap (selection.beg.col, selection.end.col);	3335	::swap (selection.beg.col, selection.end.col);
3339	#endif	3336	#endif
		3337
		3338	selection_changed ();
3340	}	3339	}
3341		3340
3342	#if !ENABLE_MINIMAL	3341	#if !ENABLE_MINIMAL
3343	void	3342	void ecb_cold
3344	rxvt_term::selection_remove_trailing_spaces () NOTHROW	3343	rxvt_term::selection_remove_trailing_spaces () NOTHROW
3345	{	3344	{
3346	int32_t end_col, end_row;	3345	int32_t end_col, end_row;
3347	text_t *stp;	3346	text_t *stp;
3348		3347
…		…
3386	/* ------------------------------------------------------------------------- */	3385	/* ------------------------------------------------------------------------- */
3387	/*	3386	/*
3388	* Double click on button 3 when already selected	3387	* Double click on button 3 when already selected
3389	* EXT: button 3 double click	3388	* EXT: button 3 double click
3390	*/	3389	*/
3391	void	3390	void ecb_cold
3392	rxvt_term::selection_rotate (int x, int y) NOTHROW	3391	rxvt_term::selection_rotate (int x, int y) NOTHROW
3393	{	3392	{
3394	selection.clicks = selection.clicks % 3 + 1;	3393	selection.clicks = selection.clicks % 3 + 1;
3395	selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);	3394	selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3396	}	3395	}
…		…
3398	/* ------------------------------------------------------------------------- */	3397	/* ------------------------------------------------------------------------- */
3399	/*	3398	/*
3400	* Respond to a request for our current selection	3399	* Respond to a request for our current selection
3401	* EXT: SelectionRequest	3400	* EXT: SelectionRequest
3402	*/	3401	*/
3403	void	3402	void ecb_cold
3404	rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW	3403	rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3405	{	3404	{
3406	Atom property = rq.property == None ? rq.target : rq.property;	3405	Atom property = rq.property == None ? rq.target : rq.property;
3407	XSelectionEvent ev;	3406	XSelectionEvent ev;
3408		3407
…		…
3501	cl = selection.clip_text;	3500	cl = selection.clip_text;
3502	selectlen = selection.clip_len;	3501	selectlen = selection.clip_len;
3503	}	3502	}
3504	else	3503	else
3505	{	3504	{
3506	cl = L"";	3505	cl = (wchar_t *)L"";
3507	selectlen = 0;	3506	selectlen = 0;
3508	}	3507	}
3509		3508
3510	#if !ENABLE_MINIMAL	3509	#if !ENABLE_MINIMAL
3511	// xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it	3510	// xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
…		…
3541		3540
3542	XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);	3541	XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3543	}	3542	}
3544		3543
3545	/* ------------------------------------------------------------------------- */	3544	/* ------------------------------------------------------------------------- */
3546	#ifdef USE_XIM	3545	#if USE_XIM
3547	void	3546	void ecb_cold
3548	rxvt_term::im_set_position (XPoint &pos) NOTHROW	3547	rxvt_term::im_set_position (XPoint &pos) NOTHROW
3549	{	3548	{
3550	XWindowAttributes xwa;	3549	XWindowAttributes xwa;
3551		3550
3552	XGetWindowAttributes (dpy, vt, &xwa);	3551	XGetWindowAttributes (dpy, vt, &xwa);

Diff Legend

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