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

Diff Legend

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