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.360 by sf-exg, Wed Jan 5 22:29:50 2011 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;
…		…
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;
…		…
920		942
921	// nuke the character at this position, if required	943	// nuke the character at this position, if required
922	// due to wonderful coincidences everywhere else in this loop	944	// due to wonderful coincidences everywhere else in this loop
923	// we never have to check for overwriting a wide char itself,	945	// we never have to check for overwriting a wide char itself,
924	// only its tail.	946	// only its tail.
925	if (expect_false (line->t[screen.cur.col] == NOCHAR))	947	if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
926	scr_kill_char (*line, screen.cur.col);	948	scr_kill_char (*line, screen.cur.col);
927		949
928	line->touch ();	950	line->touch ();
929		951
930	do	952	do
931	{	953	{
932	line->t[screen.cur.col] = c;	954	line->t[screen.cur.col] = c;
933	line->r[screen.cur.col] = rend;	955	line->r[screen.cur.col] = rend;
934		956
935	if (expect_true (screen.cur.col < ncol - 1))	957	if (ecb_likely (screen.cur.col < ncol - 1))
936	screen.cur.col++;	958	screen.cur.col++;
937	else	959	else
938	{	960	{
939	line->l = ncol;	961	line->l = ncol;
940	if (screen.flags & Screen_Autowrap)	962	if (screen.flags & Screen_Autowrap)
…		…
943	goto end_of_line;	965	goto end_of_line;
944	}	966	}
945		967
946	c = NOCHAR;	968	c = NOCHAR;
947	}	969	}
948	while (expect_false (--width > 0));	970	while (ecb_unlikely (--width > 0));
949		971
950	// pad with spaces when overwriting wide character with smaller one	972	// pad with spaces when overwriting wide character with smaller one
951	for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++)	973	for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
952	{	974	{
953	line->t[c] = ' ';	975	line->t[c] = ' ';
954	line->r[c] = rend;	976	line->r[c] = rend;
955	}	977	}
956		978
…		…
1115	* XTERM_SEQ: ESC 6	1137	* XTERM_SEQ: ESC 6
1116	* 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
1117	* in that row right. Clear left column.	1139	* in that row right. Clear left column.
1118	*/	1140	*/
1119	#if !ENABLE_MINIMAL	1141	#if !ENABLE_MINIMAL
1120	void	1142	void ecb_cold
1121	rxvt_term::scr_backindex () NOTHROW	1143	rxvt_term::scr_backindex () NOTHROW
1122	{	1144	{
1123	if (screen.cur.col > 0)	1145	if (screen.cur.col > 0)
1124	scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);	1146	scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1125	else	1147	else
…		…
1132	* XTERM_SEQ: ESC 9	1154	* XTERM_SEQ: ESC 9
1133	* 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
1134	* in that row left. Clear right column.	1156	* in that row left. Clear right column.
1135	*/	1157	*/
1136	#if !ENABLE_MINIMAL	1158	#if !ENABLE_MINIMAL
1137	void	1159	void ecb_cold
1138	rxvt_term::scr_forwardindex () NOTHROW	1160	rxvt_term::scr_forwardindex () NOTHROW
1139	{	1161	{
1140	if (screen.cur.col < ncol - 1)	1162	if (screen.cur.col < ncol - 1)
1141	scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);	1163	scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1142	else	1164	else
…		…
1293	scr_blank_line (line, col, num, rstyle);	1315	scr_blank_line (line, col, num, rstyle);
1294	}	1316	}
1295		1317
1296	/* ------------------------------------------------------------------------- */	1318	/* ------------------------------------------------------------------------- */
1297	/*	1319	/*
1298	* Erase part of whole of the screen	1320	* Erase part or whole of the screen
1299	* XTERM_SEQ: Clear screen after cursor : ESC [ 0 J	1321	* XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1300	* XTERM_SEQ: Clear screen before cursor: ESC [ 1 J	1322	* XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1301	* XTERM_SEQ: Clear whole screen : ESC [ 2 J	1323	* XTERM_SEQ: Clear whole screen : ESC [ 2 J
1302	*/	1324	*/
1303	void	1325	void
…		…
1312	ZERO_SCROLLBACK ();	1334	ZERO_SCROLLBACK ();
1313		1335
1314	switch (mode)	1336	switch (mode)
1315	{	1337	{
1316	case 0: /* erase to end of screen */	1338	case 0: /* erase to end of screen */
1317	selection_check (1);
1318	scr_erase_line (0);	1339	scr_erase_line (0);
1319	row = screen.cur.row + 1; /* possible OOB */	1340	row = screen.cur.row + 1; /* possible OOB */
1320	num = nrow - row;	1341	num = nrow - row;
1321	break;	1342	break;
1322	case 1: /* erase to beginning of screen */	1343	case 1: /* erase to beginning of screen */
1323	selection_check (3);
1324	scr_erase_line (1);	1344	scr_erase_line (1);
1325	row = 0;	1345	row = 0;
1326	num = screen.cur.row;	1346	num = screen.cur.row;
1327	break;	1347	break;
1328	case 2: /* erase whole screen */	1348	case 2: /* erase whole screen */
1329	selection_check (3);
1330	row = 0;	1349	row = 0;
1331	num = nrow;	1350	num = nrow;
1332	break;	1351	break;
1333	default:	1352	default:
1334	return;	1353	return;
…		…
1351	{	1370	{
1352	ren = DEFAULT_RSTYLE;	1371	ren = DEFAULT_RSTYLE;
1353		1372
1354	if (mapped)	1373	if (mapped)
1355	XClearArea (dpy, vt, 0,	1374	XClearArea (dpy, vt, 0,
1356	Row2Pixel (row - view_start), (unsigned int)width,	1375	Row2Pixel (row - view_start), (unsigned int)vt_width,
1357	(unsigned int)Height2Pixel (num), False);	1376	(unsigned int)Height2Pixel (num), False);
1358	}	1377	}
1359	else	1378	else
1360	{	1379	{
1361	ren = rstyle & (RS_fgMask | RS_bgMask);	1380	ren = rstyle & (RS_fgMask | RS_bgMask);
…		…
1364	{	1383	{
1365	gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];	1384	gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1366	XChangeGC (dpy, gc, GCForeground, &gcvalue);	1385	XChangeGC (dpy, gc, GCForeground, &gcvalue);
1367	XFillRectangle (dpy, vt, gc,	1386	XFillRectangle (dpy, vt, gc,
1368	0, Row2Pixel (row - view_start),	1387	0, Row2Pixel (row - view_start),
1369	(unsigned int)width,	1388	(unsigned int)vt_width,
1370	(unsigned int)Height2Pixel (num));	1389	(unsigned int)Height2Pixel (num));
1371	gcvalue.foreground = pix_colors[Color_fg];	1390	gcvalue.foreground = pix_colors[Color_fg];
1372	XChangeGC (dpy, gc, GCForeground, &gcvalue);	1391	XChangeGC (dpy, gc, GCForeground, &gcvalue);
1373	}	1392	}
1374	}	1393	}
…		…
1396	/* ------------------------------------------------------------------------- */	1415	/* ------------------------------------------------------------------------- */
1397	/*	1416	/*
1398	* Fill the screen with `E's	1417	* Fill the screen with `E's
1399	* XTERM_SEQ: Screen Alignment Test: ESC # 8	1418	* XTERM_SEQ: Screen Alignment Test: ESC # 8
1400	*/	1419	*/
1401	void	1420	void ecb_cold
1402	rxvt_term::scr_E () NOTHROW	1421	rxvt_term::scr_E () NOTHROW
1403	{	1422	{
1404	rend_t fs;	1423	rend_t fs;
1405		1424
1406	want_refresh = 1;	1425	want_refresh = 1;
1407	ZERO_SCROLLBACK ();	1426	ZERO_SCROLLBACK ();
1408		1427
1409	num_scr_allow = 0;	1428	num_scr_allow = 0;
1410	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 ();
1411		1434
1412	fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));	1435	fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1413	for (int row = nrow; row--; )	1436	for (int row = nrow; row--; )
1414	{	1437	{
1415	line_t &line = ROW(row);	1438	line_t &line = ROW(row);
…		…
1566	/* ------------------------------------------------------------------------- */	1589	/* ------------------------------------------------------------------------- */
1567	/*	1590	/*
1568	* Set the scrolling region	1591	* Set the scrolling region
1569	* XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r	1592	* XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1570	*/	1593	*/
1571	void	1594	void ecb_cold
1572	rxvt_term::scr_scroll_region (int top, int bot) NOTHROW	1595	rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1573	{	1596	{
1574	max_it (top, 0);	1597	max_it (top, 0);
1575	min_it (bot, nrow - 1);	1598	min_it (bot, nrow - 1);
1576		1599
…		…
1586	/*	1609	/*
1587	* Make the cursor visible/invisible	1610	* Make the cursor visible/invisible
1588	* XTERM_SEQ: Make cursor visible : ESC [ ? 25 h	1611	* XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1589	* XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l	1612	* XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1590	*/	1613	*/
1591	void	1614	void ecb_cold
1592	rxvt_term::scr_cursor_visible (int mode) NOTHROW	1615	rxvt_term::scr_cursor_visible (int mode) NOTHROW
1593	{	1616	{
1594	want_refresh = 1;	1617	want_refresh = 1;
1595		1618
1596	if (mode)	1619	if (mode)
…		…
1603	/*	1626	/*
1604	* Set/unset automatic wrapping	1627	* Set/unset automatic wrapping
1605	* XTERM_SEQ: Set Wraparound : ESC [ ? 7 h	1628	* XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1606	* XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l	1629	* XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1607	*/	1630	*/
1608	void	1631	void ecb_cold
1609	rxvt_term::scr_autowrap (int mode) NOTHROW	1632	rxvt_term::scr_autowrap (int mode) NOTHROW
1610	{	1633	{
1611	if (mode)	1634	if (mode)
1612	screen.flags |= Screen_Autowrap;	1635	screen.flags |= Screen_Autowrap;
1613	else	1636	else
…		…
1622	* 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
1623	* and the cursor cannot be moved outside.	1646	* and the cursor cannot be moved outside.
1624	* XTERM_SEQ: Set Absolute: ESC [ ? 6 h	1647	* XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1625	* XTERM_SEQ: Set Relative: ESC [ ? 6 l	1648	* XTERM_SEQ: Set Relative: ESC [ ? 6 l
1626	*/	1649	*/
1627	void	1650	void ecb_cold
1628	rxvt_term::scr_relative_origin (int mode) NOTHROW	1651	rxvt_term::scr_relative_origin (int mode) NOTHROW
1629	{	1652	{
1630	if (mode)	1653	if (mode)
1631	screen.flags |= Screen_Relative;	1654	screen.flags |= Screen_Relative;
1632	else	1655	else
…		…
1639	/*	1662	/*
1640	* Set insert/replace mode	1663	* Set insert/replace mode
1641	* XTERM_SEQ: Set Insert mode : ESC [ ? 4 h	1664	* XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1642	* XTERM_SEQ: Set Replace mode: ESC [ ? 4 l	1665	* XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1643	*/	1666	*/
1644	void	1667	void ecb_cold
1645	rxvt_term::scr_insert_mode (int mode) NOTHROW	1668	rxvt_term::scr_insert_mode (int mode) NOTHROW
1646	{	1669	{
1647	if (mode)	1670	if (mode)
1648	screen.flags |= Screen_Insert;	1671	screen.flags |= Screen_Insert;
1649	else	1672	else
…		…
1655	* Set/Unset tabs	1678	* Set/Unset tabs
1656	* XTERM_SEQ: Set tab at current column : ESC H	1679	* XTERM_SEQ: Set tab at current column : ESC H
1657	* XTERM_SEQ: Clear tab at current column: ESC [ 0 g	1680	* XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1658	* XTERM_SEQ: Clear all tabs : ESC [ 3 g	1681	* XTERM_SEQ: Clear all tabs : ESC [ 3 g
1659	*/	1682	*/
1660	void	1683	void ecb_cold
1661	rxvt_term::scr_set_tab (int mode) NOTHROW	1684	rxvt_term::scr_set_tab (int mode) NOTHROW
1662	{	1685	{
1663	if (mode < 0)	1686	if (mode < 0)
1664	memset (tabs, 0, ncol);	1687	memset (tabs, 0, ncol);
1665	else if (screen.cur.col < ncol)	1688	else if (screen.cur.col < ncol)
…		…
1685	{	1708	{
1686	rvideo_state = on;	1709	rvideo_state = on;
1687		1710
1688	::swap (pix_colors[Color_fg], pix_colors[Color_bg]);	1711	::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1689	#ifdef HAVE_BG_PIXMAP	1712	#ifdef HAVE_BG_PIXMAP
1690	if (bgPixmap.pixmap == None)	1713	if (bg_img == 0)
1691	#endif	1714	#endif
1692	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);	1715	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1693		1716
1694	XGCValues gcvalue;	1717	XGCValues gcvalue;
1695	gcvalue.foreground = pix_colors[Color_fg];	1718	gcvalue.foreground = pix_colors[Color_fg];
…		…
1704	/* ------------------------------------------------------------------------- */	1727	/* ------------------------------------------------------------------------- */
1705	/*	1728	/*
1706	* Report current cursor position	1729	* Report current cursor position
1707	* XTERM_SEQ: Report position: ESC [ 6 n	1730	* XTERM_SEQ: Report position: ESC [ 6 n
1708	*/	1731	*/
1709	void	1732	void ecb_cold
1710	rxvt_term::scr_report_position () NOTHROW	1733	rxvt_term::scr_report_position () NOTHROW
1711	{	1734	{
1712	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);
1713	}	1736	}
1714		1737
…		…
1717	* ------------------------------------------------------------------------- */	1740	* ------------------------------------------------------------------------- */
1718		1741
1719	/*	1742	/*
1720	* Set font style	1743	* Set font style
1721	*/	1744	*/
1722	void	1745	void ecb_cold
1723	rxvt_term::set_font_style () NOTHROW	1746	rxvt_term::set_font_style () NOTHROW
1724	{	1747	{
1725	#if 0	1748	#if 0
1726	switch (charsets [screen.charset])	1749	switch (charsets [screen.charset])
1727	{	1750	{
…		…
1749	* XTERM_SEQ: Invoke G0 character set: CTRL-O	1772	* XTERM_SEQ: Invoke G0 character set: CTRL-O
1750	* XTERM_SEQ: Invoke G1 character set: CTRL-N	1773	* XTERM_SEQ: Invoke G1 character set: CTRL-N
1751	* XTERM_SEQ: Invoke G2 character set: ESC N	1774	* XTERM_SEQ: Invoke G2 character set: ESC N
1752	* XTERM_SEQ: Invoke G3 character set: ESC O	1775	* XTERM_SEQ: Invoke G3 character set: ESC O
1753	*/	1776	*/
1754	void	1777	void ecb_cold
1755	rxvt_term::scr_charset_choose (int set) NOTHROW	1778	rxvt_term::scr_charset_choose (int set) NOTHROW
1756	{	1779	{
1757	screen.charset = set;	1780	screen.charset = set;
1758	set_font_style ();	1781	set_font_style ();
1759	}	1782	}
…		…
1780	* ------------------------------------------------------------------------- */	1803	* ------------------------------------------------------------------------- */
1781		1804
1782	/*	1805	/*
1783	* refresh matching text.	1806	* refresh matching text.
1784	*/	1807	*/
1785	bool	1808	bool ecb_cold
1786	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
1787	{	1810	{
1788	bool found = false;	1811	bool found = false;
1789		1812
1790	for (int i = 0; i < nrow; i++)	1813	for (int i = 0; i < nrow; i++)
…		…
1809	PART_BEG = 0,	1832	PART_BEG = 0,
1810	PART_END,	1833	PART_END,
1811	RC_COUNT	1834	RC_COUNT
1812	};	1835	};
1813		1836
1814	void	1837	void ecb_hot
1815	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
1816	{	1839	{
1817	int i;	1840	int i;
1818	row_col_t rc[RC_COUNT];	1841	row_col_t rc[RC_COUNT];
1819		1842
…		…
1856	* Refresh the entire screen	1879	* Refresh the entire screen
1857	*/	1880	*/
1858	void	1881	void
1859	rxvt_term::scr_touch (bool refresh) NOTHROW	1882	rxvt_term::scr_touch (bool refresh) NOTHROW
1860	{	1883	{
1861	scr_expose (0, 0, width, height, refresh);	1884	scr_expose (0, 0, vt_width, vt_height, refresh);
1862	}	1885	}
1863		1886
1864	/* ------------------------------------------------------------------------- */	1887	/* ------------------------------------------------------------------------- */
1865	/*	1888	/*
1866	* 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
…		…
1922		1945
1923	# ifndef NO_MAPALERT	1946	# ifndef NO_MAPALERT
1924	# ifdef MAPALERT_OPTION	1947	# ifdef MAPALERT_OPTION
1925	if (option (Opt_mapAlert))	1948	if (option (Opt_mapAlert))
1926	# endif	1949	# endif
1927	XMapWindow (dpy, parent[0]);	1950	XMapWindow (dpy, parent);
1928	# endif	1951	# endif
1929		1952
1930	# if ENABLE_FRILLS	1953	# if ENABLE_FRILLS
1931	if (option (Opt_urgentOnBell))	1954	if (option (Opt_urgentOnBell))
1932	set_urgency (1);	1955	set_urgency (1);
…		…
1945	HOOK_INVOKE ((this, HOOK_BELL, DT_END));	1968	HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1946	#endif	1969	#endif
1947	}	1970	}
1948		1971
1949	/* ------------------------------------------------------------------------- */	1972	/* ------------------------------------------------------------------------- */
1950	/* ARGSUSED */	1973	void ecb_cold
1951	void
1952	rxvt_term::scr_printscreen (int fullhist) NOTHROW	1974	rxvt_term::scr_printscreen (int fullhist) NOTHROW
1953	{	1975	{
1954	#ifdef PRINTPIPE	1976	#ifdef PRINTPIPE
1955	int nrows, row_start;	1977	int nrows, row_start;
1956	FILE *fd = popen_printer ();	1978	FILE *fd = popen_printer ();
…		…
2005	/*	2027	/*
2006	* Refresh the screen	2028	* Refresh the screen
2007	* drawn_text/drawn_rend contain the screen information before the update.	2029	* drawn_text/drawn_rend contain the screen information before the update.
2008	* screen.text/screen.rend contain what the screen will change to.	2030	* screen.text/screen.rend contain what the screen will change to.
2009	*/	2031	*/
2010	void	2032	void ecb_hot
2011	rxvt_term::scr_refresh () NOTHROW	2033	rxvt_term::scr_refresh () NOTHROW
2012	{	2034	{
2013	int16_t col, row, /* column/row we're processing */	2035	int16_t col, row, /* column/row we're processing */
2014	ocrow; /* old cursor row */	2036	ocrow; /* old cursor row */
2015	int i; /* tmp */	2037	int i; /* tmp */
…		…
2029	* A: set up vars	2051	* A: set up vars
2030	*/	2052	*/
2031	refresh_count = 0;	2053	refresh_count = 0;
2032		2054
2033	unsigned int old_screen_flags = screen.flags;	2055	unsigned int old_screen_flags = screen.flags;
2034	char have_bg = 0;	2056	bool have_bg = 0;
2035	#ifdef HAVE_BG_PIXMAP	2057	#ifdef HAVE_BG_PIXMAP
2036	have_bg = bgPixmap.pixmap != None;	2058	have_bg = bg_img != 0;
2037	#endif	2059	#endif
2038	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */	2060	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2039		2061
2040	/*	2062	/*
2041	* B: reverse any characters which are selected	2063	* B: reverse any characters which are selected
…		…
2045	HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));	2067	HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2046	#if ENABLE_OVERLAY	2068	#if ENABLE_OVERLAY
2047	scr_swap_overlay ();	2069	scr_swap_overlay ();
2048	#endif	2070	#endif
2049		2071
2050	char showcursor = screen.flags & Screen_VisibleCursor;	2072	bool showcursor = screen.flags & Screen_VisibleCursor;
2051		2073
2052	/*	2074	/*
2053	* C: set the cursor character (s)	2075	* C: set the cursor character (s)
2054	*/	2076	*/
2055	{	2077	{
2056	unsigned char setoldcursor;	2078	bool setoldcursor;
2057		2079
2058	#ifdef CURSOR_BLINK	2080	#ifdef CURSOR_BLINK
2059	if (hidden_cursor)	2081	if (hidden_cursor)
2060	showcursor = 0;	2082	showcursor = 0;
2061	#endif	2083	#endif
…		…
2148	{	2170	{
2149	int16_t nits;	2171	int16_t nits;
2150	int i = num_scr;	2172	int i = num_scr;
2151	int j;	2173	int j;
2152	int len, wlen;	2174	int len, wlen;
2153	dLocal (int, num_scr);
2154		2175
2155	j = nrow;	2176	j = nrow;
2156	wlen = len = -1;	2177	wlen = len = -1;
2157	row = i > 0 ? 0 : j - 1;	2178	row = i > 0 ? 0 : j - 1;
2158		2179
…		…
2233	continue;	2254	continue;
2234		2255
2235	// redraw one or more characters	2256	// redraw one or more characters
2236		2257
2237	// seek to the beginning of wide characters	2258	// seek to the beginning of wide characters
2238	while (expect_false (stp[col] == NOCHAR && col > 0))	2259	while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2239	--col;	2260	--col;
2240		2261
2241	rend_t rend = srp[col]; /* screen rendition (target rendition) */	2262	rend_t rend = srp[col]; /* screen rendition (target rendition) */
2242	text_t *text = stp + col;	2263	text_t *text = stp + col;
2243	int count = 1;	2264	int count = 1;
…		…
2281		2302
2282	col--; /* went one too far. move back */	2303	col--; /* went one too far. move back */
2283	count -= i; /* dump any matching trailing chars */	2304	count -= i; /* dump any matching trailing chars */
2284		2305
2285	// sometimes we optimize away the trailing NOCHAR's, add them back	2306	// sometimes we optimize away the trailing NOCHAR's, add them back
2286	while (expect_false (i && text[count] == NOCHAR))	2307	while (ecb_unlikely (i && text[count] == NOCHAR))
2287	count++, i--;	2308	count++, i--;
2288		2309
2289	/*	2310	/*
2290	* Determine the attributes for the string	2311	* Determine the attributes for the string
2291	*/	2312	*/
2292	int fore = fgcolor_of (rend); // desired foreground	2313	int fore = fgcolor_of (rend); // desired foreground
2293	int back = bgcolor_of (rend); // desired background	2314	int back = bgcolor_of (rend); // desired background
2294		2315
2295	// 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
2296	if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))	2317	if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2297	{	2318	{
2298	bool invert = rend & RS_RVid;	2319	bool invert = rend & RS_RVid;
2299		2320
2300	#ifndef NO_BOLD_UNDERLINE_REVERSE	2321	#ifndef NO_BOLD_UNDERLINE_REVERSE
2301	if (rend & RS_Bold && fore == Color_fg)	2322	if (rend & RS_Bold && fore == Color_fg)
…		…
2390	/*	2411	/*
2391	* Actually do the drawing of the string here	2412	* Actually do the drawing of the string here
2392	*/	2413	*/
2393	rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];	2414	rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2394		2415
2395	if (expect_true (have_bg && back == Color_bg))	2416	if (ecb_likely (have_bg && back == Color_bg))
2396	{	2417	{
2397	// this is very ugly, maybe push it into ->draw?	2418	// this is very ugly, maybe push it into ->draw?
2398		2419
2399	for (i = 0; i < count; i++) /* don't draw empty strings */	2420	for (i = 0; i < count; i++) /* don't draw empty strings */
2400	if (text[i] != ' ')	2421	if (text[i] != ' ')
…		…
2407	did_clear: ;	2428	did_clear: ;
2408	}	2429	}
2409	else	2430	else
2410	font->draw (*drawable, xpixel, ypixel, text, count, fore, back);	2431	font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2411		2432
2412	if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))	2433	if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2413	{	2434	{
2414	#if ENABLE_FRILLS	2435	#if ENABLE_FRILLS
2415	if (ISSET_PIXCOLOR (Color_underline))	2436	if (ISSET_PIXCOLOR (Color_underline))
2416	XSetForeground (dpy, gc, pix_colors[Color_underline]);	2437	XSetForeground (dpy, gc, pix_colors[Color_underline]);
2417	else	2438	else
…		…
2463		2484
2464	XDrawRectangle (dpy, vt, gc,	2485	XDrawRectangle (dpy, vt, gc,
2465	Col2Pixel (col),	2486	Col2Pixel (col),
2466	Row2Pixel (oldcursor.row),	2487	Row2Pixel (oldcursor.row),
2467	(unsigned int) (Width2Pixel (cursorwidth) - 1),	2488	(unsigned int) (Width2Pixel (cursorwidth) - 1),
2468	(unsigned int) (Height2Pixel (1) - lineSpace - 1));	2489	(unsigned int) (Height2Pixel (1) - 1));
2469	}	2490	}
2470	}	2491	}
2471		2492
2472	/*	2493	/*
2473	* H: cleanup selection	2494	* H: cleanup selection
…		…
2482	screen.flags = old_screen_flags;	2503	screen.flags = old_screen_flags;
2483	num_scr = 0;	2504	num_scr = 0;
2484	num_scr_allow = 1;	2505	num_scr_allow = 1;
2485	}	2506	}
2486		2507
2487	void	2508	void ecb_cold
2488	rxvt_term::scr_remap_chars (line_t &l) NOTHROW	2509	rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2489	{	2510	{
2490	if (!l.t)	2511	if (!l.valid ())
2491	return;	2512	return;
2492		2513
2493	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
2494		2515
2495	for (int i = ncol; i--; )	2516	for (int i = ncol; i--; )
2496	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]));
2497	}	2518	}
2498		2519
2499	void	2520	void ecb_cold
2500	rxvt_term::scr_remap_chars () NOTHROW	2521	rxvt_term::scr_remap_chars () NOTHROW
2501	{	2522	{
2502	for (int i = total_rows; i--; )	2523	for (int i = total_rows; i--; )
2503	scr_remap_chars (row_buf [i]);	2524	scr_remap_chars (row_buf [i]);
2504		2525
…		…
2507	scr_remap_chars (drawn_buf [i]);	2528	scr_remap_chars (drawn_buf [i]);
2508	scr_remap_chars (swap_buf [i]);	2529	scr_remap_chars (swap_buf [i]);
2509	}	2530	}
2510	}	2531	}
2511		2532
2512	void	2533	void ecb_cold
2513	rxvt_term::scr_recolour () NOTHROW	2534	rxvt_term::scr_recolour (bool refresh) NOTHROW
2514	{	2535	{
		2536	bool transparent = false;
		2537
2515	#ifdef HAVE_BG_PIXMAP	2538	#ifdef HAVE_BG_PIXMAP
2516	bgPixmap.apply ();	2539	if (bg_img != 0)
2517	#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);
2518		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	{
2519	XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);	2559	XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2520	XClearWindow (dpy, parent[0]);
2521	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);	2560	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
		2561	}
		2562
		2563	XClearWindow (dpy, parent);
2522		2564
2523	if (scrollBar.win)	2565	if (scrollBar.win)
2524	{	2566	{
		2567	if (transparent)
		2568	XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
		2569	else
2525	XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);	2570	XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2526	scrollBar.state = STATE_IDLE;	2571	scrollBar.state = SB_STATE_IDLE;
2527	scrollBar.show (0);	2572	scrollBar.show (0);
2528	}	2573	}
2529		2574
2530	#endif	2575	if (refresh)
2531		2576	{
2532	/* bgPixmap.apply () does not do the following : */
2533	scr_clear ();	2577	scr_clear ();
2534	scr_touch (true);	2578	scr_touch (true);
		2579	}
2535	want_refresh = 1;	2580	want_refresh = 1;
2536	}	2581	}
2537		2582
2538	/* ------------------------------------------------------------------------- */	2583	/* ------------------------------------------------------------------------- */
2539	void	2584	void
…		…
2596	for (rend_t *srp = ROW(row).r; col < end_col; col++)	2641	for (rend_t *srp = ROW(row).r; col < end_col; col++)
2597	srp[col] ^= rstyle;	2642	srp[col] ^= rstyle;
2598	}	2643	}
2599		2644
2600	/* ------------------------------------------------------------------------- */	2645	/* ------------------------------------------------------------------------- */
2601	void	2646	void ecb_hot
2602	rxvt_term::scr_reverse_selection () NOTHROW	2647	rxvt_term::scr_reverse_selection () NOTHROW
2603	{	2648	{
2604	if (selection.op	2649	if (selection.op
2605	&& current_screen == selection.screen	2650	&& current_screen == selection.screen
2606	&& selection.end.row >= view_start)	2651	&& selection.end.row >= view_start)
…		…
2625	*/	2670	*/
2626	#if 0	2671	#if 0
2627	void	2672	void
2628	rxvt_term::scr_dump (int fd) NOTHROW	2673	rxvt_term::scr_dump (int fd) NOTHROW
2629	{	2674	{
2630	int row, wrote;	2675	// if this method is needed, it can be implemented by factoring the
2631	unsigned int width, towrite;	2676	// relevant code in scr_printscreen
2632	const char r1[] = "\n";
2633
2634	for (row = saveLines + top_row;
2635	row < saveLines + nrow - 1; row++)
2636	{
2637	width = row_buf[row].l >= 0 ? row_buf[row].l
2638	: ncol;
2639	for (towrite = width; towrite; towrite -= wrote)
2640	{
2641	wrote = write (fd, & (row_buf[row].t[width - towrite]),
2642	towrite);
2643	if (wrote < 0)
2644	return; /* XXX: death, no report */
2645	}
2646	if (row_buf[row].l >= 0)
2647	if (write (fd, r1, 1) <= 0)
2648	return; /* XXX: death, no report */
2649	}
2650	}	2677	}
2651	#endif	2678	#endif
2652		2679
2653	/* ------------------------------------------------------------------------- *	2680	/* ------------------------------------------------------------------------- *
2654	* CHARACTER SELECTION *	2681	* CHARACTER SELECTION *
2655	* ------------------------------------------------------------------------- */	2682	* ------------------------------------------------------------------------- */
2656	void	2683	void
2657	rxvt_term::selection_check (int check_more) NOTHROW	2684	rxvt_term::selection_check (int check_more) NOTHROW
2658	{	2685	{
2659	row_col_t pos;
2660
2661	if (!selection.op)	2686	if (!selection.op)
2662	return;	2687	return;
2663		2688
2664	pos.row = pos.col = 0;
2665	if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)	2689	if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2666	|| !IN_RANGE_EXC (selection.mark.row, top_row, nrow)	2690	|| !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2667	|| !IN_RANGE_EXC (selection.end.row, top_row, nrow)	2691	|| !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2668	|| (check_more == 1	2692	|| (check_more == 1
2669	&& current_screen == selection.screen	2693	&& current_screen == selection.screen
2670	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)	2694	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2671	&& ROWCOL_IS_BEFORE (screen.cur, selection.end))	2695	&& ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2672	|| (check_more == 2
2673	&& ROWCOL_IS_BEFORE (selection.beg, pos)
2674	&& ROWCOL_IS_AFTER (selection.end, pos))
2675	|| (check_more == 3
2676	&& ROWCOL_IS_AFTER (selection.end, pos))
2677	|| (check_more == 4 /* screen width change */
2678	&& (selection.beg.row != selection.end.row
2679	|| selection.end.col > ncol)))
2680	CLEAR_SELECTION ();	2696	CLEAR_ALL_SELECTION ();
2681	}	2697	}
2682		2698
2683	/* ------------------------------------------------------------------------- */	2699	/* ------------------------------------------------------------------------- */
2684	/*	2700	/*
2685	* Paste a selection direct to the command fd	2701	* Paste a selection direct to the command fd
…		…
2691	for (unsigned int i = 0; i < len; i++)	2707	for (unsigned int i = 0; i < len; i++)
2692	if (data[i] == C0_LF)	2708	if (data[i] == C0_LF)
2693	data[i] = C0_CR;	2709	data[i] = C0_CR;
2694		2710
2695	if (priv_modes & PrivMode_BracketPaste)	2711	if (priv_modes & PrivMode_BracketPaste)
2696	tt_printf ("\e[200~");	2712	tt_printf ("\x1b[200~");
2697		2713
2698	tt_write (data, len);	2714	tt_write (data, len);
2699		2715
2700	if (priv_modes & PrivMode_BracketPaste)	2716	if (priv_modes & PrivMode_BracketPaste)
2701	tt_printf ("\e[201~");	2717	tt_printf ("\x1b[201~");
2702	}	2718	}
2703		2719
2704	void	2720	void
2705	rxvt_term::paste (char *data, unsigned int len) NOTHROW	2721	rxvt_term::paste (char *data, unsigned int len) NOTHROW
2706	{	2722	{
…		…
2710	tt_paste (data, len);	2726	tt_paste (data, len);
2711	}	2727	}
2712		2728
2713	/* ------------------------------------------------------------------------- */	2729	/* ------------------------------------------------------------------------- */
2714	/*	2730	/*
2715	* Respond to a notification that a primary selection has been sent	2731	* Request PRIMARY, SECONDARY or CLIPBOARD selection.
2716	* EXT: SelectionNotify	2732	* if the requested selection has no owner or is empty CUT_BUFFER0 is used
2717	*/	2733	* as fallback
2718	void
2719	rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2720	{
2721	if (prop == None) /* check for failed XConvertSelection */
2722	{
2723	if ((selection_type & Sel_CompoundText))
2724	{
2725	int selnum = selection_type & Sel_whereMask;
2726
2727	selection_type = 0;
2728	if (selnum != Sel_direct)
2729	selection_request_other (XA_STRING, selnum);
2730	}
2731
2732	if ((selection_type & Sel_UTF8String))
2733	{
2734	int selnum = selection_type & Sel_whereMask;
2735
2736	selection_type = Sel_CompoundText;
2737	if (selnum != Sel_direct)
2738	selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2739	else
2740	selection_type = 0;
2741	}
2742
2743	return;
2744	}
2745
2746	unsigned long bytes_after;
2747	XTextProperty ct;
2748
2749	if (XGetWindowProperty (dpy, win, prop,
2750	0, PROP_SIZE / 4,
2751	delete_prop, AnyPropertyType,
2752	&ct.encoding, &ct.format,
2753	&ct.nitems, &bytes_after,
2754	&ct.value) != Success)
2755	{
2756	ct.value = 0;
2757	goto bailout;
2758	}
2759
2760	if (ct.encoding == None)
2761	goto bailout;
2762
2763	if (bytes_after)
2764	{
2765	// fetch and append remaining data
2766	XTextProperty ct2;
2767
2768	if (XGetWindowProperty (dpy, win, prop,
2769	ct.nitems / 4, (bytes_after + 3) / 4,
2770	delete_prop, AnyPropertyType,
2771	&ct2.encoding, &ct2.format,
2772	&ct2.nitems, &bytes_after,
2773	&ct2.value) != Success)
2774	goto bailout;
2775
2776	// realloc should be compatible to XFree, here, and elsewhere, too
2777	ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2778	memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2779	ct.nitems += ct2.nitems;
2780
2781	XFree (ct2.value);
2782	}
2783
2784	if (ct.value == 0)
2785	goto bailout;
2786
2787	if (ct.encoding == xa[XA_INCR])
2788	{
2789	// INCR selection, start handshake
2790	if (!delete_prop)
2791	XDeleteProperty (dpy, win, prop);
2792
2793	selection_wait = Sel_incr;
2794	incr_buf_fill = 0;
2795	incr_ev.start (10);
2796
2797	goto bailout;
2798	}
2799
2800	if (ct.nitems == 0)
2801	{
2802	if (selection_wait == Sel_incr)
2803	{
2804	XFree (ct.value);
2805
2806	// finally complete, now paste the whole thing
2807	selection_wait = Sel_normal;
2808	ct.value = (unsigned char *)incr_buf;
2809	ct.nitems = incr_buf_fill;
2810	incr_buf = 0;
2811	incr_buf_size = 0;
2812	incr_ev.stop ();
2813	}
2814	else
2815	{
2816	if (selection_wait == Sel_normal
2817	&& (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2818	{
2819	/*
2820	* pass through again trying CUT_BUFFER0 if we've come from
2821	* XConvertSelection () but nothing was presented
2822	*/
2823	selection_paste (display->root, XA_CUT_BUFFER0, False);
2824	}
2825
2826	goto bailout;
2827	}
2828	}
2829	else if (selection_wait == Sel_incr)
2830	{
2831	incr_ev.start (10);
2832
2833	while (incr_buf_fill + ct.nitems > incr_buf_size)
2834	{
2835	incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2836	incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2837	}
2838
2839	memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2840	incr_buf_fill += ct.nitems;
2841
2842	goto bailout;
2843	}
2844
2845	char **cl;
2846	int cr;
2847
2848	#if !ENABLE_MINIMAL
2849	// xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2850	// so recode it manually
2851	if (ct.encoding == xa[XA_UTF8_STRING])
2852	{
2853	wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2854	char *s = rxvt_wcstombs (w);
2855	free (w);
2856	// TODO: strlen == only the first element will be converted. well...
2857	paste (s, strlen (s));
2858	free (s);
2859	}
2860	else
2861	#endif
2862	if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2863	&& cl)
2864	{
2865	for (int i = 0; i < cr; i++)
2866	paste (cl[i], strlen (cl[i]));
2867
2868	XFreeStringList (cl);
2869	}
2870	else
2871	paste ((char *)ct.value, ct.nitems); // paste raw
2872
2873	bailout:
2874	XFree (ct.value);
2875
2876	if (selection_wait == Sel_normal)
2877	selection_wait = Sel_none;
2878	}
2879
2880	void
2881	rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2882	{
2883	selection_wait = Sel_none;
2884
2885	incr_buf_size = 0;
2886	free (incr_buf);
2887
2888	rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2889	}
2890
2891	void
2892	rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2893	{
2894	if (prop == None || selection_wait != Sel_incr)
2895	return;
2896
2897	selection_paste (win, prop, true);
2898	}
2899
2900	/* ------------------------------------------------------------------------- */
2901	/*
2902	* Request the current selection:
2903	* Order: > internal selection if available
2904	* > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2905	* > CUT_BUFFER0
2906	* (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2907	* will auto fallback to CUT_BUFFER0
2908	* EXT: button 2 release	2734	* EXT: button 2 release
2909	*/	2735	*/
2910	void	2736	void
2911	rxvt_term::selection_request (Time tm, int selnum) NOTHROW	2737	rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2912	{	2738	{
2913	if (selection.text && selnum == Sel_Primary)	2739	if (!selection_req)
2914	{
2915	/* internal selection */
2916	char *str = rxvt_wcstombs (selection.text, selection.len);
2917	paste (str, strlen (str));
2918	free (str);
2919	return;
2920	}	2740	{
2921	else	2741	selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
		2742	selection_req->run ();
2922	{	2743	}
2923	selection_request_time = tm;
2924	selection_wait = Sel_normal;
2925
2926	#if X_HAVE_UTF8_STRING
2927	selection_type = Sel_UTF8String;
2928	if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2929	return;
2930	#else
2931	selection_type = Sel_CompoundText;
2932	if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2933	return;
2934	#endif
2935	}
2936
2937	selection_wait = Sel_none; /* don't loop in selection_paste () */
2938	selection_paste (display->root, XA_CUT_BUFFER0, false);
2939	}
2940
2941	int
2942	rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2943	{
2944	Atom sel;
2945
2946	selection_type |= selnum;
2947
2948	if (selnum == Sel_Primary)
2949	sel = XA_PRIMARY;
2950	else if (selnum == Sel_Secondary)
2951	sel = XA_SECONDARY;
2952	else
2953	sel = xa[XA_CLIPBOARD];
2954
2955	if (XGetSelectionOwner (dpy, sel) != None)
2956	{
2957	XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2958	vt, selection_request_time);
2959	return 1;
2960	}
2961
2962	return 0;
2963	}	2744	}
2964		2745
2965	/* ------------------------------------------------------------------------- */	2746	/* ------------------------------------------------------------------------- */
2966	/*	2747	/*
2967	* Clear all selected text	2748	* Clear all selected text
…		…
3091		2872
3092	new_selection_text[ofs++] = C0_LF;	2873	new_selection_text[ofs++] = C0_LF;
3093	}	2874	}
3094	else	2875	else
3095	#endif	2876	#endif
3096	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)
3097	&& (row != selection.beg.row || selection.beg.col < ncol))	2879	&& (row != selection.beg.row || selection.beg.col < ncol))
3098	new_selection_text[ofs++] = C0_LF;	2880	new_selection_text[ofs++] = C0_LF;
3099	}	2881	}
3100
3101	if (end_col != selection.end.col)
3102	new_selection_text[ofs++] = C0_LF;
3103		2882
3104	new_selection_text[ofs] = 0;	2883	new_selection_text[ofs] = 0;
3105		2884
3106	if (ofs == 0)	2885	if (ofs == 0)
3107	{	2886	{
…		…
3163	/* ------------------------------------------------------------------------- */	2942	/* ------------------------------------------------------------------------- */
3164	/*	2943	/*
3165	* 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
3166	* EXT: button 1 press	2945	* EXT: button 1 press
3167	*/	2946	*/
3168	void	2947	void ecb_cold
3169	rxvt_term::selection_click (int clicks, int x, int y) NOTHROW	2948	rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3170	{	2949	{
3171	clicks = ((clicks - 1) % 3) + 1;	2950	clicks = ((clicks - 1) % 3) + 1;
3172	selection.clicks = clicks; /* save clicks so extend will work */	2951	selection.clicks = clicks; /* save clicks so extend will work */
3173		2952
…		…
3192		2971
3193	/* ------------------------------------------------------------------------- */	2972	/* ------------------------------------------------------------------------- */
3194	/*	2973	/*
3195	* Mark a selection at the specified col/row	2974	* Mark a selection at the specified col/row
3196	*/	2975	*/
3197	void	2976	void ecb_cold
3198	rxvt_term::selection_start_colrow (int col, int row) NOTHROW	2977	rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3199	{	2978	{
3200	want_refresh = 1;	2979	want_refresh = 1;
3201		2980
3202	selection.mark.row = row + view_start;	2981	selection.mark.row = row + view_start;
…		…
3229	/* 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 */
3230	#define DELIMIT_TEXT(x) \	3009	#define DELIMIT_TEXT(x) \
3231	(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)))
3232	#define DELIMIT_REND(x) 1	3011	#define DELIMIT_REND(x) 1
3233		3012
3234	void	3013	void ecb_cold
3235	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
3236	{	3015	{
3237	int col, row, dirnadd, tcol, trow, w1, w2;	3016	int col, row, dirnadd, tcol, trow, w1, w2;
3238	row_col_t bound;	3017	row_col_t bound;
3239	text_t *stp;	3018	text_t *stp;
…		…
3313	* EXT: button 3 press; button 1 or 3 drag	3092	* EXT: button 3 press; button 1 or 3 drag
3314	* flag == 0 ==> button 1	3093	* flag == 0 ==> button 1
3315	* flag == 1 ==> button 3 press	3094	* flag == 1 ==> button 3 press
3316	* flag == 2 ==> button 3 motion	3095	* flag == 2 ==> button 3 motion
3317	*/	3096	*/
3318	void	3097	void ecb_cold
3319	rxvt_term::selection_extend (int x, int y, int flag) NOTHROW	3098	rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3320	{	3099	{
3321	int col = clamp (Pixel2Col (x), 0, ncol);	3100	int col = clamp (Pixel2Col (x), 0, ncol);
3322	int row = clamp (Pixel2Row (y), 0, nrow - 1);	3101	int row = clamp (Pixel2Row (y), 0, nrow - 1);
3323		3102
…		…
3349		3128
3350	/* ------------------------------------------------------------------------- */	3129	/* ------------------------------------------------------------------------- */
3351	/*	3130	/*
3352	* Extend the selection to the specified col/row	3131	* Extend the selection to the specified col/row
3353	*/	3132	*/
3354	void	3133	void ecb_cold
3355	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
3356	{	3135	{
3357	row_col_t pos;	3136	row_col_t pos;
3358	enum {	3137	enum {
3359	LEFT, RIGHT	3138	LEFT, RIGHT
…		…
3550	::swap (selection.beg.col, selection.end.col);	3329	::swap (selection.beg.col, selection.end.col);
3551	#endif	3330	#endif
3552	}	3331	}
3553		3332
3554	#if !ENABLE_MINIMAL	3333	#if !ENABLE_MINIMAL
3555	void	3334	void ecb_cold
3556	rxvt_term::selection_remove_trailing_spaces () NOTHROW	3335	rxvt_term::selection_remove_trailing_spaces () NOTHROW
3557	{	3336	{
3558	int32_t end_col, end_row;	3337	int32_t end_col, end_row;
3559	text_t *stp;	3338	text_t *stp;
3560		3339
…		…
3598	/* ------------------------------------------------------------------------- */	3377	/* ------------------------------------------------------------------------- */
3599	/*	3378	/*
3600	* Double click on button 3 when already selected	3379	* Double click on button 3 when already selected
3601	* EXT: button 3 double click	3380	* EXT: button 3 double click
3602	*/	3381	*/
3603	void	3382	void ecb_cold
3604	rxvt_term::selection_rotate (int x, int y) NOTHROW	3383	rxvt_term::selection_rotate (int x, int y) NOTHROW
3605	{	3384	{
3606	selection.clicks = selection.clicks % 3 + 1;	3385	selection.clicks = selection.clicks % 3 + 1;
3607	selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);	3386	selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3608	}	3387	}
…		…
3610	/* ------------------------------------------------------------------------- */	3389	/* ------------------------------------------------------------------------- */
3611	/*	3390	/*
3612	* Respond to a request for our current selection	3391	* Respond to a request for our current selection
3613	* EXT: SelectionRequest	3392	* EXT: SelectionRequest
3614	*/	3393	*/
3615	void	3394	void ecb_cold
3616	rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW	3395	rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3617	{	3396	{
		3397	Atom property = rq.property == None ? rq.target : rq.property;
3618	XSelectionEvent ev;	3398	XSelectionEvent ev;
3619		3399
3620	ev.type = SelectionNotify;	3400	ev.type = SelectionNotify;
3621	ev.property = None;	3401	ev.property = None;
3622	ev.display = rq.display;	3402	ev.display = rq.display;
…		…
3637	*target++ = xa[XA_COMPOUND_TEXT];	3417	*target++ = xa[XA_COMPOUND_TEXT];
3638	#if X_HAVE_UTF8_STRING	3418	#if X_HAVE_UTF8_STRING
3639	*target++ = xa[XA_UTF8_STRING];	3419	*target++ = xa[XA_UTF8_STRING];
3640	#endif	3420	#endif
3641		3421
3642	XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,	3422	XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3643	32, PropModeReplace,	3423	32, PropModeReplace,
3644	(unsigned char *)target_list, target - target_list);	3424	(unsigned char *)target_list, target - target_list);
3645	ev.property = rq.property;	3425	ev.property = property;
3646	}	3426	}
3647	#if TODO // TODO	3427	#if TODO // TODO
3648	else if (rq.target == xa[XA_MULTIPLE])	3428	else if (rq.target == xa[XA_MULTIPLE])
3649	{	3429	{
3650	/* TODO: Handle MULTIPLE */	3430	/* TODO: Handle MULTIPLE */
3651	}	3431	}
3652	#endif	3432	#endif
3653	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)
3654	{	3434	{
3655	XChangeProperty (dpy, rq.requestor, rq.property, rq.target,	3435	XChangeProperty (dpy, rq.requestor, property, rq.target,
3656	32, PropModeReplace, (unsigned char *)&selection_time, 1);	3436	32, PropModeReplace, (unsigned char *)&selection_time, 1);
3657	ev.property = rq.property;	3437	ev.property = property;
3658	}	3438	}
3659	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)
3660	{	3440	{
3661	XChangeProperty (dpy, rq.requestor, rq.property, rq.target,	3441	XChangeProperty (dpy, rq.requestor, property, rq.target,
3662	32, PropModeReplace, (unsigned char *)&clipboard_time, 1);	3442	32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3663	ev.property = rq.property;	3443	ev.property = property;
3664	}	3444	}
3665	else if (rq.target == XA_STRING	3445	else if (rq.target == XA_STRING
3666	|| rq.target == xa[XA_TEXT]	3446	|| rq.target == xa[XA_TEXT]
3667	|| rq.target == xa[XA_COMPOUND_TEXT]	3447	|| rq.target == xa[XA_COMPOUND_TEXT]
3668	|| rq.target == xa[XA_UTF8_STRING]	3448	|| rq.target == xa[XA_UTF8_STRING]
…		…
3739	ct.value = (unsigned char *)cl;	3519	ct.value = (unsigned char *)cl;
3740	ct.nitems = selectlen;	3520	ct.nitems = selectlen;
3741	ct.encoding = target;	3521	ct.encoding = target;
3742	}	3522	}
3743		3523
3744	XChangeProperty (dpy, rq.requestor, rq.property,	3524	XChangeProperty (dpy, rq.requestor, property,
3745	ct.encoding, 8, PropModeReplace,	3525	ct.encoding, 8, PropModeReplace,
3746	ct.value, (int)ct.nitems);	3526	ct.value, (int)ct.nitems);
3747	ev.property = rq.property;	3527	ev.property = property;
3748		3528
3749	if (freect)	3529	if (freect)
3750	XFree (ct.value);	3530	XFree (ct.value);
3751	}	3531	}
3752		3532
3753	XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);	3533	XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3754	}	3534	}
3755		3535
3756	/* ------------------------------------------------------------------------- */	3536	/* ------------------------------------------------------------------------- */
3757	#ifdef USE_XIM	3537	#if USE_XIM
3758	void	3538	void ecb_cold
3759	rxvt_term::im_set_position (XPoint &pos) NOTHROW	3539	rxvt_term::im_set_position (XPoint &pos) NOTHROW
3760	{	3540	{
3761	XWindowAttributes xwa;	3541	XWindowAttributes xwa;
3762		3542
3763	XGetWindowAttributes (dpy, vt, &xwa);	3543	XGetWindowAttributes (dpy, vt, &xwa);

Diff Legend

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