ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/rxvt-unicode/src/screen.C

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

Diff Legend

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