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.305 by ayin, Thu Feb 21 10:30:24 2008 UTC vs.
Revision 1.399 by sf-exg, Thu Nov 3 10:42:17 2011 UTC

1	/*---------------------------------------------------------------------------*	1	/*---------------------------------------------------------------------------*
2	* File: screen.C	2	* File: screen.C
3	*---------------------------------------------------------------------------*	3	*---------------------------------------------------------------------------*
4	*	4	*
5	* Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>	5	* Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6	* Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>	6	* Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de>
7	*	7	*
8	* This program is free software; you can redistribute it and/or modify	8	* This program is free software; you can redistribute it and/or modify
9	* it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
10	* the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation; either version 2 of the License, or
11	* (at your option) any later version.	11	* (at your option) any later version.
…		…
28	#include "rxvt.h" /* NECESSARY */	28	#include "rxvt.h" /* NECESSARY */
29	#include "rxvtperl.h" /* NECESSARY */	29	#include "rxvtperl.h" /* NECESSARY */
30		30
31	#include <inttypes.h>	31	#include <inttypes.h>
32		32
33	#include "salloc.C" // HACK, should be a seperate compile!	33	#include "salloc.C" // HACK, should be a separate compile!
34		34
		35	static inline void
35	static inline void fill_text (text_t *start, text_t value, int len)	36	fill_text (text_t *start, text_t value, int len)
36	{	37	{
37	while (len--)	38	while (len--)
38	*start++ = value;	39	*start++ = value;
39	}	40	}
40		41
41	/* ------------------------------------------------------------------------- */	42	/* ------------------------------------------------------------------------- */
42	#define PROP_SIZE 256*1024
43	#define PASTE_SIZE 32768
44	#define TABSIZE 8 /* default tab size */	43	#define TABSIZE 8 /* default tab size */
45		44
46	/* ------------------------------------------------------------------------- *	45	/* ------------------------------------------------------------------------- *
47	* GENERAL SCREEN AND SELECTION UPDATE ROUTINES *	46	* GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
48	* ------------------------------------------------------------------------- */	47	* ------------------------------------------------------------------------- */
…		…
83	ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col)	82	ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col)
84	#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \	83	#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \
85	ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)	84	ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
86		85
87	/*	86	/*
88	* CLEAR_ROWS : clear <num> rows starting from row <row>
89	* CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>	87	* CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
90	* ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
91	*/	88	*/
92	#define CLEAR_ROWS(row, num) \
93	if (mapped) \
94	XClearArea (dpy, vt, 0, \
95	Row2Pixel (row), (unsigned int)width, \
96	(unsigned int)Height2Pixel (num), False)
97
98	#define CLEAR_CHARS(x, y, num) \	89	#define CLEAR_CHARS(x, y, num) \
99	if (mapped) \	90	if (mapped) \
100	XClearArea (dpy, vt, x, y, \	91	XClearArea (dpy, vt, x, y, \
101	(unsigned int)Width2Pixel (num), \	92	(unsigned int)Width2Pixel (num), \
102	(unsigned int)Height2Pixel (1), False)	93	(unsigned int)Height2Pixel (1), False)
103		94
104	#define ERASE_ROWS(row, num) \
105	XFillRectangle (dpy, vt, gc, \
106	0, Row2Pixel (row), \
107	(unsigned int)width, \
108	(unsigned int)Height2Pixel (num))
109
110	/* ------------------------------------------------------------------------- *	95	/* ------------------------------------------------------------------------- *
111	* SCREEN `COMMON' ROUTINES *	96	* SCREEN `COMMON' ROUTINES *
112	* ------------------------------------------------------------------------- */	97	* ------------------------------------------------------------------------- */
113		98
114	/* Fill part/all of a line with blanks. */	99	/* Fill part/all of a line with blanks. */
…		…
146		131
147	l.l = 0;	132	l.l = 0;
148	l.f = 0;	133	l.f = 0;
149	}	134	}
150		135
		136	// nuke a single wide character at the given column
		137	void
		138	rxvt_term::scr_kill_char (line_t &l, int col) const NOTHROW
		139	{
		140	// find begin
		141	while (col > 0 && l.t[col] == NOCHAR)
		142	col--;
		143
		144	rend_t rend = l.r[col] & ~RS_baseattrMask;
		145	rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
		146
		147	l.touch ();
		148
		149	// found start, nuke
		150	do {
		151	l.t[col] = ' ';
		152	l.r[col] = rend;
		153	col++;
		154	} while (col < ncol && l.t[col] == NOCHAR);
		155	}
		156
151	/* ------------------------------------------------------------------------- *	157	/* ------------------------------------------------------------------------- *
152	* SCREEN INITIALISATION *	158	* SCREEN INITIALISATION *
153	* ------------------------------------------------------------------------- */	159	* ------------------------------------------------------------------------- */
154		160
155	void	161	void
…		…
157	{	163	{
158	#if ENABLE_OVERLAY	164	#if ENABLE_OVERLAY
159	scr_overlay_off ();	165	scr_overlay_off ();
160	#endif	166	#endif
161		167
162	rvideo_mode = false;
163	view_start = 0;	168	view_start = 0;
164	num_scr = 0;	169	num_scr = 0;
165		170
166	if (ncol == 0)	171	if (ncol == 0)
167	ncol = 80;	172	ncol = 80;
…		…
169	if (nrow == 0)	174	if (nrow == 0)
170	nrow = 24;	175	nrow = 24;
171		176
172	if (ncol == prev_ncol && nrow == prev_nrow)	177	if (ncol == prev_ncol && nrow == prev_nrow)
173	return;	178	return;
174
175	if (current_screen != PRIMARY)
176	scr_swap_screen ();
177		179
178	// we need at least two lines for wrapping to work correctly	180	// we need at least two lines for wrapping to work correctly
179	while (nrow + saveLines < 2)	181	while (nrow + saveLines < 2)
180	{	182	{
181	//TODO//FIXME	183	//TODO//FIXME
…		…
201	term_start = 0;	203	term_start = 0;
202		204
203	talloc = new rxvt_salloc (ncol * sizeof (text_t));	205	talloc = new rxvt_salloc (ncol * sizeof (text_t));
204	ralloc = new rxvt_salloc (ncol * sizeof (rend_t));	206	ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
205		207
206	row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));	208	row_buf = (line_t *)rxvt_calloc (total_rows , sizeof (line_t));
207	drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));	209	drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
208	swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));	210	swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
209		211
210	for (int row = nrow; row--; )	212	for (int row = nrow; row--; )
211	{	213	{
…		…
234	selection.text = NULL;	236	selection.text = NULL;
235	selection.len = 0;	237	selection.len = 0;
236	selection.op = SELECTION_CLEAR;	238	selection.op = SELECTION_CLEAR;
237	selection.screen = PRIMARY;	239	selection.screen = PRIMARY;
238	selection.clicks = 0;	240	selection.clicks = 0;
		241	selection.clip_text = NULL;
		242	selection.clip_len = 0;
239	}	243	}
240	else	244	else
241	{	245	{
242	/*	246	/*
243	* add or delete rows as appropriate	247	* add or delete rows as appropriate
…		…
271	swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);	275	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);	276	drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
273	}	277	}
274		278
275	line_t *old_buf = row_buf;	279	line_t *old_buf = row_buf;
276	row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));	280	row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
277		281
278	int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row	282	int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
279	int pend = MOD (term_start + top_row , prev_total_rows);	283	int pend = MOD (term_start + top_row , prev_total_rows);
280	int q = total_rows; // rewrapped row	284	int q = total_rows; // rewrapped row
281		285
282	if (top_row)	286	if (top_row)
283	{	287	{
284	// Re-wrap lines. This is rather ugly, possibly because I am too dumb	288	// Re-wrap lines. This is rather ugly, possibly because I am too dumb
285	// to come up with a lean and mean algorithm.	289	// to come up with a lean and mean algorithm.
		290	// TODO: maybe optimise when width didn't change
286		291
287	row_col_t ocur = screen.cur;	292	row_col_t ocur = screen.cur;
288	ocur.row = MOD (term_start + ocur.row, prev_total_rows);	293	ocur.row = MOD (term_start + ocur.row, prev_total_rows);
289		294
290	do	295	do
291	{	296	{
292	p = MOD (p - 1, prev_total_rows);	297	p = MOD (p - 1, prev_total_rows);
293	#ifdef DEBUG_STRICT
294	assert (old_buf [MOD (p, prev_total_rows)].t);	298	assert (old_buf [MOD (p, prev_total_rows)].t);
295	#endif
296	int plines = 1;	299	int plines = 1;
297	int llen = old_buf [MOD (p, prev_total_rows)].l;	300	int llen = old_buf [MOD (p, prev_total_rows)].l;
298		301
299	while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())	302	while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
300	{	303	{
…		…
394	delete old_ta;	397	delete old_ta;
395	delete old_ra;	398	delete old_ra;
396		399
397	clamp_it (screen.cur.row, 0, nrow - 1);	400	clamp_it (screen.cur.row, 0, nrow - 1);
398	clamp_it (screen.cur.col, 0, ncol - 1);	401	clamp_it (screen.cur.col, 0, ncol - 1);
		402	}
399		403
400	free (tabs);	404	free (tabs);
401	}	405	tabs = (char *)rxvt_malloc (ncol);
		406
		407	for (int col = ncol; col--; )
		408	tabs [col] = col % TABSIZE == 0;
402		409
403	CLEAR_ALL_SELECTION ();	410	CLEAR_ALL_SELECTION ();
404		411
405	prev_nrow = nrow;	412	prev_nrow = nrow;
406	prev_ncol = ncol;	413	prev_ncol = ncol;
407
408	tabs = (char *)rxvt_malloc (ncol);
409
410	for (int col = ncol; --col; )
411	tabs [col] = col % TABSIZE == 0;
412
413	if (current_screen != PRIMARY)
414	scr_swap_screen ();
415		414
416	tt_winch ();	415	tt_winch ();
417		416
418	HOOK_INVOKE ((this, HOOK_RESET, DT_END));	417	HOOK_INVOKE ((this, HOOK_RESET, DT_END));
419	}	418	}
…		…
431	delete ralloc; ralloc = 0;	430	delete ralloc; ralloc = 0;
432		431
433	free (row_buf);	432	free (row_buf);
434	free (swap_buf);	433	free (swap_buf);
435	free (drawn_buf);	434	free (drawn_buf);
		435	row_buf = 0; // signal that we freed all the arrays above
		436
436	free (tabs);	437	free (tabs);
437		438	tabs = 0;
438	row_buf = 0; // signal that we freed all the arrays
439	}	439	}
440	}	440	}
441		441
442	/* ------------------------------------------------------------------------- */	442	/* ------------------------------------------------------------------------- */
443	/*	443	/*
444	* Hard reset	444	* Hard/Soft reset
445	*/	445	*/
446	void	446	void
447	rxvt_term::scr_poweron ()	447	rxvt_term::scr_poweron ()
448	{	448	{
449	scr_release ();	449	scr_release ();
450	prev_nrow = prev_ncol = 0;	450	prev_nrow = prev_ncol = 0;
		451	rvideo_mode = false;
		452	scr_soft_reset ();
451	scr_reset ();	453	scr_reset ();
452		454
453	scr_clear (true);	455	scr_clear (true);
454	scr_refresh ();	456	scr_refresh ();
		457	}
		458
		459	void
		460	rxvt_term::scr_soft_reset ()
		461	{
		462	/* only affects modes, nothing drastic such as clearing the screen */
		463	#if ENABLE_OVERLAY
		464	scr_overlay_off ();
		465	#endif
		466
		467	if (current_screen != PRIMARY)
		468	scr_swap_screen ();
		469
		470	scr_scroll_region (0, MAX_ROWS - 1);
		471	scr_rendition (0, ~RS_None);
		472	scr_insert_mode (0);
455	}	473	}
456		474
457	/* ------------------------------------------------------------------------- *	475	/* ------------------------------------------------------------------------- *
458	* PROCESS SCREEN COMMANDS *	476	* PROCESS SCREEN COMMANDS *
459	* ------------------------------------------------------------------------- */	477	* ------------------------------------------------------------------------- */
…		…
497	}	515	}
498		516
499	/* boundary check in case screen size changed between SAVE and RESTORE */	517	/* boundary check in case screen size changed between SAVE and RESTORE */
500	min_it (s->cur.row, nrow - 1);	518	min_it (s->cur.row, nrow - 1);
501	min_it (s->cur.col, ncol - 1);	519	min_it (s->cur.col, ncol - 1);
502	#ifdef DEBUG_STRICT
503	assert (s->cur.row >= 0);	520	assert (s->cur.row >= 0);
504	assert (s->cur.col >= 0);	521	assert (s->cur.col >= 0);
505	#endif
506	}	522	}
507		523
508	void	524	void
509	rxvt_term::scr_swap_screen ()	525	rxvt_term::scr_swap_screen ()
510	{	526	{
…		…
535	want_refresh = 1;	551	want_refresh = 1;
536	view_start = 0;	552	view_start = 0;
537		553
538	selection_check (2); /* check for boundary cross */	554	selection_check (2); /* check for boundary cross */
539		555
540	int i = current_screen; current_screen = scrn; scrn = i;	556	current_screen = scrn;
541		557
542	#if NSCREENS	558	#if NSCREENS
543	if (option (Opt_secondaryScreen))	559	if (option (Opt_secondaryScreen))
544	{	560	{
545	num_scr = 0;	561	num_scr = 0;
…		…
622		638
623	if (count > 0	639	if (count > 0
624	&& row1 == 0	640	&& row1 == 0
625	&& (current_screen == PRIMARY || option (Opt_secondaryScroll)))	641	&& (current_screen == PRIMARY || option (Opt_secondaryScroll)))
626	{	642	{
		643	min_it (count, total_rows - (nrow - (row2 + 1)));
		644
627	top_row = max (top_row - count, -saveLines);	645	top_row = max (top_row - count, -saveLines);
628
629	// scroll everything up 'count' lines
630	term_start = (term_start + count) % total_rows;
631		646
632	// sever bottommost line	647	// sever bottommost line
633	{	648	{
634	line_t &l = ROW(row2 - count);	649	line_t &l = ROW(row2);
635	l.is_longer (0);	650	l.is_longer (0);
636	l.touch ();	651	l.touch ();
637	}	652	}
638		653
		654	// scroll everything up 'count' lines
		655	term_start = (term_start + count) % total_rows;
		656
		657	// now copy lines below the scroll region bottom to the
		658	// bottom of the screen again, so they look as if they
		659	// hadn't moved.
		660	for (int i = nrow; --i > row2; )
		661	{
		662	line_t &l1 = ROW(i - count);
		663	line_t &l2 = ROW(i);
		664
		665	::swap (l1, l2);
		666	l2.touch ();
		667	}
		668
639	// erase newly scrolled-in lines	669	// erase newly scrolled-in lines
640	for (int i = count; i--; )	670	for (int i = count; i--; )
641	{	671	{
642	line_t &l = ROW(nrow - 1 - i);	672	line_t &l = ROW(row2 - i);
643		673
644	// optimize if already cleared, can be significant on slow machines	674	// optimise if already cleared, can be significant on slow machines
645	// could be rolled into scr_blank_screen_mem	675	// could be rolled into scr_blank_screen_mem
646	if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))	676	if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
647	{	677	{
648	scr_blank_line (l, 0, l.l, rstyle);	678	scr_blank_line (l, 0, l.l, rstyle);
649	l.l = 0;	679	l.l = 0;
…		…
651	}	681	}
652	else	682	else
653	scr_blank_screen_mem (l, rstyle);	683	scr_blank_screen_mem (l, rstyle);
654	}	684	}
655		685
656	// now copy lines below the scroll region bottom to the
657	// bottom of the screen again, so they look as if they
658	// hadn't moved.
659	for (int i = nrow; --i > row2; )
660	{
661	line_t &l1 = ROW(i - count);
662	line_t &l2 = ROW(i);
663
664	::swap (l1, l2);
665	l2.touch ();
666	}
667
668	// move and/or clear selection, if any
669	if (selection.op && current_screen == selection.screen)
670	{
671	selection.beg.row -= count;
672	selection.end.row -= count;
673	selection.mark.row -= count;
674
675	if (selection.beg.row < top_row
676	|| selection.end.row < top_row
677	|| selection.mark.row < top_row)
678	{
679	CLEAR_ALL_SELECTION ();
680	selection.op = SELECTION_CLEAR;
681	}
682	}
683
684	// finally move the view window, if desired	686	// finally move the view window, if desired
685	if (option (Opt_scrollWithBuffer)	687	if (option (Opt_scrollWithBuffer)
686	&& view_start != 0	688	&& view_start != 0
687	&& view_start != -saveLines)	689	&& view_start != -saveLines)
688	scr_page (UP, count);	690	scr_page (UP, count);
…		…
690	if (SHOULD_INVOKE (HOOK_SCROLL_BACK))	692	if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
691	HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));	693	HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
692	}	694	}
693	else	695	else
694	{	696	{
695	if (selection.op && current_screen == selection.screen)
696	{
697	if ((selection.beg.row < row1 && selection.end.row > row1)
698	|| (selection.beg.row < row2 && selection.end.row > row2)
699	|| (selection.beg.row - count < row1 && selection.beg.row >= row1)
700	|| (selection.beg.row - count > row2 && selection.beg.row <= row2)
701	|| (selection.end.row - count < row1 && selection.end.row >= row1)
702	|| (selection.end.row - count > row2 && selection.end.row <= row2))
703	{
704	CLEAR_ALL_SELECTION ();
705	selection.op = SELECTION_CLEAR;
706	}
707	else if (selection.end.row >= row1 && selection.end.row <= row2)
708	{
709	/* move selected region too */
710	selection.beg.row -= count;
711	selection.end.row -= count;
712	selection.mark.row -= count;
713
714	selection_check (0);
715	}
716	}
717
718	// use a simple and robust scrolling algorithm, this	697	// use a simple and robust scrolling algorithm, this
719	// part of scr_scroll_text is not time-critical.	698	// part of scr_scroll_text is not time-critical.
720		699
		700	// sever line above scroll region
		701	if (row1)
		702	{
		703	line_t &l = ROW(row1 - 1);
		704	l.is_longer (0);
		705	l.touch ();
		706	}
		707
721	int rows = row2 - row1 + 1;	708	int rows = row2 - row1 + 1;
722		709
723	min_it (count, rows);	710	min_it (count, rows);
724		711
725	line_t *temp_buf = row_buf + total_rows;	712	line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
726		713
727	for (int row = 0; row < rows; row++)	714	for (int row = 0; row < rows; row++)
728	{	715	{
729	temp_buf [row] = ROW(row1 + (row + count + rows) % rows);	716	temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
730		717
…		…
732	scr_blank_screen_mem (temp_buf [row], rstyle);	719	scr_blank_screen_mem (temp_buf [row], rstyle);
733	}	720	}
734		721
735	for (int row = 0; row < rows; row++)	722	for (int row = 0; row < rows; row++)
736	ROW(row1 + row) = temp_buf [row];	723	ROW(row1 + row) = temp_buf [row];
		724
		725	// sever bottommost line
		726	{
		727	line_t &l = ROW(row2);
		728	l.is_longer (0);
		729	l.touch ();
		730	}
		731	}
		732
		733	// move and/or clear selection, if any
		734	if (selection.op && current_screen == selection.screen)
		735	{
		736	if ((selection.beg.row < row1 && selection.end.row > row1)
		737	|| (selection.beg.row < row2 && selection.end.row > row2)
		738	|| (selection.beg.row - count < row1 && selection.beg.row >= row1)
		739	|| (selection.beg.row - count > row2 && selection.beg.row <= row2)
		740	|| (selection.end.row - count < row1 && selection.end.row >= row1)
		741	|| (selection.end.row - count > row2 && selection.end.row <= row2))
		742	CLEAR_ALL_SELECTION ();
		743	else if (selection.end.row >= row1 && selection.end.row <= row2)
		744	{
		745	/* move selected region too */
		746	selection.beg.row -= count;
		747	selection.end.row -= count;
		748	selection.mark.row -= count;
		749
		750	selection_check (0);
		751	}
737	}	752	}
738		753
739	return count;	754	return count;
740	}	755	}
741		756
…		…
770	scr_scroll_text (screen.tscroll, screen.bscroll, minlines);	785	scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
771	screen.cur.row -= minlines;	786	screen.cur.row -= minlines;
772	}	787	}
773	}	788	}
774		789
775	#ifdef DEBUG_STRICT
776	assert (screen.cur.col < ncol);	790	assert (screen.cur.col < ncol);
777	assert (screen.cur.row < nrow	791	assert (screen.cur.row < nrow
778	&& screen.cur.row >= top_row);	792	&& screen.cur.row >= top_row);
779	#endif
780	int row = screen.cur.row;	793	int row = screen.cur.row;
781		794
782	checksel = selection.op && current_screen == selection.screen ? 1 : 0;	795	checksel = selection.op && current_screen == selection.screen ? 1 : 0;
783		796
784	line_t *line = &ROW(row);	797	line_t *line = &ROW(row);
785		798
786	while (str < strend)	799	while (str < strend)
787	{	800	{
788	c = (unicode_t)*str++; // convert to rxvt-unicodes representation	801	c = (unicode_t)*str++; // convert to rxvt-unicodes representation
789		802
790	if (c < 0x20)	803	if (ecb_unlikely (c < 0x20))
791	if (c == C0_LF)	804	if (c == C0_LF)
792	{	805	{
793	max_it (line->l, screen.cur.col);	806	max_it (line->l, screen.cur.col);
794		807
795	screen.flags &= ~Screen_WrapNext;	808	screen.flags &= ~Screen_WrapNext;
…		…
814	{	827	{
815	scr_tab (1, true);	828	scr_tab (1, true);
816	continue;	829	continue;
817	}	830	}
818		831
		832	if (ecb_unlikely (
819	if (checksel /* see if we're writing within selection */	833	checksel /* see if we're writing within selection */
820	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)	834	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
821	&& ROWCOL_IS_BEFORE (screen.cur, selection.end))	835	&& ROWCOL_IS_BEFORE (screen.cur, selection.end)
		836	))
822	{	837	{
823	checksel = 0;	838	checksel = 0;
824	/*	839	/*
825	* If we wrote anywhere in the selected area, kill the selection	840	* If we wrote anywhere in the selected area, kill the selection
826	* XXX: should we kill the mark too? Possibly, but maybe that	841	* XXX: should we kill the mark too? Possibly, but maybe that
827	* should be a similar check.	842	* should be a similar check.
828	*/	843	*/
829	CLEAR_SELECTION ();	844	CLEAR_SELECTION ();
830	}	845	}
831		846
832	if (screen.flags & Screen_WrapNext)	847	if (ecb_unlikely (screen.flags & Screen_WrapNext))
833	{	848	{
834	scr_do_wrap ();	849	scr_do_wrap ();
835		850
836	line->l = ncol;	851	line->l = ncol;
837	line->is_longer (1);	852	line->is_longer (1);
…		…
839	row = screen.cur.row;	854	row = screen.cur.row;
840	line = &ROW(row); /* _must_ refresh */	855	line = &ROW(row); /* _must_ refresh */
841	}	856	}
842		857
843	// some utf-8 decoders "decode" surrogate characters: let's fix this.	858	// some utf-8 decoders "decode" surrogate characters: let's fix this.
844	if (IN_RANGE_INC (c, 0xd800, 0xdfff))	859	if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
845	c = 0xfffd;	860	c = 0xfffd;
846		861
847	// rely on wcwidth to tell us the character width, do wcwidth before	862	// rely on wcwidth to tell us the character width, do wcwidth before
848	// further replacements, as wcwidth might return -1 for the line	863	// further replacements, as wcwidth might return -1 for the line
849	// drawing characters below as they might be invalid in the current	864	// drawing characters below as they might be invalid in the current
850	// locale.	865	// locale.
851	int width = WCWIDTH (c);	866	int width = WCWIDTH (c);
852		867
853	if (charsets [screen.charset] == '0') // DEC SPECIAL	868	if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
854	{	869	{
855	// vt100 special graphics and line drawing	870	// vt100 special graphics and line drawing
856	// 5f-7e standard vt100	871	// 5f-7e standard vt100
857	// 40-5e rxvt extension for extra curses acs chars	872	// 40-5e rxvt extension for extra curses acs chars
858	static uint16_t vt100_0[62] = { // 41 .. 7e	873	static uint16_t vt100_0[62] = { // 41 .. 7e
…		…
871	c = vt100_0[c - 0x41];	886	c = vt100_0[c - 0x41];
872	width = 1; // vt100 line drawing characters are always single-width	887	width = 1; // vt100 line drawing characters are always single-width
873	}	888	}
874	}	889	}
875		890
876	if (screen.flags & Screen_Insert)	891	if (ecb_unlikely (screen.flags & Screen_Insert))
877	scr_insdel_chars (width, INSERT);	892	scr_insdel_chars (width, INSERT);
878		893
879	if (width != 0)	894	if (width != 0)
880	{	895	{
881	#if !UNICODE_3	896	#if !UNICODE_3
…		…
886	# else	901	# else
887	c = 0xfffd;	902	c = 0xfffd;
888	# endif	903	# endif
889	#endif	904	#endif
890		905
		906	rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
		907
		908	// if the character doesn't fit into the remaining columns...
		909	if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
		910	{
		911	if (screen.flags & Screen_Autowrap)
		912	{
		913	// ... artificially enlargen the previous one
		914	c = NOCHAR;
		915	// and try the same character next loop iteration
		916	--str;
		917	}
		918	else
		919	screen.cur.col = ncol - width;
		920	}
		921
891	// nuke the character at this position, if required	922	// nuke the character at this position, if required
		923	// due to wonderful coincidences everywhere else in this loop
		924	// we never have to check for overwriting a wide char itself,
		925	// only its tail.
892	if (line->t[screen.cur.col] == NOCHAR	926	if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
893	|| (screen.cur.col < ncol - 1	927	scr_kill_char (*line, screen.cur.col);
894	&& line->t[screen.cur.col + 1] == NOCHAR))
895	{
896	int col = screen.cur.col;
897
898	// find begin
899	while (col > 0 && line->t[col] == NOCHAR)
900	col--;
901
902	rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
903
904	// found begin, nuke
905	do {
906	line->t[col] = ' ';
907	line->r[col] = rend;
908	col++;
909	} while (col < ncol && line->t[col] == NOCHAR);
910	}
911
912	rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
913
914	// if the character doesn't fit into the remaining columns...
915	if (screen.cur.col > ncol - width && ncol >= width)
916	{
917	// ...output spaces
918	c = ' ';
919	// and try the same character next loop iteration
920	--str;
921	}
922		928
923	line->touch ();	929	line->touch ();
924		930
925	do	931	do
926	{	932	{
927	line->t[screen.cur.col] = c;	933	line->t[screen.cur.col] = c;
928	line->r[screen.cur.col] = rend;	934	line->r[screen.cur.col] = rend;
929		935
930	if (screen.cur.col < ncol - 1)	936	if (ecb_likely (screen.cur.col < ncol - 1))
931	screen.cur.col++;	937	screen.cur.col++;
932	else	938	else
933	{	939	{
934	line->l = ncol;	940	line->l = ncol;
935	if (screen.flags & Screen_Autowrap)	941	if (screen.flags & Screen_Autowrap)
936	screen.flags |= Screen_WrapNext;	942	screen.flags |= Screen_WrapNext;
937	break;	943
		944	goto end_of_line;
938	}	945	}
939		946
940	c = NOCHAR;	947	c = NOCHAR;
941	}	948	}
942	while (--width > 0);	949	while (ecb_unlikely (--width > 0));
943		950
944	// pad with spaces when overwriting wide character with smaller one	951	// pad with spaces when overwriting wide character with smaller one
945	if (!width)	952	for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
946	{	953	{
947	line->touch ();	954	line->t[c] = ' ';
		955	line->r[c] = rend;
		956	}
948		957
949	for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)	958	end_of_line:
		959	;
		960	}
		961	#if ENABLE_COMBINING
		962	else // width == 0
		963	{
		964	if (c != 0xfeff) // ignore BOM
		965	{
		966	// handle combining characters
		967	// we just tag the accent on the previous on-screen character.
		968	// this is arguably not correct, but also arguably not wrong.
		969	// we don't handle double-width characters nicely yet.
		970	line_t *linep;
		971	text_t *tp;
		972	rend_t *rp;
		973
		974	if (screen.cur.col > 0)
950	{	975	{
951	line->t[c] = ' ';
952	line->r[c] = rend;	976	linep = line;
		977	tp = line->t + screen.cur.col - 1;
		978	rp = line->r + screen.cur.col - 1;
953	}	979	}
		980	else if (screen.cur.row > 0
		981	&& ROW(screen.cur.row - 1).is_longer ())
		982	{
		983	linep = &ROW(screen.cur.row - 1);
		984	tp = line->t + ncol - 1;
		985	rp = line->r + ncol - 1;
		986	}
		987	else
		988	continue;
		989
		990	linep->touch ();
		991
		992	while (*tp == NOCHAR && tp > linep->t)
		993	tp--, rp--;
		994
		995	// first try to find a precomposed character
		996	unicode_t n = rxvt_compose (*tp, c);
		997	if (n == NOCHAR)
		998	n = rxvt_composite.compose (*tp, c);
		999
		1000	*tp = n;
		1001	*rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
954	}	1002	}
955	}	1003	}
956	else // width == 0
957	{
958	#if ENABLE_COMBINING
959	// handle combining characters
960	// we just tag the accent on the previous on-screen character.
961	// this is arguably not correct, but also arguably not wrong.
962	// we don't handle double-width characters nicely yet.
963	line_t *linep;
964	text_t *tp;
965	rend_t *rp;
966
967	if (screen.cur.col > 0)
968	{
969	linep = line;
970	tp = line->t + screen.cur.col - 1;
971	rp = line->r + screen.cur.col - 1;
972	}
973	else if (screen.cur.row > 0
974	&& ROW(screen.cur.row - 1).is_longer ())
975	{
976	linep = &ROW(screen.cur.row - 1);
977	tp = line->t + ncol - 1;
978	rp = line->r + ncol - 1;
979	}
980	else
981	continue;
982
983	linep->touch ();
984
985	while (*tp == NOCHAR && tp > linep->t)
986	tp--, rp--;
987
988	// first try to find a precomposed character
989	unicode_t n = rxvt_compose (*tp, c);
990	if (n == NOCHAR)
991	n = rxvt_composite.compose (*tp, c);
992
993	*tp = n;
994	*rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
995	#endif	1004	#endif
996	}
997	}	1005	}
998		1006
999	max_it (line->l, screen.cur.col);	1007	max_it (line->l, screen.cur.col);
1000		1008
1001	#ifdef DEBUG_STRICT
1002	assert (screen.cur.row >= 0);	1009	assert (screen.cur.row >= 0);
1003	#endif
1004	}	1010	}
1005		1011
1006	/* ------------------------------------------------------------------------- */	1012	/* ------------------------------------------------------------------------- */
1007	/*	1013	/*
1008	* Process Backspace. Move back the cursor back a position, wrap if have to	1014	* Process Backspace. Move back the cursor back a position, wrap if have to
…		…
1021		1027
1022	want_refresh = 1;	1028	want_refresh = 1;
1023	#endif	1029	#endif
1024	}	1030	}
1025	}	1031	}
		1032	else if (screen.flags & Screen_WrapNext)
		1033	screen.flags &= ~Screen_WrapNext;
1026	else	1034	else
1027	scr_gotorc (0, -1, RELATIVE);	1035	scr_gotorc (0, -1, RELATIVE);
1028	}	1036	}
1029		1037
1030	/* ------------------------------------------------------------------------- */	1038	/* ------------------------------------------------------------------------- */
…		…
1225	/*	1233	/*
1226	* Erase part or whole of a line	1234	* Erase part or whole of a line
1227	* XTERM_SEQ: Clear line to right: ESC [ 0 K	1235	* XTERM_SEQ: Clear line to right: ESC [ 0 K
1228	* XTERM_SEQ: Clear line to left : ESC [ 1 K	1236	* XTERM_SEQ: Clear line to left : ESC [ 1 K
1229	* XTERM_SEQ: Clear whole line : ESC [ 2 K	1237	* XTERM_SEQ: Clear whole line : ESC [ 2 K
		1238	* extension: clear to right unless wrapped: ESC [ 3 K
1230	*/	1239	*/
1231	void	1240	void
1232	rxvt_term::scr_erase_line (int mode) NOTHROW	1241	rxvt_term::scr_erase_line (int mode) NOTHROW
1233	{	1242	{
1234	unsigned int col, num;	1243	unsigned int col, num;
…		…
1243	line.touch ();	1252	line.touch ();
1244	line.is_longer (0);	1253	line.is_longer (0);
1245		1254
1246	switch (mode)	1255	switch (mode)
1247	{	1256	{
		1257	case 3:
		1258	if (screen.flags & Screen_WrapNext)
		1259	return;
		1260
		1261	/* fall through */
		1262
1248	case 0: /* erase to end of line */	1263	case 0: /* erase to end of line */
1249	col = screen.cur.col;	1264	col = screen.cur.col;
1250	num = ncol - col;	1265	num = ncol - col;
1251	min_it (line.l, col);	1266	min_it (line.l, col);
		1267
1252	if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)	1268	if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1253	|| ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))	1269	|| ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1254	CLEAR_SELECTION ();	1270	CLEAR_SELECTION ();
1255	break;	1271	break;
		1272
1256	case 1: /* erase to beginning of line */	1273	case 1: /* erase to beginning of line */
1257	col = 0;	1274	col = 0;
1258	num = screen.cur.col + 1;	1275	num = screen.cur.col + 1;
		1276
1259	if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)	1277	if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1260	|| ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))	1278	|| ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1261	CLEAR_SELECTION ();	1279	CLEAR_SELECTION ();
1262	break;	1280	break;
		1281
1263	case 2: /* erase whole line */	1282	case 2: /* erase whole line */
1264	col = 0;	1283	col = 0;
1265	num = ncol;	1284	num = ncol;
1266	line.l = 0;	1285	line.l = 0;
1267	if (selection.beg.row <= screen.cur.row	1286	if (selection.beg.row <= screen.cur.row
…		…
1325	if (row >= nrow) /* Out Of Bounds */	1344	if (row >= nrow) /* Out Of Bounds */
1326	return;	1345	return;
1327		1346
1328	min_it (num, nrow - row);	1347	min_it (num, nrow - row);
1329		1348
1330	if (rstyle & (RS_RVid | RS_Uline))	1349	if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1331	ren = (rend_t) ~RS_None;	1350	ren = (rend_t) ~RS_None;
1332	else if (GET_BASEBG (rstyle) == Color_bg)	1351	else if (GET_BASEBG (rstyle) == Color_bg)
1333	{	1352	{
1334	ren = DEFAULT_RSTYLE;	1353	ren = DEFAULT_RSTYLE;
1335	CLEAR_ROWS (row, num);	1354
		1355	if (mapped)
		1356	XClearArea (dpy, vt, 0,
		1357	Row2Pixel (row - view_start), (unsigned int)width,
		1358	(unsigned int)Height2Pixel (num), False);
1336	}	1359	}
1337	else	1360	else
1338	{	1361	{
1339	ren = rstyle & (RS_fgMask | RS_bgMask);	1362	ren = rstyle & (RS_fgMask | RS_bgMask);
		1363
		1364	if (mapped)
		1365	{
1340	gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];	1366	gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1341	XChangeGC (dpy, gc, GCForeground, &gcvalue);	1367	XChangeGC (dpy, gc, GCForeground, &gcvalue);
1342	ERASE_ROWS (row, num);	1368	XFillRectangle (dpy, vt, gc,
		1369	0, Row2Pixel (row - view_start),
		1370	(unsigned int)width,
		1371	(unsigned int)Height2Pixel (num));
1343	gcvalue.foreground = pix_colors[Color_fg];	1372	gcvalue.foreground = pix_colors[Color_fg];
1344	XChangeGC (dpy, gc, GCForeground, &gcvalue);	1373	XChangeGC (dpy, gc, GCForeground, &gcvalue);
		1374	}
1345	}	1375	}
1346		1376
1347	for (; num--; row++)	1377	for (; num--; row++)
1348	{	1378	{
1349	scr_blank_screen_mem (ROW(row), rstyle);	1379	scr_blank_screen_mem (ROW(row), rstyle);
		1380
		1381	if (row - view_start < nrow)
1350	scr_blank_line (drawn_buf [row], 0, ncol, ren);	1382	scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1351	}	1383	}
1352	}	1384	}
1353		1385
1354	#if !ENABLE_MINIMAL	1386	#if !ENABLE_MINIMAL
1355	void	1387	void
…		…
1429	* Insert/Delete <count> characters from the current position	1461	* Insert/Delete <count> characters from the current position
1430	*/	1462	*/
1431	void	1463	void
1432	rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW	1464	rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1433	{	1465	{
1434	int col, row;
1435	rend_t tr;
1436
1437	want_refresh = 1;	1466	want_refresh = 1;
1438	ZERO_SCROLLBACK ();	1467	ZERO_SCROLLBACK ();
1439		1468
1440	if (count <= 0)	1469	if (count <= 0)
1441	return;	1470	return;
…		…
1443	scr_do_wrap ();	1472	scr_do_wrap ();
1444		1473
1445	selection_check (1);	1474	selection_check (1);
1446	min_it (count, ncol - screen.cur.col);	1475	min_it (count, ncol - screen.cur.col);
1447		1476
1448	row = screen.cur.row;	1477	int row = screen.cur.row;
1449		1478
1450	line_t *line = &ROW(row);	1479	line_t *line = &ROW(row);
1451		1480
1452	line->touch ();	1481	line->touch ();
1453	line->is_longer (0);	1482	line->is_longer (0);
1454		1483
		1484	// nuke wide spanning the start
		1485	if (line->t[screen.cur.col] == NOCHAR)
		1486	scr_kill_char (*line, screen.cur.col);
		1487
1455	switch (insdel)	1488	switch (insdel)
1456	{	1489	{
1457	case INSERT:	1490	case INSERT:
1458	for (col = ncol - 1; (col - count) >= screen.cur.col; col--)	1491	line->l = min (line->l + count, ncol);
		1492
		1493	if (line->t[screen.cur.col] == NOCHAR)
		1494	scr_kill_char (*line, screen.cur.col);
		1495
		1496	for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1459	{	1497	{
1460	line->t[col] = line->t[col - count];	1498	line->t[col] = line->t[col - count];
1461	line->r[col] = line->r[col - count];	1499	line->r[col] = line->r[col - count];
1462	}	1500	}
1463
1464	line->l = min (line->l + count, ncol);
1465		1501
1466	if (selection.op && current_screen == selection.screen	1502	if (selection.op && current_screen == selection.screen
1467	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))	1503	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1468	{	1504	{
1469	if (selection.end.row != screen.cur.row	1505	if (selection.end.row != screen.cur.row
…		…
1484	case ERASE:	1520	case ERASE:
1485	screen.cur.col += count; /* don't worry if > ncol */	1521	screen.cur.col += count; /* don't worry if > ncol */
1486	selection_check (1);	1522	selection_check (1);
1487	screen.cur.col -= count;	1523	screen.cur.col -= count;
1488		1524
1489	line->l = max (line->l - count, 0);	1525	// nuke wide char after the end
		1526	if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
		1527	scr_kill_char (*line, screen.cur.col + count);
		1528
1490	scr_blank_line (*line, screen.cur.col, count, rstyle);	1529	scr_blank_line (*line, screen.cur.col, count, rstyle);
1491	break;	1530	break;
1492		1531
1493	case DELETE:	1532	case DELETE:
1494	tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);	1533	line->l = max (line->l - count, 0);
1495		1534
		1535	// nuke wide char spanning the end
		1536	if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
		1537	scr_kill_char (*line, screen.cur.col + count);
		1538
1496	for (col = screen.cur.col; (col + count) < ncol; col++)	1539	for (int col = screen.cur.col; (col + count) < ncol; col++)
1497	{	1540	{
1498	line->t[col] = line->t[col + count];	1541	line->t[col] = line->t[col + count];
1499	line->r[col] = line->r[col + count];	1542	line->r[col] = line->r[col + count];
1500	}	1543	}
1501		1544
1502	line->l = max (line->l - count, 0);
1503	scr_blank_line (*line, ncol - count, count, tr);	1545	scr_blank_line (*line, ncol - count, count, rstyle);
1504		1546
1505	if (selection.op && current_screen == selection.screen	1547	if (selection.op && current_screen == selection.screen
1506	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))	1548	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1507	{	1549	{
1508	if (selection.end.row != screen.cur.row	1550	if (selection.end.row != screen.cur.row
…		…
1644	{	1686	{
1645	rvideo_state = on;	1687	rvideo_state = on;
1646		1688
1647	::swap (pix_colors[Color_fg], pix_colors[Color_bg]);	1689	::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1648	#ifdef HAVE_BG_PIXMAP	1690	#ifdef HAVE_BG_PIXMAP
1649	if (bgPixmap.pixmap == None)	1691	if (bg_pixmap == None)
1650	#endif	1692	#endif
1651	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);	1693	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1652		1694
1653	XGCValues gcvalue;	1695	XGCValues gcvalue;
1654	gcvalue.foreground = pix_colors[Color_fg];	1696	gcvalue.foreground = pix_colors[Color_fg];
…		…
1798	for (i = PART_BEG; i < RC_COUNT; i++)	1840	for (i = PART_BEG; i < RC_COUNT; i++)
1799	{	1841	{
1800	min_it (rc[i].col, ncol - 1);	1842	min_it (rc[i].col, ncol - 1);
1801	min_it (rc[i].row, nrow - 1);	1843	min_it (rc[i].row, nrow - 1);
1802	}	1844	}
1803	// TODO: this line somehow causes segfault if scr_expose() is called just after resize	1845
1804	for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)	1846	for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1805	fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);	1847	fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1806		1848
1807	num_scr_allow = 0;	1849	num_scr_allow = 0;
1808		1850
…		…
1881		1923
1882	# ifndef NO_MAPALERT	1924	# ifndef NO_MAPALERT
1883	# ifdef MAPALERT_OPTION	1925	# ifdef MAPALERT_OPTION
1884	if (option (Opt_mapAlert))	1926	if (option (Opt_mapAlert))
1885	# endif	1927	# endif
1886	XMapWindow (dpy, parent[0]);	1928	XMapWindow (dpy, parent);
1887	# endif	1929	# endif
1888		1930
1889	# if ENABLE_FRILLS	1931	# if ENABLE_FRILLS
1890	if (option (Opt_urgentOnBell))	1932	if (option (Opt_urgentOnBell))
1891	{	1933	set_urgency (1);
1892	if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1893	{
1894	h->flags |= XUrgencyHint;
1895	XSetWMHints (dpy, parent[0], h);
1896	}
1897	}
1898	# endif	1934	# endif
1899		1935
1900	if (option (Opt_visualBell))	1936	if (option (Opt_visualBell))
1901	{	1937	{
1902	rvideo_bell = true;	1938	rvideo_bell = true;
…		…
1905		1941
1906	bell_ev.start (VISUAL_BELL_DURATION);	1942	bell_ev.start (VISUAL_BELL_DURATION);
1907	}	1943	}
1908	else	1944	else
1909	XBell (dpy, 0);	1945	XBell (dpy, 0);
		1946	HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1910	#endif	1947	#endif
1911	}	1948	}
1912		1949
1913	/* ------------------------------------------------------------------------- */	1950	/* ------------------------------------------------------------------------- */
1914	/* ARGSUSED */
1915	void	1951	void
1916	rxvt_term::scr_printscreen (int fullhist) NOTHROW	1952	rxvt_term::scr_printscreen (int fullhist) NOTHROW
1917	{	1953	{
1918	#ifdef PRINTPIPE	1954	#ifdef PRINTPIPE
1919	int nrows, row_start;	1955	int nrows, row_start;
1920	FILE *fd;	1956	FILE *fd = popen_printer ();
1921		1957
1922	if ((fd = popen_printer ()) == NULL)	1958	if (!fd)
1923	return;	1959	return;
1924		1960
1925	if (fullhist)	1961	if (fullhist)
1926	{	1962	{
1927	nrows = nrow - top_row;	1963	nrows = nrow - top_row;
…		…
1933	row_start = view_start;	1969	row_start = view_start;
1934	}	1970	}
1935		1971
1936	wctomb (0, 0);	1972	wctomb (0, 0);
1937		1973
1938	for (int r1 = 0; r1 < nrows; r1++)	1974	for (int r1 = row_start; r1 < row_start + nrows; r1++)
1939	{	1975	{
1940	text_t *tp = ROW(r1).t;	1976	text_t *tp = ROW(r1).t;
1941	int len = ROW(r1).l;	1977	int len = ROW(r1).l;
1942		1978
1943	for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN	1979	for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
…		…
1972	* screen.text/screen.rend contain what the screen will change to.	2008	* screen.text/screen.rend contain what the screen will change to.
1973	*/	2009	*/
1974	void	2010	void
1975	rxvt_term::scr_refresh () NOTHROW	2011	rxvt_term::scr_refresh () NOTHROW
1976	{	2012	{
1977	unsigned char have_bg,
1978	showcursor; /* show the cursor */
1979	int16_t col, row, /* column/row we're processing */	2013	int16_t col, row, /* column/row we're processing */
1980	ocrow; /* old cursor row */	2014	ocrow; /* old cursor row */
1981	int i; /* tmp */	2015	int i; /* tmp */
1982	#ifndef NO_CURSORCOLOR	2016	#ifndef NO_CURSORCOLOR
1983	rend_t cc1; /* store colours at cursor position (s) */	2017	rend_t cc1; /* store colours at cursor position (s) */
…		…
1994	/*	2028	/*
1995	* A: set up vars	2029	* A: set up vars
1996	*/	2030	*/
1997	refresh_count = 0;	2031	refresh_count = 0;
1998		2032
		2033	unsigned int old_screen_flags = screen.flags;
1999	have_bg = 0;	2034	char have_bg = 0;
2000	#ifdef HAVE_BG_PIXMAP	2035	#ifdef HAVE_BG_PIXMAP
2001	have_bg = bgPixmap.pixmap != None;	2036	have_bg = bg_pixmap != None;
2002	#endif	2037	#endif
2003	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */	2038	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2004		2039
2005	/*	2040	/*
2006	* B: reverse any characters which are selected	2041	* B: reverse any characters which are selected
2007	*/	2042	*/
2008	scr_reverse_selection ();	2043	scr_reverse_selection ();
		2044
		2045	HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
		2046	#if ENABLE_OVERLAY
		2047	scr_swap_overlay ();
		2048	#endif
		2049
		2050	char showcursor = screen.flags & Screen_VisibleCursor;
2009		2051
2010	/*	2052	/*
2011	* C: set the cursor character (s)	2053	* C: set the cursor character (s)
2012	*/	2054	*/
2013	{	2055	{
2014	unsigned char setoldcursor;	2056	unsigned char setoldcursor;
2015		2057
2016	showcursor = (screen.flags & Screen_VisibleCursor);
2017	#ifdef CURSOR_BLINK	2058	#ifdef CURSOR_BLINK
2018	if (hidden_cursor)	2059	if (hidden_cursor)
2019	showcursor = 0;	2060	showcursor = 0;
2020	#endif	2061	#endif
2021		2062
…		…
2049	ccol2 = bgcolor_of (rstyle);	2090	ccol2 = bgcolor_of (rstyle);
2050	#else	2091	#else
2051	ccol2 = Color_bg;	2092	ccol2 = Color_bg;
2052	#endif	2093	#endif
2053		2094
2054	if (showcursor && focus)	2095	if (focus)
2055	{	2096	{
2056	if (option (Opt_cursorUnderline))	2097	if (option (Opt_cursorUnderline))
2057	*crp ^= RS_Uline;	2098	*crp ^= RS_Uline;
2058	else	2099	else
2059	{	2100	{
…		…
2094	oldcursor.col = screen.cur.col;	2135	oldcursor.col = screen.cur.col;
2095	}	2136	}
2096	}	2137	}
2097	}	2138	}
2098		2139
2099	HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2100	#if ENABLE_OVERLAY
2101	scr_swap_overlay ();
2102	#endif
2103
2104	#ifndef NO_SLOW_LINK_SUPPORT	2140	#ifndef NO_SLOW_LINK_SUPPORT
2105	/*	2141	/*
2106	* D: CopyArea pass - very useful for slower links	2142	* D: CopyArea pass - very useful for slower links
2107	* This has been deliberately kept simple.	2143	* This has been deliberately kept simple.
2108	*/	2144	*/
…		…
2197	continue;	2233	continue;
2198		2234
2199	// redraw one or more characters	2235	// redraw one or more characters
2200		2236
2201	// seek to the beginning of wide characters	2237	// seek to the beginning of wide characters
2202	while (stp[col] == NOCHAR && col > 0)	2238	while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2203	--col;	2239	--col;
2204		2240
2205	rend_t rend = srp[col]; /* screen rendition (target rendtion) */	2241	rend_t rend = srp[col]; /* screen rendition (target rendition) */
2206	text_t *text = stp + col;	2242	text_t *text = stp + col;
2207	int count = 1;	2243	int count = 1;
2208		2244
2209	dtp[col] = stp[col];	2245	dtp[col] = stp[col];
2210	drp[col] = rend;	2246	drp[col] = rend;
…		…
2214	for (i = 0; ++col < ncol; )	2250	for (i = 0; ++col < ncol; )
2215	{	2251	{
2216	if (stp[col] == NOCHAR)	2252	if (stp[col] == NOCHAR)
2217	{	2253	{
2218	dtp[col] = stp[col];	2254	dtp[col] = stp[col];
2219	drp[col] = rend;	2255	drp[col] = srp[col];
		2256
2220	count++;	2257	count++;
2221	i++;	2258	i++;
2222		2259
2223	continue;	2260	continue;
2224	}	2261	}
…		…
2244		2281
2245	col--; /* went one too far. move back */	2282	col--; /* went one too far. move back */
2246	count -= i; /* dump any matching trailing chars */	2283	count -= i; /* dump any matching trailing chars */
2247		2284
2248	// sometimes we optimize away the trailing NOCHAR's, add them back	2285	// sometimes we optimize away the trailing NOCHAR's, add them back
2249	while (i && text[count] == NOCHAR)	2286	while (ecb_unlikely (i && text[count] == NOCHAR))
2250	count++, i--;	2287	count++, i--;
2251		2288
2252	/*	2289	/*
2253	* Determine the attributes for the string	2290	* Determine the attributes for the string
2254	*/	2291	*/
2255	int fore = fgcolor_of (rend); // desired foreground	2292	int fore = fgcolor_of (rend); // desired foreground
2256	int back = bgcolor_of (rend); // desired background	2293	int back = bgcolor_of (rend); // desired background
2257		2294
2258	// only do special processing if any attributes are set, which is unlikely	2295	// only do special processing if any attributes are set, which is unlikely
2259	if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))	2296	if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2260	{	2297	{
2261	bool invert = rend & RS_RVid;	2298	bool invert = rend & RS_RVid;
2262		2299
2263	#ifndef NO_BOLD_UNDERLINE_REVERSE	2300	#ifndef NO_BOLD_UNDERLINE_REVERSE
2264	if (rend & RS_Bold && fore == Color_fg)	2301	if (rend & RS_Bold && fore == Color_fg)
…		…
2283		2320
2284	if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))	2321	if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2285	fore = Color_UL;	2322	fore = Color_UL;
2286	#endif	2323	#endif
2287		2324
		2325	#ifdef OPTION_HC
		2326	if (rend & RS_Sel)
		2327	{
		2328	/* invert the column if no highlightColor is set or it is the
		2329	* current cursor column */
		2330	if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
		2331	&& ISSET_PIXCOLOR (Color_HC))
		2332	{
		2333	if (ISSET_PIXCOLOR (Color_HTC))
		2334	fore = Color_HTC;
		2335	// if invert is 0 reverse video is set so we use bg color as fg color
		2336	else if (!invert)
		2337	fore = back;
		2338
		2339	back = Color_HC;
		2340	invert = 0;
		2341	}
		2342	}
		2343	#endif
		2344
2288	if (invert)	2345	if (invert)
2289	{	2346	{
2290	#ifdef OPTION_HC
2291	if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2292	|| !ISSET_PIXCOLOR (Color_HC))
2293	#endif
2294	/* invert the column if no highlightColor is set or it is the
2295	* current cursor column */
2296	::swap (fore, back);	2347	::swap (fore, back);
2297	#ifdef OPTION_HC
2298	else if (ISSET_PIXCOLOR (Color_HC))
2299	back = Color_HC;
2300	#endif
2301		2348
2302	#ifndef NO_BOLD_UNDERLINE_REVERSE	2349	#ifndef NO_BOLD_UNDERLINE_REVERSE
2303	# ifndef OPTION_HC
2304	if (ISSET_PIXCOLOR (Color_RV))
2305	back = Color_RV;
2306	# endif
2307	if (fore == back)	2350	if (fore == back)
2308	{	2351	{
2309	fore = Color_bg;	2352	fore = Color_bg;
2310	back = Color_fg;	2353	back = Color_fg;
2311	}	2354	}
…		…
2347	/*	2390	/*
2348	* Actually do the drawing of the string here	2391	* Actually do the drawing of the string here
2349	*/	2392	*/
2350	rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];	2393	rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2351		2394
2352	if (have_bg && back == Color_bg)	2395	if (ecb_likely (have_bg && back == Color_bg))
2353	{	2396	{
2354	// this is very ugly, maybe push it into ->draw?	2397	// this is very ugly, maybe push it into ->draw?
2355		2398
2356	for (i = 0; i < count; i++) /* don't draw empty strings */	2399	for (i = 0; i < count; i++) /* don't draw empty strings */
2357	if (text[i] != ' ')	2400	if (text[i] != ' ')
…		…
2364	did_clear: ;	2407	did_clear: ;
2365	}	2408	}
2366	else	2409	else
2367	font->draw (*drawable, xpixel, ypixel, text, count, fore, back);	2410	font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2368		2411
2369	if (rend & RS_Uline && font->descent > 1 && fore != back)	2412	if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2370	{	2413	{
2371	#if ENABLE_FRILLS	2414	#if ENABLE_FRILLS
2372	if (ISSET_PIXCOLOR (Color_underline))	2415	if (ISSET_PIXCOLOR (Color_underline))
2373	XSetForeground (dpy, gc, pix_colors[Color_underline]);	2416	XSetForeground (dpy, gc, pix_colors[Color_underline]);
2374	else	2417	else
…		…
2379	xpixel, ypixel + font->ascent + 1,	2422	xpixel, ypixel + font->ascent + 1,
2380	xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);	2423	xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2381	}	2424	}
2382	} /* for (col....) */	2425	} /* for (col....) */
2383	} /* for (row....) */	2426	} /* for (row....) */
2384
2385	#if ENABLE_OVERLAY
2386	scr_swap_overlay ();
2387	#endif
2388	HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2389		2427
2390	/*	2428	/*
2391	* G: cleanup cursor and display outline cursor if necessary	2429	* G: cleanup cursor and display outline cursor if necessary
2392	*/	2430	*/
2393	if (showcursor)	2431	if (showcursor)
…		…
2432	}	2470	}
2433		2471
2434	/*	2472	/*
2435	* H: cleanup selection	2473	* H: cleanup selection
2436	*/	2474	*/
		2475	#if ENABLE_OVERLAY
		2476	scr_swap_overlay ();
		2477	#endif
		2478	HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
		2479
2437	scr_reverse_selection ();	2480	scr_reverse_selection ();
2438		2481
		2482	screen.flags = old_screen_flags;
2439	num_scr = 0;	2483	num_scr = 0;
2440	num_scr_allow = 1;	2484	num_scr_allow = 1;
2441	}	2485	}
2442		2486
2443	void	2487	void
…		…
2464	scr_remap_chars (swap_buf [i]);	2508	scr_remap_chars (swap_buf [i]);
2465	}	2509	}
2466	}	2510	}
2467		2511
2468	void	2512	void
2469	rxvt_term::scr_recolour () NOTHROW	2513	rxvt_term::scr_recolour (bool refresh) NOTHROW
2470	{	2514	{
		2515	bool transparent = false;
		2516
2471	#ifdef HAVE_BG_PIXMAP	2517	#ifdef HAVE_BG_PIXMAP
2472	bgPixmap.apply ();	2518	if (bg_pixmap != None)
2473	#else	2519	{
		2520	# ifdef ENABLE_TRANSPARENCY
		2521	if (bg_flags & BG_IS_TRANSPARENT)
		2522	{
		2523	XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap);
		2524	XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2474		2525
		2526	transparent = true;
		2527	}
		2528	else
		2529	# endif
		2530	{
		2531	XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
		2532	XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
		2533	}
		2534	}
		2535	else
		2536	#endif
		2537	{
2475	XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);	2538	XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2476	XClearWindow (dpy, parent[0]);
2477	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);	2539	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
		2540	}
		2541
		2542	XClearWindow (dpy, parent);
2478		2543
2479	if (scrollBar.win)	2544	if (scrollBar.win)
2480	{	2545	{
		2546	if (transparent)
		2547	XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
		2548	else
2481	XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);	2549	XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2482	scrollBar.state = STATE_IDLE;	2550	scrollBar.state = SB_STATE_IDLE;
2483	scrollBar.show (0);	2551	scrollBar.show (0);
2484	}	2552	}
2485		2553
2486	#endif	2554	if (refresh)
2487		2555	{
2488	/* bgPixmap.apply () does not do the following : */
2489	scr_clear ();	2556	scr_clear ();
2490	scr_touch (true);	2557	scr_touch (true);
		2558	}
2491	want_refresh = 1;	2559	want_refresh = 1;
2492	}	2560	}
2493		2561
2494	/* ------------------------------------------------------------------------- */	2562	/* ------------------------------------------------------------------------- */
2495	void	2563	void
…		…
2563	{	2631	{
2564	#if !ENABLE_MINIMAL	2632	#if !ENABLE_MINIMAL
2565	if (selection.rect)	2633	if (selection.rect)
2566	scr_xor_rect (selection.beg.row, selection.beg.col,	2634	scr_xor_rect (selection.beg.row, selection.beg.col,
2567	selection.end.row, selection.end.col,	2635	selection.end.row, selection.end.col,
2568	RS_RVid, RS_RVid | RS_Uline);	2636	RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2569	else	2637	else
2570	#endif	2638	#endif
2571	scr_xor_span (selection.beg.row, selection.beg.col,	2639	scr_xor_span (selection.beg.row, selection.beg.col,
2572	selection.end.row, selection.end.col,	2640	selection.end.row, selection.end.col,
2573	RS_RVid);	2641	RS_Sel | RS_RVid);
2574	}	2642	}
2575	}	2643	}
2576		2644
2577	/* ------------------------------------------------------------------------- */	2645	/* ------------------------------------------------------------------------- */
2578	/*	2646	/*
…		…
2583	void	2651	void
2584	rxvt_term::scr_dump (int fd) NOTHROW	2652	rxvt_term::scr_dump (int fd) NOTHROW
2585	{	2653	{
2586	int row, wrote;	2654	int row, wrote;
2587	unsigned int width, towrite;	2655	unsigned int width, towrite;
2588	char r1[] = "\n";	2656	const char r1[] = "\n";
2589		2657
2590	for (row = saveLines + top_row;	2658	for (row = saveLines + top_row;
2591	row < saveLines + nrow - 1; row++)	2659	row < saveLines + nrow - 1; row++)
2592	{	2660	{
2593	width = row_buf[row].l >= 0 ? row_buf[row].l	2661	width = row_buf[row].l >= 0 ? row_buf[row].l
…		…
2610	* CHARACTER SELECTION *	2678	* CHARACTER SELECTION *
2611	* ------------------------------------------------------------------------- */	2679	* ------------------------------------------------------------------------- */
2612	void	2680	void
2613	rxvt_term::selection_check (int check_more) NOTHROW	2681	rxvt_term::selection_check (int check_more) NOTHROW
2614	{	2682	{
2615	row_col_t pos;
2616
2617	if (!selection.op)	2683	if (!selection.op)
2618	return;	2684	return;
2619		2685
		2686	row_col_t pos;
2620	pos.row = pos.col = 0;	2687	pos.row = pos.col = 0;
		2688
2621	if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)	2689	if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2622	|| !IN_RANGE_EXC (selection.mark.row, top_row, nrow)	2690	|| !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2623	|| !IN_RANGE_EXC (selection.end.row, top_row, nrow)	2691	|| !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2624	|| (check_more == 1	2692	|| (check_more == 1
2625	&& current_screen == selection.screen	2693	&& current_screen == selection.screen
…		…
2627	&& ROWCOL_IS_BEFORE (screen.cur, selection.end))	2695	&& ROWCOL_IS_BEFORE (screen.cur, selection.end))
2628	|| (check_more == 2	2696	|| (check_more == 2
2629	&& ROWCOL_IS_BEFORE (selection.beg, pos)	2697	&& ROWCOL_IS_BEFORE (selection.beg, pos)
2630	&& ROWCOL_IS_AFTER (selection.end, pos))	2698	&& ROWCOL_IS_AFTER (selection.end, pos))
2631	|| (check_more == 3	2699	|| (check_more == 3
2632	&& ROWCOL_IS_AFTER (selection.end, pos))	2700	&& ROWCOL_IS_AFTER (selection.end, pos)))
2633	|| (check_more == 4 /* screen width change */
2634	&& (selection.beg.row != selection.end.row
2635	|| selection.end.col > ncol)))
2636	CLEAR_SELECTION ();	2701	CLEAR_ALL_SELECTION ();
2637	}	2702	}
2638		2703
2639	/* ------------------------------------------------------------------------- */	2704	/* ------------------------------------------------------------------------- */
2640	/*	2705	/*
2641	* Paste a selection direct to the command fd	2706	* Paste a selection direct to the command fd
2642	*/	2707	*/
2643	void	2708	void
2644	rxvt_term::paste (char *data, unsigned int len) NOTHROW	2709	rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2645	{	2710	{
2646	/* convert normal newline chars into common keyboard Return key sequence */	2711	/* convert normal newline chars into common keyboard Return key sequence */
2647	for (unsigned int i = 0; i < len; i++)	2712	for (unsigned int i = 0; i < len; i++)
2648	if (data[i] == C0_LF)	2713	if (data[i] == C0_LF)
2649	data[i] = C0_CR;	2714	data[i] = C0_CR;
…		…
2655		2720
2656	if (priv_modes & PrivMode_BracketPaste)	2721	if (priv_modes & PrivMode_BracketPaste)
2657	tt_printf ("\e[201~");	2722	tt_printf ("\e[201~");
2658	}	2723	}
2659		2724
2660	/* ------------------------------------------------------------------------- */
2661	/*
2662	* Respond to a notification that a primary selection has been sent
2663	* EXT: SelectionNotify
2664	*/
2665	void	2725	void
2666	rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW	2726	rxvt_term::paste (char *data, unsigned int len) NOTHROW
2667	{	2727	{
2668	if (prop == None) /* check for failed XConvertSelection */	2728	if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2669	{
2670	if ((selection_type & Sel_CompoundText))
2671	{
2672	int selnum = selection_type & Sel_whereMask;
2673
2674	selection_type = 0;
2675	if (selnum != Sel_direct)
2676	selection_request_other (XA_STRING, selnum);
2677	}
2678
2679	if ((selection_type & Sel_UTF8String))
2680	{
2681	int selnum = selection_type & Sel_whereMask;
2682
2683	selection_type = Sel_CompoundText;
2684	if (selnum != Sel_direct)
2685	selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2686	else
2687	selection_type = 0;
2688	}
2689
2690	return;
2691	}
2692
2693	unsigned long bytes_after;
2694	XTextProperty ct;
2695
2696	if (XGetWindowProperty (dpy, win, prop,
2697	0, PROP_SIZE / 4,
2698	delete_prop, AnyPropertyType,
2699	&ct.encoding, &ct.format,
2700	&ct.nitems, &bytes_after,
2701	&ct.value) != Success)
2702	{
2703	ct.value = 0;
2704	goto bailout;
2705	}
2706
2707	if (ct.encoding == None)
2708	goto bailout;
2709
2710	if (bytes_after)
2711	{
2712	// fetch and append remaining data
2713	XTextProperty ct2;
2714
2715	if (XGetWindowProperty (dpy, win, prop,
2716	ct.nitems / 4, (bytes_after + 3) / 4,
2717	delete_prop, AnyPropertyType,
2718	&ct2.encoding, &ct2.format,
2719	&ct2.nitems, &bytes_after,
2720	&ct2.value) != Success)
2721	goto bailout;
2722
2723	// realloc should be compatible to XFree, here, and elsewhere, too
2724	ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2725	memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2726	ct.nitems += ct2.nitems;
2727
2728	XFree (ct2.value);
2729	}
2730
2731	if (ct.value == 0)
2732	goto bailout;
2733
2734	if (ct.encoding == xa[XA_INCR])
2735	{
2736	// INCR selection, start handshake
2737	if (!delete_prop)
2738	XDeleteProperty (dpy, win, prop);
2739
2740	selection_wait = Sel_incr;
2741	incr_buf_fill = 0;
2742	incr_ev.start (10);
2743
2744	goto bailout;
2745	}
2746
2747	if (ct.nitems == 0)
2748	{
2749	if (selection_wait == Sel_incr)
2750	{
2751	XFree (ct.value);
2752
2753	// finally complete, now paste the whole thing
2754	selection_wait = Sel_normal;
2755	ct.value = (unsigned char *)incr_buf;
2756	ct.nitems = incr_buf_fill;
2757	incr_buf = 0;
2758	incr_buf_size = 0;
2759	incr_ev.stop ();
2760	}
2761	else
2762	{
2763	if (selection_wait == Sel_normal
2764	&& (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2765	{
2766	/*
2767	* pass through again trying CUT_BUFFER0 if we've come from
2768	* XConvertSelection () but nothing was presented
2769	*/
2770	selection_paste (display->root, XA_CUT_BUFFER0, False);
2771	}
2772
2773	goto bailout;
2774	}
2775	}
2776	else if (selection_wait == Sel_incr)
2777	{
2778	incr_ev.start (10);
2779
2780	while (incr_buf_fill + ct.nitems > incr_buf_size)
2781	{
2782	incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2783	incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2784	}
2785
2786	memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2787	incr_buf_fill += ct.nitems;
2788
2789	goto bailout;
2790	}
2791
2792	char **cl;
2793	int cr;
2794
2795	#if !ENABLE_MINIMAL
2796	// xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2797	// so recode it manually
2798	if (ct.encoding == xa[XA_UTF8_STRING])
2799	{
2800	wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2801	char *s = rxvt_wcstombs (w);
2802	free (w);
2803	// TODO: strlen == only the first element will be converted. well...
2804	paste (s, strlen (s));
2805	free (s);
2806	}
2807	else
2808	#endif
2809	if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2810	&& cl)
2811	{
2812	for (int i = 0; i < cr; i++)
2813	paste (cl[i], strlen (cl[i]));
2814
2815	XFreeStringList (cl);
2816	}
2817	else
2818	paste ((char *)ct.value, ct.nitems); // paste raw
2819
2820	bailout:
2821	XFree (ct.value);
2822
2823	if (selection_wait == Sel_normal)
2824	selection_wait = Sel_none;
2825	}
2826
2827	void
2828	rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2829	{
2830	selection_wait = Sel_none;
2831
2832	incr_buf_size = 0;
2833	free (incr_buf);
2834
2835	rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2836	}
2837
2838	void
2839	rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2840	{
2841	if (prop == None || selection_wait != Sel_incr)
2842	return;	2729	return;
2843		2730
2844	selection_paste (win, prop, true);	2731	tt_paste (data, len);
2845	}	2732	}
2846		2733
2847	/* ------------------------------------------------------------------------- */	2734	/* ------------------------------------------------------------------------- */
2848	/*	2735	/*
2849	* Request the current selection:	2736	* Request PRIMARY, SECONDARY or CLIPBOARD selection.
2850	* Order: > internal selection if available	2737	* if the requested selection has no owner or is empty CUT_BUFFER0 is used
2851	* > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)	2738	* as fallback
2852	* > CUT_BUFFER0
2853	* (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2854	* will auto fallback to CUT_BUFFER0
2855	* EXT: button 2 release	2739	* EXT: button 2 release
2856	*/	2740	*/
2857	void	2741	void
2858	rxvt_term::selection_request (Time tm, int selnum) NOTHROW	2742	rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2859	{	2743	{
2860	if (selection.text && selnum == Sel_Primary)	2744	if (!selection_req)
2861	{
2862	/* internal selection */
2863	char *str = rxvt_wcstombs (selection.text, selection.len);
2864	paste (str, strlen (str));
2865	free (str);
2866	return;
2867	}	2745	{
2868	else	2746	selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
		2747	selection_req->run ();
2869	{	2748	}
2870	selection_request_time = tm;
2871	selection_wait = Sel_normal;
2872
2873	#if X_HAVE_UTF8_STRING
2874	selection_type = Sel_UTF8String;
2875	if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2876	return;
2877	#else
2878	selection_type = Sel_CompoundText;
2879	if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2880	return;
2881	#endif
2882	}
2883
2884	selection_wait = Sel_none; /* don't loop in selection_paste () */
2885	selection_paste (display->root, XA_CUT_BUFFER0, false);
2886	}
2887
2888	int
2889	rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2890	{
2891	Atom sel;
2892
2893	selection_type |= selnum;
2894
2895	if (selnum == Sel_Primary)
2896	sel = XA_PRIMARY;
2897	else if (selnum == Sel_Secondary)
2898	sel = XA_SECONDARY;
2899	else
2900	sel = xa[XA_CLIPBOARD];
2901
2902	if (XGetSelectionOwner (dpy, sel) != None)
2903	{
2904	XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2905	vt, selection_request_time);
2906	return 1;
2907	}
2908
2909	return 0;
2910	}	2749	}
2911		2750
2912	/* ------------------------------------------------------------------------- */	2751	/* ------------------------------------------------------------------------- */
2913	/*	2752	/*
2914	* Clear all selected text	2753	* Clear all selected text
2915	* EXT: SelectionClear	2754	* EXT: SelectionClear
2916	*/	2755	*/
2917	void	2756	void
2918	rxvt_term::selection_clear () NOTHROW	2757	rxvt_term::selection_clear (bool clipboard) NOTHROW
2919	{	2758	{
		2759	if (!clipboard)
		2760	{
2920	want_refresh = 1;	2761	want_refresh = 1;
2921	free (selection.text);	2762	free (selection.text);
2922	selection.text = NULL;	2763	selection.text = NULL;
2923	selection.len = 0;	2764	selection.len = 0;
2924	CLEAR_SELECTION ();	2765	CLEAR_SELECTION ();
2925		2766
2926	if (display->selection_owner == this)	2767	if (display->selection_owner == this)
2927	display->selection_owner = 0;	2768	display->selection_owner = 0;
		2769	}
		2770	else
		2771	{
		2772	free (selection.clip_text);
		2773	selection.clip_text = NULL;
		2774	selection.clip_len = 0;
		2775
		2776	if (display->clipboard_owner == this)
		2777	display->clipboard_owner = 0;
		2778	}
2928	}	2779	}
2929		2780
2930	/* ------------------------------------------------------------------------- */	2781	/* ------------------------------------------------------------------------- */
2931	/*	2782	/*
2932	* Copy a selection into the cut buffer	2783	* Copy a selection into the cut buffer
2933	* EXT: button 1 or 3 release	2784	* EXT: button 1 or 3 release
2934	*/	2785	*/
2935	void	2786	void
2936	rxvt_term::selection_make (Time tm)	2787	rxvt_term::selection_make (Time tm)
2937	{	2788	{
2938	int i;	2789	int size;
2939	wchar_t *new_selection_text;	2790	wchar_t *new_selection_text;
2940	text_t *t;	2791	text_t *t;
2941		2792
2942	switch (selection.op)	2793	switch (selection.op)
2943	{	2794	{
…		…
2959	return; /* nothing selected, go away */	2810	return; /* nothing selected, go away */
2960		2811
2961	if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))	2812	if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2962	return;	2813	return;
2963		2814
2964	i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);	2815	size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2965	new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));	2816	new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
2966		2817
2967	int ofs = 0;	2818	int ofs = 0;
2968	int extra = 0;	2819	int extra = 0;
2969		2820
2970	int col = selection.beg.col;	2821	int col = selection.beg.col;
…		…
2976	{	2827	{
2977	#if !ENABLE_MINIMAL	2828	#if !ENABLE_MINIMAL
2978	if (selection.rect)	2829	if (selection.rect)
2979	{	2830	{
2980	col = selection.beg.col;	2831	col = selection.beg.col;
2981	end_col = ncol + 1;	2832	end_col = selection.end.col;
2982	}	2833	}
2983	else	2834	else
2984	#endif	2835	#endif
2985	end_col = ROW(row).l;	2836	end_col = ROW(row).l;
2986		2837
2987	col = max (col, 0);	2838	col = max (col, 0);
2988		2839
2989	if (row == selection.end.row	2840	if (row == selection.end.row)
2990	#if !ENABLE_MINIMAL
2991	|| selection.rect
2992	#endif
2993	)
2994	min_it (end_col, selection.end.col);	2841	min_it (end_col, selection.end.col);
2995		2842
2996	t = ROW(row).t + col;	2843	t = ROW(row).t + col;
2997		2844
2998	for (; col < end_col; col++)	2845	for (; col < end_col; col++)
…		…
3006		2853
3007	extra -= (len - 1);	2854	extra -= (len - 1);
3008		2855
3009	if (extra < 0)	2856	if (extra < 0)
3010	{	2857	{
3011	extra += i;	2858	extra += size;
3012	i += i;	2859	size += size;
3013	new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t));	2860	new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3014	}	2861	}
3015		2862
3016	ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);	2863	ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3017	}	2864	}
3018	#endif	2865	#endif
…		…
3030		2877
3031	new_selection_text[ofs++] = C0_LF;	2878	new_selection_text[ofs++] = C0_LF;
3032	}	2879	}
3033	else	2880	else
3034	#endif	2881	#endif
3035	if (!ROW(row).is_longer () && row != selection.end.row)	2882	if (!ROW(row).is_longer ()
		2883	&& (row != selection.end.row || end_col != selection.end.col)
		2884	&& (row != selection.beg.row || selection.beg.col < ncol))
3036	new_selection_text[ofs++] = C0_LF;	2885	new_selection_text[ofs++] = C0_LF;
3037	}	2886	}
3038
3039	if (end_col != selection.end.col)
3040	new_selection_text[ofs++] = C0_LF;
3041		2887
3042	new_selection_text[ofs] = 0;	2888	new_selection_text[ofs] = 0;
3043		2889
3044	if (ofs == 0)	2890	if (ofs == 0)
3045	{	2891	{
…		…
3058		2904
3059	selection_grab (tm);	2905	selection_grab (tm);
3060	}	2906	}
3061		2907
3062	bool	2908	bool
3063	rxvt_term::selection_grab (Time tm) NOTHROW	2909	rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3064	{	2910	{
		2911	Atom sel;
		2912
		2913	if (!clipboard)
		2914	{
3065	selection_time = tm;	2915	selection_time = tm;
		2916	sel = XA_PRIMARY;
		2917	}
		2918	else
		2919	{
		2920	clipboard_time = tm;
		2921	sel = xa[XA_CLIPBOARD];
		2922	}
3066		2923
3067	XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm);	2924	XSetSelectionOwner (dpy, sel, vt, tm);
3068	if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt)	2925	if (XGetSelectionOwner (dpy, sel) == vt)
3069	{	2926	{
3070	display->set_selection_owner (this);	2927	display->set_selection_owner (this, clipboard);
3071	return true;	2928	return true;
3072	}	2929	}
3073	else	2930	else
3074	{	2931	{
3075	selection_clear ();	2932	selection_clear (clipboard);
3076	return false;	2933	return false;
3077	}	2934	}
3078		2935
3079	#if 0	2936	#if 0
3080	XTextProperty ct;	2937	XTextProperty ct;
…		…
3540	* EXT: SelectionRequest	3397	* EXT: SelectionRequest
3541	*/	3398	*/
3542	void	3399	void
3543	rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW	3400	rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3544	{	3401	{
		3402	Atom property = rq.property == None ? rq.target : rq.property;
3545	XSelectionEvent ev;	3403	XSelectionEvent ev;
3546		3404
3547	ev.type = SelectionNotify;	3405	ev.type = SelectionNotify;
3548	ev.property = None;	3406	ev.property = None;
3549	ev.display = rq.display;	3407	ev.display = rq.display;
…		…
3564	*target++ = xa[XA_COMPOUND_TEXT];	3422	*target++ = xa[XA_COMPOUND_TEXT];
3565	#if X_HAVE_UTF8_STRING	3423	#if X_HAVE_UTF8_STRING
3566	*target++ = xa[XA_UTF8_STRING];	3424	*target++ = xa[XA_UTF8_STRING];
3567	#endif	3425	#endif
3568		3426
3569	XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,	3427	XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3570	32, PropModeReplace,	3428	32, PropModeReplace,
3571	(unsigned char *)target_list, target - target_list);	3429	(unsigned char *)target_list, target - target_list);
3572	ev.property = rq.property;	3430	ev.property = property;
3573	}	3431	}
3574	#if TODO // TODO	3432	#if TODO // TODO
3575	else if (rq.target == xa[XA_MULTIPLE])	3433	else if (rq.target == xa[XA_MULTIPLE])
3576	{	3434	{
3577	/* TODO: Handle MULTIPLE */	3435	/* TODO: Handle MULTIPLE */
3578	}	3436	}
3579	#endif	3437	#endif
3580	else if (rq.target == xa[XA_TIMESTAMP] && selection.text)	3438	else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3581	{	3439	{
3582	XChangeProperty (dpy, rq.requestor, rq.property, rq.target,	3440	XChangeProperty (dpy, rq.requestor, property, rq.target,
3583	32, PropModeReplace, (unsigned char *)&selection_time, 1);	3441	32, PropModeReplace, (unsigned char *)&selection_time, 1);
3584	ev.property = rq.property;	3442	ev.property = property;
		3443	}
		3444	else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
		3445	{
		3446	XChangeProperty (dpy, rq.requestor, property, rq.target,
		3447	32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
		3448	ev.property = property;
3585	}	3449	}
3586	else if (rq.target == XA_STRING	3450	else if (rq.target == XA_STRING
3587	|| rq.target == xa[XA_TEXT]	3451	|| rq.target == xa[XA_TEXT]
3588	|| rq.target == xa[XA_COMPOUND_TEXT]	3452	|| rq.target == xa[XA_COMPOUND_TEXT]
3589	|| rq.target == xa[XA_UTF8_STRING]	3453	|| rq.target == xa[XA_UTF8_STRING]
…		…
3621	{	3485	{
3622	target = xa[XA_COMPOUND_TEXT];	3486	target = xa[XA_COMPOUND_TEXT];
3623	style = enc_compound_text;	3487	style = enc_compound_text;
3624	}	3488	}
3625		3489
3626	if (selection.text)	3490	if (rq.selection == XA_PRIMARY && selection.text)
3627	{	3491	{
3628	cl = selection.text;	3492	cl = selection.text;
3629	selectlen = selection.len;	3493	selectlen = selection.len;
		3494	}
		3495	else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
		3496	{
		3497	cl = selection.clip_text;
		3498	selectlen = selection.clip_len;
3630	}	3499	}
3631	else	3500	else
3632	{	3501	{
3633	cl = L"";	3502	cl = L"";
3634	selectlen = 0;	3503	selectlen = 0;
…		…
3655	ct.value = (unsigned char *)cl;	3524	ct.value = (unsigned char *)cl;
3656	ct.nitems = selectlen;	3525	ct.nitems = selectlen;
3657	ct.encoding = target;	3526	ct.encoding = target;
3658	}	3527	}
3659		3528
3660	XChangeProperty (dpy, rq.requestor, rq.property,	3529	XChangeProperty (dpy, rq.requestor, property,
3661	ct.encoding, 8, PropModeReplace,	3530	ct.encoding, 8, PropModeReplace,
3662	ct.value, (int)ct.nitems);	3531	ct.value, (int)ct.nitems);
3663	ev.property = rq.property;	3532	ev.property = property;
3664		3533
3665	if (freect)	3534	if (freect)
3666	XFree (ct.value);	3535	XFree (ct.value);
3667	}	3536	}
3668		3537
…		…
3702	h += 2; min_it (h, nrow);	3571	h += 2; min_it (h, nrow);
3703		3572
3704	x -= 1; clamp_it (x, 0, ncol - w);	3573	x -= 1; clamp_it (x, 0, ncol - w);
3705	y -= 1; clamp_it (y, 0, nrow - h);	3574	y -= 1; clamp_it (y, 0, nrow - h);
3706		3575
3707	ov_x = x; ov_y = y;	3576	ov.x = x; ov.y = y;
3708	ov_w = w; ov_h = h;	3577	ov.w = w; ov.h = h;
3709		3578
3710	ov_text = new text_t *[h];	3579	ov.text = new text_t *[h];
3711	ov_rend = new rend_t *[h];	3580	ov.rend = new rend_t *[h];
3712		3581
3713	for (y = 0; y < h; y++)	3582	for (y = 0; y < h; y++)
3714	{	3583	{
3715	text_t *tp = ov_text[y] = new text_t[w];	3584	text_t *tp = ov.text[y] = new text_t[w];
3716	rend_t *rp = ov_rend[y] = new rend_t[w];	3585	rend_t *rp = ov.rend[y] = new rend_t[w];
3717		3586
3718	text_t t0, t1, t2;	3587	text_t t0, t1, t2;
3719	rend_t r = OVERLAY_RSTYLE;	3588	rend_t r = OVERLAY_RSTYLE;
3720		3589
3721	if (y == 0)	3590	if (y == 0)
…		…
3740	}	3609	}
3741		3610
3742	void	3611	void
3743	rxvt_term::scr_overlay_off () NOTHROW	3612	rxvt_term::scr_overlay_off () NOTHROW
3744	{	3613	{
3745	if (!ov_text)	3614	if (!ov.text)
3746	return;	3615	return;
3747		3616
3748	want_refresh = 1;	3617	want_refresh = 1;
3749		3618
3750	for (int y = 0; y < ov_h; y++)	3619	for (int y = 0; y < ov.h; y++)
3751	{	3620	{
3752	delete [] ov_text[y];	3621	delete [] ov.text[y];
3753	delete [] ov_rend[y];	3622	delete [] ov.rend[y];
3754	}	3623	}
3755		3624
3756	delete [] ov_text; ov_text = 0;	3625	delete [] ov.text; ov.text = 0;
3757	delete [] ov_rend; ov_rend = 0;	3626	delete [] ov.rend; ov.rend = 0;
3758	}	3627	}
3759		3628
3760	void	3629	void
3761	rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW	3630	rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3762	{	3631	{
3763	if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)	3632	if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3764	return;	3633	return;
3765		3634
3766	x++, y++;	3635	x++, y++;
3767		3636
3768	ov_text[y][x] = text;	3637	ov.text[y][x] = text;
3769	ov_rend[y][x] = rend;	3638	ov.rend[y][x] = rend;
3770	}	3639	}
3771		3640
3772	void	3641	void
3773	rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW	3642	rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3774	{	3643	{
…		…
3793	}	3662	}
3794		3663
3795	void	3664	void
3796	rxvt_term::scr_swap_overlay () NOTHROW	3665	rxvt_term::scr_swap_overlay () NOTHROW
3797	{	3666	{
3798	if (!ov_text)	3667	if (!ov.text)
3799	return;	3668	return;
3800		3669
		3670	// hide cursor if it is within the overlay area
		3671	if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
		3672	&& IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
		3673	screen.flags &= ~Screen_VisibleCursor;
		3674
3801	// swap screen mem with overlay	3675	// swap screen mem with overlay
3802	for (int y = ov_h; y--; )	3676	for (int y = ov.h; y--; )
3803	{	3677	{
3804	text_t *t1 = ov_text[y];	3678	text_t *t1 = ov.text[y];
3805	rend_t *r1 = ov_rend[y];	3679	rend_t *r1 = ov.rend[y];
3806		3680
3807	text_t *t2 = ROW(y + ov_y + view_start).t + ov_x;	3681	text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3808	rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x;	3682	rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3809		3683
3810	for (int x = ov_w; x--; )	3684	for (int x = ov.w; x--; )
3811	{	3685	{
3812	text_t t = *t1; *t1++ = *t2; *t2++ = t;	3686	text_t t = *t1; *t1++ = *t2; *t2++ = t;
3813	rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));	3687	rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3814	}	3688	}
3815	}	3689	}

Diff Legend

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