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.349 by root, Thu Oct 14 23:12:11 2010 UTC vs.
Revision 1.424 by root, Fri Jun 29 22:10:09 2012 UTC

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

Diff Legend

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