ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.347 by sf-exg, Sat Aug 28 11:03:04 2010 UTC vs.
Revision 1.423 by sf-exg, Fri Jun 29 14:01:53 2012 UTC

1	/*---------------------------------------------------------------------------*	1	/*---------------------------------------------------------------------------*
2	* File: screen.C	2	* File: screen.C
3	*---------------------------------------------------------------------------*	3	*---------------------------------------------------------------------------*
4	*	4	*
5	* Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>	5	* Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6	* Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>	6	* Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de>
7	*	7	*
8	* This program is free software; you can redistribute it and/or modify	8	* This program is free software; you can redistribute it and/or modify
9	* it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
10	* the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation; either version 2 of the License, or
11	* (at your option) any later version.	11	* (at your option) any later version.
…		…
28	#include "rxvt.h" /* NECESSARY */	28	#include "rxvt.h" /* NECESSARY */
29	#include "rxvtperl.h" /* NECESSARY */	29	#include "rxvtperl.h" /* NECESSARY */
30		30
31	#include <inttypes.h>	31	#include <inttypes.h>
32		32
33	#include "salloc.C" // HACK, should be a separate compile!
34
35	static inline void	33	static inline void
36	fill_text (text_t *start, text_t value, int len)	34	fill_text (text_t *start, text_t value, int len)
37	{	35	{
38	while (len--)	36	while (len--)
39	*start++ = value;	37	*start++ = value;
40	}	38	}
41		39
42	/* ------------------------------------------------------------------------- */	40	/* ------------------------------------------------------------------------- */
43	#define PROP_SIZE 256*1024
44	#define PASTE_SIZE 32768
45	#define TABSIZE 8 /* default tab size */	41	#define TABSIZE 8 /* default tab size */
46		42
47	/* ------------------------------------------------------------------------- *	43	/* ------------------------------------------------------------------------- *
48	* GENERAL SCREEN AND SELECTION UPDATE ROUTINES *	44	* GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
49	* ------------------------------------------------------------------------- */	45	* ------------------------------------------------------------------------- */
…		…
100		96
101	/* Fill part/all of a line with blanks. */	97	/* Fill part/all of a line with blanks. */
102	void	98	void
103	rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW	99	rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW
104	{	100	{
105	if (!l.t)	101	if (!l.valid ())
106	{	102	{
107	lalloc (l);	103	l.alloc ();
108	col = 0;	104	col = 0;
109	width = ncol;	105	width = ncol;
110	}	106	}
111		107
112	l.touch ();	108	l.touch ();
…		…
143	while (col > 0 && l.t[col] == NOCHAR)	139	while (col > 0 && l.t[col] == NOCHAR)
144	col--;	140	col--;
145		141
146	rend_t rend = l.r[col] & ~RS_baseattrMask;	142	rend_t rend = l.r[col] & ~RS_baseattrMask;
147	rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));	143	rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
		144
		145	l.touch ();
148		146
149	// found start, nuke	147	// found start, nuke
150	do {	148	do {
151	l.t[col] = ' ';	149	l.t[col] = ' ';
152	l.r[col] = rend;	150	l.r[col] = rend;
…		…
157	/* ------------------------------------------------------------------------- *	155	/* ------------------------------------------------------------------------- *
158	* SCREEN INITIALISATION *	156	* SCREEN INITIALISATION *
159	* ------------------------------------------------------------------------- */	157	* ------------------------------------------------------------------------- */
160		158
161	void	159	void
		160	rxvt_term::scr_alloc () NOTHROW
		161	{
		162	int tsize = sizeof (text_t) * ncol;
		163	int rsize = sizeof (rend_t) * ncol;
		164
		165	// we assume that rend_t size is a sufficient alignment
		166	// factor for text_t and line_t values, and we only
		167	// need to adjust tsize.
		168	tsize = (tsize + sizeof (rend_t) - 1);
		169	tsize -= tsize % sizeof (rend_t);
		170
		171	int all_rows = total_rows + nrow + nrow;
		172
		173	chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows;
		174	chunk = chunk_alloc (chunk_size, 0);
		175
		176	char *base = (char *)chunk + sizeof (line_t) * all_rows;
		177
		178	for (int row = 0; row < all_rows; ++row)
		179	{
		180	line_t &l = ((line_t *)chunk) [row];
		181
		182	l.t = (text_t *)base; base += tsize;
		183	l.r = (rend_t *)base; base += rsize;
		184	l.l = -1;
		185	l.f = 0;
		186	}
		187
		188	drawn_buf = (line_t *)chunk;
		189	swap_buf = drawn_buf + nrow;
		190	row_buf = swap_buf + nrow;
		191	}
		192
		193	void ecb_cold
162	rxvt_term::scr_reset ()	194	rxvt_term::scr_reset ()
163	{	195	{
		196	#if ENABLE_OVERLAY
		197	scr_overlay_off ();
		198	#endif
		199
164	view_start = 0;	200	view_start = 0;
165	num_scr = 0;	201	num_scr = 0;
166		202
167	if (ncol == 0)	203	if (ncol == 0)
168	ncol = 80;	204	ncol = 80;
…		…
188	total_rows = nrow + saveLines;	224	total_rows = nrow + saveLines;
189		225
190	screen.tscroll = 0;	226	screen.tscroll = 0;
191	screen.bscroll = nrow - 1;	227	screen.bscroll = nrow - 1;
192		228
		229	void *prev_chunk = chunk;
		230	size_t prev_chunk_size = chunk_size;
		231	line_t *prev_drawn_buf = drawn_buf;
		232	line_t *prev_swap_buf = swap_buf;
		233	line_t *prev_row_buf = row_buf;
		234
		235	int common_col = min (prev_ncol, ncol);
		236
		237	scr_alloc ();
		238
193	if (!row_buf)	239	if (!prev_row_buf)
194	{	240	{
195	/*	241	/*
196	* first time called so just malloc everything: don't rely on realloc	242	* first time called (or after scr_release) so just malloc everything: don't rely on realloc
197	*/	243	*/
198	top_row = 0;	244	top_row = 0;
199	term_start = 0;	245	term_start = 0;
200
201	talloc = new rxvt_salloc (ncol * sizeof (text_t));
202	ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
203
204	row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
205	drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
206	swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
207
208	for (int row = nrow; row--; )
209	{
210	scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
211	scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
212	scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
213	}
214		246
215	memset (charsets, 'B', sizeof (charsets));	247	memset (charsets, 'B', sizeof (charsets));
216	rstyle = DEFAULT_RSTYLE;	248	rstyle = DEFAULT_RSTYLE;
217	screen.flags = Screen_DefaultFlags;	249	screen.flags = Screen_DefaultFlags;
218	screen.cur.row = screen.cur.col = 0;	250	screen.cur.row = screen.cur.col = 0;
…		…
241	{	273	{
242	/*	274	/*
243	* add or delete rows as appropriate	275	* add or delete rows as appropriate
244	*/	276	*/
245		277
246	rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
247	rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
248
249	#if 0
250	if (nrow < prev_nrow)
251	{
252	for (int row = nrow; row < prev_nrow; row++)
253	{
254	lfree (swap_buf [row]);
255	lfree (drawn_buf[row]);
256	}
257	}
258	#endif
259
260	drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
261	swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
262
263	for (int row = min (nrow, prev_nrow); row--; )	278	for (int row = min (nrow, prev_nrow); row--; )
264	{	279	{
265	lresize (drawn_buf[row]);	280	scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
266	lresize (swap_buf [row]);	281	scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
267	}
268		282
269	for (int row = prev_nrow; row < nrow; row++)	283	memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
		284	memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
		285	memcpy (swap_buf [row].t, prev_swap_buf [row].t, sizeof (text_t) * common_col);
		286	memcpy (swap_buf [row].r, prev_swap_buf [row].r, sizeof (rend_t) * common_col);
270	{	287	}
271	swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
272	drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
273	}
274
275	line_t *old_buf = row_buf;
276	row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
277		288
278	int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row	289	int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
279	int pend = MOD (term_start + top_row , prev_total_rows);	290	int pend = MOD (term_start + top_row , prev_total_rows);
280	int q = total_rows; // rewrapped row	291	int q = total_rows; // rewrapped row
281		292
…		…
289	ocur.row = MOD (term_start + ocur.row, prev_total_rows);	300	ocur.row = MOD (term_start + ocur.row, prev_total_rows);
290		301
291	do	302	do
292	{	303	{
293	p = MOD (p - 1, prev_total_rows);	304	p = MOD (p - 1, prev_total_rows);
294	assert (old_buf [MOD (p, prev_total_rows)].t);	305	assert (prev_row_buf [MOD (p, prev_total_rows)].t);
295	int plines = 1;	306	int plines = 1;
296	int llen = old_buf [MOD (p, prev_total_rows)].l;	307	int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
297		308
298	while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())	309	while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ())
299	{	310	{
300	p = MOD (p - 1, prev_total_rows);	311	p = MOD (p - 1, prev_total_rows);
301		312
302	plines++;	313	plines++;
303	llen += prev_ncol;	314	llen += prev_ncol;
…		…
316		327
317	// re-assemble the full line by destination lines	328	// re-assemble the full line by destination lines
318	for (int qrow = q; qlines--; qrow++)	329	for (int qrow = q; qlines--; qrow++)
319	{	330	{
320	qline = row_buf + qrow;	331	qline = row_buf + qrow;
321	lalloc (*qline);	332	qline->alloc (); // redundant with next line
322	qline->l = ncol;	333	qline->l = ncol;
323	qline->is_longer (1);	334	qline->is_longer (1);
324		335
325	int qcol = 0;	336	int qcol = 0;
326		337
…		…
341	// this seems to upset applications/shells/readline	352	// this seems to upset applications/shells/readline
342	// least.	353	// least.
343	if (prow == ocur.row)	354	if (prow == ocur.row)
344	screen.cur.row = q - (total_rows - nrow);	355	screen.cur.row = q - (total_rows - nrow);
345		356
346	line_t &pline = old_buf [prow];	357	line_t &pline = prev_row_buf [prow];
347		358
348	int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);	359	int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
349		360
350	memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));	361	memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
351	memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));	362	memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
…		…
372	{	383	{
373	// if no scrollback exists (yet), wing, instead of wrap	384	// if no scrollback exists (yet), wing, instead of wrap
374		385
375	for (int row = min (nrow, prev_nrow); row--; )	386	for (int row = min (nrow, prev_nrow); row--; )
376	{	387	{
377	line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];	388	line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
378	line_t &qline = row_buf [row];	389	line_t &dst = row_buf [row];
379		390
380	qline = pline;	391	scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
381	lresize (qline);	392
		393	memcpy (dst.t, src.t, sizeof (text_t) * common_col);
		394	memcpy (dst.r, src.r, sizeof (rend_t) * common_col);
382	}	395	}
383		396
384	for (int row = prev_nrow; row < nrow; row++)	397	for (int row = prev_nrow; row < nrow; row++)
385	{
386	row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);	398	scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
387	}
388		399
389	term_start = 0;	400	term_start = 0;
390	}	401	}
391
392	free (old_buf);
393	delete old_ta;
394	delete old_ra;
395		402
396	clamp_it (screen.cur.row, 0, nrow - 1);	403	clamp_it (screen.cur.row, 0, nrow - 1);
397	clamp_it (screen.cur.col, 0, ncol - 1);	404	clamp_it (screen.cur.col, 0, ncol - 1);
398	}	405	}
399		406
		407	for (int row = nrow; row--; )
		408	{
		409	if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
		410	if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
		411	if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
		412	}
		413
		414	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
		926	rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
		927
		928	// if the character doesn't fit into the remaining columns...
		929	if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
		930	{
		931	if (screen.flags & Screen_Autowrap)
		932	{
		933	// ... artificially enlargen the previous one
		934	c = NOCHAR;
		935	// and try the same character next loop iteration
		936	--str;
		937	}
		938	else
		939	screen.cur.col = ncol - width;
		940	}
		941
903	// nuke the character at this position, if required	942	// nuke the character at this position, if required
904	if (expect_false (	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.
905	line->t[screen.cur.col] == NOCHAR	946	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);	947	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		948
922	line->touch ();	949	line->touch ();
923		950
924	do	951	do
925	{	952	{
926	line->t[screen.cur.col] = c;	953	line->t[screen.cur.col] = c;
927	line->r[screen.cur.col] = rend;	954	line->r[screen.cur.col] = rend;
928		955
929	if (expect_true (screen.cur.col < ncol - 1))	956	if (ecb_likely (screen.cur.col < ncol - 1))
930	screen.cur.col++;	957	screen.cur.col++;
931	else	958	else
932	{	959	{
933	line->l = ncol;	960	line->l = ncol;
934	if (screen.flags & Screen_Autowrap)	961	if (screen.flags & Screen_Autowrap)
935	screen.flags |= Screen_WrapNext;	962	screen.flags |= Screen_WrapNext;
936	break;	963
		964	goto end_of_line;
937	}	965	}
938		966
939	c = NOCHAR;	967	c = NOCHAR;
940	}	968	}
941	while (expect_false (--width > 0));	969	while (ecb_unlikely (--width > 0));
942		970
943	// pad with spaces when overwriting wide character with smaller one	971	// pad with spaces when overwriting wide character with smaller one
944	if (expect_false (!width))	972	for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
945	{	973	{
946	line->touch ();
947
948	for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
949	{
950	line->t[c] = ' ';	974	line->t[c] = ' ';
951	line->r[c] = rend;	975	line->r[c] = rend;
952	}
953	}	976	}
		977
		978	end_of_line:
		979	;
954	}	980	}
955	#if ENABLE_COMBINING	981	#if ENABLE_COMBINING
956	else // width == 0	982	else // width == 0
957	{	983	{
958	if (c != 0xfeff) // ignore BOM	984	if (c != 0xfeff) // ignore BOM
…		…
1021		1047
1022	want_refresh = 1;	1048	want_refresh = 1;
1023	#endif	1049	#endif
1024	}	1050	}
1025	}	1051	}
		1052	else if (screen.flags & Screen_WrapNext)
		1053	screen.flags &= ~Screen_WrapNext;
1026	else	1054	else
1027	scr_gotorc (0, -1, RELATIVE);	1055	scr_gotorc (0, -1, RELATIVE);
1028	}	1056	}
1029		1057
1030	/* ------------------------------------------------------------------------- */	1058	/* ------------------------------------------------------------------------- */
…		…
1108	* XTERM_SEQ: ESC 6	1136	* XTERM_SEQ: ESC 6
1109	* 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
1110	* in that row right. Clear left column.	1138	* in that row right. Clear left column.
1111	*/	1139	*/
1112	#if !ENABLE_MINIMAL	1140	#if !ENABLE_MINIMAL
1113	void	1141	void ecb_cold
1114	rxvt_term::scr_backindex () NOTHROW	1142	rxvt_term::scr_backindex () NOTHROW
1115	{	1143	{
1116	if (screen.cur.col > 0)	1144	if (screen.cur.col > 0)
1117	scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);	1145	scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1118	else	1146	else
…		…
1125	* XTERM_SEQ: ESC 9	1153	* XTERM_SEQ: ESC 9
1126	* 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
1127	* in that row left. Clear right column.	1155	* in that row left. Clear right column.
1128	*/	1156	*/
1129	#if !ENABLE_MINIMAL	1157	#if !ENABLE_MINIMAL
1130	void	1158	void ecb_cold
1131	rxvt_term::scr_forwardindex () NOTHROW	1159	rxvt_term::scr_forwardindex () NOTHROW
1132	{	1160	{
1133	if (screen.cur.col < ncol - 1)	1161	if (screen.cur.col < ncol - 1)
1134	scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);	1162	scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1135	else	1163	else
…		…
1286	scr_blank_line (line, col, num, rstyle);	1314	scr_blank_line (line, col, num, rstyle);
1287	}	1315	}
1288		1316
1289	/* ------------------------------------------------------------------------- */	1317	/* ------------------------------------------------------------------------- */
1290	/*	1318	/*
1291	* Erase part of whole of the screen	1319	* Erase part or whole of the screen
1292	* XTERM_SEQ: Clear screen after cursor : ESC [ 0 J	1320	* XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1293	* XTERM_SEQ: Clear screen before cursor: ESC [ 1 J	1321	* XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1294	* XTERM_SEQ: Clear whole screen : ESC [ 2 J	1322	* XTERM_SEQ: Clear whole screen : ESC [ 2 J
1295	*/	1323	*/
1296	void	1324	void
…		…
1305	ZERO_SCROLLBACK ();	1333	ZERO_SCROLLBACK ();
1306		1334
1307	switch (mode)	1335	switch (mode)
1308	{	1336	{
1309	case 0: /* erase to end of screen */	1337	case 0: /* erase to end of screen */
1310	selection_check (1);
1311	scr_erase_line (0);	1338	scr_erase_line (0);
1312	row = screen.cur.row + 1; /* possible OOB */	1339	row = screen.cur.row + 1; /* possible OOB */
1313	num = nrow - row;	1340	num = nrow - row;
1314	break;	1341	break;
1315	case 1: /* erase to beginning of screen */	1342	case 1: /* erase to beginning of screen */
1316	selection_check (3);
1317	scr_erase_line (1);	1343	scr_erase_line (1);
1318	row = 0;	1344	row = 0;
1319	num = screen.cur.row;	1345	num = screen.cur.row;
1320	break;	1346	break;
1321	case 2: /* erase whole screen */	1347	case 2: /* erase whole screen */
1322	selection_check (3);
1323	row = 0;	1348	row = 0;
1324	num = nrow;	1349	num = nrow;
1325	break;	1350	break;
1326	default:	1351	default:
1327	return;	1352	return;
…		…
1344	{	1369	{
1345	ren = DEFAULT_RSTYLE;	1370	ren = DEFAULT_RSTYLE;
1346		1371
1347	if (mapped)	1372	if (mapped)
1348	XClearArea (dpy, vt, 0,	1373	XClearArea (dpy, vt, 0,
1349	Row2Pixel (row - view_start), (unsigned int)width,	1374	Row2Pixel (row - view_start), (unsigned int)vt_width,
1350	(unsigned int)Height2Pixel (num), False);	1375	(unsigned int)Height2Pixel (num), False);
1351	}	1376	}
1352	else	1377	else
1353	{	1378	{
1354	ren = rstyle & (RS_fgMask | RS_bgMask);	1379	ren = rstyle & (RS_fgMask | RS_bgMask);
…		…
1357	{	1382	{
1358	gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];	1383	gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1359	XChangeGC (dpy, gc, GCForeground, &gcvalue);	1384	XChangeGC (dpy, gc, GCForeground, &gcvalue);
1360	XFillRectangle (dpy, vt, gc,	1385	XFillRectangle (dpy, vt, gc,
1361	0, Row2Pixel (row - view_start),	1386	0, Row2Pixel (row - view_start),
1362	(unsigned int)width,	1387	(unsigned int)vt_width,
1363	(unsigned int)Height2Pixel (num));	1388	(unsigned int)Height2Pixel (num));
1364	gcvalue.foreground = pix_colors[Color_fg];	1389	gcvalue.foreground = pix_colors[Color_fg];
1365	XChangeGC (dpy, gc, GCForeground, &gcvalue);	1390	XChangeGC (dpy, gc, GCForeground, &gcvalue);
1366	}	1391	}
1367	}	1392	}
…		…
1389	/* ------------------------------------------------------------------------- */	1414	/* ------------------------------------------------------------------------- */
1390	/*	1415	/*
1391	* Fill the screen with `E's	1416	* Fill the screen with `E's
1392	* XTERM_SEQ: Screen Alignment Test: ESC # 8	1417	* XTERM_SEQ: Screen Alignment Test: ESC # 8
1393	*/	1418	*/
1394	void	1419	void ecb_cold
1395	rxvt_term::scr_E () NOTHROW	1420	rxvt_term::scr_E () NOTHROW
1396	{	1421	{
1397	rend_t fs;	1422	rend_t fs;
1398		1423
1399	want_refresh = 1;	1424	want_refresh = 1;
1400	ZERO_SCROLLBACK ();	1425	ZERO_SCROLLBACK ();
1401		1426
1402	num_scr_allow = 0;	1427	num_scr_allow = 0;
1403	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 ();
1404		1433
1405	fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));	1434	fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1406	for (int row = nrow; row--; )	1435	for (int row = nrow; row--; )
1407	{	1436	{
1408	line_t &line = ROW(row);	1437	line_t &line = ROW(row);
…		…
1559	/* ------------------------------------------------------------------------- */	1588	/* ------------------------------------------------------------------------- */
1560	/*	1589	/*
1561	* Set the scrolling region	1590	* Set the scrolling region
1562	* XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r	1591	* XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1563	*/	1592	*/
1564	void	1593	void ecb_cold
1565	rxvt_term::scr_scroll_region (int top, int bot) NOTHROW	1594	rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1566	{	1595	{
1567	max_it (top, 0);	1596	max_it (top, 0);
1568	min_it (bot, nrow - 1);	1597	min_it (bot, nrow - 1);
1569		1598
…		…
1579	/*	1608	/*
1580	* Make the cursor visible/invisible	1609	* Make the cursor visible/invisible
1581	* XTERM_SEQ: Make cursor visible : ESC [ ? 25 h	1610	* XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1582	* XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l	1611	* XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1583	*/	1612	*/
1584	void	1613	void ecb_cold
1585	rxvt_term::scr_cursor_visible (int mode) NOTHROW	1614	rxvt_term::scr_cursor_visible (int mode) NOTHROW
1586	{	1615	{
1587	want_refresh = 1;	1616	want_refresh = 1;
1588		1617
1589	if (mode)	1618	if (mode)
…		…
1596	/*	1625	/*
1597	* Set/unset automatic wrapping	1626	* Set/unset automatic wrapping
1598	* XTERM_SEQ: Set Wraparound : ESC [ ? 7 h	1627	* XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1599	* XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l	1628	* XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1600	*/	1629	*/
1601	void	1630	void ecb_cold
1602	rxvt_term::scr_autowrap (int mode) NOTHROW	1631	rxvt_term::scr_autowrap (int mode) NOTHROW
1603	{	1632	{
1604	if (mode)	1633	if (mode)
1605	screen.flags |= Screen_Autowrap;	1634	screen.flags |= Screen_Autowrap;
1606	else	1635	else
…		…
1615	* 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
1616	* and the cursor cannot be moved outside.	1645	* and the cursor cannot be moved outside.
1617	* XTERM_SEQ: Set Absolute: ESC [ ? 6 h	1646	* XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1618	* XTERM_SEQ: Set Relative: ESC [ ? 6 l	1647	* XTERM_SEQ: Set Relative: ESC [ ? 6 l
1619	*/	1648	*/
1620	void	1649	void ecb_cold
1621	rxvt_term::scr_relative_origin (int mode) NOTHROW	1650	rxvt_term::scr_relative_origin (int mode) NOTHROW
1622	{	1651	{
1623	if (mode)	1652	if (mode)
1624	screen.flags |= Screen_Relative;	1653	screen.flags |= Screen_Relative;
1625	else	1654	else
…		…
1632	/*	1661	/*
1633	* Set insert/replace mode	1662	* Set insert/replace mode
1634	* XTERM_SEQ: Set Insert mode : ESC [ ? 4 h	1663	* XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1635	* XTERM_SEQ: Set Replace mode: ESC [ ? 4 l	1664	* XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1636	*/	1665	*/
1637	void	1666	void ecb_cold
1638	rxvt_term::scr_insert_mode (int mode) NOTHROW	1667	rxvt_term::scr_insert_mode (int mode) NOTHROW
1639	{	1668	{
1640	if (mode)	1669	if (mode)
1641	screen.flags |= Screen_Insert;	1670	screen.flags |= Screen_Insert;
1642	else	1671	else
…		…
1648	* Set/Unset tabs	1677	* Set/Unset tabs
1649	* XTERM_SEQ: Set tab at current column : ESC H	1678	* XTERM_SEQ: Set tab at current column : ESC H
1650	* XTERM_SEQ: Clear tab at current column: ESC [ 0 g	1679	* XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1651	* XTERM_SEQ: Clear all tabs : ESC [ 3 g	1680	* XTERM_SEQ: Clear all tabs : ESC [ 3 g
1652	*/	1681	*/
1653	void	1682	void ecb_cold
1654	rxvt_term::scr_set_tab (int mode) NOTHROW	1683	rxvt_term::scr_set_tab (int mode) NOTHROW
1655	{	1684	{
1656	if (mode < 0)	1685	if (mode < 0)
1657	memset (tabs, 0, ncol);	1686	memset (tabs, 0, ncol);
1658	else if (screen.cur.col < ncol)	1687	else if (screen.cur.col < ncol)
…		…
1678	{	1707	{
1679	rvideo_state = on;	1708	rvideo_state = on;
1680		1709
1681	::swap (pix_colors[Color_fg], pix_colors[Color_bg]);	1710	::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1682	#ifdef HAVE_BG_PIXMAP	1711	#ifdef HAVE_BG_PIXMAP
1683	if (bgPixmap.pixmap == None)	1712	if (bg_img == 0)
1684	#endif	1713	#endif
1685	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);	1714	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1686		1715
1687	XGCValues gcvalue;	1716	XGCValues gcvalue;
1688	gcvalue.foreground = pix_colors[Color_fg];	1717	gcvalue.foreground = pix_colors[Color_fg];
…		…
1697	/* ------------------------------------------------------------------------- */	1726	/* ------------------------------------------------------------------------- */
1698	/*	1727	/*
1699	* Report current cursor position	1728	* Report current cursor position
1700	* XTERM_SEQ: Report position: ESC [ 6 n	1729	* XTERM_SEQ: Report position: ESC [ 6 n
1701	*/	1730	*/
1702	void	1731	void ecb_cold
1703	rxvt_term::scr_report_position () NOTHROW	1732	rxvt_term::scr_report_position () NOTHROW
1704	{	1733	{
1705	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);
1706	}	1735	}
1707		1736
…		…
1710	* ------------------------------------------------------------------------- */	1739	* ------------------------------------------------------------------------- */
1711		1740
1712	/*	1741	/*
1713	* Set font style	1742	* Set font style
1714	*/	1743	*/
1715	void	1744	void ecb_cold
1716	rxvt_term::set_font_style () NOTHROW	1745	rxvt_term::set_font_style () NOTHROW
1717	{	1746	{
1718	#if 0	1747	#if 0
1719	switch (charsets [screen.charset])	1748	switch (charsets [screen.charset])
1720	{	1749	{
…		…
1742	* XTERM_SEQ: Invoke G0 character set: CTRL-O	1771	* XTERM_SEQ: Invoke G0 character set: CTRL-O
1743	* XTERM_SEQ: Invoke G1 character set: CTRL-N	1772	* XTERM_SEQ: Invoke G1 character set: CTRL-N
1744	* XTERM_SEQ: Invoke G2 character set: ESC N	1773	* XTERM_SEQ: Invoke G2 character set: ESC N
1745	* XTERM_SEQ: Invoke G3 character set: ESC O	1774	* XTERM_SEQ: Invoke G3 character set: ESC O
1746	*/	1775	*/
1747	void	1776	void ecb_cold
1748	rxvt_term::scr_charset_choose (int set) NOTHROW	1777	rxvt_term::scr_charset_choose (int set) NOTHROW
1749	{	1778	{
1750	screen.charset = set;	1779	screen.charset = set;
1751	set_font_style ();	1780	set_font_style ();
1752	}	1781	}
…		…
1773	* ------------------------------------------------------------------------- */	1802	* ------------------------------------------------------------------------- */
1774		1803
1775	/*	1804	/*
1776	* refresh matching text.	1805	* refresh matching text.
1777	*/	1806	*/
1778	bool	1807	bool ecb_cold
1779	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
1780	{	1809	{
1781	bool found = false;	1810	bool found = false;
1782		1811
1783	for (int i = 0; i < nrow; i++)	1812	for (int i = 0; i < nrow; i++)
…		…
1802	PART_BEG = 0,	1831	PART_BEG = 0,
1803	PART_END,	1832	PART_END,
1804	RC_COUNT	1833	RC_COUNT
1805	};	1834	};
1806		1835
1807	void	1836	void ecb_hot
1808	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
1809	{	1838	{
1810	int i;	1839	int i;
1811	row_col_t rc[RC_COUNT];	1840	row_col_t rc[RC_COUNT];
1812		1841
…		…
1849	* Refresh the entire screen	1878	* Refresh the entire screen
1850	*/	1879	*/
1851	void	1880	void
1852	rxvt_term::scr_touch (bool refresh) NOTHROW	1881	rxvt_term::scr_touch (bool refresh) NOTHROW
1853	{	1882	{
1854	scr_expose (0, 0, width, height, refresh);	1883	scr_expose (0, 0, vt_width, vt_height, refresh);
1855	}	1884	}
1856		1885
1857	/* ------------------------------------------------------------------------- */	1886	/* ------------------------------------------------------------------------- */
1858	/*	1887	/*
1859	* 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
…		…
1915		1944
1916	# ifndef NO_MAPALERT	1945	# ifndef NO_MAPALERT
1917	# ifdef MAPALERT_OPTION	1946	# ifdef MAPALERT_OPTION
1918	if (option (Opt_mapAlert))	1947	if (option (Opt_mapAlert))
1919	# endif	1948	# endif
1920	XMapWindow (dpy, parent[0]);	1949	XMapWindow (dpy, parent);
1921	# endif	1950	# endif
1922		1951
1923	# if ENABLE_FRILLS	1952	# if ENABLE_FRILLS
1924	if (option (Opt_urgentOnBell))	1953	if (option (Opt_urgentOnBell))
1925	set_urgency (1);	1954	set_urgency (1);
…		…
1938	HOOK_INVOKE ((this, HOOK_BELL, DT_END));	1967	HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1939	#endif	1968	#endif
1940	}	1969	}
1941		1970
1942	/* ------------------------------------------------------------------------- */	1971	/* ------------------------------------------------------------------------- */
1943	/* ARGSUSED */	1972	void ecb_cold
1944	void
1945	rxvt_term::scr_printscreen (int fullhist) NOTHROW	1973	rxvt_term::scr_printscreen (int fullhist) NOTHROW
1946	{	1974	{
1947	#ifdef PRINTPIPE	1975	#ifdef PRINTPIPE
1948	int nrows, row_start;	1976	int nrows, row_start;
1949	FILE *fd = popen_printer ();	1977	FILE *fd = popen_printer ();
…		…
1998	/*	2026	/*
1999	* Refresh the screen	2027	* Refresh the screen
2000	* drawn_text/drawn_rend contain the screen information before the update.	2028	* drawn_text/drawn_rend contain the screen information before the update.
2001	* screen.text/screen.rend contain what the screen will change to.	2029	* screen.text/screen.rend contain what the screen will change to.
2002	*/	2030	*/
2003	void	2031	void ecb_hot
2004	rxvt_term::scr_refresh () NOTHROW	2032	rxvt_term::scr_refresh () NOTHROW
2005	{	2033	{
2006	int16_t col, row, /* column/row we're processing */	2034	int16_t col, row, /* column/row we're processing */
2007	ocrow; /* old cursor row */	2035	ocrow; /* old cursor row */
2008	int i; /* tmp */	2036	int i; /* tmp */
…		…
2022	* A: set up vars	2050	* A: set up vars
2023	*/	2051	*/
2024	refresh_count = 0;	2052	refresh_count = 0;
2025		2053
2026	unsigned int old_screen_flags = screen.flags;	2054	unsigned int old_screen_flags = screen.flags;
2027	char have_bg = 0;	2055	bool have_bg = 0;
2028	#ifdef HAVE_BG_PIXMAP	2056	#ifdef HAVE_BG_PIXMAP
2029	have_bg = bgPixmap.pixmap != None;	2057	have_bg = bg_img != 0;
2030	#endif	2058	#endif
2031	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */	2059	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2032		2060
2033	/*	2061	/*
2034	* B: reverse any characters which are selected	2062	* B: reverse any characters which are selected
…		…
2038	HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));	2066	HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2039	#if ENABLE_OVERLAY	2067	#if ENABLE_OVERLAY
2040	scr_swap_overlay ();	2068	scr_swap_overlay ();
2041	#endif	2069	#endif
2042		2070
2043	char showcursor = screen.flags & Screen_VisibleCursor;	2071	bool showcursor = screen.flags & Screen_VisibleCursor;
2044		2072
2045	/*	2073	/*
2046	* C: set the cursor character (s)	2074	* C: set the cursor character (s)
2047	*/	2075	*/
2048	{	2076	{
2049	unsigned char setoldcursor;	2077	bool setoldcursor;
2050		2078
2051	#ifdef CURSOR_BLINK	2079	#ifdef CURSOR_BLINK
2052	if (hidden_cursor)	2080	if (hidden_cursor)
2053	showcursor = 0;	2081	showcursor = 0;
2054	#endif	2082	#endif
…		…
2141	{	2169	{
2142	int16_t nits;	2170	int16_t nits;
2143	int i = num_scr;	2171	int i = num_scr;
2144	int j;	2172	int j;
2145	int len, wlen;	2173	int len, wlen;
2146	dLocal (int, num_scr);
2147		2174
2148	j = nrow;	2175	j = nrow;
2149	wlen = len = -1;	2176	wlen = len = -1;
2150	row = i > 0 ? 0 : j - 1;	2177	row = i > 0 ? 0 : j - 1;
2151		2178
…		…
2226	continue;	2253	continue;
2227		2254
2228	// redraw one or more characters	2255	// redraw one or more characters
2229		2256
2230	// seek to the beginning of wide characters	2257	// seek to the beginning of wide characters
2231	while (expect_false (stp[col] == NOCHAR && col > 0))	2258	while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2232	--col;	2259	--col;
2233		2260
2234	rend_t rend = srp[col]; /* screen rendition (target rendition) */	2261	rend_t rend = srp[col]; /* screen rendition (target rendition) */
2235	text_t *text = stp + col;	2262	text_t *text = stp + col;
2236	int count = 1;	2263	int count = 1;
…		…
2274		2301
2275	col--; /* went one too far. move back */	2302	col--; /* went one too far. move back */
2276	count -= i; /* dump any matching trailing chars */	2303	count -= i; /* dump any matching trailing chars */
2277		2304
2278	// sometimes we optimize away the trailing NOCHAR's, add them back	2305	// sometimes we optimize away the trailing NOCHAR's, add them back
2279	while (expect_false (i && text[count] == NOCHAR))	2306	while (ecb_unlikely (i && text[count] == NOCHAR))
2280	count++, i--;	2307	count++, i--;
2281		2308
2282	/*	2309	/*
2283	* Determine the attributes for the string	2310	* Determine the attributes for the string
2284	*/	2311	*/
2285	int fore = fgcolor_of (rend); // desired foreground	2312	int fore = fgcolor_of (rend); // desired foreground
2286	int back = bgcolor_of (rend); // desired background	2313	int back = bgcolor_of (rend); // desired background
2287		2314
2288	// 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
2289	if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))	2316	if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2290	{	2317	{
2291	bool invert = rend & RS_RVid;	2318	bool invert = rend & RS_RVid;
2292		2319
2293	#ifndef NO_BOLD_UNDERLINE_REVERSE	2320	#ifndef NO_BOLD_UNDERLINE_REVERSE
2294	if (rend & RS_Bold && fore == Color_fg)	2321	if (rend & RS_Bold && fore == Color_fg)
…		…
2383	/*	2410	/*
2384	* Actually do the drawing of the string here	2411	* Actually do the drawing of the string here
2385	*/	2412	*/
2386	rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];	2413	rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2387		2414
2388	if (expect_true (have_bg && back == Color_bg))	2415	if (ecb_likely (have_bg && back == Color_bg))
2389	{	2416	{
2390	// this is very ugly, maybe push it into ->draw?	2417	// this is very ugly, maybe push it into ->draw?
2391		2418
2392	for (i = 0; i < count; i++) /* don't draw empty strings */	2419	for (i = 0; i < count; i++) /* don't draw empty strings */
2393	if (text[i] != ' ')	2420	if (text[i] != ' ')
…		…
2400	did_clear: ;	2427	did_clear: ;
2401	}	2428	}
2402	else	2429	else
2403	font->draw (*drawable, xpixel, ypixel, text, count, fore, back);	2430	font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2404		2431
2405	if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))	2432	if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2406	{	2433	{
2407	#if ENABLE_FRILLS	2434	#if ENABLE_FRILLS
2408	if (ISSET_PIXCOLOR (Color_underline))	2435	if (ISSET_PIXCOLOR (Color_underline))
2409	XSetForeground (dpy, gc, pix_colors[Color_underline]);	2436	XSetForeground (dpy, gc, pix_colors[Color_underline]);
2410	else	2437	else
…		…
2456		2483
2457	XDrawRectangle (dpy, vt, gc,	2484	XDrawRectangle (dpy, vt, gc,
2458	Col2Pixel (col),	2485	Col2Pixel (col),
2459	Row2Pixel (oldcursor.row),	2486	Row2Pixel (oldcursor.row),
2460	(unsigned int) (Width2Pixel (cursorwidth) - 1),	2487	(unsigned int) (Width2Pixel (cursorwidth) - 1),
2461	(unsigned int) (Height2Pixel (1) - lineSpace - 1));	2488	(unsigned int) (Height2Pixel (1) - 1));
2462	}	2489	}
2463	}	2490	}
2464		2491
2465	/*	2492	/*
2466	* H: cleanup selection	2493	* H: cleanup selection
…		…
2475	screen.flags = old_screen_flags;	2502	screen.flags = old_screen_flags;
2476	num_scr = 0;	2503	num_scr = 0;
2477	num_scr_allow = 1;	2504	num_scr_allow = 1;
2478	}	2505	}
2479		2506
2480	void	2507	void ecb_cold
2481	rxvt_term::scr_remap_chars (line_t &l) NOTHROW	2508	rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2482	{	2509	{
2483	if (!l.t)	2510	if (!l.valid ())
2484	return;	2511	return;
2485		2512
2486	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
2487		2514
2488	for (int i = ncol; i--; )	2515	for (int i = ncol; i--; )
2489	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]));
2490	}	2517	}
2491		2518
2492	void	2519	void ecb_cold
2493	rxvt_term::scr_remap_chars () NOTHROW	2520	rxvt_term::scr_remap_chars () NOTHROW
2494	{	2521	{
2495	for (int i = total_rows; i--; )	2522	for (int i = total_rows; i--; )
2496	scr_remap_chars (row_buf [i]);	2523	scr_remap_chars (row_buf [i]);
2497		2524
…		…
2500	scr_remap_chars (drawn_buf [i]);	2527	scr_remap_chars (drawn_buf [i]);
2501	scr_remap_chars (swap_buf [i]);	2528	scr_remap_chars (swap_buf [i]);
2502	}	2529	}
2503	}	2530	}
2504		2531
2505	void	2532	void ecb_cold
2506	rxvt_term::scr_recolour () NOTHROW	2533	rxvt_term::scr_recolour (bool refresh) NOTHROW
2507	{	2534	{
		2535	bool transparent = false;
		2536
2508	#ifdef HAVE_BG_PIXMAP	2537	#ifdef HAVE_BG_PIXMAP
2509	bgPixmap.apply ();	2538	if (bg_img != 0)
2510	#else	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);
2511		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	{
2512	XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);	2558	XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2513	XClearWindow (dpy, parent[0]);
2514	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);	2559	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
		2560	}
		2561
		2562	XClearWindow (dpy, parent);
2515		2563
2516	if (scrollBar.win)	2564	if (scrollBar.win)
2517	{	2565	{
		2566	if (transparent)
		2567	XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
		2568	else
2518	XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);	2569	XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2519	scrollBar.state = STATE_IDLE;	2570	scrollBar.state = SB_STATE_IDLE;
2520	scrollBar.show (0);	2571	scrollBar.show (0);
2521	}	2572	}
2522		2573
2523	#endif	2574	if (refresh)
2524		2575	{
2525	/* bgPixmap.apply () does not do the following : */
2526	scr_clear ();	2576	scr_clear ();
2527	scr_touch (true);	2577	scr_touch (true);
		2578	}
2528	want_refresh = 1;	2579	want_refresh = 1;
2529	}	2580	}
2530		2581
2531	/* ------------------------------------------------------------------------- */	2582	/* ------------------------------------------------------------------------- */
2532	void	2583	void
…		…
2589	for (rend_t *srp = ROW(row).r; col < end_col; col++)	2640	for (rend_t *srp = ROW(row).r; col < end_col; col++)
2590	srp[col] ^= rstyle;	2641	srp[col] ^= rstyle;
2591	}	2642	}
2592		2643
2593	/* ------------------------------------------------------------------------- */	2644	/* ------------------------------------------------------------------------- */
2594	void	2645	void ecb_hot
2595	rxvt_term::scr_reverse_selection () NOTHROW	2646	rxvt_term::scr_reverse_selection () NOTHROW
2596	{	2647	{
2597	if (selection.op	2648	if (selection.op
2598	&& current_screen == selection.screen	2649	&& current_screen == selection.screen
2599	&& selection.end.row >= view_start)	2650	&& selection.end.row >= view_start)
…		…
2618	*/	2669	*/
2619	#if 0	2670	#if 0
2620	void	2671	void
2621	rxvt_term::scr_dump (int fd) NOTHROW	2672	rxvt_term::scr_dump (int fd) NOTHROW
2622	{	2673	{
2623	int row, wrote;	2674	// if this method is needed, it can be implemented by factoring the
2624	unsigned int width, towrite;	2675	// relevant code in scr_printscreen
2625	char r1[] = "\n";
2626
2627	for (row = saveLines + top_row;
2628	row < saveLines + nrow - 1; row++)
2629	{
2630	width = row_buf[row].l >= 0 ? row_buf[row].l
2631	: ncol;
2632	for (towrite = width; towrite; towrite -= wrote)
2633	{
2634	wrote = write (fd, & (row_buf[row].t[width - towrite]),
2635	towrite);
2636	if (wrote < 0)
2637	return; /* XXX: death, no report */
2638	}
2639	if (row_buf[row].l >= 0)
2640	if (write (fd, r1, 1) <= 0)
2641	return; /* XXX: death, no report */
2642	}
2643	}	2676	}
2644	#endif	2677	#endif
2645		2678
2646	/* ------------------------------------------------------------------------- *	2679	/* ------------------------------------------------------------------------- *
2647	* CHARACTER SELECTION *	2680	* CHARACTER SELECTION *
2648	* ------------------------------------------------------------------------- */	2681	* ------------------------------------------------------------------------- */
2649	void	2682	void
2650	rxvt_term::selection_check (int check_more) NOTHROW	2683	rxvt_term::selection_check (int check_more) NOTHROW
2651	{	2684	{
2652	row_col_t pos;
2653
2654	if (!selection.op)	2685	if (!selection.op)
2655	return;	2686	return;
2656		2687
2657	pos.row = pos.col = 0;
2658	if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)	2688	if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2659	|| !IN_RANGE_EXC (selection.mark.row, top_row, nrow)	2689	|| !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2660	|| !IN_RANGE_EXC (selection.end.row, top_row, nrow)	2690	|| !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2661	|| (check_more == 1	2691	|| (check_more == 1
2662	&& current_screen == selection.screen	2692	&& current_screen == selection.screen
2663	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)	2693	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2664	&& ROWCOL_IS_BEFORE (screen.cur, selection.end))	2694	&& ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2665	|| (check_more == 2
2666	&& ROWCOL_IS_BEFORE (selection.beg, pos)
2667	&& ROWCOL_IS_AFTER (selection.end, pos))
2668	|| (check_more == 3
2669	&& ROWCOL_IS_AFTER (selection.end, pos))
2670	|| (check_more == 4 /* screen width change */
2671	&& (selection.beg.row != selection.end.row
2672	|| selection.end.col > ncol)))
2673	CLEAR_SELECTION ();	2695	CLEAR_ALL_SELECTION ();
2674	}	2696	}
2675		2697
2676	/* ------------------------------------------------------------------------- */	2698	/* ------------------------------------------------------------------------- */
2677	/*	2699	/*
2678	* Paste a selection direct to the command fd	2700	* Paste a selection direct to the command fd
…		…
2684	for (unsigned int i = 0; i < len; i++)	2706	for (unsigned int i = 0; i < len; i++)
2685	if (data[i] == C0_LF)	2707	if (data[i] == C0_LF)
2686	data[i] = C0_CR;	2708	data[i] = C0_CR;
2687		2709
2688	if (priv_modes & PrivMode_BracketPaste)	2710	if (priv_modes & PrivMode_BracketPaste)
2689	tt_printf ("\e[200~");	2711	tt_printf ("\x1b[200~");
2690		2712
2691	tt_write (data, len);	2713	tt_write (data, len);
2692		2714
2693	if (priv_modes & PrivMode_BracketPaste)	2715	if (priv_modes & PrivMode_BracketPaste)
2694	tt_printf ("\e[201~");	2716	tt_printf ("\x1b[201~");
2695	}	2717	}
2696		2718
2697	void	2719	void
2698	rxvt_term::paste (char *data, unsigned int len) NOTHROW	2720	rxvt_term::paste (char *data, unsigned int len) NOTHROW
2699	{	2721	{
…		…
2703	tt_paste (data, len);	2725	tt_paste (data, len);
2704	}	2726	}
2705		2727
2706	/* ------------------------------------------------------------------------- */	2728	/* ------------------------------------------------------------------------- */
2707	/*	2729	/*
2708	* Respond to a notification that a primary selection has been sent	2730	* Request PRIMARY, SECONDARY or CLIPBOARD selection.
2709	* EXT: SelectionNotify	2731	* if the requested selection has no owner or is empty CUT_BUFFER0 is used
2710	*/	2732	* as fallback
2711	void
2712	rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2713	{
2714	if (prop == None) /* check for failed XConvertSelection */
2715	{
2716	if ((selection_type & Sel_CompoundText))
2717	{
2718	int selnum = selection_type & Sel_whereMask;
2719
2720	selection_type = 0;
2721	if (selnum != Sel_direct)
2722	selection_request_other (XA_STRING, selnum);
2723	}
2724
2725	if ((selection_type & Sel_UTF8String))
2726	{
2727	int selnum = selection_type & Sel_whereMask;
2728
2729	selection_type = Sel_CompoundText;
2730	if (selnum != Sel_direct)
2731	selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2732	else
2733	selection_type = 0;
2734	}
2735
2736	return;
2737	}
2738
2739	unsigned long bytes_after;
2740	XTextProperty ct;
2741
2742	if (XGetWindowProperty (dpy, win, prop,
2743	0, PROP_SIZE / 4,
2744	delete_prop, AnyPropertyType,
2745	&ct.encoding, &ct.format,
2746	&ct.nitems, &bytes_after,
2747	&ct.value) != Success)
2748	{
2749	ct.value = 0;
2750	goto bailout;
2751	}
2752
2753	if (ct.encoding == None)
2754	goto bailout;
2755
2756	if (bytes_after)
2757	{
2758	// fetch and append remaining data
2759	XTextProperty ct2;
2760
2761	if (XGetWindowProperty (dpy, win, prop,
2762	ct.nitems / 4, (bytes_after + 3) / 4,
2763	delete_prop, AnyPropertyType,
2764	&ct2.encoding, &ct2.format,
2765	&ct2.nitems, &bytes_after,
2766	&ct2.value) != Success)
2767	goto bailout;
2768
2769	// realloc should be compatible to XFree, here, and elsewhere, too
2770	ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2771	memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2772	ct.nitems += ct2.nitems;
2773
2774	XFree (ct2.value);
2775	}
2776
2777	if (ct.value == 0)
2778	goto bailout;
2779
2780	if (ct.encoding == xa[XA_INCR])
2781	{
2782	// INCR selection, start handshake
2783	if (!delete_prop)
2784	XDeleteProperty (dpy, win, prop);
2785
2786	selection_wait = Sel_incr;
2787	incr_buf_fill = 0;
2788	incr_ev.start (10);
2789
2790	goto bailout;
2791	}
2792
2793	if (ct.nitems == 0)
2794	{
2795	if (selection_wait == Sel_incr)
2796	{
2797	XFree (ct.value);
2798
2799	// finally complete, now paste the whole thing
2800	selection_wait = Sel_normal;
2801	ct.value = (unsigned char *)incr_buf;
2802	ct.nitems = incr_buf_fill;
2803	incr_buf = 0;
2804	incr_buf_size = 0;
2805	incr_ev.stop ();
2806	}
2807	else
2808	{
2809	if (selection_wait == Sel_normal
2810	&& (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2811	{
2812	/*
2813	* pass through again trying CUT_BUFFER0 if we've come from
2814	* XConvertSelection () but nothing was presented
2815	*/
2816	selection_paste (display->root, XA_CUT_BUFFER0, False);
2817	}
2818
2819	goto bailout;
2820	}
2821	}
2822	else if (selection_wait == Sel_incr)
2823	{
2824	incr_ev.start (10);
2825
2826	while (incr_buf_fill + ct.nitems > incr_buf_size)
2827	{
2828	incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2829	incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2830	}
2831
2832	memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2833	incr_buf_fill += ct.nitems;
2834
2835	goto bailout;
2836	}
2837
2838	char **cl;
2839	int cr;
2840
2841	#if !ENABLE_MINIMAL
2842	// xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2843	// so recode it manually
2844	if (ct.encoding == xa[XA_UTF8_STRING])
2845	{
2846	wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2847	char *s = rxvt_wcstombs (w);
2848	free (w);
2849	// TODO: strlen == only the first element will be converted. well...
2850	paste (s, strlen (s));
2851	free (s);
2852	}
2853	else
2854	#endif
2855	if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2856	&& cl)
2857	{
2858	for (int i = 0; i < cr; i++)
2859	paste (cl[i], strlen (cl[i]));
2860
2861	XFreeStringList (cl);
2862	}
2863	else
2864	paste ((char *)ct.value, ct.nitems); // paste raw
2865
2866	bailout:
2867	XFree (ct.value);
2868
2869	if (selection_wait == Sel_normal)
2870	selection_wait = Sel_none;
2871	}
2872
2873	void
2874	rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2875	{
2876	selection_wait = Sel_none;
2877
2878	incr_buf_size = 0;
2879	free (incr_buf);
2880
2881	rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2882	}
2883
2884	void
2885	rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2886	{
2887	if (prop == None || selection_wait != Sel_incr)
2888	return;
2889
2890	selection_paste (win, prop, true);
2891	}
2892
2893	/* ------------------------------------------------------------------------- */
2894	/*
2895	* Request the current selection:
2896	* Order: > internal selection if available
2897	* > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2898	* > CUT_BUFFER0
2899	* (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2900	* will auto fallback to CUT_BUFFER0
2901	* EXT: button 2 release	2733	* EXT: button 2 release
2902	*/	2734	*/
2903	void	2735	void
2904	rxvt_term::selection_request (Time tm, int selnum) NOTHROW	2736	rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2905	{	2737	{
2906	if (selection.text && selnum == Sel_Primary)	2738	if (!selection_req)
2907	{
2908	/* internal selection */
2909	char *str = rxvt_wcstombs (selection.text, selection.len);
2910	paste (str, strlen (str));
2911	free (str);
2912	return;
2913	}	2739	{
2914	else	2740	selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
		2741	selection_req->run ();
2915	{	2742	}
2916	selection_request_time = tm;
2917	selection_wait = Sel_normal;
2918
2919	#if X_HAVE_UTF8_STRING
2920	selection_type = Sel_UTF8String;
2921	if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2922	return;
2923	#else
2924	selection_type = Sel_CompoundText;
2925	if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2926	return;
2927	#endif
2928	}
2929
2930	selection_wait = Sel_none; /* don't loop in selection_paste () */
2931	selection_paste (display->root, XA_CUT_BUFFER0, false);
2932	}
2933
2934	int
2935	rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2936	{
2937	Atom sel;
2938
2939	selection_type |= selnum;
2940
2941	if (selnum == Sel_Primary)
2942	sel = XA_PRIMARY;
2943	else if (selnum == Sel_Secondary)
2944	sel = XA_SECONDARY;
2945	else
2946	sel = xa[XA_CLIPBOARD];
2947
2948	if (XGetSelectionOwner (dpy, sel) != None)
2949	{
2950	XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2951	vt, selection_request_time);
2952	return 1;
2953	}
2954
2955	return 0;
2956	}	2743	}
2957		2744
2958	/* ------------------------------------------------------------------------- */	2745	/* ------------------------------------------------------------------------- */
2959	/*	2746	/*
2960	* Clear all selected text	2747	* Clear all selected text
…		…
2991	* EXT: button 1 or 3 release	2778	* EXT: button 1 or 3 release
2992	*/	2779	*/
2993	void	2780	void
2994	rxvt_term::selection_make (Time tm)	2781	rxvt_term::selection_make (Time tm)
2995	{	2782	{
2996	int i;	2783	int size;
2997	wchar_t *new_selection_text;	2784	wchar_t *new_selection_text;
2998	text_t *t;	2785	text_t *t;
2999		2786
3000	switch (selection.op)	2787	switch (selection.op)
3001	{	2788	{
…		…
3017	return; /* nothing selected, go away */	2804	return; /* nothing selected, go away */
3018		2805
3019	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)))
3020	return;	2807	return;
3021		2808
3022	i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);	2809	size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
3023	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));
3024		2811
3025	int ofs = 0;	2812	int ofs = 0;
3026	int extra = 0;	2813	int extra = 0;
3027		2814
3028	int col = selection.beg.col;	2815	int col = selection.beg.col;
…		…
3034	{	2821	{
3035	#if !ENABLE_MINIMAL	2822	#if !ENABLE_MINIMAL
3036	if (selection.rect)	2823	if (selection.rect)
3037	{	2824	{
3038	col = selection.beg.col;	2825	col = selection.beg.col;
3039	end_col = ncol + 1;	2826	end_col = selection.end.col;
3040	}	2827	}
3041	else	2828	else
3042	#endif	2829	#endif
3043	end_col = ROW(row).l;	2830	end_col = ROW(row).l;
3044		2831
3045	col = max (col, 0);	2832	col = max (col, 0);
3046		2833
3047	if (row == selection.end.row	2834	if (row == selection.end.row)
3048	#if !ENABLE_MINIMAL
3049	|| selection.rect
3050	#endif
3051	)
3052	min_it (end_col, selection.end.col);	2835	min_it (end_col, selection.end.col);
3053		2836
3054	t = ROW(row).t + col;	2837	t = ROW(row).t + col;
3055		2838
3056	for (; col < end_col; col++)	2839	for (; col < end_col; col++)
…		…
3064		2847
3065	extra -= (len - 1);	2848	extra -= (len - 1);
3066		2849
3067	if (extra < 0)	2850	if (extra < 0)
3068	{	2851	{
3069	extra += i;	2852	extra += size;
3070	i += i;	2853	size += size;
3071	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));
3072	}	2855	}
3073		2856
3074	ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);	2857	ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3075	}	2858	}
3076	#endif	2859	#endif
…		…
3088		2871
3089	new_selection_text[ofs++] = C0_LF;	2872	new_selection_text[ofs++] = C0_LF;
3090	}	2873	}
3091	else	2874	else
3092	#endif	2875	#endif
3093	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))
3094	new_selection_text[ofs++] = C0_LF;	2879	new_selection_text[ofs++] = C0_LF;
3095	}	2880	}
3096
3097	if (end_col != selection.end.col)
3098	new_selection_text[ofs++] = C0_LF;
3099		2881
3100	new_selection_text[ofs] = 0;	2882	new_selection_text[ofs] = 0;
3101		2883
3102	if (ofs == 0)	2884	if (ofs == 0)
3103	{	2885	{
…		…
3159	/* ------------------------------------------------------------------------- */	2941	/* ------------------------------------------------------------------------- */
3160	/*	2942	/*
3161	* 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
3162	* EXT: button 1 press	2944	* EXT: button 1 press
3163	*/	2945	*/
3164	void	2946	void ecb_cold
3165	rxvt_term::selection_click (int clicks, int x, int y) NOTHROW	2947	rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3166	{	2948	{
3167	clicks = ((clicks - 1) % 3) + 1;	2949	clicks = ((clicks - 1) % 3) + 1;
3168	selection.clicks = clicks; /* save clicks so extend will work */	2950	selection.clicks = clicks; /* save clicks so extend will work */
3169		2951
…		…
3188		2970
3189	/* ------------------------------------------------------------------------- */	2971	/* ------------------------------------------------------------------------- */
3190	/*	2972	/*
3191	* Mark a selection at the specified col/row	2973	* Mark a selection at the specified col/row
3192	*/	2974	*/
3193	void	2975	void ecb_cold
3194	rxvt_term::selection_start_colrow (int col, int row) NOTHROW	2976	rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3195	{	2977	{
3196	want_refresh = 1;	2978	want_refresh = 1;
3197		2979
3198	selection.mark.row = row + view_start;	2980	selection.mark.row = row + view_start;
…		…
3225	/* 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 */
3226	#define DELIMIT_TEXT(x) \	3008	#define DELIMIT_TEXT(x) \
3227	(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)))
3228	#define DELIMIT_REND(x) 1	3010	#define DELIMIT_REND(x) 1
3229		3011
3230	void	3012	void ecb_cold
3231	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
3232	{	3014	{
3233	int col, row, dirnadd, tcol, trow, w1, w2;	3015	int col, row, dirnadd, tcol, trow, w1, w2;
3234	row_col_t bound;	3016	row_col_t bound;
3235	text_t *stp;	3017	text_t *stp;
…		…
3309	* EXT: button 3 press; button 1 or 3 drag	3091	* EXT: button 3 press; button 1 or 3 drag
3310	* flag == 0 ==> button 1	3092	* flag == 0 ==> button 1
3311	* flag == 1 ==> button 3 press	3093	* flag == 1 ==> button 3 press
3312	* flag == 2 ==> button 3 motion	3094	* flag == 2 ==> button 3 motion
3313	*/	3095	*/
3314	void	3096	void ecb_cold
3315	rxvt_term::selection_extend (int x, int y, int flag) NOTHROW	3097	rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3316	{	3098	{
3317	int col = clamp (Pixel2Col (x), 0, ncol);	3099	int col = clamp (Pixel2Col (x), 0, ncol);
3318	int row = clamp (Pixel2Row (y), 0, nrow - 1);	3100	int row = clamp (Pixel2Row (y), 0, nrow - 1);
3319		3101
…		…
3345		3127
3346	/* ------------------------------------------------------------------------- */	3128	/* ------------------------------------------------------------------------- */
3347	/*	3129	/*
3348	* Extend the selection to the specified col/row	3130	* Extend the selection to the specified col/row
3349	*/	3131	*/
3350	void	3132	void ecb_cold
3351	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
3352	{	3134	{
3353	row_col_t pos;	3135	row_col_t pos;
3354	enum {	3136	enum {
3355	LEFT, RIGHT	3137	LEFT, RIGHT
…		…
3546	::swap (selection.beg.col, selection.end.col);	3328	::swap (selection.beg.col, selection.end.col);
3547	#endif	3329	#endif
3548	}	3330	}
3549		3331
3550	#if !ENABLE_MINIMAL	3332	#if !ENABLE_MINIMAL
3551	void	3333	void ecb_cold
3552	rxvt_term::selection_remove_trailing_spaces () NOTHROW	3334	rxvt_term::selection_remove_trailing_spaces () NOTHROW
3553	{	3335	{
3554	int32_t end_col, end_row;	3336	int32_t end_col, end_row;
3555	text_t *stp;	3337	text_t *stp;
3556		3338
…		…
3594	/* ------------------------------------------------------------------------- */	3376	/* ------------------------------------------------------------------------- */
3595	/*	3377	/*
3596	* Double click on button 3 when already selected	3378	* Double click on button 3 when already selected
3597	* EXT: button 3 double click	3379	* EXT: button 3 double click
3598	*/	3380	*/
3599	void	3381	void ecb_cold
3600	rxvt_term::selection_rotate (int x, int y) NOTHROW	3382	rxvt_term::selection_rotate (int x, int y) NOTHROW
3601	{	3383	{
3602	selection.clicks = selection.clicks % 3 + 1;	3384	selection.clicks = selection.clicks % 3 + 1;
3603	selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);	3385	selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3604	}	3386	}
…		…
3606	/* ------------------------------------------------------------------------- */	3388	/* ------------------------------------------------------------------------- */
3607	/*	3389	/*
3608	* Respond to a request for our current selection	3390	* Respond to a request for our current selection
3609	* EXT: SelectionRequest	3391	* EXT: SelectionRequest
3610	*/	3392	*/
3611	void	3393	void ecb_cold
3612	rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW	3394	rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3613	{	3395	{
		3396	Atom property = rq.property == None ? rq.target : rq.property;
3614	XSelectionEvent ev;	3397	XSelectionEvent ev;
3615		3398
3616	ev.type = SelectionNotify;	3399	ev.type = SelectionNotify;
3617	ev.property = None;	3400	ev.property = None;
3618	ev.display = rq.display;	3401	ev.display = rq.display;
…		…
3633	*target++ = xa[XA_COMPOUND_TEXT];	3416	*target++ = xa[XA_COMPOUND_TEXT];
3634	#if X_HAVE_UTF8_STRING	3417	#if X_HAVE_UTF8_STRING
3635	*target++ = xa[XA_UTF8_STRING];	3418	*target++ = xa[XA_UTF8_STRING];
3636	#endif	3419	#endif
3637		3420
3638	XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,	3421	XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3639	32, PropModeReplace,	3422	32, PropModeReplace,
3640	(unsigned char *)target_list, target - target_list);	3423	(unsigned char *)target_list, target - target_list);
3641	ev.property = rq.property;	3424	ev.property = property;
3642	}	3425	}
3643	#if TODO // TODO	3426	#if TODO // TODO
3644	else if (rq.target == xa[XA_MULTIPLE])	3427	else if (rq.target == xa[XA_MULTIPLE])
3645	{	3428	{
3646	/* TODO: Handle MULTIPLE */	3429	/* TODO: Handle MULTIPLE */
3647	}	3430	}
3648	#endif	3431	#endif
3649	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)
3650	{	3433	{
3651	XChangeProperty (dpy, rq.requestor, rq.property, rq.target,	3434	XChangeProperty (dpy, rq.requestor, property, rq.target,
3652	32, PropModeReplace, (unsigned char *)&selection_time, 1);	3435	32, PropModeReplace, (unsigned char *)&selection_time, 1);
3653	ev.property = rq.property;	3436	ev.property = property;
3654	}	3437	}
3655	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)
3656	{	3439	{
3657	XChangeProperty (dpy, rq.requestor, rq.property, rq.target,	3440	XChangeProperty (dpy, rq.requestor, property, rq.target,
3658	32, PropModeReplace, (unsigned char *)&clipboard_time, 1);	3441	32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3659	ev.property = rq.property;	3442	ev.property = property;
3660	}	3443	}
3661	else if (rq.target == XA_STRING	3444	else if (rq.target == XA_STRING
3662	|| rq.target == xa[XA_TEXT]	3445	|| rq.target == xa[XA_TEXT]
3663	|| rq.target == xa[XA_COMPOUND_TEXT]	3446	|| rq.target == xa[XA_COMPOUND_TEXT]
3664	|| rq.target == xa[XA_UTF8_STRING]	3447	|| rq.target == xa[XA_UTF8_STRING]
…		…
3735	ct.value = (unsigned char *)cl;	3518	ct.value = (unsigned char *)cl;
3736	ct.nitems = selectlen;	3519	ct.nitems = selectlen;
3737	ct.encoding = target;	3520	ct.encoding = target;
3738	}	3521	}
3739		3522
3740	XChangeProperty (dpy, rq.requestor, rq.property,	3523	XChangeProperty (dpy, rq.requestor, property,
3741	ct.encoding, 8, PropModeReplace,	3524	ct.encoding, 8, PropModeReplace,
3742	ct.value, (int)ct.nitems);	3525	ct.value, (int)ct.nitems);
3743	ev.property = rq.property;	3526	ev.property = property;
3744		3527
3745	if (freect)	3528	if (freect)
3746	XFree (ct.value);	3529	XFree (ct.value);
3747	}	3530	}
3748		3531
3749	XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);	3532	XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3750	}	3533	}
3751		3534
3752	/* ------------------------------------------------------------------------- */	3535	/* ------------------------------------------------------------------------- */
3753	#ifdef USE_XIM	3536	#if USE_XIM
3754	void	3537	void ecb_cold
3755	rxvt_term::im_set_position (XPoint &pos) NOTHROW	3538	rxvt_term::im_set_position (XPoint &pos) NOTHROW
3756	{	3539	{
3757	XWindowAttributes xwa;	3540	XWindowAttributes xwa;
3758		3541
3759	XGetWindowAttributes (dpy, vt, &xwa);	3542	XGetWindowAttributes (dpy, vt, &xwa);

Diff Legend

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