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.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	* ------------------------------------------------------------------------- */
…		…
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	{
…		…
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	selection_check (2); /* check for boundary cross */
552		555
553	int i = current_screen; current_screen = scrn; scrn = i;	556	current_screen = scrn;
554		557
555	#if NSCREENS	558	#if NSCREENS
556	if (option (Opt_secondaryScreen))	559	if (option (Opt_secondaryScreen))
557	{	560	{
558	num_scr = 0;	561	num_scr = 0;
…		…
635		638
636	if (count > 0	639	if (count > 0
637	&& row1 == 0	640	&& row1 == 0
638	&& (current_screen == PRIMARY || option (Opt_secondaryScroll)))	641	&& (current_screen == PRIMARY || option (Opt_secondaryScroll)))
639	{	642	{
		643	min_it (count, total_rows - (nrow - (row2 + 1)));
		644
640	top_row = max (top_row - count, -saveLines);	645	top_row = max (top_row - count, -saveLines);
641
642	// scroll everything up 'count' lines
643	term_start = (term_start + count) % total_rows;
644		646
645	// sever bottommost line	647	// sever bottommost line
646	{	648	{
647	line_t &l = ROW(row2 - count);	649	line_t &l = ROW(row2);
648	l.is_longer (0);	650	l.is_longer (0);
649	l.touch ();	651	l.touch ();
650	}	652	}
651		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
652	// erase newly scrolled-in lines	669	// erase newly scrolled-in lines
653	for (int i = count; i--; )	670	for (int i = count; i--; )
654	{	671	{
655	line_t &l = ROW(nrow - 1 - i);	672	line_t &l = ROW(row2 - i);
656		673
657	// optimize if already cleared, can be significant on slow machines	674	// optimise if already cleared, can be significant on slow machines
658	// could be rolled into scr_blank_screen_mem	675	// 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)))	676	if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
660	{	677	{
661	scr_blank_line (l, 0, l.l, rstyle);	678	scr_blank_line (l, 0, l.l, rstyle);
662	l.l = 0;	679	l.l = 0;
…		…
664	}	681	}
665	else	682	else
666	scr_blank_screen_mem (l, rstyle);	683	scr_blank_screen_mem (l, rstyle);
667	}	684	}
668		685
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
682	if (selection.op && current_screen == selection.screen)
683	{
684	selection.beg.row -= count;
685	selection.end.row -= count;
686	selection.mark.row -= count;
687
688	if (selection.beg.row < top_row
689	|| selection.end.row < top_row
690	|| selection.mark.row < top_row)
691	{
692	CLEAR_ALL_SELECTION ();
693	selection.op = SELECTION_CLEAR;
694	}
695	}
696
697	// finally move the view window, if desired	686	// finally move the view window, if desired
698	if (option (Opt_scrollWithBuffer)	687	if (option (Opt_scrollWithBuffer)
699	&& view_start != 0	688	&& view_start != 0
700	&& view_start != -saveLines)	689	&& view_start != -saveLines)
701	scr_page (UP, count);	690	scr_page (UP, count);
…		…
703	if (SHOULD_INVOKE (HOOK_SCROLL_BACK))	692	if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
704	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));
705	}	694	}
706	else	695	else
707	{	696	{
708	if (selection.op && current_screen == selection.screen)
709	{
710	if ((selection.beg.row < row1 && selection.end.row > row1)
711	|| (selection.beg.row < row2 && selection.end.row > row2)
712	|| (selection.beg.row - count < row1 && selection.beg.row >= row1)
713	|| (selection.beg.row - count > row2 && selection.beg.row <= row2)
714	|| (selection.end.row - count < row1 && selection.end.row >= row1)
715	|| (selection.end.row - count > row2 && selection.end.row <= row2))
716	{
717	CLEAR_ALL_SELECTION ();
718	selection.op = SELECTION_CLEAR;
719	}
720	else if (selection.end.row >= row1 && selection.end.row <= row2)
721	{
722	/* move selected region too */
723	selection.beg.row -= count;
724	selection.end.row -= count;
725	selection.mark.row -= count;
726
727	selection_check (0);
728	}
729	}
730
731	// use a simple and robust scrolling algorithm, this	697	// use a simple and robust scrolling algorithm, this
732	// part of scr_scroll_text is not time-critical.	698	// part of scr_scroll_text is not time-critical.
733		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
734	int rows = row2 - row1 + 1;	708	int rows = row2 - row1 + 1;
735		709
736	min_it (count, rows);	710	min_it (count, rows);
737		711
738	line_t *temp_buf = row_buf + total_rows;	712	line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
739		713
740	for (int row = 0; row < rows; row++)	714	for (int row = 0; row < rows; row++)
741	{	715	{
742	temp_buf [row] = ROW(row1 + (row + count + rows) % rows);	716	temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
743		717
…		…
745	scr_blank_screen_mem (temp_buf [row], rstyle);	719	scr_blank_screen_mem (temp_buf [row], rstyle);
746	}	720	}
747		721
748	for (int row = 0; row < rows; row++)	722	for (int row = 0; row < rows; row++)
749	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	}
750	}	752	}
751		753
752	return count;	754	return count;
753	}	755	}
754		756
…		…
783	scr_scroll_text (screen.tscroll, screen.bscroll, minlines);	785	scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
784	screen.cur.row -= minlines;	786	screen.cur.row -= minlines;
785	}	787	}
786	}	788	}
787		789
788	#ifdef DEBUG_STRICT
789	assert (screen.cur.col < ncol);	790	assert (screen.cur.col < ncol);
790	assert (screen.cur.row < nrow	791	assert (screen.cur.row < nrow
791	&& screen.cur.row >= top_row);	792	&& screen.cur.row >= top_row);
792	#endif
793	int row = screen.cur.row;	793	int row = screen.cur.row;
794		794
795	checksel = selection.op && current_screen == selection.screen ? 1 : 0;	795	checksel = selection.op && current_screen == selection.screen ? 1 : 0;
796		796
797	line_t *line = &ROW(row);	797	line_t *line = &ROW(row);
798		798
799	while (str < strend)	799	while (str < strend)
800	{	800	{
801	c = (unicode_t)*str++; // convert to rxvt-unicodes representation	801	c = (unicode_t)*str++; // convert to rxvt-unicodes representation
802		802
803	if (expect_false (c < 0x20))	803	if (ecb_unlikely (c < 0x20))
804	if (c == C0_LF)	804	if (c == C0_LF)
805	{	805	{
806	max_it (line->l, screen.cur.col);	806	max_it (line->l, screen.cur.col);
807		807
808	screen.flags &= ~Screen_WrapNext;	808	screen.flags &= ~Screen_WrapNext;
…		…
827	{	827	{
828	scr_tab (1, true);	828	scr_tab (1, true);
829	continue;	829	continue;
830	}	830	}
831		831
832	if (expect_false (	832	if (ecb_unlikely (
833	checksel /* see if we're writing within selection */	833	checksel /* see if we're writing within selection */
834	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)	834	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
835	&& ROWCOL_IS_BEFORE (screen.cur, selection.end)	835	&& ROWCOL_IS_BEFORE (screen.cur, selection.end)
836	))	836	))
837	{	837	{
…		…
842	* should be a similar check.	842	* should be a similar check.
843	*/	843	*/
844	CLEAR_SELECTION ();	844	CLEAR_SELECTION ();
845	}	845	}
846		846
847	if (expect_false (screen.flags & Screen_WrapNext))	847	if (ecb_unlikely (screen.flags & Screen_WrapNext))
848	{	848	{
849	scr_do_wrap ();	849	scr_do_wrap ();
850		850
851	line->l = ncol;	851	line->l = ncol;
852	line->is_longer (1);	852	line->is_longer (1);
…		…
854	row = screen.cur.row;	854	row = screen.cur.row;
855	line = &ROW(row); /* _must_ refresh */	855	line = &ROW(row); /* _must_ refresh */
856	}	856	}
857		857
858	// some utf-8 decoders "decode" surrogate characters: let's fix this.	858	// some utf-8 decoders "decode" surrogate characters: let's fix this.
859	if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff)))	859	if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
860	c = 0xfffd;	860	c = 0xfffd;
861		861
862	// 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
863	// further replacements, as wcwidth might return -1 for the line	863	// further replacements, as wcwidth might return -1 for the line
864	// drawing characters below as they might be invalid in the current	864	// drawing characters below as they might be invalid in the current
865	// locale.	865	// locale.
866	int width = WCWIDTH (c);	866	int width = WCWIDTH (c);
867		867
868	if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL	868	if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
869	{	869	{
870	// vt100 special graphics and line drawing	870	// vt100 special graphics and line drawing
871	// 5f-7e standard vt100	871	// 5f-7e standard vt100
872	// 40-5e rxvt extension for extra curses acs chars	872	// 40-5e rxvt extension for extra curses acs chars
873	static uint16_t vt100_0[62] = { // 41 .. 7e	873	static uint16_t vt100_0[62] = { // 41 .. 7e
…		…
886	c = vt100_0[c - 0x41];	886	c = vt100_0[c - 0x41];
887	width = 1; // vt100 line drawing characters are always single-width	887	width = 1; // vt100 line drawing characters are always single-width
888	}	888	}
889	}	889	}
890		890
891	if (expect_false (screen.flags & Screen_Insert))	891	if (ecb_unlikely (screen.flags & Screen_Insert))
892	scr_insdel_chars (width, INSERT);	892	scr_insdel_chars (width, INSERT);
893		893
894	if (width != 0)	894	if (width != 0)
895	{	895	{
896	#if !UNICODE_3	896	#if !UNICODE_3
…		…
901	# else	901	# else
902	c = 0xfffd;	902	c = 0xfffd;
903	# endif	903	# endif
904	#endif	904	#endif
905		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
906	// nuke the character at this position, if required	922	// nuke the character at this position, if required
907	if (expect_false (	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.
908	line->t[screen.cur.col] == NOCHAR	926	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);	927	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		928
925	line->touch ();	929	line->touch ();
926		930
927	do	931	do
928	{	932	{
929	line->t[screen.cur.col] = c;	933	line->t[screen.cur.col] = c;
930	line->r[screen.cur.col] = rend;	934	line->r[screen.cur.col] = rend;
931		935
932	if (expect_true (screen.cur.col < ncol - 1))	936	if (ecb_likely (screen.cur.col < ncol - 1))
933	screen.cur.col++;	937	screen.cur.col++;
934	else	938	else
935	{	939	{
936	line->l = ncol;	940	line->l = ncol;
937	if (screen.flags & Screen_Autowrap)	941	if (screen.flags & Screen_Autowrap)
938	screen.flags |= Screen_WrapNext;	942	screen.flags |= Screen_WrapNext;
939	break;	943
		944	goto end_of_line;
940	}	945	}
941		946
942	c = NOCHAR;	947	c = NOCHAR;
943	}	948	}
944	while (expect_false (--width > 0));	949	while (ecb_unlikely (--width > 0));
945		950
946	// pad with spaces when overwriting wide character with smaller one	951	// pad with spaces when overwriting wide character with smaller one
947	if (expect_false (!width))	952	for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
948	{	953	{
949	line->touch ();
950
951	for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
952	{
953	line->t[c] = ' ';	954	line->t[c] = ' ';
954	line->r[c] = rend;	955	line->r[c] = rend;
955	}
956	}	956	}
		957
		958	end_of_line:
		959	;
957	}	960	}
958	#if ENABLE_COMBINING	961	#if ENABLE_COMBINING
959	else // width == 0	962	else // width == 0
960	{	963	{
961	if (c != 0xfeff) // ignore BOM	964	if (c != 0xfeff) // ignore BOM
…		…
1001	#endif	1004	#endif
1002	}	1005	}
1003		1006
1004	max_it (line->l, screen.cur.col);	1007	max_it (line->l, screen.cur.col);
1005		1008
1006	#ifdef DEBUG_STRICT
1007	assert (screen.cur.row >= 0);	1009	assert (screen.cur.row >= 0);
1008	#endif
1009	}	1010	}
1010		1011
1011	/* ------------------------------------------------------------------------- */	1012	/* ------------------------------------------------------------------------- */
1012	/*	1013	/*
1013	* 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
…		…
1026		1027
1027	want_refresh = 1;	1028	want_refresh = 1;
1028	#endif	1029	#endif
1029	}	1030	}
1030	}	1031	}
		1032	else if (screen.flags & Screen_WrapNext)
		1033	screen.flags &= ~Screen_WrapNext;
1031	else	1034	else
1032	scr_gotorc (0, -1, RELATIVE);	1035	scr_gotorc (0, -1, RELATIVE);
1033	}	1036	}
1034		1037
1035	/* ------------------------------------------------------------------------- */	1038	/* ------------------------------------------------------------------------- */
…		…
1341	if (row >= nrow) /* Out Of Bounds */	1344	if (row >= nrow) /* Out Of Bounds */
1342	return;	1345	return;
1343		1346
1344	min_it (num, nrow - row);	1347	min_it (num, nrow - row);
1345		1348
1346	/*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */
1347	if (rstyle & (RS_RVid | RS_Uline))	1349	if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1348	ren = (rend_t) ~RS_None;	1350	ren = (rend_t) ~RS_None;
1349	else if (GET_BASEBG (rstyle) == Color_bg)	1351	else if (GET_BASEBG (rstyle) == Color_bg)
1350	{	1352	{
1351	ren = DEFAULT_RSTYLE;	1353	ren = DEFAULT_RSTYLE;
1352		1354
1353	if (mapped)	1355	if (mapped)
1354	XClearArea (dpy, vt, 0,	1356	XClearArea (dpy, vt, 0,
1355	Row2Pixel (row), (unsigned int)width,	1357	Row2Pixel (row - view_start), (unsigned int)width,
1356	(unsigned int)Height2Pixel (num), False);	1358	(unsigned int)Height2Pixel (num), False);
1357	}	1359	}
1358	else	1360	else
1359	{	1361	{
1360	ren = rstyle & (RS_fgMask | RS_bgMask);	1362	ren = rstyle & (RS_fgMask | RS_bgMask);
1361		1363
		1364	if (mapped)
		1365	{
1362	gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];	1366	gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1363	XChangeGC (dpy, gc, GCForeground, &gcvalue);	1367	XChangeGC (dpy, gc, GCForeground, &gcvalue);
1364	XFillRectangle (dpy, vt, gc,	1368	XFillRectangle (dpy, vt, gc,
1365	0, Row2Pixel (row),	1369	0, Row2Pixel (row - view_start),
1366	(unsigned int)width,	1370	(unsigned int)width,
1367	(unsigned int)Height2Pixel (num));	1371	(unsigned int)Height2Pixel (num));
1368	gcvalue.foreground = pix_colors[Color_fg];	1372	gcvalue.foreground = pix_colors[Color_fg];
1369	XChangeGC (dpy, gc, GCForeground, &gcvalue);	1373	XChangeGC (dpy, gc, GCForeground, &gcvalue);
		1374	}
1370	}	1375	}
1371		1376
1372	for (; num--; row++)	1377	for (; num--; row++)
1373	{	1378	{
1374	scr_blank_screen_mem (ROW(row), rstyle);	1379	scr_blank_screen_mem (ROW(row), rstyle);
		1380
		1381	if (row - view_start < nrow)
1375	scr_blank_line (drawn_buf [row], 0, ncol, ren);	1382	scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1376	}	1383	}
1377	}	1384	}
1378		1385
1379	#if !ENABLE_MINIMAL	1386	#if !ENABLE_MINIMAL
1380	void	1387	void
…		…
1533	{	1540	{
1534	line->t[col] = line->t[col + count];	1541	line->t[col] = line->t[col + count];
1535	line->r[col] = line->r[col + count];	1542	line->r[col] = line->r[col + count];
1536	}	1543	}
1537		1544
1538	scr_blank_line (*line, ncol - count, count,	1545	scr_blank_line (*line, ncol - count, count, rstyle);
1539	line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask));
1540		1546
1541	if (selection.op && current_screen == selection.screen	1547	if (selection.op && current_screen == selection.screen
1542	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))	1548	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1543	{	1549	{
1544	if (selection.end.row != screen.cur.row	1550	if (selection.end.row != screen.cur.row
…		…
1680	{	1686	{
1681	rvideo_state = on;	1687	rvideo_state = on;
1682		1688
1683	::swap (pix_colors[Color_fg], pix_colors[Color_bg]);	1689	::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1684	#ifdef HAVE_BG_PIXMAP	1690	#ifdef HAVE_BG_PIXMAP
1685	if (bgPixmap.pixmap == None)	1691	if (bg_pixmap == None)
1686	#endif	1692	#endif
1687	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);	1693	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1688		1694
1689	XGCValues gcvalue;	1695	XGCValues gcvalue;
1690	gcvalue.foreground = pix_colors[Color_fg];	1696	gcvalue.foreground = pix_colors[Color_fg];
…		…
1834	for (i = PART_BEG; i < RC_COUNT; i++)	1840	for (i = PART_BEG; i < RC_COUNT; i++)
1835	{	1841	{
1836	min_it (rc[i].col, ncol - 1);	1842	min_it (rc[i].col, ncol - 1);
1837	min_it (rc[i].row, nrow - 1);	1843	min_it (rc[i].row, nrow - 1);
1838	}	1844	}
1839	// TODO: this line somehow causes segfault if scr_expose() is called just after resize	1845
1840	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++)
1841	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);
1842		1848
1843	num_scr_allow = 0;	1849	num_scr_allow = 0;
1844		1850
…		…
1917		1923
1918	# ifndef NO_MAPALERT	1924	# ifndef NO_MAPALERT
1919	# ifdef MAPALERT_OPTION	1925	# ifdef MAPALERT_OPTION
1920	if (option (Opt_mapAlert))	1926	if (option (Opt_mapAlert))
1921	# endif	1927	# endif
1922	XMapWindow (dpy, parent[0]);	1928	XMapWindow (dpy, parent);
1923	# endif	1929	# endif
1924		1930
1925	# if ENABLE_FRILLS	1931	# if ENABLE_FRILLS
1926	if (option (Opt_urgentOnBell))	1932	if (option (Opt_urgentOnBell))
1927	set_urgency (1);	1933	set_urgency (1);
…		…
1935		1941
1936	bell_ev.start (VISUAL_BELL_DURATION);	1942	bell_ev.start (VISUAL_BELL_DURATION);
1937	}	1943	}
1938	else	1944	else
1939	XBell (dpy, 0);	1945	XBell (dpy, 0);
		1946	HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1940	#endif	1947	#endif
1941	}	1948	}
1942		1949
1943	/* ------------------------------------------------------------------------- */	1950	/* ------------------------------------------------------------------------- */
1944	/* ARGSUSED */
1945	void	1951	void
1946	rxvt_term::scr_printscreen (int fullhist) NOTHROW	1952	rxvt_term::scr_printscreen (int fullhist) NOTHROW
1947	{	1953	{
1948	#ifdef PRINTPIPE	1954	#ifdef PRINTPIPE
1949	int nrows, row_start;	1955	int nrows, row_start;
…		…
1963	row_start = view_start;	1969	row_start = view_start;
1964	}	1970	}
1965		1971
1966	wctomb (0, 0);	1972	wctomb (0, 0);
1967		1973
1968	for (int r1 = 0; r1 < nrows; r1++)	1974	for (int r1 = row_start; r1 < row_start + nrows; r1++)
1969	{	1975	{
1970	text_t *tp = ROW(r1).t;	1976	text_t *tp = ROW(r1).t;
1971	int len = ROW(r1).l;	1977	int len = ROW(r1).l;
1972		1978
1973	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
…		…
2002	* screen.text/screen.rend contain what the screen will change to.	2008	* screen.text/screen.rend contain what the screen will change to.
2003	*/	2009	*/
2004	void	2010	void
2005	rxvt_term::scr_refresh () NOTHROW	2011	rxvt_term::scr_refresh () NOTHROW
2006	{	2012	{
2007	unsigned char have_bg,
2008	showcursor; /* show the cursor */
2009	int16_t col, row, /* column/row we're processing */	2013	int16_t col, row, /* column/row we're processing */
2010	ocrow; /* old cursor row */	2014	ocrow; /* old cursor row */
2011	int i; /* tmp */	2015	int i; /* tmp */
2012	#ifndef NO_CURSORCOLOR	2016	#ifndef NO_CURSORCOLOR
2013	rend_t cc1; /* store colours at cursor position (s) */	2017	rend_t cc1; /* store colours at cursor position (s) */
…		…
2024	/*	2028	/*
2025	* A: set up vars	2029	* A: set up vars
2026	*/	2030	*/
2027	refresh_count = 0;	2031	refresh_count = 0;
2028		2032
		2033	unsigned int old_screen_flags = screen.flags;
2029	have_bg = 0;	2034	char have_bg = 0;
2030	#ifdef HAVE_BG_PIXMAP	2035	#ifdef HAVE_BG_PIXMAP
2031	have_bg = bgPixmap.pixmap != None;	2036	have_bg = bg_pixmap != None;
2032	#endif	2037	#endif
2033	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */	2038	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2034		2039
2035	/*	2040	/*
2036	* B: reverse any characters which are selected	2041	* B: reverse any characters which are selected
2037	*/	2042	*/
2038	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;
2039		2051
2040	/*	2052	/*
2041	* C: set the cursor character (s)	2053	* C: set the cursor character (s)
2042	*/	2054	*/
2043	{	2055	{
2044	unsigned char setoldcursor;	2056	unsigned char setoldcursor;
2045		2057
2046	showcursor = (screen.flags & Screen_VisibleCursor);
2047	#ifdef CURSOR_BLINK	2058	#ifdef CURSOR_BLINK
2048	if (hidden_cursor)	2059	if (hidden_cursor)
2049	showcursor = 0;	2060	showcursor = 0;
2050	#endif	2061	#endif
2051		2062
…		…
2079	ccol2 = bgcolor_of (rstyle);	2090	ccol2 = bgcolor_of (rstyle);
2080	#else	2091	#else
2081	ccol2 = Color_bg;	2092	ccol2 = Color_bg;
2082	#endif	2093	#endif
2083		2094
2084	if (showcursor && focus)	2095	if (focus)
2085	{	2096	{
2086	if (option (Opt_cursorUnderline))	2097	if (option (Opt_cursorUnderline))
2087	*crp ^= RS_Uline;	2098	*crp ^= RS_Uline;
2088	else	2099	else
2089	{	2100	{
…		…
2124	oldcursor.col = screen.cur.col;	2135	oldcursor.col = screen.cur.col;
2125	}	2136	}
2126	}	2137	}
2127	}	2138	}
2128		2139
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	2140	#ifndef NO_SLOW_LINK_SUPPORT
2135	/*	2141	/*
2136	* D: CopyArea pass - very useful for slower links	2142	* D: CopyArea pass - very useful for slower links
2137	* This has been deliberately kept simple.	2143	* This has been deliberately kept simple.
2138	*/	2144	*/
…		…
2227	continue;	2233	continue;
2228		2234
2229	// redraw one or more characters	2235	// redraw one or more characters
2230		2236
2231	// seek to the beginning of wide characters	2237	// seek to the beginning of wide characters
2232	while (expect_false (stp[col] == NOCHAR && col > 0))	2238	while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2233	--col;	2239	--col;
2234		2240
2235	rend_t rend = srp[col]; /* screen rendition (target rendtion) */	2241	rend_t rend = srp[col]; /* screen rendition (target rendition) */
2236	text_t *text = stp + col;	2242	text_t *text = stp + col;
2237	int count = 1;	2243	int count = 1;
2238		2244
2239	dtp[col] = stp[col];	2245	dtp[col] = stp[col];
2240	drp[col] = rend;	2246	drp[col] = rend;
…		…
2244	for (i = 0; ++col < ncol; )	2250	for (i = 0; ++col < ncol; )
2245	{	2251	{
2246	if (stp[col] == NOCHAR)	2252	if (stp[col] == NOCHAR)
2247	{	2253	{
2248	dtp[col] = stp[col];	2254	dtp[col] = stp[col];
2249	drp[col] = rend;	2255	drp[col] = srp[col];
		2256
2250	count++;	2257	count++;
2251	i++;	2258	i++;
2252		2259
2253	continue;	2260	continue;
2254	}	2261	}
…		…
2274		2281
2275	col--; /* went one too far. move back */	2282	col--; /* went one too far. move back */
2276	count -= i; /* dump any matching trailing chars */	2283	count -= i; /* dump any matching trailing chars */
2277		2284
2278	// sometimes we optimize away the trailing NOCHAR's, add them back	2285	// sometimes we optimize away the trailing NOCHAR's, add them back
2279	while (expect_false (i && text[count] == NOCHAR))	2286	while (ecb_unlikely (i && text[count] == NOCHAR))
2280	count++, i--;	2287	count++, i--;
2281		2288
2282	/*	2289	/*
2283	* Determine the attributes for the string	2290	* Determine the attributes for the string
2284	*/	2291	*/
2285	int fore = fgcolor_of (rend); // desired foreground	2292	int fore = fgcolor_of (rend); // desired foreground
2286	int back = bgcolor_of (rend); // desired background	2293	int back = bgcolor_of (rend); // desired background
2287		2294
2288	// 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
2289	if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)))	2296	if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2290	{	2297	{
2291	bool invert = rend & RS_RVid;	2298	bool invert = rend & RS_RVid;
2292		2299
2293	#ifndef NO_BOLD_UNDERLINE_REVERSE	2300	#ifndef NO_BOLD_UNDERLINE_REVERSE
2294	if (rend & RS_Bold && fore == Color_fg)	2301	if (rend & RS_Bold && fore == Color_fg)
…		…
2313		2320
2314	if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))	2321	if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2315	fore = Color_UL;	2322	fore = Color_UL;
2316	#endif	2323	#endif
2317		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
2318	if (invert)	2345	if (invert)
2319	{	2346	{
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);	2347	::swap (fore, back);
2327	#ifdef OPTION_HC
2328	else if (ISSET_PIXCOLOR (Color_HC))
2329	back = Color_HC;
2330	#endif
2331		2348
2332	#ifndef NO_BOLD_UNDERLINE_REVERSE	2349	#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)	2350	if (fore == back)
2338	{	2351	{
2339	fore = Color_bg;	2352	fore = Color_bg;
2340	back = Color_fg;	2353	back = Color_fg;
2341	}	2354	}
…		…
2377	/*	2390	/*
2378	* Actually do the drawing of the string here	2391	* Actually do the drawing of the string here
2379	*/	2392	*/
2380	rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];	2393	rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2381		2394
2382	if (expect_true (have_bg && back == Color_bg))	2395	if (ecb_likely (have_bg && back == Color_bg))
2383	{	2396	{
2384	// this is very ugly, maybe push it into ->draw?	2397	// this is very ugly, maybe push it into ->draw?
2385		2398
2386	for (i = 0; i < count; i++) /* don't draw empty strings */	2399	for (i = 0; i < count; i++) /* don't draw empty strings */
2387	if (text[i] != ' ')	2400	if (text[i] != ' ')
…		…
2394	did_clear: ;	2407	did_clear: ;
2395	}	2408	}
2396	else	2409	else
2397	font->draw (*drawable, xpixel, ypixel, text, count, fore, back);	2410	font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2398		2411
2399	if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))	2412	if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2400	{	2413	{
2401	#if ENABLE_FRILLS	2414	#if ENABLE_FRILLS
2402	if (ISSET_PIXCOLOR (Color_underline))	2415	if (ISSET_PIXCOLOR (Color_underline))
2403	XSetForeground (dpy, gc, pix_colors[Color_underline]);	2416	XSetForeground (dpy, gc, pix_colors[Color_underline]);
2404	else	2417	else
…		…
2409	xpixel, ypixel + font->ascent + 1,	2422	xpixel, ypixel + font->ascent + 1,
2410	xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);	2423	xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2411	}	2424	}
2412	} /* for (col....) */	2425	} /* for (col....) */
2413	} /* for (row....) */	2426	} /* for (row....) */
2414
2415	#if ENABLE_OVERLAY
2416	scr_swap_overlay ();
2417	#endif
2418	HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2419		2427
2420	/*	2428	/*
2421	* G: cleanup cursor and display outline cursor if necessary	2429	* G: cleanup cursor and display outline cursor if necessary
2422	*/	2430	*/
2423	if (showcursor)	2431	if (showcursor)
…		…
2462	}	2470	}
2463		2471
2464	/*	2472	/*
2465	* H: cleanup selection	2473	* H: cleanup selection
2466	*/	2474	*/
		2475	#if ENABLE_OVERLAY
		2476	scr_swap_overlay ();
		2477	#endif
		2478	HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
		2479
2467	scr_reverse_selection ();	2480	scr_reverse_selection ();
2468		2481
		2482	screen.flags = old_screen_flags;
2469	num_scr = 0;	2483	num_scr = 0;
2470	num_scr_allow = 1;	2484	num_scr_allow = 1;
2471	}	2485	}
2472		2486
2473	void	2487	void
…		…
2494	scr_remap_chars (swap_buf [i]);	2508	scr_remap_chars (swap_buf [i]);
2495	}	2509	}
2496	}	2510	}
2497		2511
2498	void	2512	void
2499	rxvt_term::scr_recolour () NOTHROW	2513	rxvt_term::scr_recolour (bool refresh) NOTHROW
2500	{	2514	{
		2515	bool transparent = false;
		2516
2501	#ifdef HAVE_BG_PIXMAP	2517	#ifdef HAVE_BG_PIXMAP
2502	bgPixmap.apply ();	2518	if (bg_pixmap != None)
2503	#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);
2504		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	{
2505	XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);	2538	XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2506	XClearWindow (dpy, parent[0]);
2507	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);	2539	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
		2540	}
		2541
		2542	XClearWindow (dpy, parent);
2508		2543
2509	if (scrollBar.win)	2544	if (scrollBar.win)
2510	{	2545	{
		2546	if (transparent)
		2547	XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
		2548	else
2511	XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);	2549	XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2512	scrollBar.state = STATE_IDLE;	2550	scrollBar.state = SB_STATE_IDLE;
2513	scrollBar.show (0);	2551	scrollBar.show (0);
2514	}	2552	}
2515		2553
2516	#endif	2554	if (refresh)
2517		2555	{
2518	/* bgPixmap.apply () does not do the following : */
2519	scr_clear ();	2556	scr_clear ();
2520	scr_touch (true);	2557	scr_touch (true);
		2558	}
2521	want_refresh = 1;	2559	want_refresh = 1;
2522	}	2560	}
2523		2561
2524	/* ------------------------------------------------------------------------- */	2562	/* ------------------------------------------------------------------------- */
2525	void	2563	void
…		…
2593	{	2631	{
2594	#if !ENABLE_MINIMAL	2632	#if !ENABLE_MINIMAL
2595	if (selection.rect)	2633	if (selection.rect)
2596	scr_xor_rect (selection.beg.row, selection.beg.col,	2634	scr_xor_rect (selection.beg.row, selection.beg.col,
2597	selection.end.row, selection.end.col,	2635	selection.end.row, selection.end.col,
2598	RS_RVid, RS_RVid | RS_Uline);	2636	RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2599	else	2637	else
2600	#endif	2638	#endif
2601	scr_xor_span (selection.beg.row, selection.beg.col,	2639	scr_xor_span (selection.beg.row, selection.beg.col,
2602	selection.end.row, selection.end.col,	2640	selection.end.row, selection.end.col,
2603	RS_RVid);	2641	RS_Sel | RS_RVid);
2604	}	2642	}
2605	}	2643	}
2606		2644
2607	/* ------------------------------------------------------------------------- */	2645	/* ------------------------------------------------------------------------- */
2608	/*	2646	/*
…		…
2613	void	2651	void
2614	rxvt_term::scr_dump (int fd) NOTHROW	2652	rxvt_term::scr_dump (int fd) NOTHROW
2615	{	2653	{
2616	int row, wrote;	2654	int row, wrote;
2617	unsigned int width, towrite;	2655	unsigned int width, towrite;
2618	char r1[] = "\n";	2656	const char r1[] = "\n";
2619		2657
2620	for (row = saveLines + top_row;	2658	for (row = saveLines + top_row;
2621	row < saveLines + nrow - 1; row++)	2659	row < saveLines + nrow - 1; row++)
2622	{	2660	{
2623	width = row_buf[row].l >= 0 ? row_buf[row].l	2661	width = row_buf[row].l >= 0 ? row_buf[row].l
…		…
2640	* CHARACTER SELECTION *	2678	* CHARACTER SELECTION *
2641	* ------------------------------------------------------------------------- */	2679	* ------------------------------------------------------------------------- */
2642	void	2680	void
2643	rxvt_term::selection_check (int check_more) NOTHROW	2681	rxvt_term::selection_check (int check_more) NOTHROW
2644	{	2682	{
2645	row_col_t pos;
2646
2647	if (!selection.op)	2683	if (!selection.op)
2648	return;	2684	return;
2649		2685
		2686	row_col_t pos;
2650	pos.row = pos.col = 0;	2687	pos.row = pos.col = 0;
		2688
2651	if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)	2689	if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2652	|| !IN_RANGE_EXC (selection.mark.row, top_row, nrow)	2690	|| !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2653	|| !IN_RANGE_EXC (selection.end.row, top_row, nrow)	2691	|| !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2654	|| (check_more == 1	2692	|| (check_more == 1
2655	&& current_screen == selection.screen	2693	&& current_screen == selection.screen
…		…
2657	&& ROWCOL_IS_BEFORE (screen.cur, selection.end))	2695	&& ROWCOL_IS_BEFORE (screen.cur, selection.end))
2658	|| (check_more == 2	2696	|| (check_more == 2
2659	&& ROWCOL_IS_BEFORE (selection.beg, pos)	2697	&& ROWCOL_IS_BEFORE (selection.beg, pos)
2660	&& ROWCOL_IS_AFTER (selection.end, pos))	2698	&& ROWCOL_IS_AFTER (selection.end, pos))
2661	|| (check_more == 3	2699	|| (check_more == 3
2662	&& ROWCOL_IS_AFTER (selection.end, pos))	2700	&& 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 ();	2701	CLEAR_ALL_SELECTION ();
2667	}	2702	}
2668		2703
2669	/* ------------------------------------------------------------------------- */	2704	/* ------------------------------------------------------------------------- */
2670	/*	2705	/*
2671	* Paste a selection direct to the command fd	2706	* Paste a selection direct to the command fd
2672	*/	2707	*/
2673	void	2708	void
2674	rxvt_term::paste (char *data, unsigned int len) NOTHROW	2709	rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2675	{	2710	{
2676	/* convert normal newline chars into common keyboard Return key sequence */	2711	/* convert normal newline chars into common keyboard Return key sequence */
2677	for (unsigned int i = 0; i < len; i++)	2712	for (unsigned int i = 0; i < len; i++)
2678	if (data[i] == C0_LF)	2713	if (data[i] == C0_LF)
2679	data[i] = C0_CR;	2714	data[i] = C0_CR;
…		…
2685		2720
2686	if (priv_modes & PrivMode_BracketPaste)	2721	if (priv_modes & PrivMode_BracketPaste)
2687	tt_printf ("\e[201~");	2722	tt_printf ("\e[201~");
2688	}	2723	}
2689		2724
2690	/* ------------------------------------------------------------------------- */
2691	/*
2692	* Respond to a notification that a primary selection has been sent
2693	* EXT: SelectionNotify
2694	*/
2695	void	2725	void
2696	rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW	2726	rxvt_term::paste (char *data, unsigned int len) NOTHROW
2697	{	2727	{
2698	if (prop == None) /* check for failed XConvertSelection */	2728	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;	2729	return;
2873		2730
2874	selection_paste (win, prop, true);	2731	tt_paste (data, len);
2875	}	2732	}
2876		2733
2877	/* ------------------------------------------------------------------------- */	2734	/* ------------------------------------------------------------------------- */
2878	/*	2735	/*
2879	* Request the current selection:	2736	* Request PRIMARY, SECONDARY or CLIPBOARD selection.
2880	* Order: > internal selection if available	2737	* if the requested selection has no owner or is empty CUT_BUFFER0 is used
2881	* > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)	2738	* 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	2739	* EXT: button 2 release
2886	*/	2740	*/
2887	void	2741	void
2888	rxvt_term::selection_request (Time tm, int selnum) NOTHROW	2742	rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2889	{	2743	{
2890	if (selection.text && selnum == Sel_Primary)	2744	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	}	2745	{
2898	else	2746	selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
		2747	selection_req->run ();
2899	{	2748	}
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	}	2749	}
2941		2750
2942	/* ------------------------------------------------------------------------- */	2751	/* ------------------------------------------------------------------------- */
2943	/*	2752	/*
2944	* Clear all selected text	2753	* Clear all selected text
2945	* EXT: SelectionClear	2754	* EXT: SelectionClear
2946	*/	2755	*/
2947	void	2756	void
2948	rxvt_term::selection_clear () NOTHROW	2757	rxvt_term::selection_clear (bool clipboard) NOTHROW
2949	{	2758	{
		2759	if (!clipboard)
		2760	{
2950	want_refresh = 1;	2761	want_refresh = 1;
2951	free (selection.text);	2762	free (selection.text);
2952	selection.text = NULL;	2763	selection.text = NULL;
2953	selection.len = 0;	2764	selection.len = 0;
2954	CLEAR_SELECTION ();	2765	CLEAR_SELECTION ();
2955		2766
2956	if (display->selection_owner == this)	2767	if (display->selection_owner == this)
2957	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	}
2958	}	2779	}
2959		2780
2960	/* ------------------------------------------------------------------------- */	2781	/* ------------------------------------------------------------------------- */
2961	/*	2782	/*
2962	* Copy a selection into the cut buffer	2783	* Copy a selection into the cut buffer
2963	* EXT: button 1 or 3 release	2784	* EXT: button 1 or 3 release
2964	*/	2785	*/
2965	void	2786	void
2966	rxvt_term::selection_make (Time tm)	2787	rxvt_term::selection_make (Time tm)
2967	{	2788	{
2968	int i;	2789	int size;
2969	wchar_t *new_selection_text;	2790	wchar_t *new_selection_text;
2970	text_t *t;	2791	text_t *t;
2971		2792
2972	switch (selection.op)	2793	switch (selection.op)
2973	{	2794	{
…		…
2989	return; /* nothing selected, go away */	2810	return; /* nothing selected, go away */
2990		2811
2991	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)))
2992	return;	2813	return;
2993		2814
2994	i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);	2815	size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2995	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));
2996		2817
2997	int ofs = 0;	2818	int ofs = 0;
2998	int extra = 0;	2819	int extra = 0;
2999		2820
3000	int col = selection.beg.col;	2821	int col = selection.beg.col;
…		…
3006	{	2827	{
3007	#if !ENABLE_MINIMAL	2828	#if !ENABLE_MINIMAL
3008	if (selection.rect)	2829	if (selection.rect)
3009	{	2830	{
3010	col = selection.beg.col;	2831	col = selection.beg.col;
3011	end_col = ncol + 1;	2832	end_col = selection.end.col;
3012	}	2833	}
3013	else	2834	else
3014	#endif	2835	#endif
3015	end_col = ROW(row).l;	2836	end_col = ROW(row).l;
3016		2837
3017	col = max (col, 0);	2838	col = max (col, 0);
3018		2839
3019	if (row == selection.end.row	2840	if (row == selection.end.row)
3020	#if !ENABLE_MINIMAL
3021	|| selection.rect
3022	#endif
3023	)
3024	min_it (end_col, selection.end.col);	2841	min_it (end_col, selection.end.col);
3025		2842
3026	t = ROW(row).t + col;	2843	t = ROW(row).t + col;
3027		2844
3028	for (; col < end_col; col++)	2845	for (; col < end_col; col++)
…		…
3036		2853
3037	extra -= (len - 1);	2854	extra -= (len - 1);
3038		2855
3039	if (extra < 0)	2856	if (extra < 0)
3040	{	2857	{
3041	extra += i;	2858	extra += size;
3042	i += i;	2859	size += size;
3043	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));
3044	}	2861	}
3045		2862
3046	ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);	2863	ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3047	}	2864	}
3048	#endif	2865	#endif
…		…
3060		2877
3061	new_selection_text[ofs++] = C0_LF;	2878	new_selection_text[ofs++] = C0_LF;
3062	}	2879	}
3063	else	2880	else
3064	#endif	2881	#endif
3065	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))
3066	new_selection_text[ofs++] = C0_LF;	2885	new_selection_text[ofs++] = C0_LF;
3067	}	2886	}
3068
3069	if (end_col != selection.end.col)
3070	new_selection_text[ofs++] = C0_LF;
3071		2887
3072	new_selection_text[ofs] = 0;	2888	new_selection_text[ofs] = 0;
3073		2889
3074	if (ofs == 0)	2890	if (ofs == 0)
3075	{	2891	{
…		…
3088		2904
3089	selection_grab (tm);	2905	selection_grab (tm);
3090	}	2906	}
3091		2907
3092	bool	2908	bool
3093	rxvt_term::selection_grab (Time tm) NOTHROW	2909	rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3094	{	2910	{
		2911	Atom sel;
		2912
		2913	if (!clipboard)
		2914	{
3095	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	}
3096		2923
3097	XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm);	2924	XSetSelectionOwner (dpy, sel, vt, tm);
3098	if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt)	2925	if (XGetSelectionOwner (dpy, sel) == vt)
3099	{	2926	{
3100	display->set_selection_owner (this);	2927	display->set_selection_owner (this, clipboard);
3101	return true;	2928	return true;
3102	}	2929	}
3103	else	2930	else
3104	{	2931	{
3105	selection_clear ();	2932	selection_clear (clipboard);
3106	return false;	2933	return false;
3107	}	2934	}
3108		2935
3109	#if 0	2936	#if 0
3110	XTextProperty ct;	2937	XTextProperty ct;
…		…
3570	* EXT: SelectionRequest	3397	* EXT: SelectionRequest
3571	*/	3398	*/
3572	void	3399	void
3573	rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW	3400	rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3574	{	3401	{
		3402	Atom property = rq.property == None ? rq.target : rq.property;
3575	XSelectionEvent ev;	3403	XSelectionEvent ev;
3576		3404
3577	ev.type = SelectionNotify;	3405	ev.type = SelectionNotify;
3578	ev.property = None;	3406	ev.property = None;
3579	ev.display = rq.display;	3407	ev.display = rq.display;
…		…
3594	*target++ = xa[XA_COMPOUND_TEXT];	3422	*target++ = xa[XA_COMPOUND_TEXT];
3595	#if X_HAVE_UTF8_STRING	3423	#if X_HAVE_UTF8_STRING
3596	*target++ = xa[XA_UTF8_STRING];	3424	*target++ = xa[XA_UTF8_STRING];
3597	#endif	3425	#endif
3598		3426
3599	XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,	3427	XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3600	32, PropModeReplace,	3428	32, PropModeReplace,
3601	(unsigned char *)target_list, target - target_list);	3429	(unsigned char *)target_list, target - target_list);
3602	ev.property = rq.property;	3430	ev.property = property;
3603	}	3431	}
3604	#if TODO // TODO	3432	#if TODO // TODO
3605	else if (rq.target == xa[XA_MULTIPLE])	3433	else if (rq.target == xa[XA_MULTIPLE])
3606	{	3434	{
3607	/* TODO: Handle MULTIPLE */	3435	/* TODO: Handle MULTIPLE */
3608	}	3436	}
3609	#endif	3437	#endif
3610	else if (rq.target == xa[XA_TIMESTAMP] && selection.text)	3438	else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3611	{	3439	{
3612	XChangeProperty (dpy, rq.requestor, rq.property, rq.target,	3440	XChangeProperty (dpy, rq.requestor, property, rq.target,
3613	32, PropModeReplace, (unsigned char *)&selection_time, 1);	3441	32, PropModeReplace, (unsigned char *)&selection_time, 1);
3614	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;
3615	}	3449	}
3616	else if (rq.target == XA_STRING	3450	else if (rq.target == XA_STRING
3617	|| rq.target == xa[XA_TEXT]	3451	|| rq.target == xa[XA_TEXT]
3618	|| rq.target == xa[XA_COMPOUND_TEXT]	3452	|| rq.target == xa[XA_COMPOUND_TEXT]
3619	|| rq.target == xa[XA_UTF8_STRING]	3453	|| rq.target == xa[XA_UTF8_STRING]
…		…
3651	{	3485	{
3652	target = xa[XA_COMPOUND_TEXT];	3486	target = xa[XA_COMPOUND_TEXT];
3653	style = enc_compound_text;	3487	style = enc_compound_text;
3654	}	3488	}
3655		3489
3656	if (selection.text)	3490	if (rq.selection == XA_PRIMARY && selection.text)
3657	{	3491	{
3658	cl = selection.text;	3492	cl = selection.text;
3659	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;
3660	}	3499	}
3661	else	3500	else
3662	{	3501	{
3663	cl = L"";	3502	cl = L"";
3664	selectlen = 0;	3503	selectlen = 0;
…		…
3685	ct.value = (unsigned char *)cl;	3524	ct.value = (unsigned char *)cl;
3686	ct.nitems = selectlen;	3525	ct.nitems = selectlen;
3687	ct.encoding = target;	3526	ct.encoding = target;
3688	}	3527	}
3689		3528
3690	XChangeProperty (dpy, rq.requestor, rq.property,	3529	XChangeProperty (dpy, rq.requestor, property,
3691	ct.encoding, 8, PropModeReplace,	3530	ct.encoding, 8, PropModeReplace,
3692	ct.value, (int)ct.nitems);	3531	ct.value, (int)ct.nitems);
3693	ev.property = rq.property;	3532	ev.property = property;
3694		3533
3695	if (freect)	3534	if (freect)
3696	XFree (ct.value);	3535	XFree (ct.value);
3697	}	3536	}
3698		3537
…		…
3732	h += 2; min_it (h, nrow);	3571	h += 2; min_it (h, nrow);
3733		3572
3734	x -= 1; clamp_it (x, 0, ncol - w);	3573	x -= 1; clamp_it (x, 0, ncol - w);
3735	y -= 1; clamp_it (y, 0, nrow - h);	3574	y -= 1; clamp_it (y, 0, nrow - h);
3736		3575
3737	ov_x = x; ov_y = y;	3576	ov.x = x; ov.y = y;
3738	ov_w = w; ov_h = h;	3577	ov.w = w; ov.h = h;
3739		3578
3740	ov_text = new text_t *[h];	3579	ov.text = new text_t *[h];
3741	ov_rend = new rend_t *[h];	3580	ov.rend = new rend_t *[h];
3742		3581
3743	for (y = 0; y < h; y++)	3582	for (y = 0; y < h; y++)
3744	{	3583	{
3745	text_t *tp = ov_text[y] = new text_t[w];	3584	text_t *tp = ov.text[y] = new text_t[w];
3746	rend_t *rp = ov_rend[y] = new rend_t[w];	3585	rend_t *rp = ov.rend[y] = new rend_t[w];
3747		3586
3748	text_t t0, t1, t2;	3587	text_t t0, t1, t2;
3749	rend_t r = OVERLAY_RSTYLE;	3588	rend_t r = OVERLAY_RSTYLE;
3750		3589
3751	if (y == 0)	3590	if (y == 0)
…		…
3770	}	3609	}
3771		3610
3772	void	3611	void
3773	rxvt_term::scr_overlay_off () NOTHROW	3612	rxvt_term::scr_overlay_off () NOTHROW
3774	{	3613	{
3775	if (!ov_text)	3614	if (!ov.text)
3776	return;	3615	return;
3777		3616
3778	want_refresh = 1;	3617	want_refresh = 1;
3779		3618
3780	for (int y = 0; y < ov_h; y++)	3619	for (int y = 0; y < ov.h; y++)
3781	{	3620	{
3782	delete [] ov_text[y];	3621	delete [] ov.text[y];
3783	delete [] ov_rend[y];	3622	delete [] ov.rend[y];
3784	}	3623	}
3785		3624
3786	delete [] ov_text; ov_text = 0;	3625	delete [] ov.text; ov.text = 0;
3787	delete [] ov_rend; ov_rend = 0;	3626	delete [] ov.rend; ov.rend = 0;
3788	}	3627	}
3789		3628
3790	void	3629	void
3791	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
3792	{	3631	{
3793	if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)	3632	if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3794	return;	3633	return;
3795		3634
3796	x++, y++;	3635	x++, y++;
3797		3636
3798	ov_text[y][x] = text;	3637	ov.text[y][x] = text;
3799	ov_rend[y][x] = rend;	3638	ov.rend[y][x] = rend;
3800	}	3639	}
3801		3640
3802	void	3641	void
3803	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
3804	{	3643	{
…		…
3823	}	3662	}
3824		3663
3825	void	3664	void
3826	rxvt_term::scr_swap_overlay () NOTHROW	3665	rxvt_term::scr_swap_overlay () NOTHROW
3827	{	3666	{
3828	if (!ov_text)	3667	if (!ov.text)
3829	return;	3668	return;
3830		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
3831	// swap screen mem with overlay	3675	// swap screen mem with overlay
3832	for (int y = ov_h; y--; )	3676	for (int y = ov.h; y--; )
3833	{	3677	{
3834	text_t *t1 = ov_text[y];	3678	text_t *t1 = ov.text[y];
3835	rend_t *r1 = ov_rend[y];	3679	rend_t *r1 = ov.rend[y];
3836		3680
3837	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;
3838	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;
3839		3683
3840	for (int x = ov_w; x--; )	3684	for (int x = ov.w; x--; )
3841	{	3685	{
3842	text_t t = *t1; *t1++ = *t2; *t2++ = t;	3686	text_t t = *t1; *t1++ = *t2; *t2++ = t;
3843	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));
3844	}	3688	}
3845	}	3689	}

Diff Legend

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