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.347 by sf-exg, Sat Aug 28 11:03:04 2010 UTC vs.
Revision 1.431 by root, Sun Jan 13 20:19:24 2013 UTC

1	/*---------------------------------------------------------------------------*	1	/*---------------------------------------------------------------------------*
2	* File: screen.C	2	* File: screen.C
3	*---------------------------------------------------------------------------*	3	*---------------------------------------------------------------------------*
4	*	4	*
5	* Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>	5	* Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6	* Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>	6	* Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de>
7	*	7	*
8	* This program is free software; you can redistribute it and/or modify	8	* This program is free software; you can redistribute it and/or modify
9	* it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
10	* the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation; either version 2 of the License, or
11	* (at your option) any later version.	11	* (at your option) any later version.
…		…
28	#include "rxvt.h" /* NECESSARY */	28	#include "rxvt.h" /* NECESSARY */
29	#include "rxvtperl.h" /* NECESSARY */	29	#include "rxvtperl.h" /* NECESSARY */
30		30
31	#include <inttypes.h>	31	#include <inttypes.h>
32		32
33	#include "salloc.C" // HACK, should be a separate compile!
34
35	static inline void	33	static inline void
36	fill_text (text_t *start, text_t value, int len)	34	fill_text (text_t *start, text_t value, int len)
37	{	35	{
38	while (len--)	36	while (len--)
39	*start++ = value;	37	*start++ = value;
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
		286	memcpy (swap_buf [row].t, prev_swap_buf [row].t, sizeof (text_t) * common_col);
		287	memcpy (swap_buf [row].r, prev_swap_buf [row].r, sizeof (rend_t) * common_col);
		288	swap_buf [row].l = min (prev_swap_buf [row].l, ncol);
		289	swap_buf [row].f = prev_swap_buf [row].f;
270	{	290	}
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		291
278	int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row	292	int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
279	int pend = MOD (term_start + top_row , prev_total_rows);	293	int pend = MOD (term_start + top_row , prev_total_rows);
280	int q = total_rows; // rewrapped row	294	int q = total_rows; // rewrapped row
281		295
…		…
289	ocur.row = MOD (term_start + ocur.row, prev_total_rows);	303	ocur.row = MOD (term_start + ocur.row, prev_total_rows);
290		304
291	do	305	do
292	{	306	{
293	p = MOD (p - 1, prev_total_rows);	307	p = MOD (p - 1, prev_total_rows);
294	assert (old_buf [MOD (p, prev_total_rows)].t);	308	assert (prev_row_buf [MOD (p, prev_total_rows)].t);
295	int plines = 1;	309	int plines = 1;
296	int llen = old_buf [MOD (p, prev_total_rows)].l;	310	int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
297		311
298	while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())	312	while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ())
299	{	313	{
300	p = MOD (p - 1, prev_total_rows);	314	p = MOD (p - 1, prev_total_rows);
301		315
302	plines++;	316	plines++;
303	llen += prev_ncol;	317	llen += prev_ncol;
…		…
316		330
317	// re-assemble the full line by destination lines	331	// re-assemble the full line by destination lines
318	for (int qrow = q; qlines--; qrow++)	332	for (int qrow = q; qlines--; qrow++)
319	{	333	{
320	qline = row_buf + qrow;	334	qline = row_buf + qrow;
321	lalloc (*qline);	335	qline->alloc (); // redundant with next line
322	qline->l = ncol;	336	qline->l = ncol;
323	qline->is_longer (1);	337	qline->is_longer (1);
324		338
325	int qcol = 0;	339	int qcol = 0;
326		340
…		…
341	// this seems to upset applications/shells/readline	355	// this seems to upset applications/shells/readline
342	// least.	356	// least.
343	if (prow == ocur.row)	357	if (prow == ocur.row)
344	screen.cur.row = q - (total_rows - nrow);	358	screen.cur.row = q - (total_rows - nrow);
345		359
346	line_t &pline = old_buf [prow];	360	line_t &pline = prev_row_buf [prow];
347		361
348	int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);	362	int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
349		363
350	memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));	364	memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
351	memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));	365	memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
…		…
372	{	386	{
373	// if no scrollback exists (yet), wing, instead of wrap	387	// if no scrollback exists (yet), wing, instead of wrap
374		388
375	for (int row = min (nrow, prev_nrow); row--; )	389	for (int row = min (nrow, prev_nrow); row--; )
376	{	390	{
377	line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];	391	line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
378	line_t &qline = row_buf [row];	392	line_t &dst = row_buf [row];
379		393
380	qline = pline;	394	scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
381	lresize (qline);	395
		396	memcpy (dst.t, src.t, sizeof (text_t) * common_col);
		397	memcpy (dst.r, src.r, sizeof (rend_t) * common_col);
		398	dst.l = min (src.l, ncol);
		399	dst.f = src.f;
382	}	400	}
383		401
384	for (int row = prev_nrow; row < nrow; row++)	402	for (int row = prev_nrow; row < nrow; row++)
385	{
386	row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);	403	scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
387	}
388		404
389	term_start = 0;	405	term_start = 0;
390	}	406	}
391
392	free (old_buf);
393	delete old_ta;
394	delete old_ra;
395		407
396	clamp_it (screen.cur.row, 0, nrow - 1);	408	clamp_it (screen.cur.row, 0, nrow - 1);
397	clamp_it (screen.cur.col, 0, ncol - 1);	409	clamp_it (screen.cur.col, 0, ncol - 1);
398	}	410	}
399		411
		412	for (int row = nrow; row--; )
		413	{
		414	if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
		415	if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
		416	if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
		417	}
		418
		419	chunk_free (prev_chunk, prev_chunk_size);
		420
400	free (tabs);	421	free (tabs);
401	tabs = (char *)rxvt_malloc (ncol);	422	tabs = (char *)rxvt_malloc (ncol);
402		423
403	for (int col = ncol; --col; )	424	for (int col = ncol; col--; )
404	tabs [col] = col % TABSIZE == 0;	425	tabs [col] = col % TABSIZE == 0;
405		426
406	CLEAR_ALL_SELECTION ();	427	CLEAR_ALL_SELECTION ();
407		428
408	prev_nrow = nrow;	429	prev_nrow = nrow;
…		…
411	tt_winch ();	432	tt_winch ();
412		433
413	HOOK_INVOKE ((this, HOOK_RESET, DT_END));	434	HOOK_INVOKE ((this, HOOK_RESET, DT_END));
414	}	435	}
415		436
416	/* ------------------------------------------------------------------------- */	437	void ecb_cold
417	/*
418	* Free everything. That way malloc debugging can find leakage.
419	*/
420	void
421	rxvt_term::scr_release () NOTHROW	438	rxvt_term::scr_release () NOTHROW
422	{	439	{
423	if (row_buf)	440	chunk_free (chunk, chunk_size);
424	{	441	chunk = 0;
425	delete talloc; talloc = 0;	442	row_buf = 0;
426	delete ralloc; ralloc = 0;
427		443
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);	444	free (tabs);
434	tabs = 0;	445	tabs = 0;
435	}
436	}	446	}
437		447
438	/* ------------------------------------------------------------------------- */	448	/* ------------------------------------------------------------------------- */
439	/*	449	/*
440	* Hard/Soft reset	450	* Hard/Soft reset
441	*/	451	*/
442	void	452	void ecb_cold
443	rxvt_term::scr_poweron ()	453	rxvt_term::scr_poweron ()
444	{	454	{
445	scr_release ();	455	scr_release ();
		456
446	prev_nrow = prev_ncol = 0;	457	prev_nrow = prev_ncol = 0;
447	rvideo_mode = false;	458	rvideo_mode = false;
448	scr_soft_reset ();	459	scr_soft_reset ();
449	scr_reset ();	460	scr_reset ();
450		461
451	scr_clear (true);	462	scr_clear (true);
452	scr_refresh ();	463	scr_refresh ();
453	}	464	}
454		465
455	void	466	void ecb_cold
456	rxvt_term::scr_soft_reset ()	467	rxvt_term::scr_soft_reset () NOTHROW
457	{	468	{
458	/* only affects modes, nothing drastic such as clearing the screen */	469	/* only affects modes, nothing drastic such as clearing the screen */
459	#if ENABLE_OVERLAY	470	#if ENABLE_OVERLAY
460	scr_overlay_off ();	471	scr_overlay_off ();
461	#endif	472	#endif
…		…
516	assert (s->cur.row >= 0);	527	assert (s->cur.row >= 0);
517	assert (s->cur.col >= 0);	528	assert (s->cur.col >= 0);
518	}	529	}
519		530
520	void	531	void
521	rxvt_term::scr_swap_screen ()	532	rxvt_term::scr_swap_screen () NOTHROW
522	{	533	{
523	if (!option (Opt_secondaryScreen))	534	if (!option (Opt_secondaryScreen))
524	return;	535	return;
525		536
526	for (int i = prev_nrow; i--; )	537	for (int i = prev_nrow; i--; )
…		…
545	return;	556	return;
546		557
547	want_refresh = 1;	558	want_refresh = 1;
548	view_start = 0;	559	view_start = 0;
549		560
550	selection_check (2); /* check for boundary cross */	561	/* check for boundary cross */
		562	row_col_t pos;
		563	pos.row = pos.col = 0;
		564	if (ROWCOL_IS_BEFORE (selection.beg, pos)
		565	&& ROWCOL_IS_AFTER (selection.end, pos))
		566	CLEAR_SELECTION ();
551		567
552	current_screen = scrn;	568	current_screen = scrn;
553		569
554	#if NSCREENS	570	#if NSCREENS
555	if (option (Opt_secondaryScreen))	571	if (option (Opt_secondaryScreen))
…		…
621	/*	637	/*
622	* Scroll text between <row1> and <row2> inclusive, by <count> lines	638	* Scroll text between <row1> and <row2> inclusive, by <count> lines
623	* count positive ==> scroll up	639	* count positive ==> scroll up
624	* count negative ==> scroll down	640	* count negative ==> scroll down
625	*/	641	*/
626	int	642	int ecb_hot
627	rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW	643	rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
628	{	644	{
629	if (count == 0 || (row1 > row2))	645	if (count == 0 || (row1 > row2))
630	return 0;	646	return 0;
631		647
…		…
634		650
635	if (count > 0	651	if (count > 0
636	&& row1 == 0	652	&& row1 == 0
637	&& (current_screen == PRIMARY || option (Opt_secondaryScroll)))	653	&& (current_screen == PRIMARY || option (Opt_secondaryScroll)))
638	{	654	{
		655	min_it (count, total_rows - (nrow - (row2 + 1)));
		656
639	top_row = max (top_row - count, -saveLines);	657	top_row = max (top_row - count, -saveLines);
640
641	// scroll everything up 'count' lines
642	term_start = (term_start + count) % total_rows;
643		658
644	// sever bottommost line	659	// sever bottommost line
645	{	660	{
646	line_t &l = ROW(row2 - count);	661	line_t &l = ROW(row2);
647	l.is_longer (0);	662	l.is_longer (0);
648	l.touch ();	663	l.touch ();
649	}	664	}
650		665
		666	// scroll everything up 'count' lines
		667	term_start = (term_start + count) % total_rows;
		668
		669	// now copy lines below the scroll region bottom to the
		670	// bottom of the screen again, so they look as if they
		671	// hadn't moved.
		672	for (int i = nrow; --i > row2; )
		673	{
		674	line_t &l1 = ROW(i - count);
		675	line_t &l2 = ROW(i);
		676
		677	::swap (l1, l2);
		678	l2.touch ();
		679	}
		680
651	// erase newly scrolled-in lines	681	// erase newly scrolled-in lines
652	for (int i = count; i--; )	682	for (int i = count; i--; )
653	{	683	{
654	line_t &l = ROW(nrow - 1 - i);	684	line_t &l = ROW(row2 - i);
655		685
656	// optimize if already cleared, can be significant on slow machines	686	// optimise if already cleared, can be significant on slow machines
657	// could be rolled into scr_blank_screen_mem	687	// 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)))	688	if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
659	{	689	{
660	scr_blank_line (l, 0, l.l, rstyle);	690	scr_blank_line (l, 0, l.l, rstyle);
661	l.l = 0;	691	l.l = 0;
…		…
663	}	693	}
664	else	694	else
665	scr_blank_screen_mem (l, rstyle);	695	scr_blank_screen_mem (l, rstyle);
666	}	696	}
667		697
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	698	// move and/or clear selection, if any
681	if (selection.op && current_screen == selection.screen)	699	if (selection.op && current_screen == selection.screen
		700	&& selection.beg.row <= row2)
682	{	701	{
683	selection.beg.row -= count;	702	selection.beg.row -= count;
684	selection.end.row -= count;	703	selection.end.row -= count;
685	selection.mark.row -= count;	704	selection.mark.row -= count;
686		705
687	if (selection.beg.row < top_row	706	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	}	707	}
695		708
696	// finally move the view window, if desired	709	// finally move the view window, if desired
697	if (option (Opt_scrollWithBuffer)	710	if (option (Opt_scrollWithBuffer)
698	&& view_start != 0	711	&& view_start != 0
…		…
728	}	741	}
729		742
730	// use a simple and robust scrolling algorithm, this	743	// use a simple and robust scrolling algorithm, this
731	// part of scr_scroll_text is not time-critical.	744	// part of scr_scroll_text is not time-critical.
732		745
		746	// sever line above scroll region
		747	if (row1)
		748	{
		749	line_t &l = ROW(row1 - 1);
		750	l.is_longer (0);
		751	l.touch ();
		752	}
		753
733	int rows = row2 - row1 + 1;	754	int rows = row2 - row1 + 1;
734		755
735	min_it (count, rows);	756	min_it (count, rows);
736		757
737	line_t *temp_buf = row_buf + total_rows;	758	line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
738		759
739	for (int row = 0; row < rows; row++)	760	for (int row = 0; row < rows; row++)
740	{	761	{
741	temp_buf [row] = ROW(row1 + (row + count + rows) % rows);	762	temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
742		763
…		…
744	scr_blank_screen_mem (temp_buf [row], rstyle);	765	scr_blank_screen_mem (temp_buf [row], rstyle);
745	}	766	}
746		767
747	for (int row = 0; row < rows; row++)	768	for (int row = 0; row < rows; row++)
748	ROW(row1 + row) = temp_buf [row];	769	ROW(row1 + row) = temp_buf [row];
		770
		771	// sever bottommost line
		772	{
		773	line_t &l = ROW(row2);
		774	l.is_longer (0);
		775	l.touch ();
		776	}
749	}	777	}
750		778
751	return count;	779	return count;
752	}	780	}
753		781
754	/* ------------------------------------------------------------------------- */	782	/* ------------------------------------------------------------------------- */
755	/*	783	/*
756	* Add text given in <str> of length <len> to screen struct	784	* Add text given in <str> of length <len> to screen struct
757	*/	785	*/
758	void	786	void ecb_hot
759	rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW	787	rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
760	{	788	{
761	if (len <= 0) /* sanity */	789	if (len <= 0) /* sanity */
762	return;	790	return;
763		791
764	unsigned char checksel;	792	bool checksel;
765	unicode_t c;	793	unicode_t c;
766	int ncol = this->ncol;	794	int ncol = this->ncol;
767	const wchar_t *strend = str + len;	795	const wchar_t *strend = str + len;
768		796
769	want_refresh = 1;	797	want_refresh = 1;
…		…
795		823
796	while (str < strend)	824	while (str < strend)
797	{	825	{
798	c = (unicode_t)*str++; // convert to rxvt-unicodes representation	826	c = (unicode_t)*str++; // convert to rxvt-unicodes representation
799		827
800	if (expect_false (c < 0x20))	828	if (ecb_unlikely (c < 0x20))
801	if (c == C0_LF)	829	if (c == C0_LF)
802	{	830	{
803	max_it (line->l, screen.cur.col);	831	max_it (line->l, screen.cur.col);
804		832
805	screen.flags &= ~Screen_WrapNext;	833	screen.flags &= ~Screen_WrapNext;
…		…
824	{	852	{
825	scr_tab (1, true);	853	scr_tab (1, true);
826	continue;	854	continue;
827	}	855	}
828		856
829	if (expect_false (	857	if (ecb_unlikely (
830	checksel /* see if we're writing within selection */	858	checksel /* see if we're writing within selection */
831	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)	859	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
832	&& ROWCOL_IS_BEFORE (screen.cur, selection.end)	860	&& ROWCOL_IS_BEFORE (screen.cur, selection.end)
833	))	861	))
834	{	862	{
…		…
839	* should be a similar check.	867	* should be a similar check.
840	*/	868	*/
841	CLEAR_SELECTION ();	869	CLEAR_SELECTION ();
842	}	870	}
843		871
844	if (expect_false (screen.flags & Screen_WrapNext))	872	if (ecb_unlikely (screen.flags & Screen_WrapNext))
845	{	873	{
846	scr_do_wrap ();	874	scr_do_wrap ();
847		875
848	line->l = ncol;	876	line->l = ncol;
849	line->is_longer (1);	877	line->is_longer (1);
…		…
851	row = screen.cur.row;	879	row = screen.cur.row;
852	line = &ROW(row); /* _must_ refresh */	880	line = &ROW(row); /* _must_ refresh */
853	}	881	}
854		882
855	// some utf-8 decoders "decode" surrogate characters: let's fix this.	883	// some utf-8 decoders "decode" surrogate characters: let's fix this.
856	if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff)))	884	if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
857	c = 0xfffd;	885	c = 0xfffd;
858		886
859	// rely on wcwidth to tell us the character width, do wcwidth before	887	// rely on wcwidth to tell us the character width, do wcwidth before
860	// further replacements, as wcwidth might return -1 for the line	888	// further replacements, as wcwidth might return -1 for the line
861	// drawing characters below as they might be invalid in the current	889	// drawing characters below as they might be invalid in the current
862	// locale.	890	// locale.
863	int width = WCWIDTH (c);	891	int width = WCWIDTH (c);
864		892
865	if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL	893	if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
866	{	894	{
867	// vt100 special graphics and line drawing	895	// vt100 special graphics and line drawing
868	// 5f-7e standard vt100	896	// 5f-7e standard vt100
869	// 40-5e rxvt extension for extra curses acs chars	897	// 40-5e rxvt extension for extra curses acs chars
870	static uint16_t vt100_0[62] = { // 41 .. 7e	898	static uint16_t vt100_0[62] = { // 41 .. 7e
…		…
883	c = vt100_0[c - 0x41];	911	c = vt100_0[c - 0x41];
884	width = 1; // vt100 line drawing characters are always single-width	912	width = 1; // vt100 line drawing characters are always single-width
885	}	913	}
886	}	914	}
887		915
888	if (expect_false (screen.flags & Screen_Insert))	916	if (ecb_unlikely (screen.flags & Screen_Insert))
889	scr_insdel_chars (width, INSERT);	917	scr_insdel_chars (width, INSERT);
890		918
891	if (width != 0)	919	if (width != 0)
892	{	920	{
893	#if !UNICODE_3	921	#if !UNICODE_3
…		…
898	# else	926	# else
899	c = 0xfffd;	927	c = 0xfffd;
900	# endif	928	# endif
901	#endif	929	#endif
902		930
		931	rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
		932
		933	// if the character doesn't fit into the remaining columns...
		934	if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
		935	{
		936	if (screen.flags & Screen_Autowrap)
		937	{
		938	// ... artificially enlargen the previous one
		939	c = NOCHAR;
		940	// and try the same character next loop iteration
		941	--str;
		942	}
		943	else
		944	screen.cur.col = ncol - width;
		945	}
		946
903	// nuke the character at this position, if required	947	// nuke the character at this position, if required
904	if (expect_false (	948	// due to wonderful coincidences everywhere else in this loop
		949	// we never have to check for overwriting a wide char itself,
		950	// only its tail.
905	line->t[screen.cur.col] == NOCHAR	951	if (ecb_unlikely (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);	952	scr_kill_char (*line, screen.cur.col);
910
911	rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
912
913	// if the character doesn't fit into the remaining columns...
914	if (expect_false (screen.cur.col > ncol - width && ncol >= width))
915	{
916	// ... artificially enlargen the previous one
917	c = NOCHAR;
918	// and try the same character next loop iteration
919	--str;
920	}
921		953
922	line->touch ();	954	line->touch ();
923		955
924	do	956	do
925	{	957	{
926	line->t[screen.cur.col] = c;	958	line->t[screen.cur.col] = c;
927	line->r[screen.cur.col] = rend;	959	line->r[screen.cur.col] = rend;
928		960
929	if (expect_true (screen.cur.col < ncol - 1))	961	if (ecb_likely (screen.cur.col < ncol - 1))
930	screen.cur.col++;	962	screen.cur.col++;
931	else	963	else
932	{	964	{
933	line->l = ncol;	965	line->l = ncol;
934	if (screen.flags & Screen_Autowrap)	966	if (screen.flags & Screen_Autowrap)
935	screen.flags |= Screen_WrapNext;	967	screen.flags |= Screen_WrapNext;
936	break;	968
		969	goto end_of_line;
937	}	970	}
938		971
939	c = NOCHAR;	972	c = NOCHAR;
940	}	973	}
941	while (expect_false (--width > 0));	974	while (ecb_unlikely (--width > 0));
942		975
943	// pad with spaces when overwriting wide character with smaller one	976	// pad with spaces when overwriting wide character with smaller one
944	if (expect_false (!width))	977	for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
945	{	978	{
946	line->touch ();
947
948	for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
949	{
950	line->t[c] = ' ';	979	line->t[c] = ' ';
951	line->r[c] = rend;	980	line->r[c] = rend;
952	}
953	}	981	}
		982
		983	end_of_line:
		984	;
954	}	985	}
955	#if ENABLE_COMBINING	986	#if ENABLE_COMBINING
956	else // width == 0	987	else // width == 0
957	{	988	{
958	if (c != 0xfeff) // ignore BOM	989	if (c != 0xfeff) // ignore BOM
…		…
1021		1052
1022	want_refresh = 1;	1053	want_refresh = 1;
1023	#endif	1054	#endif
1024	}	1055	}
1025	}	1056	}
		1057	else if (screen.flags & Screen_WrapNext)
		1058	screen.flags &= ~Screen_WrapNext;
1026	else	1059	else
1027	scr_gotorc (0, -1, RELATIVE);	1060	scr_gotorc (0, -1, RELATIVE);
1028	}	1061	}
1029		1062
1030	/* ------------------------------------------------------------------------- */	1063	/* ------------------------------------------------------------------------- */
…		…
1108	* XTERM_SEQ: ESC 6	1141	* XTERM_SEQ: ESC 6
1109	* Move cursor left in row. If we're at the left boundary, shift everything	1142	* Move cursor left in row. If we're at the left boundary, shift everything
1110	* in that row right. Clear left column.	1143	* in that row right. Clear left column.
1111	*/	1144	*/
1112	#if !ENABLE_MINIMAL	1145	#if !ENABLE_MINIMAL
1113	void	1146	void ecb_cold
1114	rxvt_term::scr_backindex () NOTHROW	1147	rxvt_term::scr_backindex () NOTHROW
1115	{	1148	{
1116	if (screen.cur.col > 0)	1149	if (screen.cur.col > 0)
1117	scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);	1150	scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1118	else	1151	else
…		…
1125	* XTERM_SEQ: ESC 9	1158	* XTERM_SEQ: ESC 9
1126	* Move cursor right in row. If we're at the right boundary, shift everything	1159	* Move cursor right in row. If we're at the right boundary, shift everything
1127	* in that row left. Clear right column.	1160	* in that row left. Clear right column.
1128	*/	1161	*/
1129	#if !ENABLE_MINIMAL	1162	#if !ENABLE_MINIMAL
1130	void	1163	void ecb_cold
1131	rxvt_term::scr_forwardindex () NOTHROW	1164	rxvt_term::scr_forwardindex () NOTHROW
1132	{	1165	{
1133	if (screen.cur.col < ncol - 1)	1166	if (screen.cur.col < ncol - 1)
1134	scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);	1167	scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1135	else	1168	else
…		…
1286	scr_blank_line (line, col, num, rstyle);	1319	scr_blank_line (line, col, num, rstyle);
1287	}	1320	}
1288		1321
1289	/* ------------------------------------------------------------------------- */	1322	/* ------------------------------------------------------------------------- */
1290	/*	1323	/*
1291	* Erase part of whole of the screen	1324	* Erase part or whole of the screen
1292	* XTERM_SEQ: Clear screen after cursor : ESC [ 0 J	1325	* XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1293	* XTERM_SEQ: Clear screen before cursor: ESC [ 1 J	1326	* XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1294	* XTERM_SEQ: Clear whole screen : ESC [ 2 J	1327	* XTERM_SEQ: Clear whole screen : ESC [ 2 J
1295	*/	1328	*/
1296	void	1329	void
…		…
1305	ZERO_SCROLLBACK ();	1338	ZERO_SCROLLBACK ();
1306		1339
1307	switch (mode)	1340	switch (mode)
1308	{	1341	{
1309	case 0: /* erase to end of screen */	1342	case 0: /* erase to end of screen */
1310	selection_check (1);
1311	scr_erase_line (0);	1343	scr_erase_line (0);
1312	row = screen.cur.row + 1; /* possible OOB */	1344	row = screen.cur.row + 1; /* possible OOB */
1313	num = nrow - row;	1345	num = nrow - row;
1314	break;	1346	break;
1315	case 1: /* erase to beginning of screen */	1347	case 1: /* erase to beginning of screen */
1316	selection_check (3);
1317	scr_erase_line (1);	1348	scr_erase_line (1);
1318	row = 0;	1349	row = 0;
1319	num = screen.cur.row;	1350	num = screen.cur.row;
1320	break;	1351	break;
1321	case 2: /* erase whole screen */	1352	case 2: /* erase whole screen */
1322	selection_check (3);
1323	row = 0;	1353	row = 0;
1324	num = nrow;	1354	num = nrow;
1325	break;	1355	break;
1326	default:	1356	default:
1327	return;	1357	return;
…		…
1344	{	1374	{
1345	ren = DEFAULT_RSTYLE;	1375	ren = DEFAULT_RSTYLE;
1346		1376
1347	if (mapped)	1377	if (mapped)
1348	XClearArea (dpy, vt, 0,	1378	XClearArea (dpy, vt, 0,
1349	Row2Pixel (row - view_start), (unsigned int)width,	1379	Row2Pixel (row - view_start), (unsigned int)vt_width,
1350	(unsigned int)Height2Pixel (num), False);	1380	(unsigned int)Height2Pixel (num), False);
1351	}	1381	}
1352	else	1382	else
1353	{	1383	{
1354	ren = rstyle & (RS_fgMask | RS_bgMask);	1384	ren = rstyle & (RS_fgMask | RS_bgMask);
…		…
1357	{	1387	{
1358	gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];	1388	gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1359	XChangeGC (dpy, gc, GCForeground, &gcvalue);	1389	XChangeGC (dpy, gc, GCForeground, &gcvalue);
1360	XFillRectangle (dpy, vt, gc,	1390	XFillRectangle (dpy, vt, gc,
1361	0, Row2Pixel (row - view_start),	1391	0, Row2Pixel (row - view_start),
1362	(unsigned int)width,	1392	(unsigned int)vt_width,
1363	(unsigned int)Height2Pixel (num));	1393	(unsigned int)Height2Pixel (num));
1364	gcvalue.foreground = pix_colors[Color_fg];	1394	gcvalue.foreground = pix_colors[Color_fg];
1365	XChangeGC (dpy, gc, GCForeground, &gcvalue);	1395	XChangeGC (dpy, gc, GCForeground, &gcvalue);
1366	}	1396	}
1367	}	1397	}
…		…
1389	/* ------------------------------------------------------------------------- */	1419	/* ------------------------------------------------------------------------- */
1390	/*	1420	/*
1391	* Fill the screen with `E's	1421	* Fill the screen with `E's
1392	* XTERM_SEQ: Screen Alignment Test: ESC # 8	1422	* XTERM_SEQ: Screen Alignment Test: ESC # 8
1393	*/	1423	*/
1394	void	1424	void ecb_cold
1395	rxvt_term::scr_E () NOTHROW	1425	rxvt_term::scr_E () NOTHROW
1396	{	1426	{
1397	rend_t fs;	1427	rend_t fs;
1398		1428
1399	want_refresh = 1;	1429	want_refresh = 1;
1400	ZERO_SCROLLBACK ();	1430	ZERO_SCROLLBACK ();
1401		1431
1402	num_scr_allow = 0;	1432	num_scr_allow = 0;
1403	selection_check (3);	1433
		1434	row_col_t pos;
		1435	pos.row = pos.col = 0;
		1436	if (ROWCOL_IS_AFTER (selection.end, pos))
		1437	CLEAR_SELECTION ();
1404		1438
1405	fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));	1439	fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1406	for (int row = nrow; row--; )	1440	for (int row = nrow; row--; )
1407	{	1441	{
1408	line_t &line = ROW(row);	1442	line_t &line = ROW(row);
…		…
1559	/* ------------------------------------------------------------------------- */	1593	/* ------------------------------------------------------------------------- */
1560	/*	1594	/*
1561	* Set the scrolling region	1595	* Set the scrolling region
1562	* XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r	1596	* XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1563	*/	1597	*/
1564	void	1598	void ecb_cold
1565	rxvt_term::scr_scroll_region (int top, int bot) NOTHROW	1599	rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1566	{	1600	{
1567	max_it (top, 0);	1601	max_it (top, 0);
1568	min_it (bot, nrow - 1);	1602	min_it (bot, nrow - 1);
1569		1603
…		…
1579	/*	1613	/*
1580	* Make the cursor visible/invisible	1614	* Make the cursor visible/invisible
1581	* XTERM_SEQ: Make cursor visible : ESC [ ? 25 h	1615	* XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1582	* XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l	1616	* XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1583	*/	1617	*/
1584	void	1618	void ecb_cold
1585	rxvt_term::scr_cursor_visible (int mode) NOTHROW	1619	rxvt_term::scr_cursor_visible (int mode) NOTHROW
1586	{	1620	{
1587	want_refresh = 1;	1621	want_refresh = 1;
1588		1622
1589	if (mode)	1623	if (mode)
…		…
1596	/*	1630	/*
1597	* Set/unset automatic wrapping	1631	* Set/unset automatic wrapping
1598	* XTERM_SEQ: Set Wraparound : ESC [ ? 7 h	1632	* XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1599	* XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l	1633	* XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1600	*/	1634	*/
1601	void	1635	void ecb_cold
1602	rxvt_term::scr_autowrap (int mode) NOTHROW	1636	rxvt_term::scr_autowrap (int mode) NOTHROW
1603	{	1637	{
1604	if (mode)	1638	if (mode)
1605	screen.flags |= Screen_Autowrap;	1639	screen.flags |= Screen_Autowrap;
1606	else	1640	else
…		…
1615	* Relative mode: line numbers are relative to top margin of scrolling region	1649	* Relative mode: line numbers are relative to top margin of scrolling region
1616	* and the cursor cannot be moved outside.	1650	* and the cursor cannot be moved outside.
1617	* XTERM_SEQ: Set Absolute: ESC [ ? 6 h	1651	* XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1618	* XTERM_SEQ: Set Relative: ESC [ ? 6 l	1652	* XTERM_SEQ: Set Relative: ESC [ ? 6 l
1619	*/	1653	*/
1620	void	1654	void ecb_cold
1621	rxvt_term::scr_relative_origin (int mode) NOTHROW	1655	rxvt_term::scr_relative_origin (int mode) NOTHROW
1622	{	1656	{
1623	if (mode)	1657	if (mode)
1624	screen.flags |= Screen_Relative;	1658	screen.flags |= Screen_Relative;
1625	else	1659	else
…		…
1632	/*	1666	/*
1633	* Set insert/replace mode	1667	* Set insert/replace mode
1634	* XTERM_SEQ: Set Insert mode : ESC [ ? 4 h	1668	* XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1635	* XTERM_SEQ: Set Replace mode: ESC [ ? 4 l	1669	* XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1636	*/	1670	*/
1637	void	1671	void ecb_cold
1638	rxvt_term::scr_insert_mode (int mode) NOTHROW	1672	rxvt_term::scr_insert_mode (int mode) NOTHROW
1639	{	1673	{
1640	if (mode)	1674	if (mode)
1641	screen.flags |= Screen_Insert;	1675	screen.flags |= Screen_Insert;
1642	else	1676	else
…		…
1648	* Set/Unset tabs	1682	* Set/Unset tabs
1649	* XTERM_SEQ: Set tab at current column : ESC H	1683	* XTERM_SEQ: Set tab at current column : ESC H
1650	* XTERM_SEQ: Clear tab at current column: ESC [ 0 g	1684	* XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1651	* XTERM_SEQ: Clear all tabs : ESC [ 3 g	1685	* XTERM_SEQ: Clear all tabs : ESC [ 3 g
1652	*/	1686	*/
1653	void	1687	void ecb_cold
1654	rxvt_term::scr_set_tab (int mode) NOTHROW	1688	rxvt_term::scr_set_tab (int mode) NOTHROW
1655	{	1689	{
1656	if (mode < 0)	1690	if (mode < 0)
1657	memset (tabs, 0, ncol);	1691	memset (tabs, 0, ncol);
1658	else if (screen.cur.col < ncol)	1692	else if (screen.cur.col < ncol)
…		…
1677	if (rvideo_state != on)	1711	if (rvideo_state != on)
1678	{	1712	{
1679	rvideo_state = on;	1713	rvideo_state = on;
1680		1714
1681	::swap (pix_colors[Color_fg], pix_colors[Color_bg]);	1715	::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1682	#ifdef HAVE_BG_PIXMAP	1716	#ifdef HAVE_IMG
1683	if (bgPixmap.pixmap == None)	1717	if (bg_img == 0)
1684	#endif	1718	#endif
1685	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);	1719	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1686		1720
1687	XGCValues gcvalue;	1721	XGCValues gcvalue;
1688	gcvalue.foreground = pix_colors[Color_fg];	1722	gcvalue.foreground = pix_colors[Color_fg];
…		…
1697	/* ------------------------------------------------------------------------- */	1731	/* ------------------------------------------------------------------------- */
1698	/*	1732	/*
1699	* Report current cursor position	1733	* Report current cursor position
1700	* XTERM_SEQ: Report position: ESC [ 6 n	1734	* XTERM_SEQ: Report position: ESC [ 6 n
1701	*/	1735	*/
1702	void	1736	void ecb_cold
1703	rxvt_term::scr_report_position () NOTHROW	1737	rxvt_term::scr_report_position () NOTHROW
1704	{	1738	{
1705	tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);	1739	tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1706	}	1740	}
1707		1741
…		…
1710	* ------------------------------------------------------------------------- */	1744	* ------------------------------------------------------------------------- */
1711		1745
1712	/*	1746	/*
1713	* Set font style	1747	* Set font style
1714	*/	1748	*/
1715	void	1749	void ecb_cold
1716	rxvt_term::set_font_style () NOTHROW	1750	rxvt_term::set_font_style () NOTHROW
1717	{	1751	{
1718	#if 0	1752	#if 0
1719	switch (charsets [screen.charset])	1753	switch (charsets [screen.charset])
1720	{	1754	{
…		…
1742	* XTERM_SEQ: Invoke G0 character set: CTRL-O	1776	* XTERM_SEQ: Invoke G0 character set: CTRL-O
1743	* XTERM_SEQ: Invoke G1 character set: CTRL-N	1777	* XTERM_SEQ: Invoke G1 character set: CTRL-N
1744	* XTERM_SEQ: Invoke G2 character set: ESC N	1778	* XTERM_SEQ: Invoke G2 character set: ESC N
1745	* XTERM_SEQ: Invoke G3 character set: ESC O	1779	* XTERM_SEQ: Invoke G3 character set: ESC O
1746	*/	1780	*/
1747	void	1781	void ecb_cold
1748	rxvt_term::scr_charset_choose (int set) NOTHROW	1782	rxvt_term::scr_charset_choose (int set) NOTHROW
1749	{	1783	{
1750	screen.charset = set;	1784	screen.charset = set;
1751	set_font_style ();	1785	set_font_style ();
1752	}	1786	}
…		…
1773	* ------------------------------------------------------------------------- */	1807	* ------------------------------------------------------------------------- */
1774		1808
1775	/*	1809	/*
1776	* refresh matching text.	1810	* refresh matching text.
1777	*/	1811	*/
1778	bool	1812	bool ecb_cold
1779	rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW	1813	rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1780	{	1814	{
1781	bool found = false;	1815	bool found = false;
1782		1816
1783	for (int i = 0; i < nrow; i++)	1817	for (int i = 0; i < nrow; i++)
…		…
1802	PART_BEG = 0,	1836	PART_BEG = 0,
1803	PART_END,	1837	PART_END,
1804	RC_COUNT	1838	RC_COUNT
1805	};	1839	};
1806		1840
1807	void	1841	void ecb_hot
1808	rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW	1842	rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1809	{	1843	{
1810	int i;	1844	int i;
1811	row_col_t rc[RC_COUNT];	1845	row_col_t rc[RC_COUNT];
1812		1846
…		…
1849	* Refresh the entire screen	1883	* Refresh the entire screen
1850	*/	1884	*/
1851	void	1885	void
1852	rxvt_term::scr_touch (bool refresh) NOTHROW	1886	rxvt_term::scr_touch (bool refresh) NOTHROW
1853	{	1887	{
1854	scr_expose (0, 0, width, height, refresh);	1888	scr_expose (0, 0, vt_width, vt_height, refresh);
1855	}	1889	}
1856		1890
1857	/* ------------------------------------------------------------------------- */	1891	/* ------------------------------------------------------------------------- */
1858	/*	1892	/*
1859	* Move the display so that the line represented by scrollbar value Y is at	1893	* Move the display so that the line represented by scrollbar value Y is at
…		…
1915		1949
1916	# ifndef NO_MAPALERT	1950	# ifndef NO_MAPALERT
1917	# ifdef MAPALERT_OPTION	1951	# ifdef MAPALERT_OPTION
1918	if (option (Opt_mapAlert))	1952	if (option (Opt_mapAlert))
1919	# endif	1953	# endif
1920	XMapWindow (dpy, parent[0]);	1954	XMapWindow (dpy, parent);
1921	# endif	1955	# endif
1922		1956
1923	# if ENABLE_FRILLS	1957	# if ENABLE_FRILLS
1924	if (option (Opt_urgentOnBell))	1958	if (option (Opt_urgentOnBell))
1925	set_urgency (1);	1959	set_urgency (1);
…		…
1938	HOOK_INVOKE ((this, HOOK_BELL, DT_END));	1972	HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1939	#endif	1973	#endif
1940	}	1974	}
1941		1975
1942	/* ------------------------------------------------------------------------- */	1976	/* ------------------------------------------------------------------------- */
1943	/* ARGSUSED */	1977	void ecb_cold
1944	void
1945	rxvt_term::scr_printscreen (int fullhist) NOTHROW	1978	rxvt_term::scr_printscreen (int fullhist) NOTHROW
1946	{	1979	{
1947	#ifdef PRINTPIPE	1980	#ifdef PRINTPIPE
1948	int nrows, row_start;	1981	int nrows, row_start;
1949	FILE *fd = popen_printer ();	1982	FILE *fd = popen_printer ();
…		…
1998	/*	2031	/*
1999	* Refresh the screen	2032	* Refresh the screen
2000	* drawn_text/drawn_rend contain the screen information before the update.	2033	* drawn_text/drawn_rend contain the screen information before the update.
2001	* screen.text/screen.rend contain what the screen will change to.	2034	* screen.text/screen.rend contain what the screen will change to.
2002	*/	2035	*/
2003	void	2036	void ecb_hot
2004	rxvt_term::scr_refresh () NOTHROW	2037	rxvt_term::scr_refresh () NOTHROW
2005	{	2038	{
2006	int16_t col, row, /* column/row we're processing */	2039	int16_t col, row, /* column/row we're processing */
2007	ocrow; /* old cursor row */	2040	ocrow; /* old cursor row */
2008	int i; /* tmp */	2041	int i; /* tmp */
…		…
2022	* A: set up vars	2055	* A: set up vars
2023	*/	2056	*/
2024	refresh_count = 0;	2057	refresh_count = 0;
2025		2058
2026	unsigned int old_screen_flags = screen.flags;	2059	unsigned int old_screen_flags = screen.flags;
2027	char have_bg = 0;	2060	bool have_bg = 0;
2028	#ifdef HAVE_BG_PIXMAP	2061	#ifdef HAVE_IMG
2029	have_bg = bgPixmap.pixmap != None;	2062	have_bg = bg_img != 0;
2030	#endif	2063	#endif
2031	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */	2064	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2032		2065
2033	/*	2066	/*
2034	* B: reverse any characters which are selected	2067	* B: reverse any characters which are selected
…		…
2038	HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));	2071	HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2039	#if ENABLE_OVERLAY	2072	#if ENABLE_OVERLAY
2040	scr_swap_overlay ();	2073	scr_swap_overlay ();
2041	#endif	2074	#endif
2042		2075
2043	char showcursor = screen.flags & Screen_VisibleCursor;	2076	bool showcursor = screen.flags & Screen_VisibleCursor;
2044		2077
2045	/*	2078	/*
2046	* C: set the cursor character (s)	2079	* C: set the cursor character (s)
2047	*/	2080	*/
2048	{	2081	{
2049	unsigned char setoldcursor;	2082	bool setoldcursor;
2050		2083
2051	#ifdef CURSOR_BLINK	2084	#ifdef CURSOR_BLINK
2052	if (hidden_cursor)	2085	if (hidden_cursor)
2053	showcursor = 0;	2086	showcursor = 0;
2054	#endif	2087	#endif
…		…
2141	{	2174	{
2142	int16_t nits;	2175	int16_t nits;
2143	int i = num_scr;	2176	int i = num_scr;
2144	int j;	2177	int j;
2145	int len, wlen;	2178	int len, wlen;
2146	dLocal (int, num_scr);
2147		2179
2148	j = nrow;	2180	j = nrow;
2149	wlen = len = -1;	2181	wlen = len = -1;
2150	row = i > 0 ? 0 : j - 1;	2182	row = i > 0 ? 0 : j - 1;
2151		2183
…		…
2226	continue;	2258	continue;
2227		2259
2228	// redraw one or more characters	2260	// redraw one or more characters
2229		2261
2230	// seek to the beginning of wide characters	2262	// seek to the beginning of wide characters
2231	while (expect_false (stp[col] == NOCHAR && col > 0))	2263	while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2232	--col;	2264	--col;
2233		2265
2234	rend_t rend = srp[col]; /* screen rendition (target rendition) */	2266	rend_t rend = srp[col]; /* screen rendition (target rendition) */
2235	text_t *text = stp + col;	2267	text_t *text = stp + col;
2236	int count = 1;	2268	int count = 1;
…		…
2274		2306
2275	col--; /* went one too far. move back */	2307	col--; /* went one too far. move back */
2276	count -= i; /* dump any matching trailing chars */	2308	count -= i; /* dump any matching trailing chars */
2277		2309
2278	// sometimes we optimize away the trailing NOCHAR's, add them back	2310	// sometimes we optimize away the trailing NOCHAR's, add them back
2279	while (expect_false (i && text[count] == NOCHAR))	2311	while (ecb_unlikely (i && text[count] == NOCHAR))
2280	count++, i--;	2312	count++, i--;
2281		2313
2282	/*	2314	/*
2283	* Determine the attributes for the string	2315	* Determine the attributes for the string
2284	*/	2316	*/
2285	int fore = fgcolor_of (rend); // desired foreground	2317	int fore = fgcolor_of (rend); // desired foreground
2286	int back = bgcolor_of (rend); // desired background	2318	int back = bgcolor_of (rend); // desired background
2287		2319
2288	// only do special processing if any attributes are set, which is unlikely	2320	// only do special processing if any attributes are set, which is unlikely
2289	if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))	2321	if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2290	{	2322	{
2291	bool invert = rend & RS_RVid;	2323	bool invert = rend & RS_RVid;
2292		2324
2293	#ifndef NO_BOLD_UNDERLINE_REVERSE	2325	#ifndef NO_BOLD_UNDERLINE_REVERSE
2294	if (rend & RS_Bold && fore == Color_fg)	2326	if (rend & RS_Bold && fore == Color_fg)
…		…
2383	/*	2415	/*
2384	* Actually do the drawing of the string here	2416	* Actually do the drawing of the string here
2385	*/	2417	*/
2386	rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];	2418	rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2387		2419
2388	if (expect_true (have_bg && back == Color_bg))	2420	if (ecb_likely (have_bg && back == Color_bg))
2389	{	2421	{
2390	// this is very ugly, maybe push it into ->draw?	2422	// this is very ugly, maybe push it into ->draw?
2391		2423
2392	for (i = 0; i < count; i++) /* don't draw empty strings */	2424	for (i = 0; i < count; i++) /* don't draw empty strings */
2393	if (text[i] != ' ')	2425	if (text[i] != ' ')
…		…
2400	did_clear: ;	2432	did_clear: ;
2401	}	2433	}
2402	else	2434	else
2403	font->draw (*drawable, xpixel, ypixel, text, count, fore, back);	2435	font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2404		2436
2405	if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))	2437	if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2406	{	2438	{
2407	#if ENABLE_FRILLS	2439	#if ENABLE_FRILLS
2408	if (ISSET_PIXCOLOR (Color_underline))	2440	if (ISSET_PIXCOLOR (Color_underline))
2409	XSetForeground (dpy, gc, pix_colors[Color_underline]);	2441	XSetForeground (dpy, gc, pix_colors[Color_underline]);
2410	else	2442	else
…		…
2456		2488
2457	XDrawRectangle (dpy, vt, gc,	2489	XDrawRectangle (dpy, vt, gc,
2458	Col2Pixel (col),	2490	Col2Pixel (col),
2459	Row2Pixel (oldcursor.row),	2491	Row2Pixel (oldcursor.row),
2460	(unsigned int) (Width2Pixel (cursorwidth) - 1),	2492	(unsigned int) (Width2Pixel (cursorwidth) - 1),
2461	(unsigned int) (Height2Pixel (1) - lineSpace - 1));	2493	(unsigned int) (Height2Pixel (1) - 1));
2462	}	2494	}
2463	}	2495	}
2464		2496
2465	/*	2497	/*
2466	* H: cleanup selection	2498	* H: cleanup selection
…		…
2475	screen.flags = old_screen_flags;	2507	screen.flags = old_screen_flags;
2476	num_scr = 0;	2508	num_scr = 0;
2477	num_scr_allow = 1;	2509	num_scr_allow = 1;
2478	}	2510	}
2479		2511
2480	void	2512	void ecb_cold
2481	rxvt_term::scr_remap_chars (line_t &l) NOTHROW	2513	rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2482	{	2514	{
2483	if (!l.t)	2515	if (!l.valid ())
2484	return;	2516	return;
2485		2517
2486	l.touch (); // maybe a bit of an overkill, but it's not performance-relevant	2518	l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2487		2519
2488	for (int i = ncol; i--; )	2520	for (int i = ncol; i--; )
2489	l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));	2521	l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2490	}	2522	}
2491		2523
2492	void	2524	void ecb_cold
2493	rxvt_term::scr_remap_chars () NOTHROW	2525	rxvt_term::scr_remap_chars () NOTHROW
2494	{	2526	{
2495	for (int i = total_rows; i--; )	2527	for (int i = total_rows; i--; )
2496	scr_remap_chars (row_buf [i]);	2528	scr_remap_chars (row_buf [i]);
2497		2529
…		…
2500	scr_remap_chars (drawn_buf [i]);	2532	scr_remap_chars (drawn_buf [i]);
2501	scr_remap_chars (swap_buf [i]);	2533	scr_remap_chars (swap_buf [i]);
2502	}	2534	}
2503	}	2535	}
2504		2536
2505	void	2537	void ecb_cold
2506	rxvt_term::scr_recolour () NOTHROW	2538	rxvt_term::scr_recolour (bool refresh) NOTHROW
2507	{	2539	{
2508	#ifdef HAVE_BG_PIXMAP	2540	bool transparent = false;
2509	bgPixmap.apply ();
2510	#else
2511		2541
		2542	#ifdef HAVE_IMG
		2543	if (bg_img != 0)
		2544	{
		2545	# if ENABLE_TRANSPARENCY
		2546	if (bg_flags & BG_IS_TRANSPARENT)
		2547	{
		2548	XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
		2549	XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
		2550
		2551	transparent = true;
		2552	}
		2553	else
		2554	# endif
		2555	{
		2556	XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
		2557	XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
		2558	}
		2559	}
		2560	else
		2561	#endif
		2562	{
2512	XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);	2563	XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2513	XClearWindow (dpy, parent[0]);
2514	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);	2564	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
		2565	}
		2566
		2567	XClearWindow (dpy, parent);
2515		2568
2516	if (scrollBar.win)	2569	if (scrollBar.win)
2517	{	2570	{
		2571	if (transparent)
		2572	XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
		2573	else
2518	XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);	2574	XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2519	scrollBar.state = STATE_IDLE;	2575	scrollBar.state = SB_STATE_IDLE;
2520	scrollBar.show (0);	2576	scrollBar.show (0);
2521	}	2577	}
2522		2578
2523	#endif	2579	if (refresh)
2524		2580	{
2525	/* bgPixmap.apply () does not do the following : */
2526	scr_clear ();	2581	scr_clear ();
2527	scr_touch (true);	2582	scr_touch (true);
		2583	}
2528	want_refresh = 1;	2584	want_refresh = 1;
2529	}	2585	}
2530		2586
2531	/* ------------------------------------------------------------------------- */	2587	/* ------------------------------------------------------------------------- */
2532	void	2588	void
…		…
2589	for (rend_t *srp = ROW(row).r; col < end_col; col++)	2645	for (rend_t *srp = ROW(row).r; col < end_col; col++)
2590	srp[col] ^= rstyle;	2646	srp[col] ^= rstyle;
2591	}	2647	}
2592		2648
2593	/* ------------------------------------------------------------------------- */	2649	/* ------------------------------------------------------------------------- */
2594	void	2650	void ecb_hot
2595	rxvt_term::scr_reverse_selection () NOTHROW	2651	rxvt_term::scr_reverse_selection () NOTHROW
2596	{	2652	{
2597	if (selection.op	2653	if (selection.op
2598	&& current_screen == selection.screen	2654	&& current_screen == selection.screen
2599	&& selection.end.row >= view_start)	2655	&& selection.end.row >= view_start)
…		…
2618	*/	2674	*/
2619	#if 0	2675	#if 0
2620	void	2676	void
2621	rxvt_term::scr_dump (int fd) NOTHROW	2677	rxvt_term::scr_dump (int fd) NOTHROW
2622	{	2678	{
2623	int row, wrote;	2679	// if this method is needed, it can be implemented by factoring the
2624	unsigned int width, towrite;	2680	// relevant code in scr_printscreen
2625	char r1[] = "\n";
2626
2627	for (row = saveLines + top_row;
2628	row < saveLines + nrow - 1; row++)
2629	{
2630	width = row_buf[row].l >= 0 ? row_buf[row].l
2631	: ncol;
2632	for (towrite = width; towrite; towrite -= wrote)
2633	{
2634	wrote = write (fd, & (row_buf[row].t[width - towrite]),
2635	towrite);
2636	if (wrote < 0)
2637	return; /* XXX: death, no report */
2638	}
2639	if (row_buf[row].l >= 0)
2640	if (write (fd, r1, 1) <= 0)
2641	return; /* XXX: death, no report */
2642	}
2643	}	2681	}
2644	#endif	2682	#endif
2645		2683
2646	/* ------------------------------------------------------------------------- *	2684	/* ------------------------------------------------------------------------- *
2647	* CHARACTER SELECTION *	2685	* CHARACTER SELECTION *
2648	* ------------------------------------------------------------------------- */	2686	* ------------------------------------------------------------------------- */
2649	void	2687	void
2650	rxvt_term::selection_check (int check_more) NOTHROW	2688	rxvt_term::selection_check (int check_more) NOTHROW
2651	{	2689	{
2652	row_col_t pos;
2653
2654	if (!selection.op)	2690	if (!selection.op)
2655	return;	2691	return;
2656		2692
2657	pos.row = pos.col = 0;
2658	if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)	2693	if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2659	|| !IN_RANGE_EXC (selection.mark.row, top_row, nrow)	2694	|| !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2660	|| !IN_RANGE_EXC (selection.end.row, top_row, nrow)	2695	|| !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2661	|| (check_more == 1	2696	|| (check_more == 1
2662	&& current_screen == selection.screen	2697	&& current_screen == selection.screen
2663	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)	2698	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2664	&& ROWCOL_IS_BEFORE (screen.cur, selection.end))	2699	&& ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2665	|| (check_more == 2
2666	&& ROWCOL_IS_BEFORE (selection.beg, pos)
2667	&& ROWCOL_IS_AFTER (selection.end, pos))
2668	|| (check_more == 3
2669	&& ROWCOL_IS_AFTER (selection.end, pos))
2670	|| (check_more == 4 /* screen width change */
2671	&& (selection.beg.row != selection.end.row
2672	|| selection.end.col > ncol)))
2673	CLEAR_SELECTION ();	2700	CLEAR_ALL_SELECTION ();
2674	}	2701	}
2675		2702
2676	/* ------------------------------------------------------------------------- */	2703	/* ------------------------------------------------------------------------- */
2677	/*	2704	/*
2678	* Paste a selection direct to the command fd	2705	* Paste a selection direct to the command fd
…		…
2684	for (unsigned int i = 0; i < len; i++)	2711	for (unsigned int i = 0; i < len; i++)
2685	if (data[i] == C0_LF)	2712	if (data[i] == C0_LF)
2686	data[i] = C0_CR;	2713	data[i] = C0_CR;
2687		2714
2688	if (priv_modes & PrivMode_BracketPaste)	2715	if (priv_modes & PrivMode_BracketPaste)
2689	tt_printf ("\e[200~");	2716	tt_printf ("\x1b[200~");
2690		2717
2691	tt_write (data, len);	2718	tt_write (data, len);
2692		2719
2693	if (priv_modes & PrivMode_BracketPaste)	2720	if (priv_modes & PrivMode_BracketPaste)
2694	tt_printf ("\e[201~");	2721	tt_printf ("\x1b[201~");
2695	}	2722	}
2696		2723
2697	void	2724	void
2698	rxvt_term::paste (char *data, unsigned int len) NOTHROW	2725	rxvt_term::paste (char *data, unsigned int len) NOTHROW
2699	{	2726	{
…		…
2703	tt_paste (data, len);	2730	tt_paste (data, len);
2704	}	2731	}
2705		2732
2706	/* ------------------------------------------------------------------------- */	2733	/* ------------------------------------------------------------------------- */
2707	/*	2734	/*
2708	* Respond to a notification that a primary selection has been sent	2735	* Request PRIMARY, SECONDARY or CLIPBOARD selection.
2709	* EXT: SelectionNotify	2736	* if the requested selection has no owner or is empty CUT_BUFFER0 is used
2710	*/	2737	* as fallback
2711	void
2712	rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2713	{
2714	if (prop == None) /* check for failed XConvertSelection */
2715	{
2716	if ((selection_type & Sel_CompoundText))
2717	{
2718	int selnum = selection_type & Sel_whereMask;
2719
2720	selection_type = 0;
2721	if (selnum != Sel_direct)
2722	selection_request_other (XA_STRING, selnum);
2723	}
2724
2725	if ((selection_type & Sel_UTF8String))
2726	{
2727	int selnum = selection_type & Sel_whereMask;
2728
2729	selection_type = Sel_CompoundText;
2730	if (selnum != Sel_direct)
2731	selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2732	else
2733	selection_type = 0;
2734	}
2735
2736	return;
2737	}
2738
2739	unsigned long bytes_after;
2740	XTextProperty ct;
2741
2742	if (XGetWindowProperty (dpy, win, prop,
2743	0, PROP_SIZE / 4,
2744	delete_prop, AnyPropertyType,
2745	&ct.encoding, &ct.format,
2746	&ct.nitems, &bytes_after,
2747	&ct.value) != Success)
2748	{
2749	ct.value = 0;
2750	goto bailout;
2751	}
2752
2753	if (ct.encoding == None)
2754	goto bailout;
2755
2756	if (bytes_after)
2757	{
2758	// fetch and append remaining data
2759	XTextProperty ct2;
2760
2761	if (XGetWindowProperty (dpy, win, prop,
2762	ct.nitems / 4, (bytes_after + 3) / 4,
2763	delete_prop, AnyPropertyType,
2764	&ct2.encoding, &ct2.format,
2765	&ct2.nitems, &bytes_after,
2766	&ct2.value) != Success)
2767	goto bailout;
2768
2769	// realloc should be compatible to XFree, here, and elsewhere, too
2770	ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2771	memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2772	ct.nitems += ct2.nitems;
2773
2774	XFree (ct2.value);
2775	}
2776
2777	if (ct.value == 0)
2778	goto bailout;
2779
2780	if (ct.encoding == xa[XA_INCR])
2781	{
2782	// INCR selection, start handshake
2783	if (!delete_prop)
2784	XDeleteProperty (dpy, win, prop);
2785
2786	selection_wait = Sel_incr;
2787	incr_buf_fill = 0;
2788	incr_ev.start (10);
2789
2790	goto bailout;
2791	}
2792
2793	if (ct.nitems == 0)
2794	{
2795	if (selection_wait == Sel_incr)
2796	{
2797	XFree (ct.value);
2798
2799	// finally complete, now paste the whole thing
2800	selection_wait = Sel_normal;
2801	ct.value = (unsigned char *)incr_buf;
2802	ct.nitems = incr_buf_fill;
2803	incr_buf = 0;
2804	incr_buf_size = 0;
2805	incr_ev.stop ();
2806	}
2807	else
2808	{
2809	if (selection_wait == Sel_normal
2810	&& (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2811	{
2812	/*
2813	* pass through again trying CUT_BUFFER0 if we've come from
2814	* XConvertSelection () but nothing was presented
2815	*/
2816	selection_paste (display->root, XA_CUT_BUFFER0, False);
2817	}
2818
2819	goto bailout;
2820	}
2821	}
2822	else if (selection_wait == Sel_incr)
2823	{
2824	incr_ev.start (10);
2825
2826	while (incr_buf_fill + ct.nitems > incr_buf_size)
2827	{
2828	incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2829	incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2830	}
2831
2832	memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2833	incr_buf_fill += ct.nitems;
2834
2835	goto bailout;
2836	}
2837
2838	char **cl;
2839	int cr;
2840
2841	#if !ENABLE_MINIMAL
2842	// xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2843	// so recode it manually
2844	if (ct.encoding == xa[XA_UTF8_STRING])
2845	{
2846	wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2847	char *s = rxvt_wcstombs (w);
2848	free (w);
2849	// TODO: strlen == only the first element will be converted. well...
2850	paste (s, strlen (s));
2851	free (s);
2852	}
2853	else
2854	#endif
2855	if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2856	&& cl)
2857	{
2858	for (int i = 0; i < cr; i++)
2859	paste (cl[i], strlen (cl[i]));
2860
2861	XFreeStringList (cl);
2862	}
2863	else
2864	paste ((char *)ct.value, ct.nitems); // paste raw
2865
2866	bailout:
2867	XFree (ct.value);
2868
2869	if (selection_wait == Sel_normal)
2870	selection_wait = Sel_none;
2871	}
2872
2873	void
2874	rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2875	{
2876	selection_wait = Sel_none;
2877
2878	incr_buf_size = 0;
2879	free (incr_buf);
2880
2881	rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2882	}
2883
2884	void
2885	rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2886	{
2887	if (prop == None || selection_wait != Sel_incr)
2888	return;
2889
2890	selection_paste (win, prop, true);
2891	}
2892
2893	/* ------------------------------------------------------------------------- */
2894	/*
2895	* Request the current selection:
2896	* Order: > internal selection if available
2897	* > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2898	* > CUT_BUFFER0
2899	* (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2900	* will auto fallback to CUT_BUFFER0
2901	* EXT: button 2 release	2738	* EXT: button 2 release
2902	*/	2739	*/
2903	void	2740	void
2904	rxvt_term::selection_request (Time tm, int selnum) NOTHROW	2741	rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2905	{	2742	{
2906	if (selection.text && selnum == Sel_Primary)	2743	if (!selection_req)
2907	{
2908	/* internal selection */
2909	char *str = rxvt_wcstombs (selection.text, selection.len);
2910	paste (str, strlen (str));
2911	free (str);
2912	return;
2913	}	2744	{
2914	else	2745	selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
		2746	selection_req->run ();
2915	{	2747	}
2916	selection_request_time = tm;
2917	selection_wait = Sel_normal;
2918
2919	#if X_HAVE_UTF8_STRING
2920	selection_type = Sel_UTF8String;
2921	if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2922	return;
2923	#else
2924	selection_type = Sel_CompoundText;
2925	if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2926	return;
2927	#endif
2928	}
2929
2930	selection_wait = Sel_none; /* don't loop in selection_paste () */
2931	selection_paste (display->root, XA_CUT_BUFFER0, false);
2932	}
2933
2934	int
2935	rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2936	{
2937	Atom sel;
2938
2939	selection_type |= selnum;
2940
2941	if (selnum == Sel_Primary)
2942	sel = XA_PRIMARY;
2943	else if (selnum == Sel_Secondary)
2944	sel = XA_SECONDARY;
2945	else
2946	sel = xa[XA_CLIPBOARD];
2947
2948	if (XGetSelectionOwner (dpy, sel) != None)
2949	{
2950	XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2951	vt, selection_request_time);
2952	return 1;
2953	}
2954
2955	return 0;
2956	}	2748	}
2957		2749
2958	/* ------------------------------------------------------------------------- */	2750	/* ------------------------------------------------------------------------- */
2959	/*	2751	/*
2960	* Clear all selected text	2752	* Clear all selected text
…		…
2991	* EXT: button 1 or 3 release	2783	* EXT: button 1 or 3 release
2992	*/	2784	*/
2993	void	2785	void
2994	rxvt_term::selection_make (Time tm)	2786	rxvt_term::selection_make (Time tm)
2995	{	2787	{
2996	int i;	2788	int size;
2997	wchar_t *new_selection_text;	2789	wchar_t *new_selection_text;
2998	text_t *t;	2790	text_t *t;
2999		2791
3000	switch (selection.op)	2792	switch (selection.op)
3001	{	2793	{
…		…
3017	return; /* nothing selected, go away */	2809	return; /* nothing selected, go away */
3018		2810
3019	if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))	2811	if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
3020	return;	2812	return;
3021		2813
3022	i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);	2814	size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
3023	new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));	2815	new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
3024		2816
3025	int ofs = 0;	2817	int ofs = 0;
3026	int extra = 0;	2818	int extra = 0;
3027		2819
3028	int col = selection.beg.col;	2820	int col = selection.beg.col;
…		…
3034	{	2826	{
3035	#if !ENABLE_MINIMAL	2827	#if !ENABLE_MINIMAL
3036	if (selection.rect)	2828	if (selection.rect)
3037	{	2829	{
3038	col = selection.beg.col;	2830	col = selection.beg.col;
3039	end_col = ncol + 1;	2831	end_col = selection.end.col;
3040	}	2832	}
3041	else	2833	else
3042	#endif	2834	#endif
3043	end_col = ROW(row).l;	2835	end_col = ROW(row).l;
3044		2836
3045	col = max (col, 0);	2837	col = max (col, 0);
3046		2838
3047	if (row == selection.end.row	2839	if (row == selection.end.row)
3048	#if !ENABLE_MINIMAL
3049	|| selection.rect
3050	#endif
3051	)
3052	min_it (end_col, selection.end.col);	2840	min_it (end_col, selection.end.col);
3053		2841
3054	t = ROW(row).t + col;	2842	t = ROW(row).t + col;
3055		2843
3056	for (; col < end_col; col++)	2844	for (; col < end_col; col++)
…		…
3064		2852
3065	extra -= (len - 1);	2853	extra -= (len - 1);
3066		2854
3067	if (extra < 0)	2855	if (extra < 0)
3068	{	2856	{
3069	extra += i;	2857	extra += size;
3070	i += i;	2858	size += size;
3071	new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t));	2859	new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3072	}	2860	}
3073		2861
3074	ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);	2862	ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3075	}	2863	}
3076	#endif	2864	#endif
…		…
3088		2876
3089	new_selection_text[ofs++] = C0_LF;	2877	new_selection_text[ofs++] = C0_LF;
3090	}	2878	}
3091	else	2879	else
3092	#endif	2880	#endif
3093	if (!ROW(row).is_longer () && row != selection.end.row)	2881	if (!ROW(row).is_longer ()
		2882	&& (row != selection.end.row || end_col != selection.end.col)
		2883	&& (row != selection.beg.row || selection.beg.col < ncol))
3094	new_selection_text[ofs++] = C0_LF;	2884	new_selection_text[ofs++] = C0_LF;
3095	}	2885	}
3096
3097	if (end_col != selection.end.col)
3098	new_selection_text[ofs++] = C0_LF;
3099		2886
3100	new_selection_text[ofs] = 0;	2887	new_selection_text[ofs] = 0;
3101		2888
3102	if (ofs == 0)	2889	if (ofs == 0)
3103	{	2890	{
…		…
3159	/* ------------------------------------------------------------------------- */	2946	/* ------------------------------------------------------------------------- */
3160	/*	2947	/*
3161	* Mark or select text based upon number of clicks: 1, 2, or 3	2948	* Mark or select text based upon number of clicks: 1, 2, or 3
3162	* EXT: button 1 press	2949	* EXT: button 1 press
3163	*/	2950	*/
3164	void	2951	void ecb_cold
3165	rxvt_term::selection_click (int clicks, int x, int y) NOTHROW	2952	rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3166	{	2953	{
3167	clicks = ((clicks - 1) % 3) + 1;	2954	clicks = ((clicks - 1) % 3) + 1;
3168	selection.clicks = clicks; /* save clicks so extend will work */	2955	selection.clicks = clicks; /* save clicks so extend will work */
3169		2956
…		…
3188		2975
3189	/* ------------------------------------------------------------------------- */	2976	/* ------------------------------------------------------------------------- */
3190	/*	2977	/*
3191	* Mark a selection at the specified col/row	2978	* Mark a selection at the specified col/row
3192	*/	2979	*/
3193	void	2980	void ecb_cold
3194	rxvt_term::selection_start_colrow (int col, int row) NOTHROW	2981	rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3195	{	2982	{
3196	want_refresh = 1;	2983	want_refresh = 1;
3197		2984
3198	selection.mark.row = row + view_start;	2985	selection.mark.row = row + view_start;
…		…
3225	/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */	3012	/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3226	#define DELIMIT_TEXT(x) \	3013	#define DELIMIT_TEXT(x) \
3227	(unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))	3014	(unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3228	#define DELIMIT_REND(x) 1	3015	#define DELIMIT_REND(x) 1
3229		3016
3230	void	3017	void ecb_cold
3231	rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW	3018	rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3232	{	3019	{
3233	int col, row, dirnadd, tcol, trow, w1, w2;	3020	int col, row, dirnadd, tcol, trow, w1, w2;
3234	row_col_t bound;	3021	row_col_t bound;
3235	text_t *stp;	3022	text_t *stp;
…		…
3309	* EXT: button 3 press; button 1 or 3 drag	3096	* EXT: button 3 press; button 1 or 3 drag
3310	* flag == 0 ==> button 1	3097	* flag == 0 ==> button 1
3311	* flag == 1 ==> button 3 press	3098	* flag == 1 ==> button 3 press
3312	* flag == 2 ==> button 3 motion	3099	* flag == 2 ==> button 3 motion
3313	*/	3100	*/
3314	void	3101	void ecb_cold
3315	rxvt_term::selection_extend (int x, int y, int flag) NOTHROW	3102	rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3316	{	3103	{
3317	int col = clamp (Pixel2Col (x), 0, ncol);	3104	int col = clamp (Pixel2Col (x), 0, ncol);
3318	int row = clamp (Pixel2Row (y), 0, nrow - 1);	3105	int row = clamp (Pixel2Row (y), 0, nrow - 1);
3319		3106
…		…
3345		3132
3346	/* ------------------------------------------------------------------------- */	3133	/* ------------------------------------------------------------------------- */
3347	/*	3134	/*
3348	* Extend the selection to the specified col/row	3135	* Extend the selection to the specified col/row
3349	*/	3136	*/
3350	void	3137	void ecb_cold
3351	rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW	3138	rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3352	{	3139	{
3353	row_col_t pos;	3140	row_col_t pos;
3354	enum {	3141	enum {
3355	LEFT, RIGHT	3142	LEFT, RIGHT
…		…
3546	::swap (selection.beg.col, selection.end.col);	3333	::swap (selection.beg.col, selection.end.col);
3547	#endif	3334	#endif
3548	}	3335	}
3549		3336
3550	#if !ENABLE_MINIMAL	3337	#if !ENABLE_MINIMAL
3551	void	3338	void ecb_cold
3552	rxvt_term::selection_remove_trailing_spaces () NOTHROW	3339	rxvt_term::selection_remove_trailing_spaces () NOTHROW
3553	{	3340	{
3554	int32_t end_col, end_row;	3341	int32_t end_col, end_row;
3555	text_t *stp;	3342	text_t *stp;
3556		3343
…		…
3594	/* ------------------------------------------------------------------------- */	3381	/* ------------------------------------------------------------------------- */
3595	/*	3382	/*
3596	* Double click on button 3 when already selected	3383	* Double click on button 3 when already selected
3597	* EXT: button 3 double click	3384	* EXT: button 3 double click
3598	*/	3385	*/
3599	void	3386	void ecb_cold
3600	rxvt_term::selection_rotate (int x, int y) NOTHROW	3387	rxvt_term::selection_rotate (int x, int y) NOTHROW
3601	{	3388	{
3602	selection.clicks = selection.clicks % 3 + 1;	3389	selection.clicks = selection.clicks % 3 + 1;
3603	selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);	3390	selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3604	}	3391	}
…		…
3606	/* ------------------------------------------------------------------------- */	3393	/* ------------------------------------------------------------------------- */
3607	/*	3394	/*
3608	* Respond to a request for our current selection	3395	* Respond to a request for our current selection
3609	* EXT: SelectionRequest	3396	* EXT: SelectionRequest
3610	*/	3397	*/
3611	void	3398	void ecb_cold
3612	rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW	3399	rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3613	{	3400	{
		3401	Atom property = rq.property == None ? rq.target : rq.property;
3614	XSelectionEvent ev;	3402	XSelectionEvent ev;
3615		3403
3616	ev.type = SelectionNotify;	3404	ev.type = SelectionNotify;
3617	ev.property = None;	3405	ev.property = None;
3618	ev.display = rq.display;	3406	ev.display = rq.display;
…		…
3633	*target++ = xa[XA_COMPOUND_TEXT];	3421	*target++ = xa[XA_COMPOUND_TEXT];
3634	#if X_HAVE_UTF8_STRING	3422	#if X_HAVE_UTF8_STRING
3635	*target++ = xa[XA_UTF8_STRING];	3423	*target++ = xa[XA_UTF8_STRING];
3636	#endif	3424	#endif
3637		3425
3638	XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,	3426	XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3639	32, PropModeReplace,	3427	32, PropModeReplace,
3640	(unsigned char *)target_list, target - target_list);	3428	(unsigned char *)target_list, target - target_list);
3641	ev.property = rq.property;	3429	ev.property = property;
3642	}	3430	}
3643	#if TODO // TODO	3431	#if TODO // TODO
3644	else if (rq.target == xa[XA_MULTIPLE])	3432	else if (rq.target == xa[XA_MULTIPLE])
3645	{	3433	{
3646	/* TODO: Handle MULTIPLE */	3434	/* TODO: Handle MULTIPLE */
3647	}	3435	}
3648	#endif	3436	#endif
3649	else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)	3437	else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3650	{	3438	{
3651	XChangeProperty (dpy, rq.requestor, rq.property, rq.target,	3439	XChangeProperty (dpy, rq.requestor, property, rq.target,
3652	32, PropModeReplace, (unsigned char *)&selection_time, 1);	3440	32, PropModeReplace, (unsigned char *)&selection_time, 1);
3653	ev.property = rq.property;	3441	ev.property = property;
3654	}	3442	}
3655	else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)	3443	else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3656	{	3444	{
3657	XChangeProperty (dpy, rq.requestor, rq.property, rq.target,	3445	XChangeProperty (dpy, rq.requestor, property, rq.target,
3658	32, PropModeReplace, (unsigned char *)&clipboard_time, 1);	3446	32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3659	ev.property = rq.property;	3447	ev.property = property;
3660	}	3448	}
3661	else if (rq.target == XA_STRING	3449	else if (rq.target == XA_STRING
3662	|| rq.target == xa[XA_TEXT]	3450	|| rq.target == xa[XA_TEXT]
3663	|| rq.target == xa[XA_COMPOUND_TEXT]	3451	|| rq.target == xa[XA_COMPOUND_TEXT]
3664	|| rq.target == xa[XA_UTF8_STRING]	3452	|| rq.target == xa[XA_UTF8_STRING]
…		…
3735	ct.value = (unsigned char *)cl;	3523	ct.value = (unsigned char *)cl;
3736	ct.nitems = selectlen;	3524	ct.nitems = selectlen;
3737	ct.encoding = target;	3525	ct.encoding = target;
3738	}	3526	}
3739		3527
3740	XChangeProperty (dpy, rq.requestor, rq.property,	3528	XChangeProperty (dpy, rq.requestor, property,
3741	ct.encoding, 8, PropModeReplace,	3529	ct.encoding, 8, PropModeReplace,
3742	ct.value, (int)ct.nitems);	3530	ct.value, (int)ct.nitems);
3743	ev.property = rq.property;	3531	ev.property = property;
3744		3532
3745	if (freect)	3533	if (freect)
3746	XFree (ct.value);	3534	XFree (ct.value);
3747	}	3535	}
3748		3536
3749	XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);	3537	XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3750	}	3538	}
3751		3539
3752	/* ------------------------------------------------------------------------- */	3540	/* ------------------------------------------------------------------------- */
3753	#ifdef USE_XIM	3541	#if USE_XIM
3754	void	3542	void ecb_cold
3755	rxvt_term::im_set_position (XPoint &pos) NOTHROW	3543	rxvt_term::im_set_position (XPoint &pos) NOTHROW
3756	{	3544	{
3757	XWindowAttributes xwa;	3545	XWindowAttributes xwa;
3758		3546
3759	XGetWindowAttributes (dpy, vt, &xwa);	3547	XGetWindowAttributes (dpy, vt, &xwa);

Diff Legend

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