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.352 by root, Fri Oct 15 20:52:15 2010 UTC vs.
Revision 1.424 by root, Fri Jun 29 22:10:09 2012 UTC

1	/*---------------------------------------------------------------------------*	1	/*---------------------------------------------------------------------------*
2	* File: screen.C	2	* File: screen.C
3	*---------------------------------------------------------------------------*	3	*---------------------------------------------------------------------------*
4	*	4	*
5	* Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>	5	* Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6	* Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>	6	* Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de>
7	*	7	*
8	* This program is free software; you can redistribute it and/or modify	8	* This program is free software; you can redistribute it and/or modify
9	* it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
10	* the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation; either version 2 of the License, or
11	* (at your option) any later version.	11	* (at your option) any later version.
…		…
28	#include "rxvt.h" /* NECESSARY */	28	#include "rxvt.h" /* NECESSARY */
29	#include "rxvtperl.h" /* NECESSARY */	29	#include "rxvtperl.h" /* NECESSARY */
30		30
31	#include <inttypes.h>	31	#include <inttypes.h>
32		32
33	#include "salloc.C" // HACK, should be a separate compile!
34
35	static inline void	33	static inline void
36	fill_text (text_t *start, text_t value, int len)	34	fill_text (text_t *start, text_t value, int len)
37	{	35	{
38	while (len--)	36	while (len--)
39	*start++ = value;	37	*start++ = value;
40	}	38	}
41		39
42	/* ------------------------------------------------------------------------- */	40	/* ------------------------------------------------------------------------- */
43	#define PROP_SIZE 256*1024
44	#define PASTE_SIZE 32768
45	#define TABSIZE 8 /* default tab size */	41	#define TABSIZE 8 /* default tab size */
46		42
47	/* ------------------------------------------------------------------------- *	43	/* ------------------------------------------------------------------------- *
48	* GENERAL SCREEN AND SELECTION UPDATE ROUTINES *	44	* GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
49	* ------------------------------------------------------------------------- */	45	* ------------------------------------------------------------------------- */
…		…
100		96
101	/* Fill part/all of a line with blanks. */	97	/* Fill part/all of a line with blanks. */
102	void	98	void
103	rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW	99	rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW
104	{	100	{
105	if (!l.t)	101	if (!l.valid ())
106	{	102	{
107	lalloc (l);	103	l.alloc ();
108	col = 0;	104	col = 0;
109	width = ncol;	105	width = ncol;
110	}	106	}
111		107
112	l.touch ();	108	l.touch ();
…		…
159	/* ------------------------------------------------------------------------- *	155	/* ------------------------------------------------------------------------- *
160	* SCREEN INITIALISATION *	156	* SCREEN INITIALISATION *
161	* ------------------------------------------------------------------------- */	157	* ------------------------------------------------------------------------- */
162		158
163	void	159	void
		160	rxvt_term::scr_alloc () NOTHROW
		161	{
		162	int tsize = sizeof (text_t) * ncol;
		163	int rsize = sizeof (rend_t) * ncol;
		164
		165	// we assume that rend_t size is a sufficient alignment
		166	// factor for text_t and line_t values, and we only
		167	// need to adjust tsize.
		168	tsize = (tsize + sizeof (rend_t) - 1);
		169	tsize -= tsize % sizeof (rend_t);
		170
		171	int all_rows = total_rows + nrow + nrow;
		172
		173	chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows;
		174	chunk = chunk_alloc (chunk_size, 0);
		175
		176	char *base = (char *)chunk + sizeof (line_t) * all_rows;
		177
		178	for (int row = 0; row < all_rows; ++row)
		179	{
		180	line_t &l = ((line_t *)chunk) [row];
		181
		182	l.t = (text_t *)base; base += tsize;
		183	l.r = (rend_t *)base; base += rsize;
		184	l.l = -1;
		185	l.f = 0;
		186	}
		187
		188	drawn_buf = (line_t *)chunk;
		189	swap_buf = drawn_buf + nrow;
		190	row_buf = swap_buf + nrow;
		191	}
		192
		193	void ecb_cold
164	rxvt_term::scr_reset ()	194	rxvt_term::scr_reset ()
165	{	195	{
		196	#if ENABLE_OVERLAY
		197	scr_overlay_off ();
		198	#endif
		199
166	view_start = 0;	200	view_start = 0;
167	num_scr = 0;	201	num_scr = 0;
168		202
169	if (ncol == 0)	203	if (ncol == 0)
170	ncol = 80;	204	ncol = 80;
…		…
190	total_rows = nrow + saveLines;	224	total_rows = nrow + saveLines;
191		225
192	screen.tscroll = 0;	226	screen.tscroll = 0;
193	screen.bscroll = nrow - 1;	227	screen.bscroll = nrow - 1;
194		228
		229	void *prev_chunk = chunk;
		230	size_t prev_chunk_size = chunk_size;
		231	line_t *prev_drawn_buf = drawn_buf;
		232	line_t *prev_swap_buf = swap_buf;
		233	line_t *prev_row_buf = row_buf;
		234
		235	int common_col = min (prev_ncol, ncol);
		236
		237	scr_alloc ();
		238
195	if (!row_buf)	239	if (!prev_row_buf)
196	{	240	{
197	/*	241	/*
198	* first time called so just malloc everything: don't rely on realloc	242	* first time called (or after scr_release) so just malloc everything: don't rely on realloc
199	*/	243	*/
200	top_row = 0;	244	top_row = 0;
201	term_start = 0;	245	term_start = 0;
202
203	talloc = new rxvt_salloc (ncol * sizeof (text_t));
204	ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
205
206	row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
207	drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
208	swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
209
210	for (int row = nrow; row--; )
211	{
212	scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
213	scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
214	scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
215	}
216		246
217	memset (charsets, 'B', sizeof (charsets));	247	memset (charsets, 'B', sizeof (charsets));
218	rstyle = DEFAULT_RSTYLE;	248	rstyle = DEFAULT_RSTYLE;
219	screen.flags = Screen_DefaultFlags;	249	screen.flags = Screen_DefaultFlags;
220	screen.cur.row = screen.cur.col = 0;	250	screen.cur.row = screen.cur.col = 0;
…		…
243	{	273	{
244	/*	274	/*
245	* add or delete rows as appropriate	275	* add or delete rows as appropriate
246	*/	276	*/
247		277
248	rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
249	rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
250
251	#if 0
252	if (nrow < prev_nrow)
253	{
254	for (int row = nrow; row < prev_nrow; row++)
255	{
256	lfree (swap_buf [row]);
257	lfree (drawn_buf[row]);
258	}
259	}
260	#endif
261
262	drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
263	swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
264
265	for (int row = min (nrow, prev_nrow); row--; )	278	for (int row = min (nrow, prev_nrow); row--; )
266	{	279	{
267	lresize (drawn_buf[row]);	280	scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
268	lresize (swap_buf [row]);	281	scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
269	}
270		282
271	for (int row = prev_nrow; row < nrow; row++)	283	memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
		284	memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
		285	memcpy (swap_buf [row].t, prev_swap_buf [row].t, sizeof (text_t) * common_col);
		286	memcpy (swap_buf [row].r, prev_swap_buf [row].r, sizeof (rend_t) * common_col);
272	{	287	}
273	swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
274	drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
275	}
276
277	line_t *old_buf = row_buf;
278	row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
279		288
280	int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row	289	int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
281	int pend = MOD (term_start + top_row , prev_total_rows);	290	int pend = MOD (term_start + top_row , prev_total_rows);
282	int q = total_rows; // rewrapped row	291	int q = total_rows; // rewrapped row
283		292
…		…
291	ocur.row = MOD (term_start + ocur.row, prev_total_rows);	300	ocur.row = MOD (term_start + ocur.row, prev_total_rows);
292		301
293	do	302	do
294	{	303	{
295	p = MOD (p - 1, prev_total_rows);	304	p = MOD (p - 1, prev_total_rows);
296	assert (old_buf [MOD (p, prev_total_rows)].t);	305	assert (prev_row_buf [MOD (p, prev_total_rows)].t);
297	int plines = 1;	306	int plines = 1;
298	int llen = old_buf [MOD (p, prev_total_rows)].l;	307	int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
299		308
300	while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())	309	while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ())
301	{	310	{
302	p = MOD (p - 1, prev_total_rows);	311	p = MOD (p - 1, prev_total_rows);
303		312
304	plines++;	313	plines++;
305	llen += prev_ncol;	314	llen += prev_ncol;
…		…
318		327
319	// re-assemble the full line by destination lines	328	// re-assemble the full line by destination lines
320	for (int qrow = q; qlines--; qrow++)	329	for (int qrow = q; qlines--; qrow++)
321	{	330	{
322	qline = row_buf + qrow;	331	qline = row_buf + qrow;
323	lalloc (*qline);	332	qline->alloc (); // redundant with next line
324	qline->l = ncol;	333	qline->l = ncol;
325	qline->is_longer (1);	334	qline->is_longer (1);
326		335
327	int qcol = 0;	336	int qcol = 0;
328		337
…		…
343	// this seems to upset applications/shells/readline	352	// this seems to upset applications/shells/readline
344	// least.	353	// least.
345	if (prow == ocur.row)	354	if (prow == ocur.row)
346	screen.cur.row = q - (total_rows - nrow);	355	screen.cur.row = q - (total_rows - nrow);
347		356
348	line_t &pline = old_buf [prow];	357	line_t &pline = prev_row_buf [prow];
349		358
350	int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);	359	int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
351		360
352	memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));	361	memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
353	memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));	362	memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
…		…
374	{	383	{
375	// if no scrollback exists (yet), wing, instead of wrap	384	// if no scrollback exists (yet), wing, instead of wrap
376		385
377	for (int row = min (nrow, prev_nrow); row--; )	386	for (int row = min (nrow, prev_nrow); row--; )
378	{	387	{
379	line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];	388	line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
380	line_t &qline = row_buf [row];	389	line_t &dst = row_buf [row];
381		390
382	qline = pline;	391	scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
383	lresize (qline);	392
		393	memcpy (dst.t, src.t, sizeof (text_t) * common_col);
		394	memcpy (dst.r, src.r, sizeof (rend_t) * common_col);
384	}	395	}
385		396
386	for (int row = prev_nrow; row < nrow; row++)	397	for (int row = prev_nrow; row < nrow; row++)
387	{
388	row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);	398	scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
389	}
390		399
391	term_start = 0;	400	term_start = 0;
392	}	401	}
393
394	free (old_buf);
395	delete old_ta;
396	delete old_ra;
397		402
398	clamp_it (screen.cur.row, 0, nrow - 1);	403	clamp_it (screen.cur.row, 0, nrow - 1);
399	clamp_it (screen.cur.col, 0, ncol - 1);	404	clamp_it (screen.cur.col, 0, ncol - 1);
400	}	405	}
401		406
		407	for (int row = nrow; row--; )
		408	{
		409	if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
		410	if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
		411	if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
		412	}
		413
		414	printf ("pc %p\n", prev_chunk);//D
		415	chunk_free (prev_chunk, prev_chunk_size);
		416
402	free (tabs);	417	free (tabs);
403	tabs = (char *)rxvt_malloc (ncol);	418	tabs = (char *)rxvt_malloc (ncol);
404		419
405	for (int col = ncol; --col; )	420	for (int col = ncol; col--; )
406	tabs [col] = col % TABSIZE == 0;	421	tabs [col] = col % TABSIZE == 0;
407		422
408	CLEAR_ALL_SELECTION ();	423	CLEAR_ALL_SELECTION ();
409		424
410	prev_nrow = nrow;	425	prev_nrow = nrow;
…		…
413	tt_winch ();	428	tt_winch ();
414		429
415	HOOK_INVOKE ((this, HOOK_RESET, DT_END));	430	HOOK_INVOKE ((this, HOOK_RESET, DT_END));
416	}	431	}
417		432
418	/* ------------------------------------------------------------------------- */	433	void ecb_cold
419	/*
420	* Free everything. That way malloc debugging can find leakage.
421	*/
422	void
423	rxvt_term::scr_release () NOTHROW	434	rxvt_term::scr_release () NOTHROW
424	{	435	{
425	if (row_buf)	436	chunk_free (chunk, chunk_size);
426	{	437	chunk = 0;
427	delete talloc; talloc = 0;	438	row_buf = 0;
428	delete ralloc; ralloc = 0;
429		439
430	free (row_buf);
431	free (swap_buf);
432	free (drawn_buf);
433	row_buf = 0; // signal that we freed all the arrays above
434
435	free (tabs);	440	free (tabs);
436	tabs = 0;	441	tabs = 0;
437	}
438	}	442	}
439		443
440	/* ------------------------------------------------------------------------- */	444	/* ------------------------------------------------------------------------- */
441	/*	445	/*
442	* Hard/Soft reset	446	* Hard/Soft reset
443	*/	447	*/
444	void	448	void ecb_cold
445	rxvt_term::scr_poweron ()	449	rxvt_term::scr_poweron ()
446	{	450	{
447	scr_release ();	451	scr_release ();
		452
448	prev_nrow = prev_ncol = 0;	453	prev_nrow = prev_ncol = 0;
449	rvideo_mode = false;	454	rvideo_mode = false;
450	scr_soft_reset ();	455	scr_soft_reset ();
451	scr_reset ();	456	scr_reset ();
452		457
453	scr_clear (true);	458	scr_clear (true);
454	scr_refresh ();	459	scr_refresh ();
455	}	460	}
456		461
457	void	462	void ecb_cold
458	rxvt_term::scr_soft_reset ()	463	rxvt_term::scr_soft_reset () NOTHROW
459	{	464	{
460	/* only affects modes, nothing drastic such as clearing the screen */	465	/* only affects modes, nothing drastic such as clearing the screen */
461	#if ENABLE_OVERLAY	466	#if ENABLE_OVERLAY
462	scr_overlay_off ();	467	scr_overlay_off ();
463	#endif	468	#endif
…		…
518	assert (s->cur.row >= 0);	523	assert (s->cur.row >= 0);
519	assert (s->cur.col >= 0);	524	assert (s->cur.col >= 0);
520	}	525	}
521		526
522	void	527	void
523	rxvt_term::scr_swap_screen ()	528	rxvt_term::scr_swap_screen () NOTHROW
524	{	529	{
525	if (!option (Opt_secondaryScreen))	530	if (!option (Opt_secondaryScreen))
526	return;	531	return;
527		532
528	for (int i = prev_nrow; i--; )	533	for (int i = prev_nrow; i--; )
…		…
547	return;	552	return;
548		553
549	want_refresh = 1;	554	want_refresh = 1;
550	view_start = 0;	555	view_start = 0;
551		556
552	selection_check (2); /* check for boundary cross */	557	/* check for boundary cross */
		558	row_col_t pos;
		559	pos.row = pos.col = 0;
		560	if (ROWCOL_IS_BEFORE (selection.beg, pos)
		561	&& ROWCOL_IS_AFTER (selection.end, pos))
		562	CLEAR_SELECTION ();
553		563
554	current_screen = scrn;	564	current_screen = scrn;
555		565
556	#if NSCREENS	566	#if NSCREENS
557	if (option (Opt_secondaryScreen))	567	if (option (Opt_secondaryScreen))
…		…
623	/*	633	/*
624	* Scroll text between <row1> and <row2> inclusive, by <count> lines	634	* Scroll text between <row1> and <row2> inclusive, by <count> lines
625	* count positive ==> scroll up	635	* count positive ==> scroll up
626	* count negative ==> scroll down	636	* count negative ==> scroll down
627	*/	637	*/
628	int	638	int ecb_hot
629	rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW	639	rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
630	{	640	{
631	if (count == 0 || (row1 > row2))	641	if (count == 0 || (row1 > row2))
632	return 0;	642	return 0;
633		643
…		…
636		646
637	if (count > 0	647	if (count > 0
638	&& row1 == 0	648	&& row1 == 0
639	&& (current_screen == PRIMARY || option (Opt_secondaryScroll)))	649	&& (current_screen == PRIMARY || option (Opt_secondaryScroll)))
640	{	650	{
		651	min_it (count, total_rows - (nrow - (row2 + 1)));
		652
641	top_row = max (top_row - count, -saveLines);	653	top_row = max (top_row - count, -saveLines);
642
643	// scroll everything up 'count' lines
644	term_start = (term_start + count) % total_rows;
645		654
646	// sever bottommost line	655	// sever bottommost line
647	{	656	{
648	line_t &l = ROW(row2 - count);	657	line_t &l = ROW(row2);
649	l.is_longer (0);	658	l.is_longer (0);
650	l.touch ();	659	l.touch ();
651	}	660	}
652		661
		662	// scroll everything up 'count' lines
		663	term_start = (term_start + count) % total_rows;
		664
		665	// now copy lines below the scroll region bottom to the
		666	// bottom of the screen again, so they look as if they
		667	// hadn't moved.
		668	for (int i = nrow; --i > row2; )
		669	{
		670	line_t &l1 = ROW(i - count);
		671	line_t &l2 = ROW(i);
		672
		673	::swap (l1, l2);
		674	l2.touch ();
		675	}
		676
653	// erase newly scrolled-in lines	677	// erase newly scrolled-in lines
654	for (int i = count; i--; )	678	for (int i = count; i--; )
655	{	679	{
656	line_t &l = ROW(nrow - 1 - i);	680	line_t &l = ROW(row2 - i);
657		681
658	// optimize if already cleared, can be significant on slow machines	682	// optimise if already cleared, can be significant on slow machines
659	// could be rolled into scr_blank_screen_mem	683	// could be rolled into scr_blank_screen_mem
660	if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))	684	if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
661	{	685	{
662	scr_blank_line (l, 0, l.l, rstyle);	686	scr_blank_line (l, 0, l.l, rstyle);
663	l.l = 0;	687	l.l = 0;
…		…
665	}	689	}
666	else	690	else
667	scr_blank_screen_mem (l, rstyle);	691	scr_blank_screen_mem (l, rstyle);
668	}	692	}
669		693
670	// now copy lines below the scroll region bottom to the
671	// bottom of the screen again, so they look as if they
672	// hadn't moved.
673	for (int i = nrow; --i > row2; )
674	{
675	line_t &l1 = ROW(i - count);
676	line_t &l2 = ROW(i);
677
678	::swap (l1, l2);
679	l2.touch ();
680	}
681
682	// move and/or clear selection, if any	694	// move and/or clear selection, if any
683	if (selection.op && current_screen == selection.screen)	695	if (selection.op && current_screen == selection.screen
		696	&& selection.beg.row <= row2)
684	{	697	{
685	selection.beg.row -= count;	698	selection.beg.row -= count;
686	selection.end.row -= count;	699	selection.end.row -= count;
687	selection.mark.row -= count;	700	selection.mark.row -= count;
688		701
689	if (selection.beg.row < top_row	702	selection_check (0);
690	|| selection.end.row < top_row
691	|| selection.mark.row < top_row)
692	{
693	CLEAR_ALL_SELECTION ();
694	selection.op = SELECTION_CLEAR;
695	}
696	}	703	}
697		704
698	// finally move the view window, if desired	705	// finally move the view window, if desired
699	if (option (Opt_scrollWithBuffer)	706	if (option (Opt_scrollWithBuffer)
700	&& view_start != 0	707	&& view_start != 0
…		…
730	}	737	}
731		738
732	// use a simple and robust scrolling algorithm, this	739	// use a simple and robust scrolling algorithm, this
733	// part of scr_scroll_text is not time-critical.	740	// part of scr_scroll_text is not time-critical.
734		741
		742	// sever line above scroll region
		743	if (row1)
		744	{
		745	line_t &l = ROW(row1 - 1);
		746	l.is_longer (0);
		747	l.touch ();
		748	}
		749
735	int rows = row2 - row1 + 1;	750	int rows = row2 - row1 + 1;
736		751
737	min_it (count, rows);	752	min_it (count, rows);
738		753
739	line_t *temp_buf = row_buf + total_rows;	754	line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
740		755
741	for (int row = 0; row < rows; row++)	756	for (int row = 0; row < rows; row++)
742	{	757	{
743	temp_buf [row] = ROW(row1 + (row + count + rows) % rows);	758	temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
744		759
…		…
746	scr_blank_screen_mem (temp_buf [row], rstyle);	761	scr_blank_screen_mem (temp_buf [row], rstyle);
747	}	762	}
748		763
749	for (int row = 0; row < rows; row++)	764	for (int row = 0; row < rows; row++)
750	ROW(row1 + row) = temp_buf [row];	765	ROW(row1 + row) = temp_buf [row];
		766
		767	// sever bottommost line
		768	{
		769	line_t &l = ROW(row2);
		770	l.is_longer (0);
		771	l.touch ();
		772	}
751	}	773	}
752		774
753	return count;	775	return count;
754	}	776	}
755		777
756	/* ------------------------------------------------------------------------- */	778	/* ------------------------------------------------------------------------- */
757	/*	779	/*
758	* Add text given in <str> of length <len> to screen struct	780	* Add text given in <str> of length <len> to screen struct
759	*/	781	*/
760	void	782	void ecb_hot
761	rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW	783	rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
762	{	784	{
763	if (len <= 0) /* sanity */	785	if (len <= 0) /* sanity */
764	return;	786	return;
765		787
766	unsigned char checksel;	788	bool checksel;
767	unicode_t c;	789	unicode_t c;
768	int ncol = this->ncol;	790	int ncol = this->ncol;
769	const wchar_t *strend = str + len;	791	const wchar_t *strend = str + len;
770		792
771	want_refresh = 1;	793	want_refresh = 1;
…		…
797		819
798	while (str < strend)	820	while (str < strend)
799	{	821	{
800	c = (unicode_t)*str++; // convert to rxvt-unicodes representation	822	c = (unicode_t)*str++; // convert to rxvt-unicodes representation
801		823
802	if (expect_false (c < 0x20))	824	if (ecb_unlikely (c < 0x20))
803	if (c == C0_LF)	825	if (c == C0_LF)
804	{	826	{
805	max_it (line->l, screen.cur.col);	827	max_it (line->l, screen.cur.col);
806		828
807	screen.flags &= ~Screen_WrapNext;	829	screen.flags &= ~Screen_WrapNext;
…		…
826	{	848	{
827	scr_tab (1, true);	849	scr_tab (1, true);
828	continue;	850	continue;
829	}	851	}
830		852
831	if (expect_false (	853	if (ecb_unlikely (
832	checksel /* see if we're writing within selection */	854	checksel /* see if we're writing within selection */
833	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)	855	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
834	&& ROWCOL_IS_BEFORE (screen.cur, selection.end)	856	&& ROWCOL_IS_BEFORE (screen.cur, selection.end)
835	))	857	))
836	{	858	{
…		…
841	* should be a similar check.	863	* should be a similar check.
842	*/	864	*/
843	CLEAR_SELECTION ();	865	CLEAR_SELECTION ();
844	}	866	}
845		867
846	if (expect_false (screen.flags & Screen_WrapNext))	868	if (ecb_unlikely (screen.flags & Screen_WrapNext))
847	{	869	{
848	scr_do_wrap ();	870	scr_do_wrap ();
849		871
850	line->l = ncol;	872	line->l = ncol;
851	line->is_longer (1);	873	line->is_longer (1);
…		…
853	row = screen.cur.row;	875	row = screen.cur.row;
854	line = &ROW(row); /* _must_ refresh */	876	line = &ROW(row); /* _must_ refresh */
855	}	877	}
856		878
857	// some utf-8 decoders "decode" surrogate characters: let's fix this.	879	// some utf-8 decoders "decode" surrogate characters: let's fix this.
858	if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff)))	880	if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
859	c = 0xfffd;	881	c = 0xfffd;
860		882
861	// rely on wcwidth to tell us the character width, do wcwidth before	883	// rely on wcwidth to tell us the character width, do wcwidth before
862	// further replacements, as wcwidth might return -1 for the line	884	// further replacements, as wcwidth might return -1 for the line
863	// drawing characters below as they might be invalid in the current	885	// drawing characters below as they might be invalid in the current
864	// locale.	886	// locale.
865	int width = WCWIDTH (c);	887	int width = WCWIDTH (c);
866		888
867	if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL	889	if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
868	{	890	{
869	// vt100 special graphics and line drawing	891	// vt100 special graphics and line drawing
870	// 5f-7e standard vt100	892	// 5f-7e standard vt100
871	// 40-5e rxvt extension for extra curses acs chars	893	// 40-5e rxvt extension for extra curses acs chars
872	static uint16_t vt100_0[62] = { // 41 .. 7e	894	static uint16_t vt100_0[62] = { // 41 .. 7e
…		…
885	c = vt100_0[c - 0x41];	907	c = vt100_0[c - 0x41];
886	width = 1; // vt100 line drawing characters are always single-width	908	width = 1; // vt100 line drawing characters are always single-width
887	}	909	}
888	}	910	}
889		911
890	if (expect_false (screen.flags & Screen_Insert))	912	if (ecb_unlikely (screen.flags & Screen_Insert))
891	scr_insdel_chars (width, INSERT);	913	scr_insdel_chars (width, INSERT);
892		914
893	if (width != 0)	915	if (width != 0)
894	{	916	{
895	#if !UNICODE_3	917	#if !UNICODE_3
…		…
903	#endif	925	#endif
904		926
905	rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));	927	rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
906		928
907	// if the character doesn't fit into the remaining columns...	929	// if the character doesn't fit into the remaining columns...
908	if (expect_false (screen.cur.col > ncol - width && ncol >= width))	930	if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
909	{	931	{
910	if (screen.flags & Screen_Autowrap)	932	if (screen.flags & Screen_Autowrap)
911	{	933	{
912	// ... artificially enlargen the previous one	934	// ... artificially enlargen the previous one
913	c = NOCHAR;	935	c = NOCHAR;
…		…
917	else	939	else
918	screen.cur.col = ncol - width;	940	screen.cur.col = ncol - width;
919	}	941	}
920		942
921	// nuke the character at this position, if required	943	// nuke the character at this position, if required
922	if (expect_false (	944	// due to wonderful coincidences everywhere else in this loop
		945	// we never have to check for overwriting a wide char itself,
		946	// only its tail.
923	line->t[screen.cur.col] == NOCHAR	947	if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
924	|| (screen.cur.col < ncol - 1
925	&& line->t[screen.cur.col + 1] == NOCHAR)
926	))
927	scr_kill_char (*line, screen.cur.col);	948	scr_kill_char (*line, screen.cur.col);
928		949
929	line->touch ();	950	line->touch ();
930		951
931	do	952	do
932	{	953	{
933	line->t[screen.cur.col] = c;	954	line->t[screen.cur.col] = c;
934	line->r[screen.cur.col] = rend;	955	line->r[screen.cur.col] = rend;
935		956
936	if (expect_true (screen.cur.col < ncol - 1))	957	if (ecb_likely (screen.cur.col < ncol - 1))
937	screen.cur.col++;	958	screen.cur.col++;
938	else	959	else
939	{	960	{
940	line->l = ncol;	961	line->l = ncol;
941	if (screen.flags & Screen_Autowrap)	962	if (screen.flags & Screen_Autowrap)
…		…
944	goto end_of_line;	965	goto end_of_line;
945	}	966	}
946		967
947	c = NOCHAR;	968	c = NOCHAR;
948	}	969	}
949	while (expect_false (--width > 0));	970	while (ecb_unlikely (--width > 0));
950		971
951	// pad with spaces when overwriting wide character with smaller one	972	// pad with spaces when overwriting wide character with smaller one
952	for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++)	973	for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
953	{	974	{
954	line->t[c] = ' ';	975	line->t[c] = ' ';
955	line->r[c] = rend;	976	line->r[c] = rend;
956	}	977	}
957		978
…		…
1116	* XTERM_SEQ: ESC 6	1137	* XTERM_SEQ: ESC 6
1117	* Move cursor left in row. If we're at the left boundary, shift everything	1138	* Move cursor left in row. If we're at the left boundary, shift everything
1118	* in that row right. Clear left column.	1139	* in that row right. Clear left column.
1119	*/	1140	*/
1120	#if !ENABLE_MINIMAL	1141	#if !ENABLE_MINIMAL
1121	void	1142	void ecb_cold
1122	rxvt_term::scr_backindex () NOTHROW	1143	rxvt_term::scr_backindex () NOTHROW
1123	{	1144	{
1124	if (screen.cur.col > 0)	1145	if (screen.cur.col > 0)
1125	scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);	1146	scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1126	else	1147	else
…		…
1133	* XTERM_SEQ: ESC 9	1154	* XTERM_SEQ: ESC 9
1134	* Move cursor right in row. If we're at the right boundary, shift everything	1155	* Move cursor right in row. If we're at the right boundary, shift everything
1135	* in that row left. Clear right column.	1156	* in that row left. Clear right column.
1136	*/	1157	*/
1137	#if !ENABLE_MINIMAL	1158	#if !ENABLE_MINIMAL
1138	void	1159	void ecb_cold
1139	rxvt_term::scr_forwardindex () NOTHROW	1160	rxvt_term::scr_forwardindex () NOTHROW
1140	{	1161	{
1141	if (screen.cur.col < ncol - 1)	1162	if (screen.cur.col < ncol - 1)
1142	scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);	1163	scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1143	else	1164	else
…		…
1294	scr_blank_line (line, col, num, rstyle);	1315	scr_blank_line (line, col, num, rstyle);
1295	}	1316	}
1296		1317
1297	/* ------------------------------------------------------------------------- */	1318	/* ------------------------------------------------------------------------- */
1298	/*	1319	/*
1299	* Erase part of whole of the screen	1320	* Erase part or whole of the screen
1300	* XTERM_SEQ: Clear screen after cursor : ESC [ 0 J	1321	* XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1301	* XTERM_SEQ: Clear screen before cursor: ESC [ 1 J	1322	* XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1302	* XTERM_SEQ: Clear whole screen : ESC [ 2 J	1323	* XTERM_SEQ: Clear whole screen : ESC [ 2 J
1303	*/	1324	*/
1304	void	1325	void
…		…
1313	ZERO_SCROLLBACK ();	1334	ZERO_SCROLLBACK ();
1314		1335
1315	switch (mode)	1336	switch (mode)
1316	{	1337	{
1317	case 0: /* erase to end of screen */	1338	case 0: /* erase to end of screen */
1318	selection_check (1);
1319	scr_erase_line (0);	1339	scr_erase_line (0);
1320	row = screen.cur.row + 1; /* possible OOB */	1340	row = screen.cur.row + 1; /* possible OOB */
1321	num = nrow - row;	1341	num = nrow - row;
1322	break;	1342	break;
1323	case 1: /* erase to beginning of screen */	1343	case 1: /* erase to beginning of screen */
1324	selection_check (3);
1325	scr_erase_line (1);	1344	scr_erase_line (1);
1326	row = 0;	1345	row = 0;
1327	num = screen.cur.row;	1346	num = screen.cur.row;
1328	break;	1347	break;
1329	case 2: /* erase whole screen */	1348	case 2: /* erase whole screen */
1330	selection_check (3);
1331	row = 0;	1349	row = 0;
1332	num = nrow;	1350	num = nrow;
1333	break;	1351	break;
1334	default:	1352	default:
1335	return;	1353	return;
…		…
1352	{	1370	{
1353	ren = DEFAULT_RSTYLE;	1371	ren = DEFAULT_RSTYLE;
1354		1372
1355	if (mapped)	1373	if (mapped)
1356	XClearArea (dpy, vt, 0,	1374	XClearArea (dpy, vt, 0,
1357	Row2Pixel (row - view_start), (unsigned int)width,	1375	Row2Pixel (row - view_start), (unsigned int)vt_width,
1358	(unsigned int)Height2Pixel (num), False);	1376	(unsigned int)Height2Pixel (num), False);
1359	}	1377	}
1360	else	1378	else
1361	{	1379	{
1362	ren = rstyle & (RS_fgMask | RS_bgMask);	1380	ren = rstyle & (RS_fgMask | RS_bgMask);
…		…
1365	{	1383	{
1366	gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];	1384	gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1367	XChangeGC (dpy, gc, GCForeground, &gcvalue);	1385	XChangeGC (dpy, gc, GCForeground, &gcvalue);
1368	XFillRectangle (dpy, vt, gc,	1386	XFillRectangle (dpy, vt, gc,
1369	0, Row2Pixel (row - view_start),	1387	0, Row2Pixel (row - view_start),
1370	(unsigned int)width,	1388	(unsigned int)vt_width,
1371	(unsigned int)Height2Pixel (num));	1389	(unsigned int)Height2Pixel (num));
1372	gcvalue.foreground = pix_colors[Color_fg];	1390	gcvalue.foreground = pix_colors[Color_fg];
1373	XChangeGC (dpy, gc, GCForeground, &gcvalue);	1391	XChangeGC (dpy, gc, GCForeground, &gcvalue);
1374	}	1392	}
1375	}	1393	}
…		…
1397	/* ------------------------------------------------------------------------- */	1415	/* ------------------------------------------------------------------------- */
1398	/*	1416	/*
1399	* Fill the screen with `E's	1417	* Fill the screen with `E's
1400	* XTERM_SEQ: Screen Alignment Test: ESC # 8	1418	* XTERM_SEQ: Screen Alignment Test: ESC # 8
1401	*/	1419	*/
1402	void	1420	void ecb_cold
1403	rxvt_term::scr_E () NOTHROW	1421	rxvt_term::scr_E () NOTHROW
1404	{	1422	{
1405	rend_t fs;	1423	rend_t fs;
1406		1424
1407	want_refresh = 1;	1425	want_refresh = 1;
1408	ZERO_SCROLLBACK ();	1426	ZERO_SCROLLBACK ();
1409		1427
1410	num_scr_allow = 0;	1428	num_scr_allow = 0;
1411	selection_check (3);	1429
		1430	row_col_t pos;
		1431	pos.row = pos.col = 0;
		1432	if (ROWCOL_IS_AFTER (selection.end, pos))
		1433	CLEAR_SELECTION ();
1412		1434
1413	fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));	1435	fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1414	for (int row = nrow; row--; )	1436	for (int row = nrow; row--; )
1415	{	1437	{
1416	line_t &line = ROW(row);	1438	line_t &line = ROW(row);
…		…
1567	/* ------------------------------------------------------------------------- */	1589	/* ------------------------------------------------------------------------- */
1568	/*	1590	/*
1569	* Set the scrolling region	1591	* Set the scrolling region
1570	* XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r	1592	* XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1571	*/	1593	*/
1572	void	1594	void ecb_cold
1573	rxvt_term::scr_scroll_region (int top, int bot) NOTHROW	1595	rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1574	{	1596	{
1575	max_it (top, 0);	1597	max_it (top, 0);
1576	min_it (bot, nrow - 1);	1598	min_it (bot, nrow - 1);
1577		1599
…		…
1587	/*	1609	/*
1588	* Make the cursor visible/invisible	1610	* Make the cursor visible/invisible
1589	* XTERM_SEQ: Make cursor visible : ESC [ ? 25 h	1611	* XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1590	* XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l	1612	* XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1591	*/	1613	*/
1592	void	1614	void ecb_cold
1593	rxvt_term::scr_cursor_visible (int mode) NOTHROW	1615	rxvt_term::scr_cursor_visible (int mode) NOTHROW
1594	{	1616	{
1595	want_refresh = 1;	1617	want_refresh = 1;
1596		1618
1597	if (mode)	1619	if (mode)
…		…
1604	/*	1626	/*
1605	* Set/unset automatic wrapping	1627	* Set/unset automatic wrapping
1606	* XTERM_SEQ: Set Wraparound : ESC [ ? 7 h	1628	* XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1607	* XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l	1629	* XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1608	*/	1630	*/
1609	void	1631	void ecb_cold
1610	rxvt_term::scr_autowrap (int mode) NOTHROW	1632	rxvt_term::scr_autowrap (int mode) NOTHROW
1611	{	1633	{
1612	if (mode)	1634	if (mode)
1613	screen.flags |= Screen_Autowrap;	1635	screen.flags |= Screen_Autowrap;
1614	else	1636	else
…		…
1623	* Relative mode: line numbers are relative to top margin of scrolling region	1645	* Relative mode: line numbers are relative to top margin of scrolling region
1624	* and the cursor cannot be moved outside.	1646	* and the cursor cannot be moved outside.
1625	* XTERM_SEQ: Set Absolute: ESC [ ? 6 h	1647	* XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1626	* XTERM_SEQ: Set Relative: ESC [ ? 6 l	1648	* XTERM_SEQ: Set Relative: ESC [ ? 6 l
1627	*/	1649	*/
1628	void	1650	void ecb_cold
1629	rxvt_term::scr_relative_origin (int mode) NOTHROW	1651	rxvt_term::scr_relative_origin (int mode) NOTHROW
1630	{	1652	{
1631	if (mode)	1653	if (mode)
1632	screen.flags |= Screen_Relative;	1654	screen.flags |= Screen_Relative;
1633	else	1655	else
…		…
1640	/*	1662	/*
1641	* Set insert/replace mode	1663	* Set insert/replace mode
1642	* XTERM_SEQ: Set Insert mode : ESC [ ? 4 h	1664	* XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1643	* XTERM_SEQ: Set Replace mode: ESC [ ? 4 l	1665	* XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1644	*/	1666	*/
1645	void	1667	void ecb_cold
1646	rxvt_term::scr_insert_mode (int mode) NOTHROW	1668	rxvt_term::scr_insert_mode (int mode) NOTHROW
1647	{	1669	{
1648	if (mode)	1670	if (mode)
1649	screen.flags |= Screen_Insert;	1671	screen.flags |= Screen_Insert;
1650	else	1672	else
…		…
1656	* Set/Unset tabs	1678	* Set/Unset tabs
1657	* XTERM_SEQ: Set tab at current column : ESC H	1679	* XTERM_SEQ: Set tab at current column : ESC H
1658	* XTERM_SEQ: Clear tab at current column: ESC [ 0 g	1680	* XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1659	* XTERM_SEQ: Clear all tabs : ESC [ 3 g	1681	* XTERM_SEQ: Clear all tabs : ESC [ 3 g
1660	*/	1682	*/
1661	void	1683	void ecb_cold
1662	rxvt_term::scr_set_tab (int mode) NOTHROW	1684	rxvt_term::scr_set_tab (int mode) NOTHROW
1663	{	1685	{
1664	if (mode < 0)	1686	if (mode < 0)
1665	memset (tabs, 0, ncol);	1687	memset (tabs, 0, ncol);
1666	else if (screen.cur.col < ncol)	1688	else if (screen.cur.col < ncol)
…		…
1686	{	1708	{
1687	rvideo_state = on;	1709	rvideo_state = on;
1688		1710
1689	::swap (pix_colors[Color_fg], pix_colors[Color_bg]);	1711	::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1690	#ifdef HAVE_BG_PIXMAP	1712	#ifdef HAVE_BG_PIXMAP
1691	if (bgPixmap.pixmap == None)	1713	if (bg_img == 0)
1692	#endif	1714	#endif
1693	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);	1715	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1694		1716
1695	XGCValues gcvalue;	1717	XGCValues gcvalue;
1696	gcvalue.foreground = pix_colors[Color_fg];	1718	gcvalue.foreground = pix_colors[Color_fg];
…		…
1705	/* ------------------------------------------------------------------------- */	1727	/* ------------------------------------------------------------------------- */
1706	/*	1728	/*
1707	* Report current cursor position	1729	* Report current cursor position
1708	* XTERM_SEQ: Report position: ESC [ 6 n	1730	* XTERM_SEQ: Report position: ESC [ 6 n
1709	*/	1731	*/
1710	void	1732	void ecb_cold
1711	rxvt_term::scr_report_position () NOTHROW	1733	rxvt_term::scr_report_position () NOTHROW
1712	{	1734	{
1713	tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);	1735	tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1714	}	1736	}
1715		1737
…		…
1718	* ------------------------------------------------------------------------- */	1740	* ------------------------------------------------------------------------- */
1719		1741
1720	/*	1742	/*
1721	* Set font style	1743	* Set font style
1722	*/	1744	*/
1723	void	1745	void ecb_cold
1724	rxvt_term::set_font_style () NOTHROW	1746	rxvt_term::set_font_style () NOTHROW
1725	{	1747	{
1726	#if 0	1748	#if 0
1727	switch (charsets [screen.charset])	1749	switch (charsets [screen.charset])
1728	{	1750	{
…		…
1750	* XTERM_SEQ: Invoke G0 character set: CTRL-O	1772	* XTERM_SEQ: Invoke G0 character set: CTRL-O
1751	* XTERM_SEQ: Invoke G1 character set: CTRL-N	1773	* XTERM_SEQ: Invoke G1 character set: CTRL-N
1752	* XTERM_SEQ: Invoke G2 character set: ESC N	1774	* XTERM_SEQ: Invoke G2 character set: ESC N
1753	* XTERM_SEQ: Invoke G3 character set: ESC O	1775	* XTERM_SEQ: Invoke G3 character set: ESC O
1754	*/	1776	*/
1755	void	1777	void ecb_cold
1756	rxvt_term::scr_charset_choose (int set) NOTHROW	1778	rxvt_term::scr_charset_choose (int set) NOTHROW
1757	{	1779	{
1758	screen.charset = set;	1780	screen.charset = set;
1759	set_font_style ();	1781	set_font_style ();
1760	}	1782	}
…		…
1781	* ------------------------------------------------------------------------- */	1803	* ------------------------------------------------------------------------- */
1782		1804
1783	/*	1805	/*
1784	* refresh matching text.	1806	* refresh matching text.
1785	*/	1807	*/
1786	bool	1808	bool ecb_cold
1787	rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW	1809	rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1788	{	1810	{
1789	bool found = false;	1811	bool found = false;
1790		1812
1791	for (int i = 0; i < nrow; i++)	1813	for (int i = 0; i < nrow; i++)
…		…
1810	PART_BEG = 0,	1832	PART_BEG = 0,
1811	PART_END,	1833	PART_END,
1812	RC_COUNT	1834	RC_COUNT
1813	};	1835	};
1814		1836
1815	void	1837	void ecb_hot
1816	rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW	1838	rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1817	{	1839	{
1818	int i;	1840	int i;
1819	row_col_t rc[RC_COUNT];	1841	row_col_t rc[RC_COUNT];
1820		1842
…		…
1857	* Refresh the entire screen	1879	* Refresh the entire screen
1858	*/	1880	*/
1859	void	1881	void
1860	rxvt_term::scr_touch (bool refresh) NOTHROW	1882	rxvt_term::scr_touch (bool refresh) NOTHROW
1861	{	1883	{
1862	scr_expose (0, 0, width, height, refresh);	1884	scr_expose (0, 0, vt_width, vt_height, refresh);
1863	}	1885	}
1864		1886
1865	/* ------------------------------------------------------------------------- */	1887	/* ------------------------------------------------------------------------- */
1866	/*	1888	/*
1867	* Move the display so that the line represented by scrollbar value Y is at	1889	* Move the display so that the line represented by scrollbar value Y is at
…		…
1923		1945
1924	# ifndef NO_MAPALERT	1946	# ifndef NO_MAPALERT
1925	# ifdef MAPALERT_OPTION	1947	# ifdef MAPALERT_OPTION
1926	if (option (Opt_mapAlert))	1948	if (option (Opt_mapAlert))
1927	# endif	1949	# endif
1928	XMapWindow (dpy, parent[0]);	1950	XMapWindow (dpy, parent);
1929	# endif	1951	# endif
1930		1952
1931	# if ENABLE_FRILLS	1953	# if ENABLE_FRILLS
1932	if (option (Opt_urgentOnBell))	1954	if (option (Opt_urgentOnBell))
1933	set_urgency (1);	1955	set_urgency (1);
…		…
1946	HOOK_INVOKE ((this, HOOK_BELL, DT_END));	1968	HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1947	#endif	1969	#endif
1948	}	1970	}
1949		1971
1950	/* ------------------------------------------------------------------------- */	1972	/* ------------------------------------------------------------------------- */
1951	/* ARGSUSED */	1973	void ecb_cold
1952	void
1953	rxvt_term::scr_printscreen (int fullhist) NOTHROW	1974	rxvt_term::scr_printscreen (int fullhist) NOTHROW
1954	{	1975	{
1955	#ifdef PRINTPIPE	1976	#ifdef PRINTPIPE
1956	int nrows, row_start;	1977	int nrows, row_start;
1957	FILE *fd = popen_printer ();	1978	FILE *fd = popen_printer ();
…		…
2006	/*	2027	/*
2007	* Refresh the screen	2028	* Refresh the screen
2008	* drawn_text/drawn_rend contain the screen information before the update.	2029	* drawn_text/drawn_rend contain the screen information before the update.
2009	* screen.text/screen.rend contain what the screen will change to.	2030	* screen.text/screen.rend contain what the screen will change to.
2010	*/	2031	*/
2011	void	2032	void ecb_hot
2012	rxvt_term::scr_refresh () NOTHROW	2033	rxvt_term::scr_refresh () NOTHROW
2013	{	2034	{
2014	int16_t col, row, /* column/row we're processing */	2035	int16_t col, row, /* column/row we're processing */
2015	ocrow; /* old cursor row */	2036	ocrow; /* old cursor row */
2016	int i; /* tmp */	2037	int i; /* tmp */
…		…
2030	* A: set up vars	2051	* A: set up vars
2031	*/	2052	*/
2032	refresh_count = 0;	2053	refresh_count = 0;
2033		2054
2034	unsigned int old_screen_flags = screen.flags;	2055	unsigned int old_screen_flags = screen.flags;
2035	char have_bg = 0;	2056	bool have_bg = 0;
2036	#ifdef HAVE_BG_PIXMAP	2057	#ifdef HAVE_BG_PIXMAP
2037	have_bg = bgPixmap.pixmap != None;	2058	have_bg = bg_img != 0;
2038	#endif	2059	#endif
2039	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */	2060	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2040		2061
2041	/*	2062	/*
2042	* B: reverse any characters which are selected	2063	* B: reverse any characters which are selected
…		…
2046	HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));	2067	HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2047	#if ENABLE_OVERLAY	2068	#if ENABLE_OVERLAY
2048	scr_swap_overlay ();	2069	scr_swap_overlay ();
2049	#endif	2070	#endif
2050		2071
2051	char showcursor = screen.flags & Screen_VisibleCursor;	2072	bool showcursor = screen.flags & Screen_VisibleCursor;
2052		2073
2053	/*	2074	/*
2054	* C: set the cursor character (s)	2075	* C: set the cursor character (s)
2055	*/	2076	*/
2056	{	2077	{
2057	unsigned char setoldcursor;	2078	bool setoldcursor;
2058		2079
2059	#ifdef CURSOR_BLINK	2080	#ifdef CURSOR_BLINK
2060	if (hidden_cursor)	2081	if (hidden_cursor)
2061	showcursor = 0;	2082	showcursor = 0;
2062	#endif	2083	#endif
…		…
2149	{	2170	{
2150	int16_t nits;	2171	int16_t nits;
2151	int i = num_scr;	2172	int i = num_scr;
2152	int j;	2173	int j;
2153	int len, wlen;	2174	int len, wlen;
2154	dLocal (int, num_scr);
2155		2175
2156	j = nrow;	2176	j = nrow;
2157	wlen = len = -1;	2177	wlen = len = -1;
2158	row = i > 0 ? 0 : j - 1;	2178	row = i > 0 ? 0 : j - 1;
2159		2179
…		…
2234	continue;	2254	continue;
2235		2255
2236	// redraw one or more characters	2256	// redraw one or more characters
2237		2257
2238	// seek to the beginning of wide characters	2258	// seek to the beginning of wide characters
2239	while (expect_false (stp[col] == NOCHAR && col > 0))	2259	while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2240	--col;	2260	--col;
2241		2261
2242	rend_t rend = srp[col]; /* screen rendition (target rendition) */	2262	rend_t rend = srp[col]; /* screen rendition (target rendition) */
2243	text_t *text = stp + col;	2263	text_t *text = stp + col;
2244	int count = 1;	2264	int count = 1;
…		…
2282		2302
2283	col--; /* went one too far. move back */	2303	col--; /* went one too far. move back */
2284	count -= i; /* dump any matching trailing chars */	2304	count -= i; /* dump any matching trailing chars */
2285		2305
2286	// sometimes we optimize away the trailing NOCHAR's, add them back	2306	// sometimes we optimize away the trailing NOCHAR's, add them back
2287	while (expect_false (i && text[count] == NOCHAR))	2307	while (ecb_unlikely (i && text[count] == NOCHAR))
2288	count++, i--;	2308	count++, i--;
2289		2309
2290	/*	2310	/*
2291	* Determine the attributes for the string	2311	* Determine the attributes for the string
2292	*/	2312	*/
2293	int fore = fgcolor_of (rend); // desired foreground	2313	int fore = fgcolor_of (rend); // desired foreground
2294	int back = bgcolor_of (rend); // desired background	2314	int back = bgcolor_of (rend); // desired background
2295		2315
2296	// only do special processing if any attributes are set, which is unlikely	2316	// only do special processing if any attributes are set, which is unlikely
2297	if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))	2317	if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2298	{	2318	{
2299	bool invert = rend & RS_RVid;	2319	bool invert = rend & RS_RVid;
2300		2320
2301	#ifndef NO_BOLD_UNDERLINE_REVERSE	2321	#ifndef NO_BOLD_UNDERLINE_REVERSE
2302	if (rend & RS_Bold && fore == Color_fg)	2322	if (rend & RS_Bold && fore == Color_fg)
…		…
2391	/*	2411	/*
2392	* Actually do the drawing of the string here	2412	* Actually do the drawing of the string here
2393	*/	2413	*/
2394	rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];	2414	rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2395		2415
2396	if (expect_true (have_bg && back == Color_bg))	2416	if (ecb_likely (have_bg && back == Color_bg))
2397	{	2417	{
2398	// this is very ugly, maybe push it into ->draw?	2418	// this is very ugly, maybe push it into ->draw?
2399		2419
2400	for (i = 0; i < count; i++) /* don't draw empty strings */	2420	for (i = 0; i < count; i++) /* don't draw empty strings */
2401	if (text[i] != ' ')	2421	if (text[i] != ' ')
…		…
2408	did_clear: ;	2428	did_clear: ;
2409	}	2429	}
2410	else	2430	else
2411	font->draw (*drawable, xpixel, ypixel, text, count, fore, back);	2431	font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2412		2432
2413	if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))	2433	if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2414	{	2434	{
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
…		…
2464		2484
2465	XDrawRectangle (dpy, vt, gc,	2485	XDrawRectangle (dpy, vt, gc,
2466	Col2Pixel (col),	2486	Col2Pixel (col),
2467	Row2Pixel (oldcursor.row),	2487	Row2Pixel (oldcursor.row),
2468	(unsigned int) (Width2Pixel (cursorwidth) - 1),	2488	(unsigned int) (Width2Pixel (cursorwidth) - 1),
2469	(unsigned int) (Height2Pixel (1) - lineSpace - 1));	2489	(unsigned int) (Height2Pixel (1) - 1));
2470	}	2490	}
2471	}	2491	}
2472		2492
2473	/*	2493	/*
2474	* H: cleanup selection	2494	* H: cleanup selection
…		…
2483	screen.flags = old_screen_flags;	2503	screen.flags = old_screen_flags;
2484	num_scr = 0;	2504	num_scr = 0;
2485	num_scr_allow = 1;	2505	num_scr_allow = 1;
2486	}	2506	}
2487		2507
2488	void	2508	void ecb_cold
2489	rxvt_term::scr_remap_chars (line_t &l) NOTHROW	2509	rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2490	{	2510	{
2491	if (!l.t)	2511	if (!l.valid ())
2492	return;	2512	return;
2493		2513
2494	l.touch (); // maybe a bit of an overkill, but it's not performance-relevant	2514	l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2495		2515
2496	for (int i = ncol; i--; )	2516	for (int i = ncol; i--; )
2497	l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));	2517	l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2498	}	2518	}
2499		2519
2500	void	2520	void ecb_cold
2501	rxvt_term::scr_remap_chars () NOTHROW	2521	rxvt_term::scr_remap_chars () NOTHROW
2502	{	2522	{
2503	for (int i = total_rows; i--; )	2523	for (int i = total_rows; i--; )
2504	scr_remap_chars (row_buf [i]);	2524	scr_remap_chars (row_buf [i]);
2505		2525
…		…
2508	scr_remap_chars (drawn_buf [i]);	2528	scr_remap_chars (drawn_buf [i]);
2509	scr_remap_chars (swap_buf [i]);	2529	scr_remap_chars (swap_buf [i]);
2510	}	2530	}
2511	}	2531	}
2512		2532
2513	void	2533	void ecb_cold
2514	rxvt_term::scr_recolour () NOTHROW	2534	rxvt_term::scr_recolour (bool refresh) NOTHROW
2515	{	2535	{
		2536	bool transparent = false;
		2537
2516	#ifdef HAVE_BG_PIXMAP	2538	#ifdef HAVE_BG_PIXMAP
2517	bgPixmap.apply ();	2539	if (bg_img != 0)
2518	#else	2540	{
		2541	# if ENABLE_TRANSPARENCY
		2542	if (bg_flags & BG_IS_TRANSPARENT)
		2543	{
		2544	XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
		2545	XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2519		2546
		2547	transparent = true;
		2548	}
		2549	else
		2550	# endif
		2551	{
		2552	XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
		2553	XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
		2554	}
		2555	}
		2556	else
		2557	#endif
		2558	{
2520	XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);	2559	XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2521	XClearWindow (dpy, parent[0]);
2522	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);	2560	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
		2561	}
		2562
		2563	XClearWindow (dpy, parent);
2523		2564
2524	if (scrollBar.win)	2565	if (scrollBar.win)
2525	{	2566	{
		2567	if (transparent)
		2568	XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
		2569	else
2526	XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);	2570	XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2527	scrollBar.state = STATE_IDLE;	2571	scrollBar.state = SB_STATE_IDLE;
2528	scrollBar.show (0);	2572	scrollBar.show (0);
2529	}	2573	}
2530		2574
2531	#endif	2575	if (refresh)
2532		2576	{
2533	/* bgPixmap.apply () does not do the following : */
2534	scr_clear ();	2577	scr_clear ();
2535	scr_touch (true);	2578	scr_touch (true);
		2579	}
2536	want_refresh = 1;	2580	want_refresh = 1;
2537	}	2581	}
2538		2582
2539	/* ------------------------------------------------------------------------- */	2583	/* ------------------------------------------------------------------------- */
2540	void	2584	void
…		…
2597	for (rend_t *srp = ROW(row).r; col < end_col; col++)	2641	for (rend_t *srp = ROW(row).r; col < end_col; col++)
2598	srp[col] ^= rstyle;	2642	srp[col] ^= rstyle;
2599	}	2643	}
2600		2644
2601	/* ------------------------------------------------------------------------- */	2645	/* ------------------------------------------------------------------------- */
2602	void	2646	void ecb_hot
2603	rxvt_term::scr_reverse_selection () NOTHROW	2647	rxvt_term::scr_reverse_selection () NOTHROW
2604	{	2648	{
2605	if (selection.op	2649	if (selection.op
2606	&& current_screen == selection.screen	2650	&& current_screen == selection.screen
2607	&& selection.end.row >= view_start)	2651	&& selection.end.row >= view_start)
…		…
2626	*/	2670	*/
2627	#if 0	2671	#if 0
2628	void	2672	void
2629	rxvt_term::scr_dump (int fd) NOTHROW	2673	rxvt_term::scr_dump (int fd) NOTHROW
2630	{	2674	{
2631	int row, wrote;	2675	// if this method is needed, it can be implemented by factoring the
2632	unsigned int width, towrite;	2676	// relevant code in scr_printscreen
2633	char r1[] = "\n";
2634
2635	for (row = saveLines + top_row;
2636	row < saveLines + nrow - 1; row++)
2637	{
2638	width = row_buf[row].l >= 0 ? row_buf[row].l
2639	: ncol;
2640	for (towrite = width; towrite; towrite -= wrote)
2641	{
2642	wrote = write (fd, & (row_buf[row].t[width - towrite]),
2643	towrite);
2644	if (wrote < 0)
2645	return; /* XXX: death, no report */
2646	}
2647	if (row_buf[row].l >= 0)
2648	if (write (fd, r1, 1) <= 0)
2649	return; /* XXX: death, no report */
2650	}
2651	}	2677	}
2652	#endif	2678	#endif
2653		2679
2654	/* ------------------------------------------------------------------------- *	2680	/* ------------------------------------------------------------------------- *
2655	* CHARACTER SELECTION *	2681	* CHARACTER SELECTION *
2656	* ------------------------------------------------------------------------- */	2682	* ------------------------------------------------------------------------- */
2657	void	2683	void
2658	rxvt_term::selection_check (int check_more) NOTHROW	2684	rxvt_term::selection_check (int check_more) NOTHROW
2659	{	2685	{
2660	row_col_t pos;
2661
2662	if (!selection.op)	2686	if (!selection.op)
2663	return;	2687	return;
2664		2688
2665	pos.row = pos.col = 0;
2666	if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)	2689	if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2667	|| !IN_RANGE_EXC (selection.mark.row, top_row, nrow)	2690	|| !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2668	|| !IN_RANGE_EXC (selection.end.row, top_row, nrow)	2691	|| !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2669	|| (check_more == 1	2692	|| (check_more == 1
2670	&& current_screen == selection.screen	2693	&& current_screen == selection.screen
2671	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)	2694	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2672	&& ROWCOL_IS_BEFORE (screen.cur, selection.end))	2695	&& ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2673	|| (check_more == 2
2674	&& ROWCOL_IS_BEFORE (selection.beg, pos)
2675	&& ROWCOL_IS_AFTER (selection.end, pos))
2676	|| (check_more == 3
2677	&& ROWCOL_IS_AFTER (selection.end, pos))
2678	|| (check_more == 4 /* screen width change */
2679	&& (selection.beg.row != selection.end.row
2680	|| selection.end.col > ncol)))
2681	CLEAR_SELECTION ();	2696	CLEAR_ALL_SELECTION ();
2682	}	2697	}
2683		2698
2684	/* ------------------------------------------------------------------------- */	2699	/* ------------------------------------------------------------------------- */
2685	/*	2700	/*
2686	* Paste a selection direct to the command fd	2701	* Paste a selection direct to the command fd
…		…
2692	for (unsigned int i = 0; i < len; i++)	2707	for (unsigned int i = 0; i < len; i++)
2693	if (data[i] == C0_LF)	2708	if (data[i] == C0_LF)
2694	data[i] = C0_CR;	2709	data[i] = C0_CR;
2695		2710
2696	if (priv_modes & PrivMode_BracketPaste)	2711	if (priv_modes & PrivMode_BracketPaste)
2697	tt_printf ("\e[200~");	2712	tt_printf ("\x1b[200~");
2698		2713
2699	tt_write (data, len);	2714	tt_write (data, len);
2700		2715
2701	if (priv_modes & PrivMode_BracketPaste)	2716	if (priv_modes & PrivMode_BracketPaste)
2702	tt_printf ("\e[201~");	2717	tt_printf ("\x1b[201~");
2703	}	2718	}
2704		2719
2705	void	2720	void
2706	rxvt_term::paste (char *data, unsigned int len) NOTHROW	2721	rxvt_term::paste (char *data, unsigned int len) NOTHROW
2707	{	2722	{
…		…
2711	tt_paste (data, len);	2726	tt_paste (data, len);
2712	}	2727	}
2713		2728
2714	/* ------------------------------------------------------------------------- */	2729	/* ------------------------------------------------------------------------- */
2715	/*	2730	/*
2716	* Respond to a notification that a primary selection has been sent	2731	* Request PRIMARY, SECONDARY or CLIPBOARD selection.
2717	* EXT: SelectionNotify	2732	* if the requested selection has no owner or is empty CUT_BUFFER0 is used
2718	*/	2733	* as fallback
2719	void
2720	rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2721	{
2722	if (prop == None) /* check for failed XConvertSelection */
2723	{
2724	if ((selection_type & Sel_CompoundText))
2725	{
2726	int selnum = selection_type & Sel_whereMask;
2727
2728	selection_type = 0;
2729	if (selnum != Sel_direct)
2730	selection_request_other (XA_STRING, selnum);
2731	}
2732
2733	if ((selection_type & Sel_UTF8String))
2734	{
2735	int selnum = selection_type & Sel_whereMask;
2736
2737	selection_type = Sel_CompoundText;
2738	if (selnum != Sel_direct)
2739	selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2740	else
2741	selection_type = 0;
2742	}
2743
2744	return;
2745	}
2746
2747	unsigned long bytes_after;
2748	XTextProperty ct;
2749
2750	if (XGetWindowProperty (dpy, win, prop,
2751	0, PROP_SIZE / 4,
2752	delete_prop, AnyPropertyType,
2753	&ct.encoding, &ct.format,
2754	&ct.nitems, &bytes_after,
2755	&ct.value) != Success)
2756	{
2757	ct.value = 0;
2758	goto bailout;
2759	}
2760
2761	if (ct.encoding == None)
2762	goto bailout;
2763
2764	if (bytes_after)
2765	{
2766	// fetch and append remaining data
2767	XTextProperty ct2;
2768
2769	if (XGetWindowProperty (dpy, win, prop,
2770	ct.nitems / 4, (bytes_after + 3) / 4,
2771	delete_prop, AnyPropertyType,
2772	&ct2.encoding, &ct2.format,
2773	&ct2.nitems, &bytes_after,
2774	&ct2.value) != Success)
2775	goto bailout;
2776
2777	// realloc should be compatible to XFree, here, and elsewhere, too
2778	ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2779	memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2780	ct.nitems += ct2.nitems;
2781
2782	XFree (ct2.value);
2783	}
2784
2785	if (ct.value == 0)
2786	goto bailout;
2787
2788	if (ct.encoding == xa[XA_INCR])
2789	{
2790	// INCR selection, start handshake
2791	if (!delete_prop)
2792	XDeleteProperty (dpy, win, prop);
2793
2794	selection_wait = Sel_incr;
2795	incr_buf_fill = 0;
2796	incr_ev.start (10);
2797
2798	goto bailout;
2799	}
2800
2801	if (ct.nitems == 0)
2802	{
2803	if (selection_wait == Sel_incr)
2804	{
2805	XFree (ct.value);
2806
2807	// finally complete, now paste the whole thing
2808	selection_wait = Sel_normal;
2809	ct.value = (unsigned char *)incr_buf;
2810	ct.nitems = incr_buf_fill;
2811	incr_buf = 0;
2812	incr_buf_size = 0;
2813	incr_ev.stop ();
2814	}
2815	else
2816	{
2817	if (selection_wait == Sel_normal
2818	&& (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2819	{
2820	/*
2821	* pass through again trying CUT_BUFFER0 if we've come from
2822	* XConvertSelection () but nothing was presented
2823	*/
2824	selection_paste (display->root, XA_CUT_BUFFER0, False);
2825	}
2826
2827	goto bailout;
2828	}
2829	}
2830	else if (selection_wait == Sel_incr)
2831	{
2832	incr_ev.start (10);
2833
2834	while (incr_buf_fill + ct.nitems > incr_buf_size)
2835	{
2836	incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2837	incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2838	}
2839
2840	memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2841	incr_buf_fill += ct.nitems;
2842
2843	goto bailout;
2844	}
2845
2846	char **cl;
2847	int cr;
2848
2849	#if !ENABLE_MINIMAL
2850	// xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2851	// so recode it manually
2852	if (ct.encoding == xa[XA_UTF8_STRING])
2853	{
2854	wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2855	char *s = rxvt_wcstombs (w);
2856	free (w);
2857	// TODO: strlen == only the first element will be converted. well...
2858	paste (s, strlen (s));
2859	free (s);
2860	}
2861	else
2862	#endif
2863	if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2864	&& cl)
2865	{
2866	for (int i = 0; i < cr; i++)
2867	paste (cl[i], strlen (cl[i]));
2868
2869	XFreeStringList (cl);
2870	}
2871	else
2872	paste ((char *)ct.value, ct.nitems); // paste raw
2873
2874	bailout:
2875	XFree (ct.value);
2876
2877	if (selection_wait == Sel_normal)
2878	selection_wait = Sel_none;
2879	}
2880
2881	void
2882	rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2883	{
2884	selection_wait = Sel_none;
2885
2886	incr_buf_size = 0;
2887	free (incr_buf);
2888
2889	rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2890	}
2891
2892	void
2893	rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2894	{
2895	if (prop == None || selection_wait != Sel_incr)
2896	return;
2897
2898	selection_paste (win, prop, true);
2899	}
2900
2901	/* ------------------------------------------------------------------------- */
2902	/*
2903	* Request the current selection:
2904	* Order: > internal selection if available
2905	* > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2906	* > CUT_BUFFER0
2907	* (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2908	* will auto fallback to CUT_BUFFER0
2909	* EXT: button 2 release	2734	* EXT: button 2 release
2910	*/	2735	*/
2911	void	2736	void
2912	rxvt_term::selection_request (Time tm, int selnum) NOTHROW	2737	rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2913	{	2738	{
2914	if (selection.text && selnum == Sel_Primary)	2739	if (!selection_req)
2915	{
2916	/* internal selection */
2917	char *str = rxvt_wcstombs (selection.text, selection.len);
2918	paste (str, strlen (str));
2919	free (str);
2920	return;
2921	}	2740	{
2922	else	2741	selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
		2742	selection_req->run ();
2923	{	2743	}
2924	selection_request_time = tm;
2925	selection_wait = Sel_normal;
2926
2927	#if X_HAVE_UTF8_STRING
2928	selection_type = Sel_UTF8String;
2929	if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2930	return;
2931	#else
2932	selection_type = Sel_CompoundText;
2933	if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2934	return;
2935	#endif
2936	}
2937
2938	selection_wait = Sel_none; /* don't loop in selection_paste () */
2939	selection_paste (display->root, XA_CUT_BUFFER0, false);
2940	}
2941
2942	int
2943	rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2944	{
2945	Atom sel;
2946
2947	selection_type |= selnum;
2948
2949	if (selnum == Sel_Primary)
2950	sel = XA_PRIMARY;
2951	else if (selnum == Sel_Secondary)
2952	sel = XA_SECONDARY;
2953	else
2954	sel = xa[XA_CLIPBOARD];
2955
2956	if (XGetSelectionOwner (dpy, sel) != None)
2957	{
2958	XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2959	vt, selection_request_time);
2960	return 1;
2961	}
2962
2963	return 0;
2964	}	2744	}
2965		2745
2966	/* ------------------------------------------------------------------------- */	2746	/* ------------------------------------------------------------------------- */
2967	/*	2747	/*
2968	* Clear all selected text	2748	* Clear all selected text
…		…
2999	* EXT: button 1 or 3 release	2779	* EXT: button 1 or 3 release
3000	*/	2780	*/
3001	void	2781	void
3002	rxvt_term::selection_make (Time tm)	2782	rxvt_term::selection_make (Time tm)
3003	{	2783	{
3004	int i;	2784	int size;
3005	wchar_t *new_selection_text;	2785	wchar_t *new_selection_text;
3006	text_t *t;	2786	text_t *t;
3007		2787
3008	switch (selection.op)	2788	switch (selection.op)
3009	{	2789	{
…		…
3025	return; /* nothing selected, go away */	2805	return; /* nothing selected, go away */
3026		2806
3027	if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))	2807	if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
3028	return;	2808	return;
3029		2809
3030	i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);	2810	size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
3031	new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));	2811	new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
3032		2812
3033	int ofs = 0;	2813	int ofs = 0;
3034	int extra = 0;	2814	int extra = 0;
3035		2815
3036	int col = selection.beg.col;	2816	int col = selection.beg.col;
…		…
3042	{	2822	{
3043	#if !ENABLE_MINIMAL	2823	#if !ENABLE_MINIMAL
3044	if (selection.rect)	2824	if (selection.rect)
3045	{	2825	{
3046	col = selection.beg.col;	2826	col = selection.beg.col;
3047	end_col = ncol + 1;	2827	end_col = selection.end.col;
3048	}	2828	}
3049	else	2829	else
3050	#endif	2830	#endif
3051	end_col = ROW(row).l;	2831	end_col = ROW(row).l;
3052		2832
3053	col = max (col, 0);	2833	col = max (col, 0);
3054		2834
3055	if (row == selection.end.row	2835	if (row == selection.end.row)
3056	#if !ENABLE_MINIMAL
3057	|| selection.rect
3058	#endif
3059	)
3060	min_it (end_col, selection.end.col);	2836	min_it (end_col, selection.end.col);
3061		2837
3062	t = ROW(row).t + col;	2838	t = ROW(row).t + col;
3063		2839
3064	for (; col < end_col; col++)	2840	for (; col < end_col; col++)
…		…
3072		2848
3073	extra -= (len - 1);	2849	extra -= (len - 1);
3074		2850
3075	if (extra < 0)	2851	if (extra < 0)
3076	{	2852	{
3077	extra += i;	2853	extra += size;
3078	i += i;	2854	size += size;
3079	new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t));	2855	new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3080	}	2856	}
3081		2857
3082	ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);	2858	ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3083	}	2859	}
3084	#endif	2860	#endif
…		…
3096		2872
3097	new_selection_text[ofs++] = C0_LF;	2873	new_selection_text[ofs++] = C0_LF;
3098	}	2874	}
3099	else	2875	else
3100	#endif	2876	#endif
3101	if (!ROW(row).is_longer () && row != selection.end.row)	2877	if (!ROW(row).is_longer ()
		2878	&& (row != selection.end.row || end_col != selection.end.col)
		2879	&& (row != selection.beg.row || selection.beg.col < ncol))
3102	new_selection_text[ofs++] = C0_LF;	2880	new_selection_text[ofs++] = C0_LF;
3103	}	2881	}
3104
3105	if (end_col != selection.end.col)
3106	new_selection_text[ofs++] = C0_LF;
3107		2882
3108	new_selection_text[ofs] = 0;	2883	new_selection_text[ofs] = 0;
3109		2884
3110	if (ofs == 0)	2885	if (ofs == 0)
3111	{	2886	{
…		…
3167	/* ------------------------------------------------------------------------- */	2942	/* ------------------------------------------------------------------------- */
3168	/*	2943	/*
3169	* Mark or select text based upon number of clicks: 1, 2, or 3	2944	* Mark or select text based upon number of clicks: 1, 2, or 3
3170	* EXT: button 1 press	2945	* EXT: button 1 press
3171	*/	2946	*/
3172	void	2947	void ecb_cold
3173	rxvt_term::selection_click (int clicks, int x, int y) NOTHROW	2948	rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3174	{	2949	{
3175	clicks = ((clicks - 1) % 3) + 1;	2950	clicks = ((clicks - 1) % 3) + 1;
3176	selection.clicks = clicks; /* save clicks so extend will work */	2951	selection.clicks = clicks; /* save clicks so extend will work */
3177		2952
…		…
3196		2971
3197	/* ------------------------------------------------------------------------- */	2972	/* ------------------------------------------------------------------------- */
3198	/*	2973	/*
3199	* Mark a selection at the specified col/row	2974	* Mark a selection at the specified col/row
3200	*/	2975	*/
3201	void	2976	void ecb_cold
3202	rxvt_term::selection_start_colrow (int col, int row) NOTHROW	2977	rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3203	{	2978	{
3204	want_refresh = 1;	2979	want_refresh = 1;
3205		2980
3206	selection.mark.row = row + view_start;	2981	selection.mark.row = row + view_start;
…		…
3233	/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */	3008	/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3234	#define DELIMIT_TEXT(x) \	3009	#define DELIMIT_TEXT(x) \
3235	(unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))	3010	(unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3236	#define DELIMIT_REND(x) 1	3011	#define DELIMIT_REND(x) 1
3237		3012
3238	void	3013	void ecb_cold
3239	rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW	3014	rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3240	{	3015	{
3241	int col, row, dirnadd, tcol, trow, w1, w2;	3016	int col, row, dirnadd, tcol, trow, w1, w2;
3242	row_col_t bound;	3017	row_col_t bound;
3243	text_t *stp;	3018	text_t *stp;
…		…
3317	* EXT: button 3 press; button 1 or 3 drag	3092	* EXT: button 3 press; button 1 or 3 drag
3318	* flag == 0 ==> button 1	3093	* flag == 0 ==> button 1
3319	* flag == 1 ==> button 3 press	3094	* flag == 1 ==> button 3 press
3320	* flag == 2 ==> button 3 motion	3095	* flag == 2 ==> button 3 motion
3321	*/	3096	*/
3322	void	3097	void ecb_cold
3323	rxvt_term::selection_extend (int x, int y, int flag) NOTHROW	3098	rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3324	{	3099	{
3325	int col = clamp (Pixel2Col (x), 0, ncol);	3100	int col = clamp (Pixel2Col (x), 0, ncol);
3326	int row = clamp (Pixel2Row (y), 0, nrow - 1);	3101	int row = clamp (Pixel2Row (y), 0, nrow - 1);
3327		3102
…		…
3353		3128
3354	/* ------------------------------------------------------------------------- */	3129	/* ------------------------------------------------------------------------- */
3355	/*	3130	/*
3356	* Extend the selection to the specified col/row	3131	* Extend the selection to the specified col/row
3357	*/	3132	*/
3358	void	3133	void ecb_cold
3359	rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW	3134	rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3360	{	3135	{
3361	row_col_t pos;	3136	row_col_t pos;
3362	enum {	3137	enum {
3363	LEFT, RIGHT	3138	LEFT, RIGHT
…		…
3554	::swap (selection.beg.col, selection.end.col);	3329	::swap (selection.beg.col, selection.end.col);
3555	#endif	3330	#endif
3556	}	3331	}
3557		3332
3558	#if !ENABLE_MINIMAL	3333	#if !ENABLE_MINIMAL
3559	void	3334	void ecb_cold
3560	rxvt_term::selection_remove_trailing_spaces () NOTHROW	3335	rxvt_term::selection_remove_trailing_spaces () NOTHROW
3561	{	3336	{
3562	int32_t end_col, end_row;	3337	int32_t end_col, end_row;
3563	text_t *stp;	3338	text_t *stp;
3564		3339
…		…
3602	/* ------------------------------------------------------------------------- */	3377	/* ------------------------------------------------------------------------- */
3603	/*	3378	/*
3604	* Double click on button 3 when already selected	3379	* Double click on button 3 when already selected
3605	* EXT: button 3 double click	3380	* EXT: button 3 double click
3606	*/	3381	*/
3607	void	3382	void ecb_cold
3608	rxvt_term::selection_rotate (int x, int y) NOTHROW	3383	rxvt_term::selection_rotate (int x, int y) NOTHROW
3609	{	3384	{
3610	selection.clicks = selection.clicks % 3 + 1;	3385	selection.clicks = selection.clicks % 3 + 1;
3611	selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);	3386	selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3612	}	3387	}
…		…
3614	/* ------------------------------------------------------------------------- */	3389	/* ------------------------------------------------------------------------- */
3615	/*	3390	/*
3616	* Respond to a request for our current selection	3391	* Respond to a request for our current selection
3617	* EXT: SelectionRequest	3392	* EXT: SelectionRequest
3618	*/	3393	*/
3619	void	3394	void ecb_cold
3620	rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW	3395	rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3621	{	3396	{
		3397	Atom property = rq.property == None ? rq.target : rq.property;
3622	XSelectionEvent ev;	3398	XSelectionEvent ev;
3623		3399
3624	ev.type = SelectionNotify;	3400	ev.type = SelectionNotify;
3625	ev.property = None;	3401	ev.property = None;
3626	ev.display = rq.display;	3402	ev.display = rq.display;
…		…
3641	*target++ = xa[XA_COMPOUND_TEXT];	3417	*target++ = xa[XA_COMPOUND_TEXT];
3642	#if X_HAVE_UTF8_STRING	3418	#if X_HAVE_UTF8_STRING
3643	*target++ = xa[XA_UTF8_STRING];	3419	*target++ = xa[XA_UTF8_STRING];
3644	#endif	3420	#endif
3645		3421
3646	XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,	3422	XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3647	32, PropModeReplace,	3423	32, PropModeReplace,
3648	(unsigned char *)target_list, target - target_list);	3424	(unsigned char *)target_list, target - target_list);
3649	ev.property = rq.property;	3425	ev.property = property;
3650	}	3426	}
3651	#if TODO // TODO	3427	#if TODO // TODO
3652	else if (rq.target == xa[XA_MULTIPLE])	3428	else if (rq.target == xa[XA_MULTIPLE])
3653	{	3429	{
3654	/* TODO: Handle MULTIPLE */	3430	/* TODO: Handle MULTIPLE */
3655	}	3431	}
3656	#endif	3432	#endif
3657	else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)	3433	else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3658	{	3434	{
3659	XChangeProperty (dpy, rq.requestor, rq.property, rq.target,	3435	XChangeProperty (dpy, rq.requestor, property, rq.target,
3660	32, PropModeReplace, (unsigned char *)&selection_time, 1);	3436	32, PropModeReplace, (unsigned char *)&selection_time, 1);
3661	ev.property = rq.property;	3437	ev.property = property;
3662	}	3438	}
3663	else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)	3439	else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3664	{	3440	{
3665	XChangeProperty (dpy, rq.requestor, rq.property, rq.target,	3441	XChangeProperty (dpy, rq.requestor, property, rq.target,
3666	32, PropModeReplace, (unsigned char *)&clipboard_time, 1);	3442	32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3667	ev.property = rq.property;	3443	ev.property = property;
3668	}	3444	}
3669	else if (rq.target == XA_STRING	3445	else if (rq.target == XA_STRING
3670	|| rq.target == xa[XA_TEXT]	3446	|| rq.target == xa[XA_TEXT]
3671	|| rq.target == xa[XA_COMPOUND_TEXT]	3447	|| rq.target == xa[XA_COMPOUND_TEXT]
3672	|| rq.target == xa[XA_UTF8_STRING]	3448	|| rq.target == xa[XA_UTF8_STRING]
…		…
3743	ct.value = (unsigned char *)cl;	3519	ct.value = (unsigned char *)cl;
3744	ct.nitems = selectlen;	3520	ct.nitems = selectlen;
3745	ct.encoding = target;	3521	ct.encoding = target;
3746	}	3522	}
3747		3523
3748	XChangeProperty (dpy, rq.requestor, rq.property,	3524	XChangeProperty (dpy, rq.requestor, property,
3749	ct.encoding, 8, PropModeReplace,	3525	ct.encoding, 8, PropModeReplace,
3750	ct.value, (int)ct.nitems);	3526	ct.value, (int)ct.nitems);
3751	ev.property = rq.property;	3527	ev.property = property;
3752		3528
3753	if (freect)	3529	if (freect)
3754	XFree (ct.value);	3530	XFree (ct.value);
3755	}	3531	}
3756		3532
3757	XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);	3533	XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3758	}	3534	}
3759		3535
3760	/* ------------------------------------------------------------------------- */	3536	/* ------------------------------------------------------------------------- */
3761	#ifdef USE_XIM	3537	#if USE_XIM
3762	void	3538	void ecb_cold
3763	rxvt_term::im_set_position (XPoint &pos) NOTHROW	3539	rxvt_term::im_set_position (XPoint &pos) NOTHROW
3764	{	3540	{
3765	XWindowAttributes xwa;	3541	XWindowAttributes xwa;
3766		3542
3767	XGetWindowAttributes (dpy, vt, &xwa);	3543	XGetWindowAttributes (dpy, vt, &xwa);

Diff Legend

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