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.319 by root, Tue Nov 4 23:08:44 2008 UTC vs.
Revision 1.407 by sf-exg, Wed Nov 16 18:52: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	* ------------------------------------------------------------------------- */
…		…
143	col--;	142	col--;
144		143
145	rend_t rend = l.r[col] & ~RS_baseattrMask;	144	rend_t rend = l.r[col] & ~RS_baseattrMask;
146	rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));	145	rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
147		146
		147	l.touch ();
		148
148	// found start, nuke	149	// found start, nuke
149	do {	150	do {
150	l.t[col] = ' ';	151	l.t[col] = ' ';
151	l.r[col] = rend;	152	l.r[col] = rend;
152	col++;	153	col++;
…		…
158	* ------------------------------------------------------------------------- */	159	* ------------------------------------------------------------------------- */
159		160
160	void	161	void
161	rxvt_term::scr_reset ()	162	rxvt_term::scr_reset ()
162	{	163	{
		164	#if ENABLE_OVERLAY
		165	scr_overlay_off ();
		166	#endif
		167
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;
…		…
198	term_start = 0;	203	term_start = 0;
199		204
200	talloc = new rxvt_salloc (ncol * sizeof (text_t));	205	talloc = new rxvt_salloc (ncol * sizeof (text_t));
201	ralloc = new rxvt_salloc (ncol * sizeof (rend_t));	206	ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
202		207
203	row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));	208	row_buf = (line_t *)rxvt_calloc (total_rows , sizeof (line_t));
204	drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));	209	drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
205	swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));	210	swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
206		211
207	for (int row = nrow; row--; )	212	for (int row = nrow; row--; )
208	{	213	{
…		…
231	selection.text = NULL;	236	selection.text = NULL;
232	selection.len = 0;	237	selection.len = 0;
233	selection.op = SELECTION_CLEAR;	238	selection.op = SELECTION_CLEAR;
234	selection.screen = PRIMARY;	239	selection.screen = PRIMARY;
235	selection.clicks = 0;	240	selection.clicks = 0;
		241	selection.clip_text = NULL;
		242	selection.clip_len = 0;
236	}	243	}
237	else	244	else
238	{	245	{
239	/*	246	/*
240	* add or delete rows as appropriate	247	* add or delete rows as appropriate
…		…
268	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);
269	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);
270	}	277	}
271		278
272	line_t *old_buf = row_buf;	279	line_t *old_buf = row_buf;
273	row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));	280	row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
274		281
275	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
276	int pend = MOD (term_start + top_row , prev_total_rows);	283	int pend = MOD (term_start + top_row , prev_total_rows);
277	int q = total_rows; // rewrapped row	284	int q = total_rows; // rewrapped row
278		285
279	if (top_row)	286	if (top_row)
280	{	287	{
281	// 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
282	// 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
283		291
284	row_col_t ocur = screen.cur;	292	row_col_t ocur = screen.cur;
285	ocur.row = MOD (term_start + ocur.row, prev_total_rows);	293	ocur.row = MOD (term_start + ocur.row, prev_total_rows);
286		294
287	do	295	do
288	{	296	{
289	p = MOD (p - 1, prev_total_rows);	297	p = MOD (p - 1, prev_total_rows);
290	#ifdef DEBUG_STRICT
291	assert (old_buf [MOD (p, prev_total_rows)].t);	298	assert (old_buf [MOD (p, prev_total_rows)].t);
292	#endif
293	int plines = 1;	299	int plines = 1;
294	int llen = old_buf [MOD (p, prev_total_rows)].l;	300	int llen = old_buf [MOD (p, prev_total_rows)].l;
295		301
296	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 ())
297	{	303	{
…		…
393		399
394	clamp_it (screen.cur.row, 0, nrow - 1);	400	clamp_it (screen.cur.row, 0, nrow - 1);
395	clamp_it (screen.cur.col, 0, ncol - 1);	401	clamp_it (screen.cur.col, 0, ncol - 1);
396	}	402	}
397		403
		404	free (tabs);
		405	tabs = (char *)rxvt_malloc (ncol);
		406
		407	for (int col = ncol; col--; )
		408	tabs [col] = col % TABSIZE == 0;
		409
398	CLEAR_ALL_SELECTION ();	410	CLEAR_ALL_SELECTION ();
399		411
400	prev_nrow = nrow;	412	prev_nrow = nrow;
401	prev_ncol = ncol;	413	prev_ncol = ncol;
402		414
…		…
434	void	446	void
435	rxvt_term::scr_poweron ()	447	rxvt_term::scr_poweron ()
436	{	448	{
437	scr_release ();	449	scr_release ();
438	prev_nrow = prev_ncol = 0;	450	prev_nrow = prev_ncol = 0;
		451	rvideo_mode = false;
439	scr_soft_reset ();	452	scr_soft_reset ();
440	scr_reset ();	453	scr_reset ();
441		454
442	scr_clear (true);	455	scr_clear (true);
443	scr_refresh ();	456	scr_refresh ();
…		…
449	/* only affects modes, nothing drastic such as clearing the screen */	462	/* only affects modes, nothing drastic such as clearing the screen */
450	#if ENABLE_OVERLAY	463	#if ENABLE_OVERLAY
451	scr_overlay_off ();	464	scr_overlay_off ();
452	#endif	465	#endif
453		466
454	rvideo_mode = false;
455
456	if (current_screen != PRIMARY)	467	if (current_screen != PRIMARY)
457	scr_swap_screen ();	468	scr_swap_screen ();
458
459	free (tabs);
460	tabs = (char *)rxvt_malloc (ncol);
461
462	for (int col = ncol; --col; )
463	tabs [col] = col % TABSIZE == 0;
464		469
465	scr_scroll_region (0, MAX_ROWS - 1);	470	scr_scroll_region (0, MAX_ROWS - 1);
466	scr_rendition (0, ~RS_None);	471	scr_rendition (0, ~RS_None);
467	scr_insert_mode (0);	472	scr_insert_mode (0);
468	}	473	}
…		…
510	}	515	}
511		516
512	/* boundary check in case screen size changed between SAVE and RESTORE */	517	/* boundary check in case screen size changed between SAVE and RESTORE */
513	min_it (s->cur.row, nrow - 1);	518	min_it (s->cur.row, nrow - 1);
514	min_it (s->cur.col, ncol - 1);	519	min_it (s->cur.col, ncol - 1);
515	#ifdef DEBUG_STRICT
516	assert (s->cur.row >= 0);	520	assert (s->cur.row >= 0);
517	assert (s->cur.col >= 0);	521	assert (s->cur.col >= 0);
518	#endif
519	}	522	}
520		523
521	void	524	void
522	rxvt_term::scr_swap_screen ()	525	rxvt_term::scr_swap_screen ()
523	{	526	{
…		…
546	return;	549	return;
547		550
548	want_refresh = 1;	551	want_refresh = 1;
549	view_start = 0;	552	view_start = 0;
550		553
551	selection_check (2); /* check for boundary cross */	554	/* check for boundary cross */
		555	row_col_t pos;
		556	pos.row = pos.col = 0;
		557	if (ROWCOL_IS_BEFORE (selection.beg, pos)
		558	&& ROWCOL_IS_AFTER (selection.end, pos))
		559	CLEAR_SELECTION ();
552		560
553	int i = current_screen; current_screen = scrn; scrn = i;	561	current_screen = scrn;
554		562
555	#if NSCREENS	563	#if NSCREENS
556	if (option (Opt_secondaryScreen))	564	if (option (Opt_secondaryScreen))
557	{	565	{
558	num_scr = 0;	566	num_scr = 0;
…		…
635		643
636	if (count > 0	644	if (count > 0
637	&& row1 == 0	645	&& row1 == 0
638	&& (current_screen == PRIMARY || option (Opt_secondaryScroll)))	646	&& (current_screen == PRIMARY || option (Opt_secondaryScroll)))
639	{	647	{
		648	min_it (count, total_rows - (nrow - (row2 + 1)));
		649
640	top_row = max (top_row - count, -saveLines);	650	top_row = max (top_row - count, -saveLines);
641
642	// scroll everything up 'count' lines
643	term_start = (term_start + count) % total_rows;
644		651
645	// sever bottommost line	652	// sever bottommost line
646	{	653	{
647	line_t &l = ROW(row2 - count);	654	line_t &l = ROW(row2);
648	l.is_longer (0);	655	l.is_longer (0);
649	l.touch ();	656	l.touch ();
650	}	657	}
651		658
		659	// scroll everything up 'count' lines
		660	term_start = (term_start + count) % total_rows;
		661
		662	// now copy lines below the scroll region bottom to the
		663	// bottom of the screen again, so they look as if they
		664	// hadn't moved.
		665	for (int i = nrow; --i > row2; )
		666	{
		667	line_t &l1 = ROW(i - count);
		668	line_t &l2 = ROW(i);
		669
		670	::swap (l1, l2);
		671	l2.touch ();
		672	}
		673
652	// erase newly scrolled-in lines	674	// erase newly scrolled-in lines
653	for (int i = count; i--; )	675	for (int i = count; i--; )
654	{	676	{
655	line_t &l = ROW(nrow - 1 - i);	677	line_t &l = ROW(row2 - i);
656		678
657	// optimize if already cleared, can be significant on slow machines	679	// optimise if already cleared, can be significant on slow machines
658	// could be rolled into scr_blank_screen_mem	680	// could be rolled into scr_blank_screen_mem
659	if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))	681	if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
660	{	682	{
661	scr_blank_line (l, 0, l.l, rstyle);	683	scr_blank_line (l, 0, l.l, rstyle);
662	l.l = 0;	684	l.l = 0;
…		…
664	}	686	}
665	else	687	else
666	scr_blank_screen_mem (l, rstyle);	688	scr_blank_screen_mem (l, rstyle);
667	}	689	}
668		690
669	// now copy lines below the scroll region bottom to the
670	// bottom of the screen again, so they look as if they
671	// hadn't moved.
672	for (int i = nrow; --i > row2; )
673	{
674	line_t &l1 = ROW(i - count);
675	line_t &l2 = ROW(i);
676
677	::swap (l1, l2);
678	l2.touch ();
679	}
680
681	// move and/or clear selection, if any	691	// move and/or clear selection, if any
682	if (selection.op && current_screen == selection.screen)	692	if (selection.op && current_screen == selection.screen
		693	&& selection.beg.row <= row2)
683	{	694	{
684	selection.beg.row -= count;	695	selection.beg.row -= count;
685	selection.end.row -= count;	696	selection.end.row -= count;
686	selection.mark.row -= count;	697	selection.mark.row -= count;
687		698
688	if (selection.beg.row < top_row	699	selection_check (0);
689	|| selection.end.row < top_row
690	|| selection.mark.row < top_row)
691	{
692	CLEAR_ALL_SELECTION ();
693	selection.op = SELECTION_CLEAR;
694	}
695	}	700	}
696		701
697	// finally move the view window, if desired	702	// finally move the view window, if desired
698	if (option (Opt_scrollWithBuffer)	703	if (option (Opt_scrollWithBuffer)
699	&& view_start != 0	704	&& view_start != 0
…		…
729	}	734	}
730		735
731	// use a simple and robust scrolling algorithm, this	736	// use a simple and robust scrolling algorithm, this
732	// part of scr_scroll_text is not time-critical.	737	// part of scr_scroll_text is not time-critical.
733		738
		739	// sever line above scroll region
		740	if (row1)
		741	{
		742	line_t &l = ROW(row1 - 1);
		743	l.is_longer (0);
		744	l.touch ();
		745	}
		746
734	int rows = row2 - row1 + 1;	747	int rows = row2 - row1 + 1;
735		748
736	min_it (count, rows);	749	min_it (count, rows);
737		750
738	line_t *temp_buf = row_buf + total_rows;	751	line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
739		752
740	for (int row = 0; row < rows; row++)	753	for (int row = 0; row < rows; row++)
741	{	754	{
742	temp_buf [row] = ROW(row1 + (row + count + rows) % rows);	755	temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
743		756
…		…
745	scr_blank_screen_mem (temp_buf [row], rstyle);	758	scr_blank_screen_mem (temp_buf [row], rstyle);
746	}	759	}
747		760
748	for (int row = 0; row < rows; row++)	761	for (int row = 0; row < rows; row++)
749	ROW(row1 + row) = temp_buf [row];	762	ROW(row1 + row) = temp_buf [row];
		763
		764	// sever bottommost line
		765	{
		766	line_t &l = ROW(row2);
		767	l.is_longer (0);
		768	l.touch ();
		769	}
750	}	770	}
751		771
752	return count;	772	return count;
753	}	773	}
754		774
…		…
760	rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW	780	rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
761	{	781	{
762	if (len <= 0) /* sanity */	782	if (len <= 0) /* sanity */
763	return;	783	return;
764		784
765	unsigned char checksel;	785	bool checksel;
766	unicode_t c;	786	unicode_t c;
767	int ncol = this->ncol;	787	int ncol = this->ncol;
768	const wchar_t *strend = str + len;	788	const wchar_t *strend = str + len;
769		789
770	want_refresh = 1;	790	want_refresh = 1;
…		…
783	scr_scroll_text (screen.tscroll, screen.bscroll, minlines);	803	scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
784	screen.cur.row -= minlines;	804	screen.cur.row -= minlines;
785	}	805	}
786	}	806	}
787		807
788	#ifdef DEBUG_STRICT
789	assert (screen.cur.col < ncol);	808	assert (screen.cur.col < ncol);
790	assert (screen.cur.row < nrow	809	assert (screen.cur.row < nrow
791	&& screen.cur.row >= top_row);	810	&& screen.cur.row >= top_row);
792	#endif
793	int row = screen.cur.row;	811	int row = screen.cur.row;
794		812
795	checksel = selection.op && current_screen == selection.screen ? 1 : 0;	813	checksel = selection.op && current_screen == selection.screen ? 1 : 0;
796		814
797	line_t *line = &ROW(row);	815	line_t *line = &ROW(row);
798		816
799	while (str < strend)	817	while (str < strend)
800	{	818	{
801	c = (unicode_t)*str++; // convert to rxvt-unicodes representation	819	c = (unicode_t)*str++; // convert to rxvt-unicodes representation
802		820
803	if (expect_false (c < 0x20))	821	if (ecb_unlikely (c < 0x20))
804	if (c == C0_LF)	822	if (c == C0_LF)
805	{	823	{
806	max_it (line->l, screen.cur.col);	824	max_it (line->l, screen.cur.col);
807		825
808	screen.flags &= ~Screen_WrapNext;	826	screen.flags &= ~Screen_WrapNext;
…		…
827	{	845	{
828	scr_tab (1, true);	846	scr_tab (1, true);
829	continue;	847	continue;
830	}	848	}
831		849
832	if (expect_false (	850	if (ecb_unlikely (
833	checksel /* see if we're writing within selection */	851	checksel /* see if we're writing within selection */
834	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)	852	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
835	&& ROWCOL_IS_BEFORE (screen.cur, selection.end)	853	&& ROWCOL_IS_BEFORE (screen.cur, selection.end)
836	))	854	))
837	{	855	{
…		…
842	* should be a similar check.	860	* should be a similar check.
843	*/	861	*/
844	CLEAR_SELECTION ();	862	CLEAR_SELECTION ();
845	}	863	}
846		864
847	if (expect_false (screen.flags & Screen_WrapNext))	865	if (ecb_unlikely (screen.flags & Screen_WrapNext))
848	{	866	{
849	scr_do_wrap ();	867	scr_do_wrap ();
850		868
851	line->l = ncol;	869	line->l = ncol;
852	line->is_longer (1);	870	line->is_longer (1);
…		…
854	row = screen.cur.row;	872	row = screen.cur.row;
855	line = &ROW(row); /* _must_ refresh */	873	line = &ROW(row); /* _must_ refresh */
856	}	874	}
857		875
858	// some utf-8 decoders "decode" surrogate characters: let's fix this.	876	// some utf-8 decoders "decode" surrogate characters: let's fix this.
859	if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff)))	877	if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
860	c = 0xfffd;	878	c = 0xfffd;
861		879
862	// rely on wcwidth to tell us the character width, do wcwidth before	880	// rely on wcwidth to tell us the character width, do wcwidth before
863	// further replacements, as wcwidth might return -1 for the line	881	// further replacements, as wcwidth might return -1 for the line
864	// drawing characters below as they might be invalid in the current	882	// drawing characters below as they might be invalid in the current
865	// locale.	883	// locale.
866	int width = WCWIDTH (c);	884	int width = WCWIDTH (c);
867		885
868	if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL	886	if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
869	{	887	{
870	// vt100 special graphics and line drawing	888	// vt100 special graphics and line drawing
871	// 5f-7e standard vt100	889	// 5f-7e standard vt100
872	// 40-5e rxvt extension for extra curses acs chars	890	// 40-5e rxvt extension for extra curses acs chars
873	static uint16_t vt100_0[62] = { // 41 .. 7e	891	static uint16_t vt100_0[62] = { // 41 .. 7e
…		…
886	c = vt100_0[c - 0x41];	904	c = vt100_0[c - 0x41];
887	width = 1; // vt100 line drawing characters are always single-width	905	width = 1; // vt100 line drawing characters are always single-width
888	}	906	}
889	}	907	}
890		908
891	if (expect_false (screen.flags & Screen_Insert))	909	if (ecb_unlikely (screen.flags & Screen_Insert))
892	scr_insdel_chars (width, INSERT);	910	scr_insdel_chars (width, INSERT);
893		911
894	if (width != 0)	912	if (width != 0)
895	{	913	{
896	#if !UNICODE_3	914	#if !UNICODE_3
…		…
901	# else	919	# else
902	c = 0xfffd;	920	c = 0xfffd;
903	# endif	921	# endif
904	#endif	922	#endif
905		923
		924	rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
		925
		926	// if the character doesn't fit into the remaining columns...
		927	if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
		928	{
		929	if (screen.flags & Screen_Autowrap)
		930	{
		931	// ... artificially enlargen the previous one
		932	c = NOCHAR;
		933	// and try the same character next loop iteration
		934	--str;
		935	}
		936	else
		937	screen.cur.col = ncol - width;
		938	}
		939
906	// nuke the character at this position, if required	940	// nuke the character at this position, if required
907	if (expect_false (	941	// due to wonderful coincidences everywhere else in this loop
		942	// we never have to check for overwriting a wide char itself,
		943	// only its tail.
908	line->t[screen.cur.col] == NOCHAR	944	if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
909	|| (screen.cur.col < ncol - 1
910	&& line->t[screen.cur.col + 1] == NOCHAR)
911	))
912	scr_kill_char (*line, screen.cur.col);	945	scr_kill_char (*line, screen.cur.col);
913
914	rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
915
916	// if the character doesn't fit into the remaining columns...
917	if (expect_false (screen.cur.col > ncol - width && ncol >= width))
918	{
919	// ... artificially enlargen the previous one
920	c = NOCHAR;
921	// and try the same character next loop iteration
922	--str;
923	}
924		946
925	line->touch ();	947	line->touch ();
926		948
927	do	949	do
928	{	950	{
929	line->t[screen.cur.col] = c;	951	line->t[screen.cur.col] = c;
930	line->r[screen.cur.col] = rend;	952	line->r[screen.cur.col] = rend;
931		953
932	if (expect_true (screen.cur.col < ncol - 1))	954	if (ecb_likely (screen.cur.col < ncol - 1))
933	screen.cur.col++;	955	screen.cur.col++;
934	else	956	else
935	{	957	{
936	line->l = ncol;	958	line->l = ncol;
937	if (screen.flags & Screen_Autowrap)	959	if (screen.flags & Screen_Autowrap)
938	screen.flags |= Screen_WrapNext;	960	screen.flags |= Screen_WrapNext;
939	break;	961
		962	goto end_of_line;
940	}	963	}
941		964
942	c = NOCHAR;	965	c = NOCHAR;
943	}	966	}
944	while (expect_false (--width > 0));	967	while (ecb_unlikely (--width > 0));
945		968
946	// pad with spaces when overwriting wide character with smaller one	969	// pad with spaces when overwriting wide character with smaller one
947	if (expect_false (!width))	970	for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
948	{	971	{
949	line->touch ();
950
951	for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
952	{
953	line->t[c] = ' ';	972	line->t[c] = ' ';
954	line->r[c] = rend;	973	line->r[c] = rend;
955	}
956	}	974	}
		975
		976	end_of_line:
		977	;
957	}	978	}
958	#if ENABLE_COMBINING	979	#if ENABLE_COMBINING
959	else // width == 0	980	else // width == 0
960	{	981	{
961	if (c != 0xfeff) // ignore BOM	982	if (c != 0xfeff) // ignore BOM
…		…
1001	#endif	1022	#endif
1002	}	1023	}
1003		1024
1004	max_it (line->l, screen.cur.col);	1025	max_it (line->l, screen.cur.col);
1005		1026
1006	#ifdef DEBUG_STRICT
1007	assert (screen.cur.row >= 0);	1027	assert (screen.cur.row >= 0);
1008	#endif
1009	}	1028	}
1010		1029
1011	/* ------------------------------------------------------------------------- */	1030	/* ------------------------------------------------------------------------- */
1012	/*	1031	/*
1013	* Process Backspace. Move back the cursor back a position, wrap if have to	1032	* Process Backspace. Move back the cursor back a position, wrap if have to
…		…
1026		1045
1027	want_refresh = 1;	1046	want_refresh = 1;
1028	#endif	1047	#endif
1029	}	1048	}
1030	}	1049	}
		1050	else if (screen.flags & Screen_WrapNext)
		1051	screen.flags &= ~Screen_WrapNext;
1031	else	1052	else
1032	scr_gotorc (0, -1, RELATIVE);	1053	scr_gotorc (0, -1, RELATIVE);
1033	}	1054	}
1034		1055
1035	/* ------------------------------------------------------------------------- */	1056	/* ------------------------------------------------------------------------- */
…		…
1310	ZERO_SCROLLBACK ();	1331	ZERO_SCROLLBACK ();
1311		1332
1312	switch (mode)	1333	switch (mode)
1313	{	1334	{
1314	case 0: /* erase to end of screen */	1335	case 0: /* erase to end of screen */
1315	selection_check (1);
1316	scr_erase_line (0);	1336	scr_erase_line (0);
1317	row = screen.cur.row + 1; /* possible OOB */	1337	row = screen.cur.row + 1; /* possible OOB */
1318	num = nrow - row;	1338	num = nrow - row;
1319	break;	1339	break;
1320	case 1: /* erase to beginning of screen */	1340	case 1: /* erase to beginning of screen */
1321	selection_check (3);
1322	scr_erase_line (1);	1341	scr_erase_line (1);
1323	row = 0;	1342	row = 0;
1324	num = screen.cur.row;	1343	num = screen.cur.row;
1325	break;	1344	break;
1326	case 2: /* erase whole screen */	1345	case 2: /* erase whole screen */
1327	selection_check (3);
1328	row = 0;	1346	row = 0;
1329	num = nrow;	1347	num = nrow;
1330	break;	1348	break;
1331	default:	1349	default:
1332	return;	1350	return;
…		…
1341	if (row >= nrow) /* Out Of Bounds */	1359	if (row >= nrow) /* Out Of Bounds */
1342	return;	1360	return;
1343		1361
1344	min_it (num, nrow - row);	1362	min_it (num, nrow - row);
1345		1363
1346	/*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */
1347	if (rstyle & (RS_RVid | RS_Uline))	1364	if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1348	ren = (rend_t) ~RS_None;	1365	ren = (rend_t) ~RS_None;
1349	else if (GET_BASEBG (rstyle) == Color_bg)	1366	else if (GET_BASEBG (rstyle) == Color_bg)
1350	{	1367	{
1351	ren = DEFAULT_RSTYLE;	1368	ren = DEFAULT_RSTYLE;
1352		1369
1353	if (mapped)	1370	if (mapped)
1354	XClearArea (dpy, vt, 0,	1371	XClearArea (dpy, vt, 0,
1355	Row2Pixel (row), (unsigned int)width,	1372	Row2Pixel (row - view_start), (unsigned int)width,
1356	(unsigned int)Height2Pixel (num), False);	1373	(unsigned int)Height2Pixel (num), False);
1357	}	1374	}
1358	else	1375	else
1359	{	1376	{
1360	ren = rstyle & (RS_fgMask | RS_bgMask);	1377	ren = rstyle & (RS_fgMask | RS_bgMask);
1361		1378
		1379	if (mapped)
		1380	{
1362	gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];	1381	gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1363	XChangeGC (dpy, gc, GCForeground, &gcvalue);	1382	XChangeGC (dpy, gc, GCForeground, &gcvalue);
1364	XFillRectangle (dpy, vt, gc,	1383	XFillRectangle (dpy, vt, gc,
1365	0, Row2Pixel (row),	1384	0, Row2Pixel (row - view_start),
1366	(unsigned int)width,	1385	(unsigned int)width,
1367	(unsigned int)Height2Pixel (num));	1386	(unsigned int)Height2Pixel (num));
1368	gcvalue.foreground = pix_colors[Color_fg];	1387	gcvalue.foreground = pix_colors[Color_fg];
1369	XChangeGC (dpy, gc, GCForeground, &gcvalue);	1388	XChangeGC (dpy, gc, GCForeground, &gcvalue);
		1389	}
1370	}	1390	}
1371		1391
1372	for (; num--; row++)	1392	for (; num--; row++)
1373	{	1393	{
1374	scr_blank_screen_mem (ROW(row), rstyle);	1394	scr_blank_screen_mem (ROW(row), rstyle);
		1395
		1396	if (row - view_start < nrow)
1375	scr_blank_line (drawn_buf [row], 0, ncol, ren);	1397	scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1376	}	1398	}
1377	}	1399	}
1378		1400
1379	#if !ENABLE_MINIMAL	1401	#if !ENABLE_MINIMAL
1380	void	1402	void
…		…
1399		1421
1400	want_refresh = 1;	1422	want_refresh = 1;
1401	ZERO_SCROLLBACK ();	1423	ZERO_SCROLLBACK ();
1402		1424
1403	num_scr_allow = 0;	1425	num_scr_allow = 0;
1404	selection_check (3);	1426
		1427	row_col_t pos;
		1428	pos.row = pos.col = 0;
		1429	if (ROWCOL_IS_AFTER (selection.end, pos))
		1430	CLEAR_SELECTION ();
1405		1431
1406	fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));	1432	fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1407	for (int row = nrow; row--; )	1433	for (int row = nrow; row--; )
1408	{	1434	{
1409	line_t &line = ROW(row);	1435	line_t &line = ROW(row);
…		…
1533	{	1559	{
1534	line->t[col] = line->t[col + count];	1560	line->t[col] = line->t[col + count];
1535	line->r[col] = line->r[col + count];	1561	line->r[col] = line->r[col + count];
1536	}	1562	}
1537		1563
1538	scr_blank_line (*line, ncol - count, count,	1564	scr_blank_line (*line, ncol - count, count, rstyle);
1539	line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask));
1540		1565
1541	if (selection.op && current_screen == selection.screen	1566	if (selection.op && current_screen == selection.screen
1542	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))	1567	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1543	{	1568	{
1544	if (selection.end.row != screen.cur.row	1569	if (selection.end.row != screen.cur.row
…		…
1680	{	1705	{
1681	rvideo_state = on;	1706	rvideo_state = on;
1682		1707
1683	::swap (pix_colors[Color_fg], pix_colors[Color_bg]);	1708	::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1684	#ifdef HAVE_BG_PIXMAP	1709	#ifdef HAVE_BG_PIXMAP
1685	if (bgPixmap.pixmap == None)	1710	if (bg_pixmap == None)
1686	#endif	1711	#endif
1687	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);	1712	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1688		1713
1689	XGCValues gcvalue;	1714	XGCValues gcvalue;
1690	gcvalue.foreground = pix_colors[Color_fg];	1715	gcvalue.foreground = pix_colors[Color_fg];
…		…
1834	for (i = PART_BEG; i < RC_COUNT; i++)	1859	for (i = PART_BEG; i < RC_COUNT; i++)
1835	{	1860	{
1836	min_it (rc[i].col, ncol - 1);	1861	min_it (rc[i].col, ncol - 1);
1837	min_it (rc[i].row, nrow - 1);	1862	min_it (rc[i].row, nrow - 1);
1838	}	1863	}
1839	// TODO: this line somehow causes segfault if scr_expose() is called just after resize	1864
1840	for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)	1865	for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1841	fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);	1866	fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1842		1867
1843	num_scr_allow = 0;	1868	num_scr_allow = 0;
1844		1869
…		…
1917		1942
1918	# ifndef NO_MAPALERT	1943	# ifndef NO_MAPALERT
1919	# ifdef MAPALERT_OPTION	1944	# ifdef MAPALERT_OPTION
1920	if (option (Opt_mapAlert))	1945	if (option (Opt_mapAlert))
1921	# endif	1946	# endif
1922	XMapWindow (dpy, parent[0]);	1947	XMapWindow (dpy, parent);
1923	# endif	1948	# endif
1924		1949
1925	# if ENABLE_FRILLS	1950	# if ENABLE_FRILLS
1926	if (option (Opt_urgentOnBell))	1951	if (option (Opt_urgentOnBell))
1927	set_urgency (1);	1952	set_urgency (1);
…		…
1935		1960
1936	bell_ev.start (VISUAL_BELL_DURATION);	1961	bell_ev.start (VISUAL_BELL_DURATION);
1937	}	1962	}
1938	else	1963	else
1939	XBell (dpy, 0);	1964	XBell (dpy, 0);
		1965	HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1940	#endif	1966	#endif
1941	}	1967	}
1942		1968
1943	/* ------------------------------------------------------------------------- */	1969	/* ------------------------------------------------------------------------- */
1944	/* ARGSUSED */
1945	void	1970	void
1946	rxvt_term::scr_printscreen (int fullhist) NOTHROW	1971	rxvt_term::scr_printscreen (int fullhist) NOTHROW
1947	{	1972	{
1948	#ifdef PRINTPIPE	1973	#ifdef PRINTPIPE
1949	int nrows, row_start;	1974	int nrows, row_start;
…		…
1963	row_start = view_start;	1988	row_start = view_start;
1964	}	1989	}
1965		1990
1966	wctomb (0, 0);	1991	wctomb (0, 0);
1967		1992
1968	for (int r1 = 0; r1 < nrows; r1++)	1993	for (int r1 = row_start; r1 < row_start + nrows; r1++)
1969	{	1994	{
1970	text_t *tp = ROW(r1).t;	1995	text_t *tp = ROW(r1).t;
1971	int len = ROW(r1).l;	1996	int len = ROW(r1).l;
1972		1997
1973	for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN	1998	for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
…		…
2002	* screen.text/screen.rend contain what the screen will change to.	2027	* screen.text/screen.rend contain what the screen will change to.
2003	*/	2028	*/
2004	void	2029	void
2005	rxvt_term::scr_refresh () NOTHROW	2030	rxvt_term::scr_refresh () NOTHROW
2006	{	2031	{
2007	unsigned char have_bg,
2008	showcursor; /* show the cursor */
2009	int16_t col, row, /* column/row we're processing */	2032	int16_t col, row, /* column/row we're processing */
2010	ocrow; /* old cursor row */	2033	ocrow; /* old cursor row */
2011	int i; /* tmp */	2034	int i; /* tmp */
2012	#ifndef NO_CURSORCOLOR	2035	#ifndef NO_CURSORCOLOR
2013	rend_t cc1; /* store colours at cursor position (s) */	2036	rend_t cc1; /* store colours at cursor position (s) */
…		…
2024	/*	2047	/*
2025	* A: set up vars	2048	* A: set up vars
2026	*/	2049	*/
2027	refresh_count = 0;	2050	refresh_count = 0;
2028		2051
		2052	unsigned int old_screen_flags = screen.flags;
2029	have_bg = 0;	2053	bool have_bg = 0;
2030	#ifdef HAVE_BG_PIXMAP	2054	#ifdef HAVE_BG_PIXMAP
2031	have_bg = bgPixmap.pixmap != None;	2055	have_bg = bg_pixmap != None;
2032	#endif	2056	#endif
2033	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */	2057	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2034		2058
2035	/*	2059	/*
2036	* B: reverse any characters which are selected	2060	* B: reverse any characters which are selected
2037	*/	2061	*/
2038	scr_reverse_selection ();	2062	scr_reverse_selection ();
2039		2063
		2064	HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
		2065	#if ENABLE_OVERLAY
		2066	scr_swap_overlay ();
		2067	#endif
		2068
		2069	bool showcursor = screen.flags & Screen_VisibleCursor;
		2070
2040	/*	2071	/*
2041	* C: set the cursor character (s)	2072	* C: set the cursor character (s)
2042	*/	2073	*/
2043	{	2074	{
2044	unsigned char setoldcursor;	2075	bool setoldcursor;
2045		2076
2046	showcursor = (screen.flags & Screen_VisibleCursor);
2047	#ifdef CURSOR_BLINK	2077	#ifdef CURSOR_BLINK
2048	if (hidden_cursor)	2078	if (hidden_cursor)
2049	showcursor = 0;	2079	showcursor = 0;
2050	#endif	2080	#endif
2051		2081
…		…
2079	ccol2 = bgcolor_of (rstyle);	2109	ccol2 = bgcolor_of (rstyle);
2080	#else	2110	#else
2081	ccol2 = Color_bg;	2111	ccol2 = Color_bg;
2082	#endif	2112	#endif
2083		2113
2084	if (showcursor && focus)	2114	if (focus)
2085	{	2115	{
2086	if (option (Opt_cursorUnderline))	2116	if (option (Opt_cursorUnderline))
2087	*crp ^= RS_Uline;	2117	*crp ^= RS_Uline;
2088	else	2118	else
2089	{	2119	{
…		…
2124	oldcursor.col = screen.cur.col;	2154	oldcursor.col = screen.cur.col;
2125	}	2155	}
2126	}	2156	}
2127	}	2157	}
2128		2158
2129	HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2130	#if ENABLE_OVERLAY
2131	scr_swap_overlay ();
2132	#endif
2133
2134	#ifndef NO_SLOW_LINK_SUPPORT	2159	#ifndef NO_SLOW_LINK_SUPPORT
2135	/*	2160	/*
2136	* D: CopyArea pass - very useful for slower links	2161	* D: CopyArea pass - very useful for slower links
2137	* This has been deliberately kept simple.	2162	* This has been deliberately kept simple.
2138	*/	2163	*/
…		…
2227	continue;	2252	continue;
2228		2253
2229	// redraw one or more characters	2254	// redraw one or more characters
2230		2255
2231	// seek to the beginning of wide characters	2256	// seek to the beginning of wide characters
2232	while (expect_false (stp[col] == NOCHAR && col > 0))	2257	while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2233	--col;	2258	--col;
2234		2259
2235	rend_t rend = srp[col]; /* screen rendition (target rendtion) */	2260	rend_t rend = srp[col]; /* screen rendition (target rendition) */
2236	text_t *text = stp + col;	2261	text_t *text = stp + col;
2237	int count = 1;	2262	int count = 1;
2238		2263
2239	dtp[col] = stp[col];	2264	dtp[col] = stp[col];
2240	drp[col] = rend;	2265	drp[col] = rend;
…		…
2244	for (i = 0; ++col < ncol; )	2269	for (i = 0; ++col < ncol; )
2245	{	2270	{
2246	if (stp[col] == NOCHAR)	2271	if (stp[col] == NOCHAR)
2247	{	2272	{
2248	dtp[col] = stp[col];	2273	dtp[col] = stp[col];
2249	drp[col] = rend;	2274	drp[col] = srp[col];
		2275
2250	count++;	2276	count++;
2251	i++;	2277	i++;
2252		2278
2253	continue;	2279	continue;
2254	}	2280	}
…		…
2274		2300
2275	col--; /* went one too far. move back */	2301	col--; /* went one too far. move back */
2276	count -= i; /* dump any matching trailing chars */	2302	count -= i; /* dump any matching trailing chars */
2277		2303
2278	// sometimes we optimize away the trailing NOCHAR's, add them back	2304	// sometimes we optimize away the trailing NOCHAR's, add them back
2279	while (expect_false (i && text[count] == NOCHAR))	2305	while (ecb_unlikely (i && text[count] == NOCHAR))
2280	count++, i--;	2306	count++, i--;
2281		2307
2282	/*	2308	/*
2283	* Determine the attributes for the string	2309	* Determine the attributes for the string
2284	*/	2310	*/
2285	int fore = fgcolor_of (rend); // desired foreground	2311	int fore = fgcolor_of (rend); // desired foreground
2286	int back = bgcolor_of (rend); // desired background	2312	int back = bgcolor_of (rend); // desired background
2287		2313
2288	// only do special processing if any attributes are set, which is unlikely	2314	// only do special processing if any attributes are set, which is unlikely
2289	if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)))	2315	if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2290	{	2316	{
2291	bool invert = rend & RS_RVid;	2317	bool invert = rend & RS_RVid;
2292		2318
2293	#ifndef NO_BOLD_UNDERLINE_REVERSE	2319	#ifndef NO_BOLD_UNDERLINE_REVERSE
2294	if (rend & RS_Bold && fore == Color_fg)	2320	if (rend & RS_Bold && fore == Color_fg)
…		…
2313		2339
2314	if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))	2340	if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2315	fore = Color_UL;	2341	fore = Color_UL;
2316	#endif	2342	#endif
2317		2343
		2344	#ifdef OPTION_HC
		2345	if (rend & RS_Sel)
		2346	{
		2347	/* invert the column if no highlightColor is set or it is the
		2348	* current cursor column */
		2349	if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
		2350	&& ISSET_PIXCOLOR (Color_HC))
		2351	{
		2352	if (ISSET_PIXCOLOR (Color_HTC))
		2353	fore = Color_HTC;
		2354	// if invert is 0 reverse video is set so we use bg color as fg color
		2355	else if (!invert)
		2356	fore = back;
		2357
		2358	back = Color_HC;
		2359	invert = 0;
		2360	}
		2361	}
		2362	#endif
		2363
2318	if (invert)	2364	if (invert)
2319	{	2365	{
2320	#ifdef OPTION_HC
2321	if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2322	|| !ISSET_PIXCOLOR (Color_HC))
2323	#endif
2324	/* invert the column if no highlightColor is set or it is the
2325	* current cursor column */
2326	::swap (fore, back);	2366	::swap (fore, back);
2327	#ifdef OPTION_HC
2328	else if (ISSET_PIXCOLOR (Color_HC))
2329	back = Color_HC;
2330	#endif
2331		2367
2332	#ifndef NO_BOLD_UNDERLINE_REVERSE	2368	#ifndef NO_BOLD_UNDERLINE_REVERSE
2333	# ifndef OPTION_HC
2334	if (ISSET_PIXCOLOR (Color_RV))
2335	back = Color_RV;
2336	# endif
2337	if (fore == back)	2369	if (fore == back)
2338	{	2370	{
2339	fore = Color_bg;	2371	fore = Color_bg;
2340	back = Color_fg;	2372	back = Color_fg;
2341	}	2373	}
…		…
2377	/*	2409	/*
2378	* Actually do the drawing of the string here	2410	* Actually do the drawing of the string here
2379	*/	2411	*/
2380	rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];	2412	rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2381		2413
2382	if (expect_true (have_bg && back == Color_bg))	2414	if (ecb_likely (have_bg && back == Color_bg))
2383	{	2415	{
2384	// this is very ugly, maybe push it into ->draw?	2416	// this is very ugly, maybe push it into ->draw?
2385		2417
2386	for (i = 0; i < count; i++) /* don't draw empty strings */	2418	for (i = 0; i < count; i++) /* don't draw empty strings */
2387	if (text[i] != ' ')	2419	if (text[i] != ' ')
…		…
2394	did_clear: ;	2426	did_clear: ;
2395	}	2427	}
2396	else	2428	else
2397	font->draw (*drawable, xpixel, ypixel, text, count, fore, back);	2429	font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2398		2430
2399	if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))	2431	if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2400	{	2432	{
2401	#if ENABLE_FRILLS	2433	#if ENABLE_FRILLS
2402	if (ISSET_PIXCOLOR (Color_underline))	2434	if (ISSET_PIXCOLOR (Color_underline))
2403	XSetForeground (dpy, gc, pix_colors[Color_underline]);	2435	XSetForeground (dpy, gc, pix_colors[Color_underline]);
2404	else	2436	else
…		…
2409	xpixel, ypixel + font->ascent + 1,	2441	xpixel, ypixel + font->ascent + 1,
2410	xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);	2442	xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2411	}	2443	}
2412	} /* for (col....) */	2444	} /* for (col....) */
2413	} /* for (row....) */	2445	} /* for (row....) */
2414
2415	#if ENABLE_OVERLAY
2416	scr_swap_overlay ();
2417	#endif
2418	HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2419		2446
2420	/*	2447	/*
2421	* G: cleanup cursor and display outline cursor if necessary	2448	* G: cleanup cursor and display outline cursor if necessary
2422	*/	2449	*/
2423	if (showcursor)	2450	if (showcursor)
…		…
2462	}	2489	}
2463		2490
2464	/*	2491	/*
2465	* H: cleanup selection	2492	* H: cleanup selection
2466	*/	2493	*/
		2494	#if ENABLE_OVERLAY
		2495	scr_swap_overlay ();
		2496	#endif
		2497	HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
		2498
2467	scr_reverse_selection ();	2499	scr_reverse_selection ();
2468		2500
		2501	screen.flags = old_screen_flags;
2469	num_scr = 0;	2502	num_scr = 0;
2470	num_scr_allow = 1;	2503	num_scr_allow = 1;
2471	}	2504	}
2472		2505
2473	void	2506	void
…		…
2494	scr_remap_chars (swap_buf [i]);	2527	scr_remap_chars (swap_buf [i]);
2495	}	2528	}
2496	}	2529	}
2497		2530
2498	void	2531	void
2499	rxvt_term::scr_recolour () NOTHROW	2532	rxvt_term::scr_recolour (bool refresh) NOTHROW
2500	{	2533	{
		2534	bool transparent = false;
		2535
2501	#ifdef HAVE_BG_PIXMAP	2536	#ifdef HAVE_BG_PIXMAP
2502	bgPixmap.apply ();	2537	if (bg_pixmap != None)
2503	#else	2538	{
		2539	# ifdef ENABLE_TRANSPARENCY
		2540	if (bg_flags & BG_IS_TRANSPARENT)
		2541	{
		2542	XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap);
		2543	XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2504		2544
		2545	transparent = true;
		2546	}
		2547	else
		2548	# endif
		2549	{
		2550	XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
		2551	XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
		2552	}
		2553	}
		2554	else
		2555	#endif
		2556	{
2505	XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);	2557	XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2506	XClearWindow (dpy, parent[0]);
2507	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);	2558	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
		2559	}
		2560
		2561	XClearWindow (dpy, parent);
2508		2562
2509	if (scrollBar.win)	2563	if (scrollBar.win)
2510	{	2564	{
		2565	if (transparent)
		2566	XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
		2567	else
2511	XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);	2568	XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2512	scrollBar.state = STATE_IDLE;	2569	scrollBar.state = SB_STATE_IDLE;
2513	scrollBar.show (0);	2570	scrollBar.show (0);
2514	}	2571	}
2515		2572
2516	#endif	2573	if (refresh)
2517		2574	{
2518	/* bgPixmap.apply () does not do the following : */
2519	scr_clear ();	2575	scr_clear ();
2520	scr_touch (true);	2576	scr_touch (true);
		2577	}
2521	want_refresh = 1;	2578	want_refresh = 1;
2522	}	2579	}
2523		2580
2524	/* ------------------------------------------------------------------------- */	2581	/* ------------------------------------------------------------------------- */
2525	void	2582	void
…		…
2593	{	2650	{
2594	#if !ENABLE_MINIMAL	2651	#if !ENABLE_MINIMAL
2595	if (selection.rect)	2652	if (selection.rect)
2596	scr_xor_rect (selection.beg.row, selection.beg.col,	2653	scr_xor_rect (selection.beg.row, selection.beg.col,
2597	selection.end.row, selection.end.col,	2654	selection.end.row, selection.end.col,
2598	RS_RVid, RS_RVid | RS_Uline);	2655	RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2599	else	2656	else
2600	#endif	2657	#endif
2601	scr_xor_span (selection.beg.row, selection.beg.col,	2658	scr_xor_span (selection.beg.row, selection.beg.col,
2602	selection.end.row, selection.end.col,	2659	selection.end.row, selection.end.col,
2603	RS_RVid);	2660	RS_Sel | RS_RVid);
2604	}	2661	}
2605	}	2662	}
2606		2663
2607	/* ------------------------------------------------------------------------- */	2664	/* ------------------------------------------------------------------------- */
2608	/*	2665	/*
…		…
2613	void	2670	void
2614	rxvt_term::scr_dump (int fd) NOTHROW	2671	rxvt_term::scr_dump (int fd) NOTHROW
2615	{	2672	{
2616	int row, wrote;	2673	int row, wrote;
2617	unsigned int width, towrite;	2674	unsigned int width, towrite;
2618	char r1[] = "\n";	2675	const char r1[] = "\n";
2619		2676
2620	for (row = saveLines + top_row;	2677	for (row = saveLines + top_row;
2621	row < saveLines + nrow - 1; row++)	2678	row < saveLines + nrow - 1; row++)
2622	{	2679	{
2623	width = row_buf[row].l >= 0 ? row_buf[row].l	2680	width = row_buf[row].l >= 0 ? row_buf[row].l
…		…
2640	* CHARACTER SELECTION *	2697	* CHARACTER SELECTION *
2641	* ------------------------------------------------------------------------- */	2698	* ------------------------------------------------------------------------- */
2642	void	2699	void
2643	rxvt_term::selection_check (int check_more) NOTHROW	2700	rxvt_term::selection_check (int check_more) NOTHROW
2644	{	2701	{
2645	row_col_t pos;
2646
2647	if (!selection.op)	2702	if (!selection.op)
2648	return;	2703	return;
2649		2704
2650	pos.row = pos.col = 0;
2651	if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)	2705	if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2652	|| !IN_RANGE_EXC (selection.mark.row, top_row, nrow)	2706	|| !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2653	|| !IN_RANGE_EXC (selection.end.row, top_row, nrow)	2707	|| !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2654	|| (check_more == 1	2708	|| (check_more == 1
2655	&& current_screen == selection.screen	2709	&& current_screen == selection.screen
2656	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)	2710	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2657	&& ROWCOL_IS_BEFORE (screen.cur, selection.end))	2711	&& ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2658	|| (check_more == 2
2659	&& ROWCOL_IS_BEFORE (selection.beg, pos)
2660	&& ROWCOL_IS_AFTER (selection.end, pos))
2661	|| (check_more == 3
2662	&& ROWCOL_IS_AFTER (selection.end, pos))
2663	|| (check_more == 4 /* screen width change */
2664	&& (selection.beg.row != selection.end.row
2665	|| selection.end.col > ncol)))
2666	CLEAR_SELECTION ();	2712	CLEAR_ALL_SELECTION ();
2667	}	2713	}
2668		2714
2669	/* ------------------------------------------------------------------------- */	2715	/* ------------------------------------------------------------------------- */
2670	/*	2716	/*
2671	* Paste a selection direct to the command fd	2717	* Paste a selection direct to the command fd
2672	*/	2718	*/
2673	void	2719	void
2674	rxvt_term::paste (char *data, unsigned int len) NOTHROW	2720	rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2675	{	2721	{
2676	/* convert normal newline chars into common keyboard Return key sequence */	2722	/* convert normal newline chars into common keyboard Return key sequence */
2677	for (unsigned int i = 0; i < len; i++)	2723	for (unsigned int i = 0; i < len; i++)
2678	if (data[i] == C0_LF)	2724	if (data[i] == C0_LF)
2679	data[i] = C0_CR;	2725	data[i] = C0_CR;
…		…
2685		2731
2686	if (priv_modes & PrivMode_BracketPaste)	2732	if (priv_modes & PrivMode_BracketPaste)
2687	tt_printf ("\e[201~");	2733	tt_printf ("\e[201~");
2688	}	2734	}
2689		2735
2690	/* ------------------------------------------------------------------------- */
2691	/*
2692	* Respond to a notification that a primary selection has been sent
2693	* EXT: SelectionNotify
2694	*/
2695	void	2736	void
2696	rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW	2737	rxvt_term::paste (char *data, unsigned int len) NOTHROW
2697	{	2738	{
2698	if (prop == None) /* check for failed XConvertSelection */	2739	if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2699	{
2700	if ((selection_type & Sel_CompoundText))
2701	{
2702	int selnum = selection_type & Sel_whereMask;
2703
2704	selection_type = 0;
2705	if (selnum != Sel_direct)
2706	selection_request_other (XA_STRING, selnum);
2707	}
2708
2709	if ((selection_type & Sel_UTF8String))
2710	{
2711	int selnum = selection_type & Sel_whereMask;
2712
2713	selection_type = Sel_CompoundText;
2714	if (selnum != Sel_direct)
2715	selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2716	else
2717	selection_type = 0;
2718	}
2719
2720	return;
2721	}
2722
2723	unsigned long bytes_after;
2724	XTextProperty ct;
2725
2726	if (XGetWindowProperty (dpy, win, prop,
2727	0, PROP_SIZE / 4,
2728	delete_prop, AnyPropertyType,
2729	&ct.encoding, &ct.format,
2730	&ct.nitems, &bytes_after,
2731	&ct.value) != Success)
2732	{
2733	ct.value = 0;
2734	goto bailout;
2735	}
2736
2737	if (ct.encoding == None)
2738	goto bailout;
2739
2740	if (bytes_after)
2741	{
2742	// fetch and append remaining data
2743	XTextProperty ct2;
2744
2745	if (XGetWindowProperty (dpy, win, prop,
2746	ct.nitems / 4, (bytes_after + 3) / 4,
2747	delete_prop, AnyPropertyType,
2748	&ct2.encoding, &ct2.format,
2749	&ct2.nitems, &bytes_after,
2750	&ct2.value) != Success)
2751	goto bailout;
2752
2753	// realloc should be compatible to XFree, here, and elsewhere, too
2754	ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2755	memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2756	ct.nitems += ct2.nitems;
2757
2758	XFree (ct2.value);
2759	}
2760
2761	if (ct.value == 0)
2762	goto bailout;
2763
2764	if (ct.encoding == xa[XA_INCR])
2765	{
2766	// INCR selection, start handshake
2767	if (!delete_prop)
2768	XDeleteProperty (dpy, win, prop);
2769
2770	selection_wait = Sel_incr;
2771	incr_buf_fill = 0;
2772	incr_ev.start (10);
2773
2774	goto bailout;
2775	}
2776
2777	if (ct.nitems == 0)
2778	{
2779	if (selection_wait == Sel_incr)
2780	{
2781	XFree (ct.value);
2782
2783	// finally complete, now paste the whole thing
2784	selection_wait = Sel_normal;
2785	ct.value = (unsigned char *)incr_buf;
2786	ct.nitems = incr_buf_fill;
2787	incr_buf = 0;
2788	incr_buf_size = 0;
2789	incr_ev.stop ();
2790	}
2791	else
2792	{
2793	if (selection_wait == Sel_normal
2794	&& (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2795	{
2796	/*
2797	* pass through again trying CUT_BUFFER0 if we've come from
2798	* XConvertSelection () but nothing was presented
2799	*/
2800	selection_paste (display->root, XA_CUT_BUFFER0, False);
2801	}
2802
2803	goto bailout;
2804	}
2805	}
2806	else if (selection_wait == Sel_incr)
2807	{
2808	incr_ev.start (10);
2809
2810	while (incr_buf_fill + ct.nitems > incr_buf_size)
2811	{
2812	incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2813	incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2814	}
2815
2816	memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2817	incr_buf_fill += ct.nitems;
2818
2819	goto bailout;
2820	}
2821
2822	char **cl;
2823	int cr;
2824
2825	#if !ENABLE_MINIMAL
2826	// xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2827	// so recode it manually
2828	if (ct.encoding == xa[XA_UTF8_STRING])
2829	{
2830	wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2831	char *s = rxvt_wcstombs (w);
2832	free (w);
2833	// TODO: strlen == only the first element will be converted. well...
2834	paste (s, strlen (s));
2835	free (s);
2836	}
2837	else
2838	#endif
2839	if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2840	&& cl)
2841	{
2842	for (int i = 0; i < cr; i++)
2843	paste (cl[i], strlen (cl[i]));
2844
2845	XFreeStringList (cl);
2846	}
2847	else
2848	paste ((char *)ct.value, ct.nitems); // paste raw
2849
2850	bailout:
2851	XFree (ct.value);
2852
2853	if (selection_wait == Sel_normal)
2854	selection_wait = Sel_none;
2855	}
2856
2857	void
2858	rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2859	{
2860	selection_wait = Sel_none;
2861
2862	incr_buf_size = 0;
2863	free (incr_buf);
2864
2865	rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2866	}
2867
2868	void
2869	rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2870	{
2871	if (prop == None || selection_wait != Sel_incr)
2872	return;	2740	return;
2873		2741
2874	selection_paste (win, prop, true);	2742	tt_paste (data, len);
2875	}	2743	}
2876		2744
2877	/* ------------------------------------------------------------------------- */	2745	/* ------------------------------------------------------------------------- */
2878	/*	2746	/*
2879	* Request the current selection:	2747	* Request PRIMARY, SECONDARY or CLIPBOARD selection.
2880	* Order: > internal selection if available	2748	* if the requested selection has no owner or is empty CUT_BUFFER0 is used
2881	* > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)	2749	* as fallback
2882	* > CUT_BUFFER0
2883	* (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2884	* will auto fallback to CUT_BUFFER0
2885	* EXT: button 2 release	2750	* EXT: button 2 release
2886	*/	2751	*/
2887	void	2752	void
2888	rxvt_term::selection_request (Time tm, int selnum) NOTHROW	2753	rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2889	{	2754	{
2890	if (selection.text && selnum == Sel_Primary)	2755	if (!selection_req)
2891	{
2892	/* internal selection */
2893	char *str = rxvt_wcstombs (selection.text, selection.len);
2894	paste (str, strlen (str));
2895	free (str);
2896	return;
2897	}	2756	{
2898	else	2757	selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
		2758	selection_req->run ();
2899	{	2759	}
2900	selection_request_time = tm;
2901	selection_wait = Sel_normal;
2902
2903	#if X_HAVE_UTF8_STRING
2904	selection_type = Sel_UTF8String;
2905	if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2906	return;
2907	#else
2908	selection_type = Sel_CompoundText;
2909	if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2910	return;
2911	#endif
2912	}
2913
2914	selection_wait = Sel_none; /* don't loop in selection_paste () */
2915	selection_paste (display->root, XA_CUT_BUFFER0, false);
2916	}
2917
2918	int
2919	rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2920	{
2921	Atom sel;
2922
2923	selection_type |= selnum;
2924
2925	if (selnum == Sel_Primary)
2926	sel = XA_PRIMARY;
2927	else if (selnum == Sel_Secondary)
2928	sel = XA_SECONDARY;
2929	else
2930	sel = xa[XA_CLIPBOARD];
2931
2932	if (XGetSelectionOwner (dpy, sel) != None)
2933	{
2934	XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2935	vt, selection_request_time);
2936	return 1;
2937	}
2938
2939	return 0;
2940	}	2760	}
2941		2761
2942	/* ------------------------------------------------------------------------- */	2762	/* ------------------------------------------------------------------------- */
2943	/*	2763	/*
2944	* Clear all selected text	2764	* Clear all selected text
2945	* EXT: SelectionClear	2765	* EXT: SelectionClear
2946	*/	2766	*/
2947	void	2767	void
2948	rxvt_term::selection_clear () NOTHROW	2768	rxvt_term::selection_clear (bool clipboard) NOTHROW
2949	{	2769	{
		2770	if (!clipboard)
		2771	{
2950	want_refresh = 1;	2772	want_refresh = 1;
2951	free (selection.text);	2773	free (selection.text);
2952	selection.text = NULL;	2774	selection.text = NULL;
2953	selection.len = 0;	2775	selection.len = 0;
2954	CLEAR_SELECTION ();	2776	CLEAR_SELECTION ();
2955		2777
2956	if (display->selection_owner == this)	2778	if (display->selection_owner == this)
2957	display->selection_owner = 0;	2779	display->selection_owner = 0;
		2780	}
		2781	else
		2782	{
		2783	free (selection.clip_text);
		2784	selection.clip_text = NULL;
		2785	selection.clip_len = 0;
		2786
		2787	if (display->clipboard_owner == this)
		2788	display->clipboard_owner = 0;
		2789	}
2958	}	2790	}
2959		2791
2960	/* ------------------------------------------------------------------------- */	2792	/* ------------------------------------------------------------------------- */
2961	/*	2793	/*
2962	* Copy a selection into the cut buffer	2794	* Copy a selection into the cut buffer
2963	* EXT: button 1 or 3 release	2795	* EXT: button 1 or 3 release
2964	*/	2796	*/
2965	void	2797	void
2966	rxvt_term::selection_make (Time tm)	2798	rxvt_term::selection_make (Time tm)
2967	{	2799	{
2968	int i;	2800	int size;
2969	wchar_t *new_selection_text;	2801	wchar_t *new_selection_text;
2970	text_t *t;	2802	text_t *t;
2971		2803
2972	switch (selection.op)	2804	switch (selection.op)
2973	{	2805	{
…		…
2989	return; /* nothing selected, go away */	2821	return; /* nothing selected, go away */
2990		2822
2991	if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))	2823	if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2992	return;	2824	return;
2993		2825
2994	i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);	2826	size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2995	new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));	2827	new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
2996		2828
2997	int ofs = 0;	2829	int ofs = 0;
2998	int extra = 0;	2830	int extra = 0;
2999		2831
3000	int col = selection.beg.col;	2832	int col = selection.beg.col;
…		…
3006	{	2838	{
3007	#if !ENABLE_MINIMAL	2839	#if !ENABLE_MINIMAL
3008	if (selection.rect)	2840	if (selection.rect)
3009	{	2841	{
3010	col = selection.beg.col;	2842	col = selection.beg.col;
3011	end_col = ncol + 1;	2843	end_col = selection.end.col;
3012	}	2844	}
3013	else	2845	else
3014	#endif	2846	#endif
3015	end_col = ROW(row).l;	2847	end_col = ROW(row).l;
3016		2848
3017	col = max (col, 0);	2849	col = max (col, 0);
3018		2850
3019	if (row == selection.end.row	2851	if (row == selection.end.row)
3020	#if !ENABLE_MINIMAL
3021	|| selection.rect
3022	#endif
3023	)
3024	min_it (end_col, selection.end.col);	2852	min_it (end_col, selection.end.col);
3025		2853
3026	t = ROW(row).t + col;	2854	t = ROW(row).t + col;
3027		2855
3028	for (; col < end_col; col++)	2856	for (; col < end_col; col++)
…		…
3036		2864
3037	extra -= (len - 1);	2865	extra -= (len - 1);
3038		2866
3039	if (extra < 0)	2867	if (extra < 0)
3040	{	2868	{
3041	extra += i;	2869	extra += size;
3042	i += i;	2870	size += size;
3043	new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t));	2871	new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3044	}	2872	}
3045		2873
3046	ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);	2874	ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3047	}	2875	}
3048	#endif	2876	#endif
…		…
3060		2888
3061	new_selection_text[ofs++] = C0_LF;	2889	new_selection_text[ofs++] = C0_LF;
3062	}	2890	}
3063	else	2891	else
3064	#endif	2892	#endif
3065	if (!ROW(row).is_longer () && row != selection.end.row)	2893	if (!ROW(row).is_longer ()
		2894	&& (row != selection.end.row || end_col != selection.end.col)
		2895	&& (row != selection.beg.row || selection.beg.col < ncol))
3066	new_selection_text[ofs++] = C0_LF;	2896	new_selection_text[ofs++] = C0_LF;
3067	}	2897	}
3068
3069	if (end_col != selection.end.col)
3070	new_selection_text[ofs++] = C0_LF;
3071		2898
3072	new_selection_text[ofs] = 0;	2899	new_selection_text[ofs] = 0;
3073		2900
3074	if (ofs == 0)	2901	if (ofs == 0)
3075	{	2902	{
…		…
3088		2915
3089	selection_grab (tm);	2916	selection_grab (tm);
3090	}	2917	}
3091		2918
3092	bool	2919	bool
3093	rxvt_term::selection_grab (Time tm) NOTHROW	2920	rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3094	{	2921	{
		2922	Atom sel;
		2923
		2924	if (!clipboard)
		2925	{
3095	selection_time = tm;	2926	selection_time = tm;
		2927	sel = XA_PRIMARY;
		2928	}
		2929	else
		2930	{
		2931	clipboard_time = tm;
		2932	sel = xa[XA_CLIPBOARD];
		2933	}
3096		2934
3097	XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm);	2935	XSetSelectionOwner (dpy, sel, vt, tm);
3098	if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt)	2936	if (XGetSelectionOwner (dpy, sel) == vt)
3099	{	2937	{
3100	display->set_selection_owner (this);	2938	display->set_selection_owner (this, clipboard);
3101	return true;	2939	return true;
3102	}	2940	}
3103	else	2941	else
3104	{	2942	{
3105	selection_clear ();	2943	selection_clear (clipboard);
3106	return false;	2944	return false;
3107	}	2945	}
3108		2946
3109	#if 0	2947	#if 0
3110	XTextProperty ct;	2948	XTextProperty ct;
…		…
3570	* EXT: SelectionRequest	3408	* EXT: SelectionRequest
3571	*/	3409	*/
3572	void	3410	void
3573	rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW	3411	rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3574	{	3412	{
		3413	Atom property = rq.property == None ? rq.target : rq.property;
3575	XSelectionEvent ev;	3414	XSelectionEvent ev;
3576		3415
3577	ev.type = SelectionNotify;	3416	ev.type = SelectionNotify;
3578	ev.property = None;	3417	ev.property = None;
3579	ev.display = rq.display;	3418	ev.display = rq.display;
…		…
3594	*target++ = xa[XA_COMPOUND_TEXT];	3433	*target++ = xa[XA_COMPOUND_TEXT];
3595	#if X_HAVE_UTF8_STRING	3434	#if X_HAVE_UTF8_STRING
3596	*target++ = xa[XA_UTF8_STRING];	3435	*target++ = xa[XA_UTF8_STRING];
3597	#endif	3436	#endif
3598		3437
3599	XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,	3438	XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3600	32, PropModeReplace,	3439	32, PropModeReplace,
3601	(unsigned char *)target_list, target - target_list);	3440	(unsigned char *)target_list, target - target_list);
3602	ev.property = rq.property;	3441	ev.property = property;
3603	}	3442	}
3604	#if TODO // TODO	3443	#if TODO // TODO
3605	else if (rq.target == xa[XA_MULTIPLE])	3444	else if (rq.target == xa[XA_MULTIPLE])
3606	{	3445	{
3607	/* TODO: Handle MULTIPLE */	3446	/* TODO: Handle MULTIPLE */
3608	}	3447	}
3609	#endif	3448	#endif
3610	else if (rq.target == xa[XA_TIMESTAMP] && selection.text)	3449	else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3611	{	3450	{
3612	XChangeProperty (dpy, rq.requestor, rq.property, rq.target,	3451	XChangeProperty (dpy, rq.requestor, property, rq.target,
3613	32, PropModeReplace, (unsigned char *)&selection_time, 1);	3452	32, PropModeReplace, (unsigned char *)&selection_time, 1);
3614	ev.property = rq.property;	3453	ev.property = property;
		3454	}
		3455	else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
		3456	{
		3457	XChangeProperty (dpy, rq.requestor, property, rq.target,
		3458	32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
		3459	ev.property = property;
3615	}	3460	}
3616	else if (rq.target == XA_STRING	3461	else if (rq.target == XA_STRING
3617	|| rq.target == xa[XA_TEXT]	3462	|| rq.target == xa[XA_TEXT]
3618	|| rq.target == xa[XA_COMPOUND_TEXT]	3463	|| rq.target == xa[XA_COMPOUND_TEXT]
3619	|| rq.target == xa[XA_UTF8_STRING]	3464	|| rq.target == xa[XA_UTF8_STRING]
…		…
3651	{	3496	{
3652	target = xa[XA_COMPOUND_TEXT];	3497	target = xa[XA_COMPOUND_TEXT];
3653	style = enc_compound_text;	3498	style = enc_compound_text;
3654	}	3499	}
3655		3500
3656	if (selection.text)	3501	if (rq.selection == XA_PRIMARY && selection.text)
3657	{	3502	{
3658	cl = selection.text;	3503	cl = selection.text;
3659	selectlen = selection.len;	3504	selectlen = selection.len;
		3505	}
		3506	else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
		3507	{
		3508	cl = selection.clip_text;
		3509	selectlen = selection.clip_len;
3660	}	3510	}
3661	else	3511	else
3662	{	3512	{
3663	cl = L"";	3513	cl = L"";
3664	selectlen = 0;	3514	selectlen = 0;
…		…
3685	ct.value = (unsigned char *)cl;	3535	ct.value = (unsigned char *)cl;
3686	ct.nitems = selectlen;	3536	ct.nitems = selectlen;
3687	ct.encoding = target;	3537	ct.encoding = target;
3688	}	3538	}
3689		3539
3690	XChangeProperty (dpy, rq.requestor, rq.property,	3540	XChangeProperty (dpy, rq.requestor, property,
3691	ct.encoding, 8, PropModeReplace,	3541	ct.encoding, 8, PropModeReplace,
3692	ct.value, (int)ct.nitems);	3542	ct.value, (int)ct.nitems);
3693	ev.property = rq.property;	3543	ev.property = property;
3694		3544
3695	if (freect)	3545	if (freect)
3696	XFree (ct.value);	3546	XFree (ct.value);
3697	}	3547	}
3698		3548
…		…
3732	h += 2; min_it (h, nrow);	3582	h += 2; min_it (h, nrow);
3733		3583
3734	x -= 1; clamp_it (x, 0, ncol - w);	3584	x -= 1; clamp_it (x, 0, ncol - w);
3735	y -= 1; clamp_it (y, 0, nrow - h);	3585	y -= 1; clamp_it (y, 0, nrow - h);
3736		3586
3737	ov_x = x; ov_y = y;	3587	ov.x = x; ov.y = y;
3738	ov_w = w; ov_h = h;	3588	ov.w = w; ov.h = h;
3739		3589
3740	ov_text = new text_t *[h];	3590	ov.text = new text_t *[h];
3741	ov_rend = new rend_t *[h];	3591	ov.rend = new rend_t *[h];
3742		3592
3743	for (y = 0; y < h; y++)	3593	for (y = 0; y < h; y++)
3744	{	3594	{
3745	text_t *tp = ov_text[y] = new text_t[w];	3595	text_t *tp = ov.text[y] = new text_t[w];
3746	rend_t *rp = ov_rend[y] = new rend_t[w];	3596	rend_t *rp = ov.rend[y] = new rend_t[w];
3747		3597
3748	text_t t0, t1, t2;	3598	text_t t0, t1, t2;
3749	rend_t r = OVERLAY_RSTYLE;	3599	rend_t r = OVERLAY_RSTYLE;
3750		3600
3751	if (y == 0)	3601	if (y == 0)
…		…
3770	}	3620	}
3771		3621
3772	void	3622	void
3773	rxvt_term::scr_overlay_off () NOTHROW	3623	rxvt_term::scr_overlay_off () NOTHROW
3774	{	3624	{
3775	if (!ov_text)	3625	if (!ov.text)
3776	return;	3626	return;
3777		3627
3778	want_refresh = 1;	3628	want_refresh = 1;
3779		3629
3780	for (int y = 0; y < ov_h; y++)	3630	for (int y = 0; y < ov.h; y++)
3781	{	3631	{
3782	delete [] ov_text[y];	3632	delete [] ov.text[y];
3783	delete [] ov_rend[y];	3633	delete [] ov.rend[y];
3784	}	3634	}
3785		3635
3786	delete [] ov_text; ov_text = 0;	3636	delete [] ov.text; ov.text = 0;
3787	delete [] ov_rend; ov_rend = 0;	3637	delete [] ov.rend; ov.rend = 0;
3788	}	3638	}
3789		3639
3790	void	3640	void
3791	rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW	3641	rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3792	{	3642	{
3793	if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)	3643	if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3794	return;	3644	return;
3795		3645
3796	x++, y++;	3646	x++, y++;
3797		3647
3798	ov_text[y][x] = text;	3648	ov.text[y][x] = text;
3799	ov_rend[y][x] = rend;	3649	ov.rend[y][x] = rend;
3800	}	3650	}
3801		3651
3802	void	3652	void
3803	rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW	3653	rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3804	{	3654	{
…		…
3823	}	3673	}
3824		3674
3825	void	3675	void
3826	rxvt_term::scr_swap_overlay () NOTHROW	3676	rxvt_term::scr_swap_overlay () NOTHROW
3827	{	3677	{
3828	if (!ov_text)	3678	if (!ov.text)
3829	return;	3679	return;
3830		3680
		3681	// hide cursor if it is within the overlay area
		3682	if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
		3683	&& IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
		3684	screen.flags &= ~Screen_VisibleCursor;
		3685
3831	// swap screen mem with overlay	3686	// swap screen mem with overlay
3832	for (int y = ov_h; y--; )	3687	for (int y = ov.h; y--; )
3833	{	3688	{
3834	text_t *t1 = ov_text[y];	3689	text_t *t1 = ov.text[y];
3835	rend_t *r1 = ov_rend[y];	3690	rend_t *r1 = ov.rend[y];
3836		3691
3837	text_t *t2 = ROW(y + ov_y + view_start).t + ov_x;	3692	text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3838	rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x;	3693	rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3839		3694
3840	for (int x = ov_w; x--; )	3695	for (int x = ov.w; x--; )
3841	{	3696	{
3842	text_t t = *t1; *t1++ = *t2; *t2++ = t;	3697	text_t t = *t1; *t1++ = *t2; *t2++ = t;
3843	rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));	3698	rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3844	}	3699	}
3845	}	3700	}

Diff Legend

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