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.345 by sf-exg, Sat Jul 24 10:20:26 2010 UTC vs.
Revision 1.419 by root, Fri Jun 1 08:12: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 seperate 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 = rxvt_malloc (chunk_size);
		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	line_t *prev_drawn_buf = drawn_buf;
		231	line_t *prev_swap_buf = swap_buf;
		232	line_t *prev_row_buf = row_buf;
		233
		234	int common_col = min (prev_ncol, ncol);
		235
		236	scr_alloc ();
		237
193	if (!row_buf)	238	if (!prev_row_buf)
194	{	239	{
195	/*	240	/*
196	* first time called so just malloc everything: don't rely on realloc	241	* first time called (or after scr_release) so just malloc everything: don't rely on realloc
197	*/	242	*/
198	top_row = 0;	243	top_row = 0;
199	term_start = 0;	244	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		245
215	memset (charsets, 'B', sizeof (charsets));	246	memset (charsets, 'B', sizeof (charsets));
216	rstyle = DEFAULT_RSTYLE;	247	rstyle = DEFAULT_RSTYLE;
217	screen.flags = Screen_DefaultFlags;	248	screen.flags = Screen_DefaultFlags;
218	screen.cur.row = screen.cur.col = 0;	249	screen.cur.row = screen.cur.col = 0;
…		…
241	{	272	{
242	/*	273	/*
243	* add or delete rows as appropriate	274	* add or delete rows as appropriate
244	*/	275	*/
245		276
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--; )	277	for (int row = min (nrow, prev_nrow); row--; )
264	{	278	{
265	lresize (drawn_buf[row]);	279	scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
266	lresize (swap_buf [row]);	280	scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
267	}
268		281
269	for (int row = prev_nrow; row < nrow; row++)	282	memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
		283	memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
		284	memcpy (swap_buf [row].t, prev_swap_buf [row].t, sizeof (text_t) * common_col);
		285	memcpy (swap_buf [row].r, prev_swap_buf [row].r, sizeof (rend_t) * common_col);
270	{	286	}
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		287
278	int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row	288	int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
279	int pend = MOD (term_start + top_row , prev_total_rows);	289	int pend = MOD (term_start + top_row , prev_total_rows);
280	int q = total_rows; // rewrapped row	290	int q = total_rows; // rewrapped row
281		291
…		…
289	ocur.row = MOD (term_start + ocur.row, prev_total_rows);	299	ocur.row = MOD (term_start + ocur.row, prev_total_rows);
290		300
291	do	301	do
292	{	302	{
293	p = MOD (p - 1, prev_total_rows);	303	p = MOD (p - 1, prev_total_rows);
294	assert (old_buf [MOD (p, prev_total_rows)].t);	304	assert (prev_row_buf [MOD (p, prev_total_rows)].t);
295	int plines = 1;	305	int plines = 1;
296	int llen = old_buf [MOD (p, prev_total_rows)].l;	306	int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
297		307
298	while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())	308	while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ())
299	{	309	{
300	p = MOD (p - 1, prev_total_rows);	310	p = MOD (p - 1, prev_total_rows);
301		311
302	plines++;	312	plines++;
303	llen += prev_ncol;	313	llen += prev_ncol;
…		…
316		326
317	// re-assemble the full line by destination lines	327	// re-assemble the full line by destination lines
318	for (int qrow = q; qlines--; qrow++)	328	for (int qrow = q; qlines--; qrow++)
319	{	329	{
320	qline = row_buf + qrow;	330	qline = row_buf + qrow;
321	lalloc (*qline);	331	qline->alloc (); // redundant with next line
322	qline->l = ncol;	332	qline->l = ncol;
323	qline->is_longer (1);	333	qline->is_longer (1);
324		334
325	int qcol = 0;	335	int qcol = 0;
326		336
…		…
341	// this seems to upset applications/shells/readline	351	// this seems to upset applications/shells/readline
342	// least.	352	// least.
343	if (prow == ocur.row)	353	if (prow == ocur.row)
344	screen.cur.row = q - (total_rows - nrow);	354	screen.cur.row = q - (total_rows - nrow);
345		355
346	line_t &pline = old_buf [prow];	356	line_t &pline = prev_row_buf [prow];
347		357
348	int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);	358	int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
349		359
350	memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));	360	memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
351	memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));	361	memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
…		…
372	{	382	{
373	// if no scrollback exists (yet), wing, instead of wrap	383	// if no scrollback exists (yet), wing, instead of wrap
374		384
375	for (int row = min (nrow, prev_nrow); row--; )	385	for (int row = min (nrow, prev_nrow); row--; )
376	{	386	{
377	line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];	387	line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
378	line_t &qline = row_buf [row];	388	line_t &dst = row_buf [row];
379		389
380	qline = pline;	390	scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
381	lresize (qline);	391
		392	memcpy (dst.t, src.t, sizeof (text_t) * common_col);
		393	memcpy (dst.r, src.r, sizeof (rend_t) * common_col);
382	}	394	}
383		395
384	for (int row = prev_nrow; row < nrow; row++)	396	for (int row = prev_nrow; row < nrow; row++)
385	{
386	row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);	397	scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
387	}
388		398
389	term_start = 0;	399	term_start = 0;
390	}	400	}
391
392	free (old_buf);
393	delete old_ta;
394	delete old_ra;
395		401
396	clamp_it (screen.cur.row, 0, nrow - 1);	402	clamp_it (screen.cur.row, 0, nrow - 1);
397	clamp_it (screen.cur.col, 0, ncol - 1);	403	clamp_it (screen.cur.col, 0, ncol - 1);
398	}	404	}
399		405
		406	for (int row = nrow; row--; )
		407	{
		408	if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
		409	if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
		410	if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
		411	}
		412
		413	free (prev_chunk);
		414
400	free (tabs);	415	free (tabs);
401	tabs = (char *)rxvt_malloc (ncol);	416	tabs = (char *)rxvt_malloc (ncol);
402		417
403	for (int col = ncol; --col; )	418	for (int col = ncol; col--; )
404	tabs [col] = col % TABSIZE == 0;	419	tabs [col] = col % TABSIZE == 0;
405		420
406	CLEAR_ALL_SELECTION ();	421	CLEAR_ALL_SELECTION ();
407		422
408	prev_nrow = nrow;	423	prev_nrow = nrow;
…		…
411	tt_winch ();	426	tt_winch ();
412		427
413	HOOK_INVOKE ((this, HOOK_RESET, DT_END));	428	HOOK_INVOKE ((this, HOOK_RESET, DT_END));
414	}	429	}
415		430
416	/* ------------------------------------------------------------------------- */	431	void ecb_cold
417	/*
418	* Free everything. That way malloc debugging can find leakage.
419	*/
420	void
421	rxvt_term::scr_release () NOTHROW	432	rxvt_term::scr_release () NOTHROW
422	{	433	{
423	if (row_buf)	434	free (chunk); chunk = 0; row_buf = 0;
424	{	435	free (tabs); tabs = 0;
425	delete talloc; talloc = 0;
426	delete ralloc; ralloc = 0;
427
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);
434	tabs = 0;
435	}
436	}	436	}
437		437
438	/* ------------------------------------------------------------------------- */	438	/* ------------------------------------------------------------------------- */
439	/*	439	/*
440	* Hard/Soft reset	440	* Hard/Soft reset
441	*/	441	*/
442	void	442	void ecb_cold
443	rxvt_term::scr_poweron ()	443	rxvt_term::scr_poweron ()
444	{	444	{
445	scr_release ();	445	scr_release ();
		446
446	prev_nrow = prev_ncol = 0;	447	prev_nrow = prev_ncol = 0;
447	rvideo_mode = false;	448	rvideo_mode = false;
448	scr_soft_reset ();	449	scr_soft_reset ();
449	scr_reset ();	450	scr_reset ();
450		451
451	scr_clear (true);	452	scr_clear (true);
452	scr_refresh ();	453	scr_refresh ();
453	}	454	}
454		455
455	void	456	void ecb_cold
456	rxvt_term::scr_soft_reset ()	457	rxvt_term::scr_soft_reset () NOTHROW
457	{	458	{
458	/* only affects modes, nothing drastic such as clearing the screen */	459	/* only affects modes, nothing drastic such as clearing the screen */
459	#if ENABLE_OVERLAY	460	#if ENABLE_OVERLAY
460	scr_overlay_off ();	461	scr_overlay_off ();
461	#endif	462	#endif
…		…
516	assert (s->cur.row >= 0);	517	assert (s->cur.row >= 0);
517	assert (s->cur.col >= 0);	518	assert (s->cur.col >= 0);
518	}	519	}
519		520
520	void	521	void
521	rxvt_term::scr_swap_screen ()	522	rxvt_term::scr_swap_screen () NOTHROW
522	{	523	{
523	if (!option (Opt_secondaryScreen))	524	if (!option (Opt_secondaryScreen))
524	return;	525	return;
525		526
526	for (int i = prev_nrow; i--; )	527	for (int i = prev_nrow; i--; )
…		…
545	return;	546	return;
546		547
547	want_refresh = 1;	548	want_refresh = 1;
548	view_start = 0;	549	view_start = 0;
549		550
550	selection_check (2); /* check for boundary cross */	551	/* check for boundary cross */
		552	row_col_t pos;
		553	pos.row = pos.col = 0;
		554	if (ROWCOL_IS_BEFORE (selection.beg, pos)
		555	&& ROWCOL_IS_AFTER (selection.end, pos))
		556	CLEAR_SELECTION ();
551		557
552	current_screen = scrn;	558	current_screen = scrn;
553		559
554	#if NSCREENS	560	#if NSCREENS
555	if (option (Opt_secondaryScreen))	561	if (option (Opt_secondaryScreen))
…		…
621	/*	627	/*
622	* Scroll text between <row1> and <row2> inclusive, by <count> lines	628	* Scroll text between <row1> and <row2> inclusive, by <count> lines
623	* count positive ==> scroll up	629	* count positive ==> scroll up
624	* count negative ==> scroll down	630	* count negative ==> scroll down
625	*/	631	*/
626	int	632	int ecb_hot
627	rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW	633	rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
628	{	634	{
629	if (count == 0 || (row1 > row2))	635	if (count == 0 || (row1 > row2))
630	return 0;	636	return 0;
631		637
…		…
634		640
635	if (count > 0	641	if (count > 0
636	&& row1 == 0	642	&& row1 == 0
637	&& (current_screen == PRIMARY || option (Opt_secondaryScroll)))	643	&& (current_screen == PRIMARY || option (Opt_secondaryScroll)))
638	{	644	{
		645	min_it (count, total_rows - (nrow - (row2 + 1)));
		646
639	top_row = max (top_row - count, -saveLines);	647	top_row = max (top_row - count, -saveLines);
640
641	// scroll everything up 'count' lines
642	term_start = (term_start + count) % total_rows;
643		648
644	// sever bottommost line	649	// sever bottommost line
645	{	650	{
646	line_t &l = ROW(row2 - count);	651	line_t &l = ROW(row2);
647	l.is_longer (0);	652	l.is_longer (0);
648	l.touch ();	653	l.touch ();
649	}	654	}
650		655
		656	// scroll everything up 'count' lines
		657	term_start = (term_start + count) % total_rows;
		658
		659	// now copy lines below the scroll region bottom to the
		660	// bottom of the screen again, so they look as if they
		661	// hadn't moved.
		662	for (int i = nrow; --i > row2; )
		663	{
		664	line_t &l1 = ROW(i - count);
		665	line_t &l2 = ROW(i);
		666
		667	::swap (l1, l2);
		668	l2.touch ();
		669	}
		670
651	// erase newly scrolled-in lines	671	// erase newly scrolled-in lines
652	for (int i = count; i--; )	672	for (int i = count; i--; )
653	{	673	{
654	line_t &l = ROW(nrow - 1 - i);	674	line_t &l = ROW(row2 - i);
655		675
656	// optimize if already cleared, can be significant on slow machines	676	// optimise if already cleared, can be significant on slow machines
657	// could be rolled into scr_blank_screen_mem	677	// 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)))	678	if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
659	{	679	{
660	scr_blank_line (l, 0, l.l, rstyle);	680	scr_blank_line (l, 0, l.l, rstyle);
661	l.l = 0;	681	l.l = 0;
…		…
663	}	683	}
664	else	684	else
665	scr_blank_screen_mem (l, rstyle);	685	scr_blank_screen_mem (l, rstyle);
666	}	686	}
667		687
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	688	// move and/or clear selection, if any
681	if (selection.op && current_screen == selection.screen)	689	if (selection.op && current_screen == selection.screen
		690	&& selection.beg.row <= row2)
682	{	691	{
683	selection.beg.row -= count;	692	selection.beg.row -= count;
684	selection.end.row -= count;	693	selection.end.row -= count;
685	selection.mark.row -= count;	694	selection.mark.row -= count;
686		695
687	if (selection.beg.row < top_row	696	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	}	697	}
695		698
696	// finally move the view window, if desired	699	// finally move the view window, if desired
697	if (option (Opt_scrollWithBuffer)	700	if (option (Opt_scrollWithBuffer)
698	&& view_start != 0	701	&& view_start != 0
…		…
728	}	731	}
729		732
730	// use a simple and robust scrolling algorithm, this	733	// use a simple and robust scrolling algorithm, this
731	// part of scr_scroll_text is not time-critical.	734	// part of scr_scroll_text is not time-critical.
732		735
		736	// sever line above scroll region
		737	if (row1)
		738	{
		739	line_t &l = ROW(row1 - 1);
		740	l.is_longer (0);
		741	l.touch ();
		742	}
		743
733	int rows = row2 - row1 + 1;	744	int rows = row2 - row1 + 1;
734		745
735	min_it (count, rows);	746	min_it (count, rows);
736		747
737	line_t *temp_buf = row_buf + total_rows;	748	line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
738		749
739	for (int row = 0; row < rows; row++)	750	for (int row = 0; row < rows; row++)
740	{	751	{
741	temp_buf [row] = ROW(row1 + (row + count + rows) % rows);	752	temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
742		753
…		…
744	scr_blank_screen_mem (temp_buf [row], rstyle);	755	scr_blank_screen_mem (temp_buf [row], rstyle);
745	}	756	}
746		757
747	for (int row = 0; row < rows; row++)	758	for (int row = 0; row < rows; row++)
748	ROW(row1 + row) = temp_buf [row];	759	ROW(row1 + row) = temp_buf [row];
		760
		761	// sever bottommost line
		762	{
		763	line_t &l = ROW(row2);
		764	l.is_longer (0);
		765	l.touch ();
		766	}
749	}	767	}
750		768
751	return count;	769	return count;
752	}	770	}
753		771
754	/* ------------------------------------------------------------------------- */	772	/* ------------------------------------------------------------------------- */
755	/*	773	/*
756	* Add text given in <str> of length <len> to screen struct	774	* Add text given in <str> of length <len> to screen struct
757	*/	775	*/
758	void	776	void ecb_hot
759	rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW	777	rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
760	{	778	{
761	if (len <= 0) /* sanity */	779	if (len <= 0) /* sanity */
762	return;	780	return;
763		781
764	unsigned char checksel;	782	bool checksel;
765	unicode_t c;	783	unicode_t c;
766	int ncol = this->ncol;	784	int ncol = this->ncol;
767	const wchar_t *strend = str + len;	785	const wchar_t *strend = str + len;
768		786
769	want_refresh = 1;	787	want_refresh = 1;
…		…
795		813
796	while (str < strend)	814	while (str < strend)
797	{	815	{
798	c = (unicode_t)*str++; // convert to rxvt-unicodes representation	816	c = (unicode_t)*str++; // convert to rxvt-unicodes representation
799		817
800	if (expect_false (c < 0x20))	818	if (ecb_unlikely (c < 0x20))
801	if (c == C0_LF)	819	if (c == C0_LF)
802	{	820	{
803	max_it (line->l, screen.cur.col);	821	max_it (line->l, screen.cur.col);
804		822
805	screen.flags &= ~Screen_WrapNext;	823	screen.flags &= ~Screen_WrapNext;
…		…
824	{	842	{
825	scr_tab (1, true);	843	scr_tab (1, true);
826	continue;	844	continue;
827	}	845	}
828		846
829	if (expect_false (	847	if (ecb_unlikely (
830	checksel /* see if we're writing within selection */	848	checksel /* see if we're writing within selection */
831	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)	849	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
832	&& ROWCOL_IS_BEFORE (screen.cur, selection.end)	850	&& ROWCOL_IS_BEFORE (screen.cur, selection.end)
833	))	851	))
834	{	852	{
…		…
839	* should be a similar check.	857	* should be a similar check.
840	*/	858	*/
841	CLEAR_SELECTION ();	859	CLEAR_SELECTION ();
842	}	860	}
843		861
844	if (expect_false (screen.flags & Screen_WrapNext))	862	if (ecb_unlikely (screen.flags & Screen_WrapNext))
845	{	863	{
846	scr_do_wrap ();	864	scr_do_wrap ();
847		865
848	line->l = ncol;	866	line->l = ncol;
849	line->is_longer (1);	867	line->is_longer (1);
…		…
851	row = screen.cur.row;	869	row = screen.cur.row;
852	line = &ROW(row); /* _must_ refresh */	870	line = &ROW(row); /* _must_ refresh */
853	}	871	}
854		872
855	// some utf-8 decoders "decode" surrogate characters: let's fix this.	873	// some utf-8 decoders "decode" surrogate characters: let's fix this.
856	if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff)))	874	if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
857	c = 0xfffd;	875	c = 0xfffd;
858		876
859	// rely on wcwidth to tell us the character width, do wcwidth before	877	// rely on wcwidth to tell us the character width, do wcwidth before
860	// further replacements, as wcwidth might return -1 for the line	878	// further replacements, as wcwidth might return -1 for the line
861	// drawing characters below as they might be invalid in the current	879	// drawing characters below as they might be invalid in the current
862	// locale.	880	// locale.
863	int width = WCWIDTH (c);	881	int width = WCWIDTH (c);
864		882
865	if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL	883	if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
866	{	884	{
867	// vt100 special graphics and line drawing	885	// vt100 special graphics and line drawing
868	// 5f-7e standard vt100	886	// 5f-7e standard vt100
869	// 40-5e rxvt extension for extra curses acs chars	887	// 40-5e rxvt extension for extra curses acs chars
870	static uint16_t vt100_0[62] = { // 41 .. 7e	888	static uint16_t vt100_0[62] = { // 41 .. 7e
…		…
883	c = vt100_0[c - 0x41];	901	c = vt100_0[c - 0x41];
884	width = 1; // vt100 line drawing characters are always single-width	902	width = 1; // vt100 line drawing characters are always single-width
885	}	903	}
886	}	904	}
887		905
888	if (expect_false (screen.flags & Screen_Insert))	906	if (ecb_unlikely (screen.flags & Screen_Insert))
889	scr_insdel_chars (width, INSERT);	907	scr_insdel_chars (width, INSERT);
890		908
891	if (width != 0)	909	if (width != 0)
892	{	910	{
893	#if !UNICODE_3	911	#if !UNICODE_3
…		…
898	# else	916	# else
899	c = 0xfffd;	917	c = 0xfffd;
900	# endif	918	# endif
901	#endif	919	#endif
902		920
		921	rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
		922
		923	// if the character doesn't fit into the remaining columns...
		924	if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
		925	{
		926	if (screen.flags & Screen_Autowrap)
		927	{
		928	// ... artificially enlargen the previous one
		929	c = NOCHAR;
		930	// and try the same character next loop iteration
		931	--str;
		932	}
		933	else
		934	screen.cur.col = ncol - width;
		935	}
		936
903	// nuke the character at this position, if required	937	// nuke the character at this position, if required
904	if (expect_false (	938	// due to wonderful coincidences everywhere else in this loop
		939	// we never have to check for overwriting a wide char itself,
		940	// only its tail.
905	line->t[screen.cur.col] == NOCHAR	941	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);	942	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		943
922	line->touch ();	944	line->touch ();
923		945
924	do	946	do
925	{	947	{
926	line->t[screen.cur.col] = c;	948	line->t[screen.cur.col] = c;
927	line->r[screen.cur.col] = rend;	949	line->r[screen.cur.col] = rend;
928		950
929	if (expect_true (screen.cur.col < ncol - 1))	951	if (ecb_likely (screen.cur.col < ncol - 1))
930	screen.cur.col++;	952	screen.cur.col++;
931	else	953	else
932	{	954	{
933	line->l = ncol;	955	line->l = ncol;
934	if (screen.flags & Screen_Autowrap)	956	if (screen.flags & Screen_Autowrap)
935	screen.flags |= Screen_WrapNext;	957	screen.flags |= Screen_WrapNext;
936	break;	958
		959	goto end_of_line;
937	}	960	}
938		961
939	c = NOCHAR;	962	c = NOCHAR;
940	}	963	}
941	while (expect_false (--width > 0));	964	while (ecb_unlikely (--width > 0));
942		965
943	// pad with spaces when overwriting wide character with smaller one	966	// pad with spaces when overwriting wide character with smaller one
944	if (expect_false (!width))	967	for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
945	{	968	{
946	line->touch ();
947
948	for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
949	{
950	line->t[c] = ' ';	969	line->t[c] = ' ';
951	line->r[c] = rend;	970	line->r[c] = rend;
952	}
953	}	971	}
		972
		973	end_of_line:
		974	;
954	}	975	}
955	#if ENABLE_COMBINING	976	#if ENABLE_COMBINING
956	else // width == 0	977	else // width == 0
957	{	978	{
958	if (c != 0xfeff) // ignore BOM	979	if (c != 0xfeff) // ignore BOM
…		…
1021		1042
1022	want_refresh = 1;	1043	want_refresh = 1;
1023	#endif	1044	#endif
1024	}	1045	}
1025	}	1046	}
		1047	else if (screen.flags & Screen_WrapNext)
		1048	screen.flags &= ~Screen_WrapNext;
1026	else	1049	else
1027	scr_gotorc (0, -1, RELATIVE);	1050	scr_gotorc (0, -1, RELATIVE);
1028	}	1051	}
1029		1052
1030	/* ------------------------------------------------------------------------- */	1053	/* ------------------------------------------------------------------------- */
…		…
1108	* XTERM_SEQ: ESC 6	1131	* XTERM_SEQ: ESC 6
1109	* Move cursor left in row. If we're at the left boundary, shift everything	1132	* Move cursor left in row. If we're at the left boundary, shift everything
1110	* in that row right. Clear left column.	1133	* in that row right. Clear left column.
1111	*/	1134	*/
1112	#if !ENABLE_MINIMAL	1135	#if !ENABLE_MINIMAL
1113	void	1136	void ecb_cold
1114	rxvt_term::scr_backindex () NOTHROW	1137	rxvt_term::scr_backindex () NOTHROW
1115	{	1138	{
1116	if (screen.cur.col > 0)	1139	if (screen.cur.col > 0)
1117	scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);	1140	scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1118	else	1141	else
…		…
1125	* XTERM_SEQ: ESC 9	1148	* XTERM_SEQ: ESC 9
1126	* Move cursor right in row. If we're at the right boundary, shift everything	1149	* Move cursor right in row. If we're at the right boundary, shift everything
1127	* in that row left. Clear right column.	1150	* in that row left. Clear right column.
1128	*/	1151	*/
1129	#if !ENABLE_MINIMAL	1152	#if !ENABLE_MINIMAL
1130	void	1153	void ecb_cold
1131	rxvt_term::scr_forwardindex () NOTHROW	1154	rxvt_term::scr_forwardindex () NOTHROW
1132	{	1155	{
1133	if (screen.cur.col < ncol - 1)	1156	if (screen.cur.col < ncol - 1)
1134	scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);	1157	scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1135	else	1158	else
…		…
1286	scr_blank_line (line, col, num, rstyle);	1309	scr_blank_line (line, col, num, rstyle);
1287	}	1310	}
1288		1311
1289	/* ------------------------------------------------------------------------- */	1312	/* ------------------------------------------------------------------------- */
1290	/*	1313	/*
1291	* Erase part of whole of the screen	1314	* Erase part or whole of the screen
1292	* XTERM_SEQ: Clear screen after cursor : ESC [ 0 J	1315	* XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1293	* XTERM_SEQ: Clear screen before cursor: ESC [ 1 J	1316	* XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1294	* XTERM_SEQ: Clear whole screen : ESC [ 2 J	1317	* XTERM_SEQ: Clear whole screen : ESC [ 2 J
1295	*/	1318	*/
1296	void	1319	void
…		…
1305	ZERO_SCROLLBACK ();	1328	ZERO_SCROLLBACK ();
1306		1329
1307	switch (mode)	1330	switch (mode)
1308	{	1331	{
1309	case 0: /* erase to end of screen */	1332	case 0: /* erase to end of screen */
1310	selection_check (1);
1311	scr_erase_line (0);	1333	scr_erase_line (0);
1312	row = screen.cur.row + 1; /* possible OOB */	1334	row = screen.cur.row + 1; /* possible OOB */
1313	num = nrow - row;	1335	num = nrow - row;
1314	break;	1336	break;
1315	case 1: /* erase to beginning of screen */	1337	case 1: /* erase to beginning of screen */
1316	selection_check (3);
1317	scr_erase_line (1);	1338	scr_erase_line (1);
1318	row = 0;	1339	row = 0;
1319	num = screen.cur.row;	1340	num = screen.cur.row;
1320	break;	1341	break;
1321	case 2: /* erase whole screen */	1342	case 2: /* erase whole screen */
1322	selection_check (3);
1323	row = 0;	1343	row = 0;
1324	num = nrow;	1344	num = nrow;
1325	break;	1345	break;
1326	default:	1346	default:
1327	return;	1347	return;
…		…
1336	if (row >= nrow) /* Out Of Bounds */	1356	if (row >= nrow) /* Out Of Bounds */
1337	return;	1357	return;
1338		1358
1339	min_it (num, nrow - row);	1359	min_it (num, nrow - row);
1340		1360
1341	// TODO: the code below does not work when view_start != 0
1342	// the workaround is to disable the clear and use a normal refresh
1343	// when view_start != 0. mysterious.
1344	if (rstyle & (RS_Blink | RS_RVid | RS_Uline))	1361	if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1345	ren = (rend_t) ~RS_None;	1362	ren = (rend_t) ~RS_None;
1346	else if (GET_BASEBG (rstyle) == Color_bg)	1363	else if (GET_BASEBG (rstyle) == Color_bg)
1347	{	1364	{
1348	ren = DEFAULT_RSTYLE;	1365	ren = DEFAULT_RSTYLE;
1349		1366
1350	if (mapped && !view_start)	1367	if (mapped)
1351	XClearArea (dpy, vt, 0,	1368	XClearArea (dpy, vt, 0,
1352	Row2Pixel (row - view_start), (unsigned int)width,	1369	Row2Pixel (row - view_start), (unsigned int)vt_width,
1353	(unsigned int)Height2Pixel (num), False);	1370	(unsigned int)Height2Pixel (num), False);
1354	}	1371	}
1355	else	1372	else
1356	{	1373	{
1357	ren = rstyle & (RS_fgMask | RS_bgMask);	1374	ren = rstyle & (RS_fgMask | RS_bgMask);
1358		1375
1359	if (mapped && !view_start)	1376	if (mapped)
1360	{	1377	{
1361	gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];	1378	gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1362	XChangeGC (dpy, gc, GCForeground, &gcvalue);	1379	XChangeGC (dpy, gc, GCForeground, &gcvalue);
1363	XFillRectangle (dpy, vt, gc,	1380	XFillRectangle (dpy, vt, gc,
1364	0, Row2Pixel (row - view_start),	1381	0, Row2Pixel (row - view_start),
1365	(unsigned int)width,	1382	(unsigned int)vt_width,
1366	(unsigned int)Height2Pixel (num));	1383	(unsigned int)Height2Pixel (num));
1367	gcvalue.foreground = pix_colors[Color_fg];	1384	gcvalue.foreground = pix_colors[Color_fg];
1368	XChangeGC (dpy, gc, GCForeground, &gcvalue);	1385	XChangeGC (dpy, gc, GCForeground, &gcvalue);
1369	}	1386	}
1370	}	1387	}
1371		1388
1372	for (; num--; row++)	1389	for (; num--; row++)
1373	{	1390	{
1374	scr_blank_screen_mem (ROW(row), rstyle);	1391	scr_blank_screen_mem (ROW(row), rstyle);
1375		1392
1376	if (!view_start)	1393	if (row - view_start < nrow)
1377	scr_blank_line (drawn_buf [row], 0, ncol, ren);	1394	scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1378	}	1395	}
1379	}	1396	}
1380		1397
1381	#if !ENABLE_MINIMAL	1398	#if !ENABLE_MINIMAL
1382	void	1399	void
…		…
1392	/* ------------------------------------------------------------------------- */	1409	/* ------------------------------------------------------------------------- */
1393	/*	1410	/*
1394	* Fill the screen with `E's	1411	* Fill the screen with `E's
1395	* XTERM_SEQ: Screen Alignment Test: ESC # 8	1412	* XTERM_SEQ: Screen Alignment Test: ESC # 8
1396	*/	1413	*/
1397	void	1414	void ecb_cold
1398	rxvt_term::scr_E () NOTHROW	1415	rxvt_term::scr_E () NOTHROW
1399	{	1416	{
1400	rend_t fs;	1417	rend_t fs;
1401		1418
1402	want_refresh = 1;	1419	want_refresh = 1;
1403	ZERO_SCROLLBACK ();	1420	ZERO_SCROLLBACK ();
1404		1421
1405	num_scr_allow = 0;	1422	num_scr_allow = 0;
1406	selection_check (3);	1423
		1424	row_col_t pos;
		1425	pos.row = pos.col = 0;
		1426	if (ROWCOL_IS_AFTER (selection.end, pos))
		1427	CLEAR_SELECTION ();
1407		1428
1408	fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));	1429	fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1409	for (int row = nrow; row--; )	1430	for (int row = nrow; row--; )
1410	{	1431	{
1411	line_t &line = ROW(row);	1432	line_t &line = ROW(row);
…		…
1562	/* ------------------------------------------------------------------------- */	1583	/* ------------------------------------------------------------------------- */
1563	/*	1584	/*
1564	* Set the scrolling region	1585	* Set the scrolling region
1565	* XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r	1586	* XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1566	*/	1587	*/
1567	void	1588	void ecb_cold
1568	rxvt_term::scr_scroll_region (int top, int bot) NOTHROW	1589	rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1569	{	1590	{
1570	max_it (top, 0);	1591	max_it (top, 0);
1571	min_it (bot, nrow - 1);	1592	min_it (bot, nrow - 1);
1572		1593
…		…
1582	/*	1603	/*
1583	* Make the cursor visible/invisible	1604	* Make the cursor visible/invisible
1584	* XTERM_SEQ: Make cursor visible : ESC [ ? 25 h	1605	* XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1585	* XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l	1606	* XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1586	*/	1607	*/
1587	void	1608	void ecb_cold
1588	rxvt_term::scr_cursor_visible (int mode) NOTHROW	1609	rxvt_term::scr_cursor_visible (int mode) NOTHROW
1589	{	1610	{
1590	want_refresh = 1;	1611	want_refresh = 1;
1591		1612
1592	if (mode)	1613	if (mode)
…		…
1599	/*	1620	/*
1600	* Set/unset automatic wrapping	1621	* Set/unset automatic wrapping
1601	* XTERM_SEQ: Set Wraparound : ESC [ ? 7 h	1622	* XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1602	* XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l	1623	* XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1603	*/	1624	*/
1604	void	1625	void ecb_cold
1605	rxvt_term::scr_autowrap (int mode) NOTHROW	1626	rxvt_term::scr_autowrap (int mode) NOTHROW
1606	{	1627	{
1607	if (mode)	1628	if (mode)
1608	screen.flags |= Screen_Autowrap;	1629	screen.flags |= Screen_Autowrap;
1609	else	1630	else
…		…
1618	* Relative mode: line numbers are relative to top margin of scrolling region	1639	* Relative mode: line numbers are relative to top margin of scrolling region
1619	* and the cursor cannot be moved outside.	1640	* and the cursor cannot be moved outside.
1620	* XTERM_SEQ: Set Absolute: ESC [ ? 6 h	1641	* XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1621	* XTERM_SEQ: Set Relative: ESC [ ? 6 l	1642	* XTERM_SEQ: Set Relative: ESC [ ? 6 l
1622	*/	1643	*/
1623	void	1644	void ecb_cold
1624	rxvt_term::scr_relative_origin (int mode) NOTHROW	1645	rxvt_term::scr_relative_origin (int mode) NOTHROW
1625	{	1646	{
1626	if (mode)	1647	if (mode)
1627	screen.flags |= Screen_Relative;	1648	screen.flags |= Screen_Relative;
1628	else	1649	else
…		…
1635	/*	1656	/*
1636	* Set insert/replace mode	1657	* Set insert/replace mode
1637	* XTERM_SEQ: Set Insert mode : ESC [ ? 4 h	1658	* XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1638	* XTERM_SEQ: Set Replace mode: ESC [ ? 4 l	1659	* XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1639	*/	1660	*/
1640	void	1661	void ecb_cold
1641	rxvt_term::scr_insert_mode (int mode) NOTHROW	1662	rxvt_term::scr_insert_mode (int mode) NOTHROW
1642	{	1663	{
1643	if (mode)	1664	if (mode)
1644	screen.flags |= Screen_Insert;	1665	screen.flags |= Screen_Insert;
1645	else	1666	else
…		…
1651	* Set/Unset tabs	1672	* Set/Unset tabs
1652	* XTERM_SEQ: Set tab at current column : ESC H	1673	* XTERM_SEQ: Set tab at current column : ESC H
1653	* XTERM_SEQ: Clear tab at current column: ESC [ 0 g	1674	* XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1654	* XTERM_SEQ: Clear all tabs : ESC [ 3 g	1675	* XTERM_SEQ: Clear all tabs : ESC [ 3 g
1655	*/	1676	*/
1656	void	1677	void ecb_cold
1657	rxvt_term::scr_set_tab (int mode) NOTHROW	1678	rxvt_term::scr_set_tab (int mode) NOTHROW
1658	{	1679	{
1659	if (mode < 0)	1680	if (mode < 0)
1660	memset (tabs, 0, ncol);	1681	memset (tabs, 0, ncol);
1661	else if (screen.cur.col < ncol)	1682	else if (screen.cur.col < ncol)
…		…
1681	{	1702	{
1682	rvideo_state = on;	1703	rvideo_state = on;
1683		1704
1684	::swap (pix_colors[Color_fg], pix_colors[Color_bg]);	1705	::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1685	#ifdef HAVE_BG_PIXMAP	1706	#ifdef HAVE_BG_PIXMAP
1686	if (bgPixmap.pixmap == None)	1707	if (bg_pixmap == None)
1687	#endif	1708	#endif
1688	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);	1709	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1689		1710
1690	XGCValues gcvalue;	1711	XGCValues gcvalue;
1691	gcvalue.foreground = pix_colors[Color_fg];	1712	gcvalue.foreground = pix_colors[Color_fg];
…		…
1700	/* ------------------------------------------------------------------------- */	1721	/* ------------------------------------------------------------------------- */
1701	/*	1722	/*
1702	* Report current cursor position	1723	* Report current cursor position
1703	* XTERM_SEQ: Report position: ESC [ 6 n	1724	* XTERM_SEQ: Report position: ESC [ 6 n
1704	*/	1725	*/
1705	void	1726	void ecb_cold
1706	rxvt_term::scr_report_position () NOTHROW	1727	rxvt_term::scr_report_position () NOTHROW
1707	{	1728	{
1708	tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);	1729	tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1709	}	1730	}
1710		1731
…		…
1713	* ------------------------------------------------------------------------- */	1734	* ------------------------------------------------------------------------- */
1714		1735
1715	/*	1736	/*
1716	* Set font style	1737	* Set font style
1717	*/	1738	*/
1718	void	1739	void ecb_cold
1719	rxvt_term::set_font_style () NOTHROW	1740	rxvt_term::set_font_style () NOTHROW
1720	{	1741	{
1721	#if 0	1742	#if 0
1722	switch (charsets [screen.charset])	1743	switch (charsets [screen.charset])
1723	{	1744	{
…		…
1745	* XTERM_SEQ: Invoke G0 character set: CTRL-O	1766	* XTERM_SEQ: Invoke G0 character set: CTRL-O
1746	* XTERM_SEQ: Invoke G1 character set: CTRL-N	1767	* XTERM_SEQ: Invoke G1 character set: CTRL-N
1747	* XTERM_SEQ: Invoke G2 character set: ESC N	1768	* XTERM_SEQ: Invoke G2 character set: ESC N
1748	* XTERM_SEQ: Invoke G3 character set: ESC O	1769	* XTERM_SEQ: Invoke G3 character set: ESC O
1749	*/	1770	*/
1750	void	1771	void ecb_cold
1751	rxvt_term::scr_charset_choose (int set) NOTHROW	1772	rxvt_term::scr_charset_choose (int set) NOTHROW
1752	{	1773	{
1753	screen.charset = set;	1774	screen.charset = set;
1754	set_font_style ();	1775	set_font_style ();
1755	}	1776	}
…		…
1776	* ------------------------------------------------------------------------- */	1797	* ------------------------------------------------------------------------- */
1777		1798
1778	/*	1799	/*
1779	* refresh matching text.	1800	* refresh matching text.
1780	*/	1801	*/
1781	bool	1802	bool ecb_cold
1782	rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW	1803	rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1783	{	1804	{
1784	bool found = false;	1805	bool found = false;
1785		1806
1786	for (int i = 0; i < nrow; i++)	1807	for (int i = 0; i < nrow; i++)
…		…
1805	PART_BEG = 0,	1826	PART_BEG = 0,
1806	PART_END,	1827	PART_END,
1807	RC_COUNT	1828	RC_COUNT
1808	};	1829	};
1809		1830
1810	void	1831	void ecb_hot
1811	rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW	1832	rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1812	{	1833	{
1813	int i;	1834	int i;
1814	row_col_t rc[RC_COUNT];	1835	row_col_t rc[RC_COUNT];
1815		1836
…		…
1852	* Refresh the entire screen	1873	* Refresh the entire screen
1853	*/	1874	*/
1854	void	1875	void
1855	rxvt_term::scr_touch (bool refresh) NOTHROW	1876	rxvt_term::scr_touch (bool refresh) NOTHROW
1856	{	1877	{
1857	scr_expose (0, 0, width, height, refresh);	1878	scr_expose (0, 0, vt_width, vt_height, refresh);
1858	}	1879	}
1859		1880
1860	/* ------------------------------------------------------------------------- */	1881	/* ------------------------------------------------------------------------- */
1861	/*	1882	/*
1862	* Move the display so that the line represented by scrollbar value Y is at	1883	* Move the display so that the line represented by scrollbar value Y is at
…		…
1918		1939
1919	# ifndef NO_MAPALERT	1940	# ifndef NO_MAPALERT
1920	# ifdef MAPALERT_OPTION	1941	# ifdef MAPALERT_OPTION
1921	if (option (Opt_mapAlert))	1942	if (option (Opt_mapAlert))
1922	# endif	1943	# endif
1923	XMapWindow (dpy, parent[0]);	1944	XMapWindow (dpy, parent);
1924	# endif	1945	# endif
1925		1946
1926	# if ENABLE_FRILLS	1947	# if ENABLE_FRILLS
1927	if (option (Opt_urgentOnBell))	1948	if (option (Opt_urgentOnBell))
1928	set_urgency (1);	1949	set_urgency (1);
…		…
1941	HOOK_INVOKE ((this, HOOK_BELL, DT_END));	1962	HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1942	#endif	1963	#endif
1943	}	1964	}
1944		1965
1945	/* ------------------------------------------------------------------------- */	1966	/* ------------------------------------------------------------------------- */
1946	/* ARGSUSED */	1967	void ecb_cold
1947	void
1948	rxvt_term::scr_printscreen (int fullhist) NOTHROW	1968	rxvt_term::scr_printscreen (int fullhist) NOTHROW
1949	{	1969	{
1950	#ifdef PRINTPIPE	1970	#ifdef PRINTPIPE
1951	int nrows, row_start;	1971	int nrows, row_start;
1952	FILE *fd = popen_printer ();	1972	FILE *fd = popen_printer ();
…		…
2001	/*	2021	/*
2002	* Refresh the screen	2022	* Refresh the screen
2003	* drawn_text/drawn_rend contain the screen information before the update.	2023	* drawn_text/drawn_rend contain the screen information before the update.
2004	* screen.text/screen.rend contain what the screen will change to.	2024	* screen.text/screen.rend contain what the screen will change to.
2005	*/	2025	*/
2006	void	2026	void ecb_hot
2007	rxvt_term::scr_refresh () NOTHROW	2027	rxvt_term::scr_refresh () NOTHROW
2008	{	2028	{
2009	int16_t col, row, /* column/row we're processing */	2029	int16_t col, row, /* column/row we're processing */
2010	ocrow; /* old cursor row */	2030	ocrow; /* old cursor row */
2011	int i; /* tmp */	2031	int i; /* tmp */
…		…
2025	* A: set up vars	2045	* A: set up vars
2026	*/	2046	*/
2027	refresh_count = 0;	2047	refresh_count = 0;
2028		2048
2029	unsigned int old_screen_flags = screen.flags;	2049	unsigned int old_screen_flags = screen.flags;
2030	char have_bg = 0;	2050	bool have_bg = 0;
2031	#ifdef HAVE_BG_PIXMAP	2051	#ifdef HAVE_BG_PIXMAP
2032	have_bg = bgPixmap.pixmap != None;	2052	have_bg = bg_pixmap != None;
2033	#endif	2053	#endif
2034	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */	2054	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2035		2055
2036	/*	2056	/*
2037	* B: reverse any characters which are selected	2057	* B: reverse any characters which are selected
…		…
2041	HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));	2061	HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2042	#if ENABLE_OVERLAY	2062	#if ENABLE_OVERLAY
2043	scr_swap_overlay ();	2063	scr_swap_overlay ();
2044	#endif	2064	#endif
2045		2065
2046	char showcursor = screen.flags & Screen_VisibleCursor;	2066	bool showcursor = screen.flags & Screen_VisibleCursor;
2047		2067
2048	/*	2068	/*
2049	* C: set the cursor character (s)	2069	* C: set the cursor character (s)
2050	*/	2070	*/
2051	{	2071	{
2052	unsigned char setoldcursor;	2072	bool setoldcursor;
2053		2073
2054	#ifdef CURSOR_BLINK	2074	#ifdef CURSOR_BLINK
2055	if (hidden_cursor)	2075	if (hidden_cursor)
2056	showcursor = 0;	2076	showcursor = 0;
2057	#endif	2077	#endif
…		…
2144	{	2164	{
2145	int16_t nits;	2165	int16_t nits;
2146	int i = num_scr;	2166	int i = num_scr;
2147	int j;	2167	int j;
2148	int len, wlen;	2168	int len, wlen;
2149	dLocal (int, num_scr);
2150		2169
2151	j = nrow;	2170	j = nrow;
2152	wlen = len = -1;	2171	wlen = len = -1;
2153	row = i > 0 ? 0 : j - 1;	2172	row = i > 0 ? 0 : j - 1;
2154		2173
…		…
2229	continue;	2248	continue;
2230		2249
2231	// redraw one or more characters	2250	// redraw one or more characters
2232		2251
2233	// seek to the beginning of wide characters	2252	// seek to the beginning of wide characters
2234	while (expect_false (stp[col] == NOCHAR && col > 0))	2253	while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2235	--col;	2254	--col;
2236		2255
2237	rend_t rend = srp[col]; /* screen rendition (target rendition) */	2256	rend_t rend = srp[col]; /* screen rendition (target rendition) */
2238	text_t *text = stp + col;	2257	text_t *text = stp + col;
2239	int count = 1;	2258	int count = 1;
…		…
2277		2296
2278	col--; /* went one too far. move back */	2297	col--; /* went one too far. move back */
2279	count -= i; /* dump any matching trailing chars */	2298	count -= i; /* dump any matching trailing chars */
2280		2299
2281	// sometimes we optimize away the trailing NOCHAR's, add them back	2300	// sometimes we optimize away the trailing NOCHAR's, add them back
2282	while (expect_false (i && text[count] == NOCHAR))	2301	while (ecb_unlikely (i && text[count] == NOCHAR))
2283	count++, i--;	2302	count++, i--;
2284		2303
2285	/*	2304	/*
2286	* Determine the attributes for the string	2305	* Determine the attributes for the string
2287	*/	2306	*/
2288	int fore = fgcolor_of (rend); // desired foreground	2307	int fore = fgcolor_of (rend); // desired foreground
2289	int back = bgcolor_of (rend); // desired background	2308	int back = bgcolor_of (rend); // desired background
2290		2309
2291	// only do special processing if any attributes are set, which is unlikely	2310	// only do special processing if any attributes are set, which is unlikely
2292	if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))	2311	if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2293	{	2312	{
2294	bool invert = rend & RS_RVid;	2313	bool invert = rend & RS_RVid;
2295		2314
2296	#ifndef NO_BOLD_UNDERLINE_REVERSE	2315	#ifndef NO_BOLD_UNDERLINE_REVERSE
2297	if (rend & RS_Bold && fore == Color_fg)	2316	if (rend & RS_Bold && fore == Color_fg)
…		…
2386	/*	2405	/*
2387	* Actually do the drawing of the string here	2406	* Actually do the drawing of the string here
2388	*/	2407	*/
2389	rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];	2408	rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2390		2409
2391	if (expect_true (have_bg && back == Color_bg))	2410	if (ecb_likely (have_bg && back == Color_bg))
2392	{	2411	{
2393	// this is very ugly, maybe push it into ->draw?	2412	// this is very ugly, maybe push it into ->draw?
2394		2413
2395	for (i = 0; i < count; i++) /* don't draw empty strings */	2414	for (i = 0; i < count; i++) /* don't draw empty strings */
2396	if (text[i] != ' ')	2415	if (text[i] != ' ')
…		…
2403	did_clear: ;	2422	did_clear: ;
2404	}	2423	}
2405	else	2424	else
2406	font->draw (*drawable, xpixel, ypixel, text, count, fore, back);	2425	font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2407		2426
2408	if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))	2427	if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2409	{	2428	{
2410	#if ENABLE_FRILLS	2429	#if ENABLE_FRILLS
2411	if (ISSET_PIXCOLOR (Color_underline))	2430	if (ISSET_PIXCOLOR (Color_underline))
2412	XSetForeground (dpy, gc, pix_colors[Color_underline]);	2431	XSetForeground (dpy, gc, pix_colors[Color_underline]);
2413	else	2432	else
…		…
2459		2478
2460	XDrawRectangle (dpy, vt, gc,	2479	XDrawRectangle (dpy, vt, gc,
2461	Col2Pixel (col),	2480	Col2Pixel (col),
2462	Row2Pixel (oldcursor.row),	2481	Row2Pixel (oldcursor.row),
2463	(unsigned int) (Width2Pixel (cursorwidth) - 1),	2482	(unsigned int) (Width2Pixel (cursorwidth) - 1),
2464	(unsigned int) (Height2Pixel (1) - lineSpace - 1));	2483	(unsigned int) (Height2Pixel (1) - 1));
2465	}	2484	}
2466	}	2485	}
2467		2486
2468	/*	2487	/*
2469	* H: cleanup selection	2488	* H: cleanup selection
…		…
2478	screen.flags = old_screen_flags;	2497	screen.flags = old_screen_flags;
2479	num_scr = 0;	2498	num_scr = 0;
2480	num_scr_allow = 1;	2499	num_scr_allow = 1;
2481	}	2500	}
2482		2501
2483	void	2502	void ecb_cold
2484	rxvt_term::scr_remap_chars (line_t &l) NOTHROW	2503	rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2485	{	2504	{
2486	if (!l.t)	2505	if (!l.valid ())
2487	return;	2506	return;
2488		2507
2489	l.touch (); // maybe a bit of an overkill, but it's not performance-relevant	2508	l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2490		2509
2491	for (int i = ncol; i--; )	2510	for (int i = ncol; i--; )
2492	l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));	2511	l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2493	}	2512	}
2494		2513
2495	void	2514	void ecb_cold
2496	rxvt_term::scr_remap_chars () NOTHROW	2515	rxvt_term::scr_remap_chars () NOTHROW
2497	{	2516	{
2498	for (int i = total_rows; i--; )	2517	for (int i = total_rows; i--; )
2499	scr_remap_chars (row_buf [i]);	2518	scr_remap_chars (row_buf [i]);
2500		2519
…		…
2503	scr_remap_chars (drawn_buf [i]);	2522	scr_remap_chars (drawn_buf [i]);
2504	scr_remap_chars (swap_buf [i]);	2523	scr_remap_chars (swap_buf [i]);
2505	}	2524	}
2506	}	2525	}
2507		2526
2508	void	2527	void ecb_cold
2509	rxvt_term::scr_recolour () NOTHROW	2528	rxvt_term::scr_recolour (bool refresh) NOTHROW
2510	{	2529	{
		2530	bool transparent = false;
		2531
2511	#ifdef HAVE_BG_PIXMAP	2532	#ifdef HAVE_BG_PIXMAP
2512	bgPixmap.apply ();	2533	if (bg_pixmap != None)
2513	#else	2534	{
		2535	# ifdef ENABLE_TRANSPARENCY
		2536	if (bg_flags & BG_IS_TRANSPARENT)
		2537	{
		2538	XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap);
		2539	XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2514		2540
		2541	transparent = true;
		2542	}
		2543	else
		2544	# endif
		2545	{
		2546	XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
		2547	XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
		2548	}
		2549	}
		2550	else
		2551	#endif
		2552	{
2515	XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);	2553	XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2516	XClearWindow (dpy, parent[0]);
2517	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);	2554	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
		2555	}
		2556
		2557	XClearWindow (dpy, parent);
2518		2558
2519	if (scrollBar.win)	2559	if (scrollBar.win)
2520	{	2560	{
		2561	if (transparent)
		2562	XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
		2563	else
2521	XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);	2564	XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2522	scrollBar.state = STATE_IDLE;	2565	scrollBar.state = SB_STATE_IDLE;
2523	scrollBar.show (0);	2566	scrollBar.show (0);
2524	}	2567	}
2525		2568
2526	#endif	2569	if (refresh)
2527		2570	{
2528	/* bgPixmap.apply () does not do the following : */
2529	scr_clear ();	2571	scr_clear ();
2530	scr_touch (true);	2572	scr_touch (true);
		2573	}
2531	want_refresh = 1;	2574	want_refresh = 1;
2532	}	2575	}
2533		2576
2534	/* ------------------------------------------------------------------------- */	2577	/* ------------------------------------------------------------------------- */
2535	void	2578	void
…		…
2592	for (rend_t *srp = ROW(row).r; col < end_col; col++)	2635	for (rend_t *srp = ROW(row).r; col < end_col; col++)
2593	srp[col] ^= rstyle;	2636	srp[col] ^= rstyle;
2594	}	2637	}
2595		2638
2596	/* ------------------------------------------------------------------------- */	2639	/* ------------------------------------------------------------------------- */
2597	void	2640	void ecb_hot
2598	rxvt_term::scr_reverse_selection () NOTHROW	2641	rxvt_term::scr_reverse_selection () NOTHROW
2599	{	2642	{
2600	if (selection.op	2643	if (selection.op
2601	&& current_screen == selection.screen	2644	&& current_screen == selection.screen
2602	&& selection.end.row >= view_start)	2645	&& selection.end.row >= view_start)
…		…
2621	*/	2664	*/
2622	#if 0	2665	#if 0
2623	void	2666	void
2624	rxvt_term::scr_dump (int fd) NOTHROW	2667	rxvt_term::scr_dump (int fd) NOTHROW
2625	{	2668	{
2626	int row, wrote;	2669	// if this method is needed, it can be implemented by factoring the
2627	unsigned int width, towrite;	2670	// relevant code in scr_printscreen
2628	char r1[] = "\n";
2629
2630	for (row = saveLines + top_row;
2631	row < saveLines + nrow - 1; row++)
2632	{
2633	width = row_buf[row].l >= 0 ? row_buf[row].l
2634	: ncol;
2635	for (towrite = width; towrite; towrite -= wrote)
2636	{
2637	wrote = write (fd, & (row_buf[row].t[width - towrite]),
2638	towrite);
2639	if (wrote < 0)
2640	return; /* XXX: death, no report */
2641	}
2642	if (row_buf[row].l >= 0)
2643	if (write (fd, r1, 1) <= 0)
2644	return; /* XXX: death, no report */
2645	}
2646	}	2671	}
2647	#endif	2672	#endif
2648		2673
2649	/* ------------------------------------------------------------------------- *	2674	/* ------------------------------------------------------------------------- *
2650	* CHARACTER SELECTION *	2675	* CHARACTER SELECTION *
2651	* ------------------------------------------------------------------------- */	2676	* ------------------------------------------------------------------------- */
2652	void	2677	void
2653	rxvt_term::selection_check (int check_more) NOTHROW	2678	rxvt_term::selection_check (int check_more) NOTHROW
2654	{	2679	{
2655	row_col_t pos;
2656
2657	if (!selection.op)	2680	if (!selection.op)
2658	return;	2681	return;
2659		2682
2660	pos.row = pos.col = 0;
2661	if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)	2683	if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2662	|| !IN_RANGE_EXC (selection.mark.row, top_row, nrow)	2684	|| !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2663	|| !IN_RANGE_EXC (selection.end.row, top_row, nrow)	2685	|| !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2664	|| (check_more == 1	2686	|| (check_more == 1
2665	&& current_screen == selection.screen	2687	&& current_screen == selection.screen
2666	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)	2688	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2667	&& ROWCOL_IS_BEFORE (screen.cur, selection.end))	2689	&& ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2668	|| (check_more == 2
2669	&& ROWCOL_IS_BEFORE (selection.beg, pos)
2670	&& ROWCOL_IS_AFTER (selection.end, pos))
2671	|| (check_more == 3
2672	&& ROWCOL_IS_AFTER (selection.end, pos))
2673	|| (check_more == 4 /* screen width change */
2674	&& (selection.beg.row != selection.end.row
2675	|| selection.end.col > ncol)))
2676	CLEAR_SELECTION ();	2690	CLEAR_ALL_SELECTION ();
2677	}	2691	}
2678		2692
2679	/* ------------------------------------------------------------------------- */	2693	/* ------------------------------------------------------------------------- */
2680	/*	2694	/*
2681	* Paste a selection direct to the command fd	2695	* Paste a selection direct to the command fd
…		…
2687	for (unsigned int i = 0; i < len; i++)	2701	for (unsigned int i = 0; i < len; i++)
2688	if (data[i] == C0_LF)	2702	if (data[i] == C0_LF)
2689	data[i] = C0_CR;	2703	data[i] = C0_CR;
2690		2704
2691	if (priv_modes & PrivMode_BracketPaste)	2705	if (priv_modes & PrivMode_BracketPaste)
2692	tt_printf ("\e[200~");	2706	tt_printf ("\x1b[200~");
2693		2707
2694	tt_write (data, len);	2708	tt_write (data, len);
2695		2709
2696	if (priv_modes & PrivMode_BracketPaste)	2710	if (priv_modes & PrivMode_BracketPaste)
2697	tt_printf ("\e[201~");	2711	tt_printf ("\x1b[201~");
2698	}	2712	}
2699		2713
2700	void	2714	void
2701	rxvt_term::paste (char *data, unsigned int len) NOTHROW	2715	rxvt_term::paste (char *data, unsigned int len) NOTHROW
2702	{	2716	{
…		…
2706	tt_paste (data, len);	2720	tt_paste (data, len);
2707	}	2721	}
2708		2722
2709	/* ------------------------------------------------------------------------- */	2723	/* ------------------------------------------------------------------------- */
2710	/*	2724	/*
2711	* Respond to a notification that a primary selection has been sent	2725	* Request PRIMARY, SECONDARY or CLIPBOARD selection.
2712	* EXT: SelectionNotify	2726	* if the requested selection has no owner or is empty CUT_BUFFER0 is used
2713	*/	2727	* as fallback
2714	void
2715	rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2716	{
2717	if (prop == None) /* check for failed XConvertSelection */
2718	{
2719	if ((selection_type & Sel_CompoundText))
2720	{
2721	int selnum = selection_type & Sel_whereMask;
2722
2723	selection_type = 0;
2724	if (selnum != Sel_direct)
2725	selection_request_other (XA_STRING, selnum);
2726	}
2727
2728	if ((selection_type & Sel_UTF8String))
2729	{
2730	int selnum = selection_type & Sel_whereMask;
2731
2732	selection_type = Sel_CompoundText;
2733	if (selnum != Sel_direct)
2734	selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2735	else
2736	selection_type = 0;
2737	}
2738
2739	return;
2740	}
2741
2742	unsigned long bytes_after;
2743	XTextProperty ct;
2744
2745	if (XGetWindowProperty (dpy, win, prop,
2746	0, PROP_SIZE / 4,
2747	delete_prop, AnyPropertyType,
2748	&ct.encoding, &ct.format,
2749	&ct.nitems, &bytes_after,
2750	&ct.value) != Success)
2751	{
2752	ct.value = 0;
2753	goto bailout;
2754	}
2755
2756	if (ct.encoding == None)
2757	goto bailout;
2758
2759	if (bytes_after)
2760	{
2761	// fetch and append remaining data
2762	XTextProperty ct2;
2763
2764	if (XGetWindowProperty (dpy, win, prop,
2765	ct.nitems / 4, (bytes_after + 3) / 4,
2766	delete_prop, AnyPropertyType,
2767	&ct2.encoding, &ct2.format,
2768	&ct2.nitems, &bytes_after,
2769	&ct2.value) != Success)
2770	goto bailout;
2771
2772	// realloc should be compatible to XFree, here, and elsewhere, too
2773	ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2774	memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2775	ct.nitems += ct2.nitems;
2776
2777	XFree (ct2.value);
2778	}
2779
2780	if (ct.value == 0)
2781	goto bailout;
2782
2783	if (ct.encoding == xa[XA_INCR])
2784	{
2785	// INCR selection, start handshake
2786	if (!delete_prop)
2787	XDeleteProperty (dpy, win, prop);
2788
2789	selection_wait = Sel_incr;
2790	incr_buf_fill = 0;
2791	incr_ev.start (10);
2792
2793	goto bailout;
2794	}
2795
2796	if (ct.nitems == 0)
2797	{
2798	if (selection_wait == Sel_incr)
2799	{
2800	XFree (ct.value);
2801
2802	// finally complete, now paste the whole thing
2803	selection_wait = Sel_normal;
2804	ct.value = (unsigned char *)incr_buf;
2805	ct.nitems = incr_buf_fill;
2806	incr_buf = 0;
2807	incr_buf_size = 0;
2808	incr_ev.stop ();
2809	}
2810	else
2811	{
2812	if (selection_wait == Sel_normal
2813	&& (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2814	{
2815	/*
2816	* pass through again trying CUT_BUFFER0 if we've come from
2817	* XConvertSelection () but nothing was presented
2818	*/
2819	selection_paste (display->root, XA_CUT_BUFFER0, False);
2820	}
2821
2822	goto bailout;
2823	}
2824	}
2825	else if (selection_wait == Sel_incr)
2826	{
2827	incr_ev.start (10);
2828
2829	while (incr_buf_fill + ct.nitems > incr_buf_size)
2830	{
2831	incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2832	incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2833	}
2834
2835	memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2836	incr_buf_fill += ct.nitems;
2837
2838	goto bailout;
2839	}
2840
2841	char **cl;
2842	int cr;
2843
2844	#if !ENABLE_MINIMAL
2845	// xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2846	// so recode it manually
2847	if (ct.encoding == xa[XA_UTF8_STRING])
2848	{
2849	wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2850	char *s = rxvt_wcstombs (w);
2851	free (w);
2852	// TODO: strlen == only the first element will be converted. well...
2853	paste (s, strlen (s));
2854	free (s);
2855	}
2856	else
2857	#endif
2858	if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2859	&& cl)
2860	{
2861	for (int i = 0; i < cr; i++)
2862	paste (cl[i], strlen (cl[i]));
2863
2864	XFreeStringList (cl);
2865	}
2866	else
2867	paste ((char *)ct.value, ct.nitems); // paste raw
2868
2869	bailout:
2870	XFree (ct.value);
2871
2872	if (selection_wait == Sel_normal)
2873	selection_wait = Sel_none;
2874	}
2875
2876	void
2877	rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2878	{
2879	selection_wait = Sel_none;
2880
2881	incr_buf_size = 0;
2882	free (incr_buf);
2883
2884	rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2885	}
2886
2887	void
2888	rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2889	{
2890	if (prop == None || selection_wait != Sel_incr)
2891	return;
2892
2893	selection_paste (win, prop, true);
2894	}
2895
2896	/* ------------------------------------------------------------------------- */
2897	/*
2898	* Request the current selection:
2899	* Order: > internal selection if available
2900	* > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2901	* > CUT_BUFFER0
2902	* (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2903	* will auto fallback to CUT_BUFFER0
2904	* EXT: button 2 release	2728	* EXT: button 2 release
2905	*/	2729	*/
2906	void	2730	void
2907	rxvt_term::selection_request (Time tm, int selnum) NOTHROW	2731	rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2908	{	2732	{
2909	if (selection.text && selnum == Sel_Primary)	2733	if (!selection_req)
2910	{
2911	/* internal selection */
2912	char *str = rxvt_wcstombs (selection.text, selection.len);
2913	paste (str, strlen (str));
2914	free (str);
2915	return;
2916	}	2734	{
2917	else	2735	selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
		2736	selection_req->run ();
2918	{	2737	}
2919	selection_request_time = tm;
2920	selection_wait = Sel_normal;
2921
2922	#if X_HAVE_UTF8_STRING
2923	selection_type = Sel_UTF8String;
2924	if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2925	return;
2926	#else
2927	selection_type = Sel_CompoundText;
2928	if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2929	return;
2930	#endif
2931	}
2932
2933	selection_wait = Sel_none; /* don't loop in selection_paste () */
2934	selection_paste (display->root, XA_CUT_BUFFER0, false);
2935	}
2936
2937	int
2938	rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2939	{
2940	Atom sel;
2941
2942	selection_type |= selnum;
2943
2944	if (selnum == Sel_Primary)
2945	sel = XA_PRIMARY;
2946	else if (selnum == Sel_Secondary)
2947	sel = XA_SECONDARY;
2948	else
2949	sel = xa[XA_CLIPBOARD];
2950
2951	if (XGetSelectionOwner (dpy, sel) != None)
2952	{
2953	XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2954	vt, selection_request_time);
2955	return 1;
2956	}
2957
2958	return 0;
2959	}	2738	}
2960		2739
2961	/* ------------------------------------------------------------------------- */	2740	/* ------------------------------------------------------------------------- */
2962	/*	2741	/*
2963	* Clear all selected text	2742	* Clear all selected text
…		…
2994	* EXT: button 1 or 3 release	2773	* EXT: button 1 or 3 release
2995	*/	2774	*/
2996	void	2775	void
2997	rxvt_term::selection_make (Time tm)	2776	rxvt_term::selection_make (Time tm)
2998	{	2777	{
2999	int i;	2778	int size;
3000	wchar_t *new_selection_text;	2779	wchar_t *new_selection_text;
3001	text_t *t;	2780	text_t *t;
3002		2781
3003	switch (selection.op)	2782	switch (selection.op)
3004	{	2783	{
…		…
3020	return; /* nothing selected, go away */	2799	return; /* nothing selected, go away */
3021		2800
3022	if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))	2801	if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
3023	return;	2802	return;
3024		2803
3025	i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);	2804	size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
3026	new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));	2805	new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
3027		2806
3028	int ofs = 0;	2807	int ofs = 0;
3029	int extra = 0;	2808	int extra = 0;
3030		2809
3031	int col = selection.beg.col;	2810	int col = selection.beg.col;
…		…
3037	{	2816	{
3038	#if !ENABLE_MINIMAL	2817	#if !ENABLE_MINIMAL
3039	if (selection.rect)	2818	if (selection.rect)
3040	{	2819	{
3041	col = selection.beg.col;	2820	col = selection.beg.col;
3042	end_col = ncol + 1;	2821	end_col = selection.end.col;
3043	}	2822	}
3044	else	2823	else
3045	#endif	2824	#endif
3046	end_col = ROW(row).l;	2825	end_col = ROW(row).l;
3047		2826
3048	col = max (col, 0);	2827	col = max (col, 0);
3049		2828
3050	if (row == selection.end.row	2829	if (row == selection.end.row)
3051	#if !ENABLE_MINIMAL
3052	|| selection.rect
3053	#endif
3054	)
3055	min_it (end_col, selection.end.col);	2830	min_it (end_col, selection.end.col);
3056		2831
3057	t = ROW(row).t + col;	2832	t = ROW(row).t + col;
3058		2833
3059	for (; col < end_col; col++)	2834	for (; col < end_col; col++)
…		…
3067		2842
3068	extra -= (len - 1);	2843	extra -= (len - 1);
3069		2844
3070	if (extra < 0)	2845	if (extra < 0)
3071	{	2846	{
3072	extra += i;	2847	extra += size;
3073	i += i;	2848	size += size;
3074	new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t));	2849	new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3075	}	2850	}
3076		2851
3077	ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);	2852	ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3078	}	2853	}
3079	#endif	2854	#endif
…		…
3091		2866
3092	new_selection_text[ofs++] = C0_LF;	2867	new_selection_text[ofs++] = C0_LF;
3093	}	2868	}
3094	else	2869	else
3095	#endif	2870	#endif
3096	if (!ROW(row).is_longer () && row != selection.end.row)	2871	if (!ROW(row).is_longer ()
		2872	&& (row != selection.end.row || end_col != selection.end.col)
		2873	&& (row != selection.beg.row || selection.beg.col < ncol))
3097	new_selection_text[ofs++] = C0_LF;	2874	new_selection_text[ofs++] = C0_LF;
3098	}	2875	}
3099
3100	if (end_col != selection.end.col)
3101	new_selection_text[ofs++] = C0_LF;
3102		2876
3103	new_selection_text[ofs] = 0;	2877	new_selection_text[ofs] = 0;
3104		2878
3105	if (ofs == 0)	2879	if (ofs == 0)
3106	{	2880	{
…		…
3162	/* ------------------------------------------------------------------------- */	2936	/* ------------------------------------------------------------------------- */
3163	/*	2937	/*
3164	* Mark or select text based upon number of clicks: 1, 2, or 3	2938	* Mark or select text based upon number of clicks: 1, 2, or 3
3165	* EXT: button 1 press	2939	* EXT: button 1 press
3166	*/	2940	*/
3167	void	2941	void ecb_cold
3168	rxvt_term::selection_click (int clicks, int x, int y) NOTHROW	2942	rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3169	{	2943	{
3170	clicks = ((clicks - 1) % 3) + 1;	2944	clicks = ((clicks - 1) % 3) + 1;
3171	selection.clicks = clicks; /* save clicks so extend will work */	2945	selection.clicks = clicks; /* save clicks so extend will work */
3172		2946
…		…
3191		2965
3192	/* ------------------------------------------------------------------------- */	2966	/* ------------------------------------------------------------------------- */
3193	/*	2967	/*
3194	* Mark a selection at the specified col/row	2968	* Mark a selection at the specified col/row
3195	*/	2969	*/
3196	void	2970	void ecb_cold
3197	rxvt_term::selection_start_colrow (int col, int row) NOTHROW	2971	rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3198	{	2972	{
3199	want_refresh = 1;	2973	want_refresh = 1;
3200		2974
3201	selection.mark.row = row + view_start;	2975	selection.mark.row = row + view_start;
…		…
3228	/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */	3002	/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3229	#define DELIMIT_TEXT(x) \	3003	#define DELIMIT_TEXT(x) \
3230	(unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))	3004	(unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3231	#define DELIMIT_REND(x) 1	3005	#define DELIMIT_REND(x) 1
3232		3006
3233	void	3007	void ecb_cold
3234	rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW	3008	rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3235	{	3009	{
3236	int col, row, dirnadd, tcol, trow, w1, w2;	3010	int col, row, dirnadd, tcol, trow, w1, w2;
3237	row_col_t bound;	3011	row_col_t bound;
3238	text_t *stp;	3012	text_t *stp;
…		…
3312	* EXT: button 3 press; button 1 or 3 drag	3086	* EXT: button 3 press; button 1 or 3 drag
3313	* flag == 0 ==> button 1	3087	* flag == 0 ==> button 1
3314	* flag == 1 ==> button 3 press	3088	* flag == 1 ==> button 3 press
3315	* flag == 2 ==> button 3 motion	3089	* flag == 2 ==> button 3 motion
3316	*/	3090	*/
3317	void	3091	void ecb_cold
3318	rxvt_term::selection_extend (int x, int y, int flag) NOTHROW	3092	rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3319	{	3093	{
3320	int col = clamp (Pixel2Col (x), 0, ncol);	3094	int col = clamp (Pixel2Col (x), 0, ncol);
3321	int row = clamp (Pixel2Row (y), 0, nrow - 1);	3095	int row = clamp (Pixel2Row (y), 0, nrow - 1);
3322		3096
…		…
3348		3122
3349	/* ------------------------------------------------------------------------- */	3123	/* ------------------------------------------------------------------------- */
3350	/*	3124	/*
3351	* Extend the selection to the specified col/row	3125	* Extend the selection to the specified col/row
3352	*/	3126	*/
3353	void	3127	void ecb_cold
3354	rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW	3128	rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3355	{	3129	{
3356	row_col_t pos;	3130	row_col_t pos;
3357	enum {	3131	enum {
3358	LEFT, RIGHT	3132	LEFT, RIGHT
…		…
3549	::swap (selection.beg.col, selection.end.col);	3323	::swap (selection.beg.col, selection.end.col);
3550	#endif	3324	#endif
3551	}	3325	}
3552		3326
3553	#if !ENABLE_MINIMAL	3327	#if !ENABLE_MINIMAL
3554	void	3328	void ecb_cold
3555	rxvt_term::selection_remove_trailing_spaces () NOTHROW	3329	rxvt_term::selection_remove_trailing_spaces () NOTHROW
3556	{	3330	{
3557	int32_t end_col, end_row;	3331	int32_t end_col, end_row;
3558	text_t *stp;	3332	text_t *stp;
3559		3333
…		…
3597	/* ------------------------------------------------------------------------- */	3371	/* ------------------------------------------------------------------------- */
3598	/*	3372	/*
3599	* Double click on button 3 when already selected	3373	* Double click on button 3 when already selected
3600	* EXT: button 3 double click	3374	* EXT: button 3 double click
3601	*/	3375	*/
3602	void	3376	void ecb_cold
3603	rxvt_term::selection_rotate (int x, int y) NOTHROW	3377	rxvt_term::selection_rotate (int x, int y) NOTHROW
3604	{	3378	{
3605	selection.clicks = selection.clicks % 3 + 1;	3379	selection.clicks = selection.clicks % 3 + 1;
3606	selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);	3380	selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3607	}	3381	}
…		…
3609	/* ------------------------------------------------------------------------- */	3383	/* ------------------------------------------------------------------------- */
3610	/*	3384	/*
3611	* Respond to a request for our current selection	3385	* Respond to a request for our current selection
3612	* EXT: SelectionRequest	3386	* EXT: SelectionRequest
3613	*/	3387	*/
3614	void	3388	void ecb_cold
3615	rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW	3389	rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3616	{	3390	{
		3391	Atom property = rq.property == None ? rq.target : rq.property;
3617	XSelectionEvent ev;	3392	XSelectionEvent ev;
3618		3393
3619	ev.type = SelectionNotify;	3394	ev.type = SelectionNotify;
3620	ev.property = None;	3395	ev.property = None;
3621	ev.display = rq.display;	3396	ev.display = rq.display;
…		…
3636	*target++ = xa[XA_COMPOUND_TEXT];	3411	*target++ = xa[XA_COMPOUND_TEXT];
3637	#if X_HAVE_UTF8_STRING	3412	#if X_HAVE_UTF8_STRING
3638	*target++ = xa[XA_UTF8_STRING];	3413	*target++ = xa[XA_UTF8_STRING];
3639	#endif	3414	#endif
3640		3415
3641	XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,	3416	XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3642	32, PropModeReplace,	3417	32, PropModeReplace,
3643	(unsigned char *)target_list, target - target_list);	3418	(unsigned char *)target_list, target - target_list);
3644	ev.property = rq.property;	3419	ev.property = property;
3645	}	3420	}
3646	#if TODO // TODO	3421	#if TODO // TODO
3647	else if (rq.target == xa[XA_MULTIPLE])	3422	else if (rq.target == xa[XA_MULTIPLE])
3648	{	3423	{
3649	/* TODO: Handle MULTIPLE */	3424	/* TODO: Handle MULTIPLE */
3650	}	3425	}
3651	#endif	3426	#endif
3652	else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)	3427	else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3653	{	3428	{
3654	XChangeProperty (dpy, rq.requestor, rq.property, rq.target,	3429	XChangeProperty (dpy, rq.requestor, property, rq.target,
3655	32, PropModeReplace, (unsigned char *)&selection_time, 1);	3430	32, PropModeReplace, (unsigned char *)&selection_time, 1);
3656	ev.property = rq.property;	3431	ev.property = property;
3657	}	3432	}
3658	else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)	3433	else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_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 *)&clipboard_time, 1);	3436	32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3662	ev.property = rq.property;	3437	ev.property = property;
3663	}	3438	}
3664	else if (rq.target == XA_STRING	3439	else if (rq.target == XA_STRING
3665	|| rq.target == xa[XA_TEXT]	3440	|| rq.target == xa[XA_TEXT]
3666	|| rq.target == xa[XA_COMPOUND_TEXT]	3441	|| rq.target == xa[XA_COMPOUND_TEXT]
3667	|| rq.target == xa[XA_UTF8_STRING]	3442	|| rq.target == xa[XA_UTF8_STRING]
…		…
3738	ct.value = (unsigned char *)cl;	3513	ct.value = (unsigned char *)cl;
3739	ct.nitems = selectlen;	3514	ct.nitems = selectlen;
3740	ct.encoding = target;	3515	ct.encoding = target;
3741	}	3516	}
3742		3517
3743	XChangeProperty (dpy, rq.requestor, rq.property,	3518	XChangeProperty (dpy, rq.requestor, property,
3744	ct.encoding, 8, PropModeReplace,	3519	ct.encoding, 8, PropModeReplace,
3745	ct.value, (int)ct.nitems);	3520	ct.value, (int)ct.nitems);
3746	ev.property = rq.property;	3521	ev.property = property;
3747		3522
3748	if (freect)	3523	if (freect)
3749	XFree (ct.value);	3524	XFree (ct.value);
3750	}	3525	}
3751		3526
3752	XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);	3527	XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3753	}	3528	}
3754		3529
3755	/* ------------------------------------------------------------------------- */	3530	/* ------------------------------------------------------------------------- */
3756	#ifdef USE_XIM	3531	#ifdef USE_XIM
3757	void	3532	void ecb_cold
3758	rxvt_term::im_set_position (XPoint &pos) NOTHROW	3533	rxvt_term::im_set_position (XPoint &pos) NOTHROW
3759	{	3534	{
3760	XWindowAttributes xwa;	3535	XWindowAttributes xwa;
3761		3536
3762	XGetWindowAttributes (dpy, vt, &xwa);	3537	XGetWindowAttributes (dpy, vt, &xwa);

Diff Legend

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