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.374 by sf-exg, Sat Feb 12 00:50:04 2011 UTC vs.
Revision 1.440 by root, Wed Mar 27 17:24:16 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;
…		…
98		96
99	/* Fill part/all of a line with blanks. */	97	/* Fill part/all of a line with blanks. */
100	void	98	void
101	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
102	{	100	{
103	if (!l.t)	101	if (!l.valid ())
104	{	102	{
105	lalloc (l);	103	l.alloc ();
106	col = 0;	104	col = 0;
107	width = ncol;	105	width = ncol;
108	}	106	}
109		107
110	l.touch ();	108	l.touch ();
…		…
152	l.r[col] = rend;	150	l.r[col] = rend;
153	col++;	151	col++;
154	} while (col < ncol && l.t[col] == NOCHAR);	152	} while (col < ncol && l.t[col] == NOCHAR);
155	}	153	}
156		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
157	/* ------------------------------------------------------------------------- *	165	/* ------------------------------------------------------------------------- *
158	* SCREEN INITIALISATION *	166	* SCREEN INITIALISATION *
159	* ------------------------------------------------------------------------- */	167	* ------------------------------------------------------------------------- */
160		168
161	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
162	rxvt_term::scr_reset ()	214	rxvt_term::scr_reset ()
163	{	215	{
		216	#if ENABLE_OVERLAY
		217	scr_overlay_off ();
		218	#endif
		219
164	view_start = 0;	220	view_start = 0;
165	num_scr = 0;	221	num_scr = 0;
166		222
167	if (ncol == 0)	223	if (ncol == 0)
168	ncol = 80;	224	ncol = 80;
…		…
188	total_rows = nrow + saveLines;	244	total_rows = nrow + saveLines;
189		245
190	screen.tscroll = 0;	246	screen.tscroll = 0;
191	screen.bscroll = nrow - 1;	247	screen.bscroll = nrow - 1;
192		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
193	if (!row_buf)	257	if (!prev_row_buf)
194	{	258	{
195	/*
196	* first time called so just malloc everything: don't rely on realloc
197	*/
198	top_row = 0;	259	top_row = 0;
199	term_start = 0;	260	term_start = 0;
200
201	talloc = new rxvt_salloc (ncol * sizeof (text_t));
202	ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
203
204	row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
205	drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
206	swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
207
208	for (int row = nrow; row--; )
209	{
210	scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
211	scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
212	scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
213	}
214		261
215	memset (charsets, 'B', sizeof (charsets));	262	memset (charsets, 'B', sizeof (charsets));
216	rstyle = DEFAULT_RSTYLE;	263	rstyle = DEFAULT_RSTYLE;
217	screen.flags = Screen_DefaultFlags;	264	screen.flags = Screen_DefaultFlags;
218	screen.cur.row = screen.cur.col = 0;	265	screen.cur.row = screen.cur.col = 0;
…		…
241	{	288	{
242	/*	289	/*
243	* add or delete rows as appropriate	290	* add or delete rows as appropriate
244	*/	291	*/
245		292
246	rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));	293	int common_col = min (prev_ncol, ncol);
247	rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
248
249	#if 0
250	if (nrow < prev_nrow)
251	{
252	for (int row = nrow; row < prev_nrow; row++)
253	{
254	lfree (swap_buf [row]);
255	lfree (drawn_buf[row]);
256	}
257	}
258	#endif
259
260	drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
261	swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
262		294
263	for (int row = min (nrow, prev_nrow); row--; )	295	for (int row = min (nrow, prev_nrow); row--; )
264	{	296	{
265	lresize (drawn_buf[row]);	297	scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
266	lresize (swap_buf [row]);	298	memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
267	}	299	memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
268		300
269	for (int row = prev_nrow; row < nrow; row++)	301	copy_line (swap_buf [row], prev_swap_buf [row]);
270	{	302	}
271	swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
272	drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
273	}
274
275	line_t *old_buf = row_buf;
276	row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
277		303
278	int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row	304	int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
279	int pend = MOD (term_start + top_row , prev_total_rows);	305	int pend = MOD (term_start + top_row , prev_total_rows);
280	int q = total_rows; // rewrapped row	306	int q = total_rows; // rewrapped row
281		307
…		…
289	ocur.row = MOD (term_start + ocur.row, prev_total_rows);	315	ocur.row = MOD (term_start + ocur.row, prev_total_rows);
290		316
291	do	317	do
292	{	318	{
293	p = MOD (p - 1, prev_total_rows);	319	p = MOD (p - 1, prev_total_rows);
294	assert (old_buf [MOD (p, prev_total_rows)].t);	320	assert (prev_row_buf [MOD (p, prev_total_rows)].t);
295	int plines = 1;	321	int plines = 1;
296	int llen = old_buf [MOD (p, prev_total_rows)].l;	322	int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
297		323
298	while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())	324	while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ())
299	{	325	{
300	p = MOD (p - 1, prev_total_rows);	326	p = MOD (p - 1, prev_total_rows);
301		327
302	plines++;	328	plines++;
303	llen += prev_ncol;	329	llen += prev_ncol;
…		…
316		342
317	// re-assemble the full line by destination lines	343	// re-assemble the full line by destination lines
318	for (int qrow = q; qlines--; qrow++)	344	for (int qrow = q; qlines--; qrow++)
319	{	345	{
320	qline = row_buf + qrow;	346	qline = row_buf + qrow;
321	lalloc (*qline);	347	qline->alloc (); // redundant with next line
322	qline->l = ncol;	348	qline->l = ncol;
323	qline->is_longer (1);	349	qline->is_longer (1);
324		350
325	int qcol = 0;	351	int qcol = 0;
326		352
…		…
341	// this seems to upset applications/shells/readline	367	// this seems to upset applications/shells/readline
342	// least.	368	// least.
343	if (prow == ocur.row)	369	if (prow == ocur.row)
344	screen.cur.row = q - (total_rows - nrow);	370	screen.cur.row = q - (total_rows - nrow);
345		371
346	line_t &pline = old_buf [prow];	372	line_t &pline = prev_row_buf [prow];
347		373
348	int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);	374	int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
349		375
350	memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));	376	memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
351	memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));	377	memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
…		…
372	{	398	{
373	// if no scrollback exists (yet), wing, instead of wrap	399	// if no scrollback exists (yet), wing, instead of wrap
374		400
375	for (int row = min (nrow, prev_nrow); row--; )	401	for (int row = min (nrow, prev_nrow); row--; )
376	{	402	{
377	line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];	403	line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
378	line_t &qline = row_buf [row];	404	line_t &dst = row_buf [row];
379		405
380	qline = pline;	406	copy_line (dst, src);
381	lresize (qline);
382	}	407	}
383		408
384	for (int row = prev_nrow; row < nrow; row++)	409	for (int row = prev_nrow; row < nrow; row++)
385	{
386	row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);	410	scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
387	}
388		411
389	term_start = 0;	412	term_start = 0;
390	}	413	}
391
392	free (old_buf);
393	delete old_ta;
394	delete old_ra;
395		414
396	clamp_it (screen.cur.row, 0, nrow - 1);	415	clamp_it (screen.cur.row, 0, nrow - 1);
397	clamp_it (screen.cur.col, 0, ncol - 1);	416	clamp_it (screen.cur.col, 0, ncol - 1);
398	}	417	}
399		418
		419	for (int row = nrow; row--; )
		420	{
		421	if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
		422	if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
		423	if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
		424	}
		425
		426	chunk_free (prev_chunk, prev_chunk_size);
		427
400	free (tabs);	428	free (tabs);
401	tabs = (char *)rxvt_malloc (ncol);	429	tabs = (char *)rxvt_malloc (ncol);
402		430
403	for (int col = ncol; col--; )	431	for (int col = ncol; col--; )
404	tabs [col] = col % TABSIZE == 0;	432	tabs [col] = col % TABSIZE == 0;
…		…
411	tt_winch ();	439	tt_winch ();
412		440
413	HOOK_INVOKE ((this, HOOK_RESET, DT_END));	441	HOOK_INVOKE ((this, HOOK_RESET, DT_END));
414	}	442	}
415		443
416	/* ------------------------------------------------------------------------- */	444	void ecb_cold
417	/*
418	* Free everything. That way malloc debugging can find leakage.
419	*/
420	void
421	rxvt_term::scr_release () NOTHROW	445	rxvt_term::scr_release () NOTHROW
422	{	446	{
423	if (row_buf)	447	chunk_free (chunk, chunk_size);
424	{	448	chunk = 0;
425	delete talloc; talloc = 0;	449	row_buf = 0;
426	delete ralloc; ralloc = 0;
427		450
428	free (row_buf);
429	free (swap_buf);
430	free (drawn_buf);
431	row_buf = 0; // signal that we freed all the arrays above
432
433	free (tabs);	451	free (tabs);
434	tabs = 0;	452	tabs = 0;
435	}
436	}	453	}
437		454
438	/* ------------------------------------------------------------------------- */	455	/* ------------------------------------------------------------------------- */
439	/*	456	/*
440	* Hard/Soft reset	457	* Hard/Soft reset
441	*/	458	*/
442	void	459	void ecb_cold
443	rxvt_term::scr_poweron ()	460	rxvt_term::scr_poweron ()
444	{	461	{
445	scr_release ();	462	scr_release ();
		463
446	prev_nrow = prev_ncol = 0;	464	prev_nrow = prev_ncol = 0;
447	rvideo_mode = false;	465	rvideo_mode = false;
448	scr_soft_reset ();	466	scr_soft_reset ();
449	scr_reset ();	467	scr_reset ();
450		468
451	scr_clear (true);	469	scr_clear (true);
452	scr_refresh ();	470	scr_refresh ();
453	}	471	}
454		472
455	void	473	void ecb_cold
456	rxvt_term::scr_soft_reset ()	474	rxvt_term::scr_soft_reset () NOTHROW
457	{	475	{
458	/* only affects modes, nothing drastic such as clearing the screen */	476	/* only affects modes, nothing drastic such as clearing the screen */
459	#if ENABLE_OVERLAY	477	#if ENABLE_OVERLAY
460	scr_overlay_off ();	478	scr_overlay_off ();
461	#endif	479	#endif
…		…
516	assert (s->cur.row >= 0);	534	assert (s->cur.row >= 0);
517	assert (s->cur.col >= 0);	535	assert (s->cur.col >= 0);
518	}	536	}
519		537
520	void	538	void
521	rxvt_term::scr_swap_screen ()	539	rxvt_term::scr_swap_screen () NOTHROW
522	{	540	{
523	if (!option (Opt_secondaryScreen))	541	if (!option (Opt_secondaryScreen))
524	return;	542	return;
525		543
526	for (int i = prev_nrow; i--; )	544	for (int i = prev_nrow; i--; )
…		…
545	return;	563	return;
546		564
547	want_refresh = 1;	565	want_refresh = 1;
548	view_start = 0;	566	view_start = 0;
549		567
550	selection_check (2); /* check for boundary cross */	568	/* check for boundary cross */
		569	row_col_t pos;
		570	pos.row = pos.col = 0;
		571	if (ROWCOL_IS_BEFORE (selection.beg, pos)
		572	&& ROWCOL_IS_AFTER (selection.end, pos))
		573	CLEAR_SELECTION ();
551		574
552	current_screen = scrn;	575	current_screen = scrn;
553		576
554	#if NSCREENS	577	#if NSCREENS
555	if (option (Opt_secondaryScreen))	578	if (option (Opt_secondaryScreen))
…		…
621	/*	644	/*
622	* Scroll text between <row1> and <row2> inclusive, by <count> lines	645	* Scroll text between <row1> and <row2> inclusive, by <count> lines
623	* count positive ==> scroll up	646	* count positive ==> scroll up
624	* count negative ==> scroll down	647	* count negative ==> scroll down
625	*/	648	*/
626	int	649	int ecb_hot
627	rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW	650	rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
628	{	651	{
629	if (count == 0 || (row1 > row2))	652	if (count == 0 || (row1 > row2))
630	return 0;	653	return 0;
631		654
…		…
634		657
635	if (count > 0	658	if (count > 0
636	&& row1 == 0	659	&& row1 == 0
637	&& (current_screen == PRIMARY || option (Opt_secondaryScroll)))	660	&& (current_screen == PRIMARY || option (Opt_secondaryScroll)))
638	{	661	{
		662	min_it (count, total_rows - (nrow - (row2 + 1)));
		663
639	top_row = max (top_row - count, -saveLines);	664	top_row = max (top_row - count, -saveLines);
640
641	// scroll everything up 'count' lines
642	term_start = (term_start + count) % total_rows;
643		665
644	// sever bottommost line	666	// sever bottommost line
645	{	667	{
646	line_t &l = ROW(row2 - count);	668	line_t &l = ROW(row2);
647	l.is_longer (0);	669	l.is_longer (0);
648	l.touch ();	670	l.touch ();
649	}	671	}
650		672
		673	// scroll everything up 'count' lines
		674	term_start = (term_start + count) % total_rows;
		675
		676	// now copy lines below the scroll region bottom to the
		677	// bottom of the screen again, so they look as if they
		678	// hadn't moved.
		679	for (int i = nrow; --i > row2; )
		680	{
		681	line_t &l1 = ROW(i - count);
		682	line_t &l2 = ROW(i);
		683
		684	::swap (l1, l2);
		685	l2.touch ();
		686	}
		687
651	// erase newly scrolled-in lines	688	// erase newly scrolled-in lines
652	for (int i = count; i--; )	689	for (int i = count; i--; )
653	{	690	{
654	line_t &l = ROW(nrow - 1 - i);	691	line_t &l = ROW(row2 - i);
655		692
656	// optimize if already cleared, can be significant on slow machines	693	// optimise if already cleared, can be significant on slow machines
657	// could be rolled into scr_blank_screen_mem	694	// could be rolled into scr_blank_screen_mem
658	if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))	695	if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
659	{	696	{
660	scr_blank_line (l, 0, l.l, rstyle);	697	scr_blank_line (l, 0, l.l, rstyle);
661	l.l = 0;	698	l.l = 0;
…		…
663	}	700	}
664	else	701	else
665	scr_blank_screen_mem (l, rstyle);	702	scr_blank_screen_mem (l, rstyle);
666	}	703	}
667		704
668	// now copy lines below the scroll region bottom to the
669	// bottom of the screen again, so they look as if they
670	// hadn't moved.
671	for (int i = nrow; --i > row2; )
672	{
673	line_t &l1 = ROW(i - count);
674	line_t &l2 = ROW(i);
675
676	::swap (l1, l2);
677	l2.touch ();
678	}
679
680	// move and/or clear selection, if any	705	// move and/or clear selection, if any
681	if (selection.op && current_screen == selection.screen)	706	if (selection.op && current_screen == selection.screen
		707	&& selection.beg.row <= row2)
682	{	708	{
683	selection.beg.row -= count;	709	selection.beg.row -= count;
684	selection.end.row -= count;	710	selection.end.row -= count;
685	selection.mark.row -= count;	711	selection.mark.row -= count;
686		712
687	if (selection.beg.row < top_row	713	selection_check (0);
688	|| selection.end.row < top_row
689	|| selection.mark.row < top_row)
690	{
691	CLEAR_ALL_SELECTION ();
692	selection.op = SELECTION_CLEAR;
693	}
694	}	714	}
695		715
696	// finally move the view window, if desired	716	// finally move the view window, if desired
697	if (option (Opt_scrollWithBuffer)	717	if (option (Opt_scrollWithBuffer)
698	&& view_start != 0	718	&& view_start != 0
699	&& view_start != -saveLines)	719	&& view_start != -saveLines)
700	scr_page (UP, count);	720	scr_page (count);
701		721
702	if (SHOULD_INVOKE (HOOK_SCROLL_BACK))	722	if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
703	HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));	723	HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
704	}	724	}
705	else	725	else
…		…
728	}	748	}
729		749
730	// use a simple and robust scrolling algorithm, this	750	// use a simple and robust scrolling algorithm, this
731	// part of scr_scroll_text is not time-critical.	751	// part of scr_scroll_text is not time-critical.
732		752
		753	// sever line above scroll region
		754	if (row1)
		755	{
		756	line_t &l = ROW(row1 - 1);
		757	l.is_longer (0);
		758	l.touch ();
		759	}
		760
733	int rows = row2 - row1 + 1;	761	int rows = row2 - row1 + 1;
734		762
735	min_it (count, rows);	763	min_it (count, rows);
736		764
737	line_t *temp_buf = row_buf + total_rows;	765	line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
738		766
739	for (int row = 0; row < rows; row++)	767	for (int row = 0; row < rows; row++)
740	{	768	{
741	temp_buf [row] = ROW(row1 + (row + count + rows) % rows);	769	temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
742		770
…		…
744	scr_blank_screen_mem (temp_buf [row], rstyle);	772	scr_blank_screen_mem (temp_buf [row], rstyle);
745	}	773	}
746		774
747	for (int row = 0; row < rows; row++)	775	for (int row = 0; row < rows; row++)
748	ROW(row1 + row) = temp_buf [row];	776	ROW(row1 + row) = temp_buf [row];
		777
		778	// sever bottommost line
		779	{
		780	line_t &l = ROW(row2);
		781	l.is_longer (0);
		782	l.touch ();
		783	}
749	}	784	}
750		785
751	return count;	786	return count;
752	}	787	}
753		788
754	/* ------------------------------------------------------------------------- */	789	/* ------------------------------------------------------------------------- */
755	/*	790	/*
756	* Add text given in <str> of length <len> to screen struct	791	* Add text given in <str> of length <len> to screen struct
757	*/	792	*/
758	void	793	void ecb_hot
759	rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW	794	rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
760	{	795	{
761	if (len <= 0) /* sanity */	796	if (len <= 0) /* sanity */
762	return;	797	return;
763		798
764	unsigned char checksel;	799	bool checksel;
765	unicode_t c;	800	unicode_t c;
766	int ncol = this->ncol;	801	int ncol = this->ncol;
767	const wchar_t *strend = str + len;	802	const wchar_t *strend = str + len;
768		803
769	want_refresh = 1;	804	want_refresh = 1;
…		…
795		830
796	while (str < strend)	831	while (str < strend)
797	{	832	{
798	c = (unicode_t)*str++; // convert to rxvt-unicodes representation	833	c = (unicode_t)*str++; // convert to rxvt-unicodes representation
799		834
800	if (expect_false (c < 0x20))	835	if (ecb_unlikely (c < 0x20))
801	if (c == C0_LF)	836	if (c == C0_LF)
802	{	837	{
803	max_it (line->l, screen.cur.col);	838	max_it (line->l, screen.cur.col);
804		839
805	screen.flags &= ~Screen_WrapNext;	840	screen.flags &= ~Screen_WrapNext;
…		…
824	{	859	{
825	scr_tab (1, true);	860	scr_tab (1, true);
826	continue;	861	continue;
827	}	862	}
828		863
829	if (expect_false (	864	if (ecb_unlikely (
830	checksel /* see if we're writing within selection */	865	checksel /* see if we're writing within selection */
831	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)	866	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
832	&& ROWCOL_IS_BEFORE (screen.cur, selection.end)	867	&& ROWCOL_IS_BEFORE (screen.cur, selection.end)
833	))	868	))
834	{	869	{
…		…
839	* should be a similar check.	874	* should be a similar check.
840	*/	875	*/
841	CLEAR_SELECTION ();	876	CLEAR_SELECTION ();
842	}	877	}
843		878
844	if (expect_false (screen.flags & Screen_WrapNext))	879	if (ecb_unlikely (screen.flags & Screen_WrapNext))
845	{	880	{
846	scr_do_wrap ();	881	scr_do_wrap ();
847		882
848	line->l = ncol;	883	line->l = ncol;
849	line->is_longer (1);	884	line->is_longer (1);
…		…
851	row = screen.cur.row;	886	row = screen.cur.row;
852	line = &ROW(row); /* _must_ refresh */	887	line = &ROW(row); /* _must_ refresh */
853	}	888	}
854		889
855	// some utf-8 decoders "decode" surrogate characters: let's fix this.	890	// some utf-8 decoders "decode" surrogate characters: let's fix this.
856	if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff)))	891	if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
857	c = 0xfffd;	892	c = 0xfffd;
858		893
859	// rely on wcwidth to tell us the character width, do wcwidth before	894	// rely on wcwidth to tell us the character width, do wcwidth before
860	// further replacements, as wcwidth might return -1 for the line	895	// further replacements, as wcwidth might return -1 for the line
861	// drawing characters below as they might be invalid in the current	896	// drawing characters below as they might be invalid in the current
862	// locale.	897	// locale.
863	int width = WCWIDTH (c);	898	int width = WCWIDTH (c);
864		899
865	if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL	900	if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
866	{	901	{
867	// vt100 special graphics and line drawing	902	// vt100 special graphics and line drawing
868	// 5f-7e standard vt100	903	// 5f-7e standard vt100
869	// 40-5e rxvt extension for extra curses acs chars	904	// 40-5e rxvt extension for extra curses acs chars
870	static uint16_t vt100_0[62] = { // 41 .. 7e	905	static uint16_t vt100_0[62] = { // 41 .. 7e
…		…
883	c = vt100_0[c - 0x41];	918	c = vt100_0[c - 0x41];
884	width = 1; // vt100 line drawing characters are always single-width	919	width = 1; // vt100 line drawing characters are always single-width
885	}	920	}
886	}	921	}
887		922
888	if (expect_false (screen.flags & Screen_Insert))	923	if (ecb_unlikely (screen.flags & Screen_Insert))
889	scr_insdel_chars (width, INSERT);	924	scr_insdel_chars (width, INSERT);
890		925
891	if (width != 0)	926	if (width != 0)
892	{	927	{
893	#if !UNICODE_3	928	#if !UNICODE_3
…		…
901	#endif	936	#endif
902		937
903	rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));	938	rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
904		939
905	// if the character doesn't fit into the remaining columns...	940	// if the character doesn't fit into the remaining columns...
906	if (expect_false (screen.cur.col > ncol - width && ncol >= width))	941	if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
907	{	942	{
908	if (screen.flags & Screen_Autowrap)	943	if (screen.flags & Screen_Autowrap)
909	{	944	{
910	// ... artificially enlargen the previous one	945	// ... artificially enlargen the previous one
911	c = NOCHAR;	946	c = NOCHAR;
…		…
918		953
919	// nuke the character at this position, if required	954	// nuke the character at this position, if required
920	// due to wonderful coincidences everywhere else in this loop	955	// due to wonderful coincidences everywhere else in this loop
921	// we never have to check for overwriting a wide char itself,	956	// we never have to check for overwriting a wide char itself,
922	// only its tail.	957	// only its tail.
923	if (expect_false (line->t[screen.cur.col] == NOCHAR))	958	if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
924	scr_kill_char (*line, screen.cur.col);	959	scr_kill_char (*line, screen.cur.col);
925		960
926	line->touch ();	961	line->touch ();
927		962
928	do	963	do
929	{	964	{
930	line->t[screen.cur.col] = c;	965	line->t[screen.cur.col] = c;
931	line->r[screen.cur.col] = rend;	966	line->r[screen.cur.col] = rend;
932		967
933	if (expect_true (screen.cur.col < ncol - 1))	968	if (ecb_likely (screen.cur.col < ncol - 1))
934	screen.cur.col++;	969	screen.cur.col++;
935	else	970	else
936	{	971	{
937	line->l = ncol;	972	line->l = ncol;
938	if (screen.flags & Screen_Autowrap)	973	if (screen.flags & Screen_Autowrap)
…		…
941	goto end_of_line;	976	goto end_of_line;
942	}	977	}
943		978
944	c = NOCHAR;	979	c = NOCHAR;
945	}	980	}
946	while (expect_false (--width > 0));	981	while (ecb_unlikely (--width > 0));
947		982
948	// pad with spaces when overwriting wide character with smaller one	983	// pad with spaces when overwriting wide character with smaller one
949	for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++)	984	for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
950	{	985	{
951	line->t[c] = ' ';	986	line->t[c] = ' ';
952	line->r[c] = rend;	987	line->r[c] = rend;
953	}	988	}
954		989
…		…
1113	* XTERM_SEQ: ESC 6	1148	* XTERM_SEQ: ESC 6
1114	* Move cursor left in row. If we're at the left boundary, shift everything	1149	* Move cursor left in row. If we're at the left boundary, shift everything
1115	* in that row right. Clear left column.	1150	* in that row right. Clear left column.
1116	*/	1151	*/
1117	#if !ENABLE_MINIMAL	1152	#if !ENABLE_MINIMAL
1118	void	1153	void ecb_cold
1119	rxvt_term::scr_backindex () NOTHROW	1154	rxvt_term::scr_backindex () NOTHROW
1120	{	1155	{
1121	if (screen.cur.col > 0)	1156	if (screen.cur.col > 0)
1122	scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);	1157	scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1123	else	1158	else
…		…
1130	* XTERM_SEQ: ESC 9	1165	* XTERM_SEQ: ESC 9
1131	* Move cursor right in row. If we're at the right boundary, shift everything	1166	* Move cursor right in row. If we're at the right boundary, shift everything
1132	* in that row left. Clear right column.	1167	* in that row left. Clear right column.
1133	*/	1168	*/
1134	#if !ENABLE_MINIMAL	1169	#if !ENABLE_MINIMAL
1135	void	1170	void ecb_cold
1136	rxvt_term::scr_forwardindex () NOTHROW	1171	rxvt_term::scr_forwardindex () NOTHROW
1137	{	1172	{
1138	if (screen.cur.col < ncol - 1)	1173	if (screen.cur.col < ncol - 1)
1139	scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);	1174	scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1140	else	1175	else
…		…
1291	scr_blank_line (line, col, num, rstyle);	1326	scr_blank_line (line, col, num, rstyle);
1292	}	1327	}
1293		1328
1294	/* ------------------------------------------------------------------------- */	1329	/* ------------------------------------------------------------------------- */
1295	/*	1330	/*
1296	* Erase part of whole of the screen	1331	* Erase part or whole of the screen
1297	* XTERM_SEQ: Clear screen after cursor : ESC [ 0 J	1332	* XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1298	* XTERM_SEQ: Clear screen before cursor: ESC [ 1 J	1333	* XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1299	* XTERM_SEQ: Clear whole screen : ESC [ 2 J	1334	* XTERM_SEQ: Clear whole screen : ESC [ 2 J
1300	*/	1335	*/
1301	void	1336	void
…		…
1310	ZERO_SCROLLBACK ();	1345	ZERO_SCROLLBACK ();
1311		1346
1312	switch (mode)	1347	switch (mode)
1313	{	1348	{
1314	case 0: /* erase to end of screen */	1349	case 0: /* erase to end of screen */
1315	selection_check (1);
1316	scr_erase_line (0);	1350	scr_erase_line (0);
1317	row = screen.cur.row + 1; /* possible OOB */	1351	row = screen.cur.row + 1; /* possible OOB */
1318	num = nrow - row;	1352	num = nrow - row;
1319	break;	1353	break;
1320	case 1: /* erase to beginning of screen */	1354	case 1: /* erase to beginning of screen */
1321	selection_check (3);
1322	scr_erase_line (1);	1355	scr_erase_line (1);
1323	row = 0;	1356	row = 0;
1324	num = screen.cur.row;	1357	num = screen.cur.row;
1325	break;	1358	break;
1326	case 2: /* erase whole screen */	1359	case 2: /* erase whole screen */
1327	selection_check (3);
1328	row = 0;	1360	row = 0;
1329	num = nrow;	1361	num = nrow;
1330	break;	1362	break;
1331	default:	1363	default:
1332	return;	1364	return;
…		…
1349	{	1381	{
1350	ren = DEFAULT_RSTYLE;	1382	ren = DEFAULT_RSTYLE;
1351		1383
1352	if (mapped)	1384	if (mapped)
1353	XClearArea (dpy, vt, 0,	1385	XClearArea (dpy, vt, 0,
1354	Row2Pixel (row - view_start), (unsigned int)width,	1386	Row2Pixel (row - view_start), (unsigned int)vt_width,
1355	(unsigned int)Height2Pixel (num), False);	1387	(unsigned int)Height2Pixel (num), False);
1356	}	1388	}
1357	else	1389	else
1358	{	1390	{
1359	ren = rstyle & (RS_fgMask | RS_bgMask);	1391	ren = rstyle & (RS_fgMask | RS_bgMask);
…		…
1362	{	1394	{
1363	gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];	1395	gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1364	XChangeGC (dpy, gc, GCForeground, &gcvalue);	1396	XChangeGC (dpy, gc, GCForeground, &gcvalue);
1365	XFillRectangle (dpy, vt, gc,	1397	XFillRectangle (dpy, vt, gc,
1366	0, Row2Pixel (row - view_start),	1398	0, Row2Pixel (row - view_start),
1367	(unsigned int)width,	1399	(unsigned int)vt_width,
1368	(unsigned int)Height2Pixel (num));	1400	(unsigned int)Height2Pixel (num));
1369	gcvalue.foreground = pix_colors[Color_fg];	1401	gcvalue.foreground = pix_colors[Color_fg];
1370	XChangeGC (dpy, gc, GCForeground, &gcvalue);	1402	XChangeGC (dpy, gc, GCForeground, &gcvalue);
1371	}	1403	}
1372	}	1404	}
…		…
1394	/* ------------------------------------------------------------------------- */	1426	/* ------------------------------------------------------------------------- */
1395	/*	1427	/*
1396	* Fill the screen with `E's	1428	* Fill the screen with `E's
1397	* XTERM_SEQ: Screen Alignment Test: ESC # 8	1429	* XTERM_SEQ: Screen Alignment Test: ESC # 8
1398	*/	1430	*/
1399	void	1431	void ecb_cold
1400	rxvt_term::scr_E () NOTHROW	1432	rxvt_term::scr_E () NOTHROW
1401	{	1433	{
1402	rend_t fs;	1434	rend_t fs;
1403		1435
1404	want_refresh = 1;	1436	want_refresh = 1;
1405	ZERO_SCROLLBACK ();	1437	ZERO_SCROLLBACK ();
1406		1438
1407	num_scr_allow = 0;	1439	num_scr_allow = 0;
1408	selection_check (3);	1440
		1441	row_col_t pos;
		1442	pos.row = pos.col = 0;
		1443	if (ROWCOL_IS_AFTER (selection.end, pos))
		1444	CLEAR_SELECTION ();
1409		1445
1410	fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));	1446	fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1411	for (int row = nrow; row--; )	1447	for (int row = nrow; row--; )
1412	{	1448	{
1413	line_t &line = ROW(row);	1449	line_t &line = ROW(row);
…		…
1564	/* ------------------------------------------------------------------------- */	1600	/* ------------------------------------------------------------------------- */
1565	/*	1601	/*
1566	* Set the scrolling region	1602	* Set the scrolling region
1567	* XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r	1603	* XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1568	*/	1604	*/
1569	void	1605	void ecb_cold
1570	rxvt_term::scr_scroll_region (int top, int bot) NOTHROW	1606	rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1571	{	1607	{
1572	max_it (top, 0);	1608	max_it (top, 0);
1573	min_it (bot, nrow - 1);	1609	min_it (bot, nrow - 1);
1574		1610
…		…
1584	/*	1620	/*
1585	* Make the cursor visible/invisible	1621	* Make the cursor visible/invisible
1586	* XTERM_SEQ: Make cursor visible : ESC [ ? 25 h	1622	* XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1587	* XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l	1623	* XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1588	*/	1624	*/
1589	void	1625	void ecb_cold
1590	rxvt_term::scr_cursor_visible (int mode) NOTHROW	1626	rxvt_term::scr_cursor_visible (int mode) NOTHROW
1591	{	1627	{
1592	want_refresh = 1;	1628	want_refresh = 1;
1593		1629
1594	if (mode)	1630	if (mode)
…		…
1601	/*	1637	/*
1602	* Set/unset automatic wrapping	1638	* Set/unset automatic wrapping
1603	* XTERM_SEQ: Set Wraparound : ESC [ ? 7 h	1639	* XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1604	* XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l	1640	* XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1605	*/	1641	*/
1606	void	1642	void ecb_cold
1607	rxvt_term::scr_autowrap (int mode) NOTHROW	1643	rxvt_term::scr_autowrap (int mode) NOTHROW
1608	{	1644	{
1609	if (mode)	1645	if (mode)
1610	screen.flags |= Screen_Autowrap;	1646	screen.flags |= Screen_Autowrap;
1611	else	1647	else
…		…
1620	* Relative mode: line numbers are relative to top margin of scrolling region	1656	* Relative mode: line numbers are relative to top margin of scrolling region
1621	* and the cursor cannot be moved outside.	1657	* and the cursor cannot be moved outside.
1622	* XTERM_SEQ: Set Absolute: ESC [ ? 6 h	1658	* XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1623	* XTERM_SEQ: Set Relative: ESC [ ? 6 l	1659	* XTERM_SEQ: Set Relative: ESC [ ? 6 l
1624	*/	1660	*/
1625	void	1661	void ecb_cold
1626	rxvt_term::scr_relative_origin (int mode) NOTHROW	1662	rxvt_term::scr_relative_origin (int mode) NOTHROW
1627	{	1663	{
1628	if (mode)	1664	if (mode)
1629	screen.flags |= Screen_Relative;	1665	screen.flags |= Screen_Relative;
1630	else	1666	else
…		…
1637	/*	1673	/*
1638	* Set insert/replace mode	1674	* Set insert/replace mode
1639	* XTERM_SEQ: Set Insert mode : ESC [ ? 4 h	1675	* XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1640	* XTERM_SEQ: Set Replace mode: ESC [ ? 4 l	1676	* XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1641	*/	1677	*/
1642	void	1678	void ecb_cold
1643	rxvt_term::scr_insert_mode (int mode) NOTHROW	1679	rxvt_term::scr_insert_mode (int mode) NOTHROW
1644	{	1680	{
1645	if (mode)	1681	if (mode)
1646	screen.flags |= Screen_Insert;	1682	screen.flags |= Screen_Insert;
1647	else	1683	else
…		…
1653	* Set/Unset tabs	1689	* Set/Unset tabs
1654	* XTERM_SEQ: Set tab at current column : ESC H	1690	* XTERM_SEQ: Set tab at current column : ESC H
1655	* XTERM_SEQ: Clear tab at current column: ESC [ 0 g	1691	* XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1656	* XTERM_SEQ: Clear all tabs : ESC [ 3 g	1692	* XTERM_SEQ: Clear all tabs : ESC [ 3 g
1657	*/	1693	*/
1658	void	1694	void ecb_cold
1659	rxvt_term::scr_set_tab (int mode) NOTHROW	1695	rxvt_term::scr_set_tab (int mode) NOTHROW
1660	{	1696	{
1661	if (mode < 0)	1697	if (mode < 0)
1662	memset (tabs, 0, ncol);	1698	memset (tabs, 0, ncol);
1663	else if (screen.cur.col < ncol)	1699	else if (screen.cur.col < ncol)
…		…
1682	if (rvideo_state != on)	1718	if (rvideo_state != on)
1683	{	1719	{
1684	rvideo_state = on;	1720	rvideo_state = on;
1685		1721
1686	::swap (pix_colors[Color_fg], pix_colors[Color_bg]);	1722	::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1687	#ifdef HAVE_BG_PIXMAP	1723	#ifdef HAVE_IMG
1688	if (bg_pixmap == None)	1724	if (bg_img == 0)
1689	#endif	1725	#endif
1690	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);	1726	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1691		1727
1692	XGCValues gcvalue;	1728	XGCValues gcvalue;
1693	gcvalue.foreground = pix_colors[Color_fg];	1729	gcvalue.foreground = pix_colors[Color_fg];
…		…
1702	/* ------------------------------------------------------------------------- */	1738	/* ------------------------------------------------------------------------- */
1703	/*	1739	/*
1704	* Report current cursor position	1740	* Report current cursor position
1705	* XTERM_SEQ: Report position: ESC [ 6 n	1741	* XTERM_SEQ: Report position: ESC [ 6 n
1706	*/	1742	*/
1707	void	1743	void ecb_cold
1708	rxvt_term::scr_report_position () NOTHROW	1744	rxvt_term::scr_report_position () NOTHROW
1709	{	1745	{
1710	tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);	1746	tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1711	}	1747	}
1712		1748
…		…
1715	* ------------------------------------------------------------------------- */	1751	* ------------------------------------------------------------------------- */
1716		1752
1717	/*	1753	/*
1718	* Set font style	1754	* Set font style
1719	*/	1755	*/
1720	void	1756	void ecb_cold
1721	rxvt_term::set_font_style () NOTHROW	1757	rxvt_term::set_font_style () NOTHROW
1722	{	1758	{
1723	#if 0	1759	#if 0
1724	switch (charsets [screen.charset])	1760	switch (charsets [screen.charset])
1725	{	1761	{
…		…
1747	* XTERM_SEQ: Invoke G0 character set: CTRL-O	1783	* XTERM_SEQ: Invoke G0 character set: CTRL-O
1748	* XTERM_SEQ: Invoke G1 character set: CTRL-N	1784	* XTERM_SEQ: Invoke G1 character set: CTRL-N
1749	* XTERM_SEQ: Invoke G2 character set: ESC N	1785	* XTERM_SEQ: Invoke G2 character set: ESC N
1750	* XTERM_SEQ: Invoke G3 character set: ESC O	1786	* XTERM_SEQ: Invoke G3 character set: ESC O
1751	*/	1787	*/
1752	void	1788	void ecb_cold
1753	rxvt_term::scr_charset_choose (int set) NOTHROW	1789	rxvt_term::scr_charset_choose (int set) NOTHROW
1754	{	1790	{
1755	screen.charset = set;	1791	screen.charset = set;
1756	set_font_style ();	1792	set_font_style ();
1757	}	1793	}
…		…
1778	* ------------------------------------------------------------------------- */	1814	* ------------------------------------------------------------------------- */
1779		1815
1780	/*	1816	/*
1781	* refresh matching text.	1817	* refresh matching text.
1782	*/	1818	*/
1783	bool	1819	bool ecb_cold
1784	rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW	1820	rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1785	{	1821	{
1786	bool found = false;	1822	bool found = false;
1787		1823
1788	for (int i = 0; i < nrow; i++)	1824	for (int i = 0; i < nrow; i++)
…		…
1807	PART_BEG = 0,	1843	PART_BEG = 0,
1808	PART_END,	1844	PART_END,
1809	RC_COUNT	1845	RC_COUNT
1810	};	1846	};
1811		1847
1812	void	1848	void ecb_hot
1813	rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW	1849	rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1814	{	1850	{
1815	int i;	1851	int i;
1816	row_col_t rc[RC_COUNT];	1852	row_col_t rc[RC_COUNT];
1817		1853
…		…
1854	* Refresh the entire screen	1890	* Refresh the entire screen
1855	*/	1891	*/
1856	void	1892	void
1857	rxvt_term::scr_touch (bool refresh) NOTHROW	1893	rxvt_term::scr_touch (bool refresh) NOTHROW
1858	{	1894	{
1859	scr_expose (0, 0, width, height, refresh);	1895	scr_expose (0, 0, vt_width, vt_height, refresh);
1860	}	1896	}
1861		1897
1862	/* ------------------------------------------------------------------------- */	1898	/* ------------------------------------------------------------------------- */
1863	/*	1899	/*
1864	* Move the display so that the line represented by scrollbar value Y is at	1900	* Move the display so that the line represented by scrollbar value Y is at
…		…
1874	/*	1910	/*
1875	* Page the screen up/down nlines	1911	* Page the screen up/down nlines
1876	* direction should be UP or DN	1912	* direction should be UP or DN
1877	*/	1913	*/
1878	bool	1914	bool
1879	rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW	1915	rxvt_term::scr_page (int nlines) NOTHROW
1880	{	1916	{
1881	int new_view_start =
1882	direction == UP ? view_start - nlines
1883	: view_start + nlines;
1884
1885	return scr_changeview (new_view_start);	1917	return scr_changeview (view_start - nlines);
1886	}	1918	}
1887		1919
1888	bool	1920	bool
1889	rxvt_term::scr_changeview (int new_view_start) NOTHROW	1921	rxvt_term::scr_changeview (int new_view_start) NOTHROW
1890	{	1922	{
…		…
1920		1952
1921	# ifndef NO_MAPALERT	1953	# ifndef NO_MAPALERT
1922	# ifdef MAPALERT_OPTION	1954	# ifdef MAPALERT_OPTION
1923	if (option (Opt_mapAlert))	1955	if (option (Opt_mapAlert))
1924	# endif	1956	# endif
1925	XMapWindow (dpy, parent[0]);	1957	XMapWindow (dpy, parent);
1926	# endif	1958	# endif
1927		1959
1928	# if ENABLE_FRILLS	1960	# if ENABLE_FRILLS
1929	if (option (Opt_urgentOnBell))	1961	if (option (Opt_urgentOnBell))
1930	set_urgency (1);	1962	set_urgency (1);
…		…
1943	HOOK_INVOKE ((this, HOOK_BELL, DT_END));	1975	HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1944	#endif	1976	#endif
1945	}	1977	}
1946		1978
1947	/* ------------------------------------------------------------------------- */	1979	/* ------------------------------------------------------------------------- */
1948	/* ARGSUSED */	1980	void ecb_cold
1949	void
1950	rxvt_term::scr_printscreen (int fullhist) NOTHROW	1981	rxvt_term::scr_printscreen (int fullhist) NOTHROW
1951	{	1982	{
1952	#ifdef PRINTPIPE	1983	#ifdef PRINTPIPE
1953	int nrows, row_start;	1984	int nrows, row_start;
1954	FILE *fd = popen_printer ();	1985	FILE *fd = popen_printer ();
…		…
2003	/*	2034	/*
2004	* Refresh the screen	2035	* Refresh the screen
2005	* drawn_text/drawn_rend contain the screen information before the update.	2036	* drawn_text/drawn_rend contain the screen information before the update.
2006	* screen.text/screen.rend contain what the screen will change to.	2037	* screen.text/screen.rend contain what the screen will change to.
2007	*/	2038	*/
2008	void	2039	void ecb_hot
2009	rxvt_term::scr_refresh () NOTHROW	2040	rxvt_term::scr_refresh () NOTHROW
2010	{	2041	{
2011	int16_t col, row, /* column/row we're processing */	2042	int16_t col, row, /* column/row we're processing */
2012	ocrow; /* old cursor row */	2043	ocrow; /* old cursor row */
2013	int i; /* tmp */	2044	int i; /* tmp */
2014	#ifndef NO_CURSORCOLOR
2015	rend_t cc1; /* store colours at cursor position (s) */
2016	#endif
2017	rend_t *crp; // cursor rendition pointer
2018	rend_t ccol1, /* Cursor colour */	2045	rend_t ccol1, /* Cursor colour */
2019	ccol2; /* Cursor colour2 */	2046	ccol2; /* Cursor colour2 */
		2047	rend_t cur_rend;
		2048	int cur_col;
		2049	int cursorwidth;
2020		2050
2021	want_refresh = 0; /* screen is current */	2051	want_refresh = 0; /* screen is current */
2022		2052
2023	if (refresh_type == NO_REFRESH || !mapped)	2053	if (refresh_type == NO_REFRESH || !mapped)
2024	return;	2054	return;
…		…
2027	* A: set up vars	2057	* A: set up vars
2028	*/	2058	*/
2029	refresh_count = 0;	2059	refresh_count = 0;
2030		2060
2031	unsigned int old_screen_flags = screen.flags;	2061	unsigned int old_screen_flags = screen.flags;
2032	char have_bg = 0;	2062	bool have_bg = 0;
2033	#ifdef HAVE_BG_PIXMAP	2063	#ifdef HAVE_IMG
2034	have_bg = bg_pixmap != None;	2064	have_bg = bg_img != 0;
2035	#endif	2065	#endif
2036	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */	2066	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2037		2067
2038	/*	2068	/*
2039	* B: reverse any characters which are selected	2069	* B: reverse any characters which are selected
…		…
2043	HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));	2073	HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2044	#if ENABLE_OVERLAY	2074	#if ENABLE_OVERLAY
2045	scr_swap_overlay ();	2075	scr_swap_overlay ();
2046	#endif	2076	#endif
2047		2077
2048	char showcursor = screen.flags & Screen_VisibleCursor;	2078	bool showcursor = screen.flags & Screen_VisibleCursor;
2049		2079
2050	/*	2080	/*
2051	* C: set the cursor character (s)	2081	* C: set the cursor character (s)
2052	*/	2082	*/
2053	{	2083	{
2054	unsigned char setoldcursor;
2055
2056	#ifdef CURSOR_BLINK	2084	#ifdef CURSOR_BLINK
2057	if (hidden_cursor)	2085	if (hidden_cursor)
2058	showcursor = 0;	2086	showcursor = 0;
2059	#endif	2087	#endif
2060		2088
…		…
2063	int col = screen.cur.col;	2091	int col = screen.cur.col;
2064		2092
2065	while (col && ROW(screen.cur.row).t[col] == NOCHAR)	2093	while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2066	col--;	2094	col--;
2067		2095
		2096	cursorwidth = 1;
		2097	while (col + cursorwidth < ncol
		2098	&& ROW(screen.cur.row).t[col + cursorwidth] == NOCHAR)
		2099	cursorwidth++;
		2100
2068	crp = &ROW(screen.cur.row).r[col];	2101	cur_rend = ROW(screen.cur.row).r[col];
		2102	cur_col = col;
2069		2103
2070	#ifndef NO_CURSORCOLOR	2104	#ifndef NO_CURSORCOLOR
2071	cc1 = *crp & (RS_fgMask | RS_bgMask);
2072	if (ISSET_PIXCOLOR (Color_cursor))	2105	if (ISSET_PIXCOLOR (Color_cursor))
2073	ccol1 = Color_cursor;	2106	ccol1 = Color_cursor;
2074	else	2107	else
2075	#endif	2108	#endif
2076	#ifdef CURSOR_COLOR_IS_RENDITION_COLOR	2109	#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
…		…
2090	ccol2 = Color_bg;	2123	ccol2 = Color_bg;
2091	#endif	2124	#endif
2092		2125
2093	if (focus)	2126	if (focus)
2094	{	2127	{
		2128	rend_t rend = cur_rend;
		2129
2095	if (option (Opt_cursorUnderline))	2130	if (option (Opt_cursorUnderline))
2096	*crp ^= RS_Uline;	2131	rend ^= RS_Uline;
2097	else	2132	else
2098	{	2133	{
2099	*crp ^= RS_RVid;	2134	rend ^= RS_RVid;
2100	*crp = SET_FGCOLOR (*crp, ccol1);	2135	rend = SET_FGCOLOR (rend, ccol1);
2101	*crp = SET_BGCOLOR (*crp, ccol2);	2136	rend = SET_BGCOLOR (rend, ccol2);
2102	}	2137	}
		2138
		2139	scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
2103	}	2140	}
2104	}	2141	}
2105		2142
2106	/* make sure no outline cursor is left around */	2143	/* make sure no outline cursor is left around */
2107	setoldcursor = 0;
2108	if (ocrow != -1)	2144	if (ocrow != -1)
2109	{	2145	{
2110	if (screen.cur.row - view_start != ocrow	2146	if (screen.cur.row - view_start != ocrow
2111	|| screen.cur.col != oldcursor.col)	2147	|| screen.cur.col != oldcursor.col)
2112	{	2148	{
2113	if (ocrow < nrow	2149	if (ocrow < nrow
2114	&& oldcursor.col < ncol)	2150	&& oldcursor.col < ncol)
2115	drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);	2151	drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2116
2117	if (focus || !showcursor)
2118	oldcursor.row = -1;
2119	else
2120	setoldcursor = 1;
2121	}	2152	}
2122	}	2153	}
2123	else if (!focus)
2124	setoldcursor = 1;
2125		2154
2126	if (setoldcursor)	2155	// save the current cursor coordinates if the cursor is visible
		2156	// and the window is unfocused, so as to clear the outline cursor
		2157	// in the next refresh if the cursor moves
		2158	if (showcursor && !focus && screen.cur.row - view_start < nrow)
2127	{	2159	{
2128	if (screen.cur.row - view_start >= nrow)
2129	oldcursor.row = -1;
2130	else
2131	{
2132	oldcursor.row = screen.cur.row - view_start;	2160	oldcursor.row = screen.cur.row - view_start;
2133	oldcursor.col = screen.cur.col;	2161	oldcursor.col = screen.cur.col;
2134	}
2135	}	2162	}
		2163	else
		2164	oldcursor.row = -1;
2136	}	2165	}
2137		2166
2138	#ifndef NO_SLOW_LINK_SUPPORT	2167	#ifndef NO_SLOW_LINK_SUPPORT
2139	/*	2168	/*
2140	* D: CopyArea pass - very useful for slower links	2169	* D: CopyArea pass - very useful for slower links
…		…
2146	{	2175	{
2147	int16_t nits;	2176	int16_t nits;
2148	int i = num_scr;	2177	int i = num_scr;
2149	int j;	2178	int j;
2150	int len, wlen;	2179	int len, wlen;
2151	dLocal (int, num_scr);
2152		2180
2153	j = nrow;	2181	j = nrow;
2154	wlen = len = -1;	2182	wlen = len = -1;
2155	row = i > 0 ? 0 : j - 1;	2183	row = i > 0 ? 0 : j - 1;
2156		2184
…		…
2231	continue;	2259	continue;
2232		2260
2233	// redraw one or more characters	2261	// redraw one or more characters
2234		2262
2235	// seek to the beginning of wide characters	2263	// seek to the beginning of wide characters
2236	while (expect_false (stp[col] == NOCHAR && col > 0))	2264	while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2237	--col;	2265	--col;
2238		2266
2239	rend_t rend = srp[col]; /* screen rendition (target rendition) */	2267	rend_t rend = srp[col]; /* screen rendition (target rendition) */
2240	text_t *text = stp + col;	2268	text_t *text = stp + col;
2241	int count = 1;	2269	int count = 1;
…		…
2279		2307
2280	col--; /* went one too far. move back */	2308	col--; /* went one too far. move back */
2281	count -= i; /* dump any matching trailing chars */	2309	count -= i; /* dump any matching trailing chars */
2282		2310
2283	// sometimes we optimize away the trailing NOCHAR's, add them back	2311	// sometimes we optimize away the trailing NOCHAR's, add them back
2284	while (expect_false (i && text[count] == NOCHAR))	2312	while (ecb_unlikely (i && text[count] == NOCHAR))
2285	count++, i--;	2313	count++, i--;
2286		2314
2287	/*	2315	/*
2288	* Determine the attributes for the string	2316	* Determine the attributes for the string
2289	*/	2317	*/
2290	int fore = fgcolor_of (rend); // desired foreground	2318	int fore = fgcolor_of (rend); // desired foreground
2291	int back = bgcolor_of (rend); // desired background	2319	int back = bgcolor_of (rend); // desired background
2292		2320
2293	// only do special processing if any attributes are set, which is unlikely	2321	// only do special processing if any attributes are set, which is unlikely
2294	if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))	2322	if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2295	{	2323	{
2296	bool invert = rend & RS_RVid;	2324	bool invert = rend & RS_RVid;
2297		2325
2298	#ifndef NO_BOLD_UNDERLINE_REVERSE	2326	#ifndef NO_BOLD_UNDERLINE_REVERSE
2299	if (rend & RS_Bold && fore == Color_fg)	2327	if (rend & RS_Bold && fore == Color_fg)
…		…
2388	/*	2416	/*
2389	* Actually do the drawing of the string here	2417	* Actually do the drawing of the string here
2390	*/	2418	*/
2391	rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];	2419	rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2392		2420
2393	if (expect_true (have_bg && back == Color_bg))	2421	if (ecb_likely (have_bg && back == Color_bg))
2394	{	2422	{
2395	// this is very ugly, maybe push it into ->draw?	2423	// this is very ugly, maybe push it into ->draw?
2396		2424
2397	for (i = 0; i < count; i++) /* don't draw empty strings */	2425	for (i = 0; i < count; i++) /* don't draw empty strings */
2398	if (text[i] != ' ')	2426	if (text[i] != ' ')
…		…
2405	did_clear: ;	2433	did_clear: ;
2406	}	2434	}
2407	else	2435	else
2408	font->draw (*drawable, xpixel, ypixel, text, count, fore, back);	2436	font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2409		2437
2410	if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))	2438	if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2411	{	2439	{
		2440	if (showcursor && focus && row == screen.cur.row
		2441	&& IN_RANGE_EXC (col, cur_col, cur_col + cursorwidth))
		2442	XSetForeground (dpy, gc, pix_colors[ccol1]);
		2443	else
2412	#if ENABLE_FRILLS	2444	#if ENABLE_FRILLS
2413	if (ISSET_PIXCOLOR (Color_underline))	2445	if (ISSET_PIXCOLOR (Color_underline))
2414	XSetForeground (dpy, gc, pix_colors[Color_underline]);	2446	XSetForeground (dpy, gc, pix_colors[Color_underline]);
2415	else	2447	else
2416	#endif	2448	#endif
…		…
2427	* G: cleanup cursor and display outline cursor if necessary	2459	* G: cleanup cursor and display outline cursor if necessary
2428	*/	2460	*/
2429	if (showcursor)	2461	if (showcursor)
2430	{	2462	{
2431	if (focus)	2463	if (focus)
2432	{	2464	scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend);
2433	if (option (Opt_cursorUnderline))
2434	*crp ^= RS_Uline;
2435	else
2436	{
2437	*crp ^= RS_RVid;
2438	#ifndef NO_CURSORCOLOR
2439	*crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2440	#endif
2441	}
2442	}
2443	else if (oldcursor.row >= 0)	2465	else if (oldcursor.row >= 0)
2444	{	2466	{
2445	int cursorwidth = 1;
2446	int col = oldcursor.col;
2447
2448	while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2449	col--;
2450
2451	while (col + cursorwidth < ncol
2452	&& drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2453	cursorwidth++;
2454
2455	#ifndef NO_CURSORCOLOR
2456	if (ISSET_PIXCOLOR (Color_cursor))
2457	XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2458	else
2459	#endif
2460	XSetForeground (dpy, gc, pix_colors[ccol1]);	2467	XSetForeground (dpy, gc, pix_colors[ccol1]);
2461		2468
2462	XDrawRectangle (dpy, vt, gc,	2469	XDrawRectangle (dpy, vt, gc,
2463	Col2Pixel (col),	2470	Col2Pixel (cur_col),
2464	Row2Pixel (oldcursor.row),	2471	Row2Pixel (oldcursor.row),
2465	(unsigned int) (Width2Pixel (cursorwidth) - 1),	2472	(unsigned int) (Width2Pixel (cursorwidth) - 1),
2466	(unsigned int) (Height2Pixel (1) - lineSpace - 1));	2473	(unsigned int) (Height2Pixel (1) - 1));
2467	}	2474	}
2468	}	2475	}
2469		2476
2470	/*	2477	/*
2471	* H: cleanup selection	2478	* H: cleanup selection
…		…
2480	screen.flags = old_screen_flags;	2487	screen.flags = old_screen_flags;
2481	num_scr = 0;	2488	num_scr = 0;
2482	num_scr_allow = 1;	2489	num_scr_allow = 1;
2483	}	2490	}
2484		2491
2485	void	2492	void ecb_cold
2486	rxvt_term::scr_remap_chars (line_t &l) NOTHROW	2493	rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2487	{	2494	{
2488	if (!l.t)	2495	if (!l.valid ())
2489	return;	2496	return;
2490		2497
2491	l.touch (); // maybe a bit of an overkill, but it's not performance-relevant	2498	l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2492		2499
2493	for (int i = ncol; i--; )	2500	for (int i = ncol; i--; )
2494	l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));	2501	l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2495	}	2502	}
2496		2503
2497	void	2504	void ecb_cold
2498	rxvt_term::scr_remap_chars () NOTHROW	2505	rxvt_term::scr_remap_chars () NOTHROW
2499	{	2506	{
2500	for (int i = total_rows; i--; )	2507	for (int i = total_rows; i--; )
2501	scr_remap_chars (row_buf [i]);	2508	scr_remap_chars (row_buf [i]);
2502		2509
…		…
2505	scr_remap_chars (drawn_buf [i]);	2512	scr_remap_chars (drawn_buf [i]);
2506	scr_remap_chars (swap_buf [i]);	2513	scr_remap_chars (swap_buf [i]);
2507	}	2514	}
2508	}	2515	}
2509		2516
2510	void	2517	void ecb_cold
2511	rxvt_term::scr_recolour (bool refresh) NOTHROW	2518	rxvt_term::scr_recolour (bool refresh) NOTHROW
2512	{	2519	{
2513	bool transparent = false;	2520	bool transparent = false;
2514		2521
2515	#ifdef HAVE_BG_PIXMAP	2522	#ifdef HAVE_IMG
2516	if (bg_pixmap != None)	2523	if (bg_img != 0)
2517	{	2524	{
2518	# ifdef ENABLE_TRANSPARENCY	2525	# if ENABLE_TRANSPARENCY
2519	if (bg_flags & BG_IS_TRANSPARENT)	2526	if (bg_flags & BG_IS_TRANSPARENT)
2520	{	2527	{
2521	XSetWindowBackgroundPixmap (dpy, parent[0], bg_pixmap);	2528	XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2522	XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);	2529	XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2523		2530
2524	transparent = true;	2531	transparent = true;
2525	}	2532	}
2526	else	2533	else
2527	# endif	2534	# endif
2528	{	2535	{
2529	XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);	2536	XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2530	XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);	2537	XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2531	}	2538	}
2532	}	2539	}
2533	else	2540	else
2534	#endif	2541	#endif
2535	{	2542	{
2536	XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);	2543	XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2537	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);	2544	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2538	}	2545	}
2539		2546
2540	XClearWindow (dpy, parent[0]);	2547	XClearWindow (dpy, parent);
2541		2548
2542	if (scrollBar.win)	2549	if (scrollBar.win)
2543	{	2550	{
2544	if (transparent)	2551	if (transparent)
2545	XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);	2552	XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2546	else	2553	else
2547	XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);	2554	XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2548	scrollBar.state = STATE_IDLE;	2555	scrollBar.state = SB_STATE_IDLE;
2549	scrollBar.show (0);	2556	scrollBar.show (0);
2550	}	2557	}
2551		2558
2552	if (refresh)	2559	if (refresh)
2553	{	2560	{
…		…
2618	for (rend_t *srp = ROW(row).r; col < end_col; col++)	2625	for (rend_t *srp = ROW(row).r; col < end_col; col++)
2619	srp[col] ^= rstyle;	2626	srp[col] ^= rstyle;
2620	}	2627	}
2621		2628
2622	/* ------------------------------------------------------------------------- */	2629	/* ------------------------------------------------------------------------- */
2623	void	2630	void ecb_hot
2624	rxvt_term::scr_reverse_selection () NOTHROW	2631	rxvt_term::scr_reverse_selection () NOTHROW
2625	{	2632	{
2626	if (selection.op	2633	if (selection.op
2627	&& current_screen == selection.screen	2634	&& current_screen == selection.screen
2628	&& selection.end.row >= view_start)	2635	&& selection.end.row >= view_start)
…		…
2647	*/	2654	*/
2648	#if 0	2655	#if 0
2649	void	2656	void
2650	rxvt_term::scr_dump (int fd) NOTHROW	2657	rxvt_term::scr_dump (int fd) NOTHROW
2651	{	2658	{
2652	int row, wrote;	2659	// if this method is needed, it can be implemented by factoring the
2653	unsigned int width, towrite;	2660	// relevant code in scr_printscreen
2654	const char r1[] = "\n";
2655
2656	for (row = saveLines + top_row;
2657	row < saveLines + nrow - 1; row++)
2658	{
2659	width = row_buf[row].l >= 0 ? row_buf[row].l
2660	: ncol;
2661	for (towrite = width; towrite; towrite -= wrote)
2662	{
2663	wrote = write (fd, & (row_buf[row].t[width - towrite]),
2664	towrite);
2665	if (wrote < 0)
2666	return; /* XXX: death, no report */
2667	}
2668	if (row_buf[row].l >= 0)
2669	if (write (fd, r1, 1) <= 0)
2670	return; /* XXX: death, no report */
2671	}
2672	}	2661	}
2673	#endif	2662	#endif
2674		2663
2675	/* ------------------------------------------------------------------------- *	2664	/* ------------------------------------------------------------------------- *
2676	* CHARACTER SELECTION *	2665	* CHARACTER SELECTION *
2677	* ------------------------------------------------------------------------- */	2666	* ------------------------------------------------------------------------- */
2678	void	2667	void
2679	rxvt_term::selection_check (int check_more) NOTHROW	2668	rxvt_term::selection_check (int check_more) NOTHROW
2680	{	2669	{
2681	row_col_t pos;
2682
2683	if (!selection.op)	2670	if (!selection.op)
2684	return;	2671	return;
2685		2672
2686	pos.row = pos.col = 0;
2687	if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)	2673	if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2688	|| !IN_RANGE_EXC (selection.mark.row, top_row, nrow)	2674	|| !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2689	|| !IN_RANGE_EXC (selection.end.row, top_row, nrow)	2675	|| !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2690	|| (check_more == 1	2676	|| (check_more == 1
2691	&& current_screen == selection.screen	2677	&& current_screen == selection.screen
2692	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)	2678	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2693	&& ROWCOL_IS_BEFORE (screen.cur, selection.end))	2679	&& ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2694	|| (check_more == 2
2695	&& ROWCOL_IS_BEFORE (selection.beg, pos)
2696	&& ROWCOL_IS_AFTER (selection.end, pos))
2697	|| (check_more == 3
2698	&& ROWCOL_IS_AFTER (selection.end, pos))
2699	|| (check_more == 4 /* screen width change */
2700	&& (selection.beg.row != selection.end.row
2701	|| selection.end.col > ncol)))
2702	CLEAR_SELECTION ();	2680	CLEAR_ALL_SELECTION ();
		2681	}
		2682
		2683	void
		2684	rxvt_term::selection_changed () NOTHROW
		2685	{
		2686	line_t &r1 = ROW (selection.beg.row);
		2687	while (selection.beg.col > 0 && r1.t [selection.beg.col] == NOCHAR)
		2688	--selection.beg.col;
		2689
		2690	line_t &r2 = ROW (selection.end.row);
		2691	while (selection.end.col < r2.l && r2.t [selection.end.col] == NOCHAR)
		2692	++selection.end.col;
		2693
		2694	want_refresh = 1;
2703	}	2695	}
2704		2696
2705	/* ------------------------------------------------------------------------- */	2697	/* ------------------------------------------------------------------------- */
2706	/*	2698	/*
2707	* Paste a selection direct to the command fd	2699	* Paste a selection direct to the command fd
…		…
2713	for (unsigned int i = 0; i < len; i++)	2705	for (unsigned int i = 0; i < len; i++)
2714	if (data[i] == C0_LF)	2706	if (data[i] == C0_LF)
2715	data[i] = C0_CR;	2707	data[i] = C0_CR;
2716		2708
2717	if (priv_modes & PrivMode_BracketPaste)	2709	if (priv_modes & PrivMode_BracketPaste)
2718	tt_printf ("\e[200~");	2710	tt_printf ("\x1b[200~");
2719		2711
2720	tt_write (data, len);	2712	tt_write (data, len);
2721		2713
2722	if (priv_modes & PrivMode_BracketPaste)	2714	if (priv_modes & PrivMode_BracketPaste)
2723	tt_printf ("\e[201~");	2715	tt_printf ("\x1b[201~");
2724	}	2716	}
2725		2717
2726	void	2718	void
2727	rxvt_term::paste (char *data, unsigned int len) NOTHROW	2719	rxvt_term::paste (char *data, unsigned int len) NOTHROW
2728	{	2720	{
…		…
2732	tt_paste (data, len);	2724	tt_paste (data, len);
2733	}	2725	}
2734		2726
2735	/* ------------------------------------------------------------------------- */	2727	/* ------------------------------------------------------------------------- */
2736	/*	2728	/*
2737	* Request the current selection:	2729	* Request PRIMARY, SECONDARY or CLIPBOARD selection.
2738	* Order: > internal selection if available	2730	* if the requested selection has no owner or is empty CUT_BUFFER0 is used
2739	* > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)	2731	* as fallback
2740	* > CUT_BUFFER0
2741	* (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2742	* will auto fallback to CUT_BUFFER0
2743	* EXT: button 2 release	2732	* EXT: button 2 release
2744	*/	2733	*/
2745
2746	static void
2747	selection_cb (char *data, unsigned int len, rxvt_selection *rs)
2748	{
2749	rxvt_term *term = (rxvt_term *)rs->user_data;
2750
2751	if (data)
2752	term->paste (data, len);
2753	delete rs;
2754	term->selection_req = 0;
2755	}
2756
2757	void	2734	void
2758	rxvt_term::selection_request (Time tm, int selnum) NOTHROW	2735	rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2759	{	2736	{
2760	if (selection.text && selnum == Sel_Primary)
2761	{
2762	/* internal selection */
2763	char *str = rxvt_wcstombs (selection.text, selection.len);
2764	paste (str, strlen (str));
2765	free (str);
2766	return;
2767	}
2768	else if (!selection_req)	2737	if (!selection_req)
2769	{	2738	{
2770	selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], selection_cb, this);	2739	selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2771	selection_req->run ();	2740	selection_req->run ();
2772	}	2741	}
2773	}	2742	}
2774		2743
2775	/* ------------------------------------------------------------------------- */	2744	/* ------------------------------------------------------------------------- */
…		…
2971	/* ------------------------------------------------------------------------- */	2940	/* ------------------------------------------------------------------------- */
2972	/*	2941	/*
2973	* Mark or select text based upon number of clicks: 1, 2, or 3	2942	* Mark or select text based upon number of clicks: 1, 2, or 3
2974	* EXT: button 1 press	2943	* EXT: button 1 press
2975	*/	2944	*/
2976	void	2945	void ecb_cold
2977	rxvt_term::selection_click (int clicks, int x, int y) NOTHROW	2946	rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
2978	{	2947	{
2979	clicks = ((clicks - 1) % 3) + 1;	2948	clicks = ((clicks - 1) % 3) + 1;
2980	selection.clicks = clicks; /* save clicks so extend will work */	2949	selection.clicks = clicks; /* save clicks so extend will work */
2981		2950
…		…
3000		2969
3001	/* ------------------------------------------------------------------------- */	2970	/* ------------------------------------------------------------------------- */
3002	/*	2971	/*
3003	* Mark a selection at the specified col/row	2972	* Mark a selection at the specified col/row
3004	*/	2973	*/
3005	void	2974	void ecb_cold
3006	rxvt_term::selection_start_colrow (int col, int row) NOTHROW	2975	rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3007	{	2976	{
3008	want_refresh = 1;	2977	want_refresh = 1;
3009		2978
3010	selection.mark.row = row + view_start;	2979	selection.mark.row = row + view_start;
…		…
3033	* Word select: select text for 2 clicks	3002	* Word select: select text for 2 clicks
3034	* We now only find out the boundary in one direction	3003	* We now only find out the boundary in one direction
3035	*/	3004	*/
3036		3005
3037	/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */	3006	/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3038	#define DELIMIT_TEXT(x) \	3007	#define DELIMIT_TEXT(x) \
3039	(unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))	3008	(unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3040	#define DELIMIT_REND(x) 1	3009	#define DELIMIT_REND(x) 1
3041		3010
3042	void	3011	void ecb_cold
3043	rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW	3012	rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3044	{	3013	{
3045	int col, row, dirnadd, tcol, trow, w1, w2;	3014	int col, row, dirnadd, tcol, trow, w1, w2;
3046	row_col_t bound;	3015	row_col_t bound;
3047	text_t *stp;	3016	text_t *stp;
…		…
3121	* EXT: button 3 press; button 1 or 3 drag	3090	* EXT: button 3 press; button 1 or 3 drag
3122	* flag == 0 ==> button 1	3091	* flag == 0 ==> button 1
3123	* flag == 1 ==> button 3 press	3092	* flag == 1 ==> button 3 press
3124	* flag == 2 ==> button 3 motion	3093	* flag == 2 ==> button 3 motion
3125	*/	3094	*/
3126	void	3095	void ecb_cold
3127	rxvt_term::selection_extend (int x, int y, int flag) NOTHROW	3096	rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3128	{	3097	{
3129	int col = clamp (Pixel2Col (x), 0, ncol);	3098	int col = clamp (Pixel2Col (x), 0, ncol);
3130	int row = clamp (Pixel2Row (y), 0, nrow - 1);	3099	int row = clamp (Pixel2Row (y), 0, nrow - 1);
3131		3100
…		…
3157		3126
3158	/* ------------------------------------------------------------------------- */	3127	/* ------------------------------------------------------------------------- */
3159	/*	3128	/*
3160	* Extend the selection to the specified col/row	3129	* Extend the selection to the specified col/row
3161	*/	3130	*/
3162	void	3131	void ecb_cold
3163	rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW	3132	rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3164	{	3133	{
3165	row_col_t pos;	3134	row_col_t pos;
3166	enum {	3135	enum {
3167	LEFT, RIGHT	3136	LEFT, RIGHT
3168	} closeto = RIGHT;	3137	} closeto = RIGHT;
3169
3170	want_refresh = 1;
3171		3138
3172	switch (selection.op)	3139	switch (selection.op)
3173	{	3140	{
3174	case SELECTION_INIT:	3141	case SELECTION_INIT:
3175	CLEAR_SELECTION ();	3142	CLEAR_SELECTION ();
…		…
3355		3322
3356	#if !ENABLE_MINIMAL	3323	#if !ENABLE_MINIMAL
3357	if (selection.rect && selection.beg.col > selection.end.col)	3324	if (selection.rect && selection.beg.col > selection.end.col)
3358	::swap (selection.beg.col, selection.end.col);	3325	::swap (selection.beg.col, selection.end.col);
3359	#endif	3326	#endif
		3327
		3328	selection_changed ();
3360	}	3329	}
3361		3330
3362	#if !ENABLE_MINIMAL	3331	#if !ENABLE_MINIMAL
3363	void	3332	void ecb_cold
3364	rxvt_term::selection_remove_trailing_spaces () NOTHROW	3333	rxvt_term::selection_remove_trailing_spaces () NOTHROW
3365	{	3334	{
3366	int32_t end_col, end_row;	3335	int32_t end_col, end_row;
3367	text_t *stp;	3336	text_t *stp;
3368		3337
…		…
3406	/* ------------------------------------------------------------------------- */	3375	/* ------------------------------------------------------------------------- */
3407	/*	3376	/*
3408	* Double click on button 3 when already selected	3377	* Double click on button 3 when already selected
3409	* EXT: button 3 double click	3378	* EXT: button 3 double click
3410	*/	3379	*/
3411	void	3380	void ecb_cold
3412	rxvt_term::selection_rotate (int x, int y) NOTHROW	3381	rxvt_term::selection_rotate (int x, int y) NOTHROW
3413	{	3382	{
3414	selection.clicks = selection.clicks % 3 + 1;	3383	selection.clicks = selection.clicks % 3 + 1;
3415	selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);	3384	selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3416	}	3385	}
…		…
3418	/* ------------------------------------------------------------------------- */	3387	/* ------------------------------------------------------------------------- */
3419	/*	3388	/*
3420	* Respond to a request for our current selection	3389	* Respond to a request for our current selection
3421	* EXT: SelectionRequest	3390	* EXT: SelectionRequest
3422	*/	3391	*/
3423	void	3392	void ecb_cold
3424	rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW	3393	rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3425	{	3394	{
		3395	Atom property = rq.property == None ? rq.target : rq.property;
3426	XSelectionEvent ev;	3396	XSelectionEvent ev;
3427		3397
3428	ev.type = SelectionNotify;	3398	ev.type = SelectionNotify;
3429	ev.property = None;	3399	ev.property = None;
3430	ev.display = rq.display;	3400	ev.display = rq.display;
…		…
3445	*target++ = xa[XA_COMPOUND_TEXT];	3415	*target++ = xa[XA_COMPOUND_TEXT];
3446	#if X_HAVE_UTF8_STRING	3416	#if X_HAVE_UTF8_STRING
3447	*target++ = xa[XA_UTF8_STRING];	3417	*target++ = xa[XA_UTF8_STRING];
3448	#endif	3418	#endif
3449		3419
3450	XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,	3420	XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3451	32, PropModeReplace,	3421	32, PropModeReplace,
3452	(unsigned char *)target_list, target - target_list);	3422	(unsigned char *)target_list, target - target_list);
3453	ev.property = rq.property;	3423	ev.property = property;
3454	}	3424	}
3455	#if TODO // TODO	3425	#if TODO // TODO
3456	else if (rq.target == xa[XA_MULTIPLE])	3426	else if (rq.target == xa[XA_MULTIPLE])
3457	{	3427	{
3458	/* TODO: Handle MULTIPLE */	3428	/* TODO: Handle MULTIPLE */
3459	}	3429	}
3460	#endif	3430	#endif
3461	else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)	3431	else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3462	{	3432	{
3463	XChangeProperty (dpy, rq.requestor, rq.property, rq.target,	3433	XChangeProperty (dpy, rq.requestor, property, rq.target,
3464	32, PropModeReplace, (unsigned char *)&selection_time, 1);	3434	32, PropModeReplace, (unsigned char *)&selection_time, 1);
3465	ev.property = rq.property;	3435	ev.property = property;
3466	}	3436	}
3467	else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)	3437	else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3468	{	3438	{
3469	XChangeProperty (dpy, rq.requestor, rq.property, rq.target,	3439	XChangeProperty (dpy, rq.requestor, property, rq.target,
3470	32, PropModeReplace, (unsigned char *)&clipboard_time, 1);	3440	32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3471	ev.property = rq.property;	3441	ev.property = property;
3472	}	3442	}
3473	else if (rq.target == XA_STRING	3443	else if (rq.target == XA_STRING
3474	|| rq.target == xa[XA_TEXT]	3444	|| rq.target == xa[XA_TEXT]
3475	|| rq.target == xa[XA_COMPOUND_TEXT]	3445	|| rq.target == xa[XA_COMPOUND_TEXT]
3476	|| rq.target == xa[XA_UTF8_STRING]	3446	|| rq.target == xa[XA_UTF8_STRING]
…		…
3547	ct.value = (unsigned char *)cl;	3517	ct.value = (unsigned char *)cl;
3548	ct.nitems = selectlen;	3518	ct.nitems = selectlen;
3549	ct.encoding = target;	3519	ct.encoding = target;
3550	}	3520	}
3551		3521
3552	XChangeProperty (dpy, rq.requestor, rq.property,	3522	XChangeProperty (dpy, rq.requestor, property,
3553	ct.encoding, 8, PropModeReplace,	3523	ct.encoding, 8, PropModeReplace,
3554	ct.value, (int)ct.nitems);	3524	ct.value, (int)ct.nitems);
3555	ev.property = rq.property;	3525	ev.property = property;
3556		3526
3557	if (freect)	3527	if (freect)
3558	XFree (ct.value);	3528	XFree (ct.value);
3559	}	3529	}
3560		3530
3561	XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);	3531	XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3562	}	3532	}
3563		3533
3564	/* ------------------------------------------------------------------------- */	3534	/* ------------------------------------------------------------------------- */
3565	#ifdef USE_XIM	3535	#if USE_XIM
3566	void	3536	void ecb_cold
3567	rxvt_term::im_set_position (XPoint &pos) NOTHROW	3537	rxvt_term::im_set_position (XPoint &pos) NOTHROW
3568	{	3538	{
3569	XWindowAttributes xwa;	3539	XWindowAttributes xwa;
3570		3540
3571	XGetWindowAttributes (dpy, vt, &xwa);	3541	XGetWindowAttributes (dpy, vt, &xwa);

Diff Legend

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